August 2008 - Wine-Commits - list.winehq.org

James Hawkins : kernel32: Fix two failing tests in win95.
by Alexandre Julliard Aug. 29, 2008

Aug. 29, 2008

Module: wine Branch: master Commit: 806edcc496d88295a0a8c5abdc5a8d099bb8adf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=806edcc496d88295a0a8c5abd… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Aug 28 21:14:47 2008 -0500 kernel32: Fix two failing tests in win95. --- dlls/kernel32/tests/process.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 8443879..3e9e0e7 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1180,13 +1180,15 @@ static void test_Console(void) /* Try to set invalid CP */ SetLastError(0xdeadbeef); ok(!SetConsoleCP(0), "Shouldn't succeed\n"); - ok(GetLastError()==ERROR_INVALID_PARAMETER, + ok(GetLastError()==ERROR_INVALID_PARAMETER || + broken(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED), /* win95 */ "GetLastError: expecting %u got %u\n", ERROR_INVALID_PARAMETER, GetLastError()); SetLastError(0xdeadbeef); ok(!SetConsoleOutputCP(0), "Shouldn't succeed\n"); - ok(GetLastError()==ERROR_INVALID_PARAMETER, + ok(GetLastError()==ERROR_INVALID_PARAMETER || + broken(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED), /* win95 */ "GetLastError: expecting %u got %u\n", ERROR_INVALID_PARAMETER, GetLastError());

1 0

James Hawkins : kernel32: Trace the modified buffer on error.
by Alexandre Julliard Aug. 29, 2008

Aug. 29, 2008

Module: wine Branch: master Commit: 39732cf92780e19a2eb599d453c47b980d3428ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=39732cf92780e19a2eb599d45… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Aug 28 21:14:11 2008 -0500 kernel32: Trace the modified buffer on error. --- dlls/kernel32/tests/environ.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index e6dd1fc..ad3734f 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -24,6 +24,13 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "winnls.h" + +static CHAR string[MAX_PATH]; +#define ok_w(res, format, szString) \ +\ + WideCharToMultiByte(CP_ACP, 0, szString, -1, string, MAX_PATH, NULL, NULL); \ + ok(res, format, string); static BOOL (WINAPI *pGetComputerNameExA)(COMPUTER_NAME_FORMAT,LPSTR,LPDWORD); static BOOL (WINAPI *pGetComputerNameExW)(COMPUTER_NAME_FORMAT,LPWSTR,LPDWORD); @@ -156,7 +163,7 @@ static void test_GetSetEnvironmentVariableW(void) lstrcpyW(buf, fooW); ret_size = GetEnvironmentVariableW(name, buf, lstrlenW(value)); - ok(lstrcmpW(buf, fooW) == 0, "should not touch the buffer\n"); + ok_w(lstrcmpW(buf, fooW) == 0, "should not touch the buffer: %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 : kernel32: Fix a failing test in win95.
by Alexandre Julliard Aug. 29, 2008

Aug. 29, 2008

Module: wine Branch: master Commit: 9aef134bdcc06150f9af3d99cde7f88f42249bec URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aef134bdcc06150f9af3d99c… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Aug 28 21:13:32 2008 -0500 kernel32: Fix a failing test in win95. --- dlls/kernel32/tests/codepage.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 7ea89a2..c7daf19 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -241,7 +241,9 @@ static void test_string_conversion(LPBOOL bUsedDefaultChar) ok(ret == 1, "ret is %d\n", ret); ok(mbc == -16, "mbc is %d\n", mbc); if(bUsedDefaultChar) ok(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); - ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef || + broken(GetLastError() == 0), /* win95 */ + "GetLastError() is %u\n", GetLastError()); SetLastError(0xdeadbeef); ret = WideCharToMultiByte(1251, 0, &wc1, 1, &mbc, 1, NULL, bUsedDefaultChar);

1 0

James Hawkins : gdi32: Fix a failing test in win98.
by Alexandre Julliard Aug. 29, 2008

Aug. 29, 2008

Module: wine Branch: master Commit: 4c7cb8a339b10c8f814a7884682f965bf9e77130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c7cb8a339b10c8f814a78846… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Aug 28 21:12:57 2008 -0500 gdi32: Fix a failing test in win98. --- dlls/gdi32/tests/pen.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index fcd79e6..8b2e41a 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -29,6 +29,8 @@ #include "wine/test.h" #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) +#define expect2(expected, alt, got) ok(got == expected || got == alt, \ + "Expected %.8x or %.8x, got %.8x\n", expected, alt, got) static void test_logpen(void) { @@ -504,7 +506,7 @@ static void test_ps_userstyle(void) pen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 50, &lb, 0, style); ok(pen == 0, "ExtCreatePen should fail\n"); - expect(0xdeadbeef, GetLastError()); + expect2(0xdeadbeef, ERROR_INVALID_PARAMETER, GetLastError()); DeleteObject(pen); SetLastError(0xdeadbeef);

1 0

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

Aug. 29, 2008

Module: wine Branch: master Commit: fff29663abde67845f85022d2dd47048b57eed1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fff29663abde67845f85022d2… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Aug 28 21:12:22 2008 -0500 crypt32: Fix a failing test in Vista. --- dlls/crypt32/tests/message.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/message.c b/dlls/crypt32/tests/message.c index adfa0eb..1072185 100644 --- a/dlls/crypt32/tests/message.c +++ b/dlls/crypt32/tests/message.c @@ -414,9 +414,11 @@ static void test_hash_message(void) SetLastError(0xdeadbeef); ret = CryptHashMessage(&para, FALSE, 2, toHash, hashSize, NULL, &hashedBlobSize, NULL, NULL); - ok(!ret && GetLastError() == CRYPT_E_UNKNOWN_ALGO, - "expected CRYPT_E_UNKNOWN_ALGO, got 0x%08x (%d)\n", GetLastError(), - GetLastError()); + ok(!ret && + (GetLastError() == CRYPT_E_UNKNOWN_ALGO || + GetLastError() == CRYPT_E_OID_FORMAT), /* Vista */ + "expected CRYPT_E_UNKNOWN_ALGO or CRYPT_E_OID_FORMAT, got 0x%08x (%d)\n", + GetLastError(), GetLastError()); para.HashAlgorithm.pszObjId = oid_rsa_md5; /* With a valid hash algorithm, this succeeds, even though fDetached is * FALSE.

1 0

James Hawkins : crypt32: Fix a failing test in XP.
by Alexandre Julliard Aug. 29, 2008

Aug. 29, 2008

Module: wine Branch: master Commit: f9b0620f9fabdad2eb2979a6ccfb0b525b50e9b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9b0620f9fabdad2eb2979a6c… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Aug 28 21:11:41 2008 -0500 crypt32: Fix a failing test in XP. --- dlls/crypt32/tests/cert.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 515098a..cd0808a 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -511,8 +511,10 @@ static void testCertProperties(void) size = 0; ret = CertGetCertificateContextProperty(context, CERT_SIGNATURE_HASH_PROP_ID, NULL, &size); - ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, - "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); + ok(!ret && + (GetLastError() == CRYPT_E_ASN1_BADTAG || + GetLastError() == CRYPT_E_NOT_FOUND), + "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); /* Test key contexts and handles and such */ size = 0;

1 0

James Hawkins : advapi32: Fix several failing tests in Vista.
by Alexandre Julliard Aug. 29, 2008

Aug. 29, 2008

Module: wine Branch: master Commit: 1519d9e9951f9de4a416f02b0437dd851e4cd299 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1519d9e9951f9de4a416f02b0… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Aug 28 21:10:51 2008 -0500 advapi32: Fix several failing tests in Vista. --- dlls/advapi32/tests/security.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 9b3f7e6..978cc46 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1705,8 +1705,10 @@ static void test_security_descriptor(void) } } -#define TEST_GRANTED_ACCESS(a,b) test_granted_access(a,b,__LINE__) -static void test_granted_access(HANDLE handle, ACCESS_MASK access, int line) +#define TEST_GRANTED_ACCESS(a,b) test_granted_access(a,b,0,__LINE__) +#define TEST_GRANTED_ACCESS2(a,b,c) test_granted_access(a,b,c,__LINE__) +static void test_granted_access(HANDLE handle, ACCESS_MASK access, + ACCESS_MASK alt, int line) { OBJECT_BASIC_INFORMATION obj_info; NTSTATUS status; @@ -1720,8 +1722,13 @@ static void test_granted_access(HANDLE handle, ACCESS_MASK access, int line) status = pNtQueryObject( handle, ObjectBasicInformation, &obj_info, sizeof(obj_info), NULL ); ok_(__FILE__, line)(!status, "NtQueryObject with err: %08x\n", status); - ok_(__FILE__, line)(obj_info.GrantedAccess == access, "Granted access should " - "be 0x%08x, instead of 0x%08x\n", access, obj_info.GrantedAccess); + if (alt) + ok_(__FILE__, line)(obj_info.GrantedAccess == access || + obj_info.GrantedAccess == alt, "Granted access should be 0x%08x " + "or 0x%08x, instead of 0x%08x\n", access, alt, obj_info.GrantedAccess); + else + ok_(__FILE__, line)(obj_info.GrantedAccess == access, "Granted access should " + "be 0x%08x, instead of 0x%08x\n", access, obj_info.GrantedAccess); } #define CHECK_SET_SECURITY(o,i,e) \ @@ -1833,7 +1840,8 @@ static void test_process_security(void) /* 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()); - TEST_GRANTED_ACCESS( info.hProcess, PROCESS_ALL_ACCESS ); + TEST_GRANTED_ACCESS2( info.hProcess, PROCESS_ALL_ACCESS, + STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL ); winetest_wait_child_process( info.hProcess ); CloseHandle( info.hProcess ); @@ -1882,7 +1890,8 @@ static void test_process_security_child(void) ok(DuplicateHandle( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(), &handle, 0, TRUE, DUPLICATE_SAME_ACCESS ), "duplicating handle err:%d\n", GetLastError()); - TEST_GRANTED_ACCESS( handle, PROCESS_ALL_ACCESS ); + TEST_GRANTED_ACCESS2( handle, PROCESS_ALL_ACCESS, + STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL ); CloseHandle( handle ); @@ -1890,7 +1899,8 @@ static void test_process_security_child(void) ok(DuplicateHandle( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(), &handle, PROCESS_ALL_ACCESS, TRUE, 0 ), "duplicating handle err:%d\n", GetLastError()); - TEST_GRANTED_ACCESS( handle, PROCESS_ALL_ACCESS ); + TEST_GRANTED_ACCESS2( handle, PROCESS_ALL_ACCESS, + STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL ); ok(DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(), &handle1, PROCESS_VM_READ, TRUE, 0 ), "duplicating handle err:%d\n", GetLastError());

1 0

James Hawkins : advapi32: Print the actual result of several failing tests.
by Alexandre Julliard Aug. 29, 2008

Aug. 29, 2008

Module: wine Branch: master Commit: 67b23d024be9e3b9106402cb9daac8986cd2f720 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67b23d024be9e3b9106402cb9… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Aug 28 21:10:13 2008 -0500 advapi32: Print the actual result of several failing tests. --- dlls/advapi32/tests/crypt_lmhash.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/crypt_lmhash.c b/dlls/advapi32/tests/crypt_lmhash.c index b90e02c..9f2b24e 100644 --- a/dlls/advapi32/tests/crypt_lmhash.c +++ b/dlls/advapi32/tests/crypt_lmhash.c @@ -348,18 +348,20 @@ static void test_SystemFunction005(void) out.Length = 0; out.MaximumLength = 0; r = pSystemFunction005(&out, &key, &res); - ok(r == STATUS_SUCCESS, "function failed\n"); + ok(r == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", r); ok(res.Length == in.Length, "Length wrong\n"); ok(!memcmp(res.Buffer, in.Buffer, in.Length), "data wrong\n"); res.MaximumLength = 0; r = pSystemFunction005(&out, &key, &res); - ok(r == STATUS_BUFFER_TOO_SMALL, "function failed\n"); + ok(r == STATUS_BUFFER_TOO_SMALL, + "Expected STATUS_BUFFER_TOO_SMALL, got %08x\n", r); key.Length = 1; r = pSystemFunction005(&out, &key, &res); - ok(r == STATUS_UNKNOWN_REVISION, "function failed\n"); + ok(r == STATUS_UNKNOWN_REVISION, + "Expected STATUS_UNKNOWN_REVISION, got %08x\n", r); key.Length = 0; r = pSystemFunction005(&out, &key, &res);

1 0

James Hawkins : comctl32: Fix a failing test in XP.
by Alexandre Julliard Aug. 29, 2008

Aug. 29, 2008

Module: wine Branch: master Commit: f126c765c717e1ab82b10cadd0da69a1e8544105 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f126c765c717e1ab82b10cadd… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Aug 28 21:08:47 2008 -0500 comctl32: Fix a failing test in XP. --- dlls/comctl32/tests/listview.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 8b47cdd..2e00e67 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -50,6 +50,8 @@ static const struct message create_parent_wnd_seq[] = { { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, { WM_QUERYNEWPALETTE, sent|optional }, { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, + { WM_WINDOWPOSCHANGED, sent|optional }, + { WM_NCCALCSIZE, sent|wparam|optional, 1 }, { WM_ACTIVATEAPP, sent|wparam, 1 }, { WM_NCACTIVATE, sent|wparam, 1 }, { WM_ACTIVATE, sent|wparam, 1 },

1 0

James Hawkins : comctl32: Fix a few failing tests in win2000.
by Alexandre Julliard Aug. 29, 2008

Aug. 29, 2008

Module: wine Branch: master Commit: 1258e4d8ffa7048813f86cfd85cd0f1ebe0cc5f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1258e4d8ffa7048813f86cfd8… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Aug 28 21:08:13 2008 -0500 comctl32: Fix a few failing tests in win2000. --- dlls/comctl32/tests/listview.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 4f8b32d..8b47cdd 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -48,6 +48,7 @@ static const struct message create_parent_wnd_seq[] = { { WM_CREATE, sent }, { WM_SHOWWINDOW, sent|wparam, 1 }, { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, + { WM_QUERYNEWPALETTE, sent|optional }, { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, { WM_ACTIVATEAPP, sent|wparam, 1 }, { WM_NCACTIVATE, sent|wparam, 1 }, @@ -872,7 +873,9 @@ static void test_icon_spacing(void) trace("test icon spacing\n"); r = SendMessage(hwnd, LVM_SETICONSPACING, 0, (LPARAM) MAKELONG(20, 30)); - expect(MAKELONG(w,h), r); + ok(r == MAKELONG(w, h) || + broken(r == MAKELONG(w, w)), /* win98 */ + "Expected %d, got %d\n", MAKELONG(w, h), r); r = SendMessage(hwnd, LVM_SETICONSPACING, 0, (LPARAM) MAKELONG(25, 35)); expect(MAKELONG(20,30), r);

1 0