From 9f12d22657c971427a82761c22d5d2c3706d9c75 Mon Sep 17 00:00:00 2001 From: Hans Leidekker Date: Mon, 15 Dec 2003 19:51:17 +0000 Subject: [PATCH] [Global|Local]ReAlloc don't fail with size 0. Fixed typos. --- dlls/kernel/tests/heap.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/kernel/tests/heap.c b/dlls/kernel/tests/heap.c index 53a436ceb2b..26bd33fffe8 100644 --- a/dlls/kernel/tests/heap.c +++ b/dlls/kernel/tests/heap.c @@ -46,8 +46,13 @@ START_TEST(heap) ok(gbl != NULL, "Can't realloc global memory"); size = GlobalSize(gbl); ok(size >= 10 && size <= 16, "Memory not resized to size 10, instead size=%ld", size); - gbl = GlobalReAlloc(gbl, 0, GMEM_MOVEABLE); - ok(gbl == NULL, "GlobalReAlloc should fail on size 0, instead size=%ld", size); + + todo_wine + { + gbl = GlobalReAlloc(gbl, 0, GMEM_MOVEABLE); + ok(gbl != NULL, "GlobalReAlloc should not fail on size 0"); + } + size = GlobalSize(gbl); ok(size == 0, "Memory not resized to size 0, instead size=%ld", size); ok(GlobalFree(gbl) == NULL, "Memory not freed"); @@ -59,14 +64,19 @@ START_TEST(heap) /* Local*() functions */ gbl = LocalAlloc(GMEM_MOVEABLE, 0); - ok(gbl != NULL, "global memory not allocated for size 0"); + ok(gbl != NULL, "local memory not allocated for size 0"); gbl = LocalReAlloc(gbl, 10, GMEM_MOVEABLE); - ok(gbl != NULL, "Can't realloc global memory"); + ok(gbl != NULL, "Can't realloc local memory"); size = LocalSize(gbl); ok(size >= 10 && size <= 16, "Memory not resized to size 10, instead size=%ld", size); - gbl = LocalReAlloc(gbl, 0, GMEM_MOVEABLE); - ok(gbl == NULL, "LocalReAlloc should fail on size 0, instead size=%ld", size); + + todo_wine + { + gbl = LocalReAlloc(gbl, 0, GMEM_MOVEABLE); + ok(gbl != NULL, "LocalReAlloc should not fail on size 0"); + } + size = LocalSize(gbl); ok(size == 0, "Memory not resized to size 0, instead size=%ld", size); ok(LocalFree(gbl) == NULL, "Memory not freed"); @@ -74,6 +84,6 @@ START_TEST(heap) ok(size == 0, "Memory should have been freed, size=%ld", size); gbl = LocalReAlloc(0, 10, GMEM_MOVEABLE); - ok(gbl == NULL, "global realloc allocated memory"); + ok(gbl == NULL, "local realloc allocated memory"); }