Alexandre Julliard : kernel32/tests: Comment out a couple of heap tests that crash on 64-bit Vista.
Alexandre Julliard
julliard at winehq.org
Sun Jan 4 09:09:08 CST 2009
Module: wine
Branch: master
Commit: 1cdccc7de79bf6e4cdea58f5aa461ae0fa949698
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cdccc7de79bf6e4cdea58f5aa461ae0fa949698
Author: Alexandre Julliard <julliard at winehq.org>
Date: Sun Jan 4 14:11:52 2009 +0100
kernel32/tests: Comment out a couple of heap tests that crash on 64-bit Vista.
---
dlls/kernel32/tests/heap.c | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c
index 4aa6b7e..39efde9 100644
--- a/dlls/kernel32/tests/heap.c
+++ b/dlls/kernel32/tests/heap.c
@@ -190,13 +190,16 @@ START_TEST(heap)
ok(mem == NULL, "Expected NULL, got %p\n", mem);
/* invalid free */
- SetLastError(MAGIC_DEAD);
- mem = GlobalFree(gbl);
- 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());
+ if (sizeof(void *) != 8) /* crashes on 64-bit Vista */
+ {
+ SetLastError(MAGIC_DEAD);
+ mem = GlobalFree(gbl);
+ 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);
@@ -211,12 +214,15 @@ START_TEST(heap)
"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 ||
- GetLastError() == ERROR_INVALID_PARAMETER, /* win9x */
- "Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
+ if (sizeof(void *) != 8) /* crashes on 64-bit Vista */
+ {
+ SetLastError(MAGIC_DEAD);
+ size = GlobalSize((HGLOBAL)0xc042);
+ ok(size == 0, "Expected 0, got %ld\n", size);
+ 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