Fix VC++ builds and sync up installers.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10951 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/cups/libcups2.def b/cups/libcups2.def
index c4cf46212645f183c17fb5ccd248ec2e687b320e..8745d9e142b17e6d2a991c13149a7f50f95c57ed 100644 (file)
--- a/cups/libcups2.def
+++ b/cups/libcups2.def
@@ -61,14 +61,6 @@ _ppdNormalizeMakeAndModel
 _ppdOpen\r
 _ppdOpenFile\r
 _ppdParseOptions\r
-_pwgGenerateSize\r
-_pwgInitSize\r
-_pwgMediaForLegacy\r
-_pwgMediaForPPD\r
-_pwgMediaForPWG\r
-_pwgMediaForSize\r
-_pwgMediaTypeForType\r
-_pwgPageSizeForMedia\r
 cupsAddDest\r
 cupsAddOption\r
 cupsAdminCreateWindowsPPD\r
@@ -134,6 +126,9 @@ cupsFileStdout
 cupsFileTell\r
 cupsFileUnlock\r
 cupsFileWrite\r
+cupsFindDestDefault\r
+cupsFindDestReady\r
+cupsFindDestSupported\r
 cupsFreeDests\r
 cupsFreeJobs\r
 cupsFreeOptions\r
@@ -141,6 +136,9 @@ cupsGetClasses
 cupsGetDefault\r
 cupsGetDefault2\r
 cupsGetDest\r
+cupsGetDestMediaByIndex\r
+cupsGetDestMediaCount\r
+cupsGetDestMediaDefault\r
 cupsGetDests\r
 cupsGetDests2\r
 cupsGetFd\r
@@ -301,6 +299,7 @@ ippContainsInteger
 ippContainsString\r
 ippCopyAttribute\r
 ippCopyAttributes\r
+ippCreateRequestedArray\r
 ippDateToTime\r
 ippDelete\r
 ippDeleteAttribute\r
@@ -319,6 +318,7 @@ ippGetDate
 ippGetGroupTag\r
 ippGetInteger\r
 ippGetName\r
+ippGetOctetString\r
 ippGetOperation\r
 ippGetRange\r
 ippGetRequestId\r
@@ -346,6 +346,7 @@ ippSetDate
 ippSetGroupTag\r
 ippSetInteger\r
 ippSetName\r
+ippSetOctetString\r
 ippSetOperation\r
 ippSetRange\r
 ippSetRequestId\r
@@ -400,3 +401,9 @@ ppdPageLength
 ppdPageSize\r
 ppdPageWidth\r
 ppdSetConformance\r
+pwgFormatSizeName\r
+pwgInitSize\r
+pwgMediaForLegacy\r
+pwgMediaForPPD\r
+pwgMediaForPWG\r
+pwgMediaForSize\r

