wine/dlls/kernel/tests heap.c

[Alexandre Julliard]

ChangeSet ID:	21169
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	julliard at winehq.org	2005/11/08 10:09:44

Modified files:
	dlls/kernel/tests: heap.c 

Log message:
	Saulius Krasuckas <saulius.krasuckas at ieee.org>
	Take into account some alignment done by HeapAlloc() on Win9x.

Patch: http://cvs.winehq.org/patch.py?id=21169

Old revision  New revision  Changes     Path
 1.6           1.7           +8 -1       wine/dlls/kernel/tests/heap.c

Index: wine/dlls/kernel/tests/heap.c
diff -u -p wine/dlls/kernel/tests/heap.c:1.6 wine/dlls/kernel/tests/heap.c:1.7
--- wine/dlls/kernel/tests/heap.c:1.6	8 Nov 2005 16: 9:44 -0000
+++ wine/dlls/kernel/tests/heap.c	8 Nov 2005 16: 9:44 -0000
@@ -25,6 +25,12 @@
 #include "winbase.h"
 #include "wine/test.h"
 
+static SIZE_T resize_9x(SIZE_T size)
+{
+    DWORD dwSizeAligned = (size + 3) & ~3;
+    return max(dwSizeAligned, 12); /* at least 12 bytes */
+}
+
 START_TEST(heap)
 {
     void *mem;
@@ -43,7 +49,8 @@ START_TEST(heap)
         SIZE_T heap_size;
         mem = HeapAlloc(GetProcessHeap(), 0, size);
         heap_size = HeapSize(GetProcessHeap(), 0, mem);
-        ok(size == heap_size, "HeapSize returned %lu instead of %lu\n", heap_size, size);
+        ok(heap_size == size || heap_size == resize_9x(size), 
+            "HeapSize returned %lu instead of %lu or %lu\n", heap_size, size, resize_9x(size));
         HeapFree(GetProcessHeap(), 0, mem);
     }