Sync up libcups/ipptool installer payloads

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

diff --git a/vcnet/cups.sln b/vcnet/cups.sln
index 5fede836a1700286dbee640b3b42555b2440d640..2e674a6f6aef2929f448c9d9c4384b2845376acc 100644 (file)
--- a/vcnet/cups.sln
+++ b/vcnet/cups.sln
@@ -36,7 +36,7 @@ Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "ipptool-installer", "ipptoo
 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}") = "ipptool-installer", "libcups2-installer.vdproj", "{03CF67C2-3FF5-44EA-B3AF-FB62D3BED961}"\r
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "libcups2-installer", "libcups2-installer.vdproj", "{03CF67C2-3FF5-44EA-B3AF-FB62D3BED961}"\r
 EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
@@ -104,7 +104,8 @@ 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 = 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}.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

diff --git a/vcnet/ipptool-installer.vdproj b/vcnet/ipptool-installer.vdproj
index 89cf278b393c0cc714b1695a17568ec66c3076d5..9ea8f39668acdc84b2f75186525319094fd6a0c6 100644 (file)
--- a/vcnet/ipptool-installer.vdproj
+++ b/vcnet/ipptool-installer.vdproj
@@ -75,14 +75,8 @@
         }\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
+        "MsmKey" = "8:_604E80B396974DD68D1F4A11BB022F79"\r
+        "OwnerKey" = "8:_8B9B4769224046F5B6D692BA9E6FFBDD"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
@@ -117,6 +111,12 @@
         }\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
@@ -129,8 +129,14 @@
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_962EDAE5C1924E75B67815861062D102"\r
-        "OwnerKey" = "8:_53657E2E11814303B218D8DF1CED7298"\r
+        "MsmKey" = "8:_9967519E7058965D4C7DEF47EB39CC50"\r
+        "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
+        "MsmKey" = "8:_9FBF78D7B89EEA843380D5F10E1954D7"\r
+        "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
@@ -141,6 +147,12 @@
         }\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
