[PATCH 0/1] MR1816: win32u: Account for 16-bit instances in find_class().

[Sven Baars (＠sbaars)]

This mimics the condition in the server. Fixes a regression introduced by 9b9d818252fe1a47f3ca52d028dc10d52fa33597.

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

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

[PATCH 1/1] win32u: Account for 16-bit instances in find_class().

[Sven Baars]

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

This mimics the condition in the server.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53384
---
 dlls/win32u/class.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c
index b18fd69edfc..9f3b4251e65 100644
--- a/dlls/win32u/class.c
+++ b/dlls/win32u/class.c
@@ -353,8 +353,9 @@ static void release_class_ptr( CLASS *ptr )
 static CLASS *find_class( HINSTANCE module, UNICODE_STRING *name )
 {
     ATOM atom = get_int_atom_value( name );
-    ULONG_PTR instance = (UINT_PTR)module & ~0xffff;
+    ULONG_PTR instance = (UINT_PTR)module;
     CLASS *class;
+    int is_win16;
 
     user_lock();
     LIST_FOR_EACH_ENTRY( class, &class_list, CLASS, entry )
@@ -368,7 +369,9 @@ static CLASS *find_class( HINSTANCE module, UNICODE_STRING *name )
             if (wcsnicmp( class->name, name->Buffer, name->Length / sizeof(WCHAR) ) ||
                 class->name[name->Length / sizeof(WCHAR)]) continue;
         }
-        if (!class->local || !module || (class->instance & ~0xffff) == instance)
+        is_win16 = !(class->instance >> 16);
+        if (!instance || !class->local || class->instance == instance ||
+            (!is_win16 && ((class->instance & ~0xffff) == (instance & ~0xffff))))
         {
             TRACE( "%s %lx -> %p\n", debugstr_us(name), instance, class );
             return class;
-- 
GitLab

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

[PATCH 0/1] MR1816: win32u: Account for 16-bit instances in find_class(). - approved

[Jacek Caban (＠jacek)]

This merge request was approved by Jacek Caban.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1816