Merge changes from CUPS 1.6svn-r10267.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3643 a1ca3aef-8c08-0410-bb20-df032aa958be

7 files changed, 455 insertions, 42 deletions

diff --git a/vcnet/cups.sln b/vcnet/cups.sln
index 45d459319..a49280538 100644
--- a/vcnet/cups.sln
+++ b/vcnet/cups.sln
@@ -1,6 +1,9 @@
 Microsoft Visual Studio Solution File, Format Version 10.00

 # Visual Studio 2008

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcups2", "libcups2.vcproj", "{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}"

+	ProjectSection(ProjectDependencies) = postProject

+		{18950A1B-D37A-40C7-B2DF-C12986C0526E} = {18950A1B-D37A-40C7-B2DF-C12986C0526E}

+	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcupsimage2", "libcupsimage2.vcproj", "{CB4AA6F2-3E84-45BE-B505-95CD375E1234}"

 	ProjectSection(ProjectDependencies) = postProject

@@ -25,11 +28,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cupstestppd", "cupstestppd.
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ipptool", "ipptool.vcproj", "{B246D91E-61F2-4433-BFD2-6C2A96FBD4D4}"

 	ProjectSection(ProjectDependencies) = postProject

+		{18950A1B-D37A-40C7-B2DF-C12986C0526E} = {18950A1B-D37A-40C7-B2DF-C12986C0526E}

 		{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3} = {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}

 	EndProjectSection

 EndProject

 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "ipptool-installer", "ipptool-installer.vdproj", "{6AEA263B-92C0-426F-B5FF-F7F5917B704A}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regex", "regex.vcproj", "{18950A1B-D37A-40C7-B2DF-C12986C0526E}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -94,6 +100,12 @@ Global
 		{6AEA263B-92C0-426F-B5FF-F7F5917B704A}.Release|Win32.Build.0 = Release

 		{6AEA263B-92C0-426F-B5FF-F7F5917B704A}.Release|x64.ActiveCfg = Release

 		{6AEA263B-92C0-426F-B5FF-F7F5917B704A}.Release|x64.Build.0 = Release

+		{18950A1B-D37A-40C7-B2DF-C12986C0526E}.Debug|Win32.ActiveCfg = Debug|Win32

+		{18950A1B-D37A-40C7-B2DF-C12986C0526E}.Debug|Win32.Build.0 = Debug|Win32

+		{18950A1B-D37A-40C7-B2DF-C12986C0526E}.Debug|x64.ActiveCfg = Debug|Win32

+		{18950A1B-D37A-40C7-B2DF-C12986C0526E}.Release|Win32.ActiveCfg = Release|Win32

+		{18950A1B-D37A-40C7-B2DF-C12986C0526E}.Release|Win32.Build.0 = Release|Win32

+		{18950A1B-D37A-40C7-B2DF-C12986C0526E}.Release|x64.ActiveCfg = Release|Win32

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/vcnet/ipptool-installer.vdproj b/vcnet/ipptool-installer.vdproj
index a01d04585..948299e88 100644
--- a/vcnet/ipptool-installer.vdproj
+++ b/vcnet/ipptool-installer.vdproj
@@ -33,6 +33,12 @@
         }

         "Entry"

         {

+        "MsmKey" = "8:_290B9B52C4784AED94FA6B87CAB18D10"

+        "OwnerKey" = "8:_UNDEFINED"

+        "MsmSig" = "8:_UNDEFINED"

+        }

+        "Entry"

+        {

         "MsmKey" = "8:_40C483299484486C9416B704F0EF4A6C"

         "OwnerKey" = "8:_UNDEFINED"

         "MsmSig" = "8:_UNDEFINED"

@@ -63,6 +69,24 @@
         }

         "Entry"

         {

+        "MsmKey" = "8:_7AFD2BBA568D45F5B1E871E2B93892BC"

+        "OwnerKey" = "8:_D02EB13951314EFD9C539150EF8E53B8"

+        "MsmSig" = "8:_UNDEFINED"

+        }

+        "Entry"

+        {

+        "MsmKey" = "8:_7AFD2BBA568D45F5B1E871E2B93892BC"

+        "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"

+        "MsmSig" = "8:_UNDEFINED"

+        }

