[PATCH 2/2] gdi32: Do not sign extend 64-bit gdi handles.

Francisco Casas fcasas at codeweavers.com
Wed Oct 27 07:47:07 CDT 2021


Testing on Windows shows typically handles are not sign extended,
however sometimes they are. It's not clear what triggers the change
in behaviour.

Signed-off-by: Francisco Casas <fcasas at codeweavers.com>
---
 dlls/gdi32/objects.c | 2 +-
 dlls/win32u/gdiobj.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c
index 196cea9ba92..04b91cfd60f 100644
--- a/dlls/gdi32/objects.c
+++ b/dlls/gdi32/objects.c
@@ -102,7 +102,7 @@ static inline GDI_HANDLE_ENTRY *handle_entry( HGDIOBJ handle )
 static HGDIOBJ entry_to_handle( GDI_HANDLE_ENTRY *entry )
 {
     unsigned int idx = entry - get_gdi_shared()->Handles;
-    return LongToHandle( idx | (entry->Unique << NTGDI_HANDLE_TYPE_SHIFT) );
+    return ULongToHandle( idx | (entry->Unique << NTGDI_HANDLE_TYPE_SHIFT) );
 }
 
 static DWORD get_object_type( HGDIOBJ obj )
diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c
index a661cefe0bd..06bade61a56 100644
--- a/dlls/win32u/gdiobj.c
+++ b/dlls/win32u/gdiobj.c
@@ -55,7 +55,7 @@ const struct user_callbacks *user_callbacks = NULL;
 static inline HGDIOBJ entry_to_handle( GDI_HANDLE_ENTRY *entry )
 {
     unsigned int idx = entry - gdi_shared->Handles;
-    return LongToHandle( idx | (entry->Unique << NTGDI_HANDLE_TYPE_SHIFT) );
+    return ULongToHandle( idx | (entry->Unique << NTGDI_HANDLE_TYPE_SHIFT) );
 }
 
 static inline GDI_HANDLE_ENTRY *handle_entry( HGDIOBJ handle )
-- 
2.25.1




More information about the wine-devel mailing list