September 2008 - Wine-Commits

James Hawkins : msvcrt: Trace the results of two failing tests.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: 43c97f44775ea01609a64d22e628a4373bb869b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43c97f44775ea01609a64d22e… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 01:05:37 2008 -0500 msvcrt: Trace the results of two failing tests. --- dlls/msvcrt/tests/printf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index d7abacd..040c4a7 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -390,9 +390,9 @@ static void test_sprintf( void ) format = "asdf%n"; x = 0; r = sprintf(buffer, format, &x ); - ok(x == 4, "should write to x\n"); + ok(x == 4, "should write to x: %d\n", x); ok(!strcmp(buffer,"asdf"), "failed\n"); - ok( r==4, "return count wrong\n"); + ok( r==4, "return count wrong: %d\n", r); format = "%-1d"; r = sprintf(buffer, format,2);

1 0

James Hawkins : msi: Fix a failing test in Vista.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: e5fd83da6d9cd6bb6489cd5b840ddd1930792b6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5fd83da6d9cd6bb6489cd5b8… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 01:04:59 2008 -0500 msi: Fix a failing test in Vista. --- dlls/msi/tests/automation.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 8ea639a..b76aae1 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -373,6 +373,15 @@ static CHAR string1[MAX_PATH], string2[MAX_PATH]; ok(0, format, string1, string2); \ } +#define ok_w2n(format, szString1, szString2, len) \ +\ + if (memcmp(szString1, szString2, len * sizeof(WCHAR)) != 0) \ + { \ + WideCharToMultiByte(CP_ACP, 0, szString1, -1, string1, MAX_PATH, NULL, NULL); \ + WideCharToMultiByte(CP_ACP, 0, szString2, -1, string2, MAX_PATH, NULL, NULL); \ + ok(0, format, string1, string2); \ + } + #define ok_aw(format, aString, wString) \ \ WideCharToMultiByte(CP_ACP, 0, wString, -1, string1, MAX_PATH, NULL, NULL); \ @@ -1888,10 +1897,12 @@ static void test_Installer_RegistryValue(void) ok(hr == S_OK, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr); ok_w2("Registry value \"%s\" does not match expected \"%s\"\n", szString, szFour); + /* Vista does not NULL-terminate this case */ memset(szString, 0, sizeof(szString)); hr = Installer_RegistryValueW(curr_user, szKey, szFive, szString); ok(hr == S_OK, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr); - ok_w2("Registry value \"%s\" does not match expected \"%s\"\n", szString, szFiveHi); + ok_w2n("Registry value \"%s\" does not match expected \"%s\"\n", + szString, szFiveHi, lstrlenW(szFiveHi)); memset(szString, 0, sizeof(szString)); hr = Installer_RegistryValueW(curr_user, szKey, szSix, szString);

1 0

James Hawkins : mshtml: Fix a test that fails in Vista.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: d62b33f2290fa652ecfe4a873ae6f7be4173d66a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62b33f2290fa652ecfe4a873… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 01:04:21 2008 -0500 mshtml: Fix a test that fails in Vista. --- dlls/mshtml/tests/dom.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d442800..b658a74 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2728,7 +2728,9 @@ static void run_domtest(const char *str, domtest_t test) } ref = IHTMLDocument2_Release(doc); - ok(!ref, "ref = %d\n", ref); + ok(!ref || + ref == 1, /* Vista */ + "ref = %d\n", ref); } static void gecko_installer_workaround(BOOL disable)

1 0

James Hawkins : mlang: Remove a test that fails on all systems.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: e57badb6679f96f39aa17ddc32a18a4bc87ab70c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e57badb6679f96f39aa17ddc3… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 01:03:28 2008 -0500 mlang: Remove a test that fails on all systems. --- dlls/mlang/tests/mlang.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 7b35d43..ed63cc6 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1273,15 +1273,6 @@ static void test_JapaneseConversion(void) ok(destsz == unc_jp[i][0],"(%i) Expected %i, got %i\n",i,unc_jp[i][0],destsz); ok(srcsz == sjis_jp[i][0],"(%i) Expected %i, got %i\n",i,sjis_jp[i][0],srcsz); ok(memcmp(outputW,&unc_jp[i][1],destsz)==0,"(%i) Strings do not match\n",i); - - i = 2; - destsz = 30; - srcsz = euc_jp[i][0]; - hr = pConvertINetMultiByteToUnicode(NULL, 50932, &euc_jp[i][1], &srcsz, outputW, &destsz); - ok(hr == S_OK,"(%i) Expected S_OK, got %08x\n",i,hr); - ok(destsz == unc_jp[i][0],"(%i) Expected %i, got %i\n",i,unc_jp[i][0],destsz); - ok(srcsz == euc_jp[i][0],"(%i) Expected %i, got %i\n",i,euc_jp[i][0],srcsz); - ok(memcmp(outputW,&unc_jp[i][1],destsz)==0,"(%i) Strings do not match\n",i); } START_TEST(mlang)

