From 536bc2c6525745b914830119c65824faf63e15e8 Mon Sep 17 00:00:00 2001 From: msweet Date: Thu, 14 May 2009 22:48:33 +0000 Subject: [PATCH] Merge changes from CUPS 1.4svn-r8639. git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1505 a1ca3aef-8c08-0410-bb20-df032aa958be --- CHANGES.txt | 3 +- backend/usb-darwin.c | 4 +- config.h.in | 1 + cups/backchannel.c | 4 +- cups/debug.c | 14 +- cups/dir.c | 2 +- cups/file.c | 6 +- cups/globals.c | 2 +- cups/http.c | 12 +- cups/ipp.c | 8 +- cups/langprintf.c | 2 +- cups/sidechannel.c | 8 +- cups/snmp.c | 14 +- cups/string.h | 4 +- cups/testfile.c | 6 +- cups/transcode.c | 2 +- scheduler/dirsvc.c | 58 ++- scheduler/dirsvc.h | 4 +- scheduler/ipp.c | 3 +- vc2005/config.h | 685 ++++++++++++++++++++++++++++++ vc2005/cups.sln | 35 ++ vc2005/libcups2.def | 284 +++++++++++++ vc2005/libcups2.vcproj | 927 +++++++++++++++++++++++++++++++++++++++++ vc2005/testfile.vcproj | 202 +++++++++ vc2005/testhttp.vcproj | 202 +++++++++ vcnet/config.h | 473 +++++++++++++++++---- vcnet/cups.sln | 46 +- vcnet/libcups2.def | 5 - vcnet/libcups2.vcproj | 722 +++++++++++++++++++++----------- vcnet/testfile.vcproj | 161 ++++--- vcnet/testhttp.vcproj | 163 +++++--- 31 files changed, 3582 insertions(+), 480 deletions(-) create mode 100644 vc2005/config.h create mode 100644 vc2005/cups.sln create mode 100644 vc2005/libcups2.def create mode 100644 vc2005/libcups2.vcproj create mode 100644 vc2005/testfile.vcproj create mode 100644 vc2005/testhttp.vcproj diff --git a/CHANGES.txt b/CHANGES.txt index dc4ea588c..5bb097630 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,4 @@ -CHANGES.txt - 2009-05-13 +CHANGES.txt - 2009-05-14 ------------------------ CHANGES IN CUPS V1.4b3 @@ -8,6 +8,7 @@ CHANGES IN CUPS V1.4b3 Russian and partial localizations for Chinese, Danish, Finnish, French, Italian, Korean, Norwegian, Portuguese, and Swedish (STR #3096, STR #3098, STR #3109, STR #3111, STR #3141) + - The scheduler could crash when deleting an attribute (STR #3197) - The cups-driverd program did not detect symlink loops (STR #3185) - The EPSON 24-pin series driver should now feed the correct amount (STR #2624) diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c index 9dcd2c6ee..2fc7a27d3 100644 --- a/backend/usb-darwin.c +++ b/backend/usb-darwin.c @@ -587,7 +587,7 @@ print_device(const char *uri, /* I - Device URI */ "written, aborting!\n", stderr); return (CUPS_BACKEND_OK); } - else if (errno != EAGAIN) + else if (errno != EAGAIN && errno != EINTR) { _cupsLangPuts(stderr, _("ERROR: Unable to read print data!\n")); perror("DEBUG: select"); @@ -620,7 +620,7 @@ print_device(const char *uri, /* I - Device URI */ * Read error - bail if we don't see EAGAIN or EINTR... */ - if (errno != EAGAIN || errno != EINTR) + if (errno != EAGAIN && errno != EINTR) { _cupsLangPuts(stderr, _("ERROR: Unable to read print data!\n")); perror("DEBUG: read"); diff --git a/config.h.in b/config.h.in index da096f59c..5aceeb6d8 100644 --- a/config.h.in +++ b/config.h.in @@ -434,6 +434,7 @@ #undef HAVE_USERSEC_H + /* * Do we have pthread support? */ diff --git a/cups/backchannel.c b/cups/backchannel.c index b264b5c89..44d8b574b 100644 --- a/cups/backchannel.c +++ b/cups/backchannel.c @@ -86,7 +86,7 @@ cupsBackChannelRead(char *buffer, /* I - Buffer to read into */ */ #ifdef WIN32 - return ((ssize_t)read(3, buffer, (unsigned)bytes)); + return ((ssize_t)_read(3, buffer, (unsigned)bytes)); #else return (read(3, buffer, bytes)); #endif /* WIN32 */ @@ -148,7 +148,7 @@ cupsBackChannelWrite( */ #ifdef WIN32 - count = (ssize_t)write(3, buffer, (unsigned)(bytes - total)); + count = (ssize_t)_write(3, buffer, (unsigned)(bytes - total)); #else count = write(3, buffer, bytes - total); #endif /* WIN32 */ diff --git a/cups/debug.c b/cups/debug.c index 74f77ffd4..f3d2f1c5b 100644 --- a/cups/debug.c +++ b/cups/debug.c @@ -26,10 +26,16 @@ #include "globals.h" #include "debug.h" -#include +#ifdef WIN32 +# include +#else +# include +# include +#endif /* WIN32 */ #include -#include -#include +#ifndef WIN32 +# include +#endif /* WIN32 */ /* @@ -47,8 +53,10 @@ int _cups_debug_level = 1; * Local globals... */ +# ifndef WIN32 static regex_t *debug_filter = NULL; /* Filter expression for messages */ +# endif /* !WIN32 */ static int debug_init = 0; /* Did we initialize debugging? */ # ifdef HAVE_PTHREAD_H static pthread_mutex_t debug_mutex = PTHREAD_MUTEX_INITIALIZER; diff --git a/cups/dir.c b/cups/dir.c index 5cb4d060e..73090941e 100644 --- a/cups/dir.c +++ b/cups/dir.c @@ -73,7 +73,7 @@ _cups_dir_time(FILETIME ft) /* I - File time */ * between them... */ - val = ft.dwLowDateTime + (ft.dwHighDateTime << 32); + val = ft.dwLowDateTime + ((ULONGLONG)ft.dwHighDateTime << 32); return ((time_t)(val / 10000000 - 11644732800)); } diff --git a/cups/file.c b/cups/file.c index 68e854de3..08445bea4 100644 --- a/cups/file.c +++ b/cups/file.c @@ -755,7 +755,7 @@ cupsFileLock(cups_file_t *fp, /* I - CUPS file */ */ #ifdef WIN32 - return (locking(fp->fd, block ? _LK_LOCK : _LK_NBLCK, 0)); + return (_locking(fp->fd, block ? _LK_LOCK : _LK_NBLCK, 0)); #else return (lockf(fp->fd, block ? F_LOCK : F_TLOCK, 0)); #endif /* WIN32 */ @@ -1078,7 +1078,7 @@ cupsFilePrintf(cups_file_t *fp, /* I - CUPS file */ bytes = vsnprintf(fp->printf_buffer, fp->printf_size, format, ap); va_end(ap); - if (bytes >= fp->printf_size) + if (bytes >= (ssize_t)fp->printf_size) { /* * Expand the printf buffer... @@ -1762,7 +1762,7 @@ cupsFileUnlock(cups_file_t *fp) /* I - CUPS file */ */ #ifdef WIN32 - return (locking(fp->fd, _LK_UNLCK, 0)); + return (_locking(fp->fd, _LK_UNLCK, 0)); #else return (lockf(fp->fd, F_ULOCK, 0)); #endif /* WIN32 */ diff --git a/cups/globals.c b/cups/globals.c index e9e863313..4e49109fc 100644 --- a/cups/globals.c +++ b/cups/globals.c @@ -205,7 +205,7 @@ _cupsGlobals(void) memset(&globals, 0, sizeof(globals)); globals.encryption = (http_encryption_t)-1; - globals.password_cb = _cupsGetPassword; + globals.password_cb = (cups_password_cb2_t)_cupsGetPassword; cups_env_init(&globals); } diff --git a/cups/http.c b/cups/http.c index ddb2f3a83..a607581a4 100644 --- a/cups/http.c +++ b/cups/http.c @@ -1685,8 +1685,6 @@ httpReconnect(http_t *http) /* I - Connection to server */ close(http->fd); #endif /* WIN32 */ - usleep(100000); - http->fd = -1; } @@ -2821,7 +2819,11 @@ http_send(http_t *http, /* I - Connection to server */ */ if (http->wused) - httpFlushWrite(http); + { + if (httpFlushWrite(http) < 0) + if (httpReconnect(http)) + return (-1); + } /* * Send the request header... @@ -2884,7 +2886,9 @@ http_send(http_t *http, /* I - Connection to server */ return (-1); } - httpFlushWrite(http); + if (httpFlushWrite(http) < 0) + return (-1); + httpGetLength2(http); httpClearFields(http); diff --git a/cups/ipp.c b/cups/ipp.c index c3e8a8f12..70fb41f38 100644 --- a/cups/ipp.c +++ b/cups/ipp.c @@ -1432,7 +1432,13 @@ ippReadIO(void *src, /* I - Data source */ case IPP_TAG_NOTSETTABLE : case IPP_TAG_DELETEATTR : case IPP_TAG_ADMINDEFINE : - if (attr->value_tag == IPP_TAG_NOVALUE) + /* + * These value types are not supposed to have values, however + * some vendors (Brother) do not implement IPP correctly and so + * we need to map non-empty values to text... + */ + + if (attr->value_tag == tag) { if (n == 0) break; diff --git a/cups/langprintf.c b/cups/langprintf.c index 0b4420f7b..d8816df0a 100644 --- a/cups/langprintf.c +++ b/cups/langprintf.c @@ -73,7 +73,7 @@ _cupsLangPrintError(const char *message)/* I - Message */ * Format the message... */ - snprintf(buffer, sizeof(buffer), "%s: %s", + snprintf(buffer, sizeof(buffer), "%s: %s\n", _cupsLangString(cg->lang_default, message), strerror(last_errno)); /* diff --git a/cups/sidechannel.c b/cups/sidechannel.c index 92aeb9d9b..0f51fd1bd 100644 --- a/cups/sidechannel.c +++ b/cups/sidechannel.c @@ -31,11 +31,15 @@ #include "sidechannel.h" #include "string.h" #include "debug.h" -#include +#ifdef WIN32 +# include +#else +# include +#endif /* WIN32 */ #include #ifdef __hpux # include -#else +#elif !defined(WIN32) # include #endif /* __hpux */ #ifndef WIN32 diff --git a/cups/snmp.c b/cups/snmp.c index 43722ba7d..d37582b96 100644 --- a/cups/snmp.c +++ b/cups/snmp.c @@ -364,7 +364,11 @@ _cupsSNMPOpen(int family) /* I - Address family - @code AF_INET@ or @code AF_IN val = 1; +#ifdef WIN32 + if (setsockopt(fd, SOL_SOCKET, SO_BROADCAST, (char *)&val, sizeof(val))) +#else if (setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &val, sizeof(val))) +#endif /* WIN32 */ { DEBUG_printf(("5_cupsSNMPOpen: Returning -1 (%s)", strerror(errno))); @@ -438,7 +442,7 @@ _cupsSNMPRead(int fd, /* I - SNMP socket file descriptor */ FD_SET(fd, &input_set); stimeout.tv_sec = (int)timeout; - stimeout.tv_usec = (int)((timeout - stimeout.tv_usec) * 1000000); + stimeout.tv_usec = (int)((timeout - stimeout.tv_sec) * 1000000); ready = select(fd + 1, &input_set, NULL, NULL, &stimeout); } @@ -799,11 +803,11 @@ asn1_debug(const char *prefix, /* I - Prefix string */ fprintf(stderr, "%sHex Dump (%d bytes):\n", prefix, (int)len); - for (i = 0; i < len; i += 16) + for (i = 0; i < (int)len; i += 16) { fprintf(stderr, "%s%04x:", prefix, i); - for (j = 0; j < 16 && (i + j) < len; j ++) + for (j = 0; j < 16 && (i + j) < (int)len; j ++) { if (j && !(j & 3)) fprintf(stderr, " %02x", buffer[i + j]); @@ -823,7 +827,7 @@ asn1_debug(const char *prefix, /* I - Prefix string */ fputs(" ", stderr); - for (j = 0; j < 16 && (i + j) < len; j ++) + for (j = 0; j < 16 && (i + j) < (int)len; j ++) if (buffer[i + j] < ' ' || buffer[i + j] >= 0x7f) putc('.', stderr); else @@ -1187,7 +1191,7 @@ asn1_encode_snmp(unsigned char *buffer, /* I - Buffer */ 1 + asn1_size_length(reqlen) + reqlen; total = 1 + asn1_size_length(msglen) + msglen; - if (total > bufsize) + if (total > (int)bufsize) { packet->error = "Message too large for buffer"; return (-1); diff --git a/cups/string.h b/cups/string.h index ac236a2b9..d8bd8e3e2 100644 --- a/cups/string.h +++ b/cups/string.h @@ -48,8 +48,8 @@ */ # if defined(WIN32) || defined(__EMX__) -# define strcasecmp stricmp -# define strncasecmp strnicmp +# define strcasecmp _stricmp +# define strncasecmp _strnicmp # endif /* WIN32 || __EMX__ */ diff --git a/cups/testfile.c b/cups/testfile.c index 391823770..43751f116 100644 --- a/cups/testfile.c +++ b/cups/testfile.c @@ -36,7 +36,11 @@ #ifdef HAVE_LIBZ # include #endif /* HAVE_LIBZ */ -#include +#ifdef WIN32 +# include +#else +# include +#endif /* WIN32 */ #include diff --git a/cups/transcode.c b/cups/transcode.c index 4e7a794cb..fed9c9492 100644 --- a/cups/transcode.c +++ b/cups/transcode.c @@ -1130,7 +1130,7 @@ conv_utf8_to_vbcs( } else { - *dest++ = legchar; + *dest++ = (cups_sbcs_t)legchar; DEBUG_printf(("9conv_utf8_to_vbcs: %08x => %02X", (unsigned)unichar, dest[-1])); diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c index 29ff94743..89bcaefbf 100644 --- a/scheduler/dirsvc.c +++ b/scheduler/dirsvc.c @@ -1910,6 +1910,7 @@ cupsdUpdateDNSSDName(void) #ifdef HAVE_COREFOUNDATION_H SCDynamicStoreRef sc; /* Context for dynamic store */ CFDictionaryRef btmm; /* Back-to-My-Mac domains */ + CFStringEncoding nameEncoding; /* Encoding of computer name */ CFStringRef nameRef; /* Host name CFString */ char nameBuffer[1024]; /* C-string buffer */ #endif /* HAVE_COREFOUNDATION_H */ @@ -1937,7 +1938,37 @@ cupsdUpdateDNSSDName(void) * Get the computer name from the dynamic store... */ - cupsdClearString(&DNSSDName); + cupsdClearString(&DNSSDComputerName); + + if ((nameRef = SCDynamicStoreCopyComputerName(sc, &nameEncoding)) != NULL) + { + if (CFStringGetCString(nameRef, nameBuffer, sizeof(nameBuffer), + kCFStringEncodingUTF8)) + { + cupsdLogMessage(CUPSD_LOG_DEBUG, + "Dynamic store computer name is \"%s\".", nameBuffer); + cupsdSetString(&DNSSDComputerName, nameBuffer); + } + + CFRelease(nameRef); + } + + if (!DNSSDComputerName) + { + /* + * Use the ServerName instead... + */ + + cupsdLogMessage(CUPSD_LOG_DEBUG, + "Using ServerName \"%s\" as computer name.", ServerName); + cupsdSetString(&DNSSDComputerName, ServerName); + } + + /* + * Get the local hostname from the dynamic store... + */ + + cupsdClearString(&DNSSDHostName); if ((nameRef = SCDynamicStoreCopyLocalHostName(sc)) != NULL) { @@ -1946,13 +1977,13 @@ cupsdUpdateDNSSDName(void) { cupsdLogMessage(CUPSD_LOG_DEBUG, "Dynamic store host name is \"%s\".", nameBuffer); - cupsdSetString(&DNSSDName, nameBuffer); + cupsdSetString(&DNSSDHostName, nameBuffer); } CFRelease(nameRef); } - if (!DNSSDName) + if (!DNSSDHostName) { /* * Use the ServerName instead... @@ -1960,7 +1991,7 @@ cupsdUpdateDNSSDName(void) cupsdLogMessage(CUPSD_LOG_DEBUG, "Using ServerName \"%s\" as host name.", ServerName); - cupsdSetString(&DNSSDName, ServerName); + cupsdSetString(&DNSSDHostName, ServerName); } /* @@ -1990,7 +2021,10 @@ cupsdUpdateDNSSDName(void) } else #endif /* HAVE_COREFOUNDATION_H */ - cupsdSetString(&DNSSDName, ServerName); + { + cupsdSetString(&DNSSDComputerName, ServerName); + cupsdSetString(&DNSSDHostName, ServerName); + } /* * Then (re)register the web interface if enabled... @@ -1998,8 +2032,8 @@ cupsdUpdateDNSSDName(void) if (BrowseWebIF) { - if (DNSSDName) - snprintf(webif, sizeof(webif), "CUPS @ %s", DNSSDName); + if (DNSSDComputerName) + snprintf(webif, sizeof(webif), "CUPS @ %s", DNSSDComputerName); else strlcpy(webif, "CUPS Web Interface", sizeof(webif)); @@ -2281,7 +2315,7 @@ dnssdAddAlias(const void *key, /* I - Key */ CFStringGetCString((CFStringRef)value, valueStr, sizeof(valueStr), kCFStringEncodingUTF8)) { - snprintf(hostname, sizeof(hostname), "%s.%s", DNSSDName, valueStr); + snprintf(hostname, sizeof(hostname), "%s.%s", DNSSDHostName, valueStr); if (!DNSSDAlias) DNSSDAlias = cupsArrayNew(NULL, NULL); @@ -2646,13 +2680,13 @@ dnssdRegisterPrinter(cupsd_printer_t *p)/* I - Printer */ if (p->info && strlen(p->info) > 0) { - if (DNSSDName) - snprintf(name, sizeof(name), "%s @ %s", p->info, DNSSDName); + if (DNSSDComputerName) + snprintf(name, sizeof(name), "%s @ %s", p->info, DNSSDComputerName); else strlcpy(name, p->info, sizeof(name)); } - else if (DNSSDName) - snprintf(name, sizeof(name), "%s @ %s", p->name, DNSSDName); + else if (DNSSDComputerName) + snprintf(name, sizeof(name), "%s @ %s", p->name, DNSSDComputerName); else strlcpy(name, p->name, sizeof(name)); diff --git a/scheduler/dirsvc.h b/scheduler/dirsvc.h index 1fae4d3cc..c17a25406 100644 --- a/scheduler/dirsvc.h +++ b/scheduler/dirsvc.h @@ -133,8 +133,10 @@ VAR cupsd_statbuf_t *PollStatusBuffer VALUE(NULL); /* Status buffer for pollers */ #ifdef HAVE_DNSSD -VAR char *DNSSDName VALUE(NULL); +VAR char *DNSSDComputerName VALUE(NULL), /* Computer/server name */ + *DNSSDHostName VALUE(NULL); + /* Hostname */ VAR cups_array_t *DNSSDAlias VALUE(NULL); /* List of dynamic ServerAlias's */ VAR int DNSSDPort VALUE(0); diff --git a/scheduler/ipp.c b/scheduler/ipp.c index 637d760b4..344e2c254 100644 --- a/scheduler/ipp.c +++ b/scheduler/ipp.c @@ -7748,8 +7748,7 @@ get_printers(cupsd_client_t *con, /* I - Client connection */ * access... */ - if (!(printer->type & CUPS_PRINTER_AUTHENTICATED) && - printer->num_users && username && !user_allowed(printer, username)) + if (printer->num_users && username && !user_allowed(printer, username)) continue; /* diff --git a/vc2005/config.h b/vc2005/config.h new file mode 100644 index 000000000..91374835e --- /dev/null +++ b/vc2005/config.h @@ -0,0 +1,685 @@ +/* + * "$Id$" + * + * Configuration file for the Common UNIX Printing System (CUPS). + * + * Copyright 2007-2009 by Apple Inc. + * Copyright 1997-2007 by Easy Software Products. + * + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". + */ + +#ifndef _CUPS_CONFIG_H_ +#define _CUPS_CONFIG_H_ + +/* + * Beginning with VC2005, Microsoft breaks ISO C and POSIX conformance + * by deprecating a number of functions in the name of security, even + * when many of the affected functions are otherwise completely secure. + * The _CRT_SECURE_NO_DEPRECATE definition ensures that we won't get + * warnings from their use... + * + * Then Microsoft decided that they should ignore this in VC2008 and use + * yet another define (_CRT_SECURE_NO_WARNINGS) instead. Bastards. + */ + +#define _CRT_SECURE_NO_DEPRECATE +#define _CRT_SECURE_NO_WARNINGS + + +/* + * Include necessary headers... + */ + +#include +#include +#include +#include +#include +#include + + +/* + * Microsoft also renames the POSIX functions to _name, and introduces + * a broken compatibility layer using the original names. As a result, + * random crashes can occur when, for example, strdup() allocates memory + * from a different heap than used by malloc() and free(). + * + * To avoid moronic problems like this, we #define the POSIX function + * names to the corresponding non-standard Microsoft names. + */ + +#define close _close +#define open _open +#define read _read +#define snprintf _snprintf +#define strdup _strdup +#define vsnprintf _vsnprintf +#define write _write + + +/* + * Compiler stuff... + */ + +#undef const +#undef __CHAR_UNSIGNED__ + + +/* + * Version of software... + */ + +#define CUPS_SVERSION "CUPS v1.4b3" +#define CUPS_MINIMAL "CUPS/1.4b3" + + +/* + * Default user and groups... + */ + +#define CUPS_DEFAULT_USER "lp" +#define CUPS_DEFAULT_GROUP "sys" +#define CUPS_DEFAULT_SYSTEM_GROUPS "admin" +#define CUPS_DEFAULT_PRINTOPERATOR_AUTH "@admin @lpadmin" + + +/* + * Default file permissions... + */ + +#define CUPS_DEFAULT_CONFIG_FILE_PERM 0644 +#define CUPS_DEFAULT_LOG_FILE_PERM 0644 + + +/* + * Default logging settings... + */ + +#define CUPS_DEFAULT_LOG_LEVEL "warn" +#define CUPS_DEFAULT_ACCESS_LOG_LEVEL "actions" + + +/* + * Default fatal error settings... + */ + +#define CUPS_DEFAULT_FATAL_ERRORS "config" + + +/* + * Default browsing settings... + */ + +#define CUPS_DEFAULT_BROWSING 1 +#define CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS "CUPS dnssd" +#define CUPS_DEFAULT_BROWSE_REMOTE_PROTOCOLS "" +#define CUPS_DEFAULT_BROWSE_SHORT_NAMES 1 +#define CUPS_DEFAULT_DEFAULT_SHARED 1 +#define CUPS_DEFAULT_IMPLICIT_CLASSES 1 +#define CUPS_DEFAULT_USE_NETWORK_DEFAULT 0 + + +/* + * Default IPP port... + */ + +#define CUPS_DEFAULT_IPP_PORT 631 + + +/* + * Default printcap file... + */ + +#define CUPS_DEFAULT_PRINTCAP "" + + +/* + * Default Samba and LPD config files... + */ + +#define CUPS_DEFAULT_SMB_CONFIG_FILE "" +#define CUPS_DEFAULT_LPD_CONFIG_FILE "" + + +/* + * Default MaxCopies value... + */ + +#define CUPS_DEFAULT_MAX_COPIES 9999 + + +/* + * Do we have domain socket support? + */ + +#undef CUPS_DEFAULT_DOMAINSOCKET + + +/* + * Where are files stored? + * + * Note: These are defaults, which can be overridden by environment + * variables at run-time... + */ + +#define CUPS_BINDIR "C:/CUPS/bin" +#define CUPS_CACHEDIR "C:/CUPS/cache" +#define CUPS_DATADIR "C:/CUPS/share" +#define CUPS_DOCROOT "C:/CUPS/share/doc" +#define CUPS_FONTPATH "C:/CUPS/share/fonts" +#define CUPS_LOCALEDIR "C:/CUPS/locale" +#define CUPS_LOGDIR "C:/CUPS/logs" +#define CUPS_REQUESTS "C:/CUPS/spool" +#define CUPS_SBINDIR "C:/CUPS/sbin" +#define CUPS_SERVERBIN "C:/CUPS/lib" +#define CUPS_SERVERROOT "C:/CUPS/etc" +#define CUPS_STATEDIR "C:/CUPS/run" + + +/* + * Do we have various image libraries? + */ + +/* #undef HAVE_LIBPNG */ +/* #undef HAVE_LIBZ */ +/* #undef HAVE_LIBJPEG */ +/* #undef HAVE_LIBTIFF */ + + +/* + * Do we have PAM stuff? + */ + +#ifndef HAVE_LIBPAM +#define HAVE_LIBPAM 0 +#endif /* !HAVE_LIBPAM */ + +/* #undef HAVE_PAM_PAM_APPL_H */ +/* #undef HAVE_PAM_SET_ITEM */ +/* #undef HAVE_PAM_SETCRED */ + + +/* + * Do we have ? + */ + +/* #undef HAVE_SHADOW_H */ + + +/* + * Do we have ? + */ + +/* #undef HAVE_CRYPT_H */ + + +/* + * Use , , and/or ? + */ + +#define HAVE_STRING_H 1 +/* #undef HAVE_STRINGS_H */ +/* #undef HAVE_BSTRING_H */ + + +/* + * Do we have the long long type? + */ + +/* #undef HAVE_LONG_LONG */ + +#ifdef HAVE_LONG_LONG +# define CUPS_LLFMT "%lld" +# define CUPS_LLCAST (long long) +#else +# define CUPS_LLFMT "%ld" +# define CUPS_LLCAST (long) +#endif /* HAVE_LONG_LONG */ + + +/* + * Do we have the strtoll() function? + */ + +/* #undef HAVE_STRTOLL */ + +#ifndef HAVE_STRTOLL +# define strtoll(nptr,endptr,base) strtol((nptr), (endptr), (base)) +#endif /* !HAVE_STRTOLL */ + + +/* + * Do we have the strXXX() functions? + */ + +#define HAVE_STRDUP +#define HAVE_STRCASECMP +#define HAVE_STRNCASECMP +/* #undef HAVE_STRLCAT */ +/* #undef HAVE_STRLCPY */ + + +/* + * Do we have the geteuid() function? + */ + +/* #undef HAVE_GETEUID */ + + +/* + * Do we have the vsyslog() function? + */ + +/* #undef HAVE_VSYSLOG */ + + +/* + * Do we have the (v)snprintf() functions? + */ + +#define HAVE_SNPRINTF 1 +#define HAVE_VSNPRINTF 1 + + +/* + * What signal functions to use? + */ + +/* #undef HAVE_SIGSET */ +/* #undef HAVE_SIGACTION */ + + +/* + * What wait functions to use? + */ + +/* #undef HAVE_WAITPID */ +/* #undef HAVE_WAIT3 */ + + +/* + * Do we have the mallinfo function and malloc.h? + */ + +/* #undef HAVE_MALLINFO */ +/* #undef HAVE_MALLOC_H */ + + +/* + * Do we have the POSIX ACL functions? + */ + +/* #undef HAVE_ACL_INIT */ + + +/* + * Do we have the langinfo.h header file? + */ + +/* #undef HAVE_LANGINFO_H */ + + +/* + * Which encryption libraries do we have? + */ + +/* #undef HAVE_CDSASSL */ +/* #undef HAVE_GNUTLS */ +/* #undef HAVE_LIBSSL */ +/* #undef HAVE_SSL */ + + +/* + * What Security framework headers do we have? + */ + +/* #undef HAVE_AUTHORIZATION_H */ +/* #undef HAVE_SECPOLICY_H */ +/* #undef HAVE_SECPOLICYPRIV_H */ +/* #undef HAVE_SECBASEPRIV_H */ +/* #undef HAVE_SECIDENTITYSEARCHPRIV_H */ + + +/* + * Do we have the SecIdentitySearchCreateWithPolicy function? + */ + +/* #undef HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY */ + + +/* + * Do we have the SLP library? + */ + +/* #undef HAVE_LIBSLP */ + + +/* + * Do we have an LDAP library? + */ + +/* #undef HAVE_LDAP */ +/* #undef HAVE_OPENLDAP */ +/* #undef HAVE_MOZILLA_LDAP */ +/* #undef HAVE_LDAP_SSL_H */ +/* #undef HAVE_LDAP_SSL */ +/* #undef HAVE_LDAP_REBIND_PROC */ + + +/* + * Do we have libpaper? + */ + +/* #undef HAVE_LIBPAPER */ + + +/* + * Do we have DNS Service Discovery (aka Bonjour)? + */ + +#define HAVE_DNSSD 1 + + +/* + * Do we have Darwin's CoreFoundation and SystemConfiguration frameworks? + */ + +/* #undef HAVE_COREFOUNDATION */ +/* #undef HAVE_SYSTEMCONFIGURATION */ + + +/* + * Do we have ? + */ + +/* #undef HAVE_SYS_IOCTL_H */ + + +/* + * Do we have mkstemp() and/or mkstemps()? + */ + +/* #undef HAVE_MKSTEMP */ +/* #undef HAVE_MKSTEMPS */ + + +/* + * Does the "tm" structure contain the "tm_gmtoff" member? + */ + +/* #undef HAVE_TM_GMTOFF */ + + +/* + * Do we have rresvport_af()? + */ + +/* #undef HAVE_RRESVPORT_AF */ + + +/* + * Do we have getaddrinfo()? + */ + +#define HAVE_GETADDRINFO 1 + + +/* + * Do we have getnameinfo()? + */ + +#define HAVE_GETNAMEINFO 1 + + +/* + * Do we have getifaddrs()? + */ + +/* #undef HAVE_GETIFADDRS */ + + +/* + * Do we have hstrerror()? + */ + +/* #undef HAVE_HSTRERROR */ + + +/* + * Do we have res_init()? + */ + +/* #undef HAVE_RES_INIT */ + + +/* + * Do we have + */ + +/* #undef HAVE_RESOLV_H */ + + +/* + * Do we have the header file? + */ + +/* #undef HAVE_SYS_SOCKIO_H */ + + +/* + * Does the sockaddr structure contain an sa_len parameter? + */ + +/* #undef HAVE_STRUCT_SOCKADDR_SA_LEN */ + + +/* + * Do we have the AIX usersec.h header file? + */ + +/* #undef HAVE_USERSEC_H */ + + +/* + * Do we have pthread support? + */ + +/* #undef HAVE_PTHREAD_H */ + + +/* + * Do we have launchd support? + */ + +/* #undef HAVE_LAUNCH_H */ +/* #undef HAVE_LAUNCHD */ +#define CUPS_DEFAULT_LAUNCHD_CONF "" + + +/* + * Various scripting languages... + */ + +/* #undef HAVE_JAVA */ +#define CUPS_JAVA "" +/* #undef HAVE_PERL */ +#define CUPS_PERL "" +/* #undef HAVE_PHP */ +#define CUPS_PHP "" +/* #undef HAVE_PYTHON */ +#define CUPS_PYTHON "" + + +/* + * Location of the poppler/Xpdf pdftops program... + */ + +/* #undef HAVE_PDFTOPS */ +#define CUPS_PDFTOPS "" + + +/* + * Location of the Ghostscript gs program... + */ + +/* #undef HAVE_GHOSTSCRIPT */ +#define CUPS_GHOSTSCRIPT "" + + +/* + * Do we have Darwin's CoreFoundation and SystemConfiguration frameworks? + */ + +/* #undef HAVE_COREFOUNDATION */ +/* #undef HAVE_SYSTEMCONFIGURATION */ + + +/* + * Do we have CoreFoundation public and private headers? + */ + +/* #undef HAVE_COREFOUNDATION_H */ +/* #undef HAVE_CFPRIV_H */ +/* #undef HAVE_CFBUNDLEPRIV_H */ + + +/* + * Do we have MacOSX 10.4's mbr_XXX functions()? + */ + +/* #undef HAVE_MEMBERSHIP_H */ +/* #undef HAVE_MEMBERSHIPPRIV_H */ +/* #undef HAVE_MBR_UID_TO_UUID */ + + +/* + * Do we have Darwin's notify_post() header and function? + */ + +/* #undef HAVE_NOTIFY_H */ +/* #undef HAVE_NOTIFY_POST */ + + +/* + * Do we have DBUS? + */ + +/* #undef HAVE_DBUS */ +/* #undef HAVE_DBUS_MESSAGE_ITER_INIT_APPEND */ + + +/* + * Do we have the AppleTalk/at_proto.h header? + */ + +/* #undef HAVE_APPLETALK_AT_PROTO_H */ + + +/* + * Do we have the GSSAPI support library (for Kerberos support)? + */ + +/* #undef HAVE_GSSAPI */ +/* #undef HAVE_GSSAPI_H */ +/* #undef HAVE_GSSAPI_GSSAPI_H */ +/* #undef HAVE_GSSAPI_GSSAPI_GENERIC_H */ +/* #undef HAVE_GSSAPI_GSSAPI_KRB5_H */ +/* #undef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY */ +/* #undef HAVE_GSS_C_NT_HOSTBASED_SERVICE */ +/* #undef HAVE_KRB5_CC_NEW_UNIQUE */ +/* #undef HAVE_KRB5_IPC_CLIENT_SET_TARGET_UID */ +/* #undef HAVE_KRB5_H */ +/* #undef HAVE_HEIMDAL */ + + +/* + * Default GSS service name... + */ + +#define CUPS_DEFAULT_GSSSERVICENAME "ipp" + + +/* + * Select/poll interfaces... + */ + +/* #undef HAVE_POLL */ +/* #undef HAVE_EPOLL */ +/* #undef HAVE_KQUEUE */ + + +/* + * Do we have the header? + */ + +/* #undef HAVE_DLFCN_H */ + + +/* + * Do we have ? + */ + +/* #undef HAVE_SYS_PARAM_H */ + + +/* + * Do we have ? + */ + +/* #undef HAVE_SYS_UCRED_H */ + + +/* + * Do we have removefile()? + */ + +/* #undef HAVE_REMOVEFILE */ + + +/* + * Do we have ? + */ + +/* #undef HAVE_SANDBOX_H */ + + +/* + * Which random number generator function to use... + */ + +/* #undef HAVE_RANDOM */ +/* #undef HAVE_MRAND48 */ +/* #undef HAVE_LRAND48 */ + + +/* + * Do we have vproc_transaction_begin/end? + */ + +/* #undef HAVE_VPROC_TRANSACTION_BEGIN */ + + +/* + * Do we have libusb? + */ + +/* #undef HAVE_USB_H */ + + +/* + * Do we have libwrap and tcpd.h? + */ + +/* #undef HAVE_TCPD_H */ + + +#endif /* !_CUPS_CONFIG_H_ */ + +/* + * End of "$Id$". + */ diff --git a/vc2005/cups.sln b/vc2005/cups.sln new file mode 100644 index 000000000..a8a8cab3d --- /dev/null +++ b/vc2005/cups.sln @@ -0,0 +1,35 @@ +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual C++ Express 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcups2", "libcups2.vcproj", "{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testfile", "testfile.vcproj", "{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}" + ProjectSection(ProjectDependencies) = postProject + {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3} = {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testhttp", "testhttp.vcproj", "{90B0058C-8393-411F-BD3B-E2C831D4E883}" + ProjectSection(ProjectDependencies) = postProject + {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3} = {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Debug|Win32.ActiveCfg = Debug|Win32 + {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Debug|Win32.Build.0 = Debug|Win32 + {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Release|Win32.ActiveCfg = Release|Win32 + {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Release|Win32.Build.0 = Release|Win32 + {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Debug|Win32.ActiveCfg = Debug|Win32 + {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Debug|Win32.Build.0 = Debug|Win32 + {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Release|Win32.ActiveCfg = Release|Win32 + {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Release|Win32.Build.0 = Release|Win32 + {90B0058C-8393-411F-BD3B-E2C831D4E883}.Debug|Win32.ActiveCfg = Debug|Win32 + {90B0058C-8393-411F-BD3B-E2C831D4E883}.Release|Win32.ActiveCfg = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/vc2005/libcups2.def b/vc2005/libcups2.def new file mode 100644 index 000000000..376fc2d4b --- /dev/null +++ b/vc2005/libcups2.def @@ -0,0 +1,284 @@ +LIBRARY libcups2 +VERSION 2.7 +EXPORTS +_cupsAdminGetServerSettings +_cupsAdminSetServerSettings +_cupsCharmapFlush +_cupsCharmapFree +_cupsCharmapGet +_cupsEncodingName +_cupsGetPassword +_cupsGlobals +_cupsLangPrintf +_cupsLangPuts +_cupsLangString +_cupsMD5Append +_cupsMD5Finish +_cupsMD5Init +_cupsMessageFree +_cupsMessageLoad +_cupsMessageLookup +_cupsSetError +_cupsSetLocale +_cupsStrAlloc +_cupsStrFlush +_cupsStrFormatd +_cupsStrFree +_cupsStrScand +_cupsStrStatistics +_cups_strcpy +_cups_strlcat +_cups_strlcpy +_ippAddAttr +_ippFindOption +_ippFreeAttr +_ppdGetEncoding +cupsAddDest +cupsAddOption +cupsAdminCreateWindowsPPD +cupsAdminExportSamba +cupsArrayAdd +cupsArrayClear +cupsArrayCount +cupsArrayCurrent +cupsArrayDelete +cupsArrayDup +cupsArrayFind +cupsArrayFirst +cupsArrayIndex +cupsArrayInsert +cupsArrayLast +cupsArrayNew +cupsArrayNext +cupsArrayPrev +cupsArrayRemove +cupsArrayRestore +cupsArraySave +cupsArrayUserData +cupsCancelJob +cupsCharsetToUTF8 +cupsDirClose +cupsDirOpen +cupsDirRead +cupsDirRewind +cupsDoAuthentication +cupsDoFileRequest +cupsDoRequest +cupsEncodeOptions +cupsEncodeOptions2 +cupsEncryption +cupsFileClose +cupsFileCompression +cupsFileEOF +cupsFileFind +cupsFileFlush +cupsFileGetChar +cupsFileGetConf +cupsFileGetLine +cupsFileGets +cupsFileLock +cupsFileNumber +cupsFileOpen +cupsFileOpenFd +cupsFilePeekChar +cupsFilePrintf +cupsFilePutChar +cupsFilePuts +cupsFileRead +cupsFileRewind +cupsFileSeek +cupsFileStderr +cupsFileStdin +cupsFileStdout +cupsFileTell +cupsFileUnlock +cupsFileWrite +cupsFreeDests +cupsFreeJobs +cupsFreeOptions +cupsGetClasses +cupsGetDefault +cupsGetDefault2 +cupsGetDest +cupsGetDests +cupsGetDests2 +cupsGetFd +cupsGetFile +cupsGetJobs +cupsGetJobs2 +cupsGetOption +cupsGetPPD +cupsGetPPD2 +cupsGetPassword +cupsGetPrinters +cupsLangDefault +cupsLangEncoding +cupsLangFlush +cupsLangFree +cupsLangGet +cupsLastError +cupsLastErrorString +cupsMarkOptions +cupsNotifySubject +cupsNotifyText +cupsParseOptions +cupsPrintFile +cupsPrintFile2 +cupsPrintFiles +cupsPrintFiles2 +cupsPutFd +cupsPutFile +cupsRemoveOption +cupsServer +cupsSetDests +cupsSetDests2 +cupsSetEncryption +cupsSetPasswordCB +cupsSetServer +cupsSetUser +cupsTempFd +cupsTempFile +cupsTempFile2 +cupsUTF32ToUTF8 +cupsUTF8ToCharset +cupsUTF8ToUTF32 +cupsUser +httpAddrAny +httpAddrConnect +httpAddrEqual +httpAddrFreeList +httpAddrGetList +httpAddrLength +httpAddrLocalhost +httpAddrLookup +httpAddrString +httpAssembleURI +httpAssembleURIf +httpBlocking +httpCheck +httpClearCookie +httpClearFields +httpClose +httpConnect +httpConnectEncrypt +httpDecode64 +httpDecode64_2 +httpDelete +httpEncode64 +httpEncode64_2 +httpEncryption +httpError +httpFlush +httpFlushWrite +httpGet +httpGetBlocking +httpGetCookie +httpGetDateString +httpGetDateString2 +httpGetDateTime +httpGetFd +httpGetField +httpGetHostByName +httpGetHostname +httpGetLength +httpGetLength2 +httpGetStatus +httpGetSubField +httpGetSubField2 +httpGets +httpHead +httpInitialize +httpMD5 +httpMD5Final +httpMD5String +httpOptions +httpPost +httpPrintf +httpPut +httpRead +httpRead2 +httpReconnect +httpSeparate +httpSeparate2 +httpSeparateURI +httpSetCookie +httpSetExpect +httpSetField +httpSetLength +httpStatus +httpTrace +httpUpdate +httpWait +httpWrite +httpWrite2 +ippAddBoolean +ippAddBooleans +ippAddCollection +ippAddCollections +ippAddDate +ippAddInteger +ippAddIntegers +ippAddOctetString +ippAddRange +ippAddRanges +ippAddResolution +ippAddResolutions +ippAddSeparator +ippAddString +ippAddStrings +ippDateToTime +ippDelete +ippDeleteAttribute +ippErrorString +ippErrorValue +ippFindAttribute +ippFindNextAttribute +ippLength +ippNew +ippNewRequest +ippOpString +ippOpValue +ippPort +ippRead +ippReadFile +ippReadIO +ippSetPort +ippTimeToDate +ippWrite +ippWriteFile +ippWriteIO +ppdClose +ppdCollect +ppdCollect2 +ppdConflicts +ppdEmit +ppdEmitAfterOrder +ppdEmitFd +ppdEmitJCL +ppdEmitJCLEnd +ppdEmitString +ppdErrorString +ppdFindAttr +ppdFindChoice +ppdFindCustomOption +ppdFindCustomParam +ppdFindMarkedChoice +ppdFindNextAttr +ppdFindOption +ppdFirstCustomParam +ppdFirstOption +ppdIsMarked +ppdLastError +ppdLocalize +ppdMarkDefaults +ppdMarkOption +ppdNextCustomParam +ppdNextOption +ppdOpen +ppdOpen2 +ppdOpenFd +ppdOpenFile +ppdPageLength +ppdPageSize +ppdPageWidth +ppdSetConformance diff --git a/vc2005/libcups2.vcproj b/vc2005/libcups2.vcproj new file mode 100644 index 000000000..768fedf0e --- /dev/null +++ b/vc2005/libcups2.vcproj @@ -0,0 +1,927 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vc2005/testfile.vcproj b/vc2005/testfile.vcproj new file mode 100644 index 000000000..f1cc6504e --- /dev/null +++ b/vc2005/testfile.vcproj @@ -0,0 +1,202 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vc2005/testhttp.vcproj b/vc2005/testhttp.vcproj new file mode 100644 index 000000000..99b2fe82d --- /dev/null +++ b/vc2005/testhttp.vcproj @@ -0,0 +1,202 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vcnet/config.h b/vcnet/config.h index d9544b344..3579f5b40 100644 --- a/vcnet/config.h +++ b/vcnet/config.h @@ -3,8 +3,8 @@ * * Configuration file for the Common UNIX Printing System (CUPS). * - * Copyright 2007 by Apple Inc. - * Copyright 1997-2005 by Easy Software Products. + * Copyright 2007-2009 by Apple Inc. + * Copyright 1997-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -16,6 +16,41 @@ #ifndef _CUPS_CONFIG_H_ #define _CUPS_CONFIG_H_ +/* + * Include necessary headers... + */ + +#include +#include +#include +#include +#include +#include + + +/* + * Microsoft also renames the POSIX functions to _name, and introduces + * a broken compatibility layer using the original names. As a result, + * random crashes can occur when, for example, strdup() allocates memory + * from a different heap than used by malloc() and free(). + * + * To avoid moronic problems like this, we #define the POSIX function + * names to the corresponding non-standard Microsoft names. + */ + +#define access _access +#define close _close +#define fileno _fileno +#define lseek _lseek +#define open _open +#define read _read +#define snprintf _snprintf +#define strdup _strdup +#define unlink _unlink +#define vsnprintf _vsnprintf +#define write _write + + /* * Compiler stuff... */ @@ -28,30 +63,83 @@ * Version of software... */ -#define CUPS_SVERSION "CUPS v1.2svn" -#define CUPS_MINIMAL "CUPS/1.2svn" +#define CUPS_SVERSION "CUPS v1.4b3" +#define CUPS_MINIMAL "CUPS/1.4b3" /* - * Default user and group... + * Default user and groups... */ #define CUPS_DEFAULT_USER "lp" #define CUPS_DEFAULT_GROUP "sys" +#define CUPS_DEFAULT_SYSTEM_GROUPS "admin" +#define CUPS_DEFAULT_PRINTOPERATOR_AUTH "@admin @lpadmin" + + +/* + * Default file permissions... + */ + +#define CUPS_DEFAULT_CONFIG_FILE_PERM 0644 +#define CUPS_DEFAULT_LOG_FILE_PERM 0644 + + +/* + * Default logging settings... + */ + +#define CUPS_DEFAULT_LOG_LEVEL "warn" +#define CUPS_DEFAULT_ACCESS_LOG_LEVEL "actions" + + +/* + * Default fatal error settings... + */ + +#define CUPS_DEFAULT_FATAL_ERRORS "config" + + +/* + * Default browsing settings... + */ + +#define CUPS_DEFAULT_BROWSING 1 +#define CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS "CUPS dnssd" +#define CUPS_DEFAULT_BROWSE_REMOTE_PROTOCOLS "" +#define CUPS_DEFAULT_BROWSE_SHORT_NAMES 1 +#define CUPS_DEFAULT_DEFAULT_SHARED 1 +#define CUPS_DEFAULT_IMPLICIT_CLASSES 1 +#define CUPS_DEFAULT_USE_NETWORK_DEFAULT 0 /* * Default IPP port... */ -#define CUPS_DEFAULT_IPP_PORT 631 +#define CUPS_DEFAULT_IPP_PORT 631 + + +/* + * Default printcap file... + */ + +#define CUPS_DEFAULT_PRINTCAP "" /* - * Maximum number of file descriptors to support. + * Default Samba and LPD config files... */ -#define CUPS_MAX_FDS 4096 +#define CUPS_DEFAULT_SMB_CONFIG_FILE "" +#define CUPS_DEFAULT_LPD_CONFIG_FILE "" + + +/* + * Default MaxCopies value... + */ + +#define CUPS_DEFAULT_MAX_COPIES 9999 /* @@ -68,26 +156,28 @@ * variables at run-time... */ -#define CUPS_CACHEDIR "C:/CUPS/cache" -#define CUPS_DATADIR "C:/CUPS/share" -#define CUPS_DOCROOT "C:/CUPS/share/doc" -#define CUPS_FONTPATH "C:/CUPS/share/fonts" -#define CUPS_LOCALEDIR "C:/CUPS/locale" -#define CUPS_LOGDIR "C:/CUPS/logs" -#define CUPS_REQUESTS "C:/CUPS/spool" -#define CUPS_SERVERBIN "C:/CUPS/lib" -#define CUPS_SERVERROOT "C:/CUPS/etc" -#define CUPS_STATEDIR "C:/CUPS/run" +#define CUPS_BINDIR "C:/CUPS/bin" +#define CUPS_CACHEDIR "C:/CUPS/cache" +#define CUPS_DATADIR "C:/CUPS/share" +#define CUPS_DOCROOT "C:/CUPS/share/doc" +#define CUPS_FONTPATH "C:/CUPS/share/fonts" +#define CUPS_LOCALEDIR "C:/CUPS/locale" +#define CUPS_LOGDIR "C:/CUPS/logs" +#define CUPS_REQUESTS "C:/CUPS/spool" +#define CUPS_SBINDIR "C:/CUPS/sbin" +#define CUPS_SERVERBIN "C:/CUPS/lib" +#define CUPS_SERVERROOT "C:/CUPS/etc" +#define CUPS_STATEDIR "C:/CUPS/run" /* * Do we have various image libraries? */ -#undef HAVE_LIBPNG -#undef HAVE_LIBZ -#undef HAVE_LIBJPEG -#undef HAVE_LIBTIFF +/* #undef HAVE_LIBPNG */ +/* #undef HAVE_LIBZ */ +/* #undef HAVE_LIBJPEG */ +/* #undef HAVE_LIBTIFF */ /* @@ -98,37 +188,39 @@ #define HAVE_LIBPAM 0 #endif /* !HAVE_LIBPAM */ -#undef HAVE_PAM_PAM_APPL_H +/* #undef HAVE_PAM_PAM_APPL_H */ +/* #undef HAVE_PAM_SET_ITEM */ +/* #undef HAVE_PAM_SETCRED */ /* * Do we have ? */ -#undef HAVE_SHADOW_H +/* #undef HAVE_SHADOW_H */ /* * Do we have ? */ -#undef HAVE_CRYPT_H +/* #undef HAVE_CRYPT_H */ /* * Use , , and/or ? */ -#define HAVE_STRING_H -#undef HAVE_STRINGS_H -#undef HAVE_BSTRING_H +#define HAVE_STRING_H 1 +/* #undef HAVE_STRINGS_H */ +/* #undef HAVE_BSTRING_H */ /* * Do we have the long long type? */ -#undef HAVE_LONG_LONG +/* #undef HAVE_LONG_LONG */ #ifdef HAVE_LONG_LONG # define CUPS_LLFMT "%lld" @@ -143,7 +235,7 @@ * Do we have the strtoll() function? */ -#undef HAVE_STRTOLL +/* #undef HAVE_STRTOLL */ #ifndef HAVE_STRTOLL # define strtoll(nptr,endptr,base) strtol((nptr), (endptr), (base)) @@ -157,183 +249,422 @@ #define HAVE_STRDUP #define HAVE_STRCASECMP #define HAVE_STRNCASECMP -#undef HAVE_STRLCAT -#undef HAVE_STRLCPY +/* #undef HAVE_STRLCAT */ +/* #undef HAVE_STRLCPY */ /* * Do we have the geteuid() function? */ -#undef HAVE_GETEUID +/* #undef HAVE_GETEUID */ /* * Do we have the vsyslog() function? */ -#undef HAVE_VSYSLOG +/* #undef HAVE_VSYSLOG */ /* * Do we have the (v)snprintf() functions? */ -#undef HAVE_SNPRINTF -#undef HAVE_VSNPRINTF +#define HAVE_SNPRINTF 1 +#define HAVE_VSNPRINTF 1 /* * What signal functions to use? */ -#undef HAVE_SIGSET -#undef HAVE_SIGACTION +/* #undef HAVE_SIGSET */ +/* #undef HAVE_SIGACTION */ /* * What wait functions to use? */ -#undef HAVE_WAITPID -#undef HAVE_WAIT3 +/* #undef HAVE_WAITPID */ +/* #undef HAVE_WAIT3 */ /* * Do we have the mallinfo function and malloc.h? */ -#undef HAVE_MALLINFO -#undef HAVE_MALLOC_H +/* #undef HAVE_MALLINFO */ +/* #undef HAVE_MALLOC_H */ + + +/* + * Do we have the POSIX ACL functions? + */ + +/* #undef HAVE_ACL_INIT */ /* * Do we have the langinfo.h header file? */ -#undef HAVE_LANGINFO_H +/* #undef HAVE_LANGINFO_H */ /* * Which encryption libraries do we have? */ -#undef HAVE_CDSASSL -#undef HAVE_GNUTLS -#undef HAVE_LIBSSL -#undef HAVE_SSL +/* #undef HAVE_CDSASSL */ +/* #undef HAVE_GNUTLS */ +/* #undef HAVE_LIBSSL */ +/* #undef HAVE_SSL */ + + +/* + * What Security framework headers do we have? + */ + +/* #undef HAVE_AUTHORIZATION_H */ +/* #undef HAVE_SECPOLICY_H */ +/* #undef HAVE_SECPOLICYPRIV_H */ +/* #undef HAVE_SECBASEPRIV_H */ +/* #undef HAVE_SECIDENTITYSEARCHPRIV_H */ + + +/* + * Do we have the SecIdentitySearchCreateWithPolicy function? + */ + +/* #undef HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY */ + + +/* + * Do we have the SLP library? + */ + +/* #undef HAVE_LIBSLP */ /* - * Do we have the OpenSLP library? + * Do we have an LDAP library? */ -#undef HAVE_LIBSLP +/* #undef HAVE_LDAP */ +/* #undef HAVE_OPENLDAP */ +/* #undef HAVE_MOZILLA_LDAP */ +/* #undef HAVE_LDAP_SSL_H */ +/* #undef HAVE_LDAP_SSL */ +/* #undef HAVE_LDAP_REBIND_PROC */ /* * Do we have libpaper? */ -#undef HAVE_LIBPAPER +/* #undef HAVE_LIBPAPER */ + + +/* + * Do we have DNS Service Discovery (aka Bonjour)? + */ + +/* #undef HAVE_DNSSD */ + + +/* + * Do we have Darwin's CoreFoundation and SystemConfiguration frameworks? + */ + +/* #undef HAVE_COREFOUNDATION */ +/* #undef HAVE_SYSTEMCONFIGURATION */ /* * Do we have ? */ -#undef HAVE_SYS_IOCTL_H +/* #undef HAVE_SYS_IOCTL_H */ /* * Do we have mkstemp() and/or mkstemps()? */ -#undef HAVE_MKSTEMP -#undef HAVE_MKSTEMPS +/* #undef HAVE_MKSTEMP */ +/* #undef HAVE_MKSTEMPS */ /* * Does the "tm" structure contain the "tm_gmtoff" member? */ -#undef HAVE_TM_GMTOFF +/* #undef HAVE_TM_GMTOFF */ /* * Do we have rresvport_af()? */ -#undef HAVE_RRESVPORT_AF +/* #undef HAVE_RRESVPORT_AF */ /* * Do we have getaddrinfo()? */ -#define HAVE_GETADDRINFO +#define HAVE_GETADDRINFO 1 /* * Do we have getnameinfo()? */ -#define HAVE_GETNAMEINFO +#define HAVE_GETNAMEINFO 1 /* * Do we have getifaddrs()? */ -#undef HAVE_GETIFADDRS +/* #undef HAVE_GETIFADDRS */ /* * Do we have hstrerror()? */ -#undef HAVE_HSTRERROR +/* #undef HAVE_HSTRERROR */ + + +/* + * Do we have res_init()? + */ + +/* #undef HAVE_RES_INIT */ + + +/* + * Do we have + */ + +/* #undef HAVE_RESOLV_H */ /* * Do we have the header file? */ -#undef HAVE_SYS_SOCKIO_H +/* #undef HAVE_SYS_SOCKIO_H */ /* * Does the sockaddr structure contain an sa_len parameter? */ -#undef HAVE_STRUCT_SOCKADDR_SA_LEN +/* #undef HAVE_STRUCT_SOCKADDR_SA_LEN */ /* * Do we have the AIX usersec.h header file? */ -#undef HAVE_USERSEC_H +/* #undef HAVE_USERSEC_H */ + /* * Do we have pthread support? */ -#undef HAVE_PTHREAD_H +/* #undef HAVE_PTHREAD_H */ + + +/* + * Do we have launchd support? + */ + +/* #undef HAVE_LAUNCH_H */ +/* #undef HAVE_LAUNCHD */ +#define CUPS_DEFAULT_LAUNCHD_CONF "" /* * Various scripting languages... */ -#undef HAVE_JAVA -#define CUPS_JAVA "/usr/bin/java" -#undef HAVE_PERL -#define CUPS_PERL "/usr/bin/perl" -#undef HAVE_PHP -#define CUPS_PHP "/usr/bin/php" -#undef HAVE_PYTHON -#define CUPS_PYTHON "/usr/bin/python" +/* #undef HAVE_JAVA */ +#define CUPS_JAVA "" +/* #undef HAVE_PERL */ +#define CUPS_PERL "" +/* #undef HAVE_PHP */ +#define CUPS_PHP "" +/* #undef HAVE_PYTHON */ +#define CUPS_PYTHON "" + + +/* + * Location of the poppler/Xpdf pdftops program... + */ + +/* #undef HAVE_PDFTOPS */ +#define CUPS_PDFTOPS "" + + +/* + * Location of the Ghostscript gs program... + */ + +/* #undef HAVE_GHOSTSCRIPT */ +#define CUPS_GHOSTSCRIPT "" + + +/* + * Do we have Darwin's CoreFoundation and SystemConfiguration frameworks? + */ + +/* #undef HAVE_COREFOUNDATION */ +/* #undef HAVE_SYSTEMCONFIGURATION */ + + +/* + * Do we have CoreFoundation public and private headers? + */ + +/* #undef HAVE_COREFOUNDATION_H */ +/* #undef HAVE_CFPRIV_H */ +/* #undef HAVE_CFBUNDLEPRIV_H */ + + +/* + * Do we have MacOSX 10.4's mbr_XXX functions()? + */ + +/* #undef HAVE_MEMBERSHIP_H */ +/* #undef HAVE_MEMBERSHIPPRIV_H */ +/* #undef HAVE_MBR_UID_TO_UUID */ + + +/* + * Do we have Darwin's notify_post() header and function? + */ + +/* #undef HAVE_NOTIFY_H */ +/* #undef HAVE_NOTIFY_POST */ + + +/* + * Do we have DBUS? + */ + +/* #undef HAVE_DBUS */ +/* #undef HAVE_DBUS_MESSAGE_ITER_INIT_APPEND */ + + +/* + * Do we have the AppleTalk/at_proto.h header? + */ + +/* #undef HAVE_APPLETALK_AT_PROTO_H */ + + +/* + * Do we have the GSSAPI support library (for Kerberos support)? + */ + +/* #undef HAVE_GSSAPI */ +/* #undef HAVE_GSSAPI_H */ +/* #undef HAVE_GSSAPI_GSSAPI_H */ +/* #undef HAVE_GSSAPI_GSSAPI_GENERIC_H */ +/* #undef HAVE_GSSAPI_GSSAPI_KRB5_H */ +/* #undef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY */ +/* #undef HAVE_GSS_C_NT_HOSTBASED_SERVICE */ +/* #undef HAVE_KRB5_CC_NEW_UNIQUE */ +/* #undef HAVE_KRB5_IPC_CLIENT_SET_TARGET_UID */ +/* #undef HAVE_KRB5_H */ +/* #undef HAVE_HEIMDAL */ + + +/* + * Default GSS service name... + */ + +#define CUPS_DEFAULT_GSSSERVICENAME "ipp" + + +/* + * Select/poll interfaces... + */ + +/* #undef HAVE_POLL */ +/* #undef HAVE_EPOLL */ +/* #undef HAVE_KQUEUE */ + + +/* + * Do we have the header? + */ + +/* #undef HAVE_DLFCN_H */ + + +/* + * Do we have ? + */ + +/* #undef HAVE_SYS_PARAM_H */ + + +/* + * Do we have ? + */ + +/* #undef HAVE_SYS_UCRED_H */ + + +/* + * Do we have removefile()? + */ + +/* #undef HAVE_REMOVEFILE */ + + +/* + * Do we have ? + */ + +/* #undef HAVE_SANDBOX_H */ + + +/* + * Which random number generator function to use... + */ + +/* #undef HAVE_RANDOM */ +/* #undef HAVE_MRAND48 */ +/* #undef HAVE_LRAND48 */ + + +/* + * Do we have vproc_transaction_begin/end? + */ + +/* #undef HAVE_VPROC_TRANSACTION_BEGIN */ + + +/* + * Do we have libusb? + */ + +/* #undef HAVE_USB_H */ + + +/* + * Do we have libwrap and tcpd.h? + */ + +/* #undef HAVE_TCPD_H */ #endif /* !_CUPS_CONFIG_H_ */ diff --git a/vcnet/cups.sln b/vcnet/cups.sln index 24e837d67..7b0711613 100644 --- a/vcnet/cups.sln +++ b/vcnet/cups.sln @@ -1,41 +1,37 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual C++ Express 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcups2", "libcups2.vcproj", "{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testfile", "testfile.vcproj", "{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}" ProjectSection(ProjectDependencies) = postProject {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3} = {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testhttp", "testhttp.vcproj", "{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testhttp", "testhttp.vcproj", "{CB1F378C-ED31-4DAC-9379-599E853419CB}" ProjectSection(ProjectDependencies) = postProject {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3} = {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3} EndProjectSection EndProject Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Debug.ActiveCfg = Debug|Win32 - {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Debug.Build.0 = Debug|Win32 - {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Release.ActiveCfg = Release|Win32 - {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Release.Build.0 = Release|Win32 - {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Debug.ActiveCfg = Debug|Win32 - {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Debug.Build.0 = Debug|Win32 - {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Release.ActiveCfg = Release|Win32 - {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Release.Build.0 = Release|Win32 - {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Debug.ActiveCfg = Debug|Win32 - {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Debug.Build.0 = Debug|Win32 - {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Release.ActiveCfg = Release|Win32 - {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Release.Build.0 = Release|Win32 + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Debug|Win32.ActiveCfg = Debug|Win32 + {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Debug|Win32.Build.0 = Debug|Win32 + {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Release|Win32.ActiveCfg = Release|Win32 + {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Release|Win32.Build.0 = Release|Win32 + {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Debug|Win32.ActiveCfg = Debug|Win32 + {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Debug|Win32.Build.0 = Debug|Win32 + {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Release|Win32.ActiveCfg = Release|Win32 + {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Release|Win32.Build.0 = Release|Win32 + {CB1F378C-ED31-4DAC-9379-599E853419CB}.Debug|Win32.ActiveCfg = Debug|Win32 + {CB1F378C-ED31-4DAC-9379-599E853419CB}.Debug|Win32.Build.0 = Debug|Win32 + {CB1F378C-ED31-4DAC-9379-599E853419CB}.Release|Win32.ActiveCfg = Release|Win32 + {CB1F378C-ED31-4DAC-9379-599E853419CB}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection EndGlobal diff --git a/vcnet/libcups2.def b/vcnet/libcups2.def index 6849f29f2..376fc2d4b 100644 --- a/vcnet/libcups2.def +++ b/vcnet/libcups2.def @@ -26,11 +26,9 @@ _cupsStrFormatd _cupsStrFree _cupsStrScand _cupsStrStatistics -_cups_snprintf _cups_strcpy _cups_strlcat _cups_strlcpy -_cups_vsnprintf _ippAddAttr _ippFindOption _ippFreeAttr @@ -57,9 +55,6 @@ cupsArrayRemove cupsArrayRestore cupsArraySave cupsArrayUserData -cupsBackChannelRead -cupsBackChannelWrite -cupsBackendDeviceURI cupsCancelJob cupsCharsetToUTF8 cupsDirClose diff --git a/vcnet/libcups2.vcproj b/vcnet/libcups2.vcproj index af51e1e0b..6a4a824e4 100644 --- a/vcnet/libcups2.vcproj +++ b/vcnet/libcups2.vcproj @@ -1,119 +1,183 @@ + RootNamespace="libcups2" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="false" + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> - + Name="VCPostBuildEventTool" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + /> + + + Name="VCPreLinkEventTool" + /> + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> - - - + Name="VCPostBuildEventTool" + /> @@ -122,560 +186,740 @@ + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + RelativePath="..\cups\adminutil.c" + > + RelativePath="..\cups\array.c" + > + Name="Debug|Win32" + > + PreprocessorDefinitions="WIN32" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="WIN32" + /> + RelativePath="..\cups\attr.c" + > + Name="Debug|Win32" + > + PreprocessorDefinitions="WIN32" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="WIN32" + /> + RelativePath="..\cups\auth.c" + > + Name="Debug|Win32" + > + PreprocessorDefinitions="WIN32" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="WIN32" + /> - - - - - - + RelativePath="..\cups\conflicts.c" + > + RelativePath="..\cups\custom.c" + > + RelativePath="..\cups\debug.c" + > + RelativePath="..\cups\dest.c" + > + Name="Debug|Win32" + > + PreprocessorDefinitions="WIN32" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="WIN32" + /> + RelativePath="..\cups\dir.c" + > + Name="Debug|Win32" + > + PreprocessorDefinitions="WIN32" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="WIN32" + /> + RelativePath="..\cups\emit.c" + > + Name="Debug|Win32" + > + PreprocessorDefinitions="WIN32" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="WIN32" + /> + RelativePath="..\cups\encode.c" + > + Name="Debug|Win32" + > + PreprocessorDefinitions="WIN32" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="WIN32" + /> + RelativePath="..\cups\file.c" + > + Name="Debug|Win32" + > + PreprocessorDefinitions="WIN32" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="WIN32" + /> + RelativePath="..\cups\getdevices.c" + > + + + Name="Debug|Win32" + > + PreprocessorDefinitions="WIN32" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="WIN32" + /> + RelativePath="..\cups\globals.c" + > + Name="Debug|Win32" + > + PreprocessorDefinitions="WIN32" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="WIN32" + /> + RelativePath="..\cups\http-addr.c" + > + Name="Debug|Win32" + > + PreprocessorDefinitions="WIN32" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="WIN32" + /> + RelativePath="..\cups\http-addrlist.c" + > + Name="Debug|Win32" + > + PreprocessorDefinitions="WIN32" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="WIN32" + /> + RelativePath="..\cups\http-support.c" + > + Name="Debug|Win32" + > + PreprocessorDefinitions="WIN32" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="WIN32" + /> + RelativePath="..\cups\http.c" + > + Name="Debug|Win32" + > + PreprocessorDefinitions="WIN32" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="WIN32" + /> + RelativePath="..\cups\ipp-support.c" + > + Name="Debug|Win32" + > + PreprocessorDefinitions="WIN32" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="WIN32" + /> + RelativePath="..\cups\ipp.c" + > + Name="Debug|Win32" + > + PreprocessorDefinitions="WIN32" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="WIN32" + /> + RelativePath="..\cups\langprintf.c" + > + Name="Debug|Win32" + > + PreprocessorDefinitions="WIN32" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="WIN32" + /> + RelativePath="..\cups\language.c" + > + Name="Debug|Win32" + > + PreprocessorDefinitions="WIN32" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="WIN32" + /> + RelativePath="..\cups\localize.c" + > + RelativePath="..\cups\mark.c" + > + Name="Debug|Win32" + > + PreprocessorDefinitions="WIN32" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="WIN32" + /> + RelativePath="..\cups\md5.c" + > + Name="Debug|Win32" + > + PreprocessorDefinitions="WIN32" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="WIN32" + /> + RelativePath="..\cups\md5passwd.c" + > + Name="Debug|Win32" + > + PreprocessorDefinitions="WIN32" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="WIN32" + /> + RelativePath="..\cups\notify.c" + > + RelativePath="..\cups\options.c" + > + Name="Debug|Win32" + > + PreprocessorDefinitions="WIN32" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="WIN32" + /> + RelativePath="..\cups\page.c" + > + Name="Debug|Win32" + > + PreprocessorDefinitions="WIN32" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="WIN32" + /> + RelativePath="..\cups\ppd.c" + > + Name="Debug|Win32" + > + PreprocessorDefinitions="WIN32" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="WIN32" + /> + RelativePath="..\cups\pwgmedia.c" + > + + + + + RelativePath="..\cups\snprintf.c" + > + Name="Debug|Win32" + > + PreprocessorDefinitions="WIN32" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="WIN32" + /> + RelativePath="..\cups\string.c" + > + Name="Debug|Win32" + > + PreprocessorDefinitions="WIN32" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="WIN32" + /> + RelativePath="..\cups\tempfile.c" + > + Name="Debug|Win32" + > + PreprocessorDefinitions="WIN32" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="WIN32" + /> + RelativePath="..\cups\transcode.c" + > + Name="Debug|Win32" + > + PreprocessorDefinitions="WIN32" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="WIN32" + /> + RelativePath="..\cups\usersys.c" + > + Name="Debug|Win32" + > + PreprocessorDefinitions="WIN32" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="WIN32" + /> + RelativePath="..\cups\util.c" + > + Name="Debug|Win32" + > + PreprocessorDefinitions="WIN32" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="WIN32" + /> + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + RelativePath="..\cups\adminutil.h" + > + RelativePath="..\cups\array.h" + > + RelativePath="..\cups\backend.h" + > + RelativePath="..\cups\cups.h" + > + RelativePath="..\cups\debug.h" + > + RelativePath="..\cups\dir.h" + > + RelativePath="..\cups\file.h" + > + RelativePath="..\cups\globals.h" + > + RelativePath="..\cups\http-private.h" + > + RelativePath="..\cups\http.h" + > + RelativePath="..\cups\i18n.h" + > + RelativePath="..\cups\ipp-private.h" + > + RelativePath="..\cups\ipp.h" + > + RelativePath="..\cups\language.h" + > + RelativePath="..\cups\md5-apple.h" + > + RelativePath="..\cups\md5.h" + > + RelativePath="..\cups\normalize.h" + > + RelativePath="..\cups\ppd.h" + > + RelativePath="..\cups\string.h" + > + RelativePath="..\cups\transcode.h" + > + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > diff --git a/vcnet/testfile.vcproj b/vcnet/testfile.vcproj index 30473a73d..0b2b9d664 100644 --- a/vcnet/testfile.vcproj +++ b/vcnet/testfile.vcproj @@ -1,70 +1,121 @@ + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - - + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="0" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - - + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> @@ -113,20 +176,24 @@ + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + RelativePath="..\cups\testfile.c" + > + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > diff --git a/vcnet/testhttp.vcproj b/vcnet/testhttp.vcproj index 310f64119..ab16007b3 100755 --- a/vcnet/testhttp.vcproj +++ b/vcnet/testhttp.vcproj @@ -1,70 +1,121 @@ + ProjectGUID="{CB1F378C-ED31-4DAC-9379-599E853419CB}" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - - + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="0" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - - + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> @@ -113,20 +176,24 @@ + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + RelativePath="..\cups\testhttp.c" + > + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > -- 2.39.2