Make ippfind build and install on Windows

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11100 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/test/ippfind.c b/test/ippfind.c
index 464d5d8905efb0b06043b1a180c8aeb3681d2d3c..d3d30cdc6deb5bd557c71acbd7e3d08e294a2bbe 100644 (file)
--- a/test/ippfind.c
+++ b/test/ippfind.c
@@ -45,7 +45,12 @@
 
 #define _CUPS_NO_DEPRECATED
 #include <cups/cups-private.h>
-#include <sys/wait.h>
+#ifdef WIN32
+#  include <process.h>
+#  include <sys/timeb.h>
+#else
+#  include <sys/wait.h>
+#endif /* WIN32 */
 #include <regex.h>
 #ifdef HAVE_DNSSD
 #  include <dns_sd.h>
@@ -59,7 +64,9 @@
 #  define kDNSServiceMaxDomainName AVAHI_DOMAIN_NAME_MAX
 #endif /* HAVE_DNSSD */
 
+#ifndef WIN32
 extern char **environ;                 /* Process environment variables */
+#endif /* !WIN32 */
 
 
 /*
@@ -166,7 +173,7 @@ static int  ipp_version = 20;       /* IPP version for LIST */
  */
 
 #ifdef HAVE_DNSSD
-static void            browse_callback(DNSServiceRef sdRef,
+static void DNSSD_API  browse_callback(DNSServiceRef sdRef,
                                        DNSServiceFlags flags,
                                        uint32_t interfaceIndex,
                                        DNSServiceErrorType errorCode,
@@ -174,7 +181,7 @@ static void         browse_callback(DNSServiceRef sdRef,
                                        const char *regtype,
                                        const char *replyDomain, void *context)
                                        __attribute__((nonnull(1,5,6,7,8)));
-static void            browse_local_callback(DNSServiceRef sdRef,
+static void DNSSD_API  browse_local_callback(DNSServiceRef sdRef,
                                              DNSServiceFlags flags,
                                              uint32_t interfaceIndex,
                                              DNSServiceErrorType errorCode,
@@ -215,7 +222,7 @@ static ippfind_expr_t       *new_expr(ippfind_op_t op, int invert,
                                  const char *value, const char *regex,
                                  char **args);
 #ifdef HAVE_DNSSD
-static void            resolve_callback(DNSServiceRef sdRef,
+static void DNSSD_API  resolve_callback(DNSServiceRef sdRef,
                                         DNSServiceFlags flags,
                                         uint32_t interfaceIndex,
                                         DNSServiceErrorType errorCode,
@@ -1468,7 +1475,7 @@ main(int  argc,                           /* I - Number of command-line args */
  * 'browse_callback()' - Browse devices.
  */
 
-static void
+static void DNSSD_API
 browse_callback(
     DNSServiceRef       sdRef,         /* I - Service reference */
     DNSServiceFlags     flags,         /* I - Option flags */
@@ -1498,7 +1505,7 @@ browse_callback(
  * 'browse_local_callback()' - Browse local devices.
  */
 
-static void
+static void DNSSD_API
 browse_local_callback(
     DNSServiceRef       sdRef,         /* I - Service reference */
     DNSServiceFlags     flags,         /* I - Option flags */
@@ -1728,8 +1735,10 @@ dnssd_error_string(int error)            /* I - Error number */
     case kDNSServiceErr_PollingMode :
         return ("Service polling mode error.");
 
+#ifndef WIN32
     case kDNSServiceErr_Timeout :
         return ("Service timeout.");
+#endif /* !WIN32 */
   }
 
 #  elif defined(HAVE_AVAHI)
@@ -2503,7 +2512,7 @@ poll_callback(
  */
 
 #ifdef HAVE_DNSSD
-static void
+static void DNSSD_API
 resolve_callback(
     DNSServiceRef       sdRef,         /* I - Service reference */
     DNSServiceFlags     flags,         /* I - Data flags */

diff --git a/vcnet/cups.sln b/vcnet/cups.sln
index 2e674a6f6aef2929f448c9d9c4384b2845376acc..4f3c0d9cbb11afa4559c8701ea8897e17508f247 100644 (file)
--- a/vcnet/cups.sln
+++ b/vcnet/cups.sln
@@ -33,10 +33,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ipptool", "ipptool.vcproj",
        EndProjectSection\r
 EndProject\r
 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "ipptool-installer", "ipptool-installer.vdproj", "{6AEA263B-92C0-426F-B5FF-F7F5917B704A}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {B484DA0C-62C8-4C32-83B6-CCEB58968B85} = {B484DA0C-62C8-4C32-83B6-CCEB58968B85}\r
+       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regex", "regex.vcproj", "{18950A1B-D37A-40C7-B2DF-C12986C0526E}"\r
 EndProject\r
 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "libcups2-installer", "libcups2-installer.vdproj", "{03CF67C2-3FF5-44EA-B3AF-FB62D3BED961}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {B484DA0C-62C8-4C32-83B6-CCEB58968B85} = {B484DA0C-62C8-4C32-83B6-CCEB58968B85}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ippfind", "ippfind.vcproj", "{B484DA0C-62C8-4C32-83B6-CCEB58968B85}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {18950A1B-D37A-40C7-B2DF-C12986C0526E} = {18950A1B-D37A-40C7-B2DF-C12986C0526E}\r
+               {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3} = {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}\r
+       EndProjectSection\r
 EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
@@ -52,8 +64,8 @@ Global
                {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Debug|x64.Build.0 = Debug|x64\r
                {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Release|Win32.ActiveCfg = Release|Win32\r
                {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Release|Win32.Build.0 = Release|Win32\r
-               {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Release|x64.ActiveCfg = Debug|x64\r
-               {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Release|x64.Build.0 = Debug|x64\r
+               {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Release|x64.ActiveCfg = Release|x64\r
+               {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Release|x64.Build.0 = Release|x64\r
                {CB4AA6F2-3E84-45BE-B505-95CD375E1234}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {CB4AA6F2-3E84-45BE-B505-95CD375E1234}.Debug|Win32.Build.0 = Debug|Win32\r
                {CB4AA6F2-3E84-45BE-B505-95CD375E1234}.Debug|x64.ActiveCfg = Debug|x64\r
@@ -104,11 +116,11 @@ Global
                {6AEA263B-92C0-426F-B5FF-F7F5917B704A}.Release|x64.Build.0 = Release\r
                {18950A1B-D37A-40C7-B2DF-C12986C0526E}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {18950A1B-D37A-40C7-B2DF-C12986C0526E}.Debug|Win32.Build.0 = Debug|Win32\r
-               {18950A1B-D37A-40C7-B2DF-C12986C0526E}.Debug|x64.ActiveCfg = Release|x64\r
-               {18950A1B-D37A-40C7-B2DF-C12986C0526E}.Debug|x64.Build.0 = Release|x64\r
+               {18950A1B-D37A-40C7-B2DF-C12986C0526E}.Debug|x64.ActiveCfg = Debug|x64\r
+               {18950A1B-D37A-40C7-B2DF-C12986C0526E}.Debug|x64.Build.0 = Debug|x64\r
                {18950A1B-D37A-40C7-B2DF-C12986C0526E}.Release|Win32.ActiveCfg = Release|Win32\r
                {18950A1B-D37A-40C7-B2DF-C12986C0526E}.Release|Win32.Build.0 = Release|Win32\r
-               {18950A1B-D37A-40C7-B2DF-C12986C0526E}.Release|x64.ActiveCfg = Release|Win32\r
+               {18950A1B-D37A-40C7-B2DF-C12986C0526E}.Release|x64.ActiveCfg = Release|x64\r
                {03CF67C2-3FF5-44EA-B3AF-FB62D3BED961}.Debug|Win32.ActiveCfg = Debug\r
                {03CF67C2-3FF5-44EA-B3AF-FB62D3BED961}.Debug|Win32.Build.0 = Debug\r
                {03CF67C2-3FF5-44EA-B3AF-FB62D3BED961}.Debug|x64.ActiveCfg = Debug\r
@@ -117,6 +129,14 @@ Global
                {03CF67C2-3FF5-44EA-B3AF-FB62D3BED961}.Release|Win32.Build.0 = Release\r
                {03CF67C2-3FF5-44EA-B3AF-FB62D3BED961}.Release|x64.ActiveCfg = Release\r
                {03CF67C2-3FF5-44EA-B3AF-FB62D3BED961}.Release|x64.Build.0 = Release\r
+               {B484DA0C-62C8-4C32-83B6-CCEB58968B85}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {B484DA0C-62C8-4C32-83B6-CCEB58968B85}.Debug|Win32.Build.0 = Debug|Win32\r
+               {B484DA0C-62C8-4C32-83B6-CCEB58968B85}.Debug|x64.ActiveCfg = Debug|x64\r
+               {B484DA0C-62C8-4C32-83B6-CCEB58968B85}.Debug|x64.Build.0 = Debug|x64\r
+               {B484DA0C-62C8-4C32-83B6-CCEB58968B85}.Release|Win32.ActiveCfg = Release|Win32\r
+               {B484DA0C-62C8-4C32-83B6-CCEB58968B85}.Release|Win32.Build.0 = Release|Win32\r
+               {B484DA0C-62C8-4C32-83B6-CCEB58968B85}.Release|x64.ActiveCfg = Release|x64\r
+               {B484DA0C-62C8-4C32-83B6-CCEB58968B85}.Release|x64.Build.0 = Release|x64\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/vcnet/ippfind.vcproj b/vcnet/ippfind.vcproj
index df685af4b58bf876bbbeea3ecbced2e7df44b62c..59a7f2b247f5c9b1adea5ae42ef0761fca9e4901 100644 (file)
--- a/vcnet/ippfind.vcproj
+++ b/vcnet/ippfind.vcproj
@@ -65,6 +65,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="dnssd.lib ws2_32.lib"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
@@ -141,6 +142,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="dnssd.lib ws2_32.lib"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
@@ -214,6 +216,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="dnssd.lib ws2_32.lib"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
@@ -290,6 +293,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="dnssd.lib ws2_32.lib"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r

diff --git a/vcnet/ipptool-installer.vdproj b/vcnet/ipptool-installer.vdproj
index 9ea8f39668acdc84b2f75186525319094fd6a0c6..881480541750cbbed5a96b2374f9c00a24697857 100644 (file)
--- a/vcnet/ipptool-installer.vdproj
+++ b/vcnet/ipptool-installer.vdproj
@@ -27,6 +27,12 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_1DBDCFABB8DF28E5F75E41EDAE4BF6BE"\r
+        "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_1E4B2A9BD6A44926B719E0D7E8FC0952"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -39,6 +45,30 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_3CE1523FBE134534AC61A75E96CB0E1A"\r
+        "OwnerKey" = "8:_D02EB13951314EFD9C539150EF8E53B8"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
+        "MsmKey" = "8:_3CE1523FBE134534AC61A75E96CB0E1A"\r
+        "OwnerKey" = "8:_58DC0E72F0944BEFB927AED718CD1660"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
+        "MsmKey" = "8:_3CE1523FBE134534AC61A75E96CB0E1A"\r
+        "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
+        "MsmKey" = "8:_3CE1523FBE134534AC61A75E96CB0E1A"\r
+        "OwnerKey" = "8:_E97571D3FBE048DABDC59B37762D800F"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_40C483299484486C9416B704F0EF4A6C"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -75,8 +105,14 @@
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_604E80B396974DD68D1F4A11BB022F79"\r
-        "OwnerKey" = "8:_8B9B4769224046F5B6D692BA9E6FFBDD"\r
+        "MsmKey" = "8:_58DC0E72F0944BEFB927AED718CD1660"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
+        "MsmKey" = "8:_592FC984DBFD494D9FB7DFFEA35AD7A5"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
@@ -111,12 +147,6 @@
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_8B9B4769224046F5B6D692BA9E6FFBDD"\r
-        "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"\r
-        "MsmSig" = "8:_UNDEFINED"\r
-        }\r
-        "Entry"\r
-        {\r
         "MsmKey" = "8:_8CC3562BCDED4676A672115D19D898B5"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -147,12 +177,6 @@
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_A9CCE21DCF004D869F157B0065B32AA7"\r
-        "OwnerKey" = "8:_D02EB13951314EFD9C539150EF8E53B8"\r
-        "MsmSig" = "8:_UNDEFINED"\r
-        }\r
-        "Entry"\r
-        {\r
         "MsmKey" = "8:_AF057921D20E4520A3C6420F0729A744"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -189,20 +213,20 @@
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_D20F7E9FAB8B4CF38D740C5E5655CC3E"\r
-        "OwnerKey" = "8:_A9CCE21DCF004D869F157B0065B32AA7"\r
+        "MsmKey" = "8:_D4BEA026ABFB46DD960AD8EFCAE45E31"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_D4BEA026ABFB46DD960AD8EFCAE45E31"\r
+        "MsmKey" = "8:_D5CD9D9AB1644688A1D54B1589BDF724"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_D5CD9D9AB1644688A1D54B1589BDF724"\r
-        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmKey" = "8:_D9C1920DC8F14B9EB89DDF4B6C1F474A"\r
+        "OwnerKey" = "8:_3CE1523FBE134534AC61A75E96CB0E1A"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
@@ -414,6 +438,26 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1DBDCFABB8DF28E5F75E41EDAE4BF6BE"\r
+            {\r
+            "SourcePath" = "8:zlibwapi.dll"\r
+            "TargetName" = "8:zlibwapi.dll"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
+            "Condition" = "8:"\r
+            "Transitive" = "11:FALSE"\r
+            "Vital" = "11:TRUE"\r
+            "ReadOnly" = "11:FALSE"\r
+            "Hidden" = "11:FALSE"\r
+            "System" = "11:FALSE"\r
+            "Permanent" = "11:FALSE"\r
+            "SharedLegacy" = "11:FALSE"\r
+            "PackageAs" = "3:1"\r
+            "Register" = "3:1"\r
+            "Exclude" = "11:FALSE"\r
+            "IsDependency" = "11:TRUE"\r
+            "IsolateTo" = "8:"\r
+            }\r
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1E4B2A9BD6A44926B719E0D7E8FC0952"\r
             {\r
             "SourcePath" = "8:..\\test\\get-printer-attributes.test"\r
@@ -574,6 +618,26 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_592FC984DBFD494D9FB7DFFEA35AD7A5"\r
+            {\r
+            "SourcePath" = "8:..\\doc\\help\\man-ippfind.html"\r
+            "TargetName" = "8:man-ippfind.html"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
+            "Condition" = "8:"\r
+            "Transitive" = "11:FALSE"\r
+            "Vital" = "11:TRUE"\r
+            "ReadOnly" = "11:FALSE"\r
+            "Hidden" = "11:FALSE"\r
+            "System" = "11:FALSE"\r
+            "Permanent" = "11:FALSE"\r
+            "SharedLegacy" = "11:FALSE"\r
+            "PackageAs" = "3:1"\r
+            "Register" = "3:1"\r
+            "Exclude" = "11:FALSE"\r
+            "IsDependency" = "11:FALSE"\r
+            "IsolateTo" = "8:"\r
+            }\r
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_65CBD149C9DA448FBACE2B02766A6537"\r
             {\r
             "SourcePath" = "8:..\\test\\testfile.ps"\r
@@ -1192,14 +1256,14 @@
         {\r
         "Name" = "8:Microsoft Visual Studio"\r
         "ProductName" = "8:ipptool for Windows"\r
-        "ProductCode" = "8:{75CFE2B5-5105-4D7A-87CA-5D919126F3DA}"\r
-        "PackageCode" = "8:{85757D89-5057-4EE1-9852-763E1EEF2FC8}"\r
+        "ProductCode" = "8:{820B4978-328C-46E6-938B-02ECE3846FFA}"\r
+        "PackageCode" = "8:{FF5FD1DE-7162-41BD-B4E4-E9E32BD8CA80}"\r
         "UpgradeCode" = "8:{BAB6EBBB-515D-4155-9FEF-D98DA76814CA}"\r
         "RestartWWWService" = "11:FALSE"\r
         "RemovePreviousVersions" = "11:TRUE"\r
         "DetectNewerInstalledVersion" = "11:TRUE"\r
         "InstallAllUsers" = "11:TRUE"\r
-        "ProductVersion" = "8:13.04.1800"\r
+        "ProductVersion" = "8:13.07.0500"\r
         "Manufacturer" = "8:Apple Inc."\r
         "ARPHELPTELEPHONE" = "8:"\r
         "ARPHELPLINK" = "8:http://www.cups.org/str.php"\r
@@ -1758,11 +1822,11 @@
         }\r
         "MergeModule"\r
         {\r
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_604E80B396974DD68D1F4A11BB022F79"\r
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_3CE1523FBE134534AC61A75E96CB0E1A"\r
             {\r
             "UseDynamicProperties" = "11:TRUE"\r
             "IsDependency" = "11:TRUE"\r
-            "SourcePath" = "8:microsoft_vc90_debugcrt_x86_x64.msm"\r
+            "SourcePath" = "8:policy_9_0_Microsoft_VC90_DebugCRT_x86.msm"\r
                 "Properties"\r
                 {\r
                 }\r
@@ -1772,11 +1836,11 @@
             "Feature" = "8:"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_8B9B4769224046F5B6D692BA9E6FFBDD"\r
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_D9C1920DC8F14B9EB89DDF4B6C1F474A"\r
             {\r
             "UseDynamicProperties" = "11:TRUE"\r
             "IsDependency" = "11:TRUE"\r
-            "SourcePath" = "8:policy_9_0_Microsoft_VC90_DebugCRT_x86_x64.msm"\r
+            "SourcePath" = "8:microsoft_vc90_debugcrt_x86.msm"\r
                 "Properties"\r
                 {\r
                 }\r
@@ -1786,40 +1850,40 @@
             "Feature" = "8:"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_A9CCE21DCF004D869F157B0065B32AA7"\r
+        }\r
+        "ProjectOutput"\r
+        {\r
+            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_58DC0E72F0944BEFB927AED718CD1660"\r
             {\r
-            "UseDynamicProperties" = "11:TRUE"\r
-            "IsDependency" = "11:TRUE"\r
-            "SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86_x64.msm"\r
-                "Properties"\r
-                {\r
-                }\r
-            "LanguageId" = "3:0"\r
+            "SourcePath" = "8:Win32\\Debug\\ippfind.exe"\r
+            "TargetName" = "8:"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
+            "Condition" = "8:"\r
+            "Transitive" = "11:FALSE"\r
+            "Vital" = "11:TRUE"\r
+            "ReadOnly" = "11:FALSE"\r
+            "Hidden" = "11:FALSE"\r
+            "System" = "11:FALSE"\r
+            "Permanent" = "11:FALSE"\r
+            "SharedLegacy" = "11:FALSE"\r
+            "PackageAs" = "3:1"\r
+            "Register" = "3:1"\r
             "Exclude" = "11:FALSE"\r
-            "Folder" = "8:"\r
-            "Feature" = "8:"\r
+            "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
-            }\r
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_D20F7E9FAB8B4CF38D740C5E5655CC3E"\r
-            {\r
-            "UseDynamicProperties" = "11:TRUE"\r
-            "IsDependency" = "11:TRUE"\r
-            "SourcePath" = "8:microsoft_vc90_crt_x86_x64.msm"\r
-                "Properties"\r
+            "ProjectOutputGroupRegister" = "3:1"\r
+            "OutputConfiguration" = "8:"\r
+            "OutputGroupCanonicalName" = "8:Built"\r
+            "OutputProjectGuid" = "8:{B484DA0C-62C8-4C32-83B6-CCEB58968B85}"\r
+            "ShowKeyOutput" = "11:TRUE"\r
+                "ExcludeFilters"\r
                 {\r
                 }\r
-            "LanguageId" = "3:0"\r
-            "Exclude" = "11:FALSE"\r
-            "Folder" = "8:"\r
-            "Feature" = "8:"\r
-            "IsolateTo" = "8:"\r
             }\r
-        }\r
-        "ProjectOutput"\r
-        {\r
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D02EB13951314EFD9C539150EF8E53B8"\r
             {\r
-            "SourcePath" = "8:x64\\Release\\regex.dll"\r
+            "SourcePath" = "8:Win32\\Debug\\regex.dll"\r
             "TargetName" = "8:"\r
             "Tag" = "8:"\r
             "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
@@ -1847,7 +1911,7 @@
             }\r
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_E97571D3FBE048DABDC59B37762D800F"\r
             {\r
-            "SourcePath" = "8:x64\\Debug\\ipptool.exe"\r
+            "SourcePath" = "8:Win32\\Debug\\ipptool.exe"\r
             "TargetName" = "8:"\r
             "Tag" = "8:"\r
             "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
@@ -1875,7 +1939,7 @@
             }\r
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_EA282F32A10B4ED1A81AA6133B997C6A"\r
             {\r
-            "SourcePath" = "8:x64\\Debug\\libcups2.dll"\r
+            "SourcePath" = "8:Win32\\Debug\\libcups2.dll"\r
             "TargetName" = "8:"\r
             "Tag" = "8:"\r
             "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r

diff --git a/vcnet/libcups2-installer.vdproj b/vcnet/libcups2-installer.vdproj
index bae6a4c82fc734a6169e896e7f9a255a8451bdab..74b22161d3d219450cc4aee22ab63b038234623e 100644 (file)
--- a/vcnet/libcups2-installer.vdproj
+++ b/vcnet/libcups2-installer.vdproj
@@ -111,32 +111,20 @@
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_2B4CDFC508564D57A5C27766923D822E"\r
-        "OwnerKey" = "8:_3F5E38826D0C441897F43747FFA7491A"\r
-        "MsmSig" = "8:_UNDEFINED"\r
-        }\r
-        "Entry"\r
-        {\r
-        "MsmKey" = "8:_2B4CDFC508564D57A5C27766923D822E"\r
-        "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"\r
-        "MsmSig" = "8:_UNDEFINED"\r
-        }\r
-        "Entry"\r
-        {\r
-        "MsmKey" = "8:_2B4CDFC508564D57A5C27766923D822E"\r
-        "OwnerKey" = "8:_0299839A2CCC4F908C5D3A8F465F3FFE"\r
+        "MsmKey" = "8:_340E6094BE6F4BCF8350280DC8B37900"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_2F26FF10F81046A9A863995A1D5F449E"\r
-        "OwnerKey" = "8:_B77819C33E084E13AC78EAF9234C67E1"\r
+        "MsmKey" = "8:_35AE0E84A609BB191E4085A2681730D1"\r
+        "OwnerKey" = "8:_E9925AF9A2D343D6BFE5BDAE33481292"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_340E6094BE6F4BCF8350280DC8B37900"\r
-        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmKey" = "8:_35AE0E84A609BB191E4085A2681730D1"\r
+        "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
@@ -213,38 +201,26 @@
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_5BBA58EFC5A9495BBEF1752E15F4A077"\r
+        "MsmKey" = "8:_5914C46E15794A9093C5BF50A983D502"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_5ED87BAE980C4992A4C74AEAEC4A57CF"\r
+        "MsmKey" = "8:_5B2FBC1C3AD5490689A61629854C80AF"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_64CCFE4D849E75157BBA3DD0A981DEE6"\r
-        "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"\r
-        "MsmSig" = "8:_UNDEFINED"\r
-        }\r
-        "Entry"\r
-        {\r
-        "MsmKey" = "8:_64CCFE4D849E75157BBA3DD0A981DEE6"\r
-        "OwnerKey" = "8:_BAEADCCB6AD74F36AE08401229354D79"\r
-        "MsmSig" = "8:_UNDEFINED"\r
-        }\r
-        "Entry"\r
-        {\r
-        "MsmKey" = "8:_64CCFE4D849E75157BBA3DD0A981DEE6"\r
-        "OwnerKey" = "8:_3F5E38826D0C441897F43747FFA7491A"\r
+        "MsmKey" = "8:_5BBA58EFC5A9495BBEF1752E15F4A077"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_64CCFE4D849E75157BBA3DD0A981DEE6"\r
-        "OwnerKey" = "8:_E9925AF9A2D343D6BFE5BDAE33481292"\r
+        "MsmKey" = "8:_5ED87BAE980C4992A4C74AEAEC4A57CF"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
@@ -273,12 +249,6 @@
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_7014E39650EC41979A77C81B8C8636C5"\r
-        "OwnerKey" = "8:_2B4CDFC508564D57A5C27766923D822E"\r
-        "MsmSig" = "8:_UNDEFINED"\r
-        }\r
-        "Entry"\r
-        {\r
         "MsmKey" = "8:_72A7EBE64092496AA67AB2DD00C0804B"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -297,134 +267,128 @@
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_7E5E5AB3D3C0409AB04A160380C1B03A"\r
-        "OwnerKey" = "8:_D3197C67CBAC46DE854CF283CDBC677E"\r
-        "MsmSig" = "8:_UNDEFINED"\r
-        }\r
-        "Entry"\r
-        {\r
-        "MsmKey" = "8:_7E5E5AB3D3C0409AB04A160380C1B03A"\r
-        "OwnerKey" = "8:_E9925AF9A2D343D6BFE5BDAE33481292"\r
+        "MsmKey" = "8:_7FC58520B0F44E3E95A207905CABFED4"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_7FC58520B0F44E3E95A207905CABFED4"\r
+        "MsmKey" = "8:_860678A628E34D219950C2E2B1BE6A89"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_8400394709ED174EDB995EE7D2002030"\r
-        "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"\r
+        "MsmKey" = "8:_8CCA95F5402D439B9B9CAC6F0FC1A443"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_8400394709ED174EDB995EE7D2002030"\r
-        "OwnerKey" = "8:_BAEADCCB6AD74F36AE08401229354D79"\r
+        "MsmKey" = "8:_933D37C7FEBF4B8AAF9E6CE01A605039"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_8400394709ED174EDB995EE7D2002030"\r
-        "OwnerKey" = "8:_3F5E38826D0C441897F43747FFA7491A"\r
+        "MsmKey" = "8:_9D69B0FC2413407BA24D88B73EF456AA"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_8400394709ED174EDB995EE7D2002030"\r
-        "OwnerKey" = "8:_E9925AF9A2D343D6BFE5BDAE33481292"\r
+        "MsmKey" = "8:_A271CCE042C14DDF8F0F1A1B16584F17"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_860678A628E34D219950C2E2B1BE6A89"\r
+        "MsmKey" = "8:_A513FBE6CC6247C19AF06829E5470D01"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_8CCA95F5402D439B9B9CAC6F0FC1A443"\r
+        "MsmKey" = "8:_A833908023464B61A160E0323C8E9606"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_933D37C7FEBF4B8AAF9E6CE01A605039"\r
-        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmKey" = "8:_B15F5898006758C3483850D50CA2C7F0"\r
+        "OwnerKey" = "8:_E9925AF9A2D343D6BFE5BDAE33481292"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_9D69B0FC2413407BA24D88B73EF456AA"\r
-        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmKey" = "8:_B15F5898006758C3483850D50CA2C7F0"\r
+        "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_A271CCE042C14DDF8F0F1A1B16584F17"\r
+        "MsmKey" = "8:_B20638175CCB42398417E0683A12469C"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_A513FBE6CC6247C19AF06829E5470D01"\r
+        "MsmKey" = "8:_B38E399C93724A9BB5F429DABBA6301F"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_A833908023464B61A160E0323C8E9606"\r
-        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmKey" = "8:_B7023A0B2ADF4B4D822FAEE062F9BD87"\r
+        "OwnerKey" = "8:_0299839A2CCC4F908C5D3A8F465F3FFE"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_B1520DB5B1CE4CA392FF0EB614535300"\r
-        "OwnerKey" = "8:_BAEADCCB6AD74F36AE08401229354D79"\r
+        "MsmKey" = "8:_B7023A0B2ADF4B4D822FAEE062F9BD87"\r
+        "OwnerKey" = "8:_5B2FBC1C3AD5490689A61629854C80AF"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_B20638175CCB42398417E0683A12469C"\r
-        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmKey" = "8:_B7023A0B2ADF4B4D822FAEE062F9BD87"\r
+        "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_B38E399C93724A9BB5F429DABBA6301F"\r
-        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmKey" = "8:_B7023A0B2ADF4B4D822FAEE062F9BD87"\r
+        "OwnerKey" = "8:_E9925AF9A2D343D6BFE5BDAE33481292"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_B77819C33E084E13AC78EAF9234C67E1"\r
-        "OwnerKey" = "8:_C17DC336766E4B1BBC8DD24D686C440A"\r
+        "MsmKey" = "8:_B7023A0B2ADF4B4D822FAEE062F9BD87"\r
+        "OwnerKey" = "8:_D3197C67CBAC46DE854CF283CDBC677E"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_B77819C33E084E13AC78EAF9234C67E1"\r
+        "MsmKey" = "8:_B7023A0B2ADF4B4D822FAEE062F9BD87"\r
         "OwnerKey" = "8:_D02EB13951314EFD9C539150EF8E53B8"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_B820F65C4D844938881581933D156B34"\r
-        "OwnerKey" = "8:_B1520DB5B1CE4CA392FF0EB614535300"\r
+        "MsmKey" = "8:_B7023A0B2ADF4B4D822FAEE062F9BD87"\r
+        "OwnerKey" = "8:_B20638175CCB42398417E0683A12469C"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_BAEADCCB6AD74F36AE08401229354D79"\r
-        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmKey" = "8:_B7023A0B2ADF4B4D822FAEE062F9BD87"\r
+        "OwnerKey" = "8:_364DCCAFF25145BCBE75FFEEDCC75B3A"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_BF7DFB3EEB1A6396025E468768AC5AB1"\r
-        "OwnerKey" = "8:_E9925AF9A2D343D6BFE5BDAE33481292"\r
+        "MsmKey" = "8:_BAEADCCB6AD74F36AE08401229354D79"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
@@ -453,6 +417,18 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_CAF8F7B63E0E9F92F4B3B83FA9CC5424"\r
+        "OwnerKey" = "8:_E9925AF9A2D343D6BFE5BDAE33481292"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
+        "MsmKey" = "8:_CAF8F7B63E0E9F92F4B3B83FA9CC5424"\r
+        "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_CD0CFE42ED2D4416A01253E12A0082A8"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -513,12 +489,6 @@
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_E4DC6765AD3348C28401914D2B7BC71A"\r
-        "OwnerKey" = "8:_7E5E5AB3D3C0409AB04A160380C1B03A"\r
-        "MsmSig" = "8:_UNDEFINED"\r
-        }\r
-        "Entry"\r
-        {\r
         "MsmKey" = "8:_E9925AF9A2D343D6BFE5BDAE33481292"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -543,6 +513,12 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_F39E4E6E6DCB48E08E9E51E724E77DCF"\r
+        "OwnerKey" = "8:_B7023A0B2ADF4B4D822FAEE062F9BD87"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_F77CB9E0AE78446481BD8BFD680F548E"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -956,6 +932,26 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_35AE0E84A609BB191E4085A2681730D1"\r
+            {\r
+            "SourcePath" = "8:CRYPT32.dll"\r
+            "TargetName" = "8:CRYPT32.dll"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_C8D931ADC425446B916E9711B929659F"\r
+            "Condition" = "8:"\r
+            "Transitive" = "11:FALSE"\r
+            "Vital" = "11:TRUE"\r
+            "ReadOnly" = "11:FALSE"\r
+            "Hidden" = "11:FALSE"\r
+            "System" = "11:FALSE"\r
+            "Permanent" = "11:FALSE"\r
+            "SharedLegacy" = "11:FALSE"\r
+            "PackageAs" = "3:1"\r
+            "Register" = "3:1"\r
+            "Exclude" = "11:FALSE"\r
+            "IsDependency" = "11:TRUE"\r
+            "IsolateTo" = "8:"\r
+            }\r
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3697A58F04D14955AA428E89771E7BA3"\r
             {\r
             "SourcePath" = "8:..\\test\\ipp-2.0.test"\r
@@ -1116,10 +1112,10 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5BBA58EFC5A9495BBEF1752E15F4A077"\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5914C46E15794A9093C5BF50A983D502"\r
             {\r
-            "SourcePath" = "8:README.txt"\r
-            "TargetName" = "8:README.txt"\r
+            "SourcePath" = "8:..\\doc\\help\\man-ippfind.html"\r
+            "TargetName" = "8:man-ippfind.html"\r
             "Tag" = "8:"\r
             "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
             "Condition" = "8:"\r
@@ -1136,12 +1132,12 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5ED87BAE980C4992A4C74AEAEC4A57CF"\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5BBA58EFC5A9495BBEF1752E15F4A077"\r
             {\r
-            "SourcePath" = "8:..\\cups\\ppd.h"\r
-            "TargetName" = "8:ppd.h"\r
+            "SourcePath" = "8:README.txt"\r
+            "TargetName" = "8:README.txt"\r
             "Tag" = "8:"\r
-            "Folder" = "8:_8EF6B1AA25034DB9BCC44F5A3CCFF9F0"\r
+            "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
             "Condition" = "8:"\r
             "Transitive" = "11:FALSE"\r
             "Vital" = "11:TRUE"\r
@@ -1156,12 +1152,12 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_64CCFE4D849E75157BBA3DD0A981DEE6"\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5ED87BAE980C4992A4C74AEAEC4A57CF"\r
             {\r
-            "SourcePath" = "8:CRYPT32.dll"\r
-            "TargetName" = "8:CRYPT32.dll"\r
+            "SourcePath" = "8:..\\cups\\ppd.h"\r
+            "TargetName" = "8:ppd.h"\r
             "Tag" = "8:"\r
-            "Folder" = "8:_C8D931ADC425446B916E9711B929659F"\r
+            "Folder" = "8:_8EF6B1AA25034DB9BCC44F5A3CCFF9F0"\r
             "Condition" = "8:"\r
             "Transitive" = "11:FALSE"\r
             "Vital" = "11:TRUE"\r
@@ -1173,7 +1169,7 @@
             "PackageAs" = "3:1"\r
             "Register" = "3:1"\r
             "Exclude" = "11:FALSE"\r
-            "IsDependency" = "11:TRUE"\r
+            "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_65560B58BEBF468C9D06493456A17DEC"\r
@@ -1336,26 +1332,6 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8400394709ED174EDB995EE7D2002030"\r
-            {\r
-            "SourcePath" = "8:Secur32.dll"\r
-            "TargetName" = "8:Secur32.dll"\r
-            "Tag" = "8:"\r
-            "Folder" = "8:_C8D931ADC425446B916E9711B929659F"\r
-            "Condition" = "8:"\r
-            "Transitive" = "11:FALSE"\r
-            "Vital" = "11:TRUE"\r
-            "ReadOnly" = "11:FALSE"\r
-            "Hidden" = "11:FALSE"\r
-            "System" = "11:FALSE"\r
-            "Permanent" = "11:FALSE"\r
-            "SharedLegacy" = "11:FALSE"\r
-            "PackageAs" = "3:1"\r
-            "Register" = "3:1"\r
-            "Exclude" = "11:FALSE"\r
-            "IsDependency" = "11:TRUE"\r
-            "IsolateTo" = "8:"\r
-            }\r
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_860678A628E34D219950C2E2B1BE6A89"\r
             {\r
             "SourcePath" = "8:..\\doc\\help\\api-raster.html"\r
@@ -1496,12 +1472,12 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B38E399C93724A9BB5F429DABBA6301F"\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B15F5898006758C3483850D50CA2C7F0"\r
             {\r
-            "SourcePath" = "8:..\\test\\print-job-deflate.test"\r
-            "TargetName" = "8:print-job-deflate.test"\r
+            "SourcePath" = "8:Secur32.dll"\r
+            "TargetName" = "8:Secur32.dll"\r
             "Tag" = "8:"\r
-            "Folder" = "8:_9DFBB4777E594B0F8884792467931241"\r
+            "Folder" = "8:_C8D931ADC425446B916E9711B929659F"\r
             "Condition" = "8:"\r
             "Transitive" = "11:FALSE"\r
             "Vital" = "11:TRUE"\r
@@ -1513,15 +1489,15 @@
             "PackageAs" = "3:1"\r
             "Register" = "3:1"\r
             "Exclude" = "11:FALSE"\r
-            "IsDependency" = "11:FALSE"\r
+            "IsDependency" = "11:TRUE"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BF7DFB3EEB1A6396025E468768AC5AB1"\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B38E399C93724A9BB5F429DABBA6301F"\r
             {\r
-            "SourcePath" = "8:zlibwapi.dll"\r
-            "TargetName" = "8:zlibwapi.dll"\r
+            "SourcePath" = "8:..\\test\\print-job-deflate.test"\r
+            "TargetName" = "8:print-job-deflate.test"\r
             "Tag" = "8:"\r
-            "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
+            "Folder" = "8:_9DFBB4777E594B0F8884792467931241"\r
             "Condition" = "8:"\r
             "Transitive" = "11:FALSE"\r
             "Vital" = "11:TRUE"\r
@@ -1533,7 +1509,7 @@
             "PackageAs" = "3:1"\r
             "Register" = "3:1"\r
             "Exclude" = "11:FALSE"\r
-            "IsDependency" = "11:TRUE"\r
+            "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C1FCE2FAE4714A719B7B430E2BE93CBB"\r
@@ -1596,6 +1572,26 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CAF8F7B63E0E9F92F4B3B83FA9CC5424"\r
+            {\r
+            "SourcePath" = "8:zlibwapi.dll"\r
+            "TargetName" = "8:zlibwapi.dll"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
+            "Condition" = "8:"\r
+            "Transitive" = "11:FALSE"\r
+            "Vital" = "11:TRUE"\r
+            "ReadOnly" = "11:FALSE"\r
+            "Hidden" = "11:FALSE"\r
+            "System" = "11:FALSE"\r
+            "Permanent" = "11:FALSE"\r
+            "SharedLegacy" = "11:FALSE"\r
+            "PackageAs" = "3:1"\r
+            "Register" = "3:1"\r
+            "Exclude" = "11:FALSE"\r
+            "IsDependency" = "11:TRUE"\r
+            "IsolateTo" = "8:"\r
+            }\r
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CD0CFE42ED2D4416A01253E12A0082A8"\r
             {\r
             "SourcePath" = "8:..\\test\\testfile.pdf"\r
@@ -2557,49 +2553,7 @@
         }\r
         "MergeModule"\r
         {\r
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_2B4CDFC508564D57A5C27766923D822E"\r
-            {\r
-            "UseDynamicProperties" = "11:TRUE"\r
-            "IsDependency" = "11:TRUE"\r
-            "SourcePath" = "8:policy_9_0_Microsoft_VC90_DebugCRT_x86_x64.msm"\r
-                "Properties"\r
-                {\r
-                }\r
-            "LanguageId" = "3:0"\r
-            "Exclude" = "11:FALSE"\r
-            "Folder" = "8:"\r
-            "Feature" = "8:"\r
-            "IsolateTo" = "8:"\r
-            }\r
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_2F26FF10F81046A9A863995A1D5F449E"\r
-            {\r
-            "UseDynamicProperties" = "11:TRUE"\r
-            "IsDependency" = "11:TRUE"\r
-            "SourcePath" = "8:microsoft_vc90_crt_x86_x64.msm"\r
-                "Properties"\r
-                {\r
-                }\r
-            "LanguageId" = "3:0"\r
-            "Exclude" = "11:FALSE"\r
-            "Folder" = "8:"\r
-            "Feature" = "8:"\r
-            "IsolateTo" = "8:"\r
-            }\r
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_7014E39650EC41979A77C81B8C8636C5"\r
-            {\r
-            "UseDynamicProperties" = "11:TRUE"\r
-            "IsDependency" = "11:TRUE"\r
-            "SourcePath" = "8:microsoft_vc90_debugcrt_x86_x64.msm"\r
-                "Properties"\r
-                {\r
-                }\r
-            "LanguageId" = "3:0"\r
-            "Exclude" = "11:FALSE"\r
-            "Folder" = "8:"\r
-            "Feature" = "8:"\r
-            "IsolateTo" = "8:"\r
-            }\r
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_7E5E5AB3D3C0409AB04A160380C1B03A"\r
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_B7023A0B2ADF4B4D822FAEE062F9BD87"\r
             {\r
             "UseDynamicProperties" = "11:TRUE"\r
             "IsDependency" = "11:TRUE"\r
@@ -2613,49 +2567,7 @@
             "Feature" = "8:"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_B1520DB5B1CE4CA392FF0EB614535300"\r
-            {\r
-            "UseDynamicProperties" = "11:TRUE"\r
-            "IsDependency" = "11:TRUE"\r
-            "SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86.msm"\r
-                "Properties"\r
-                {\r
-                }\r
-            "LanguageId" = "3:0"\r
-            "Exclude" = "11:FALSE"\r
-            "Folder" = "8:"\r
-            "Feature" = "8:"\r
-            "IsolateTo" = "8:"\r
-            }\r
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_B77819C33E084E13AC78EAF9234C67E1"\r
-            {\r
-            "UseDynamicProperties" = "11:TRUE"\r
-            "IsDependency" = "11:TRUE"\r
-            "SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86_x64.msm"\r
-                "Properties"\r
-                {\r
-                }\r
-            "LanguageId" = "3:0"\r
-            "Exclude" = "11:FALSE"\r
-            "Folder" = "8:"\r
-            "Feature" = "8:"\r
-            "IsolateTo" = "8:"\r
-            }\r
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_B820F65C4D844938881581933D156B34"\r
-            {\r
-            "UseDynamicProperties" = "11:TRUE"\r
-            "IsDependency" = "11:TRUE"\r
-            "SourcePath" = "8:microsoft_vc90_crt_x86.msm"\r
-                "Properties"\r
-                {\r
-                }\r
-            "LanguageId" = "3:0"\r
-            "Exclude" = "11:FALSE"\r
-            "Folder" = "8:"\r
-            "Feature" = "8:"\r
-            "IsolateTo" = "8:"\r
-            }\r
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_E4DC6765AD3348C28401914D2B7BC71A"\r
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_F39E4E6E6DCB48E08E9E51E724E77DCF"\r
             {\r
             "UseDynamicProperties" = "11:TRUE"\r
             "IsDependency" = "11:TRUE"\r
@@ -2674,7 +2586,7 @@
         {\r
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_0299839A2CCC4F908C5D3A8F465F3FFE"\r
             {\r
-            "SourcePath" = "8:x64\\Debug\\libcupsimage2.dll"\r
+            "SourcePath" = "8:Win32\\Debug\\libcupsimage2.dll"\r
             "TargetName" = "8:"\r
             "Tag" = "8:"\r
             "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
@@ -2730,7 +2642,7 @@
             }\r
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_364DCCAFF25145BCBE75FFEEDCC75B3A"\r
             {\r
-            "SourcePath" = "8:x64\\Debug\\cupstestppd.exe"\r
+            "SourcePath" = "8:Win32\\Debug\\cupstestppd.exe"\r
             "TargetName" = "8:"\r
             "Tag" = "8:"\r
             "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
@@ -2840,9 +2752,37 @@
                 {\r
                 }\r
             }\r
+            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_5B2FBC1C3AD5490689A61629854C80AF"\r
+            {\r
+            "SourcePath" = "8:Win32\\Debug\\ippfind.exe"\r
+            "TargetName" = "8:"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
+            "Condition" = "8:"\r
+            "Transitive" = "11:FALSE"\r
+            "Vital" = "11:TRUE"\r
+            "ReadOnly" = "11:FALSE"\r
+            "Hidden" = "11:FALSE"\r
+            "System" = "11:FALSE"\r
+            "Permanent" = "11:FALSE"\r
+            "SharedLegacy" = "11:FALSE"\r
+            "PackageAs" = "3:1"\r
+            "Register" = "3:1"\r
+            "Exclude" = "11:FALSE"\r
+            "IsDependency" = "11:FALSE"\r
+            "IsolateTo" = "8:"\r
+            "ProjectOutputGroupRegister" = "3:1"\r
+            "OutputConfiguration" = "8:"\r
+            "OutputGroupCanonicalName" = "8:Built"\r
+            "OutputProjectGuid" = "8:{B484DA0C-62C8-4C32-83B6-CCEB58968B85}"\r
+            "ShowKeyOutput" = "11:TRUE"\r
+                "ExcludeFilters"\r
+                {\r
+                }\r
+            }\r
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B20638175CCB42398417E0683A12469C"\r
             {\r
-            "SourcePath" = "8:x64\\Debug\\ipptool.exe"\r
+            "SourcePath" = "8:Win32\\Debug\\ipptool.exe"\r
             "TargetName" = "8:"\r
             "Tag" = "8:"\r
             "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
@@ -2926,7 +2866,7 @@
             }\r
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D02EB13951314EFD9C539150EF8E53B8"\r
             {\r
-            "SourcePath" = "8:x64\\Release\\regex.dll"\r
+            "SourcePath" = "8:Win32\\Debug\\regex.dll"\r
             "TargetName" = "8:"\r
             "Tag" = "8:"\r
             "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
@@ -3010,7 +2950,7 @@
             }\r
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_EA282F32A10B4ED1A81AA6133B997C6A"\r
             {\r
-            "SourcePath" = "8:x64\\Debug\\libcups2.dll"\r
+            "SourcePath" = "8:Win32\\Debug\\libcups2.dll"\r
             "TargetName" = "8:"\r
             "Tag" = "8:"\r
             "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r

diff --git a/vcnet/libcups2.vcproj b/vcnet/libcups2.vcproj
index fcb94ea884e413f3474fa58b111af2b27382ef70..2580eb21a2406b7bed4e40f52a3f3aec7db23dc2 100644 (file)
--- a/vcnet/libcups2.vcproj
+++ b/vcnet/libcups2.vcproj
@@ -45,7 +45,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\vcnet;..;..\vcnet\regex"\r
+                               AdditionalIncludeDirectories="..\vcnet,..,..\vcnet\regex"\r
                                PreprocessorDefinitions="ZLIB_WINAPI;WIN32;DEBUG;_DEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -129,7 +129,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\vcnet,.."\r
+                               AdditionalIncludeDirectories="..\vcnet,..,..\vcnet\regex"\r
                                PreprocessorDefinitions="ZLIB_WINAPI;WIN32;DEBUG;_DEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -209,7 +209,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="1"\r
-                               AdditionalIncludeDirectories="..\vcnet;..;..\vcnet\regex"\r
+                               AdditionalIncludeDirectories="..\vcnet,..,..\vcnet\regex"\r
                                PreprocessorDefinitions="ZLIB_WINAPI;WIN32;DEBUG;NDEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
@@ -293,7 +293,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="1"\r
-                               AdditionalIncludeDirectories="..\vcnet,.."\r
+                               AdditionalIncludeDirectories="..\vcnet,..,..\vcnet\regex"\r
                                PreprocessorDefinitions="ZLIB_WINAPI;WIN32;DEBUG;NDEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r