1 0

James Hawkins : kernel32: Fix a test that fails in win2k3.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: 57cda911a94d504396a6900a3ab3467df953810e URL: http://source.winehq.org/git/wine.git/?a=commit;h=57cda911a94d504396a6900a3… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 01:02:39 2008 -0500 kernel32: Fix a test that fails in win2k3. --- dlls/kernel32/tests/pipe.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index ce0f5b6..8de2e97 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -953,7 +953,10 @@ static void test_ImpersonateNamedPipeClient(HANDLE hClientToken, DWORD security_ ret = ImpersonateNamedPipeClient(hPipeServer); error = GetLastError(); todo_wine - ok(!ret && (error == ERROR_CANNOT_IMPERSONATE), "ImpersonateNamedPipeClient should have failed with ERROR_CANNOT_IMPERSONATE instead of %d\n", GetLastError()); + ok(!ret && + (error == ERROR_CANNOT_IMPERSONATE || + error == 0xdeadbeef), /* win2k3 */ + "ImpersonateNamedPipeClient should have failed with ERROR_CANNOT_IMPERSONATE instead of %d\n", GetLastError()); ret = ConnectNamedPipe(hPipeServer, NULL); ok(ret || (GetLastError() == ERROR_PIPE_CONNECTED), "ConnectNamedPipe failed with error %d\n", GetLastError());

1 0

James Hawkins : kernel32: Fix two tests that fail in win2k3 and modify LoadLibraryEx to match this behavior .
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: 731306bf78f2b8a6a92448e1977268b4396eb449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=731306bf78f2b8a6a92448e19… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 01:01:59 2008 -0500 kernel32: Fix two tests that fail in win2k3 and modify LoadLibraryEx to match this behavior. --- dlls/kernel32/module.c | 6 ++++++ dlls/kernel32/tests/module.c | 19 ++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 86675b6..1b259e5 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -922,6 +922,12 @@ HMODULE WINAPI LoadLibraryExW(LPCWSTR libnameW, HANDLE hfile, DWORD flags) UNICODE_STRING wstr; HMODULE res; + if (hfile) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + if (!libnameW) { SetLastError(ERROR_INVALID_PARAMETER); diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index ca31aaf..7b602e7 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -245,13 +245,12 @@ static void testLoadLibraryEx(void) SetLastError(0xdeadbeef); hmodule = LoadLibraryExA("testfile.dll", hfile, 0); ok(hmodule == 0, "Expected 0, got %p\n", hmodule); - todo_wine - { - ok(GetLastError() == ERROR_SHARING_VIOLATION, - "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); - } + ok(GetLastError() == ERROR_SHARING_VIOLATION || + GetLastError() == ERROR_INVALID_PARAMETER, /* win2k3 */ + "Expected ERROR_SHARING_VIOLATION or ERROR_INVALID_PARAMETER, got %d\n", + GetLastError()); - /* has nothing to do with hFile */ + /* try to open a file that is locked */ SetLastError(0xdeadbeef); hmodule = LoadLibraryExA("testfile.dll", NULL, 0); ok(hmodule == 0, "Expected 0, got %p\n", hmodule); @@ -261,12 +260,14 @@ static void testLoadLibraryEx(void) "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); } - /* one last try with hFile */ + /* lpFileName does not matter */ SetLastError(0xdeadbeef); hmodule = LoadLibraryExA(NULL, hfile, 0); ok(hmodule == 0, "Expected 0, got %p\n", hmodule); - ok(GetLastError() == ERROR_MOD_NOT_FOUND, - "Expected ERROR_MOD_NOT_FOUND, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_MOD_NOT_FOUND || + GetLastError() == ERROR_INVALID_PARAMETER, /* win2k3 */ + "Expected ERROR_MOD_NOT_FOUND or ERROR_INVALID_PARAMETER, got %d\n", + GetLastError()); CloseHandle(hfile);

1 0

James Hawkins : crypt32: Fix a failing test in Vista.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: 5a9587949f7b6da2a4a853b22c897bd408fbe77e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a9587949f7b6da2a4a853b22… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 00:55:26 2008 -0500 crypt32: Fix a failing test in Vista. --- dlls/crypt32/tests/msg.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 13f40f0..2783815 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2712,8 +2712,10 @@ static void test_msg_control(void) SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); todo_wine - ok(!ret && GetLastError() == NTE_BAD_HASH_STATE, - "Expected NTE_BAD_HASH_STATE, got %08x\n", GetLastError()); + ok(!ret && + (GetLastError() == NTE_BAD_HASH_STATE || + GetLastError() == CRYPT_E_MSG_ERROR), /* Vista */ + "Expected NTE_BAD_HASH_STATE or CRYPT_E_MSG_ERROR, got %08x\n", GetLastError()); CryptMsgClose(msg); /* Finally, verifying the hash of a detached message in the correct order:

1 0

James Hawkins : kernel32: Fix a failing test in Vista.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: b1ff9621824e13c52e97c0411b994982de99ed74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1ff9621824e13c52e97c0411… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 00:56:03 2008 -0500 kernel32: Fix a failing test in Vista. --- dlls/kernel32/tests/environ.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index ad3734f..70549e3 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -163,7 +163,9 @@ static void test_GetSetEnvironmentVariableW(void) lstrcpyW(buf, fooW); ret_size = GetEnvironmentVariableW(name, buf, lstrlenW(value)); - ok_w(lstrcmpW(buf, fooW) == 0, "should not touch the buffer: %s\n", buf); + ok_w(lstrcmpW(buf, fooW) == 0 || + lstrlenW(buf) == 0, /* Vista */ + "Expected untouched or empty buffer, got \"%s\"\n", buf); ok(ret_size == lstrlenW(value) + 1, "should return length with terminating 0 ret_size=%d\n", ret_size);

