]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
Merge changes from CUPS 1.4svn-r8639.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Thu, 14 May 2009 22:48:33 +0000 (22:48 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Thu, 14 May 2009 22:48:33 +0000 (22:48 +0000)
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1505 a1ca3aef-8c08-0410-bb20-df032aa958be

31 files changed:
CHANGES.txt
backend/usb-darwin.c
config.h.in
cups/backchannel.c
cups/debug.c
cups/dir.c
cups/file.c
cups/globals.c
cups/http.c
cups/ipp.c
cups/langprintf.c
cups/sidechannel.c
cups/snmp.c
cups/string.h
cups/testfile.c
cups/transcode.c
scheduler/dirsvc.c
scheduler/dirsvc.h
scheduler/ipp.c
vc2005/config.h [new file with mode: 0644]
vc2005/cups.sln [new file with mode: 0644]
vc2005/libcups2.def [new file with mode: 0644]
vc2005/libcups2.vcproj [new file with mode: 0644]
vc2005/testfile.vcproj [new file with mode: 0644]
vc2005/testhttp.vcproj [new file with mode: 0644]
vcnet/config.h
vcnet/cups.sln
vcnet/libcups2.def
vcnet/libcups2.vcproj
vcnet/testfile.vcproj
vcnet/testhttp.vcproj

index dc4ea588cd976ec6107e9a0c3dd6122296c193ed..5bb09763042e743bd8e7430d8382c30d577265a0 100644 (file)
@@ -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)
index 9dcd2c6eec814c0c2cb24f66b7ee0d33148c73f0..2fc7a27d38ebf93838ad0a144a869705efed8484 100644 (file)
@@ -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");
index da096f59cc6418e4b9efe8e967b16274a4d22441..5aceeb6d8a548dbae0cf03dc30599672d0f343cc 100644 (file)
 
 #undef HAVE_USERSEC_H
 
+
 /*
  * Do we have pthread support?
  */
index b264b5c89365b8e2789b8126fd4def7b1993d51a..44d8b574b604106841cacc5ff9df19a899bd4faa 100644 (file)
@@ -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 */
index 74f77ffd4915fae2b398b6f23cd502875386b814..f3d2f1c5b5487c85a86629de414f130c787c123e 100644 (file)
 
 #include "globals.h"
 #include "debug.h"
-#include <sys/time.h>
+#ifdef WIN32
+#  include <io.h>
+#else
+#  include <sys/time.h>
+#  include <unistd.h>
+#endif /* WIN32 */
 #include <fcntl.h>
-#include <unistd.h>
-#include <regex.h>
+#ifndef WIN32
+#  include <regex.h>
+#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;
index 5cb4d060e5d008c3272e661855e4d2b698d57861..73090941ea65a02ec16c62adbbc33841a3581a19 100644 (file)
@@ -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));
 }
 
index 68e854de399912afb6608c9f86f2d3a3941428e8..08445bea4ed66e58d135f33fd513855f88ca1e15 100644 (file)
@@ -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 */
index e9e863313f00856616d6eb3f084e4dad113c0eed..4e49109fc9d2bc41dbc40a24cd42347e5da5dc78 100644 (file)
@@ -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);
   }
index ddb2f3a83b3baf9eddae46c1ca1de14852e6d38a..a607581a4d8991b18378a4a1c10754f1512374b2 100644 (file)
@@ -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);
 
index c3e8a8f12432ca4a640df69d3f63d53b28d8f396..70fb41f3813afbe73d46d7510e01f5775585adc7 100644 (file)
@@ -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;
index 0b4420f7b9f14d8c20481610e3d546705373053f..d8816df0a39da2c9705e99fae49e49515b7a18e4 100644 (file)
@@ -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));
 
  /*
index 92aeb9d9bdeab5d9bffb6340b40cc8b358c63914..0f51fd1bd24ee1efac096495224fb2c844a5f6b4 100644 (file)
 #include "sidechannel.h"
 #include "string.h"
 #include "debug.h"
-#include <unistd.h>
+#ifdef WIN32
+#  include <io.h>
+#else
+#  include <unistd.h>
+#endif /* WIN32 */
 #include <errno.h>
 #ifdef __hpux
 #  include <sys/time.h>