diff --git a/systemv/cupstestppd.c b/systemv/cupstestppd.c
index bc07bdd73b615afcbb87b4ae5751a10a57bac707..7c080a9369c91a4c51a2a576c14664090a34825f 100644 (file)
--- a/systemv/cupstestppd.c
+++ b/systemv/cupstestppd.c
@@ -3215,7 +3215,7 @@ check_sizes(ppd_file_t *ppd,              /* I - PPD file */
       length_2540ths = (size->length > size->width) ?
                            PWG_FROM_POINTS(size->length) :
                           PWG_FROM_POINTS(size->width);
-      pwg_media      = _pwgMediaForSize(width_2540ths, length_2540ths);
+      pwg_media      = pwgMediaForSize(width_2540ths, length_2540ths);
 
       if (pwg_media &&
           (fabs(pwg_media->width - width_2540ths) > 34 ||

diff --git a/vcnet/ipptool-installer.vdproj b/vcnet/ipptool-installer.vdproj
index 45f9084a29a7ef825a98a1928cba9bb3db121b6b..89cf278b393c0cc714b1695a17568ec66c3076d5 100644 (file)
--- a/vcnet/ipptool-installer.vdproj
+++ b/vcnet/ipptool-installer.vdproj
@@ -27,12 +27,6 @@
         }\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
@@ -81,6 +75,18 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_53657E2E11814303B218D8DF1CED7298"\r
+        "OwnerKey" = "8:_D02EB13951314EFD9C539150EF8E53B8"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
+        "MsmKey" = "8:_53657E2E11814303B218D8DF1CED7298"\r
+        "OwnerKey" = "8:_E97571D3FBE048DABDC59B37762D800F"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_65CBD149C9DA448FBACE2B02766A6537"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -123,20 +129,14 @@
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_9967519E7058965D4C7DEF47EB39CC50"\r
-        "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"\r
+        "MsmKey" = "8:_962EDAE5C1924E75B67815861062D102"\r
+        "OwnerKey" = "8:_53657E2E11814303B218D8DF1CED7298"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_9FBF78D7B89EEA843380D5F10E1954D7"\r
-        "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"\r
-        "MsmSig" = "8:_UNDEFINED"\r
-        }\r
-        "Entry"\r
-        {\r
-        "MsmKey" = "8:_AB0BD66B57BF4C41BE53BCE573C254BC"\r
-        "OwnerKey" = "8:_F208E348BAE54EDEA200755E5C149F13"\r
+        "MsmKey" = "8:_A63C5C4108AB4B588878482B26876DC5"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
@@ -255,24 +255,6 @@
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_F208E348BAE54EDEA200755E5C149F13"\r
-        "OwnerKey" = "8:_D02EB13951314EFD9C539150EF8E53B8"\r
-        "MsmSig" = "8:_UNDEFINED"\r
-        }\r
-        "Entry"\r
-        {\r
-        "MsmKey" = "8:_F208E348BAE54EDEA200755E5C149F13"\r
-        "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"\r
-        "MsmSig" = "8:_UNDEFINED"\r
-        }\r
-        "Entry"\r
-        {\r
-        "MsmKey" = "8:_F208E348BAE54EDEA200755E5C149F13"\r
-        "OwnerKey" = "8:_E97571D3FBE048DABDC59B37762D800F"\r
-        "MsmSig" = "8:_UNDEFINED"\r
-        }\r
-        "Entry"\r
-        {\r
         "MsmKey" = "8:_F22F5380A6E14A43A15A452C7C6F6C07"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -414,26 +396,6 @@
             "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
@@ -734,32 +696,12 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9967519E7058965D4C7DEF47EB39CC50"\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A63C5C4108AB4B588878482B26876DC5"\r
             {\r
-            "SourcePath" = "8:CRYPT32.dll"\r
-            "TargetName" = "8:CRYPT32.dll"\r
+            "SourcePath" = "8:..\\test\\validate-job.test"\r
+            "TargetName" = "8:validate-job.test"\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:TRUE"\r
-            "IsDependency" = "11:TRUE"\r
-            "IsolateTo" = "8:"\r
-            }\r
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9FBF78D7B89EEA843380D5F10E1954D7"\r
-            {\r
-            "SourcePath" = "8:Secur32.dll"\r
-            "TargetName" = "8:Secur32.dll"\r
-            "Tag" = "8:"\r
-            "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
+            "Folder" = "8:_EB00D0298C7E441EBD0257AC04FB3560"\r
             "Condition" = "8:"\r
             "Transitive" = "11:FALSE"\r
             "Vital" = "11:TRUE"\r
@@ -770,8 +712,8 @@
             "SharedLegacy" = "11:FALSE"\r
             "PackageAs" = "3:1"\r
             "Register" = "3:1"\r
-            "Exclude" = "11:TRUE"\r
-            "IsDependency" = "11:TRUE"\r
+            "Exclude" = "11:FALSE"\r
+            "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_AF057921D20E4520A3C6420F0729A744"\r
@@ -1193,7 +1135,7 @@
         "Name" = "8:Microsoft Visual Studio"\r
         "ProductName" = "8:ipptool for Windows"\r
         "ProductCode" = "8:{BADD3454-4180-4519-B1CA-5C255DAB0047}"\r
-        "PackageCode" = "8:{3C801C7B-F294-47ED-9146-D35C6B48C3B9}"\r
+        "PackageCode" = "8:{96C55675-F0E6-405C-B8EF-F1BFF11F94A5}"\r
         "UpgradeCode" = "8:{BAB6EBBB-515D-4155-9FEF-D98DA76814CA}"\r
         "RestartWWWService" = "11:FALSE"\r
         "RemovePreviousVersions" = "11:TRUE"\r
@@ -1758,11 +1700,11 @@
         }\r
         "MergeModule"\r
         {\r
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_AB0BD66B57BF4C41BE53BCE573C254BC"\r
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_53657E2E11814303B218D8DF1CED7298"\r
             {\r
             "UseDynamicProperties" = "11:TRUE"\r
             "IsDependency" = "11:TRUE"\r
-            "SourcePath" = "8:microsoft_vc90_debugcrt_x86.msm"\r
+            "SourcePath" = "8:policy_9_0_Microsoft_VC90_DebugCRT_x86.msm"\r
                 "Properties"\r
                 {\r
                 }\r
@@ -1772,11 +1714,11 @@
             "Feature" = "8:"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_F208E348BAE54EDEA200755E5C149F13"\r
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_962EDAE5C1924E75B67815861062D102"\r
             {\r
             "UseDynamicProperties" = "11:TRUE"\r
             "IsDependency" = "11:TRUE"\r
-            "SourcePath" = "8:policy_9_0_Microsoft_VC90_DebugCRT_x86.msm"\r
+            "SourcePath" = "8:microsoft_vc90_debugcrt_x86.msm"\r
                 "Properties"\r
                 {\r
                 }\r

diff --git a/vcnet/libcups2-installer.vdproj b/vcnet/libcups2-installer.vdproj
index 75d6dd8cff207daeb56b13ed5dd5bfb0fc9e037e..84994f72ee7cf3796c54a004e5fb7617e8e724d2 100644 (file)
--- a/vcnet/libcups2-installer.vdproj
+++ b/vcnet/libcups2-installer.vdproj
@@ -45,14 +45,14 @@
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_1AF767BD52F94DC08C2CBE11DA41E95A"\r
+        "MsmKey" = "8:_1859B81745C54E228CDCA94F130C8150"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_1DFD9AECD1AD4B2291DD52028E866569"\r
-        "OwnerKey" = "8:_62CA00B1E5E4460CA93EE7E2B8FE878B"\r
+        "MsmKey" = "8:_1AF767BD52F94DC08C2CBE11DA41E95A"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
@@ -69,12 +69,24 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_232E0EB837A04A5B90312D947F1A7905"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_24E7DBA1F5964574A8251258BCDC935D"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_253C714B01974C9BB1A698DD449F588D"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_260594D75E4B4764BBAFE25C15E4F273"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -117,56 +129,50 @@
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_3CFC5A9B09ED4916A350B88FEF4662CC"\r
-        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmKey" = "8:_3A7FB149E6D64E78A9792E52A6D905FD"\r
+        "OwnerKey" = "8:_FC564AE377AF4166919D500C98F403DA"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_4879AF80C19D4ED9A3758DCC412190FB"\r
+        "MsmKey" = "8:_3CFC5A9B09ED4916A350B88FEF4662CC"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_574EE5A852D3434987B58E3B8118C1C2"\r
+        "MsmKey" = "8:_3CFD2A1A9D824E2491CC2BAC1334BA13"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_5ED87BAE980C4992A4C74AEAEC4A57CF"\r
+        "MsmKey" = "8:_4879AF80C19D4ED9A3758DCC412190FB"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_62CA00B1E5E4460CA93EE7E2B8FE878B"\r
-        "OwnerKey" = "8:_0299839A2CCC4F908C5D3A8F465F3FFE"\r
-        "MsmSig" = "8:_UNDEFINED"\r
-        }\r
-        "Entry"\r
-        {\r
-        "MsmKey" = "8:_62CA00B1E5E4460CA93EE7E2B8FE878B"\r
-        "OwnerKey" = "8:_B20638175CCB42398417E0683A12469C"\r
+        "MsmKey" = "8:_4A46F690254944ECBF1539E2C2F86A59"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_62CA00B1E5E4460CA93EE7E2B8FE878B"\r
-        "OwnerKey" = "8:_364DCCAFF25145BCBE75FFEEDCC75B3A"\r
+        "MsmKey" = "8:_51381771E03E40DEA842E785C9B7A31B"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_62CA00B1E5E4460CA93EE7E2B8FE878B"\r
-        "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"\r
+        "MsmKey" = "8:_574EE5A852D3434987B58E3B8118C1C2"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_62CA00B1E5E4460CA93EE7E2B8FE878B"\r
-        "OwnerKey" = "8:_D02EB13951314EFD9C539150EF8E53B8"\r
+        "MsmKey" = "8:_5ED87BAE980C4992A4C74AEAEC4A57CF"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
@@ -201,38 +207,38 @@
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_7FC58520B0F44E3E95A207905CABFED4"\r
+        "MsmKey" = "8:_7A478A9B37C44B22BD4F926913C9A5B7"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_860678A628E34D219950C2E2B1BE6A89"\r
+        "MsmKey" = "8:_7FC58520B0F44E3E95A207905CABFED4"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_8CCA95F5402D439B9B9CAC6F0FC1A443"\r
+        "MsmKey" = "8:_860678A628E34D219950C2E2B1BE6A89"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_9967519E7058965D4C7DEF47EB39CC50"\r
-        "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"\r
+        "MsmKey" = "8:_8CCA95F5402D439B9B9CAC6F0FC1A443"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_9D69B0FC2413407BA24D88B73EF456AA"\r
+        "MsmKey" = "8:_933D37C7FEBF4B8AAF9E6CE01A605039"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_9FBF78D7B89EEA843380D5F10E1954D7"\r
-        "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"\r
+        "MsmKey" = "8:_9D69B0FC2413407BA24D88B73EF456AA"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
@@ -261,6 +267,12 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_B38E399C93724A9BB5F429DABBA6301F"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_C1FCE2FAE4714A719B7B430E2BE93CBB"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -291,6 +303,12 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_CE2A836CE5AF4404B8672B100A9FC9ED"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_D02EB13951314EFD9C539150EF8E53B8"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -351,10 +369,40 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_F7FBD6E1C73B45EA813FB1D5E6050650"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_FA604C5C4FDD4D7B8110AFC6B603FBAF"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
+        "Entry"\r
+        {\r
+        "MsmKey" = "8:_FC564AE377AF4166919D500C98F403DA"\r
+        "OwnerKey" = "8:_0299839A2CCC4F908C5D3A8F465F3FFE"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
+        "MsmKey" = "8:_FC564AE377AF4166919D500C98F403DA"\r
+        "OwnerKey" = "8:_D02EB13951314EFD9C539150EF8E53B8"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
+        "MsmKey" = "8:_FC564AE377AF4166919D500C98F403DA"\r
+        "OwnerKey" = "8:_B20638175CCB42398417E0683A12469C"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
+        "MsmKey" = "8:_FC564AE377AF4166919D500C98F403DA"\r
+        "OwnerKey" = "8:_364DCCAFF25145BCBE75FFEEDCC75B3A"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
     }\r
     "Configurations"\r
     {\r
@@ -532,6 +580,26 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1859B81745C54E228CDCA94F130C8150"\r
+            {\r
+            "SourcePath" = "8:..\\test\\get-notifications.test"\r
+            "TargetName" = "8:get-notifications.test"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_9DFBB4777E594B0F8884792467931241"\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}:_1AF767BD52F94DC08C2CBE11DA41E95A"\r
             {\r
             "SourcePath" = "8:..\\doc\\images\\raster.png"\r
@@ -577,7 +645,27 @@
             "SourcePath" = "8:..\\cups\\adminutil.h"\r
             "TargetName" = "8:adminutil.h"\r
             "Tag" = "8:"\r
-            "Folder" = "8:_121A70CA434045EDB010E7480AFCEF18"\r
+            "Folder" = "8:_8EF6B1AA25034DB9BCC44F5A3CCFF9F0"\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}:_232E0EB837A04A5B90312D947F1A7905"\r
+            {\r
+            "SourcePath" = "8:..\\doc\\help\\man-ipptool.html"\r
+            "TargetName" = "8:man-ipptool.html"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_24DE31CE70694FD2977B5FB38F24D77F"\r
             "Condition" = "8:"\r
             "Transitive" = "11:FALSE"\r
             "Vital" = "11:TRUE"\r
@@ -597,7 +685,27 @@
             "SourcePath" = "8:..\\cups\\http.h"\r
             "TargetName" = "8:http.h"\r
             "Tag" = "8:"\r
-            "Folder" = "8:_121A70CA434045EDB010E7480AFCEF18"\r
+            "Folder" = "8:_8EF6B1AA25034DB9BCC44F5A3CCFF9F0"\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}:_253C714B01974C9BB1A698DD449F588D"\r
+            {\r
+            "SourcePath" = "8:..\\test\\validate-job.test"\r
+            "TargetName" = "8:validate-job.test"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_9DFBB4777E594B0F8884792467931241"\r
             "Condition" = "8:"\r
             "Transitive" = "11:FALSE"\r
             "Vital" = "11:TRUE"\r
@@ -657,7 +765,7 @@
             "SourcePath" = "8:..\\cups\\ipp.h"\r
             "TargetName" = "8:ipp.h"\r
             "Tag" = "8:"\r
-            "Folder" = "8:_121A70CA434045EDB010E7480AFCEF18"\r
+            "Folder" = "8:_8EF6B1AA25034DB9BCC44F5A3CCFF9F0"\r
             "Condition" = "8:"\r
             "Transitive" = "11:FALSE"\r
             "Vital" = "11:TRUE"\r
@@ -737,7 +845,27 @@
             "SourcePath" = "8:..\\cups\\transcode.h"\r
             "TargetName" = "8:transcode.h"\r
             "Tag" = "8:"\r
-            "Folder" = "8:_121A70CA434045EDB010E7480AFCEF18"\r
+            "Folder" = "8:_8EF6B1AA25034DB9BCC44F5A3CCFF9F0"\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}:_3CFD2A1A9D824E2491CC2BAC1334BA13"\r
+            {\r
+            "SourcePath" = "8:..\\test\\get-subscriptions.test"\r
+            "TargetName" = "8:get-subscriptions.test"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_9DFBB4777E594B0F8884792467931241"\r
             "Condition" = "8:"\r
             "Transitive" = "11:FALSE"\r
             "Vital" = "11:TRUE"\r
@@ -757,7 +885,47 @@
             "SourcePath" = "8:..\\cups\\raster.h"\r
             "TargetName" = "8:raster.h"\r
             "Tag" = "8:"\r
-            "Folder" = "8:_121A70CA434045EDB010E7480AFCEF18"\r
+            "Folder" = "8:_8EF6B1AA25034DB9BCC44F5A3CCFF9F0"\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}:_4A46F690254944ECBF1539E2C2F86A59"\r
+            {\r
+            "SourcePath" = "8:..\\doc\\help\\man-ipptoolfile.html"\r
+            "TargetName" = "8:man-ipptoolfile.html"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_24DE31CE70694FD2977B5FB38F24D77F"\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}:_51381771E03E40DEA842E785C9B7A31B"\r
+            {\r
+            "SourcePath" = "8:..\\test\\print-job-gzip.test"\r
+            "TargetName" = "8:print-job-gzip.test"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_9DFBB4777E594B0F8884792467931241"\r
             "Condition" = "8:"\r
             "Transitive" = "11:FALSE"\r
             "Vital" = "11:TRUE"\r
@@ -777,7 +945,7 @@
             "SourcePath" = "8:..\\cups\\array.h"\r
             "TargetName" = "8:array.h"\r
             "Tag" = "8:"\r
-            "Folder" = "8:_121A70CA434045EDB010E7480AFCEF18"\r
+            "Folder" = "8:_8EF6B1AA25034DB9BCC44F5A3CCFF9F0"\r
             "Condition" = "8:"\r
             "Transitive" = "11:FALSE"\r
             "Vital" = "11:TRUE"\r
@@ -797,7 +965,7 @@
             "SourcePath" = "8:..\\cups\\ppd.h"\r
             "TargetName" = "8:ppd.h"\r
             "Tag" = "8:"\r
-            "Folder" = "8:_121A70CA434045EDB010E7480AFCEF18"\r
+            "Folder" = "8:_8EF6B1AA25034DB9BCC44F5A3CCFF9F0"\r
             "Condition" = "8:"\r
             "Transitive" = "11:FALSE"\r
             "Vital" = "11:TRUE"\r
@@ -817,7 +985,7 @@
             "SourcePath" = "8:..\\cups\\language.h"\r
             "TargetName" = "8:language.h"\r
             "Tag" = "8:"\r
-            "Folder" = "8:_121A70CA434045EDB010E7480AFCEF18"\r
+            "Folder" = "8:_8EF6B1AA25034DB9BCC44F5A3CCFF9F0"\r
             "Condition" = "8:"\r
             "Transitive" = "11:FALSE"\r
             "Vital" = "11:TRUE"\r
@@ -877,7 +1045,7 @@
             "SourcePath" = "8:..\\cups\\versioning.h"\r
             "TargetName" = "8:versioning.h"\r
             "Tag" = "8:"\r
-            "Folder" = "8:_121A70CA434045EDB010E7480AFCEF18"\r
+            "Folder" = "8:_8EF6B1AA25034DB9BCC44F5A3CCFF9F0"\r
             "Condition" = "8:"\r
             "Transitive" = "11:FALSE"\r
             "Vital" = "11:TRUE"\r
@@ -897,7 +1065,27 @@
             "SourcePath" = "8:..\\cups\\dir.h"\r
             "TargetName" = "8:dir.h"\r
             "Tag" = "8:"\r
-            "Folder" = "8:_121A70CA434045EDB010E7480AFCEF18"\r
+            "Folder" = "8:_8EF6B1AA25034DB9BCC44F5A3CCFF9F0"\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}:_7A478A9B37C44B22BD4F926913C9A5B7"\r
+            {\r
+            "SourcePath" = "8:..\\test\\get-jobs.test"\r
+            "TargetName" = "8:get-jobs.test"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_9DFBB4777E594B0F8884792467931241"\r
             "Condition" = "8:"\r
             "Transitive" = "11:FALSE"\r
             "Vital" = "11:TRUE"\r
@@ -972,12 +1160,12 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9967519E7058965D4C7DEF47EB39CC50"\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_933D37C7FEBF4B8AAF9E6CE01A605039"\r
             {\r
-            "SourcePath" = "8:CRYPT32.dll"\r
-            "TargetName" = "8:CRYPT32.dll"\r
+            "SourcePath" = "8:..\\test\\ipp-everywhere.test"\r
+            "TargetName" = "8:ipp-everywhere.test"\r
             "Tag" = "8:"\r
-            "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
+            "Folder" = "8:_9DFBB4777E594B0F8884792467931241"\r
             "Condition" = "8:"\r
             "Transitive" = "11:FALSE"\r
             "Vital" = "11:TRUE"\r
@@ -988,8 +1176,8 @@
             "SharedLegacy" = "11:FALSE"\r
             "PackageAs" = "3:1"\r
             "Register" = "3:1"\r
-            "Exclude" = "11:TRUE"\r
-            "IsDependency" = "11:TRUE"\r
+            "Exclude" = "11:FALSE"\r
+            "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9D69B0FC2413407BA24D88B73EF456AA"\r
@@ -1012,12 +1200,12 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9FBF78D7B89EEA843380D5F10E1954D7"\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A271CCE042C14DDF8F0F1A1B16584F17"\r
             {\r
-            "SourcePath" = "8:Secur32.dll"\r
-            "TargetName" = "8:Secur32.dll"\r
+            "SourcePath" = "8:..\\doc\\help\\api-filedir.html"\r
+            "TargetName" = "8:api-filedir.html"\r
             "Tag" = "8:"\r
-            "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
+            "Folder" = "8:_24DE31CE70694FD2977B5FB38F24D77F"\r
             "Condition" = "8:"\r
             "Transitive" = "11:FALSE"\r
             "Vital" = "11:TRUE"\r
@@ -1028,16 +1216,16 @@
             "SharedLegacy" = "11:FALSE"\r
             "PackageAs" = "3:1"\r
             "Register" = "3:1"\r
-            "Exclude" = "11:TRUE"\r
-            "IsDependency" = "11:TRUE"\r
+            "Exclude" = "11:FALSE"\r
+            "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A271CCE042C14DDF8F0F1A1B16584F17"\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A513FBE6CC6247C19AF06829E5470D01"\r
             {\r
-            "SourcePath" = "8:..\\doc\\help\\api-filedir.html"\r
-            "TargetName" = "8:api-filedir.html"\r
+            "SourcePath" = "8:..\\test\\document-a4.pdf"\r
+            "TargetName" = "8:document-a4.pdf"\r
             "Tag" = "8:"\r
-            "Folder" = "8:_24DE31CE70694FD2977B5FB38F24D77F"\r
+            "Folder" = "8:_9DFBB4777E594B0F8884792467931241"\r
             "Condition" = "8:"\r
             "Transitive" = "11:FALSE"\r
             "Vital" = "11:TRUE"\r
@@ -1052,10 +1240,10 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A513FBE6CC6247C19AF06829E5470D01"\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A833908023464B61A160E0323C8E9606"\r
             {\r
-            "SourcePath" = "8:..\\test\\document-a4.pdf"\r
-            "TargetName" = "8:document-a4.pdf"\r
+            "SourcePath" = "8:..\\test\\document-letter.pdf"\r
+            "TargetName" = "8:document-letter.pdf"\r
             "Tag" = "8:"\r
             "Folder" = "8:_9DFBB4777E594B0F8884792467931241"\r
             "Condition" = "8:"\r
@@ -1072,10 +1260,10 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A833908023464B61A160E0323C8E9606"\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B38E399C93724A9BB5F429DABBA6301F"\r
             {\r
-            "SourcePath" = "8:..\\test\\document-letter.pdf"\r
-            "TargetName" = "8:document-letter.pdf"\r
+            "SourcePath" = "8:..\\test\\print-job-deflate.test"\r
+            "TargetName" = "8:print-job-deflate.test"\r
             "Tag" = "8:"\r
             "Folder" = "8:_9DFBB4777E594B0F8884792467931241"\r
             "Condition" = "8:"\r
@@ -1192,6 +1380,26 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CE2A836CE5AF4404B8672B100A9FC9ED"\r
+            {\r
+            "SourcePath" = "8:..\\IPPTOOL.txt"\r
+            "TargetName" = "8:IPPTOOL.txt"\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}:_D3B3B266E0FC45DD9B7EEBCC3AC52965"\r
             {\r
             "SourcePath" = "8:..\\test\\get-printer-attributes.test"\r
@@ -1277,7 +1485,7 @@
             "SourcePath" = "8:..\\cups\\cups.h"\r
             "TargetName" = "8:cups.h"\r
             "Tag" = "8:"\r
-            "Folder" = "8:_121A70CA434045EDB010E7480AFCEF18"\r
+            "Folder" = "8:_8EF6B1AA25034DB9BCC44F5A3CCFF9F0"\r
             "Condition" = "8:"\r
             "Transitive" = "11:FALSE"\r
             "Vital" = "11:TRUE"\r
@@ -1317,7 +1525,7 @@
             "SourcePath" = "8:..\\cups\\file.h"\r
             "TargetName" = "8:file.h"\r
             "Tag" = "8:"\r
-            "Folder" = "8:_121A70CA434045EDB010E7480AFCEF18"\r
+            "Folder" = "8:_8EF6B1AA25034DB9BCC44F5A3CCFF9F0"\r
             "Condition" = "8:"\r
             "Transitive" = "11:FALSE"\r
             "Vital" = "11:TRUE"\r
@@ -1352,6 +1560,26 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F7FBD6E1C73B45EA813FB1D5E6050650"\r
+            {\r
+            "SourcePath" = "8:..\\cups\\pwg.h"\r
+            "TargetName" = "8:pwg.h"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_8EF6B1AA25034DB9BCC44F5A3CCFF9F0"\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}:_FA604C5C4FDD4D7B8110AFC6B603FBAF"\r
             {\r
             "SourcePath" = "8:..\\test\\onepage-letter.ps"\r
@@ -1430,6 +1658,17 @@
                     "Property" = "8:_23D8BBBA9DEE4C8E88C9D1624DEAFB81"\r
                         "Folders"\r
                         {\r
+                            "{9EF0B969-E518-4E46-987F-47570745A589}:_8EF6B1AA25034DB9BCC44F5A3CCFF9F0"\r
+                            {\r
+                            "Name" = "8:cups"\r
+                            "AlwaysCreate" = "11:FALSE"\r
+                            "Condition" = "8:"\r
+                            "Transitive" = "11:FALSE"\r
+                            "Property" = "8:_61254DF68D8F4039997C263F7B45ABB8"\r
+                                "Folders"\r
+                                {\r
+                                }\r
+                            }\r
                         }\r
                     }\r
                     "{9EF0B969-E518-4E46-987F-47570745A589}:_24DE31CE70694FD2977B5FB38F24D77F"\r
@@ -1495,7 +1734,7 @@
         "Name" = "8:Microsoft Visual Studio"\r
         "ProductName" = "8:CUPS SDK for Windows"\r
         "ProductCode" = "8:{4E0D1662-B032-4CAD-8DBD-5302ADCE1C6F}"\r
-        "PackageCode" = "8:{00298F12-01DD-4785-9402-7A1E694F9577}"\r
+        "PackageCode" = "8:{EB6A403A-100A-4EDB-A727-C18FAC8E39E1}"\r
         "UpgradeCode" = "8:{BAB6EBBB-515D-4155-9FEF-D98DA76814CA}"\r
         "RestartWWWService" = "11:FALSE"\r
         "RemovePreviousVersions" = "11:TRUE"\r
@@ -2018,11 +2257,11 @@
         }\r
         "MergeModule"\r
         {\r
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_1DFD9AECD1AD4B2291DD52028E866569"\r
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_3A7FB149E6D64E78A9792E52A6D905FD"\r
             {\r
             "UseDynamicProperties" = "11:TRUE"\r
             "IsDependency" = "11:TRUE"\r
-            "SourcePath" = "8:microsoft_vc90_crt_x86.msm"\r
+            "SourcePath" = "8:microsoft_vc90_debugcrt_x86.msm"\r
                 "Properties"\r
                 {\r
                 }\r
@@ -2032,11 +2271,11 @@
             "Feature" = "8:"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_62CA00B1E5E4460CA93EE7E2B8FE878B"\r
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_FC564AE377AF4166919D500C98F403DA"\r
             {\r
             "UseDynamicProperties" = "11:TRUE"\r
             "IsDependency" = "11:TRUE"\r
-            "SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86.msm"\r
+            "SourcePath" = "8:policy_9_0_Microsoft_VC90_DebugCRT_x86.msm"\r
                 "Properties"\r
                 {\r
                 }\r
@@ -2051,7 +2290,7 @@
         {\r
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_0299839A2CCC4F908C5D3A8F465F3FFE"\r
             {\r
-            "SourcePath" = "8:Win32\\Release\\libcupsimage2.dll"\r
+            "SourcePath" = "8:Win32\\Debug\\libcupsimage2.dll"\r
             "TargetName" = "8:"\r
             "Tag" = "8:"\r
             "Folder" = "8:_C8D931ADC425446B916E9711B929659F"\r
@@ -2079,7 +2318,7 @@
             }\r
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_364DCCAFF25145BCBE75FFEEDCC75B3A"\r
             {\r
-            "SourcePath" = "8:Win32\\Release\\cupstestppd.exe"\r
+            "SourcePath" = "8:Win32\\Debug\\cupstestppd.exe"\r
             "TargetName" = "8:"\r
             "Tag" = "8:"\r
             "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
@@ -2107,7 +2346,7 @@
             }\r
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B20638175CCB42398417E0683A12469C"\r
             {\r
-            "SourcePath" = "8:Win32\\Release\\ipptool.exe"\r
+            "SourcePath" = "8:Win32\\Debug\\ipptool.exe"\r
             "TargetName" = "8:"\r
             "Tag" = "8:"\r
             "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
@@ -2135,7 +2374,7 @@
             }\r
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D02EB13951314EFD9C539150EF8E53B8"\r
             {\r
-            "SourcePath" = "8:Win32\\Release\\regex.dll"\r
+            "SourcePath" = "8:Win32\\Debug\\regex.dll"\r
             "TargetName" = "8:"\r
             "Tag" = "8:"\r
             "Folder" = "8:_C8D931ADC425446B916E9711B929659F"\r
@@ -2163,7 +2402,7 @@
             }\r
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_EA282F32A10B4ED1A81AA6133B997C6A"\r
             {\r
-            "SourcePath" = "8:Win32\\Release\\libcups2.dll"\r
+            "SourcePath" = "8:Win32\\Debug\\libcups2.dll"\r
             "TargetName" = "8:"\r
             "Tag" = "8:"\r
             "Folder" = "8:_C8D931ADC425446B916E9711B929659F"\r

diff --git a/vcnet/libcups2.vcproj b/vcnet/libcups2.vcproj
index b20812256ec965c84262327f1805a9eddaf3d763..fcb94ea884e413f3474fa58b111af2b27382ef70 100644 (file)
--- a/vcnet/libcups2.vcproj
+++ b/vcnet/libcups2.vcproj
@@ -4,6 +4,7 @@
        Version="9.00"\r
        Name="libcups2"\r
        ProjectGUID="{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}"\r
+       RootNamespace="libcups2"\r
        Keyword="Win32Proj"\r
        TargetFrameworkVersion="131072"\r
        >\r
@@ -483,6 +484,18 @@
                                RelativePath="..\cups\debug.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\cups\dest-job.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\dest-localization.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\dest-options.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\cups\dest.c"\r
                                >\r