September 2008 - Wine-commits

Juan Lang : secur32: Fix test failure with neither gnutls nor ntlm_auth available.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: b95e146ccbbffaefcf6714c80667d7df5f10f365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b95e146ccbbffaefcf6714c80… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Sep 28 08:38:41 2008 -0700 secur32: Fix test failure with neither gnutls nor ntlm_auth available. --- dlls/secur32/tests/main.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/tests/main.c b/dlls/secur32/tests/main.c index 359bcc7..e652485 100644 --- a/dlls/secur32/tests/main.c +++ b/dlls/secur32/tests/main.c @@ -143,8 +143,17 @@ static void testEnumerateSecurityPackages(void) "EnumerateSecurityPackages() should return %d, not %08x\n", SEC_E_OK, sec_status); - ok(num_packages > 0, "Number of sec packages should be > 0 ,but is %d\n", - num_packages); + if (num_packages == 0) + { + todo_wine + ok(num_packages > 0, "Number of sec packages should be > 0 ,but is %d\n", + num_packages); + skip("no sec packages to check\n"); + return; + } + else + ok(num_packages > 0, "Number of sec packages should be > 0 ,but is %d\n", + num_packages); ok(pkg_info != NULL, "pkg_info should not be NULL after EnumerateSecurityPackages\n");

1 0

Marcus Meissner : jscript: Fix number conversion in non-English locales.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: 4730205ffbf4ee53dcb5d04db85aec726778024e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4730205ffbf4ee53dcb5d04db… Author: Marcus Meissner <meissner(a)suse.de> Date: Sun Sep 28 17:15:55 2008 +0200 jscript: Fix number conversion in non-English locales. --- dlls/jscript/jsutils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 32b877b..c6f4b9c 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -458,7 +458,7 @@ HRESULT to_string(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, BSTR *str) HRESULT hres; V_VT(&strv) = VT_EMPTY; - hres = VariantChangeType(&strv, v, 0, VT_BSTR); + hres = VariantChangeTypeEx(&strv, v, MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT), 0, VT_BSTR); if(FAILED(hres)) return hres;

1 0