1 0

James Hawkins : advapi32: Fix the process access rights value for Vista.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: 3c53fcc4c482e688672b6e8464e882e9d0638377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c53fcc4c482e688672b6e846… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 00:52:33 2008 -0500 advapi32: Fix the process access rights value for Vista. --- dlls/advapi32/tests/security.c | 2 +- include/winnt.h | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 978cc46..99dbce8 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1900,7 +1900,7 @@ static void test_process_security_child(void) &handle, PROCESS_ALL_ACCESS, TRUE, 0 ), "duplicating handle err:%d\n", GetLastError()); TEST_GRANTED_ACCESS2( handle, PROCESS_ALL_ACCESS, - STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL ); + PROCESS_ALL_ACCESS | PROCESS_QUERY_LIMITED_INFORMATION ); ok(DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(), &handle1, PROCESS_VM_READ, TRUE, 0 ), "duplicating handle err:%d\n", GetLastError()); diff --git a/include/winnt.h b/include/winnt.h index 7ca80a7..f4a0d70 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4023,6 +4023,7 @@ typedef enum tagSID_NAME_USE { #define PROCESS_SET_INFORMATION 0x0200 #define PROCESS_QUERY_INFORMATION 0x0400 #define PROCESS_SUSPEND_RESUME 0x0800 +#define PROCESS_QUERY_LIMITED_INFORMATION 0x1000 #define PROCESS_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0xfff) #define THREAD_TERMINATE 0x0001

1 0

James Hawkins : crypt32: Fix a test that fails in Vista.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: 3dedb0fdba9e6c90cb754ef93414287e3e598565 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dedb0fdba9e6c90cb754ef93… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 00:53:56 2008 -0500 crypt32: Fix a test that fails in Vista. --- dlls/crypt32/tests/main.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index 43c07bf..87ac711 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -361,7 +361,9 @@ static void test_CryptInstallOssGlobal(void) for(i=0;i<30;i++) { ret = pI_CryptInstallOssGlobal(rand(),rand(),rand()); - ok((9+i) == ret,"Expected %d, got %d\n",(9+i),ret); + ok((9+i) == ret || + ret == 0, /* Vista */ + "Expected %d or 0, got %d\n",(9+i),ret); } }

1 0