-#else
+#elif !defined(WIN32)
 #  include <sys/select.h>
 #endif /* __hpux */
 #ifndef WIN32
index 43722ba7dbb8bbbc6114ec30bc299d2ee61fcc23..d37582b96bcd116ee9e5da9ad75f253e01356c48 100644 (file)
@@ -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);
index ac236a2b99ffcf2692acd792bc6a3a3eed36e0b4..d8bd8e3e2a4ab6c12961f994d7ea5e5b12c0d6d5 100644 (file)
@@ -48,8 +48,8 @@
  */
 
 #  if defined(WIN32) || defined(__EMX__)
-#    define strcasecmp stricmp
-#    define strncasecmp        strnicmp
+#    define strcasecmp _stricmp
+#    define strncasecmp        _strnicmp
 #  endif /* WIN32 || __EMX__ */
 
 
index 3918237708686ff1a83eff31fbf97f4f596d0980..43751f116e5d58126ef23b035f144adb0d11047a 100644 (file)
 #ifdef HAVE_LIBZ
 #  include <zlib.h>
 #endif /* HAVE_LIBZ */
-#include <unistd.h>
+#ifdef WIN32
+#  include <io.h>
+#else
+#  include <unistd.h>
+#endif /* WIN32 */
 #include <fcntl.h>
 
 
index 4e7a794cbe33e735cadbc692bbe02cd791e99c05..fed9c9492b20cb78f2582f9c4c524d3da890d425 100644 (file)
@@ -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]));
index 29ff94743340c685a57883dff6abb66e3ea2771f..89bcaefbf1bf52f03ee6fd717272175caedfb1b9 100644 (file)
@@ -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));
 
