kernel32: Fix a few test failures in win9x.

This commit is contained in:
James Hawkins 2008-06-29 18:14:18 -05:00 committed by Alexandre Julliard
parent ac5885ef41
commit 03d23bd43d
1 changed files with 12 additions and 6 deletions

View File

@ -186,23 +186,29 @@ START_TEST(heap)
SetLastError(MAGIC_DEAD); SetLastError(MAGIC_DEAD);
mem = GlobalFree(gbl); mem = GlobalFree(gbl);
ok(mem == gbl, "Expected gbl, got %p\n", mem); ok(mem == gbl, "Expected gbl, got %p\n", mem);
ok(GetLastError() == ERROR_INVALID_HANDLE, ok(GetLastError() == ERROR_INVALID_HANDLE ||
"Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); GetLastError() == ERROR_INVALID_PARAMETER, /* win9x */
"Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
gbl = GlobalAlloc(GMEM_DDESHARE, 100); gbl = GlobalAlloc(GMEM_DDESHARE, 100);
res = GlobalUnlock(gbl); res = GlobalUnlock(gbl);
ok(res == 1, "Expected 1, got %d\n", res); ok(res == 1 ||
res == 0, /* win9x */
"Expected 1 or 0, got %d\n", res);
res = GlobalUnlock(gbl); res = GlobalUnlock(gbl);
ok(res == 1, "Expected 1, got %d\n", res); ok(res == 1 ||
res == 0, /* win9x */
"Expected 1 or 0, got %d\n", res);
/* GlobalSize on an invalid handle */ /* GlobalSize on an invalid handle */
SetLastError(MAGIC_DEAD); SetLastError(MAGIC_DEAD);
size = GlobalSize((HGLOBAL)0xc042); size = GlobalSize((HGLOBAL)0xc042);
ok(size == 0, "Expected 0, got %ld\n", size); ok(size == 0, "Expected 0, got %ld\n", size);
ok(GetLastError() == ERROR_INVALID_HANDLE, ok(GetLastError() == ERROR_INVALID_HANDLE ||
"Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); GetLastError() == ERROR_INVALID_PARAMETER, /* win9x */
"Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
/* ####################################### */ /* ####################################### */
/* Local*() functions */ /* Local*() functions */