marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32: Don't move fixed memory area in GlobalReAlloc.

oldstable
Akihiro Sagawa 2013-06-01 22:01:41 +09:00 committed by Alexandre Julliard
parent 4874b806f3
commit 9ab603b033
2 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/kernel32/heap.c
View File

@ -646,6 +646,8 @@ HGLOBAL WINAPI GlobalReAlloc(
if(ISPOINTER(hmem)) if(ISPOINTER(hmem))
{ {
/* reallocate fixed memory */ /* reallocate fixed memory */
if (!(flags & GMEM_MOVEABLE))
heap_flags |= HEAP_REALLOC_IN_PLACE_ONLY;
hnew=HeapReAlloc(GetProcessHeap(), heap_flags, hmem, size); hnew=HeapReAlloc(GetProcessHeap(), heap_flags, hmem, size);
} }
else else

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

@ -251,17 +251,9 @@ static void test_heap(void)
gbl = GlobalAlloc(GMEM_FIXED, init_size); gbl = GlobalAlloc(GMEM_FIXED, init_size);
SetLastError(MAGIC_DEAD); SetLastError(MAGIC_DEAD);
hsecond = GlobalReAlloc(gbl, size + init_size, 0); hsecond = GlobalReAlloc(gbl, size + init_size, 0);
if (hsecond != gbl) { ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY),
todo_wine "got %p with %x (expected %p or NULL) @%ld\n", hsecond, GetLastError(), gbl, size);
ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), GlobalFree(gbl);
"got %p with %x (expected %p or NULL) @%ld\n", hsecond, GetLastError(), gbl, size);
GlobalFree(hsecond);
}
else {
ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY),
"got %p with %x (expected %p or NULL) @%ld\n", hsecond, GetLastError(), gbl, size);
GlobalFree(gbl);
}
} }
/* GMEM_FIXED block can be relocated with GMEM_MOVEABLE */ /* GMEM_FIXED block can be relocated with GMEM_MOVEABLE */
@ -418,17 +410,9 @@ static void test_heap(void)
gbl = LocalAlloc(LMEM_FIXED, init_size); gbl = LocalAlloc(LMEM_FIXED, init_size);
SetLastError(MAGIC_DEAD); SetLastError(MAGIC_DEAD);
hsecond = LocalReAlloc(gbl, size + init_size, 0); hsecond = LocalReAlloc(gbl, size + init_size, 0);
if (hsecond != gbl) { ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY),
todo_wine "got %p with %x (expected %p or NULL) @%ld\n", hsecond, GetLastError(), gbl, size);
ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), LocalFree(gbl);
"got %p with %x (expected %p or NULL) @%ld\n", hsecond, GetLastError(), gbl, size);
LocalFree(hsecond);
}
else {
ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY),
"got %p with %x (expected %p or NULL) @%ld\n", hsecond, GetLastError(), gbl, size);
LocalFree(gbl);
}
} }
/* LMEM_FIXED memory can be relocated with LMEM_MOVEABLE */ /* LMEM_FIXED memory can be relocated with LMEM_MOVEABLE */