index 1fae4d3cc6d41b4abdd2727acb09dace7a759ac2..c17a2540671187a979826f2967edfa4bd0f08e5d 100644 (file)
@@ -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);
index 637d760b4fdf7120c6b68a88a485cbad2cfe0d7c..344e2c254b4213c9a5a6b0736d93e1657b7aa13b 100644 (file)
@@ -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 (file)
index 0000000..9137483
--- /dev/null
@@ -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 <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <ctype.h>
+#include <io.h>
+
+
+/*
+ * 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 <shadow.h>?
+ */
+
+/* #undef HAVE_SHADOW_H */
+
+
+/*
+ * Do we have <crypt.h>?
+ */
+
+/* #undef HAVE_CRYPT_H */
+
+
+/*
+ * Use <string.h>, <strings.h>, and/or <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 */
+
+#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 <sys/ioctl.h>?
+ */
+
+/* #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 <resolv.h>
+ */
+
+/* #undef HAVE_RESOLV_H */
+
+
+/*
+ * Do we have the <sys/sockio.h> 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 <dlfcn.h> header?
+ */
+
+/* #undef HAVE_DLFCN_H */
+
+
+/*
+ * Do we have <sys/param.h>?
+ */
+
+/* #undef HAVE_SYS_PARAM_H */
+
+
+/*
+ * Do we have <sys/ucred.h>?
+ */
+
+/* #undef HAVE_SYS_UCRED_H */
+
+
+/*
+ * Do we have removefile()?
+ */
+
+/* #undef HAVE_REMOVEFILE */
+
+
+/*
+ * Do we have <sandbox.h>?
+ */
+
+/* #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 (file)
index 0000000..a8a8cab
--- /dev/null
@@ -0,0 +1,35 @@
+Microsoft Visual Studio Solution File, Format Version 9.00\r
+# Visual C++ Express 2005\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcups2", "libcups2.vcproj", "{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testfile", "testfile.vcproj", "{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3} = {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testhttp", "testhttp.vcproj", "{90B0058C-8393-411F-BD3B-E2C831D4E883}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3} = {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}\r
+       EndProjectSection\r
+EndProject\r
+Global\r
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug|Win32 = Debug|Win32\r
+               Release|Win32 = Release|Win32\r
+       EndGlobalSection\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Debug|Win32.Build.0 = Debug|Win32\r
+               {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Release|Win32.ActiveCfg = Release|Win32\r
+               {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Release|Win32.Build.0 = Release|Win32\r
+               {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Debug|Win32.Build.0 = Debug|Win32\r
+               {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Release|Win32.ActiveCfg = Release|Win32\r
+               {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Release|Win32.Build.0 = Release|Win32\r
+               {90B0058C-8393-411F-BD3B-E2C831D4E883}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {90B0058C-8393-411F-BD3B-E2C831D4E883}.Release|Win32.ActiveCfg = Release|Win32\r
+       EndGlobalSection\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
+       EndGlobalSection\r
+EndGlobal\r
diff --git a/vc2005/libcups2.def b/vc2005/libcups2.def
new file mode 100644 (file)
index 0000000..376fc2d
--- /dev/null
@@ -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 (file)
index 0000000..768fedf
--- /dev/null
@@ -0,0 +1,927 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="libcups2"\r
+       ProjectGUID="{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="Debug"\r
+                       IntermediateDirectory="Debug"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\vcnet,.."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="false"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib advapi32.lib"\r
+                               OutputFile="Debug\libcups2.dll"\r
+                               LinkIncremental="2"\r
+                               ModuleDefinitionFile="..\vcnet\libcups2.def"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="Debug\libcups2.pdb"\r
+                               SubSystem="2"\r
+                               ImportLibrary="Debug\libcups2.lib"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="Release"\r
+                       IntermediateDirectory="Release"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="1"\r
+                               AdditionalIncludeDirectories="..\vcnet,.."\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="false"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib advapi32.lib"\r
+                               OutputFile="libcups2.dll"\r
+                               LinkIncremental="1"\r
+                               ModuleDefinitionFile="..\vcnet\libcups2.def"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="libcups2.pdb"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               ImportLibrary="libcups2.lib"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\cups\adminutil.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\array.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\attr.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\auth.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\backend.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\conflicts.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\custom.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\dest.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\dir.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\emit.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\encode.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\file.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\getdevices.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\getputfile.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\globals.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\http-addr.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\http-addrlist.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\http-support.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\http.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\ipp-support.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\ipp.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\langprintf.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\language.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\localize.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\mark.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\md5.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\md5passwd.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\notify.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\options.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\page.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\ppd.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\pwgmedia.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\request.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\snmp.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\snprintf.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\string.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\tempfile.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\transcode.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\usersys.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\util.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\cups\adminutil.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\array.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\backend.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\cups.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\debug.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\dir.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\file.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\globals.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\http-private.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\http.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\i18n.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\ipp-private.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\ipp.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\language.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\md5-apple.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\md5.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\normalize.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\ppd.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\string.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\transcode.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/vc2005/testfile.vcproj b/vc2005/testfile.vcproj
new file mode 100644 (file)
index 0000000..f1cc650
--- /dev/null
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="testfile"\r
+       ProjectGUID="{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="Debug"\r
+                       IntermediateDirectory="Debug"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\vcnet;.."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="1"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="Debug\testfile.exe"\r
+                               LinkIncremental="2"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="$(OutDir)/testfile.pdb"\r
+                               SubSystem="1"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="Release"\r
+                       IntermediateDirectory="Release"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="..\vcnet;.."\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
+                               RuntimeLibrary="0"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="0"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="testfile.exe"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\cups\testfile.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/vc2005/testhttp.vcproj b/vc2005/testhttp.vcproj
new file mode 100644 (file)
index 0000000..99b2fe8
--- /dev/null
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="testhttp"\r
+       ProjectGUID="{90B0058C-8393-411F-BD3B-E2C831D4E883}"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="Debug"\r
+                       IntermediateDirectory="Debug"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\vcnet;.."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="1"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="Debug\testhttp.exe"\r
+                               LinkIncremental="2"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="$(OutDir)/testhttp.pdb"\r
+                               SubSystem="1"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="Release"\r
+                       IntermediateDirectory="Release"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="..\vcnet;.."\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
+                               RuntimeLibrary="0"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="0"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="testhttp.exe"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\cups\testhttp.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
index d9544b3447d59dd2f210095d68ea6166cedceb74..3579f5b4055469c2293558fd38b93aa77f97b893 100644 (file)
@@ -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
 #ifndef _CUPS_CONFIG_H_
 #define _CUPS_CONFIG_H_
 
+/*
+ * Include necessary headers...
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <ctype.h>
+#include <io.h>
+
+
+/*
+ * 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...
  */
  * 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
 
 
 /*
  *       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 */
 
 
 /*
 #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 <shadow.h>?
  */
 
