From db8b865d20076ba51626da16bb3a2e080b7d1104 Mon Sep 17 00:00:00 2001 From: msweet Date: Mon, 4 Feb 2013 19:27:13 +0000 Subject: Merge changes from CUPS 1.7svn-r10861. git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4167 a1ca3aef-8c08-0410-bb20-df032aa958be --- vcnet/config.h | 135 ++++++++++------------ vcnet/ipptool-installer.vdproj | 247 +++++++++++++++++++++++++++++++++++++---- vcnet/libcups2.vcproj | 16 +-- 3 files changed, 297 insertions(+), 101 deletions(-) (limited to 'vcnet') diff --git a/vcnet/config.h b/vcnet/config.h index 79ac955f6..c514e682d 100644 --- a/vcnet/config.h +++ b/vcnet/config.h @@ -3,7 +3,7 @@ * * Configuration file for CUPS on Windows. * - * Copyright 2007-2012 by Apple Inc. + * Copyright 2007-2013 by Apple Inc. * Copyright 1997-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -86,8 +86,8 @@ * Version of software... */ -#define CUPS_SVERSION "CUPS v1.6.0" -#define CUPS_MINIMAL "CUPS/1.6.0" +#define CUPS_SVERSION "CUPS v1.7.0" +#define CUPS_MINIMAL "CUPS/1.7.0" /* @@ -104,7 +104,7 @@ * Default file permissions... */ -#define CUPS_DEFAULT_CONFIG_FILE_PERM 0644 +#define CUPS_DEFAULT_CONFIG_FILE_PERM 0640 #define CUPS_DEFAULT_LOG_FILE_PERM 0644 @@ -128,12 +128,8 @@ */ #define CUPS_DEFAULT_BROWSING 1 -#define CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS "CUPS dnssd" -#define CUPS_DEFAULT_BROWSE_REMOTE_PROTOCOLS "" -#define CUPS_DEFAULT_BROWSE_SHORT_NAMES 1 +#define CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS "" #define CUPS_DEFAULT_DEFAULT_SHARED 1 -#define CUPS_DEFAULT_IMPLICIT_CLASSES 1 -#define CUPS_DEFAULT_USE_NETWORK_DEFAULT 0 /* @@ -172,6 +168,13 @@ #undef CUPS_DEFAULT_DOMAINSOCKET +/* + * Default WebInterface value... + */ + +#undef CUPS_DEFAULT_WEBIF + + /* * Where are files stored? * @@ -194,13 +197,11 @@ /* - * Do we have various image libraries? + * Do we have ZLIB? */ -/* #undef HAVE_LIBPNG */ -/* #undef HAVE_LIBZ */ -/* #undef HAVE_LIBJPEG */ -/* #undef HAVE_LIBTIFF */ +#define HAVE_LIBZ 1 +#define HAVE_INFLATECOPY 1 /* @@ -231,10 +232,10 @@ /* - * Do we have ? + * Use ? */ -/* #undef HAVE_SCSI_SG_H */ +/* #undef HAVE_STDINT_H */ /* @@ -360,35 +361,25 @@ /* - * What Security framework headers do we have? + * Do we have the SSL_set_tlsext_host_name function? */ -/* #undef HAVE_AUTHORIZATION_H */ -/* #undef HAVE_SECPOLICY_H */ -/* #undef HAVE_SECPOLICYPRIV_H */ -/* #undef HAVE_SECBASEPRIV_H */ -/* #undef HAVE_SECIDENTITYSEARCHPRIV_H */ +/* #undef HAVE_SSL_SET_TLSEXT_HOST_NAME */ /* - * Do we have the SecIdentitySearchCreateWithPolicy function? - */ - -/* #undef HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY */ - - -/* - * Do we have the SecPolicyCreateSSL function? - */ - -/* #undef HAVE_SECPOLICYCREATESSL */ - - -/* - * Do we have the SecPolicyCreateSSL function? + * What Security framework headers do we have? */ -/* #undef HAVE_SECPOLICYCREATESSL */ +/* #undef HAVE_AUTHORIZATION_H */ +/* #undef HAVE_SECBASEPRIV_H */ +/* #undef HAVE_SECCERTIFICATE_H */ +/* #undef HAVE_SECIDENTITYSEARCHPRIV_H */ +/* #undef HAVE_SECITEM_H */ +/* #undef HAVE_SECITEMPRIV_H */ +/* #undef HAVE_SECPOLICY_H */ +/* #undef HAVE_SECPOLICYPRIV_H */ +/* #undef HAVE_SECURETRANSPORTPRIV_H */ /* @@ -399,36 +390,31 @@ /* - * Do we have the SLP library? + * Do we have libpaper? */ -/* #undef HAVE_LIBSLP */ +/* #undef HAVE_LIBPAPER */ /* - * Do we have an LDAP library? + * Do we have mDNSResponder for DNS Service Discovery (aka Bonjour)? */ -/* #undef HAVE_LDAP */ -/* #undef HAVE_OPENLDAP */ -/* #undef HAVE_MOZILLA_LDAP */ -/* #undef HAVE_LDAP_SSL_H */ -/* #undef HAVE_LDAP_SSL */ -/* #undef HAVE_LDAP_REBIND_PROC */ +#define HAVE_DNSSD 1 /* - * Do we have libpaper? + * Do we have Avahi for DNS Service Discovery (aka Bonjour)? */ -/* #undef HAVE_LIBPAPER */ +#undef HAVE_AVAHI /* - * Do we have DNS Service Discovery (aka Bonjour)? + * Do we have ? */ -#define HAVE_DNSSD 1 +#undef HAVE_SYS_IOCTL_H /* @@ -438,13 +424,6 @@ /* #undef HAVE_ST_GEN */ -/* - * Do we have ? - */ - -/* #undef HAVE_SYS_IOCTL_H */ - - /* * Does the "tm" structure contain the "tm_gmtoff" member? */ @@ -556,6 +535,7 @@ */ /* #undef HAVE_PDFTOPS */ +/* #undef HAVE_PDFTOPS_WITH_ORIGPAGESIZES */ #define CUPS_PDFTOPS "" @@ -567,14 +547,6 @@ #define CUPS_GHOSTSCRIPT "" -/* - * Do we have Darwin's CoreFoundation and SystemConfiguration frameworks? - */ - -/* #undef HAVE_COREFOUNDATION */ -/* #undef HAVE_SYSTEMCONFIGURATION */ - - /* * Do we have CoreFoundation public and private headers? */ @@ -639,11 +611,8 @@ /* #undef HAVE_GSS_GSSAPI_H */ /* #undef HAVE_GSS_GSSAPI_SPI_H */ /* #undef HAVE_GSSAPI */ -/* #undef HAVE_GSSAPI_GENERIC_H */ /* #undef HAVE_GSSAPI_GSSAPI_H */ /* #undef HAVE_GSSAPI_H */ -/* #undef HAVE_GSSAPI_KRB5_H */ -/* #undef HAVE_KRB5_H */ /* @@ -731,7 +700,7 @@ * Do we have libusb? */ -/* #undef HAVE_USB_H */ +/* #undef HAVE_LIBUSB */ /* @@ -768,18 +737,36 @@ /* - * Do we have the ColorSyncRegisterDevice function? + * Do we have XPC? */ -/* #undef HAVE_COLORSYNCREGISTERDEVICE */ +/* #undef HAVE_XPC */ +/* #undef HAVE_XPC_PRIVATE_H */ /* - * Do we have XPC? + * Do we have Mini-XML? */ -/* #undef HAVE_XPC */ +/* #undef HAVE_MXML_H */ + + +/* + * Do we have the C99 abs() function? + */ +/* #undef HAVE_ABS */ +#if !defined(HAVE_ABS) && !defined(abs) +# if defined(__GNUC__) || __STDC_VERSION__ >= 199901L +# define abs(x) _cups_abs(x) +static inline int _cups_abs(int i) { return (i < 0 ? -i : i); } +# elif defined(_MSC_VER) +# define abs(x) _cups_abs(x) +static __inline int _cups_abs(int i) { return (i < 0 ? -i : i); } +# else +# define abs(x) ((x) < 0 ? -(x) : (x)) +# endif /* __GNUC__ || __STDC_VERSION__ */ +#endif /* !HAVE_ABS && !abs */ #endif /* !_CUPS_CONFIG_H_ */ diff --git a/vcnet/ipptool-installer.vdproj b/vcnet/ipptool-installer.vdproj index 948299e88..45f9084a2 100644 --- a/vcnet/ipptool-installer.vdproj +++ b/vcnet/ipptool-installer.vdproj @@ -27,6 +27,12 @@ } "Entry" { + "MsmKey" = "8:_1DBDCFABB8DF28E5F75E41EDAE4BF6BE" + "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_1E4B2A9BD6A44926B719E0D7E8FC0952" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -57,32 +63,32 @@ } "Entry" { - "MsmKey" = "8:_65CBD149C9DA448FBACE2B02766A6537" + "MsmKey" = "8:_4454D1BB58774F95972FB94388DC5E6A" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_6F893B2A3B7048CBA39359FC368BCA27" + "MsmKey" = "8:_46AB64FF360D4F309866FF5F49C65D88" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7AFD2BBA568D45F5B1E871E2B93892BC" - "OwnerKey" = "8:_D02EB13951314EFD9C539150EF8E53B8" + "MsmKey" = "8:_531A281ACDC6420D918E2A9FE97A2D42" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7AFD2BBA568D45F5B1E871E2B93892BC" - "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A" + "MsmKey" = "8:_65CBD149C9DA448FBACE2B02766A6537" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7AFD2BBA568D45F5B1E871E2B93892BC" - "OwnerKey" = "8:_E97571D3FBE048DABDC59B37762D800F" + "MsmKey" = "8:_6F893B2A3B7048CBA39359FC368BCA27" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -111,6 +117,12 @@ } "Entry" { + "MsmKey" = "8:_9314DE98517C42E9AF190B67472408DF" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_9967519E7058965D4C7DEF47EB39CC50" "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A" "MsmSig" = "8:_UNDEFINED" @@ -123,12 +135,24 @@ } "Entry" { + "MsmKey" = "8:_AB0BD66B57BF4C41BE53BCE573C254BC" + "OwnerKey" = "8:_F208E348BAE54EDEA200755E5C149F13" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_AF057921D20E4520A3C6420F0729A744" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { + "MsmKey" = "8:_B85BD013DC024B9E82862535191B405B" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_B9E79062FEF64745915546DDD5BF8D85" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -225,14 +249,26 @@ } "Entry" { - "MsmKey" = "8:_F0AA062C769A4867B5C302491CA4F2D3" - "OwnerKey" = "8:_7AFD2BBA568D45F5B1E871E2B93892BC" + "MsmKey" = "8:_F16FA7F9826E461E955A95B2EEABA975" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_F16FA7F9826E461E955A95B2EEABA975" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_F208E348BAE54EDEA200755E5C149F13" + "OwnerKey" = "8:_D02EB13951314EFD9C539150EF8E53B8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_F208E348BAE54EDEA200755E5C149F13" + "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_F208E348BAE54EDEA200755E5C149F13" + "OwnerKey" = "8:_E97571D3FBE048DABDC59B37762D800F" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -378,6 +414,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1DBDCFABB8DF28E5F75E41EDAE4BF6BE" + { + "SourcePath" = "8:zlibwapi.dll" + "TargetName" = "8:zlibwapi.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:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1E4B2A9BD6A44926B719E0D7E8FC0952" { "SourcePath" = "8:..\\test\\get-printer-attributes.test" @@ -478,6 +534,66 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4454D1BB58774F95972FB94388DC5E6A" + { + "SourcePath" = "8:..\\test\\print-job-deflate.test" + "TargetName" = "8:print-job-deflate.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}:_46AB64FF360D4F309866FF5F49C65D88" + { + "SourcePath" = "8:..\\test\\ipp-everywhere.test" + "TargetName" = "8:ipp-everywhere.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}:_531A281ACDC6420D918E2A9FE97A2D42" + { + "SourcePath" = "8:..\\test\\get-notifications.test" + "TargetName" = "8:get-notifications.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}:_65CBD149C9DA448FBACE2B02766A6537" { "SourcePath" = "8:..\\test\\testfile.ps" @@ -598,6 +714,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9314DE98517C42E9AF190B67472408DF" + { + "SourcePath" = "8:..\\test\\get-subscriptions.test" + "TargetName" = "8:get-subscriptions.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}:_9967519E7058965D4C7DEF47EB39CC50" { "SourcePath" = "8:CRYPT32.dll" @@ -658,6 +794,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B85BD013DC024B9E82862535191B405B" + { + "SourcePath" = "8:..\\test\\print-job-gzip.test" + "TargetName" = "8:print-job-gzip.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}:_B9E79062FEF64745915546DDD5BF8D85" { "SourcePath" = "8:..\\CHANGES-IPPTOOL.txt" @@ -973,6 +1129,17 @@ "Property" = "8:ProgramMenuFolder" "Folders" { + "{9EF0B969-E518-4E46-987F-47570745A589}:_E379D4EDBAD0460BB876711E9062ADB4" + { + "Name" = "8:ipptool" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:_D115D2F4F12143B09D5FDA447A6A7D04" + "Folders" + { + } + } } } "{1525181F-901A-416C-8A58-119130FE478E}:_D02CDADE99F344CF92CA1A8D0278861F" @@ -1025,14 +1192,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:ipptool for Windows" - "ProductCode" = "8:{8220ED6C-8FAC-4E28-8589-867295E2A23D}" - "PackageCode" = "8:{B78F9AC6-92F9-48FF-AA11-ECD929442B4A}" + "ProductCode" = "8:{BADD3454-4180-4519-B1CA-5C255DAB0047}" + "PackageCode" = "8:{3C801C7B-F294-47ED-9146-D35C6B48C3B9}" "UpgradeCode" = "8:{BAB6EBBB-515D-4155-9FEF-D98DA76814CA}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:12.02.0600" + "ProductVersion" = "8:13.01.3100" "Manufacturer" = "8:Apple Inc." "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://www.cups.org/str.php" @@ -1153,6 +1320,48 @@ } "Shortcut" { + "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_63715171338D40FFBC5B47A1418B4814" + { + "Name" = "8:README" + "Arguments" = "8:" + "Description" = "8:" + "ShowCmd" = "3:1" + "IconIndex" = "3:0" + "Transitive" = "11:FALSE" + "Target" = "8:_AF057921D20E4520A3C6420F0729A744" + "Folder" = "8:_E379D4EDBAD0460BB876711E9062ADB4" + "WorkingFolder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D" + "Icon" = "8:" + "Feature" = "8:" + } + "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_70CF74DB997A408DBBFD48AB10F92321" + { + "Name" = "8:ipptool Documentation" + "Arguments" = "8:" + "Description" = "8:" + "ShowCmd" = "3:1" + "IconIndex" = "3:0" + "Transitive" = "11:FALSE" + "Target" = "8:_D5CD9D9AB1644688A1D54B1589BDF724" + "Folder" = "8:_E379D4EDBAD0460BB876711E9062ADB4" + "WorkingFolder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D" + "Icon" = "8:" + "Feature" = "8:" + } + "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_BD2A7DF74D844FF5919EE8340EE36ECD" + { + "Name" = "8:Test File Documentation" + "Arguments" = "8:" + "Description" = "8:" + "ShowCmd" = "3:1" + "IconIndex" = "3:0" + "Transitive" = "11:FALSE" + "Target" = "8:_1A1324305D78463BBFC62269C56DCF0B" + "Folder" = "8:_E379D4EDBAD0460BB876711E9062ADB4" + "WorkingFolder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D" + "Icon" = "8:" + "Feature" = "8:" + } } "UserInterface" { @@ -1549,11 +1758,11 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_7AFD2BBA568D45F5B1E871E2B93892BC" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_AB0BD66B57BF4C41BE53BCE573C254BC" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_9_0_Microsoft_VC90_DebugCRT_x86.msm" + "SourcePath" = "8:microsoft_vc90_debugcrt_x86.msm" "Properties" { } @@ -1563,11 +1772,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_F0AA062C769A4867B5C302491CA4F2D3" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_F208E348BAE54EDEA200755E5C149F13" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:microsoft_vc90_debugcrt_x86.msm" + "SourcePath" = "8:policy_9_0_Microsoft_VC90_DebugCRT_x86.msm" "Properties" { } diff --git a/vcnet/libcups2.vcproj b/vcnet/libcups2.vcproj index 6e12bdad8..b20812256 100644 --- a/vcnet/libcups2.vcproj +++ b/vcnet/libcups2.vcproj @@ -45,7 +45,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\vcnet;..;..\vcnet\regex" - PreprocessorDefinitions="WIN32;DEBUG;_DEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="ZLIB_WINAPI;WIN32;DEBUG;_DEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -67,7 +67,7 @@