From 3ab617499768132df134bab2a7c036413a9af50c Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Fri, 1 Sep 2017 09:15:44 +0200 Subject: [PATCH] user32: Use the correct top-level window when activating through a mouse click. Signed-off-by: Alexandre Julliard --- dlls/user32/message.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 3d3736d9c60..406eff3469a 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2637,14 +2637,9 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H if (msg->hwnd != info.hwndActive) { - HWND hwndTop = msg->hwnd; - while (hwndTop) - { - if ((GetWindowLongW( hwndTop, GWL_STYLE ) & (WS_POPUP|WS_CHILD)) != WS_CHILD) break; - hwndTop = GetParent( hwndTop ); - } + HWND hwndTop = GetAncestor( msg->hwnd, GA_ROOT ); - if (hwndTop) + if ((GetWindowLongW( hwndTop, GWL_STYLE ) & (WS_POPUP|WS_CHILD)) != WS_CHILD) { LONG ret = SendMessageW( msg->hwnd, WM_MOUSEACTIVATE, (WPARAM)hwndTop, MAKELONG( hittest, msg->message ) ); -- 2.11.4.GIT