[PATCH v4 0/1] MR1698: user.exe16: Set the right instance after creating a window.

[Sven Baars (＠sbaars)]

This fixes the regressions mentioned in the following bugs


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

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

--
  v4: user.exe16: Set the right instance after creating a window.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1698

[PATCH v4 1/1] user.exe16: Set the right instance after creating a window.

[Sven Baars]

From: Sven Baars <sbaars(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53568
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53646
---
 dlls/user.exe16/message.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c
index 9af217bf5f1..a1c0b239629 100644
--- a/dlls/user.exe16/message.c
+++ b/dlls/user.exe16/message.c
@@ -2573,11 +2573,19 @@ static LRESULT static_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam,
  */
 HWND create_window16( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE instance, BOOL unicode )
 {
+    HINSTANCE module = instance;
+    HWND hwnd;
+
     /* map to module handle */
     if (instance && !((ULONG_PTR)instance >> 16))
-        instance = HINSTANCE_32( GetExePtr( HINSTANCE_16(instance) ));
+        module = HINSTANCE_32( GetExePtr( HINSTANCE_16(instance) ));
+
+    hwnd = wow_handlers32.create_window( cs, className, module, unicode );
+
+    if (hwnd)
+        SetWindowLongPtrW( hwnd, GWLP_HINSTANCE, (LONG_PTR)instance );
 
-    return wow_handlers32.create_window( cs, className, instance, unicode );
+    return hwnd;
 }
 
 
-- 
GitLab

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

[Jacek Caban (＠jacek)]

Note that CreateWindow sends messages and hooks, so a wrong instance is already visible there. I think we could just pass explicitly "client_instance" NtUserCreateWindowEx parameter (possibly replacing cbtc with just HINSTANCE parameter).

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1698#note_18990