[PATCH 2/2] server: Ignore low word of a class instance when looking up for a window class.
Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/class.c | 3 --- server/class.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index b07ff8548f..ceb3483285 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -128,14 +128,11 @@ static void ClassTest(HINSTANCE hInstance, BOOL global) WS_OVERLAPPEDWINDOW + WS_HSCROLL + WS_VSCROLL, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, 0, 0, hInstance2, 0); -todo_wine_if (!global) ok(hTestWnd != 0, "Failed to create window for hInstance %p\n", hInstance2); -todo_wine_if (!global) ok((HINSTANCE)GetClassLongPtrA(hTestWnd, GCLP_HMODULE) == hInstance, "Wrong GCL instance %p != %p\n", (HINSTANCE)GetClassLongPtrA(hTestWnd, GCLP_HMODULE), hInstance); -todo_wine_if (!global) ok((HINSTANCE)GetWindowLongPtrA(hTestWnd, GWLP_HINSTANCE) == hInstance2, "Wrong GWL instance %p != %p\n", (HINSTANCE)GetWindowLongPtrA(hTestWnd, GWLP_HINSTANCE), hInstance2); diff --git a/server/class.c b/server/class.c index b8240bd568..21903f90d0 100644 --- a/server/class.c +++ b/server/class.c @@ -102,7 +102,7 @@ static struct window_class *find_class( struct process *process, atom_t atom, mo { struct window_class *class = LIST_ENTRY( ptr, struct window_class, entry ); if (class->atom != atom) continue; - if (!instance || !class->local || class->instance == instance) return class; + if (!instance || !class->local || (class->instance & ~0xffff) == (instance & ~0xffff)) return class; } return NULL; } -- 2.20.1
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=65291 Your paranoid android. === wxppro (32 bit report) === user32: class.c:1281: Test failed: CreateProcess failed. class.c:1281: Test failed: CreateProcess failed. class.c:1281: Test failed: CreateProcess failed. class.c:1281: Test failed: CreateProcess failed. class.c:1281: Test failed: CreateProcess failed. class.c:1281: Test failed: CreateProcess failed. class.c:1281: Test failed: CreateProcess failed. class.c:1281: Test failed: CreateProcess failed. class.c:1281: Test failed: CreateProcess failed. class.c:1281: Test failed: CreateProcess failed. class.c:1281: Test failed: CreateProcess failed. class.c:1281: Test failed: CreateProcess failed. class.c:1281: Test failed: CreateProcess failed. class.c:1281: Test failed: CreateProcess failed. class.c:1281: Test failed: CreateProcess failed. class.c:1281: Test failed: CreateProcess failed. class.c:1281: Test failed: CreateProcess failed. class.c:1281: Test failed: CreateProcess failed. class.c:1281: Test failed: CreateProcess failed. class.c:1281: Test failed: CreateProcess failed. class.c:1281: Test failed: CreateProcess failed. class.c:1281: Test failed: CreateProcess failed. class.c:1281: Test failed: CreateProcess failed. class.c:1281: Test failed: CreateProcess failed. class.c:1281: Test failed: CreateProcess failed. class.c:1281: Test failed: CreateProcess failed.
Dmitry Timoshkov <dmitry(a)baikal.ru> writes:
@@ -102,7 +102,7 @@ static struct window_class *find_class( struct process *process, atom_t atom, mo { struct window_class *class = LIST_ENTRY( ptr, struct window_class, entry ); if (class->atom != atom) continue; - if (!instance || !class->local || class->instance == instance) return class; + if (!instance || !class->local || (class->instance & ~0xffff) == (instance & ~0xffff)) return class;
I suspect that this may cause trouble with 16-bit classes. -- Alexandre Julliard julliard(a)winehq.org
participants (4)
-
Alexandre Julliard -
Dmitry Timoshkov -
Marvin -
Zhiyi Zhang