James Hawkins : kernel32: Fix a few test failures in win9x.

Alexandre Julliard julliard at winehq.org
Mon Jun 30 08:27:30 CDT 2008


Module: wine
Branch: master
Commit: 03d23bd43d7edf18537ac4c206e9d7d6379e7b91
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=03d23bd43d7edf18537ac4c206e9d7d6379e7b91

Author: James Hawkins <jhawkins at codeweavers.com>
Date:   Sun Jun 29 18:14:18 2008 -0500

kernel32: Fix a few test failures in win9x.

---

 dlls/kernel32/tests/heap.c |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c
index 2939862..e35d8bf 100644
--- a/dlls/kernel32/tests/heap.c
+++ b/dlls/kernel32/tests/heap.c
@@ -186,23 +186,29 @@ START_TEST(heap)
     SetLastError(MAGIC_DEAD);
     mem = GlobalFree(gbl);
     ok(mem == gbl, "Expected gbl, got %p\n", mem);
-    ok(GetLastError() == ERROR_INVALID_HANDLE,
-       "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError());
+    ok(GetLastError() == ERROR_INVALID_HANDLE ||
+       GetLastError() == ERROR_INVALID_PARAMETER, /* win9x */
+       "Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
 
     gbl = GlobalAlloc(GMEM_DDESHARE, 100);
 
     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);
-    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 */
     SetLastError(MAGIC_DEAD);
     size = GlobalSize((HGLOBAL)0xc042);
     ok(size == 0, "Expected 0, got %ld\n", size);
-    ok(GetLastError() == ERROR_INVALID_HANDLE,
-       "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError());
+    ok(GetLastError() == ERROR_INVALID_HANDLE ||
+       GetLastError() == ERROR_INVALID_PARAMETER, /* win9x */
+       "Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
 
     /* ####################################### */
     /* Local*() functions */




More information about the wine-cvs mailing list