Skip to content

W
wine-cw
Commit d904f84e authored by Sven Baars's avatar Sven Baars Committed by Alexandre Julliard
Browse files
Options

win32u: Account for 16-bit instances in find_class().

This mimics the condition in the server. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53384
parent b77255f8
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
dlls/win32u/class.c
View file @ d904f84e
...@@ -353,8 +353,9 @@ static void release_class_ptr( CLASS *ptr ) ...@@ -353,8 +353,9 @@ static void release_class_ptr( CLASS *ptr )
static CLASS *find_class( HINSTANCE module, UNICODE_STRING *name ) static CLASS *find_class( HINSTANCE module, UNICODE_STRING *name )
{ {
ATOM atom = get_int_atom_value( name ); ATOM atom = get_int_atom_value( name );
ULONG_PTR instance = (UINT_PTR)module & ~0xffff; ULONG_PTR instance = (UINT_PTR)module;
CLASS *class; CLASS *class;
int is_win16;
user_lock(); user_lock();
LIST_FOR_EACH_ENTRY( class, &class_list, CLASS, entry ) LIST_FOR_EACH_ENTRY( class, &class_list, CLASS, entry )
...@@ -368,7 +369,9 @@ static CLASS *find_class( HINSTANCE module, UNICODE_STRING *name ) ...@@ -368,7 +369,9 @@ static CLASS *find_class( HINSTANCE module, UNICODE_STRING *name )
if (wcsnicmp( class->name, name->Buffer, name->Length / sizeof(WCHAR) ) || if (wcsnicmp( class->name, name->Buffer, name->Length / sizeof(WCHAR) ) ||
class->name[name->Length / sizeof(WCHAR)]) continue; 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 ); TRACE( "%s %lx -> %p\n", debugstr_us(name), instance, class );
return class; return class;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment