system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-14 20:45:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

shlwapi/tests: Fix some test failures on Win9x/WinMe.

Browse source
This commit is contained in:
Paul Vriens 2010-03-05 11:45:40 +01:00 committed by Alexandre Julliard
parent e271ac6f26
commit fc47c7d1d7
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
dlls/shlwapi/tests/ordinal.c
View file

@ -1435,8 +1435,9 @@ static void test_SHSetWindowBits(void)
SetLastError(0xdeadbeef);
style = pSHSetWindowBits(NULL, GWL_STYLE, 0, 0);
ok(style == 0, "expected 0 retval, got %d\n", style);
ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE,
"expected ERROR_INVALID_WINDOW_HANDLE, got %d\n", GetLastError());
ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE ||
broken(GetLastError() == 0xdeadbeef), /* Win9x/WinMe */
"expected ERROR_INVALID_WINDOW_HANDLE, got %d\n", GetLastError());
/* zero mask, zero flags */
styleold = GetWindowLongA(hwnd, GWL_STYLE);
@ -1532,7 +1533,9 @@ if (0)
SetLastError(0xdeadbeef);
ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff));
ok(ret == lstrlenA(buff)+1, "got %d\n", ret);
ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError());
ok(GetLastError() == 0xdeadbeef ||
broken(GetLastError() == ERROR_INVALID_FLAGS), /* Win9x/WinMe */
"expected 0xdeadbeef, got %d\n", GetLastError());
/* now check returned strings */
flags = FDTF_SHORTTIME;
@ -1682,7 +1685,9 @@ if (0)
SetLastError(0xdeadbeef);
ret = pSHFormatDateTimeW(&filetime, &flags, buff, sizeof(buff)/sizeof(WCHAR));
ok(ret == lstrlenW(buff)+1, "got %d\n", ret);
ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError());
ok(GetLastError() == 0xdeadbeef ||
broken(GetLastError() == ERROR_INVALID_FLAGS), /* Win9x/WinMe */
"expected 0xdeadbeef, got %d\n", GetLastError());
/* now check returned strings */
flags = FDTF_SHORTTIME;