[PATCH 0/1] MR3292: wow64win: Consistently marshal HINSTANCEs and HMODULEs as pointers.

[Tim Clem (＠tclem)]

In large address aware binaries, these can be > 0x7fffffff, and using
the handle functions will result in them being incorrectly extended
to 0xffffffffxxxxxxxx.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3292

[PATCH 1/1] wow64win: Consistently marshal HINSTANCEs and HMODULEs as pointers.

[Tim Clem]

From: Tim Clem <tclem(a)codeweavers.com>

In large address aware binaries, these can be > 0x7fffffff, and using
the handle functions will result in them being incorrectly extended
to 0xffffffffxxxxxxxx.
---
 dlls/wow64win/user.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c
index 8e2853ca0b5..5f12af0a624 100644
--- a/dlls/wow64win/user.c
+++ b/dlls/wow64win/user.c
@@ -1485,10 +1485,10 @@ NTSTATUS WINAPI wow64_NtUserCreateWindowEx( UINT *args )
     int height = get_ulong( &args );
     HWND parent = get_handle( &args );
     HMENU menu = get_handle( &args );
-    HINSTANCE instance = get_handle( &args );
+    HINSTANCE instance = get_ptr( &args );
     void *params = get_ptr( &args );
     DWORD flags = get_ulong( &args );
-    HINSTANCE client_instance = get_handle( &args );
+    HINSTANCE client_instance = get_ptr( &args );
     DWORD unk = get_ulong( &args );
     BOOL ansi = get_ulong( &args );
 
@@ -1874,7 +1874,7 @@ NTSTATUS WINAPI wow64_NtUserGetClassInfoEx( UINT *args )
     wc32->lpfnWndProc = PtrToUlong( wc.lpfnWndProc );
     wc32->cbClsExtra = wc.cbClsExtra;
     wc32->cbWndExtra = wc.cbWndExtra;
-    wc32->hInstance = HandleToUlong( wc.hInstance );
+    wc32->hInstance = PtrToUlong( wc.hInstance );
     wc32->hIcon = HandleToUlong( wc.hIcon );
     wc32->hCursor = HandleToUlong( wc.hCursor );
     wc32->hbrBackground = HandleToUlong( wc.hbrBackground );
@@ -3830,7 +3830,7 @@ NTSTATUS WINAPI wow64_NtUserSetWinEventHook( UINT *args )
 {
     DWORD event_min = get_ulong( &args );
     DWORD event_max = get_ulong( &args );
-    HMODULE inst = get_handle( &args );
+    HMODULE inst = get_ptr( &args );
     UNICODE_STRING32 *module32 = get_ptr( &args );
     WINEVENTPROC proc = get_ptr(&args );
     DWORD pid = get_ulong( &args );
@@ -3906,7 +3906,7 @@ NTSTATUS WINAPI wow64_NtUserSetWindowWord( UINT *args )
 
 NTSTATUS WINAPI wow64_NtUserSetWindowsHookEx( UINT *args )
 {
-    HINSTANCE inst = get_handle( &args );
+    HINSTANCE inst = get_ptr( &args );
     UNICODE_STRING32 *module32 = get_ptr( &args );
     DWORD tid = get_ulong( &args );
     INT id = get_ulong( &args );
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/3292