kernelbase: Restore HEAP_REALLOC_IN_PLACE_ONLY usage in LocalReAlloc.

This effectively reverts 2be9b0ff, which incorrectly removed the flag, when the reallocation failures the tests showed were coming from an underlying LFH in-place reallocation failure. Thus, it restores todo_wine where appropriate while removing other todos for sizes outside of the LFH block size range. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53996

kernelbase: Restore HEAP_REALLOC_IN_PLACE_ONLY usage in LocalReAlloc.
4979ae5a · Rémi Bernon · Alexandre Julliard · a568704c · 4979ae5a · 4979ae5a
Commit 4979ae5a authored Nov 30, 2022 by Rémi Bernon Committed by Alexandre Julliard Nov 30, 2022
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 26 additions and 22 deletions

heap.c dlls/kernel32/tests/heap.c +24 -20

memory.c dlls/kernelbase/memory.c +2 -2

No files found.
--- a/dlls/kernel32/tests/heap.c
+++ b/dlls/kernel32/tests/heap.c
--- a/dlls/kernelbase/memory.c
+++ b/dlls/kernelbase/memory.c
@@ -991,13 +991,13 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalReAlloc( HLOCAL handle, SIZE_T size, UINT f
    {
        if (flags & LMEM_MODIFY) ret = handle;
        else if (flags & LMEM_DISCARDABLE) SetLastError( ERROR_INVALID_PARAMETER );
-        else if (flags & LMEM_MOVEABLE)
+        else
        {
+            if (!(flags & LMEM_MOVEABLE)) heap_flags |= HEAP_REALLOC_IN_PLACE_ONLY;
            ret = HeapReAlloc( heap, heap_flags, ptr, size );
            if (ret) RtlSetUserValueHeap( heap, heap_flags, ret, ret );
            else SetLastError( ERROR_NOT_ENOUGH_MEMORY );
        }
-        else SetLastError( ERROR_NOT_ENOUGH_MEMORY );
    }
    else if ((mem = unsafe_mem_from_HLOCAL( handle )))
    {