From b395a0c560ba5a50638fc1f75e3830efba06b5b1 Mon Sep 17 00:00:00 2001 From: "Dimitrie O. Paun" Date: Fri, 4 Jun 2004 17:58:49 +0000 Subject: [PATCH] Win9x does not convert FIXED to MOVEABLE. It also discards locked memory. --- dlls/kernel/tests/alloc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel/tests/alloc.c b/dlls/kernel/tests/alloc.c index ae02789506d..4c4a23eb36b 100644 --- a/dlls/kernel/tests/alloc.c +++ b/dlls/kernel/tests/alloc.c @@ -208,13 +208,12 @@ static void test_Global(void) /* Check that GlobalReAlloc works */ /* Check that we can change GMEM_FIXED to GMEM_MOVEABLE */ mem2a=GlobalReAlloc(mem2,0,GMEM_MODIFY | GMEM_MOVEABLE); - ok(mem2a!=NULL,"GlobalReAlloc failed to convert FIXED to MOVEABLE: error=%ld\n",GetLastError()); if(mem2a!=NULL) { mem2=mem2a; + mem2ptr=GlobalLock(mem2a); + ok(mem2ptr!=NULL && !GlobalUnlock(mem2a)&&GetLastError()==NO_ERROR, + "Converting from FIXED to MOVEABLE didn't REALLY work\n"); } - mem2ptr=GlobalLock(mem2a); - ok(mem2ptr!=NULL && !GlobalUnlock(mem2a)&&GetLastError()==NO_ERROR, - "Converting from FIXED to MOVEABLE didn't REALLY work\n"); /* Check that ReAllocing memory works as expected */ mem2a=GlobalReAlloc(mem2,2*memchunk,GMEM_MOVEABLE | GMEM_ZEROINIT); @@ -238,8 +237,9 @@ static void test_Global(void) /* Check that we can't discard locked memory */ mem2b=GlobalDiscard(mem2a); - ok(mem2b==NULL,"Discarded memory we shouldn't have\n"); - ok(!GlobalUnlock(mem2a) && GetLastError()==NO_ERROR,"GlobalUnlock Failed\n"); + if(mem2b==NULL) { + ok(!GlobalUnlock(mem2a) && GetLastError()==NO_ERROR,"GlobalUnlock Failed\n"); + } } } if(mem1) { -- 2.11.4.GIT