Rob Shearman : urlmon: Fix race in protocol tests.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: 601b3b2732eb9da816c7805c594376ad8f7d0bdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=601b3b2732eb9da816c7805c5… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Sep 28 16:38:05 2008 +0100 urlmon: Fix race in protocol tests. The value of *called is set asynchronously and so the callback function could be called after IInternetProtocol_Read returns E_PENDING. The value of *called is only predictable after the WaitForSingleObject call returns. Therefore, remove the checks on *called before this call. --- dlls/urlmon/tests/protocol.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index b986dfc..159af5d 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1557,7 +1557,6 @@ static void test_http_protocol_url(LPCWSTR url, BOOL is_first) if(SUCCEEDED(hres)) { BYTE buf[3600]; DWORD cb; - int *called = (bindf & BINDF_FROMURLMON) ? &called_Switch : &called_ReportData; test_priority(http_protocol); @@ -1579,8 +1578,8 @@ static void test_http_protocol_url(LPCWSTR url, BOOL is_first) expect_hrResult = S_OK; hres = IInternetProtocol_Read(http_protocol, buf, 1, &cb); - ok((!*called && hres == E_PENDING && cb==0) || - (*called && hres == S_OK && cb==1), "Read failed: %08x (%d bytes)\n", hres, cb); + ok((hres == E_PENDING && cb==0) || + (hres == S_OK && cb==1), "Read failed: %08x (%d bytes)\n", hres, cb); WaitForSingleObject(event_complete, INFINITE); if(bindf & BINDF_FROMURLMON) @@ -1596,8 +1595,8 @@ static void test_http_protocol_url(LPCWSTR url, BOOL is_first) hres = IInternetProtocol_Read(http_protocol, buf, sizeof(buf), &cb); if(hres == E_PENDING) { hres = IInternetProtocol_Read(http_protocol, buf, 1, &cb); - ok((!*called && hres == E_PENDING && cb==0) || - (*called && hres == S_OK && cb==1), "Read failed: %08x (%d bytes)\n", hres, cb); + ok((hres == E_PENDING && cb==0) || + (hres == S_OK && cb==1), "Read failed: %08x (%d bytes)\n", hres, cb); WaitForSingleObject(event_complete, INFINITE); if(bindf & BINDF_FROMURLMON) CHECK_CALLED(Switch);

1 0

Marcus Meissner : jscript: Fixed crash in run test.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: db447d0f669e3358dbd58f081cb9323046131464 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db447d0f669e3358dbd58f081… Author: Marcus Meissner <meissner(a)suse.de> Date: Sun Sep 28 16:56:50 2008 +0200 jscript: Fixed crash in run test. --- dlls/jscript/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index fc40462..11ef882 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -530,7 +530,7 @@ static HRESULT rep_call(DispatchEx *func, const WCHAR *str, match_result_t *matc static HRESULT String_replace(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - DWORD parens_cnt, parens_size=0, rep_len=0, length; + DWORD parens_cnt = 0, parens_size=0, rep_len=0, length; BSTR rep_str = NULL, match_str = NULL, ret_str; DispatchEx *rep_func = NULL, *regexp = NULL; match_result_t *parens = NULL, match;

1 0

Lei Zhang : winspool: Check the return results from schedule_* functions.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: aea5d3d14a3e9e78f9e05045fa9dd94ad86c61b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aea5d3d14a3e9e78f9e05045f… Author: Lei Zhang <thestig(a)google.com> Date: Sat Sep 27 13:16:26 2008 -0700 winspool: Check the return results from schedule_* functions. --- dlls/winspool.drv/info.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 4737e98..3ac336d 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -7574,6 +7574,7 @@ static BOOL schedule_lpr(LPCWSTR printer_name, LPCWSTR filename) char *unixname, *queue, *cmd; char fmt[] = "lpr -P%s %s"; DWORD len; + int r; if(!(unixname = wine_get_unix_file_name(filename))) return FALSE; @@ -7586,12 +7587,12 @@ static BOOL schedule_lpr(LPCWSTR printer_name, LPCWSTR filename) sprintf(cmd, fmt, queue, unixname); TRACE("printing with: %s\n", cmd); - system(cmd); + r = system(cmd); HeapFree(GetProcessHeap(), 0, cmd); HeapFree(GetProcessHeap(), 0, queue); HeapFree(GetProcessHeap(), 0, unixname); - return TRUE; + return (r == 0); } /***************************************************************************** @@ -7714,10 +7715,11 @@ static BOOL schedule_file(LPCWSTR filename) if(get_filename(&output)) { + BOOL r; TRACE("copy to %s\n", debugstr_w(output)); - CopyFileW(filename, output, FALSE); + r = CopyFileW(filename, output, FALSE); HeapFree(GetProcessHeap(), 0, output); - return TRUE; + return r; } return FALSE; } @@ -7869,23 +7871,23 @@ BOOL WINAPI ScheduleJob( HANDLE hPrinter, DWORD dwJobID ) } if(output[0] == '|') { - schedule_pipe(output + 1, job->filename); + ret = schedule_pipe(output + 1, job->filename); } else if(output[0]) { - schedule_unixfile(output, job->filename); + ret = schedule_unixfile(output, job->filename); } else if(!strncmpW(pi5->pPortName, LPR_Port, strlenW(LPR_Port))) { - schedule_lpr(pi5->pPortName + strlenW(LPR_Port), job->filename); + ret = schedule_lpr(pi5->pPortName + strlenW(LPR_Port), job->filename); } else if(!strncmpW(pi5->pPortName, CUPS_Port, strlenW(CUPS_Port))) { - schedule_cups(pi5->pPortName + strlenW(CUPS_Port), job->filename, job->document_title); + ret = schedule_cups(pi5->pPortName + strlenW(CUPS_Port), job->filename, job->document_title); } else if(!strncmpW(pi5->pPortName, FILE_Port, strlenW(FILE_Port))) { - schedule_file(job->filename); + ret = schedule_file(job->filename); } else { @@ -7899,7 +7901,6 @@ BOOL WINAPI ScheduleJob( HANDLE hPrinter, DWORD dwJobID ) HeapFree(GetProcessHeap(), 0, job->document_title); HeapFree(GetProcessHeap(), 0, job->filename); HeapFree(GetProcessHeap(), 0, job); - ret = TRUE; break; } end:

1 0

Juan Lang : wintrust: Only set the error on the root element of the chain.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: cdfb393db4ec8a369db2485eac4fdb59935604fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdfb393db4ec8a369db2485ea… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Sep 27 11:32:50 2008 -0700 wintrust: Only set the error on the root element of the chain. --- dlls/wintrust/softpub.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 918e103..9140182 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -611,9 +611,6 @@ static BOOL WINTRUST_CopyChain(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) data->pasSigners[signerIdx].pasCertChain[0].dwConfidence = WINTRUST_TrustStatusToConfidence( simpleChain->rgpElement[0]->TrustStatus.dwErrorStatus); - data->pasSigners[signerIdx].pasCertChain[0].dwError = - WINTRUST_TrustStatusToError( - simpleChain->rgpElement[0]->TrustStatus.dwErrorStatus); data->pasSigners[signerIdx].pasCertChain[0].pChainElement = simpleChain->rgpElement[0]; ret = TRUE; @@ -628,11 +625,12 @@ static BOOL WINTRUST_CopyChain(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) data->pasSigners[signerIdx].pasCertChain[i].dwConfidence = WINTRUST_TrustStatusToConfidence( simpleChain->rgpElement[i]->TrustStatus.dwErrorStatus); - data->pasSigners[signerIdx].pasCertChain[i].dwError = - WINTRUST_TrustStatusToError( - simpleChain->rgpElement[i]->TrustStatus.dwErrorStatus); } } + data->pasSigners[signerIdx].pasCertChain[simpleChain->cElement - 1].dwError + = WINTRUST_TrustStatusToError( + simpleChain->rgpElement[simpleChain->cElement - 1]-> + TrustStatus.dwErrorStatus); return ret; }

1 0

Juan Lang : wintrust: Use helper function for setting confidence in SoftpubCheckCert.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: c20a617aecb5ea58058db93cdfb6c715eaee5e59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c20a617aecb5ea58058db93cd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Sep 27 11:32:04 2008 -0700 wintrust: Use helper function for setting confidence in SoftpubCheckCert. --- dlls/wintrust/softpub.c | 44 +++++++++++++++++--------------------------- 1 files changed, 17 insertions(+), 27 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 9ee1ba7..918e103 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -501,6 +501,20 @@ HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) return ret ? S_OK : S_FALSE; } +static DWORD WINTRUST_TrustStatusToConfidence(DWORD errorStatus) +{ + DWORD confidence = 0; + + confidence = 0; + if (!(errorStatus & CERT_TRUST_IS_NOT_SIGNATURE_VALID)) + confidence |= CERT_CONFIDENCE_SIG; + if (!(errorStatus & CERT_TRUST_IS_NOT_TIME_VALID)) + confidence |= CERT_CONFIDENCE_TIME; + if (!(errorStatus & CERT_TRUST_IS_NOT_TIME_NESTED)) + confidence |= CERT_CONFIDENCE_TIMENEST; + return confidence; +} + BOOL WINAPI SoftpubCheckCert(CRYPT_PROVIDER_DATA *data, DWORD idxSigner, BOOL fCounterSignerChain, DWORD idxCounterSigner) { @@ -524,19 +538,9 @@ BOOL WINAPI SoftpubCheckCert(CRYPT_PROVIDER_DATA *data, DWORD idxSigner, for (i = 0; i < simpleChain->cElement; i++) { /* Set confidence */ - data->pasSigners[idxSigner].pasCertChain[i].dwConfidence = 0; - if (!(simpleChain->rgpElement[i]->TrustStatus.dwErrorStatus & - CERT_TRUST_IS_NOT_TIME_VALID)) - data->pasSigners[idxSigner].pasCertChain[i].dwConfidence - |= CERT_CONFIDENCE_TIME; - if (!(simpleChain->rgpElement[i]->TrustStatus.dwErrorStatus & - CERT_TRUST_IS_NOT_TIME_NESTED)) - data->pasSigners[idxSigner].pasCertChain[i].dwConfidence - |= CERT_CONFIDENCE_TIMENEST; - if (!(simpleChain->rgpElement[i]->TrustStatus.dwErrorStatus & - CERT_TRUST_IS_NOT_SIGNATURE_VALID)) - data->pasSigners[idxSigner].pasCertChain[i].dwConfidence - |= CERT_CONFIDENCE_SIG; + data->pasSigners[idxSigner].pasCertChain[i].dwConfidence = + WINTRUST_TrustStatusToConfidence( + simpleChain->rgpElement[i]->TrustStatus.dwErrorStatus); /* Set additional flags */ if (!(simpleChain->rgpElement[i]->TrustStatus.dwErrorStatus & CERT_TRUST_IS_UNTRUSTED_ROOT)) @@ -552,20 +556,6 @@ BOOL WINAPI SoftpubCheckCert(CRYPT_PROVIDER_DATA *data, DWORD idxSigner, return ret; } -static DWORD WINTRUST_TrustStatusToConfidence(DWORD errorStatus) -{ - DWORD confidence = 0; - - confidence = 0; - if (!(errorStatus & CERT_TRUST_IS_NOT_SIGNATURE_VALID)) - confidence |= CERT_CONFIDENCE_SIG; - if (!(errorStatus & CERT_TRUST_IS_NOT_TIME_VALID)) - confidence |= CERT_CONFIDENCE_TIME; - if (!(errorStatus & CERT_TRUST_IS_NOT_TIME_NESTED)) - confidence |= CERT_CONFIDENCE_TIMENEST; - return confidence; -} - static DWORD WINTRUST_TrustStatusToError(DWORD errorStatus) { DWORD error;

1 0

Juan Lang : wintrust: Map cert trust error status to a windows error.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: cc3a94f40d71465261372ba98f1e841176f491f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc3a94f40d71465261372ba98… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Sep 27 11:31:23 2008 -0700 wintrust: Map cert trust error status to a windows error. --- dlls/wintrust/softpub.c | 51 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 52df73d..9ee1ba7 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -566,6 +566,51 @@ static DWORD WINTRUST_TrustStatusToConfidence(DWORD errorStatus) return confidence; } +static DWORD WINTRUST_TrustStatusToError(DWORD errorStatus) +{ + DWORD error; + + if (errorStatus & CERT_TRUST_IS_NOT_SIGNATURE_VALID) + error = TRUST_E_CERT_SIGNATURE; + else if (errorStatus & CERT_TRUST_IS_UNTRUSTED_ROOT) + error = CERT_E_UNTRUSTEDROOT; + else if (errorStatus & CERT_TRUST_IS_NOT_TIME_VALID) + error = CERT_E_EXPIRED; + else if (errorStatus & CERT_TRUST_IS_NOT_TIME_NESTED) + error = CERT_E_VALIDITYPERIODNESTING; + else if (errorStatus & CERT_TRUST_IS_REVOKED) + error = CERT_E_REVOKED; + else if (errorStatus & CERT_TRUST_IS_OFFLINE_REVOCATION || + errorStatus & CERT_TRUST_REVOCATION_STATUS_UNKNOWN) + error = CERT_E_REVOCATION_FAILURE; + else if (errorStatus & CERT_TRUST_IS_NOT_VALID_FOR_USAGE) + error = CERT_E_WRONG_USAGE; + else if (errorStatus & CERT_TRUST_IS_CYCLIC) + error = CERT_E_CHAINING; + else if (errorStatus & CERT_TRUST_INVALID_EXTENSION) + error = CERT_E_CRITICAL; + else if (errorStatus & CERT_TRUST_INVALID_POLICY_CONSTRAINTS) + error = CERT_E_INVALID_POLICY; + else if (errorStatus & CERT_TRUST_INVALID_BASIC_CONSTRAINTS) + error = TRUST_E_BASIC_CONSTRAINTS; + else if (errorStatus & CERT_TRUST_INVALID_NAME_CONSTRAINTS || + errorStatus & CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT || + errorStatus & CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT || + errorStatus & CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT || + errorStatus & CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT) + error = CERT_E_INVALID_NAME; + else if (errorStatus & CERT_TRUST_NO_ISSUANCE_CHAIN_POLICY) + error = CERT_E_INVALID_POLICY; + else if (errorStatus) + { + FIXME("unknown error status %08x\n", errorStatus); + error = TRUST_E_SYSTEM_ERROR; + } + else + error = S_OK; + return error; +} + static BOOL WINTRUST_CopyChain(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) { BOOL ret; @@ -577,7 +622,8 @@ static BOOL WINTRUST_CopyChain(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) WINTRUST_TrustStatusToConfidence( simpleChain->rgpElement[0]->TrustStatus.dwErrorStatus); data->pasSigners[signerIdx].pasCertChain[0].dwError = - simpleChain->rgpElement[0]->TrustStatus.dwErrorStatus; + WINTRUST_TrustStatusToError( + simpleChain->rgpElement[0]->TrustStatus.dwErrorStatus); data->pasSigners[signerIdx].pasCertChain[0].pChainElement = simpleChain->rgpElement[0]; ret = TRUE; @@ -593,7 +639,8 @@ static BOOL WINTRUST_CopyChain(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) WINTRUST_TrustStatusToConfidence( simpleChain->rgpElement[i]->TrustStatus.dwErrorStatus); data->pasSigners[signerIdx].pasCertChain[i].dwError = - simpleChain->rgpElement[i]->TrustStatus.dwErrorStatus; + WINTRUST_TrustStatusToError( + simpleChain->rgpElement[i]->TrustStatus.dwErrorStatus); } } return ret;

1 0

Rob Shearman : msvcmaker: Fix detection of static libraries.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: 07ca2b45275d7eae88a74226108d9fd445efab79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07ca2b45275d7eae88a742261… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Sep 25 16:44:23 2008 +0100 msvcmaker: Fix detection of static libraries. Also don't generate a custom build step for the .spec file for static libraries, since they don't have a .spec file. --- tools/winapi/msvcmaker | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index 7309f1e..fc7d022 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -120,6 +120,7 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) { my $module; my $testdll; my @imports; + my $type; my %vars; @@ -164,8 +165,8 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) { next MAKEFILE_IN; } } - } elsif(/^LIBRARY\s*=\s*(\S+)\s*$/) { - $module = $1 . "\.lib"; + } elsif (/^\@MAKE_IMPLIB_RULES\@/) { + $type = "lib"; } elsif(/^TOPOBJDIR\s*=\s*(\S+)\s*$/) { $topobjdir = $1; } elsif (/^TESTDLL\s*=\s*(\S+)\s*$/) { @@ -249,12 +250,11 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) { $project =~ s/\.(?:dll|exe|lib)$//; $project =~ y/./_/; - my $type; if($module =~ /\.exe$/) { $type = "exe"; } elsif($module =~ /\.lib$/) { $type = "lib"; - } else { + } elsif(!$type) { $type = "dll"; } @@ -449,7 +449,8 @@ sub _generate_dsp($$) { if ($project !~ /^wine(?:build|runtests|test)?$/ && $project !~ /^(?:gdi32)_.+?$/ && - $project !~ /_test$/) + $project !~ /_test$/ && + !$lib) { push @source_files, "$base_module.spec"; @source_files = sort(@source_files);

1 0

Rob Shearman : msvcmaker: Define _USE_MATH_DEFINES so that M_PI and other constants are defined when including <math.h>.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: b1fccd9da9cd23bbb9ddfc36c1062c221159310f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1fccd9da9cd23bbb9ddfc36c… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Sep 25 16:44:29 2008 +0100 msvcmaker: Define _USE_MATH_DEFINES so that M_PI and other constants are defined when including <math.h>. --- tools/winapi/msvcmaker | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index fc7d022..1fec041 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -627,7 +627,7 @@ sub _generate_dsp($$) { print OUT " /c"; print OUT "\r\n"; - my @defines2 = qw(_CRT_SECURE_NO_DEPRECATE _CRT_NONSTDC_NO_DEPRECATE USE_COMPILER_EXCEPTIONS); + my @defines2 = qw(_CRT_SECURE_NO_DEPRECATE _CRT_NONSTDC_NO_DEPRECATE USE_COMPILER_EXCEPTIONS _USE_MATH_DEFINES); if($debug) { if($lib) { print OUT "# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od";

1 0