[PATCH v2 11/12] kernel32: Return success from GlobalReAlloc with locked HGLOBAL pointer.

[Rémi Bernon]

From: Rémi Bernon

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53474
---
 dlls/kernel32/heap.c       |  5 ++++-
 dlls/kernel32/tests/heap.c | 16 +++++-----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c
index 9e1da01778d..3ea3b348376 100644
--- a/dlls/kernel32/heap.c
+++ b/dlls/kernel32/heap.c
@@ -195,7 +195,10 @@ HGLOBAL WINAPI GlobalReAlloc( HGLOBAL handle, SIZE_T size, UINT flags )
     struct mem_entry *mem;
     void *ptr;

-    if ((mem = unsafe_mem_from_HLOCAL( handle )) && mem->lock) return 0;
+    if (!(flags & GMEM_MODIFY) && (mem = unsafe_mem_from_HLOCAL( handle )) &&
+        mem->lock && (!size || (flags & GMEM_DISCARDABLE)))
+        return 0;
+
     if (!(handle = LocalReAlloc( handle, size, flags ))) return 0;

/* GlobalReAlloc allows changing GMEM_FIXED to GMEM_MOVEABLE with GMEM_MODIFY */
diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c
index f66a6135591..883b75e5e39 100644
--- a/dlls/kernel32/tests/heap.c
+++ b/dlls/kernel32/tests/heap.c
@@ -1820,21 +1820,17 @@ static void test_GlobalAlloc(void)
         if (!(flags & GMEM_MODIFY) && ((flags & GMEM_DISCARDABLE) || !(flags & GMEM_MOVEABLE)))
             ok( !tmp_mem, "GlobalReAlloc succeeded\n" );
         else
-        {
-            todo_wine
             ok( tmp_mem == mem, "GlobalReAlloc returned %p, error %lu\n", tmp_mem, GetLastError() );
-        }
         entry = *mem_entry_from_HANDLE( mem );
         if ((flags & GMEM_DISCARDABLE) && (flags & GMEM_MODIFY)) expect_entry.flags |= 4;
         if (flags == GMEM_MOVEABLE)
-            todo_wine ok( entry.ptr != expect_entry.ptr, "got unexpected ptr %p\n", entry.ptr );
+            ok( entry.ptr != expect_entry.ptr, "got unexpected ptr %p\n", entry.ptr );
         else
             ok( entry.ptr == expect_entry.ptr, "got ptr %p\n", entry.ptr );
-        todo_wine_if((flags & GMEM_MODIFY) && (flags & GMEM_MOVEABLE) && flags != (GMEM_MODIFY | GMEM_MOVEABLE))
         ok( entry.flags == expect_entry.flags, "got flags %#Ix was %#Ix\n", entry.flags, expect_entry.flags );
         size = GlobalSize( mem );
         if (flags == GMEM_MOVEABLE)
-            todo_wine ok( size == 512, "GlobalSize returned %Iu\n", size );
+            ok( size == 512, "GlobalSize returned %Iu\n", size );
         else
             ok( size == 10, "GlobalSize returned %Iu\n", size );

@@ -1855,17 +1851,16 @@ static void test_GlobalAlloc(void)
         if (!(flags & GMEM_MODIFY) && (flags & GMEM_DISCARDABLE))
             ok( !tmp_mem, "GlobalReAlloc succeeded\n" );
         else
-            todo_wine ok( tmp_mem == mem, "GlobalReAlloc returned %p, error %lu\n", tmp_mem, GetLastError() );
+            ok( tmp_mem == mem, "GlobalReAlloc returned %p, error %lu\n", tmp_mem, GetLastError() );
         entry = *mem_entry_from_HANDLE( mem );
         if ((flags & GMEM_DISCARDABLE) && (flags & GMEM_MODIFY)) expect_entry.flags |= 4;
         ok( entry.ptr == expect_entry.ptr, "got ptr %p was %p\n", entry.ptr, expect_entry.ptr );
-        todo_wine_if((flags & GMEM_DISCARDABLE) && (flags & GMEM_MODIFY))
         ok( entry.flags == expect_entry.flags, "got flags %#Ix was %#Ix\n", entry.flags, expect_entry.flags );
         size = GlobalSize( mem );
         if ((flags & GMEM_DISCARDABLE) || (flags & GMEM_MODIFY))
             ok( size == 12, "GlobalSize returned %Iu\n", size );
         else
-            todo_wine_if(!(flags & GMEM_MODIFY)) ok( size == 10, "GlobalSize returned %Iu\n", size );
+            ok( size == 10, "GlobalSize returned %Iu\n", size );

ret = GlobalUnlock( mem );
         ok( !ret, "GlobalUnlock succeeded\n" );
@@ -1882,13 +1877,12 @@ static void test_GlobalAlloc(void)

tmp_mem = GlobalReAlloc( mem, 0, flags );
         if (flags & GMEM_MODIFY)
-            todo_wine ok( tmp_mem == mem, "GlobalReAlloc returned %p, error %lu\n", tmp_mem, GetLastError() );
+            ok( tmp_mem == mem, "GlobalReAlloc returned %p, error %lu\n", tmp_mem, GetLastError() );
         else
             ok( !tmp_mem, "GlobalReAlloc succeeded\n" );
         entry = *mem_entry_from_HANDLE( mem );
         if ((flags & GMEM_DISCARDABLE) && (flags & GMEM_MODIFY)) expect_entry.flags |= 4;
         ok( entry.ptr == expect_entry.ptr, "got ptr %p was %p\n", entry.ptr, expect_entry.ptr );
-        todo_wine_if((flags & GMEM_MODIFY) && (flags & GMEM_DISCARDABLE))
         ok( entry.flags == expect_entry.flags, "got flags %#Ix was %#Ix\n", entry.flags, expect_entry.flags );
         size = GlobalSize( mem );
         ok( size == 12, "GlobalSize returned %Iu\n", size );