Load cups into easysw/current.

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

6 files changed, 891 insertions, 56 deletions

diff --git a/vcnet/config.h b/vcnet/config.h
index c5f1752d0..6a4613d71 100644
--- a/vcnet/config.h
+++ b/vcnet/config.h
@@ -1,9 +1,9 @@
 /*
- * "$Id: config.h 4828 2005-11-11 12:53:38Z mike $"
+ * "$Id: config.h 6189 2007-01-10 16:30:34Z mike $"
  *
  *   Configuration file for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2005 by Easy Software Products.
+ *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -37,16 +37,38 @@
  * Version of software...
  */
 
-#define CUPS_SVERSION		"CUPS v1.2svn"
-#define CUPS_MINIMAL		"CUPS/1.2svn"
+#define CUPS_SVERSION		"CUPS v1.2.8"
+#define CUPS_MINIMAL		"CUPS/1.2.8"
 
 
 /*
- * Default user and group...
+ * Default user and groups...
  */
 
-#define CUPS_DEFAULT_USER	"lp"
-#define CUPS_DEFAULT_GROUP	"sys"
+#define CUPS_DEFAULT_USER "lp"
+#define CUPS_DEFAULT_GROUP "lp"
+#define CUPS_DEFAULT_SYSTEM_GROUPS "sys root"
+
+
+/*
+ * Default file permissions...
+ */
+
+#define CUPS_DEFAULT_CONFIG_FILE_PERM 0640
+#define CUPS_DEFAULT_LOG_FILE_PERM 0644
+
+
+/*
+ * Default browsing settings...
+ */
+
+#define CUPS_DEFAULT_BROWSING 1
+#define CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS "CUPS"
+#define CUPS_DEFAULT_BROWSE_REMOTE_PROTOCOLS "CUPS"
+#define CUPS_DEFAULT_BROWSE_SHORT_NAMES 1
+#define CUPS_DEFAULT_DEFAULT_SHARED 1
+#define CUPS_DEFAULT_IMPLICIT_CLASSES 1
+#define CUPS_DEFAULT_USE_NETWORK_DEFAULT 1
 
 
 /*
@@ -125,6 +147,13 @@
 
 
 /*
+ * Do we have <scsi/sg.h>?
+ */
+
+#undef HAVE_SCSI_SG_H
+
+
+/*
  * Use <string.h>, <strings.h>, and/or <bstring.h>?
  */
 
@@ -217,6 +246,13 @@
 
 
 /*
+ * Do we have the POSIX ACL functions?
+ */
+
+#undef HAVE_ACL_INIT
+
+
+/*
  * Do we have the langinfo.h header file?
  */
 
@@ -229,8 +265,8 @@
 
 #undef HAVE_CDSASSL
 #undef HAVE_GNUTLS
-#undef HAVE_LIBSSL
-#undef HAVE_SSL
+#define HAVE_LIBSSL 1
+#define HAVE_SSL 1
 
 
 /*
@@ -241,6 +277,14 @@
 
 
 /*
+ * Do we have an LDAP library?
+ */
+
+#undef HAVE_LDAP
+#undef HAVE_OPENLDAP
+
+
+/*
  * Do we have libpaper?
  */
 
@@ -332,6 +376,15 @@
 
 
 /*
+ * Do we have launchd support?
+ */
+
+/* #undef HAVE_LAUNCH_H */
+/* #undef HAVE_LAUNCHD */
+#define CUPS_DEFAULT_LAUNCHD_CONF ""
+
+
+/*
  * Various scripting languages...
  */
 
@@ -345,8 +398,63 @@
 #define CUPS_PYTHON	"/usr/bin/python"
 
 
+/*
+ * Do we have Darwin's CoreFoundation and SystemConfiguration frameworks?
+ */
+
+/* #undef HAVE_COREFOUNDATION */
+/* #undef HAVE_SYSTEMCONFIGURATION */
+
+
+/*
+ * Do we have CoreFoundation public and private headers?
+ */
+
+/* #undef HAVE_COREFOUNDATION_H */
+/* #undef HAVE_CFPRIV_H */
+/* #undef HAVE_CFBUNDLEPRIV_H */
+
+
+/*
+ * Do we have CFLocaleCreateCanonicalLocaleIdentifierFromString()?
+ */
+
+/* #undef HAVE_CF_LOCALE_ID */
+
+
+/*
+ * Do we have MacOSX 10.4's mbr_XXX functions()?
+ */
+
+/* #undef HAVE_MEMBERSHIP_H */
+/* #undef HAVE_MBR_UID_TO_UUID */
+
+
+/*
+ * Do we have Darwin's notify_post() header and function?
+ */
+
+/* #undef HAVE_NOTIFY_H */
+/* #undef HAVE_NOTIFY_POST */
+
+
+/*
+ * Do we have DBUS?
+ */
+
+/* #undef HAVE_DBUS */
+/* #undef HAVE_DBUS_MESSAGE_ITER_INIT_APPEND */
+
+
+/*
+ * Do we have the AppleTalk/at_proto.h header?
+ */
+
+/* #undef HAVE_APPLETALK_AT_PROTO_H */
+
+
 #endif /* !_CUPS_CONFIG_H_ */
 
 /*
- * End of "$Id: config.h 4828 2005-11-11 12:53:38Z mike $".
+ * End of "$Id: config.h 6189 2007-01-10 16:30:34Z mike $".
  */