-#undef HAVE_SHADOW_H
+/* #undef HAVE_SHADOW_H */
 
 
 /*
  * Do we have <crypt.h>?
  */
 
-#undef HAVE_CRYPT_H
+/* #undef HAVE_CRYPT_H */
 
 
 /*
  * Use <string.h>, <strings.h>, and/or <bstring.h>?
  */
 
-#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"
  * Do we have the strtoll() function?
  */
 
-#undef HAVE_STRTOLL
+/* #undef HAVE_STRTOLL */
 
 #ifndef HAVE_STRTOLL
 #  define strtoll(nptr,endptr,base) strtol((nptr), (endptr), (base))
 #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 <sys/ioctl.h>?
  */
 
-#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 <resolv.h>
+ */
+
+/* #undef HAVE_RESOLV_H */
 
 
 /*
  * Do we have the <sys/sockio.h> 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 <dlfcn.h> header?
+ */
+
+/* #undef HAVE_DLFCN_H */
+
+
+/*
+ * Do we have <sys/param.h>?
+ */
+
+/* #undef HAVE_SYS_PARAM_H */
+
+
+/*
+ * Do we have <sys/ucred.h>?
+ */
+
+/* #undef HAVE_SYS_UCRED_H */
+
+
+/*
+ * Do we have removefile()?
+ */
+
+/* #undef HAVE_REMOVEFILE */
+
+
+/*
+ * Do we have <sandbox.h>?
+ */
+
+/* #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_ */
index 24e837d6736dfee447bf8d0536242c7c35377d0d..7b07116133ca62beff3e762ffa924dd79cf03ade 100644 (file)
@@ -1,41 +1,37 @@
-Microsoft Visual Studio Solution File, Format Version 8.00\r
+Microsoft Visual Studio Solution File, Format Version 10.00\r
+# Visual C++ Express 2008\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcups2", "libcups2.vcproj", "{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testfile", "testfile.vcproj", "{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3} = {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testhttp", "testhttp.vcproj", "{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testhttp", "testhttp.vcproj", "{CB1F378C-ED31-4DAC-9379-599E853419CB}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3} = {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}\r
        EndProjectSection\r
 EndProject\r
 Global\r
