December 2010 - Wine-commits

André Hentschel : advapi32/tests: Test how creating a subkey in HKCR affect HKLM/HKCU.
by Alexandre Julliard 31 Dec '10

31 Dec '10

Module: wine Branch: master Commit: 2399e7f25a2d69c889f4cd430eb3c83b33385ae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2399e7f25a2d69c889f4cd430… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 30 17:39:41 2010 +0100 advapi32/tests: Test how creating a subkey in HKCR affect HKLM/HKCU. --- dlls/advapi32/tests/registry.c | 45 ++++++++++++++++++++++++++++++--------- 1 files changed, 34 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index c70767f..d8f65e8 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -2,6 +2,7 @@ * Unit tests for registry functions * * Copyright (c) 2002 Alexandre Julliard + * Copyright (c) 2010 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1914,7 +1915,7 @@ static void test_redirection(void) static void test_classesroot(void) { - HKEY hkey, hklm, hkcr, hkeysub1, hklmsub1, hkcrsub1; + HKEY hkey, hklm, hkcr, hkeysub1, hklmsub1, hkcrsub1, hklmsub2, hkcrsub2; DWORD size = 8; DWORD type = REG_SZ; static CHAR buffer[8]; @@ -1954,7 +1955,7 @@ static void test_classesroot(void) /* modify the value in hkcr */ res = RegSetValueExA(hkcr, "val1", 0, REG_SZ, (const BYTE *)"hkcr", sizeof("hkcr")); - ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", res); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); /* check if the value is also modified in user's classes */ res = RegQueryValueExA(hkey, "val1", NULL, &type, (LPBYTE)buffer, &size); @@ -1972,7 +1973,7 @@ static void test_classesroot(void) /* modify the value in user's classes */ res = RegSetValueExA(hkcr, "val0", 0, REG_SZ, (const BYTE *)"user", sizeof("user")); - ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", res); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); /* check if the value is also modified in hkcr */ res = RegQueryValueExA(hkey, "val0", NULL, &type, (LPBYTE)buffer, &size); @@ -2022,7 +2023,7 @@ static void test_classesroot(void) /* modify the value in hkcr */ res = RegSetValueExA(hkcr, "val2", 0, REG_SZ, (const BYTE *)"hkcr", sizeof("hkcr")); - ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", res); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); /* check that the value is not modified in hklm classes */ res = RegQueryValueExA(hklm, "val2", NULL, &type, (LPBYTE)buffer, &size); @@ -2061,7 +2062,7 @@ static void test_classesroot(void) /* modify the value in hkcr */ res = RegSetValueExA(hkcr, "val2", 0, REG_SZ, (const BYTE *)"hkcr", sizeof("hkcr")); - ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", res); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); /* check that the value is overwritten in hklm and user's classes */ res = RegQueryValueExA(hkcr, "val2", NULL, &type, (LPBYTE)buffer, &size); @@ -2089,7 +2090,7 @@ static void test_classesroot(void) /* modify the value in hkcr */ res = RegSetValueExA(hkcrsub1, "subval1", 0, REG_SZ, (const BYTE *)"hkcr", sizeof("hkcr")); - ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", res); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); /* check that the value is modified in hklm classes */ res = RegQueryValueExA(hklmsub1, "subval1", NULL, &type, (LPBYTE)buffer, &size); @@ -2123,29 +2124,51 @@ static void test_classesroot(void) /* modify the value in hkcr */ res = RegSetValueExA(hkcrsub1, "subval1", 0, REG_SZ, (const BYTE *)"hkcr", sizeof("hkcr")); - ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", res); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); - /* check that the value is overwritten in hklm and user's classes */ - res = RegQueryValueExA(hkcrsub1, "subval1", NULL, &type, (LPBYTE)buffer, &size); + /* check that the value is not overwritten in hklm, but in user's classes */ + res = RegQueryValueExA(hklmsub1, "subval1", NULL, &type, (LPBYTE)buffer, &size); ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", res); - ok(!strcmp( buffer, "hkcr" ), "value set to '%s'\n", buffer ); + ok(!strcmp( buffer, "hklm" ), "value set to '%s'\n", buffer ); res = RegQueryValueExA(hkeysub1, "subval1", NULL, &type, (LPBYTE)buffer, &size); ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d, GLE=%x\n", res, GetLastError()); ok(!strcmp( buffer, "hkcr" ), "value set to '%s'\n", buffer ); - /* cleanup */ + /* new subkey in hkcr */ + if (RegCreateKeyExA( hkcr, "subkey2", 0, NULL, 0, + KEY_QUERY_VALUE|KEY_SET_VALUE, NULL, &hkcrsub2, NULL )) return; + res = RegSetValueExA(hkcrsub2, "subval1", 0, REG_SZ, (const BYTE *)"hkcr", sizeof("hkcr")); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); + + /* try to open that new subkey in user's classes and hklm */ + res = RegOpenKeyExA( hkey, "subkey2", 0, KEY_QUERY_VALUE|KEY_SET_VALUE, &hklmsub2 ); + ok(res != ERROR_SUCCESS, "test key found in user's classes: %d\n", res); + hklmsub2 = 0; + res = RegOpenKeyExA( hklm, "subkey2", 0, KEY_QUERY_VALUE|KEY_SET_VALUE, &hklmsub2 ); + ok(res == ERROR_SUCCESS, "test key not found in hklm: %d\n", res); + + /* check that the value is present in hklm */ + res = RegQueryValueExA(hklmsub2, "subval1", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", res); + ok(!strcmp( buffer, "hkcr" ), "value set to '%s'\n", buffer ); + + /* final cleanup */ delete_key( hkey ); delete_key( hklm ); delete_key( hkcr ); delete_key( hkeysub1 ); delete_key( hklmsub1 ); delete_key( hkcrsub1 ); + delete_key( hklmsub2 ); + delete_key( hkcrsub2 ); RegCloseKey( hkey ); RegCloseKey( hklm ); RegCloseKey( hkcr ); RegCloseKey( hkeysub1 ); RegCloseKey( hklmsub1 ); RegCloseKey( hkcrsub1 ); + RegCloseKey( hklmsub2 ); + RegCloseKey( hkcrsub2 ); } static void test_deleted_key(void)

1 0

André Hentschel : wininet/tests: Don' t call GetLastError() twice.
by Alexandre Julliard 31 Dec '10

31 Dec '10

Module: wine Branch: master Commit: 145031b8d42cffa918b5dad58855606be15b19d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=145031b8d42cffa918b5dad58… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 30 19:30:12 2010 +0100 wininet/tests: Don't call GetLastError() twice. --- dlls/wininet/tests/url.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 2ffecbc..15fbb09 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -465,21 +465,21 @@ static void InternetCrackUrl_test(void) ret = InternetCrackUrlA(TEST_URL3, 0, ICU_DECODE, &urlComponents); GLE = GetLastError(); ok(ret==firstret && (GLE==firstGLE), "InternetCrackUrl returned %d with GLE=%d (expected to return %d)\n", - ret, GetLastError(), firstret); + ret, GLE, firstret); copy_compsA(&urlSrc, &urlComponents, 32, 1024, 0, 1024, 2048, 1024); SetLastError(0xdeadbeef); ret = InternetCrackUrlA(TEST_URL3, 0, ICU_DECODE, &urlComponents); GLE = GetLastError(); ok(ret==firstret && (GLE==firstGLE), "InternetCrackUrl returned %d with GLE=%d (expected to return %d)\n", - ret, GetLastError(), firstret); + ret, GLE, firstret); copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 0, 2048, 1024); SetLastError(0xdeadbeef); ret = InternetCrackUrlA(TEST_URL3, 0, ICU_DECODE, &urlComponents); GLE = GetLastError(); ok(ret==firstret && (GLE==firstGLE), "InternetCrackUrl returned %d with GLE=%d (expected to return %d)\n", - ret, GetLastError(), firstret); + ret, GLE, firstret); copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 0, 1024); SetLastError(0xdeadbeef);

1 0

André Hentschel : advapi32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 31 Dec '10

31 Dec '10

Module: wine Branch: master Commit: 92f9cb6c5db52423f5fdc435486ddc232a85bcb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92f9cb6c5db52423f5fdc4354… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 30 19:31:54 2010 +0100 advapi32/tests: Don't test function directly when reporting GetLastError(). --- dlls/advapi32/tests/cred.c | 8 ++++---- dlls/advapi32/tests/security.c | 20 +++++++++++--------- dlls/advapi32/tests/service.c | 7 ++++--- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index fbefa92..4d4e6c8 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -156,10 +156,10 @@ static void test_CredReadDomainCredentialsA(void) * does not check for NULL output pointers and try to zero them out early */ if(0) { - ok(!pCredReadDomainCredentialsA(&info, 0, NULL, &creds) && - GetLastError() == ERROR_INVALID_PARAMETER, "!\n"); - ok(!pCredReadDomainCredentialsA(&info, 0, &count, NULL) && - GetLastError() == ERROR_INVALID_PARAMETER, "!\n"); + ret = pCredReadDomainCredentialsA(&info, 0, NULL, &creds); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "!\n"); + ret = pCredReadDomainCredentialsA(&info, 0, &count, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "!\n"); } SetLastError(0xdeadbeef); diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 4d8c8cf..ff07513 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2293,8 +2293,8 @@ static void test_process_security(void) psa.bInheritHandle = TRUE; /* Doesn't matter what ACL say we should get full access for ourselves */ - ok(CreateProcessA( NULL, buffer, &psa, NULL, FALSE, 0, NULL, NULL, &startup, &info ), - "CreateProcess with err:%d\n", GetLastError()); + res = CreateProcessA( NULL, buffer, &psa, NULL, FALSE, 0, NULL, NULL, &startup, &info ); + ok(res, "CreateProcess with err:%d\n", GetLastError()); TEST_GRANTED_ACCESS2( info.hProcess, PROCESS_ALL_ACCESS, STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL ); winetest_wait_child_process( info.hProcess ); @@ -3008,6 +3008,7 @@ static void test_PrivateObjectSecurity(void) LPSTR string; ULONG len; PSECURITY_DESCRIPTOR buf; + BOOL ret; if (!pConvertStringSecurityDescriptorToSecurityDescriptorA) { @@ -3046,25 +3047,26 @@ static void test_PrivateObjectSecurity(void) GetSecurityDescriptorControl(sec, &ctrl, &dwRevision); expect_eq(ctrl, 0x9014, int, "%x"); - ok(GetPrivateObjectSecurity(sec, GROUP_SECURITY_INFORMATION, buf, dwDescSize, &retSize), - "GetPrivateObjectSecurity failed (err=%u)\n", GetLastError()); + ret = GetPrivateObjectSecurity(sec, GROUP_SECURITY_INFORMATION, buf, dwDescSize, &retSize); + ok(ret, "GetPrivateObjectSecurity failed (err=%u)\n", GetLastError()); ok(retSize <= dwDescSize, "Buffer too small (%d vs %d)\n", retSize, dwDescSize); ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(buf, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed\n"); CHECK_RESULT_AND_FREE("G:S-1-5-21-93476-23408-4576"); GetSecurityDescriptorControl(buf, &ctrl, &dwRevision); expect_eq(ctrl, 0x8000, int, "%x"); - ok(GetPrivateObjectSecurity(sec, GROUP_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, buf, dwDescSize, &retSize), - "GetPrivateObjectSecurity failed (err=%u)\n", GetLastError()); + ret = GetPrivateObjectSecurity(sec, GROUP_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, buf, dwDescSize, &retSize); + ok(ret, "GetPrivateObjectSecurity failed (err=%u)\n", GetLastError()); ok(retSize <= dwDescSize, "Buffer too small (%d vs %d)\n", retSize, dwDescSize); - ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(buf, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed err=%u\n", GetLastError()); + ret = pConvertSecurityDescriptorToStringSecurityDescriptorA(buf, SDDL_REVISION_1, sec_info, &string, &len); + ok(ret, "Conversion failed err=%u\n", GetLastError()); CHECK_ONE_OF_AND_FREE("G:S-1-5-21-93476-23408-4576D:(A;NP;GAGXGWGR;;;SU)(A;IOID;CCDC;;;SU)(D;OICI;0xffffffff;;;S-1-5-21-93476-23408-4576)", "G:S-1-5-21-93476-23408-4576D:P(A;NP;GAGXGWGR;;;SU)(A;IOID;CCDC;;;SU)(D;OICI;0xffffffff;;;S-1-5-21-93476-23408-4576)"); /* Win7 */ GetSecurityDescriptorControl(buf, &ctrl, &dwRevision); expect_eq(ctrl & (~ SE_DACL_PROTECTED), 0x8004, int, "%x"); - ok(GetPrivateObjectSecurity(sec, sec_info, buf, dwDescSize, &retSize), - "GetPrivateObjectSecurity failed (err=%u)\n", GetLastError()); + ret = GetPrivateObjectSecurity(sec, sec_info, buf, dwDescSize, &retSize); + ok(ret, "GetPrivateObjectSecurity failed (err=%u)\n", GetLastError()); ok(retSize == dwDescSize, "Buffer too small (%d vs %d)\n", retSize, dwDescSize); ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(buf, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed\n"); CHECK_ONE_OF_AND_FREE("O:SY" diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 4605ffd..5bacb1b 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1840,9 +1840,10 @@ static void test_sequence(void) } ok(!strcmp(config->lpServiceStartName, localsystem), "Expected 'LocalSystem', got '%s'\n", config->lpServiceStartName); ok(!strcmp(config->lpDisplayName, displayname), "Expected '%s', got '%s'\n", displayname, config->lpDisplayName); - - ok(ChangeServiceConfigA(svc_handle, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, SERVICE_ERROR_NORMAL, NULL, "TestGroup2", NULL, NULL, NULL, NULL, displayname2), - "ChangeServiceConfig failed (err=%d)\n", GetLastError()); + + ret = ChangeServiceConfigA(svc_handle, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, SERVICE_ERROR_NORMAL, NULL, "TestGroup2", + NULL, NULL, NULL, NULL, displayname2); + ok(ret, "ChangeServiceConfig failed (err=%d)\n", GetLastError()); QueryServiceConfigA(svc_handle, NULL, 0, &needed); config = HeapReAlloc(GetProcessHeap(), 0, config, needed);

1 0

Sven Baars : jscript: Update the Dutch translation.
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: 1019f2f14f57b6c5e966b8108e1b18646a936ebe URL: http://source.winehq.org/git/wine.git/?a=commit;h=1019f2f14f57b6c5e966b8108… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Dec 30 16:10:20 2010 +0100 jscript: Update the Dutch translation. --- dlls/jscript/jscript_Nl.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Nl.rc b/dlls/jscript/jscript_Nl.rc index 3311ba4..5dca5f6 100644 --- a/dlls/jscript/jscript_Nl.rc +++ b/dlls/jscript/jscript_Nl.rc @@ -36,6 +36,7 @@ STRINGTABLE IDS_LBRACKET "'(' verwacht" IDS_RBRACKET "')' verwacht" IDS_UNTERMINATED_STR "Onafgesloten tekenreeksconstante" + IDS_DISABLED_CC "Conditionele compilatie is uitgeschakeld" IDS_NOT_FUNC "Functie verwacht" IDS_NOT_DATE "'[object]' is geen datum object" IDS_NOT_NUM "Getal verwacht"

1 0

Greg Geldorp : kernel32/tests: Skip some debugger tests on 64-bit.
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: f284719c96a383933ec9556473b5357b7479a07e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f284719c96a383933ec955647… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Thu Dec 30 16:31:16 2010 +0100 kernel32/tests: Skip some debugger tests on 64-bit. --- dlls/kernel32/tests/debugger.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 2d666ef..5c2afeb 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -266,6 +266,7 @@ static void doDebugger(int argc, char** argv) static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) { + static BOOL skip_crash_and_debug = FALSE; DWORD ret; HANDLE start_event, done_event; char* cmd; @@ -276,6 +277,13 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) DWORD exit_code; crash_blackbox_t crash_blackbox; debugger_blackbox_t dbg_blackbox; + DWORD wait_code; + + if (skip_crash_and_debug) + { + win_skip("Skipping crash_and_debug\n"); + return; + } ret=RegSetValueExA(hkey, "auto", 0, REG_SZ, (BYTE*)"1", 2); ok(ret == ERROR_SUCCESS, "unable to set AeDebug/auto: ret=%d\n", ret); @@ -303,7 +311,22 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) /* The process exits... */ trace("waiting for child exit...\n"); - ok(WaitForSingleObject(info.hProcess, 60000) == WAIT_OBJECT_0, "Timed out waiting for the child to crash\n"); + wait_code = WaitForSingleObject(info.hProcess, 30000); +#if defined(_WIN64) && defined(__MINGW32__) + /* Mingw x64 doesn't output proper unwind info */ + skip_crash_and_debug = broken(wait_code == WAIT_TIMEOUT); + if (skip_crash_and_debug) + { + TerminateProcess(info.hProcess, WAIT_TIMEOUT); + WaitForSingleObject(info.hProcess, 5000); + CloseHandle(info.hProcess); + assert(DeleteFileA(dbglog) != 0); + assert(DeleteFileA(childlog) != 0); + win_skip("Giving up on child process\n"); + return; + } +#endif + ok(wait_code == WAIT_OBJECT_0, "Timed out waiting for the child to crash\n"); ok(GetExitCodeProcess(info.hProcess, &exit_code), "GetExitCodeProcess failed: err=%d\n", GetLastError()); if (strstr(dbgtasks, "code2")) { @@ -328,7 +351,19 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) ok(SetEvent(start_event), "SetEvent(start_event) failed\n"); trace("waiting for the debugger...\n"); - ok(WaitForSingleObject(done_event, 60000) == WAIT_OBJECT_0, "Timed out waiting for the debugger\n"); + wait_code = WaitForSingleObject(done_event, 5000); +#if defined(_WIN64) && defined(__MINGW32__) + /* Mingw x64 doesn't output proper unwind info */ + skip_crash_and_debug = broken(wait_code == WAIT_TIMEOUT); + if (skip_crash_and_debug) + { + assert(DeleteFileA(dbglog) != 0); + assert(DeleteFileA(childlog) != 0); + win_skip("Giving up on debugger\n"); + return; + } +#endif + ok(wait_code == WAIT_OBJECT_0, "Timed out waiting for the debugger\n"); assert(load_blackbox(childlog, &crash_blackbox, sizeof(crash_blackbox))); assert(load_blackbox(dbglog, &dbg_blackbox, sizeof(dbg_blackbox)));

1 0

Jacek Caban : jscript: Fixed some math API assumption that cause test failures on Solaris.
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: 45aee4fd6c6b1aca529d543b73cd3d8efcaa2a92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45aee4fd6c6b1aca529d543b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 30 14:32:43 2010 +0100 jscript: Fixed some math API assumption that cause test failures on Solaris. --- dlls/jscript/global.c | 2 +- dlls/jscript/math.c | 25 +++++++++++++++++++++---- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index d1dddcc..24698ac 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -290,7 +290,7 @@ static HRESULT JSGlobal_escape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, D for(ptr=str; *ptr; ptr++) { if(*ptr > 0xff) len += 6; - else if(isalnum((char)*ptr) || *ptr=='*' || *ptr=='@' || *ptr=='-' + else if(isalnum((unsigned char)*ptr) || *ptr=='*' || *ptr=='@' || *ptr=='-' || *ptr=='_' || *ptr=='+' || *ptr=='.' || *ptr=='/') len++; else diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index 765e015..9fff6a9 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -100,7 +100,13 @@ static HRESULT Math_acos(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPAR if(FAILED(hres)) return hres; - if(retv) num_set_val(retv, acos(num_val(&v))); + if(retv) { + DOUBLE x = num_val(&v); + if(x < -1.0 || x > 1.0) + num_set_nan(retv); + else + num_set_val(retv, acos(x)); + } return S_OK; } @@ -121,7 +127,13 @@ static HRESULT Math_asin(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPAR if(FAILED(hres)) return hres; - if(retv) num_set_val(retv, asin(num_val(&v))); + if(retv) { + DOUBLE x = num_val(&v); + if(x < -1.0 || x > 1.0) + num_set_nan(retv); + else + num_set_val(retv, asin(x)); + } return S_OK; } @@ -278,8 +290,13 @@ static HRESULT Math_log(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARA if(FAILED(hres)) return hres; - if(retv) - num_set_val(retv, log(num_val(&v))); + if(retv) { + DOUBLE x = num_val(&v); + if(x < -0.0) + num_set_nan(retv); + else + num_set_val(retv, log(x)); + } return S_OK; }

1 0

Sven Baars : appwiz.cpl: Update the Dutch translation.
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: b9840424b2fda3b815c4ad08964c78a16905e74a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9840424b2fda3b815c4ad089… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Dec 30 16:10:16 2010 +0100 appwiz.cpl: Update the Dutch translation. --- dlls/appwiz.cpl/Nl.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Nl.rc b/dlls/appwiz.cpl/Nl.rc index 9fd296b..9c337dd 100644 --- a/dlls/appwiz.cpl/Nl.rc +++ b/dlls/appwiz.cpl/Nl.rc @@ -48,6 +48,7 @@ STRINGTABLE { IDS_DOWNLOADING "Bezig met downloaden..." IDS_INSTALLING "Bezig met installeren..." + IDS_INVALID_SHA "Onverwachte checksum van het gedownloade bestand. Installatie van het corrupte bestand wordt afgebroken." } IDD_MAIN DIALOG 0, 0, 320, 220

1 0

André Hentschel : riched20/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: cea221caa039c6b77d2f288aa393c3d04ca2e617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cea221caa039c6b77d2f288aa… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 30 02:39:40 2010 +0100 riched20/tests: Don't test function directly when reporting GetLastError(). --- dlls/riched20/tests/editor.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index efd2023..63b23e9 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -7070,6 +7070,7 @@ static void test_dialogmode(void) START_TEST( editor ) { + BOOL ret; /* Must explicitly LoadLibrary(). The test has no references to functions in * RICHED20.DLL, so the linker doesn't actually link to it. */ hmoduleRichEdit = LoadLibrary("RICHED20.DLL"); @@ -7134,5 +7135,6 @@ START_TEST( editor ) } OleFlushClipboard(); - ok(FreeLibrary(hmoduleRichEdit) != 0, "error: %d\n", (int) GetLastError()); + ret = FreeLibrary(hmoduleRichEdit); + ok(ret, "error: %d\n", (int) GetLastError()); }

1 0

André Hentschel : msi/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: 648025881f44e36440332e033be047184627bc93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=648025881f44e36440332e033… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 30 02:40:43 2010 +0100 msi/tests: Don't test function directly when reporting GetLastError(). --- dlls/msi/tests/automation.c | 3 ++- dlls/msi/tests/install.c | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 49cdca3..46178b8 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -2103,7 +2103,8 @@ static void test_Installer_RegistryValue(void) "RegSetValueExW failed\n"); ok(!RegSetValueExW(hkey,szThree,0,REG_BINARY, (const BYTE *)qw, 4), "RegSetValueExW failed\n"); - ok(SetEnvironmentVariableA("MSITEST", "Four"), "SetEnvironmentVariableA failed %d\n", GetLastError()); + bRet = SetEnvironmentVariableA("MSITEST", "Four"); + ok(bRet, "SetEnvironmentVariableA failed %d\n", GetLastError()); ok(!RegSetValueExW(hkey,szFour,0,REG_EXPAND_SZ, (const BYTE *)szExpand, sizeof(szExpand)), "RegSetValueExW failed\n"); ok(!RegSetValueExW(hkey,szFive,0,REG_MULTI_SZ, (const BYTE *)szFive, sizeof(szFive)), diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index ad5a355..5461387 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -5546,6 +5546,7 @@ static void process_pending_renames(HKEY hkey) for (src = buf; *src; src = dst + strlen(dst) + 1) { DWORD flags = MOVEFILE_COPY_ALLOWED; + BOOL fileret; dst = src + strlen(src) + 1; @@ -5573,10 +5574,14 @@ static void process_pending_renames(HKEY hkey) if (*dst) { if (dst[0] == '\\' && dst[1] == '?' && dst[2] == '?' && dst[3] == '\\') dst += 4; - ok(MoveFileExA(src, dst, flags), "Failed to move file %s -> %s (%u)\n", src, dst, GetLastError()); + fileret = MoveFileExA(src, dst, flags); + ok(fileret, "Failed to move file %s -> %s (%u)\n", src, dst, GetLastError()); } else - ok(DeleteFileA(src), "Failed to delete file %s (%u)\n", src, GetLastError()); + { + fileret = DeleteFileA(src); + ok(fileret, "Failed to delete file %s (%u)\n", src, GetLastError()); + } } ok(found, "Expected a 'msitest' entry\n");

1 0

André Hentschel : shlwapi/tests: Fix typo.
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: 503934a67d51787a28da99f6111ac007b7ed90c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=503934a67d51787a28da99f61… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 30 02:41:20 2010 +0100 shlwapi/tests: Fix typo. --- dlls/shlwapi/tests/shreg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/shreg.c b/dlls/shlwapi/tests/shreg.c index 11ebae9..4a68494 100644 --- a/dlls/shlwapi/tests/shreg.c +++ b/dlls/shlwapi/tests/shreg.c @@ -192,7 +192,7 @@ static void test_SHGetRegPath(void) ok( 0 == strcmp(sExpTestpath1, buf) , "Comparing (%s) with (%s) failed\n", buf, sExpTestpath1); } -static void test_SHQUeryValueEx(void) +static void test_SHQueryValueEx(void) { HKEY hKey; DWORD dwSize; @@ -464,7 +464,7 @@ START_TEST(shreg) pSHRegGetValueA=(SHRegGetValueA_func)GetProcAddress(hshlwapi,"SHRegGetValueA"); test_SHGetValue(); test_SHRegGetValue(); - test_SHQUeryValueEx(); + test_SHQueryValueEx(); test_SHGetRegPath(); test_SHCopyKey(); test_SHDeleteKey();

1 0