Rémi Bernon : ntdll: Check block user flags in RtlSetUserValueHeap.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0f6e9084055aea7eb7f11dc67e2bdbc016546775
URL:    https://gitlab.winehq.org/wine/wine/-/commit/0f6e9084055aea7eb7f11dc67e2bdbc...

Author: Rémi Bernon 
Date:   Thu Oct 13 17:31:48 2022 +0200

ntdll: Check block user flags in RtlSetUserValueHeap.

Adding the same user flags as native, for Global/Local allocs, and
returning the pointer from Global/LocalHandle by default.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53741

---

dlls/kernel32/heap.c     | 2 +-
 dlls/kernelbase/memory.c | 4 ++--
 dlls/ntdll/heap.c        | 9 +++++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c
index 1c1e6b05f25..5f7f950d23d 100644
--- a/dlls/kernel32/heap.c
+++ b/dlls/kernel32/heap.c
@@ -343,7 +343,7 @@ UINT WINAPI LocalFlags( HLOCAL handle )
  */
 HLOCAL WINAPI LocalHandle( const void *ptr )
 {
-    HLOCAL handle;
+    HLOCAL handle = (HANDLE)ptr;
     ULONG flags;

TRACE_(globalmem)( "ptr %p\n", ptr );
diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c
index 19b1d0a3a1a..2a503587e93 100644
--- a/dlls/kernelbase/memory.c
+++ b/dlls/kernelbase/memory.c
@@ -835,7 +835,7 @@ HGLOBAL WINAPI DECLSPEC_HOTPATCH GlobalFree( HLOCAL handle )
  */
 HLOCAL WINAPI DECLSPEC_HOTPATCH LocalAlloc( UINT flags, SIZE_T size )
 {
-    DWORD heap_flags = HEAP_ADD_USER_INFO;
+    DWORD heap_flags = 0x200 | HEAP_ADD_USER_INFO;
     HANDLE heap = GetProcessHeap();
     struct mem_entry *mem;
     HLOCAL handle;
@@ -974,7 +974,7 @@ LPVOID WINAPI DECLSPEC_HOTPATCH LocalLock( HLOCAL handle )
  */
 HLOCAL WINAPI DECLSPEC_HOTPATCH LocalReAlloc( HLOCAL handle, SIZE_T size, UINT flags )
 {
-    DWORD heap_flags = HEAP_ADD_USER_INFO | HEAP_NO_SERIALIZE;
+    DWORD heap_flags = 0x200 | HEAP_ADD_USER_INFO | HEAP_NO_SERIALIZE;
     HANDLE heap = GetProcessHeap();
     struct mem_entry *mem;
     HLOCAL ret = 0;
diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
index f218ba12f3e..e0af0e72925 100644
--- a/dlls/ntdll/heap.c
+++ b/dlls/ntdll/heap.c
@@ -2044,7 +2044,7 @@ BOOLEAN WINAPI RtlGetUserInfoHeap( HANDLE handle, ULONG flags, void *ptr, void *
 BOOLEAN WINAPI RtlSetUserValueHeap( HANDLE handle, ULONG flags, void *ptr, void *user_value )
 {
     struct block *block;
-    BOOLEAN ret = TRUE;
+    BOOLEAN ret = FALSE;
     struct heap *heap;
     SUBHEAP *subheap;
     char *tmp;
@@ -2054,17 +2054,22 @@ BOOLEAN WINAPI RtlSetUserValueHeap( HANDLE handle, ULONG flags, void *ptr, void
     if (!(heap = unsafe_heap_from_handle( handle ))) return TRUE;

heap_lock( heap, flags );
-    if (!(block = unsafe_block_from_ptr( heap, ptr, &subheap ))) ret = FALSE;
+    if (!(block = unsafe_block_from_ptr( heap, ptr, &subheap )))
+        WARN( "Failed to find block %p in heap %p\n", ptr, handle );
+    else if (!(block_get_flags( block ) & BLOCK_FLAG_USER_INFO))
+        WARN( "Block %p wasn't allocated with user info\n", ptr );
     else if (!subheap)
     {
         ARENA_LARGE *large = CONTAINING_RECORD( block, ARENA_LARGE, block );
         large->user_value = user_value;
+        ret = TRUE;
     }
     else
     {
         tmp = (char *)block + block_get_size( block ) - block->tail_size + sizeof(void *);
         if ((heap_get_flags( heap, flags ) & HEAP_TAIL_CHECKING_ENABLED) || RUNNING_ON_VALGRIND) tmp += ALIGNMENT;
         *(void **)tmp = user_value;
+        ret = TRUE;
     }
     heap_unlock( heap, flags );