-       GlobalSection(SolutionConfiguration) = preSolution\r
-               Debug = Debug\r
-               Release = Release\r
-       EndGlobalSection\r
-       GlobalSection(ProjectDependencies) = postSolution\r
-       EndGlobalSection\r
-       GlobalSection(ProjectConfiguration) = postSolution\r
-               {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Debug.ActiveCfg = Debug|Win32\r
-               {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Debug.Build.0 = Debug|Win32\r
-               {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Release.ActiveCfg = Release|Win32\r
-               {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Release.Build.0 = Release|Win32\r
-               {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Debug.ActiveCfg = Debug|Win32\r
-               {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Debug.Build.0 = Debug|Win32\r
-               {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Release.ActiveCfg = Release|Win32\r
-               {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Release.Build.0 = Release|Win32\r
-               {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Debug.ActiveCfg = Debug|Win32\r
-               {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Debug.Build.0 = Debug|Win32\r
-               {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Release.ActiveCfg = Release|Win32\r
-               {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Release.Build.0 = Release|Win32\r
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug|Win32 = Debug|Win32\r
+               Release|Win32 = Release|Win32\r
        EndGlobalSection\r
-       GlobalSection(ExtensibilityGlobals) = postSolution\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Debug|Win32.Build.0 = Debug|Win32\r
+               {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Release|Win32.ActiveCfg = Release|Win32\r
+               {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Release|Win32.Build.0 = Release|Win32\r
+               {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Debug|Win32.Build.0 = Debug|Win32\r
+               {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Release|Win32.ActiveCfg = Release|Win32\r
+               {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Release|Win32.Build.0 = Release|Win32\r
+               {CB1F378C-ED31-4DAC-9379-599E853419CB}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {CB1F378C-ED31-4DAC-9379-599E853419CB}.Debug|Win32.Build.0 = Debug|Win32\r
+               {CB1F378C-ED31-4DAC-9379-599E853419CB}.Release|Win32.ActiveCfg = Release|Win32\r
+               {CB1F378C-ED31-4DAC-9379-599E853419CB}.Release|Win32.Build.0 = Release|Win32\r
        EndGlobalSection\r
-       GlobalSection(ExtensibilityAddIns) = postSolution\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
        EndGlobalSection\r
 EndGlobal\r
index 6849f29f258901b725a719d416cc1bae21e9994f..376fc2d4bace72d0d6d4f46ef01bd3174997f8f2 100644 (file)
@@ -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
index af51e1e0b55fe59c1f471966d059585f850bc3a4..6a4a824e4bee151266bcab8a714d0057de2eb700 100644 (file)
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="7.10"\r
+       Version="9.00"\r
        Name="libcups2"\r
        ProjectGUID="{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}"\r
-       Keyword="Win32Proj">\r
+       RootNamespace="libcups2"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="131072"\r
+       >\r
        <Platforms>\r
                <Platform\r
-                       Name="Win32"/>\r
+                       Name="Win32"\r
+               />\r
        </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
                        OutputDirectory="Debug"\r
                        IntermediateDirectory="Debug"\r
                        ConfigurationType="2"\r
-                       CharacterSet="2">\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\vcnet,.."\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS"\r
-                               MinimalRebuild="TRUE"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"\r
+                               MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
+                               BufferSecurityCheck="true"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="4"/>\r
+                               Detect64BitPortabilityProblems="false"\r
+                               DebugInformationFormat="4"\r
+                       />\r
                        <Tool\r
-                               Name="VCCustomBuildTool"/>\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="ssleay32.lib libeay32.lib ws2_32.lib"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                OutputFile="Debug\libcups2.dll"\r
                                LinkIncremental="2"\r
                                ModuleDefinitionFile="..\vcnet\libcups2.def"\r
-                               GenerateDebugInformation="TRUE"\r
+                               GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="Debug\libcups2.pdb"\r
                                SubSystem="2"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
                                ImportLibrary="Debug\libcups2.lib"\r
-                               TargetMachine="1"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               TargetMachine="1"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCALinkTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCResourceCompilerTool"/>\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCBscMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCFxCopTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
                        OutputDirectory="Release"\r
                        IntermediateDirectory="Release"\r
                        ConfigurationType="2"\r
-                       CharacterSet="2">\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="1"\r
                                AdditionalIncludeDirectories="..\vcnet,.."\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="3"/>\r
+                               Detect64BitPortabilityProblems="false"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCCustomBuildTool"/>\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="ssleay32.lib libeay32.lib ws2_32.lib"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                OutputFile="libcups2.dll"\r
                                LinkIncremental="1"\r
                                ModuleDefinitionFile="..\vcnet\libcups2.def"\r
-                               GenerateDebugInformation="TRUE"\r
+                               GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="libcups2.pdb"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
                                ImportLibrary="libcups2.lib"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                       />\r
                        <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCALinkTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCBscMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCResourceCompilerTool"/>\r
+                               Name="VCFxCopTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
-                       <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
                </Configuration>\r
        </Configurations>\r
        <References>\r
                <Filter\r
                        Name="Source Files"\r
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
                        <File\r
-                               RelativePath="..\cups\adminutil.c">\r
+                               RelativePath="..\cups\adminutil.c"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\array.c">\r
+                               RelativePath="..\cups\array.c"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\attr.c">\r
+                               RelativePath="..\cups\attr.c"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\auth.c">\r
+                               RelativePath="..\cups\auth.c"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\backchannel.c">\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
-                               </FileConfiguration>\r
+                               RelativePath="..\cups\conflicts.c"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\backend.c">\r
+                               RelativePath="..\cups\custom.c"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\custom.c">\r
+                               RelativePath="..\cups\debug.c"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\dest.c">\r
+                               RelativePath="..\cups\dest.c"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\dir.c">\r
+                               RelativePath="..\cups\dir.c"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\emit.c">\r
+                               RelativePath="..\cups\emit.c"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\encode.c">\r
+                               RelativePath="..\cups\encode.c"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\file.c">\r
+                               RelativePath="..\cups\file.c"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\getputfile.c">\r
+                               RelativePath="..\cups\getdevices.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\getputfile.c"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\globals.c">\r
+                               RelativePath="..\cups\globals.c"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\http-addr.c">\r
+                               RelativePath="..\cups\http-addr.c"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\http-addrlist.c">\r
+                               RelativePath="..\cups\http-addrlist.c"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\http-support.c">\r
+                               RelativePath="..\cups\http-support.c"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\http.c">\r
+                               RelativePath="..\cups\http.c"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\ipp-support.c">\r
+                               RelativePath="..\cups\ipp-support.c"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\ipp.c">\r
+                               RelativePath="..\cups\ipp.c"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\langprintf.c">\r
+                               RelativePath="..\cups\langprintf.c"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\language.c">\r
+                               RelativePath="..\cups\language.c"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\localize.c">\r
+                               RelativePath="..\cups\localize.c"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\mark.c">\r
+                               RelativePath="..\cups\mark.c"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\md5.c">\r
+                               RelativePath="..\cups\md5.c"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\md5passwd.c">\r
+                               RelativePath="..\cups\md5passwd.c"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\notify.c">\r
+                               RelativePath="..\cups\notify.c"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\options.c">\r
+                               RelativePath="..\cups\options.c"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\page.c">\r
+                               RelativePath="..\cups\page.c"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\ppd.c">\r
+                               RelativePath="..\cups\ppd.c"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\request.c">\r
+                               RelativePath="..\cups\pwgmedia.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\request.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\snmp.c"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\snprintf.c">\r
+                               RelativePath="..\cups\snprintf.c"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\string.c">\r
+                               RelativePath="..\cups\string.c"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\tempfile.c">\r
+                               RelativePath="..\cups\tempfile.c"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\transcode.c">\r
+                               RelativePath="..\cups\transcode.c"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\usersys.c">\r
+                               RelativePath="..\cups\usersys.c"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\util.c">\r
+                               RelativePath="..\cups\util.c"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="WIN32"/>\r
+                                               PreprocessorDefinitions="WIN32"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                </Filter>\r
                <Filter\r
                        Name="Header Files"\r
                        Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
                        <File\r
-                               RelativePath="..\cups\adminutil.h">\r
+                               RelativePath="..\cups\adminutil.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\array.h">\r
+                               RelativePath="..\cups\array.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\backend.h">\r
+                               RelativePath="..\cups\backend.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\cups.h">\r
+                               RelativePath="..\cups\cups.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\debug.h">\r
+                               RelativePath="..\cups\debug.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\dir.h">\r
+                               RelativePath="..\cups\dir.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\file.h">\r
+                               RelativePath="..\cups\file.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\globals.h">\r
+                               RelativePath="..\cups\globals.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\http-private.h">\r
+                               RelativePath="..\cups\http-private.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\http.h">\r
+                               RelativePath="..\cups\http.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\i18n.h">\r
+                               RelativePath="..\cups\i18n.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\ipp-private.h">\r
+                               RelativePath="..\cups\ipp-private.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\ipp.h">\r
+                               RelativePath="..\cups\ipp.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\language.h">\r
+                               RelativePath="..\cups\language.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\md5-apple.h">\r
+                               RelativePath="..\cups\md5-apple.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\md5.h">\r
+                               RelativePath="..\cups\md5.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\normalize.h">\r
+                               RelativePath="..\cups\normalize.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\ppd.h">\r
+                               RelativePath="..\cups\ppd.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\string.h">\r
+                               RelativePath="..\cups\string.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\transcode.h">\r
+                               RelativePath="..\cups\transcode.h"\r
+                               >\r
                        </File>\r
                </Filter>\r
                <Filter\r
                        Name="Resource Files"\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
                </Filter>\r
        </Files>\r
        <Globals>\r
index 30473a73d533b119c8f788df7a5b1b1d754c8eb1..0b2b9d6645eb86585a262d1c389dfdeca84e0a6b 100644 (file)
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="7.10"\r
+       Version="9.00"\r
        Name="testfile"\r
        ProjectGUID="{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}"\r
-       Keyword="Win32Proj">\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="131072"\r
+       >\r
        <Platforms>\r
                <Platform\r
-                       Name="Win32"/>\r
+                       Name="Win32"\r
+               />\r
        </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
                        OutputDirectory="Debug"\r
                        IntermediateDirectory="Debug"\r
                        ConfigurationType="1"\r
-                       CharacterSet="2">\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\vcnet;.."\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
-                               MinimalRebuild="TRUE"\r
+                               MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="5"\r
+                               RuntimeLibrary="1"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="4"/>\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="4"\r
+                       />\r
                        <Tool\r
-                               Name="VCCustomBuildTool"/>\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                OutputFile="Debug\testfile.exe"\r
                                LinkIncremental="2"\r
-                               GenerateDebugInformation="TRUE"\r
+                               GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/testfile.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
+                               TargetMachine="1"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCALinkTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCResourceCompilerTool"/>\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCBscMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
+                               Name="VCFxCopTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
                        OutputDirectory="Release"\r
                        IntermediateDirectory="Release"\r
                        ConfigurationType="1"\r
-                       CharacterSet="2">\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="..\vcnet;.."\r
                                RuntimeLibrary="0"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="0"/>\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="0"\r
+                       />\r
                        <Tool\r
-                               Name="VCCustomBuildTool"/>\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                OutputFile="testfile.exe"\r
                                LinkIncremental="1"\r
-                               GenerateDebugInformation="TRUE"\r
+                               GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
-                               TargetMachine="1"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
+                               TargetMachine="1"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCALinkTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCResourceCompilerTool"/>\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCBscMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
+                               Name="VCFxCopTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
                </Configuration>\r
        </Configurations>\r
        <References>\r
                <Filter\r
                        Name="Source Files"\r
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
                        <File\r
-                               RelativePath="..\cups\testfile.c">\r
+                               RelativePath="..\cups\testfile.c"\r
+                               >\r
                        </File>\r
                </Filter>\r
                <Filter\r
                        Name="Header Files"\r
                        Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
                </Filter>\r
                <Filter\r
                        Name="Resource Files"\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
                </Filter>\r
        </Files>\r
        <Globals>\r
index 310f641193099460d24f30a83a70abc2675e0b30..ab16007b30c05e24e3725bfc495e863282d96114 100755 (executable)
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="7.10"\r
+       Version="9.00"\r
        Name="testhttp"\r
-       ProjectGUID="{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}"\r
-       Keyword="Win32Proj">\r
+       ProjectGUID="{CB1F378C-ED31-4DAC-9379-599E853419CB}"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="131072"\r
+       >\r
        <Platforms>\r
                <Platform\r
-                       Name="Win32"/>\r
+                       Name="Win32"\r
+               />\r
        </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
                        OutputDirectory="Debug"\r
                        IntermediateDirectory="Debug"\r
                        ConfigurationType="1"\r
-                       CharacterSet="2">\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\vcnet;.."\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
-                               MinimalRebuild="TRUE"\r
+                               MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="5"\r
+                               RuntimeLibrary="1"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="4"/>\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="4"\r
+                       />\r
                        <Tool\r
-                               Name="VCCustomBuildTool"/>\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                OutputFile="Debug\testhttp.exe"\r
                                LinkIncremental="2"\r
-                               GenerateDebugInformation="TRUE"\r
+                               GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/testhttp.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
+                               TargetMachine="1"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCALinkTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCResourceCompilerTool"/>\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCBscMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
+                               Name="VCFxCopTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
                        OutputDirectory="Release"\r
                        IntermediateDirectory="Release"\r
                        ConfigurationType="1"\r
-                       CharacterSet="2">\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="..\vcnet;.."\r
                                RuntimeLibrary="0"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="0"/>\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="0"\r
+                       />\r
                        <Tool\r
-                               Name="VCCustomBuildTool"/>\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                OutputFile="testhttp.exe"\r
                                LinkIncremental="1"\r
-                               GenerateDebugInformation="TRUE"\r
+                               GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
-                               TargetMachine="1"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
+                               TargetMachine="1"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCALinkTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCResourceCompilerTool"/>\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCBscMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
+                               Name="VCFxCopTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
                </Configuration>\r
        </Configurations>\r
        <References>\r
                <Filter\r
                        Name="Source Files"\r
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
                        <File\r
-                               RelativePath="..\cups\testhttp.c">\r
+                               RelativePath="..\cups\testhttp.c"\r
+                               >\r
                        </File>\r
                </Filter>\r
                <Filter\r
                        Name="Header Files"\r
                        Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
                </Filter>\r
                <Filter\r
                        Name="Resource Files"\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
                </Filter>\r
        </Files>\r
        <Globals>\r