From: Michael R Sweet Date: Tue, 16 Oct 2018 20:09:17 +0000 (-0400) Subject: Add missing DNSSD.LIB functions. X-Git-Tag: v2.3b6~70 X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fcups.git;a=commitdiff_plain;h=86206ccf13c909e67fdbe0a4ddba0152a571cd9d Add missing DNSSD.LIB functions. --- diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c index 23031f50a..ea2021ce6 100644 --- a/cups/http-addrlist.c +++ b/cups/http-addrlist.c @@ -57,13 +57,13 @@ httpAddrConnect2( { int val; /* Socket option value */ #ifndef _WIN32 - int flags; /* Socket flags */ -#endif /* !_WIN32 */ - int remaining; /* Remaining timeout */ int i, j, /* Looping vars */ - nfds, /* Number of file descriptors */ - fds[100], /* Socket file descriptors */ + flags, /* Socket flags */ result; /* Result from select() or poll() */ +#endif /* !_WIN32 */ + int remaining; /* Remaining timeout */ + int nfds, /* Number of file descriptors */ + fds[100]; /* Socket file descriptors */ http_addrlist_t *addrs[100]; /* Addresses */ #ifndef HAVE_POLL int max_fd = -1; /* Highest file descriptor */ @@ -79,8 +79,10 @@ httpAddrConnect2( # endif /* HAVE_POLL */ #endif /* O_NONBLOCK */ #ifdef DEBUG +# ifndef _WIN32 socklen_t len; /* Length of value */ http_addr_t peer; /* Peer address */ +# endif /* !_WIN32 */ char temp[256]; /* Temporary address string */ #endif /* DEBUG */ @@ -649,7 +651,11 @@ httpAddrGetList(const char *hostname, /* I - Hostname, IP address, or NULL for p if (error == EAI_FAIL) cg->need_res_init = 1; +# ifdef _WIN32 /* Really, Microsoft?!? */ + _cupsSetError(IPP_STATUS_ERROR_INTERNAL, gai_strerrorA(error), 0); +# else _cupsSetError(IPP_STATUS_ERROR_INTERNAL, gai_strerror(error), 0); +# endif /* _WIN32 */ } #else diff --git a/cups/http-support.c b/cups/http-support.c index 364939bcc..3ce38885e 100644 --- a/cups/http-support.c +++ b/cups/http-support.c @@ -1763,9 +1763,6 @@ _httpResolveURI( _http_uribuf_t uribuf; /* URI buffer */ int offline = 0; /* offline-report state set? */ # ifdef HAVE_DNSSD -# ifdef _WIN32 -# pragma comment(lib, "dnssd.lib") -# endif /* _WIN32 */ DNSServiceRef ref, /* DNS-SD master service reference */ domainref = NULL,/* DNS-SD service reference for domain */ ippref = NULL, /* DNS-SD service reference for network IPP */ diff --git a/cups/ipp-file.c b/cups/ipp-file.c index 0234de555..dabc5356e 100644 --- a/cups/ipp-file.c +++ b/cups/ipp-file.c @@ -23,7 +23,7 @@ static ipp_t *parse_collection(_ipp_file_t *f, _ipp_vars_t *v, void *user_data); static int parse_value(_ipp_file_t *f, _ipp_vars_t *v, void *user_data, ipp_t *ipp, ipp_attribute_t **attr, int element); -static void report_error(_ipp_file_t *f, _ipp_vars_t *v, void *user_data, const char *message, ...) __attribute((__format__ (__printf__, 4, 5))); +static void report_error(_ipp_file_t *f, _ipp_vars_t *v, void *user_data, const char *message, ...) _CUPS_FORMAT(4, 5); /* diff --git a/cups/libcups2.def b/cups/libcups2.def index 8a32f27e8..409e8b71d 100644 --- a/cups/libcups2.def +++ b/cups/libcups2.def @@ -41,18 +41,6 @@ _cupsRWUnlock _cupsRasterAddError _cupsRasterClearError _cupsRasterExecPS -_cupsSNMPClose -_cupsSNMPCopyOID -_cupsSNMPDefaultCommunity -_cupsSNMPIsOID -_cupsSNMPIsOIDPrefixed -_cupsSNMPOIDToString -_cupsSNMPOpen -_cupsSNMPRead -_cupsSNMPSetDebug -_cupsSNMPStringToOID -_cupsSNMPWalk -_cupsSNMPWrite _cupsSetDefaults _cupsSetError _cupsSetHTTPError diff --git a/cups/raster-stream.c b/cups/raster-stream.c index 7ab278b43..54adfb808 100644 --- a/cups/raster-stream.c +++ b/cups/raster-stream.c @@ -1188,7 +1188,7 @@ _cupsRasterWritePixels( else bytes = cups_raster_io(r, p, len); - if (bytes < len) + if (bytes < (ssize_t)len) return (0); else return (len); diff --git a/cups/tempfile.c b/cups/tempfile.c index e305c6cd9..9b72f1e83 100644 --- a/cups/tempfile.c +++ b/cups/tempfile.c @@ -54,7 +54,7 @@ cupsTempFd(char *filename, /* I - Pointer to buffer */ #ifdef _WIN32 if ((tmpdir = getenv("TEMP")) == NULL) { - GetTempPath(sizeof(tmppath), tmppath); + GetTempPathA(sizeof(tmppath), tmppath); tmpdir = tmppath; } diff --git a/cups/tls-sspi.c b/cups/tls-sspi.c index 91c8961f2..6e3c03b9e 100644 --- a/cups/tls-sspi.c +++ b/cups/tls-sspi.c @@ -186,7 +186,7 @@ httpCredentialsAreValidForName( if (cert) { - if (CertNameToStr(X509_ASN_ENCODING, &(cert->pCertInfo->Subject), CERT_SIMPLE_NAME_STR, cert_name, sizeof(cert_name))) + if (CertNameToStrA(X509_ASN_ENCODING, &(cert->pCertInfo->Subject), CERT_SIMPLE_NAME_STR, cert_name, sizeof(cert_name))) { /* * Extract common name at end... @@ -360,7 +360,7 @@ httpCredentialsString( expiration = mktime(&tm); - if (CertNameToStr(X509_ASN_ENCODING, &(cert->pCertInfo->Subject), CERT_SIMPLE_NAME_STR, cert_name, sizeof(cert_name))) + if (CertNameToStrA(X509_ASN_ENCODING, &(cert->pCertInfo->Subject), CERT_SIMPLE_NAME_STR, cert_name, sizeof(cert_name))) { /* * Extract common name at end... @@ -467,7 +467,7 @@ httpLoadCredentials( dwSize = 0; - if (!CertStrToName(X509_ASN_ENCODING, common_name, CERT_OID_NAME_STR, NULL, NULL, &dwSize, NULL)) + if (!CertStrToNameA(X509_ASN_ENCODING, common_name, CERT_OID_NAME_STR, NULL, NULL, &dwSize, NULL)) { DEBUG_printf(("1httpLoadCredentials: CertStrToName failed: %s", http_sspi_strerror(error, sizeof(error), GetLastError()))); goto cleanup; @@ -481,7 +481,7 @@ httpLoadCredentials( goto cleanup; } - if (!CertStrToName(X509_ASN_ENCODING, common_name, CERT_OID_NAME_STR, NULL, p, &dwSize, NULL)) + if (!CertStrToNameA(X509_ASN_ENCODING, common_name, CERT_OID_NAME_STR, NULL, p, &dwSize, NULL)) { DEBUG_printf(("1httpLoadCredentials: CertStrToName failed: %s", http_sspi_strerror(error, sizeof(error), GetLastError()))); goto cleanup; @@ -590,7 +590,7 @@ httpSaveCredentials( dwSize = 0; - if (!CertStrToName(X509_ASN_ENCODING, common_name, CERT_OID_NAME_STR, NULL, NULL, &dwSize, NULL)) + if (!CertStrToNameA(X509_ASN_ENCODING, common_name, CERT_OID_NAME_STR, NULL, NULL, &dwSize, NULL)) { DEBUG_printf(("1httpSaveCredentials: CertStrToName failed: %s", http_sspi_strerror(error, sizeof(error), GetLastError()))); goto cleanup; @@ -604,7 +604,7 @@ httpSaveCredentials( goto cleanup; } - if (!CertStrToName(X509_ASN_ENCODING, common_name, CERT_OID_NAME_STR, NULL, p, &dwSize, NULL)) + if (!CertStrToNameA(X509_ASN_ENCODING, common_name, CERT_OID_NAME_STR, NULL, p, &dwSize, NULL)) { DEBUG_printf(("1httpSaveCredentials: CertStrToName failed: %s", http_sspi_strerror(error, sizeof(error), GetLastError()))); goto cleanup; @@ -1350,7 +1350,7 @@ http_sspi_client(http_t *http, /* I - Client connection */ */ dwSize = sizeof(username); - GetUserName(username, &dwSize); + GetUserNameA(username, &dwSize); snprintf(common_name, sizeof(common_name), "CN=%s", username); if (!http_sspi_find_credentials(http, L"ClientContainer", common_name)) @@ -1713,7 +1713,7 @@ http_sspi_find_credentials( dwSize = 0; - if (!CertStrToName(X509_ASN_ENCODING, common_name, CERT_OID_NAME_STR, NULL, NULL, &dwSize, NULL)) + if (!CertStrToNameA(X509_ASN_ENCODING, common_name, CERT_OID_NAME_STR, NULL, NULL, &dwSize, NULL)) { DEBUG_printf(("5http_sspi_find_credentials: CertStrToName failed: %s", http_sspi_strerror(sspi->error, sizeof(sspi->error), GetLastError()))); ok = FALSE; @@ -1729,7 +1729,7 @@ http_sspi_find_credentials( goto cleanup; } - if (!CertStrToName(X509_ASN_ENCODING, common_name, CERT_OID_NAME_STR, NULL, p, &dwSize, NULL)) + if (!CertStrToNameA(X509_ASN_ENCODING, common_name, CERT_OID_NAME_STR, NULL, p, &dwSize, NULL)) { DEBUG_printf(("5http_sspi_find_credentials: CertStrToName failed: %s", http_sspi_strerror(sspi->error, sizeof(sspi->error), GetLastError()))); ok = FALSE; @@ -1924,7 +1924,7 @@ http_sspi_make_credentials( dwSize = 0; - if (!CertStrToName(X509_ASN_ENCODING, common_name, CERT_OID_NAME_STR, NULL, NULL, &dwSize, NULL)) + if (!CertStrToNameA(X509_ASN_ENCODING, common_name, CERT_OID_NAME_STR, NULL, NULL, &dwSize, NULL)) { DEBUG_printf(("5http_sspi_make_credentials: CertStrToName failed: %s", http_sspi_strerror(sspi->error, sizeof(sspi->error), GetLastError()))); ok = FALSE; @@ -1940,7 +1940,7 @@ http_sspi_make_credentials( goto cleanup; } - if (!CertStrToName(X509_ASN_ENCODING, common_name, CERT_OID_NAME_STR, NULL, p, &dwSize, NULL)) + if (!CertStrToNameA(X509_ASN_ENCODING, common_name, CERT_OID_NAME_STR, NULL, p, &dwSize, NULL)) { DEBUG_printf(("5http_sspi_make_credentials: CertStrToName failed: %s", http_sspi_strerror(sspi->error, sizeof(sspi->error), GetLastError()))); ok = FALSE; @@ -2296,7 +2296,7 @@ http_sspi_strerror(char *buffer, /* I - Error message buffer */ size_t bufsize, /* I - Size of buffer */ DWORD code) /* I - Error code */ { - if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, code, 0, buffer, bufsize, NULL)) + if (FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, code, 0, buffer, bufsize, NULL)) { /* * Strip trailing CR + LF... diff --git a/cups/usersys.c b/cups/usersys.c index 3cf265646..f9764fb42 100644 --- a/cups/usersys.c +++ b/cups/usersys.c @@ -500,7 +500,7 @@ cupsSetUserAgent(const char *user_agent)/* I - User-Agent string or @code NULL@ #ifdef _WIN32 version.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - GetVersionEx(&version); + GetVersionExA(&version); GetNativeSystemInfo(&sysinfo); snprintf(cg->user_agent, sizeof(cg->user_agent), @@ -1103,7 +1103,7 @@ cups_finalize_client_conf( DWORD size; /* Size of string */ size = sizeof(cc->user); - if (!GetUserName(cc->user, &size)) + if (!GetUserNameA(cc->user, &size)) #else /* * Try the USER environment variable as the default username... diff --git a/vcnet/cups.sln b/vcnet/cups.sln index 664e1b1dc..a06e7e3fa 100644 --- a/vcnet/cups.sln +++ b/vcnet/cups.sln @@ -10,16 +10,31 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testfile", "testfile.vcxproj", "{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testhttp", "testhttp.vcxproj", "{90B0058C-8393-411F-BD3B-E2C831D4E883}" + ProjectSection(ProjectDependencies) = postProject + {C0899B3A-43E7-4BC3-A785-659E1FD2EA83} = {C0899B3A-43E7-4BC3-A785-659E1FD2EA83} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cupstestppd", "cupstestppd.vcxproj", "{6BE0CDD3-4ED7-409C-A80F-19DF73664B1F}" + ProjectSection(ProjectDependencies) = postProject + {C0899B3A-43E7-4BC3-A785-659E1FD2EA83} = {C0899B3A-43E7-4BC3-A785-659E1FD2EA83} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ipptool", "ipptool.vcxproj", "{B246D91E-61F2-4433-BFD2-6C2A96FBD4D4}" + ProjectSection(ProjectDependencies) = postProject + {C0899B3A-43E7-4BC3-A785-659E1FD2EA83} = {C0899B3A-43E7-4BC3-A785-659E1FD2EA83} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regex", "regex.vcxproj", "{18950A1B-D37A-40C7-B2DF-C12986C0526E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ippfind", "ippfind.vcxproj", "{B484DA0C-62C8-4C32-83B6-CCEB58968B85}" + ProjectSection(ProjectDependencies) = postProject + {C0899B3A-43E7-4BC3-A785-659E1FD2EA83} = {C0899B3A-43E7-4BC3-A785-659E1FD2EA83} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ippserver", "ippserver.vcxproj", "{82A03BC7-0746-4B85-8908-3C7A3FAA58A9}" + ProjectSection(ProjectDependencies) = postProject + {C0899B3A-43E7-4BC3-A785-659E1FD2EA83} = {C0899B3A-43E7-4BC3-A785-659E1FD2EA83} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dnssdstub", "dnssdstub.vcxproj", "{C0899B3A-43E7-4BC3-A785-659E1FD2EA83}" EndProject diff --git a/vcnet/dns_sd.c b/vcnet/dns_sd.c index d135e9aa8..25131dd6c 100644 --- a/vcnet/dns_sd.c +++ b/vcnet/dns_sd.c @@ -34,7 +34,10 @@ static DNSServiceErrorType (*dnssd_update_record)(DNSServiceRef sdRef, DNSRecord static void (*dnssd_txt_create)(TXTRecordRef *txtRecord, uint16_t bufferLen, void *buffer); static void (*dnssd_txt_deallocate)(TXTRecordRef *txtRecord); static const void *(*dnssd_txt_get_bytes_ptr)(const TXTRecordRef *txtRecord); +static uint16_t (*dnssd_txt_get_count)(uint16_t txtLen, const void *txtRecord); static uint16_t (*dnssd_txt_get_length)(const TXTRecordRef *txtRecord); +static DNSServiceErrorType (*dnssd_txt_get_item_at_index)(uint16_t txtLen, const void *txtRecord, uint16_t itemIndex, uint16_t keyBufLen, char *key, uint8_t *valueLen, const void **value); +static const void *(*dnssd_txt_get_value_ptr)(uint16_t txtLen, const void *txtRecord, const char *key, uint8_t *valueLen); static DNSServiceErrorType (*dnssd_txt_set_value)(TXTRecordRef *txtRecord, const char *key, uint8_t valueSize, const void *value); @@ -68,7 +71,10 @@ dnssd_init(void) dnssd_txt_create = (void (*)(TXTRecordRef *, uint16_t, void *))GetProcAddress(dll_handle, "TXTRecordCreate"); dnssd_txt_deallocate = (void (*)(TXTRecordRef *))GetProcAddress(dll_handle, "TXTRecordDeallocate"); dnssd_txt_get_bytes_ptr = (const void *(*)(const TXTRecordRef *))GetProcAddress(dll_handle, "TXTRecordGetBytesPtr"); + dnssd_txt_get_count = (uint16_t (*)(uint16_t, const void *))GetProcAddress(dll_handle, "TXTRecordGetCount"); + dnssd_txt_get_item_at_index = (DNSServiceErrorType (*)(uint16_t, const void *, uint16_t, uint16_t, char *, uint8_t *, const void **))GetProcAddress(dll_handle, "TXTRecordGetItemAtIndex"); dnssd_txt_get_length = (uint16_t (*)(const TXTRecordRef *))GetProcAddress(dll_handle, "TXTRecordGetLength"); + dnssd_txt_get_value_ptr = (const void *(*)(uint16_t, const void *, const char *, uint8_t *))GetProcAddress(dll_handle, "TXTRecordGetValuePtr"); dnssd_txt_set_value = (DNSServiceErrorType (*)(TXTRecordRef *, const char *, uint8_t, const void *))GetProcAddress(dll_handle, "TXTRecordSetValue"); } @@ -383,3 +389,56 @@ DNSServiceErrorType DNSSD_API TXTRecordSetValue } +// TXTRecordGetCount +uint16_t DNSSD_API +TXTRecordGetCount( + uint16_t txtLen, + const void *txtRecord) +{ + if (!dnssd_initialized) + dnssd_init(); + + if (dnssd_txt_get_count) + return (*dnssd_txt_get_count)(txtLen, txtRecord); + else + return (0); +} + + +// TXTRecordGetItemAtIndex +DNSServiceErrorType DNSSD_API +TXTRecordGetItemAtIndex( + uint16_t txtLen, + const void *txtRecord, + uint16_t itemIndex, + uint16_t keyBufLen, + char *key, + uint8_t *valueLen, + const void **value) +{ + if (!dnssd_initialized) + dnssd_init(); + + if (dnssd_txt_get_item_at_index) + return (*dnssd_txt_get_item_at_index)(txtLen, txtRecord, itemIndex, keyBufLen, key, valueLen, value); + else + return (-1); +} + + +// TXTRecordGetValuePtr +const void * DNSSD_API +TXTRecordGetValuePtr( + uint16_t txtLen, + const void *txtRecord, + const char *key, + uint8_t *valueLen) +{ + if (!dnssd_initialized) + dnssd_init(); + + if (dnssd_txt_get_value_ptr) + return (*dnssd_txt_get_value_ptr)(txtLen, txtRecord, key, valueLen); + else + return (NULL); +} diff --git a/vcnet/ippfind.vcxproj b/vcnet/ippfind.vcxproj index 8a3010e10..66b5d65a6 100644 --- a/vcnet/ippfind.vcxproj +++ b/vcnet/ippfind.vcxproj @@ -99,7 +99,7 @@ EditAndContinue - dnssd.lib;ws2_32.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) true Console false @@ -123,7 +123,7 @@ ProgramDatabase - dnssd.lib;ws2_32.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) true Console false @@ -141,7 +141,7 @@ ProgramDatabase - dnssd.lib;ws2_32.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) true Console true @@ -164,7 +164,7 @@ ProgramDatabase - dnssd.lib;ws2_32.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) true Console true diff --git a/vcnet/ippserver.vcxproj b/vcnet/ippserver.vcxproj index 490470336..212d89609 100644 --- a/vcnet/ippserver.vcxproj +++ b/vcnet/ippserver.vcxproj @@ -99,7 +99,7 @@ EditAndContinue - dnssd.lib;ws2_32.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) true Console false @@ -123,7 +123,7 @@ ProgramDatabase - dnssd.lib;ws2_32.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) true Console false @@ -141,7 +141,7 @@ ProgramDatabase - dnssd.lib;ws2_32.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) true Console true @@ -164,7 +164,7 @@ ProgramDatabase - dnssd.lib;ws2_32.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) true Console true diff --git a/vcnet/libcups2.vcxproj b/vcnet/libcups2.vcxproj index cb656618d..0cabd0ed8 100644 --- a/vcnet/libcups2.vcxproj +++ b/vcnet/libcups2.vcxproj @@ -28,7 +28,7 @@ DynamicLibrary v141 - Unicode + MultiByte DynamicLibrary @@ -38,7 +38,7 @@ DynamicLibrary v141 - Unicode + MultiByte DynamicLibrary @@ -92,7 +92,7 @@ Disabled ..\vcnet;..;..\vcnet\regex;%(AdditionalIncludeDirectories) - ZLIB_WINAPI;WIN32;DEBUG;_DEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + DEBUG;_DEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -122,7 +122,7 @@ Disabled ..\vcnet;..;..\vcnet\regex;%(AdditionalIncludeDirectories) - ZLIB_WINAPI;WIN32;DEBUG;_DEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + DEBUG;_DEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -146,7 +146,7 @@ MinSpace ..\vcnet;..;..\vcnet\regex;%(AdditionalIncludeDirectories) - ZLIB_WINAPI;WIN32;DEBUG;NDEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + DEBUG;NDEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL Level3 @@ -178,7 +178,7 @@ MinSpace ..\vcnet;..;..\vcnet\regex;%(AdditionalIncludeDirectories) - ZLIB_WINAPI;WIN32;DEBUG;NDEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + DEBUG;NDEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL Level3 @@ -284,12 +284,14 @@ xcopy /I/Y "$(TargetPath)" WIN32;%(PreprocessorDefinitions) WIN32;%(PreprocessorDefinitions) + WIN32;%(PreprocessorDefinitions) WIN32;%(PreprocessorDefinitions) WIN32;%(PreprocessorDefinitions) WIN32;%(PreprocessorDefinitions) + WIN32;%(PreprocessorDefinitions) WIN32;%(PreprocessorDefinitions) @@ -423,6 +425,9 @@ xcopy /I/Y "$(TargetPath)" + + {c0899b3a-43e7-4bc3-a785-659e1fd2ea83} + {18950a1b-d37a-40c7-b2df-c12986c0526e} false diff --git a/vcnet/libcups2.vcxproj.filters b/vcnet/libcups2.vcxproj.filters index 43c138bee..348b72155 100644 --- a/vcnet/libcups2.vcxproj.filters +++ b/vcnet/libcups2.vcxproj.filters @@ -171,6 +171,12 @@ Source Files + + Source Files + + + Source Files +