diff --git a/vcnet/cups.sln b/vcnet/cups.sln
index 093265c9d..24e837d67 100644
--- a/vcnet/cups.sln
+++ b/vcnet/cups.sln
@@ -3,16 +3,36 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcups2", "libcups2.vcproj
 	ProjectSection(ProjectDependencies) = postProject

 	EndProjectSection

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testfile", "testfile.vcproj", "{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}"

+	ProjectSection(ProjectDependencies) = postProject

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

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testhttp", "testhttp.vcproj", "{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}"

+	ProjectSection(ProjectDependencies) = postProject

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

+	EndProjectSection

+EndProject

 Global

 	GlobalSection(SolutionConfiguration) = preSolution

 		Debug = Debug

 		Release = Release

 	EndGlobalSection

+	GlobalSection(ProjectDependencies) = postSolution

+	EndGlobalSection

 	GlobalSection(ProjectConfiguration) = postSolution

 		{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Debug.ActiveCfg = Debug|Win32

 		{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Debug.Build.0 = Debug|Win32

 		{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Release.ActiveCfg = Release|Win32

 		{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}.Release.Build.0 = Release|Win32

+		{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Debug.ActiveCfg = Debug|Win32

+		{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Debug.Build.0 = Debug|Win32

+		{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Release.ActiveCfg = Release|Win32

+		{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Release.Build.0 = Release|Win32

+		{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Debug.ActiveCfg = Debug|Win32

+		{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Debug.Build.0 = Debug|Win32

+		{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Release.ActiveCfg = Release|Win32

+		{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Release.Build.0 = Release|Win32

 	EndGlobalSection

 	GlobalSection(ExtensibilityGlobals) = postSolution

 	EndGlobalSection

diff --git a/vcnet/libcups2.def b/vcnet/libcups2.def
index 3aa6c9cb7..6849f29f2 100644
--- a/vcnet/libcups2.def
+++ b/vcnet/libcups2.def
@@ -1,8 +1,44 @@
 LIBRARY libcups2
-VERSION 2.6
+VERSION 2.7
 EXPORTS
+_cupsAdminGetServerSettings
+_cupsAdminSetServerSettings
+_cupsCharmapFlush
+_cupsCharmapFree
+_cupsCharmapGet
+_cupsEncodingName
+_cupsGetPassword
+_cupsGlobals
+_cupsLangPrintf
+_cupsLangPuts
+_cupsLangString
+_cupsMD5Append
+_cupsMD5Finish
+_cupsMD5Init
+_cupsMessageFree
+_cupsMessageLoad
+_cupsMessageLookup
+_cupsSetError
+_cupsSetLocale
+_cupsStrAlloc
+_cupsStrFlush
+_cupsStrFormatd
+_cupsStrFree
+_cupsStrScand
+_cupsStrStatistics
+_cups_snprintf
+_cups_strcpy
+_cups_strlcat
+_cups_strlcpy
+_cups_vsnprintf
+_ippAddAttr
+_ippFindOption
+_ippFreeAttr
+_ppdGetEncoding
 cupsAddDest
 cupsAddOption
+cupsAdminCreateWindowsPPD
+cupsAdminExportSamba
 cupsArrayAdd
 cupsArrayClear
 cupsArrayCount
@@ -11,6 +47,8 @@ cupsArrayDelete
 cupsArrayDup
 cupsArrayFind
 cupsArrayFirst
+cupsArrayIndex
+cupsArrayInsert
 cupsArrayLast
 cupsArrayNew
 cupsArrayNext
@@ -18,12 +56,11 @@ cupsArrayPrev
 cupsArrayRemove
 cupsArrayRestore
 cupsArraySave
-cupsBackchannelRead
-cupsBackchannelWrite
+cupsArrayUserData
+cupsBackChannelRead
+cupsBackChannelWrite
+cupsBackendDeviceURI
 cupsCancelJob
-cupsCharmapFlush
-cupsCharmapFree
-cupsCharmapGet
 cupsCharsetToUTF8
 cupsDirClose
 cupsDirOpen
@@ -31,16 +68,18 @@ cupsDirRead
 cupsDirRewind
 cupsDoAuthentication
 cupsDoFileRequest
+cupsDoRequest
 cupsEncodeOptions
 cupsEncodeOptions2
-cupsEncodingName
 cupsEncryption
 cupsFileClose
 cupsFileCompression
 cupsFileEOF
+cupsFileFind
 cupsFileFlush
 cupsFileGetChar
 cupsFileGetConf
+cupsFileGetLine
 cupsFileGets
 cupsFileLock
 cupsFileNumber
@@ -53,6 +92,9 @@ cupsFilePuts
 cupsFileRead
 cupsFileRewind
 cupsFileSeek
+cupsFileStderr
+cupsFileStdin
+cupsFileStdout
 cupsFileTell
 cupsFileUnlock
 cupsFileWrite
@@ -70,24 +112,20 @@ cupsGetFile
 cupsGetJobs
 cupsGetJobs2
 cupsGetOption
-cupsGetPassword
 cupsGetPPD
 cupsGetPPD2
+cupsGetPassword
 cupsGetPrinters
+cupsLangDefault
 cupsLangEncoding
 cupsLangFlush
 cupsLangFree
 cupsLangGet
-cupsLangPrintf
-cupsLangPuts
 cupsLastError
+cupsLastErrorString
 cupsMarkOptions
-_cups_md5_append
-_cups_md5_finish
-_cups_md5_init
-cupsNormalizeMapsFlush
-cupsNormalizeMapsFree
-cupsNormalizeMapsGet
+cupsNotifySubject
+cupsNotifyText
 cupsParseOptions
 cupsPrintFile
 cupsPrintFile2
@@ -95,8 +133,7 @@ cupsPrintFiles
 cupsPrintFiles2
 cupsPutFd
 cupsPutFile
-_cupsRestoreLocale
-_cupsSaveLocale
+cupsRemoveOption
 cupsServer
 cupsSetDests
 cupsSetDests2
@@ -104,29 +141,13 @@ cupsSetEncryption
 cupsSetPasswordCB
 cupsSetServer
 cupsSetUser
-_cups_strcpy
-_cups_strlcat
-_cups_strlcpy
 cupsTempFd
 cupsTempFile
 cupsTempFile2
-cupsUser
-cupsUTF16ToUTF32
-cupsUTF16ToUTF8
-cupsUTF32CaseFold
-cupsUTF32CharacterProperty
-cupsUTF32CompareCaseless
-cupsUTF32CompareIdentifier
-cupsUTF32Normalize
-cupsUTF32ToUTF16
 cupsUTF32ToUTF8
-cupsUTF8CaseFold
-cupsUTF8CompareCaseless
-cupsUTF8CompareIdentifier
-cupsUTF8Normalize
 cupsUTF8ToCharset
-cupsUTF8ToUTF16
 cupsUTF8ToUTF32
+cupsUser
 httpAddrAny
 httpAddrConnect
 httpAddrEqual
@@ -138,8 +159,10 @@ httpAddrLookup
 httpAddrString
 httpAssembleURI
 httpAssembleURIf
+httpBlocking
 httpCheck
 httpClearCookie
+httpClearFields
 httpClose
 httpConnect
 httpConnectEncrypt
@@ -149,19 +172,25 @@ httpDelete
 httpEncode64
 httpEncode64_2
 httpEncryption
+httpError
 httpFlush
 httpFlushWrite
 httpGet
+httpGetBlocking
+httpGetCookie
 httpGetDateString
 httpGetDateString2
 httpGetDateTime
+httpGetFd
+httpGetField
 httpGetHostByName
 httpGetHostname
 httpGetLength
 httpGetLength2
-httpGets
+httpGetStatus
 httpGetSubField
 httpGetSubField2
+httpGets
 httpHead
 httpInitialize
 httpMD5
@@ -172,11 +201,13 @@ httpPost
 httpPrintf
 httpPut
 httpRead
+httpRead2
 httpReconnect
 httpSeparate
 httpSeparate2
 httpSeparateURI
 httpSetCookie
+httpSetExpect
 httpSetField
 httpSetLength
 httpStatus
@@ -184,7 +215,7 @@ httpTrace
 httpUpdate
 httpWait
 httpWrite
-_ipp_add_attr
+httpWrite2
 ippAddBoolean
 ippAddBooleans
 ippAddCollection
@@ -192,6 +223,7 @@ ippAddCollections
 ippAddDate
 ippAddInteger
 ippAddIntegers
+ippAddOctetString
 ippAddRange
 ippAddRanges
 ippAddResolution
@@ -206,9 +238,9 @@ ippErrorString
 ippErrorValue
 ippFindAttribute
 ippFindNextAttribute
-_ipp_free_attr
 ippLength
 ippNew
+ippNewRequest
 ippOpString
 ippOpValue
 ippPort
@@ -222,21 +254,31 @@ ippWriteFile
 ippWriteIO
 ppdClose
 ppdCollect
+ppdCollect2
 ppdConflicts
 ppdEmit
+ppdEmitAfterOrder
 ppdEmitFd
 ppdEmitJCL
 ppdEmitJCLEnd
+ppdEmitString
 ppdErrorString
 ppdFindAttr
 ppdFindChoice
+ppdFindCustomOption
+ppdFindCustomParam
 ppdFindMarkedChoice
 ppdFindNextAttr
 ppdFindOption
+ppdFirstCustomParam
+ppdFirstOption
 ppdIsMarked
 ppdLastError
+ppdLocalize
 ppdMarkDefaults
 ppdMarkOption
+ppdNextCustomParam
+ppdNextOption
 ppdOpen
 ppdOpen2
 ppdOpenFd
diff --git a/vcnet/libcups2.vcproj b/vcnet/libcups2.vcproj
index af3d2deb3..af51e1e0b 100644
--- a/vcnet/libcups2.vcproj
+++ b/vcnet/libcups2.vcproj
@@ -33,14 +33,14 @@
 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="ws2_32.lib"

-				OutputFile="$(OutDir)/libcups2.dll"

+				AdditionalDependencies="ssleay32.lib libeay32.lib ws2_32.lib"

+				OutputFile="Debug\libcups2.dll"

 				LinkIncremental="2"

 				ModuleDefinitionFile="..\vcnet\libcups2.def"

 				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/libcups2.pdb"

+				ProgramDatabaseFile="Debug\libcups2.pdb"

 				SubSystem="2"

-				ImportLibrary="$(OutDir)/libcups2.lib"

+				ImportLibrary="Debug\libcups2.lib"

 				TargetMachine="1"/>

 			<Tool

 				Name="VCMIDLTool"/>

@@ -83,15 +83,16 @@
 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="ws2_32.lib"

-				OutputFile="$(OutDir)/libcups2.dll"

+				AdditionalDependencies="ssleay32.lib libeay32.lib ws2_32.lib"

+				OutputFile="libcups2.dll"

 				LinkIncremental="1"

 				ModuleDefinitionFile="..\vcnet\libcups2.def"

 				GenerateDebugInformation="TRUE"

+				ProgramDatabaseFile="libcups2.pdb"

 				SubSystem="2"

 				OptimizeReferences="2"

 				EnableCOMDATFolding="2"

-				ImportLibrary="$(OutDir)/libcups2.lib"

+				ImportLibrary="libcups2.lib"

 				TargetMachine="1"/>

 			<Tool

 				Name="VCMIDLTool"/>

@@ -123,100 +124,487 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

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

 			<File

+				RelativePath="..\cups\adminutil.c">

+			</File>

+			<File

 				RelativePath="..\cups\array.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\cups\attr.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\cups\auth.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\cups\backchannel.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="..\cups\backend.c">

+			</File>

+			<File

+				RelativePath="..\cups\custom.c">

 			</File>

 			<File

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

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\cups\dir.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\cups\emit.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\cups\encode.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\cups\file.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\cups\getputfile.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\cups\globals.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\cups\http-addr.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\cups\http-addrlist.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\cups\http-support.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\cups\http.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\cups\ipp-support.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\cups\ipp.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\cups\langprintf.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\cups\language.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="..\cups\localize.c">

 			</File>

 			<File

 				RelativePath="..\cups\mark.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\cups\md5.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\cups\md5passwd.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\cups\normalize.c">

+				RelativePath="..\cups\notify.c">

 			</File>

 			<File

 				RelativePath="..\cups\options.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\cups\page.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\cups\ppd.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="..\cups\request.c">

 			</File>

 			<File

 				RelativePath="..\cups\snprintf.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\cups\string.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\cups\tempfile.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\cups\transcode.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\cups\usersys.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\cups\util.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="WIN32"/>

+				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

@@ -224,6 +612,9 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"

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

 			<File

+				RelativePath="..\cups\adminutil.h">

+			</File>

+			<File

 				RelativePath="..\cups\array.h">

 			</File>

 			<File

@@ -251,6 +642,12 @@
 				RelativePath="..\cups\http.h">

 			</File>

 			<File

+				RelativePath="..\cups\i18n.h">

+			</File>

+			<File

+				RelativePath="..\cups\ipp-private.h">

+			</File>

+			<File

 				RelativePath="..\cups\ipp.h">

 			</File>

 			<File

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

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="7.10"

+	Name="testfile"

+	ProjectGUID="{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}"

+	Keyword="Win32Proj">

+	<Platforms>

+		<Platform

+			Name="Win32"/>

+	</Platforms>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="Debug"

+			IntermediateDirectory="Debug"

+			ConfigurationType="1"

+			CharacterSet="2">

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

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

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				MinimalRebuild="TRUE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="5"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="TRUE"

+				DebugInformationFormat="4"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLinkerTool"

+				OutputFile="Debug\testfile.exe"

+				LinkIncremental="2"

+				GenerateDebugInformation="TRUE"

+				ProgramDatabaseFile="$(OutDir)/testfile.pdb"

+				SubSystem="1"

+				TargetMachine="1"/>

+			<Tool

+				Name="VCMIDLTool"/>

+			<Tool

+				Name="VCPostBuildEventTool"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"/>

+			<Tool

+				Name="VCWebDeploymentTool"/>

+			<Tool

+				Name="VCManagedWrapperGeneratorTool"/>

+			<Tool

+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="Release"

+			IntermediateDirectory="Release"

+			ConfigurationType="1"

+			CharacterSet="2">

+			<Tool

+				Name="VCCLCompilerTool"

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

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				RuntimeLibrary="0"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="TRUE"

+				DebugInformationFormat="0"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLinkerTool"

+				OutputFile="testfile.exe"

+				LinkIncremental="1"

+				GenerateDebugInformation="TRUE"

+				SubSystem="1"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				TargetMachine="1"/>

+			<Tool

+				Name="VCMIDLTool"/>

+			<Tool

+				Name="VCPostBuildEventTool"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"/>

+			<Tool

+				Name="VCWebDeploymentTool"/>

+			<Tool

+				Name="VCManagedWrapperGeneratorTool"/>

+			<Tool

+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

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

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

+			<File

+				RelativePath="..\cups\testfile.c">

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

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

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

+		</Filter>

+		<Filter

+			Name="Resource Files"

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

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

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

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

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="7.10"

+	Name="testhttp"

+	ProjectGUID="{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}"

+	Keyword="Win32Proj">

+	<Platforms>

+		<Platform

+			Name="Win32"/>

+	</Platforms>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="Debug"

+			IntermediateDirectory="Debug"

+			ConfigurationType="1"

+			CharacterSet="2">

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

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

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				MinimalRebuild="TRUE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="5"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="TRUE"

+				DebugInformationFormat="4"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLinkerTool"

+				OutputFile="Debug\testhttp.exe"

+				LinkIncremental="2"

+				GenerateDebugInformation="TRUE"

+				ProgramDatabaseFile="$(OutDir)/testhttp.pdb"

+				SubSystem="1"

+				TargetMachine="1"/>

+			<Tool

+				Name="VCMIDLTool"/>

+			<Tool

+				Name="VCPostBuildEventTool"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"/>

+			<Tool

+				Name="VCWebDeploymentTool"/>

+			<Tool

+				Name="VCManagedWrapperGeneratorTool"/>

+			<Tool

+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="Release"

+			IntermediateDirectory="Release"

+			ConfigurationType="1"

+			CharacterSet="2">

+			<Tool

+				Name="VCCLCompilerTool"

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

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				RuntimeLibrary="0"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="TRUE"

+				DebugInformationFormat="0"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLinkerTool"

+				OutputFile="testhttp.exe"

+				LinkIncremental="1"

+				GenerateDebugInformation="TRUE"

+				SubSystem="1"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				TargetMachine="1"/>

+			<Tool

+				Name="VCMIDLTool"/>

+			<Tool

+				Name="VCPostBuildEventTool"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"/>

+			<Tool

+				Name="VCWebDeploymentTool"/>

+			<Tool

+				Name="VCManagedWrapperGeneratorTool"/>

+			<Tool

+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

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

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

+			<File

+				RelativePath="..\cups\testhttp.c">

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

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

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

+		</Filter>

+		<Filter

+			Name="Resource Files"

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

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

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>