ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32/tests: Fix some of the heap tests for 64-bit.

This commit is contained in:
Alexandre Julliard 2010-01-29 12:10:26 +01:00
parent 7ffb1c102e
commit 221c115e98
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/kernel32/tests/heap.c
View File

@ -42,7 +42,8 @@ static ULONG (WINAPI *pRtlGetNtGlobalFlags)(void);
struct heap_layout
{
DWORD unknown[3];
DWORD_PTR unknown[2];
DWORD pattern;
DWORD flags;
DWORD force_flags;
};
@ -488,7 +489,7 @@ static void test_heap_checks( DWORD flags )
{
BYTE old, *p, *p2;
BOOL ret;
SIZE_T i, size, large_size = 800 * 1024 + 37;
SIZE_T i, size, large_size = 3000 * 1024 + 37;
if (flags & HEAP_PAGE_ALLOCS) return; /* no tests for that case yet */
trace( "testing heap flags %08x\n", flags );
@ -751,7 +752,7 @@ static void test_child_heap( const char *arg )
expect_heap = heap_flags_from_global_flag( expected );
if (!(heap->flags & HEAP_GROWABLE) || heap->flags == 0xeeeeeeee) /* vista layout */
if (!(heap->flags & HEAP_GROWABLE) || heap->pattern == 0xffeeffee || heap->pattern == 0xeeeeeeee) /* vista layout */
{
if (expected & FLG_HEAP_PAGE_ALLOCS)
ok( heap->flags == 0xeeeeeeee, "%s: got heap flags %08x expected 0xeeeeeeee\n",
@ -765,6 +766,7 @@ static void test_child_heap( const char *arg )
"%s: got heap flags %08x expected %08x\n", arg, heap->flags, expect_heap );
ok( heap->force_flags == (expect_heap & ~0x18000080),
"%s: got heap force flags %08x expected %08x\n", arg, heap->force_flags, expect_heap );
expect_heap = heap->flags;
}
test_heap_checks( expect_heap );