Alexandre Julliard : kernel32/tests: Fix a couple of failures on Windows.
Alexandre Julliard
julliard at winehq.org
Wed Nov 5 09:37:48 CST 2008
Module: wine
Branch: master
Commit: fdf2e7a3389601b38e7a7b28ae9cc9ee294fcc30
URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdf2e7a3389601b38e7a7b28ae9cc9ee294fcc30
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Nov 4 16:13:30 2008 +0100
kernel32/tests: Fix a couple of failures on Windows.
---
dlls/kernel32/tests/heap.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c
index 271a221..c196c23 100644
--- a/dlls/kernel32/tests/heap.c
+++ b/dlls/kernel32/tests/heap.c
@@ -75,7 +75,8 @@ START_TEST(heap)
/* large blocks must be 16-byte aligned */
mem = HeapAlloc(GetProcessHeap(), 0, 512 * 1024);
ok( mem != NULL, "failed for size 512K\n" );
- ok( (ULONG_PTR)mem % 16 == 0, "512K block not 16-byte aligned\n" );
+ ok( (ULONG_PTR)mem % 16 == 0 || broken((ULONG_PTR)mem % 16) /* win9x */,
+ "512K block not 16-byte aligned\n" );
HeapFree(GetProcessHeap(), 0, mem);
/* Global*() functions */
@@ -191,10 +192,11 @@ START_TEST(heap)
/* invalid free */
SetLastError(MAGIC_DEAD);
mem = GlobalFree(gbl);
- ok(mem == gbl, "Expected gbl, got %p\n", mem);
- ok(GetLastError() == ERROR_INVALID_HANDLE ||
- GetLastError() == ERROR_INVALID_PARAMETER, /* win9x */
- "Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
+ ok(mem == gbl || broken(mem == NULL) /* nt4 */, "Expected gbl, got %p\n", mem);
+ if (mem == gbl)
+ 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);
More information about the wine-cvs
mailing list