+        "Entry"

+        {

+        "MsmKey" = "8:_7AFD2BBA568D45F5B1E871E2B93892BC"

+        "OwnerKey" = "8:_E97571D3FBE048DABDC59B37762D800F"

+        "MsmSig" = "8:_UNDEFINED"

+        }

+        "Entry"

+        {

         "MsmKey" = "8:_80DBA85C961E447CB92C95CE1F38C56B"

         "OwnerKey" = "8:_UNDEFINED"

         "MsmSig" = "8:_UNDEFINED"

@@ -87,6 +111,18 @@
         }

         "Entry"

         {

+        "MsmKey" = "8:_9967519E7058965D4C7DEF47EB39CC50"

+        "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"

+        "MsmSig" = "8:_UNDEFINED"

+        }

+        "Entry"

+        {

+        "MsmKey" = "8:_9FBF78D7B89EEA843380D5F10E1954D7"

+        "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"

+        "MsmSig" = "8:_UNDEFINED"

+        }

+        "Entry"

+        {

         "MsmKey" = "8:_AF057921D20E4520A3C6420F0729A744"

         "OwnerKey" = "8:_UNDEFINED"

         "MsmSig" = "8:_UNDEFINED"

@@ -99,12 +135,24 @@
         }

         "Entry"

         {

+        "MsmKey" = "8:_BD5B70C103EF41D9A30CF249D2B93CEB"

+        "OwnerKey" = "8:_UNDEFINED"

+        "MsmSig" = "8:_UNDEFINED"

+        }

+        "Entry"

+        {

         "MsmKey" = "8:_C430646D6E7C4CBDA84F951AE95EB76F"

         "OwnerKey" = "8:_UNDEFINED"

         "MsmSig" = "8:_UNDEFINED"

         }

         "Entry"

         {

+        "MsmKey" = "8:_D02EB13951314EFD9C539150EF8E53B8"

+        "OwnerKey" = "8:_UNDEFINED"

+        "MsmSig" = "8:_UNDEFINED"

+        }

+        "Entry"

+        {

         "MsmKey" = "8:_D4BEA026ABFB46DD960AD8EFCAE45E31"

         "OwnerKey" = "8:_UNDEFINED"

         "MsmSig" = "8:_UNDEFINED"

@@ -177,6 +225,12 @@
         }

         "Entry"

         {

+        "MsmKey" = "8:_F0AA062C769A4867B5C302491CA4F2D3"

+        "OwnerKey" = "8:_7AFD2BBA568D45F5B1E871E2B93892BC"

+        "MsmSig" = "8:_UNDEFINED"

+        }

+        "Entry"

+        {

         "MsmKey" = "8:_F16FA7F9826E461E955A95B2EEABA975"

         "OwnerKey" = "8:_UNDEFINED"

         "MsmSig" = "8:_UNDEFINED"

@@ -344,6 +398,26 @@
             "IsDependency" = "11:FALSE"

             "IsolateTo" = "8:"

             }

+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_290B9B52C4784AED94FA6B87CAB18D10"

+            {

+            "SourcePath" = "8:..\\test\\print-job.test"

+            "TargetName" = "8:print-job.test"

+            "Tag" = "8:"

+            "Folder" = "8:_EB00D0298C7E441EBD0257AC04FB3560"

+            "Condition" = "8:"

+            "Transitive" = "11:FALSE"

+            "Vital" = "11:TRUE"

+            "ReadOnly" = "11:FALSE"

+            "Hidden" = "11:FALSE"

+            "System" = "11:FALSE"

+            "Permanent" = "11:FALSE"

+            "SharedLegacy" = "11:FALSE"

+            "PackageAs" = "3:1"

+            "Register" = "3:1"

+            "Exclude" = "11:FALSE"

+            "IsDependency" = "11:FALSE"

+            "IsolateTo" = "8:"

+            }

             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_40C483299484486C9416B704F0EF4A6C"

             {

             "SourcePath" = "8:..\\test\\testfile.pdf"

@@ -524,6 +598,46 @@
             "IsDependency" = "11:FALSE"

             "IsolateTo" = "8:"

             }