@@ -177,6 +189,12 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_D20F7E9FAB8B4CF38D740C5E5655CC3E"\r
+        "OwnerKey" = "8:_A9CCE21DCF004D869F157B0065B32AA7"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_D4BEA026ABFB46DD960AD8EFCAE45E31"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -696,6 +714,46 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9967519E7058965D4C7DEF47EB39CC50"\r
+            {\r
+            "SourcePath" = "8:CRYPT32.dll"\r
+            "TargetName" = "8:CRYPT32.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}:_9FBF78D7B89EEA843380D5F10E1954D7"\r
+            {\r
+            "SourcePath" = "8:Secur32.dll"\r
+            "TargetName" = "8:Secur32.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}:_A63C5C4108AB4B588878482B26876DC5"\r
             {\r
             "SourcePath" = "8:..\\test\\validate-job.test"\r
@@ -1134,14 +1192,14 @@
         {\r
         "Name" = "8:Microsoft Visual Studio"\r
         "ProductName" = "8:ipptool for Windows"\r
-        "ProductCode" = "8:{BADD3454-4180-4519-B1CA-5C255DAB0047}"\r
-        "PackageCode" = "8:{96C55675-F0E6-405C-B8EF-F1BFF11F94A5}"\r
+        "ProductCode" = "8:{75CFE2B5-5105-4D7A-87CA-5D919126F3DA}"\r
+        "PackageCode" = "8:{85757D89-5057-4EE1-9852-763E1EEF2FC8}"\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.01.3100"\r
+        "ProductVersion" = "8:13.04.1800"\r
         "Manufacturer" = "8:Apple Inc."\r
         "ARPHELPTELEPHONE" = "8:"\r
         "ARPHELPLINK" = "8:http://www.cups.org/str.php"\r
@@ -1700,11 +1758,39 @@
         }\r
         "MergeModule"\r
         {\r
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_53657E2E11814303B218D8DF1CED7298"\r
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_604E80B396974DD68D1F4A11BB022F79"\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}:_8B9B4769224046F5B6D692BA9E6FFBDD"\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}:_A9CCE21DCF004D869F157B0065B32AA7"\r
             {\r
             "UseDynamicProperties" = "11:TRUE"\r
             "IsDependency" = "11:TRUE"\r
-            "SourcePath" = "8:policy_9_0_Microsoft_VC90_DebugCRT_x86.msm"\r
+            "SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86_x64.msm"\r
                 "Properties"\r
                 {\r
                 }\r
@@ -1714,11 +1800,11 @@
             "Feature" = "8:"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_962EDAE5C1924E75B67815861062D102"\r
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_D20F7E9FAB8B4CF38D740C5E5655CC3E"\r
             {\r
             "UseDynamicProperties" = "11:TRUE"\r
             "IsDependency" = "11:TRUE"\r
-            "SourcePath" = "8:microsoft_vc90_debugcrt_x86.msm"\r
+            "SourcePath" = "8:microsoft_vc90_crt_x86_x64.msm"\r
                 "Properties"\r
                 {\r
                 }\r
@@ -1733,7 +1819,7 @@
         {\r
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D02EB13951314EFD9C539150EF8E53B8"\r
             {\r
-            "SourcePath" = "8:Win32\\Debug\\regex.dll"\r
+            "SourcePath" = "8:x64\\Release\\regex.dll"\r
             "TargetName" = "8:"\r
             "Tag" = "8:"\r
             "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
@@ -1761,7 +1847,7 @@
             }\r
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_E97571D3FBE048DABDC59B37762D800F"\r
             {\r
-            "SourcePath" = "8:Win32\\Debug\\ipptool.exe"\r
+            "SourcePath" = "8:x64\\Debug\\ipptool.exe"\r
             "TargetName" = "8:"\r
             "Tag" = "8:"\r
             "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
@@ -1789,7 +1875,7 @@
             }\r
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_EA282F32A10B4ED1A81AA6133B997C6A"\r
             {\r
-            "SourcePath" = "8:Win32\\Debug\\libcups2.dll"\r
+            "SourcePath" = "8:x64\\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 84994f72ee7cf3796c54a004e5fb7617e8e724d2..bae6a4c82fc734a6169e896e7f9a255a8451bdab 100644 (file)
--- a/vcnet/libcups2-installer.vdproj
+++ b/vcnet/libcups2-installer.vdproj
@@ -45,6 +45,12 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_16CCCC95D1BE41A981EAA4CDAD772F32"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_1859B81745C54E228CDCA94F130C8150"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -105,6 +111,30 @@
         }\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
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
+        "MsmKey" = "8:_2F26FF10F81046A9A863995A1D5F449E"\r
+        "OwnerKey" = "8:_B77819C33E084E13AC78EAF9234C67E1"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_340E6094BE6F4BCF8350280DC8B37900"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -129,8 +159,8 @@
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_3A7FB149E6D64E78A9792E52A6D905FD"\r
-        "OwnerKey" = "8:_FC564AE377AF4166919D500C98F403DA"\r
+        "MsmKey" = "8:_3CBB55F3EBEA4645BE6CEC8A0F251B80"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
@@ -147,6 +177,12 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_3F5E38826D0C441897F43747FFA7491A"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_4879AF80C19D4ED9A3758DCC412190FB"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -165,24 +201,66 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_52B5F2EDEDEC48B5A1188F780C67DE9B"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_574EE5A852D3434987B58E3B8118C1C2"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_5BBA58EFC5A9495BBEF1752E15F4A077"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_5ED87BAE980C4992A4C74AEAEC4A57CF"\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
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
+        "MsmKey" = "8:_64CCFE4D849E75157BBA3DD0A981DEE6"\r
+        "OwnerKey" = "8:_E9925AF9A2D343D6BFE5BDAE33481292"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_65560B58BEBF468C9D06493456A17DEC"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_666BC59DB1514D61AE06860A2894BE4C"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_6BD69E32EE9A4D2B9ECC40558A68FCD8"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -195,6 +273,12 @@
         }\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
@@ -213,12 +297,48 @@
         }\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
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_7FC58520B0F44E3E95A207905CABFED4"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_8400394709ED174EDB995EE7D2002030"\r
+        "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
+        "MsmKey" = "8:_8400394709ED174EDB995EE7D2002030"\r
+        "OwnerKey" = "8:_BAEADCCB6AD74F36AE08401229354D79"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
+        "MsmKey" = "8:_8400394709ED174EDB995EE7D2002030"\r
+        "OwnerKey" = "8:_3F5E38826D0C441897F43747FFA7491A"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
+        "MsmKey" = "8:_8400394709ED174EDB995EE7D2002030"\r
+        "OwnerKey" = "8:_E9925AF9A2D343D6BFE5BDAE33481292"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_860678A628E34D219950C2E2B1BE6A89"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -261,6 +381,12 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_B1520DB5B1CE4CA392FF0EB614535300"\r
+        "OwnerKey" = "8:_BAEADCCB6AD74F36AE08401229354D79"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_B20638175CCB42398417E0683A12469C"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -273,6 +399,42 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_B77819C33E084E13AC78EAF9234C67E1"\r
+        "OwnerKey" = "8:_C17DC336766E4B1BBC8DD24D686C440A"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
+        "MsmKey" = "8:_B77819C33E084E13AC78EAF9234C67E1"\r
+        "OwnerKey" = "8:_D02EB13951314EFD9C539150EF8E53B8"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
+        "MsmKey" = "8:_B820F65C4D844938881581933D156B34"\r
+        "OwnerKey" = "8:_B1520DB5B1CE4CA392FF0EB614535300"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
+        "MsmKey" = "8:_BAEADCCB6AD74F36AE08401229354D79"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
+        "MsmKey" = "8:_BF7DFB3EEB1A6396025E468768AC5AB1"\r
+        "OwnerKey" = "8:_E9925AF9A2D343D6BFE5BDAE33481292"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
+        "MsmKey" = "8:_C17DC336766E4B1BBC8DD24D686C440A"\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
@@ -315,6 +477,12 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_D3197C67CBAC46DE854CF283CDBC677E"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_D3B3B266E0FC45DD9B7EEBCC3AC52965"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -345,62 +513,50 @@
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"\r
-        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmKey" = "8:_E4DC6765AD3348C28401914D2B7BC71A"\r
+        "OwnerKey" = "8:_7E5E5AB3D3C0409AB04A160380C1B03A"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_EA287095645D4A7BA58A530186317895"\r
+        "MsmKey" = "8:_E9925AF9A2D343D6BFE5BDAE33481292"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_EB7A2E97695F4964B4AF0560A258A14A"\r
+        "MsmKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_F77CB9E0AE78446481BD8BFD680F548E"\r
+        "MsmKey" = "8:_EA287095645D4A7BA58A530186317895"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_F7FBD6E1C73B45EA813FB1D5E6050650"\r
+        "MsmKey" = "8:_EB7A2E97695F4964B4AF0560A258A14A"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_FA604C5C4FDD4D7B8110AFC6B603FBAF"\r
+        "MsmKey" = "8:_F77CB9E0AE78446481BD8BFD680F548E"\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
+        "MsmKey" = "8:_F7FBD6E1C73B45EA813FB1D5E6050650"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_FC564AE377AF4166919D500C98F403DA"\r
-        "OwnerKey" = "8:_364DCCAFF25145BCBE75FFEEDCC75B3A"\r
+        "MsmKey" = "8:_FA604C5C4FDD4D7B8110AFC6B603FBAF"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
     }\r
@@ -825,7 +981,7 @@
             "SourcePath" = "8:Win32\\Release\\libcups2.lib"\r
             "TargetName" = "8:libcups2.lib"\r
             "Tag" = "8:"\r
-            "Folder" = "8:_2927DAE23F604CF9B8B4D1EC01A6F158"\r
+            "Folder" = "8:_BC1E27FED70845D1BA482FB1D96972F5"\r
             "Condition" = "8:"\r
             "Transitive" = "11:FALSE"\r
             "Vital" = "11:TRUE"\r
@@ -960,6 +1116,26 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5BBA58EFC5A9495BBEF1752E15F4A077"\r
+            {\r
+            "SourcePath" = "8:README.txt"\r
+            "TargetName" = "8:README.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}:_5ED87BAE980C4992A4C74AEAEC4A57CF"\r
             {\r
             "SourcePath" = "8:..\\cups\\ppd.h"\r
@@ -980,6 +1156,26 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_64CCFE4D849E75157BBA3DD0A981DEE6"\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}:_65560B58BEBF468C9D06493456A17DEC"\r
             {\r
             "SourcePath" = "8:..\\cups\\language.h"\r
@@ -1000,12 +1196,32 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_666BC59DB1514D61AE06860A2894BE4C"\r
+            {\r
+            "SourcePath" = "8:..\\doc\\help\\man-cupstestppd.html"\r
+            "TargetName" = "8:man-cupstestppd.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}:_6BD69E32EE9A4D2B9ECC40558A68FCD8"\r
             {\r
             "SourcePath" = "8:Win32\\Release\\libcupsimage2.lib"\r
             "TargetName" = "8:libcupsimage2.lib"\r
             "Tag" = "8:"\r
-            "Folder" = "8:_2927DAE23F604CF9B8B4D1EC01A6F158"\r
+            "Folder" = "8:_BC1E27FED70845D1BA482FB1D96972F5"\r
             "Condition" = "8:"\r
             "Transitive" = "11:FALSE"\r
             "Vital" = "11:TRUE"\r
@@ -1120,6 +1336,26 @@
             "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
@@ -1280,6 +1516,26 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BF7DFB3EEB1A6396025E468768AC5AB1"\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}:_C1FCE2FAE4714A719B7B430E2BE93CBB"\r
             {\r
             "SourcePath" = "8:..\\test\\testfile.ps"\r
@@ -1702,29 +1958,73 @@
                     "Property" = "8:_927C9760A02446EBB2AEDE6BCCFDE29F"\r
                         "Folders"\r
                         {\r
-                        }\r
-                    }\r
-                    "{9EF0B969-E518-4E46-987F-47570745A589}:_9DFBB4777E594B0F8884792467931241"\r
-                    {\r
-                    "Name" = "8:ipptool"\r
-                    "AlwaysCreate" = "11:FALSE"\r
-                    "Condition" = "8:"\r
-                    "Transitive" = "11:FALSE"\r
-                    "Property" = "8:_77AF2E5323304714AF58A3F662F6051B"\r
-                        "Folders"\r
-                        {\r
-                        }\r
-                    }\r
-                }\r
-            }\r
-        }\r
-        "LaunchCondition"\r
-        {\r
-        }\r
-        "Locator"\r
-        {\r
-        }\r
-        "MsiBootstrapper"\r
+                            "{9EF0B969-E518-4E46-987F-47570745A589}:_ABA133175ABB48058F633A1599B418BC"\r
+                            {\r
+                            "Name" = "8:ReleaseX64"\r
+                            "AlwaysCreate" = "11:FALSE"\r
+                            "Condition" = "8:"\r
+                            "Transitive" = "11:FALSE"\r
+                            "Property" = "8:_B4A5B4451AA146D4AA06FDF59FF36FCD"\r
+                                "Folders"\r
+                                {\r
+                                }\r
+                            }\r
+                            "{9EF0B969-E518-4E46-987F-47570745A589}:_BC1E27FED70845D1BA482FB1D96972F5"\r
+                            {\r
+                            "Name" = "8:ReleaseWin32"\r
+                            "AlwaysCreate" = "11:FALSE"\r
+                            "Condition" = "8:"\r
+                            "Transitive" = "11:FALSE"\r
+                            "Property" = "8:_83BECF9B63434282B61BAA7043D96AB1"\r
+                                "Folders"\r
+                                {\r
+                                }\r
+                            }\r
+                            "{9EF0B969-E518-4E46-987F-47570745A589}:_E6A941208712461FAD0B4FB291EDDD56"\r
+                            {\r
+                            "Name" = "8:DebugWin32"\r
+                            "AlwaysCreate" = "11:FALSE"\r
+                            "Condition" = "8:"\r
+                            "Transitive" = "11:FALSE"\r
+                            "Property" = "8:_808CB654DBF7446FB4C3706759D6326C"\r
+                                "Folders"\r
+                                {\r
+                                }\r
+                            }\r
+                            "{9EF0B969-E518-4E46-987F-47570745A589}:_EB4E176E122E4686A21902DD986EC361"\r
+                            {\r
+                            "Name" = "8:DebugX64"\r
+                            "AlwaysCreate" = "11:FALSE"\r
+                            "Condition" = "8:"\r
+                            "Transitive" = "11:FALSE"\r
+                            "Property" = "8:_704A12AF60B74B92A12505146FD2CA2E"\r
+                                "Folders"\r
+                                {\r
+                                }\r
+                            }\r
+                        }\r
+                    }\r
+                    "{9EF0B969-E518-4E46-987F-47570745A589}:_9DFBB4777E594B0F8884792467931241"\r
+                    {\r
+                    "Name" = "8:ipptool"\r
+                    "AlwaysCreate" = "11:FALSE"\r
+                    "Condition" = "8:"\r
+                    "Transitive" = "11:FALSE"\r
+                    "Property" = "8:_77AF2E5323304714AF58A3F662F6051B"\r
+                        "Folders"\r
+                        {\r
+                        }\r
+                    }\r
+                }\r
+            }\r
+        }\r
+        "LaunchCondition"\r
+        {\r
+        }\r
+        "Locator"\r
+        {\r
+        }\r
+        "MsiBootstrapper"\r
         {\r
         "LangId" = "3:1033"\r
         "RequiresElevation" = "11:FALSE"\r
@@ -1733,14 +2033,14 @@
         {\r
         "Name" = "8:Microsoft Visual Studio"\r
         "ProductName" = "8:CUPS SDK for Windows"\r
-        "ProductCode" = "8:{4E0D1662-B032-4CAD-8DBD-5302ADCE1C6F}"\r
-        "PackageCode" = "8:{EB6A403A-100A-4EDB-A727-C18FAC8E39E1}"\r
+        "ProductCode" = "8:{FE657BEF-0C7A-4175-9EAE-D482789E7AD5}"\r
+        "PackageCode" = "8:{2AE9BB2F-C4FC-4BB7-9A4D-77F83E55EA55}"\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:12.03.2600"\r
+        "ProductVersion" = "8:13.04.1800"\r
         "Manufacturer" = "8:Apple Inc."\r
         "ARPHELPTELEPHONE" = "8:"\r
         "ARPHELPLINK" = "8:http://www.cups.org/str.php"\r
@@ -2257,11 +2557,11 @@
         }\r
         "MergeModule"\r
         {\r
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_3A7FB149E6D64E78A9792E52A6D905FD"\r
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_2B4CDFC508564D57A5C27766923D822E"\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_x64.msm"\r
                 "Properties"\r
                 {\r
                 }\r
@@ -2271,7 +2571,35 @@
             "Feature" = "8:"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_FC564AE377AF4166919D500C98F403DA"\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
             {\r
             "UseDynamicProperties" = "11:TRUE"\r
             "IsDependency" = "11:TRUE"\r
@@ -2285,15 +2613,71 @@
             "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
+            {\r
+            "UseDynamicProperties" = "11:TRUE"\r
+            "IsDependency" = "11:TRUE"\r
+            "SourcePath" = "8:microsoft_vc90_debugcrt_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
         }\r
         "ProjectOutput"\r
         {\r
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_0299839A2CCC4F908C5D3A8F465F3FFE"\r
             {\r
-            "SourcePath" = "8:Win32\\Debug\\libcupsimage2.dll"\r
+            "SourcePath" = "8:x64\\Debug\\libcupsimage2.dll"\r
             "TargetName" = "8:"\r
             "Tag" = "8:"\r
-            "Folder" = "8:_C8D931ADC425446B916E9711B929659F"\r
+            "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
             "Condition" = "8:"\r
             "Transitive" = "11:FALSE"\r
             "Vital" = "11:TRUE"\r
@@ -2316,9 +2700,37 @@
                 {\r
                 }\r
             }\r
+            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_16CCCC95D1BE41A981EAA4CDAD772F32"\r
+            {\r
+            "SourcePath" = "8:x64\\Debug\\regex.dll"\r
+            "TargetName" = "8:"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_EB4E176E122E4686A21902DD986EC361"\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:Debug|x64"\r
+            "OutputGroupCanonicalName" = "8:Built"\r
+            "OutputProjectGuid" = "8:{18950A1B-D37A-40C7-B2DF-C12986C0526E}"\r
+            "ShowKeyOutput" = "11:TRUE"\r
+                "ExcludeFilters"\r
+                {\r
+                }\r
+            }\r
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_364DCCAFF25145BCBE75FFEEDCC75B3A"\r
             {\r
-            "SourcePath" = "8:Win32\\Debug\\cupstestppd.exe"\r
+            "SourcePath" = "8:x64\\Debug\\cupstestppd.exe"\r
             "TargetName" = "8:"\r
             "Tag" = "8:"\r
             "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
@@ -2344,9 +2756,93 @@
                 {\r
                 }\r
             }\r
+            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3CBB55F3EBEA4645BE6CEC8A0F251B80"\r
+            {\r
+            "SourcePath" = "8:x64\\Release\\libcups2.dll"\r
+            "TargetName" = "8:"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_ABA133175ABB48058F633A1599B418BC"\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:Release|x64"\r
+            "OutputGroupCanonicalName" = "8:Built"\r
+            "OutputProjectGuid" = "8:{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}"\r
+            "ShowKeyOutput" = "11:TRUE"\r
+                "ExcludeFilters"\r
+                {\r
+                }\r
+            }\r
+            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3F5E38826D0C441897F43747FFA7491A"\r
+            {\r
+            "SourcePath" = "8:x64\\Debug\\libcups2.dll"\r
+            "TargetName" = "8:"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_EB4E176E122E4686A21902DD986EC361"\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:Debug|x64"\r
+            "OutputGroupCanonicalName" = "8:Built"\r
+            "OutputProjectGuid" = "8:{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}"\r
+            "ShowKeyOutput" = "11:TRUE"\r
+                "ExcludeFilters"\r
+                {\r
+                }\r
+            }\r
+            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_52B5F2EDEDEC48B5A1188F780C67DE9B"\r
+            {\r
+            "SourcePath" = "8:Win32\\Release\\regex.dll"\r
+            "TargetName" = "8:"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_BC1E27FED70845D1BA482FB1D96972F5"\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:Release|Win32"\r
+            "OutputGroupCanonicalName" = "8:Built"\r
+            "OutputProjectGuid" = "8:{18950A1B-D37A-40C7-B2DF-C12986C0526E}"\r
+            "ShowKeyOutput" = "11:TRUE"\r
+                "ExcludeFilters"\r
+                {\r
+                }\r
+            }\r
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B20638175CCB42398417E0683A12469C"\r
             {\r
-            "SourcePath" = "8:Win32\\Debug\\ipptool.exe"\r
+            "SourcePath" = "8:x64\\Debug\\ipptool.exe"\r
             "TargetName" = "8:"\r
             "Tag" = "8:"\r
             "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
@@ -2372,12 +2868,68 @@
                 {\r
                 }\r
             }\r
+            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_BAEADCCB6AD74F36AE08401229354D79"\r
+            {\r
+            "SourcePath" = "8:Win32\\Release\\libcups2.dll"\r
+            "TargetName" = "8:"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_BC1E27FED70845D1BA482FB1D96972F5"\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:Release|Win32"\r
+            "OutputGroupCanonicalName" = "8:Built"\r
+            "OutputProjectGuid" = "8:{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}"\r
+            "ShowKeyOutput" = "11:TRUE"\r
+                "ExcludeFilters"\r
+                {\r
+                }\r
+            }\r
+            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C17DC336766E4B1BBC8DD24D686C440A"\r
+            {\r
+            "SourcePath" = "8:x64\\Release\\regex.dll"\r
+            "TargetName" = "8:"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_ABA133175ABB48058F633A1599B418BC"\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:Release|x64"\r
+            "OutputGroupCanonicalName" = "8:Built"\r
+            "OutputProjectGuid" = "8:{18950A1B-D37A-40C7-B2DF-C12986C0526E}"\r
+            "ShowKeyOutput" = "11:TRUE"\r
+                "ExcludeFilters"\r
+                {\r
+                }\r
+            }\r
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D02EB13951314EFD9C539150EF8E53B8"\r
             {\r
-            "SourcePath" = "8:Win32\\Debug\\regex.dll"\r
+            "SourcePath" = "8:x64\\Release\\regex.dll"\r
             "TargetName" = "8:"\r
             "Tag" = "8:"\r
-            "Folder" = "8:_C8D931ADC425446B916E9711B929659F"\r
+            "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
             "Condition" = "8:"\r
             "Transitive" = "11:FALSE"\r
             "Vital" = "11:TRUE"\r
@@ -2400,12 +2952,68 @@
                 {\r
                 }\r
             }\r
-            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_EA282F32A10B4ED1A81AA6133B997C6A"\r
+            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D3197C67CBAC46DE854CF283CDBC677E"\r
+            {\r
+            "SourcePath" = "8:Win32\\Debug\\regex.dll"\r
+            "TargetName" = "8:"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_E6A941208712461FAD0B4FB291EDDD56"\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:Debug|Win32"\r
+            "OutputGroupCanonicalName" = "8:Built"\r
+            "OutputProjectGuid" = "8:{18950A1B-D37A-40C7-B2DF-C12986C0526E}"\r
+            "ShowKeyOutput" = "11:TRUE"\r
+                "ExcludeFilters"\r
+                {\r
+                }\r
+            }\r
+            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_E9925AF9A2D343D6BFE5BDAE33481292"\r
             {\r
             "SourcePath" = "8:Win32\\Debug\\libcups2.dll"\r
             "TargetName" = "8:"\r
             "Tag" = "8:"\r
-            "Folder" = "8:_C8D931ADC425446B916E9711B929659F"\r
+            "Folder" = "8:_E6A941208712461FAD0B4FB291EDDD56"\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:Debug|Win32"\r
+            "OutputGroupCanonicalName" = "8:Built"\r
+            "OutputProjectGuid" = "8:{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}"\r
+            "ShowKeyOutput" = "11:TRUE"\r
+                "ExcludeFilters"\r
+                {\r
+                }\r
+            }\r
+            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_EA282F32A10B4ED1A81AA6133B997C6A"\r
+            {\r
+            "SourcePath" = "8:x64\\Debug\\libcups2.dll"\r
+            "TargetName" = "8:"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
             "Condition" = "8:"\r
             "Transitive" = "11:FALSE"\r
             "Vital" = "11:TRUE"\r

diff --git a/vcnet/regex.vcproj b/vcnet/regex.vcproj
index 8b13f6fd4297eeb31cf3334cda8f4e44b96ef7fd..fbc9fdfdd11900a221b123371eff1e2bdff252d4 100644 (file)
--- a/vcnet/regex.vcproj
+++ b/vcnet/regex.vcproj
@@ -12,6 +12,9 @@
                <Platform\r
                        Name="Win32"\r
                />\r
+               <Platform\r
+                       Name="x64"\r
+               />\r
        </Platforms>\r
        <ToolFiles>\r
        </ToolFiles>\r
@@ -165,6 +168,157 @@
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="regex"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;REGEX_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="2"\r
+                               ModuleDefinitionFile="regex/regex.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="2"\r
+                               EnableIntrinsicFunctions="true"\r
+                               AdditionalIncludeDirectories="regex"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;REGEX_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               ModuleDefinitionFile="regex/regex.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
        </Configurations>\r
        <References>\r
        </References>\r