+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9967519E7058965D4C7DEF47EB39CC50"

+            {

+            "SourcePath" = "8:CRYPT32.dll"

+            "TargetName" = "8:CRYPT32.dll"

+            "Tag" = "8:"

+            "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"

+            "Condition" = "8:"

+            "Transitive" = "11:FALSE"

+            "Vital" = "11:TRUE"

+            "ReadOnly" = "11:FALSE"

+            "Hidden" = "11:FALSE"

+            "System" = "11:FALSE"

+            "Permanent" = "11:FALSE"

+            "SharedLegacy" = "11:FALSE"

+            "PackageAs" = "3:1"

+            "Register" = "3:1"

+            "Exclude" = "11:TRUE"

+            "IsDependency" = "11:TRUE"

+            "IsolateTo" = "8:"

+            }

+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9FBF78D7B89EEA843380D5F10E1954D7"

+            {

+            "SourcePath" = "8:Secur32.dll"

+            "TargetName" = "8:Secur32.dll"

+            "Tag" = "8:"

+            "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"

+            "Condition" = "8:"

+            "Transitive" = "11:FALSE"

+            "Vital" = "11:TRUE"

+            "ReadOnly" = "11:FALSE"

+            "Hidden" = "11:FALSE"

+            "System" = "11:FALSE"

+            "Permanent" = "11:FALSE"

+            "SharedLegacy" = "11:FALSE"

+            "PackageAs" = "3:1"

+            "Register" = "3:1"

+            "Exclude" = "11:TRUE"

+            "IsDependency" = "11:TRUE"

+            "IsolateTo" = "8:"

+            }

             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_AF057921D20E4520A3C6420F0729A744"

             {

             "SourcePath" = "8:..\\IPPTOOL.txt"

@@ -564,6 +678,26 @@
             "IsDependency" = "11:FALSE"

             "IsolateTo" = "8:"

             }

+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BD5B70C103EF41D9A30CF249D2B93CEB"

+            {

+            "SourcePath" = "8:setdebug.bat"

+            "TargetName" = "8:setdebug.bat"

+            "Tag" = "8:"

+            "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"

+            "Condition" = "8:"

+            "Transitive" = "11:FALSE"

+            "Vital" = "11:TRUE"

+            "ReadOnly" = "11:FALSE"

+            "Hidden" = "11:FALSE"

+            "System" = "11:FALSE"

+            "Permanent" = "11:FALSE"

+            "SharedLegacy" = "11:FALSE"

+            "PackageAs" = "3:1"

+            "Register" = "3:1"

+            "Exclude" = "11:FALSE"

+            "IsDependency" = "11:FALSE"

+            "IsolateTo" = "8:"

+            }

             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C430646D6E7C4CBDA84F951AE95EB76F"

             {

             "SourcePath" = "8:..\\test\\color.jpg"

@@ -891,14 +1025,14 @@
         {

         "Name" = "8:Microsoft Visual Studio"

         "ProductName" = "8:ipptool for Windows"

-        "ProductCode" = "8:{491DCF72-4D28-4670-B775-1639941F22FD}"

-        "PackageCode" = "8:{389AA0E7-8F1C-4196-9E61-1C96C18D7B10}"

+        "ProductCode" = "8:{8220ED6C-8FAC-4E28-8589-867295E2A23D}"

+        "PackageCode" = "8:{B78F9AC6-92F9-48FF-AA11-ECD929442B4A}"

         "UpgradeCode" = "8:{BAB6EBBB-515D-4155-9FEF-D98DA76814CA}"

         "RestartWWWService" = "11:FALSE"

         "RemovePreviousVersions" = "11:TRUE"

         "DetectNewerInstalledVersion" = "11:TRUE"

         "InstallAllUsers" = "11:TRUE"

-        "ProductVersion" = "8:11.10.0700"

+        "ProductVersion" = "8:12.02.0600"

         "Manufacturer" = "8:Apple Inc."

         "ARPHELPTELEPHONE" = "8:"

         "ARPHELPLINK" = "8:http://www.cups.org/str.php"

@@ -1415,9 +1549,65 @@
         }

         "MergeModule"

         {

+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_7AFD2BBA568D45F5B1E871E2B93892BC"

+            {

+            "UseDynamicProperties" = "11:TRUE"

+            "IsDependency" = "11:TRUE"

+            "SourcePath" = "8:policy_9_0_Microsoft_VC90_DebugCRT_x86.msm"

+                "Properties"

+                {

+                }

+            "LanguageId" = "3:0"

+            "Exclude" = "11:FALSE"

+            "Folder" = "8:"

+            "Feature" = "8:"

+            "IsolateTo" = "8:"

+            }

+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_F0AA062C769A4867B5C302491CA4F2D3"

+            {

+            "UseDynamicProperties" = "11:TRUE"

+            "IsDependency" = "11:TRUE"

+            "SourcePath" = "8:microsoft_vc90_debugcrt_x86.msm"

+                "Properties"

+                {

+                }

+            "LanguageId" = "3:0"

+            "Exclude" = "11:FALSE"

+            "Folder" = "8:"

+            "Feature" = "8:"

+            "IsolateTo" = "8:"

+            }

         }

         "ProjectOutput"

         {

+            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D02EB13951314EFD9C539150EF8E53B8"

+            {

+            "SourcePath" = "8:Win32\\Debug\\regex.dll"

+            "TargetName" = "8:"

+            "Tag" = "8:"

+            "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"

+            "Condition" = "8:"

+            "Transitive" = "11:FALSE"

+            "Vital" = "11:TRUE"

+            "ReadOnly" = "11:FALSE"

+            "Hidden" = "11:FALSE"

+            "System" = "11:FALSE"

+            "Permanent" = "11:FALSE"

+            "SharedLegacy" = "11:FALSE"

+            "PackageAs" = "3:1"

+            "Register" = "3:1"

+            "Exclude" = "11:FALSE"

+            "IsDependency" = "11:FALSE"

+            "IsolateTo" = "8:"

+            "ProjectOutputGroupRegister" = "3:1"

+            "OutputConfiguration" = "8:"

+            "OutputGroupCanonicalName" = "8:Built"

+            "OutputProjectGuid" = "8:{18950A1B-D37A-40C7-B2DF-C12986C0526E}"

+            "ShowKeyOutput" = "11:TRUE"

+                "ExcludeFilters"

+                {

+                }

+            }

             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_E97571D3FBE048DABDC59B37762D800F"

             {

             "SourcePath" = "8:Win32\\Debug\\ipptool.exe"

diff --git a/vcnet/ipptool.vcproj b/vcnet/ipptool.vcproj
index cebe443aa..d29d73d9c 100644
--- a/vcnet/ipptool.vcproj
+++ b/vcnet/ipptool.vcproj
@@ -331,47 +331,15 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

 			>

 			<File

-				RelativePath=".\regex\debug.c"

-				>

-			</File>

-			<File

 				RelativePath="..\test\ipptool.c"

 				>

 			</File>

-			<File

-				RelativePath=".\regex\regcomp.c"

-				>

-			</File>

-			<File

-				RelativePath=".\regex\regerror.c"

-				>

-			</File>

-			<File

-				RelativePath=".\regex\regexec.c"

-				>

-			</File>

-			<File

-				RelativePath=".\regex\regfree.c"

-				>

-			</File>

-			<File

-				RelativePath=".\regex\split.c"

-				>

-			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

 			Filter="h;hpp;hxx;hm;inl;inc;xsd"

 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

 			>

-			<File

-				RelativePath=".\regex\regex.h"

-				>

-			</File>

-			<File

-				RelativePath=".\regex\regex2.h"

-				>

-			</File>

 		</Filter>

 		<Filter

 			Name="Resource Files"

diff --git a/vcnet/libcups2.vcproj b/vcnet/libcups2.vcproj
index 2fc8c5f81..6e12bdad8 100644
--- a/vcnet/libcups2.vcproj
+++ b/vcnet/libcups2.vcproj
@@ -44,8 +44,8 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\vcnet,.."

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"

+				AdditionalIncludeDirectories="..\vcnet;..;..\vcnet\regex"

+				PreprocessorDefinitions="WIN32;DEBUG;_DEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

@@ -66,6 +66,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

+				AdditionalOptions="/NODEFAULTLIB:libcmt"

 				AdditionalDependencies="ws2_32.lib advapi32.lib"

 				OutputFile="$(OutDir)\libcups2.dll"

 				LinkIncremental="2"

@@ -128,7 +129,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\vcnet,.."

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"

+				PreprocessorDefinitions="WIN32;DEBUG;_DEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

@@ -207,8 +208,8 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="1"

-				AdditionalIncludeDirectories="..\vcnet,.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"

+				AdditionalIncludeDirectories="..\vcnet;..;..\vcnet\regex"

+				PreprocessorDefinitions="WIN32;DEBUG;NDEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"

 				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

@@ -226,6 +227,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

+				AdditionalOptions="/NODEFAULTLIB:libcmt"

 				AdditionalDependencies="ws2_32.lib advapi32.lib"

 				OutputFile="$(OutDir)\libcups2.dll"

 				LinkIncremental="1"

@@ -291,7 +293,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="1"

 				AdditionalIncludeDirectories="..\vcnet,.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"

+				PreprocessorDefinitions="WIN32;DEBUG;NDEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"

 				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

@@ -478,6 +480,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\cups\debug.c"

+				>

+			</File>

+			<File

 				RelativePath="..\cups\dest.c"

 				>

 				<FileConfiguration

@@ -1512,7 +1518,7 @@
 				>

 			</File>

 			<File

-				RelativePath="..\cups\debug.h"

+				RelativePath="..\cups\debug-private.h"

 				>

 			</File>

 			<File

diff --git a/vcnet/regex.vcproj b/vcnet/regex.vcproj
new file mode 100644
index 000000000..8b13f6fd4
--- /dev/null
+++ b/vcnet/regex.vcproj
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="9.00"

+	Name="regex"

+	ProjectGUID="{18950A1B-D37A-40C7-B2DF-C12986C0526E}"

+	RootNamespace="regex"

+	Keyword="Win32Proj"

+	TargetFrameworkVersion="196613"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="regex"

+				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;REGEX_EXPORTS"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				DebugInformationFormat="4"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				LinkIncremental="2"

+				ModuleDefinitionFile="regex/regex.def"

+				GenerateDebugInformation="true"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			CharacterSet="1"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				EnableIntrinsicFunctions="true"

+				AdditionalIncludeDirectories="regex"

+				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;REGEX_EXPORTS"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				LinkIncremental="1"

+				ModuleDefinitionFile="regex/regex.def"

+				GenerateDebugInformation="true"

+				SubSystem="2"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+			>

+			<File

+				RelativePath=".\regex\regcomp.c"

+				>

+			</File>

+			<File

+				RelativePath=".\regex\regerror.c"

+				>

+			</File>

+			<File

+				RelativePath=".\regex\regex.def"

+				>

+			</File>

+			<File

+				RelativePath=".\regex\regexec.c"

+				>

+			</File>

+			<File

+				RelativePath=".\regex\regfree.c"

+				>

+			</File>

+			<File

+				RelativePath=".\regex\split.c"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl;inc;xsd"

+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+			>

+			<File

+				RelativePath=".\regex\regex.h"

+				>

+			</File>

+			<File

+				RelativePath=".\regex\regex2.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+			>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/vcnet/regex/regex.def b/vcnet/regex/regex.def
new file mode 100644
index 000000000..440f34820
--- /dev/null
+++ b/vcnet/regex/regex.def
@@ -0,0 +1,7 @@
+LIBRARY regex

+VERSION 1.0

+EXPORTS

+regcomp

+regerror

+regexec

+regfree

diff --git a/vcnet/setdebug.bat b/vcnet/setdebug.bat
new file mode 100644
index 000000000..dd1afa698
--- /dev/null
+++ b/vcnet/setdebug.bat
@@ -0,0 +1,5 @@
+@rem Script to enable debug logging for IPPTOOL
+set CUPS_DEBUG_LOG=ipptool.log
+set CUPS_DEBUG_LEVEL=6
+set "CUPS_DEBUG_FILTER=^(http|_http|ipp|_ipp|cupsDo|cupsGetResponse|cupsSend|cupsWrite)"
+