[PATCH v5 0/6] MR5819: win32u: Fix DPI conversions in process_mouse_message.
-- v5: win32u: Avoid changing thread DPI context in process_hardware_message. win32u: Factor hardware message point DPI mapping together. win32u: Use map_window_points with explicit DPI over screen_to_client. win32u: Split hardware message window lookup to a separate helper. win32u: Use per-monitor DPI window_from_point in process_mouse_message. win32u: Parameterize window_from_point dpi. https://gitlab.winehq.org/wine/wine/-/merge_requests/5819
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/input.c | 4 ++-- dlls/win32u/message.c | 5 +++-- dlls/win32u/win32u_private.h | 2 +- dlls/win32u/window.c | 13 ++++++------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 5b25086cb6f..0d9fe0f1d38 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -1607,7 +1607,7 @@ void update_mouse_tracking_info( HWND hwnd ) TRACE( "hwnd %p\n", hwnd ); get_cursor_pos( &pos ); - hwnd = window_from_point( hwnd, pos, &hittest ); + hwnd = window_from_point( hwnd, pos, &hittest, get_thread_dpi() ); TRACE( "point %s hwnd %p hittest %d\n", wine_dbgstr_point(&pos), hwnd, hittest ); @@ -1703,7 +1703,7 @@ BOOL WINAPI NtUserTrackMouseEvent( TRACKMOUSEEVENT *info ) NtUserSystemParametersInfo( SPI_GETMOUSEHOVERTIME, 0, &hover_time, 0 ); get_cursor_pos( &pos ); - hwnd = window_from_point( info->hwndTrack, pos, &hittest ); + hwnd = window_from_point( info->hwndTrack, pos, &hittest, get_thread_dpi() ); TRACE( "point %s hwnd %p hittest %d\n", wine_dbgstr_point(&pos), hwnd, hittest ); if (info->dwFlags & ~(TME_CANCEL | TME_HOVER | TME_LEAVE | TME_NONCLIENT)) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index d1f49ca3ed9..049773fe7e3 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2424,15 +2424,16 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H else { HWND orig = msg->hwnd; + UINT dpi = get_thread_dpi(); - msg->hwnd = window_from_point( msg->hwnd, msg->pt, &hittest ); + msg->hwnd = window_from_point( msg->hwnd, msg->pt, &hittest, dpi ); if (!msg->hwnd) /* As a heuristic, try the next window if it's the owner of orig */ { HWND next = get_window_relative( orig, GW_HWNDNEXT ); if (next && get_window_relative( orig, GW_OWNER ) == next && is_current_thread_window( next )) - msg->hwnd = window_from_point( next, msg->pt, &hittest ); + msg->hwnd = window_from_point( next, msg->pt, &hittest, dpi ); } } diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 96517ef081a..8e33370ee48 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -252,7 +252,7 @@ extern BOOL set_window_pos( WINDOWPOS *winpos, int parent_x, int parent_y ); extern ULONG set_window_style( HWND hwnd, ULONG set_bits, ULONG clear_bits ); extern BOOL show_owned_popups( HWND owner, BOOL show ); extern void update_window_state( HWND hwnd ); -extern HWND window_from_point( HWND hwnd, POINT pt, INT *hittest ); +extern HWND window_from_point( HWND hwnd, POINT pt, INT *hittest, UINT dpi ); extern HWND get_shell_window(void); extern HWND get_progman_window(void); extern HWND set_progman_window( HWND hwnd ); diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index c0ebeb6e8a9..acd4c16d2b2 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -2198,7 +2198,7 @@ done: * Point is in screen coordinates. * Returned list must be freed by caller. */ -static HWND *list_children_from_point( HWND hwnd, POINT pt ) +static HWND *list_children_from_point( HWND hwnd, POINT pt, UINT dpi ) { int i, size = 128; HWND *list; @@ -2214,7 +2214,7 @@ static HWND *list_children_from_point( HWND hwnd, POINT pt ) req->parent = wine_server_user_handle( hwnd ); req->x = pt.x; req->y = pt.y; - req->dpi = get_thread_dpi(); + req->dpi = dpi; wine_server_set_reply( req, list, (size-1) * sizeof(user_handle_t) ); if (!wine_server_call( req )) count = reply->count; } @@ -2239,19 +2239,18 @@ static HWND *list_children_from_point( HWND hwnd, POINT pt ) * * Find the window and hittest for a given point. */ -HWND window_from_point( HWND hwnd, POINT pt, INT *hittest ) +HWND window_from_point( HWND hwnd, POINT pt, INT *hittest, UINT dpi ) { int i, res; HWND ret, *list; POINT win_pt; - int dpi; if (!hwnd) hwnd = get_desktop_window(); - if (!(dpi = get_thread_dpi())) dpi = get_win_monitor_dpi( hwnd ); + if (!dpi) dpi = get_win_monitor_dpi( hwnd ); *hittest = HTNOWHERE; - if (!(list = list_children_from_point( hwnd, pt ))) return 0; + if (!(list = list_children_from_point( hwnd, pt, dpi ))) return 0; /* now determine the hittest */ @@ -2293,7 +2292,7 @@ HWND WINAPI NtUserWindowFromPoint( LONG x, LONG y ) { POINT pt = { .x = x, .y = y }; INT hittest; - return window_from_point( 0, pt, &hittest ); + return window_from_point( 0, pt, &hittest, get_thread_dpi() ); } /******************************************************************* -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5819
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/message.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 049773fe7e3..9117979422f 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2424,16 +2424,15 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H else { HWND orig = msg->hwnd; - UINT dpi = get_thread_dpi(); - msg->hwnd = window_from_point( msg->hwnd, msg->pt, &hittest, dpi ); + msg->hwnd = window_from_point( msg->hwnd, msg->pt, &hittest, 0 /* per-monitor DPI */ ); if (!msg->hwnd) /* As a heuristic, try the next window if it's the owner of orig */ { HWND next = get_window_relative( orig, GW_HWNDNEXT ); if (next && get_window_relative( orig, GW_OWNER ) == next && is_current_thread_window( next )) - msg->hwnd = window_from_point( next, msg->pt, &hittest, dpi ); + msg->hwnd = window_from_point( next, msg->pt, &hittest, 0 /* per-monitor DPI */ ); } } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5819
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/message.c | 63 +++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 9117979422f..7ff38a923fa 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2393,49 +2393,43 @@ static BOOL process_keyboard_message( MSG *msg, UINT hw_id, HWND hwnd_filter, return TRUE; } +static HWND find_hardware_message_window( MSG *msg, GUITHREADINFO *info, INT *hittest ) +{ + HWND target; + + if (!is_mouse_message( msg->message )) return msg->hwnd; + + /* find the window to dispatch this mouse message to */ + + if ((target = info->hwndCapture)) *hittest = HTCLIENT; + else if (!(target = window_from_point( msg->hwnd, msg->pt, hittest, 0 /* per-monitor DPI */ ))) + { + /* As a heuristic, try the next window if it's the owner of orig */ + HWND next = get_window_relative( msg->hwnd, GW_HWNDNEXT ); + if (next && get_window_relative( msg->hwnd, GW_OWNER ) == next && is_current_thread_window( next )) + target = window_from_point( next, msg->pt, hittest, 0 /* per-monitor DPI */ ); + } + + return target; +} + /*********************************************************************** * process_mouse_message * * returns TRUE if the contents of 'msg' should be passed to the application */ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, HWND hwnd_filter, - UINT first, UINT last, BOOL remove ) + UINT first, UINT last, BOOL remove, GUITHREADINFO *info, INT hittest ) { static MSG clk_msg; POINT pt; UINT message; - INT hittest; EVENTMSG event; - GUITHREADINFO info; MOUSEHOOKSTRUCTEX hook; BOOL eat_msg; WPARAM wparam; - /* find the window to dispatch this mouse message to */ - - info.cbSize = sizeof(info); - NtUserGetGUIThreadInfo( GetCurrentThreadId(), &info ); - if (info.hwndCapture) - { - hittest = HTCLIENT; - msg->hwnd = info.hwndCapture; - } - else - { - HWND orig = msg->hwnd; - - msg->hwnd = window_from_point( msg->hwnd, msg->pt, &hittest, 0 /* per-monitor DPI */ ); - if (!msg->hwnd) /* As a heuristic, try the next window if it's the owner of orig */ - { - HWND next = get_window_relative( orig, GW_HWNDNEXT ); - - if (next && get_window_relative( orig, GW_OWNER ) == next && - is_current_thread_window( next )) - msg->hwnd = window_from_point( next, msg->pt, &hittest, 0 /* per-monitor DPI */ ); - } - } - if (!msg->hwnd || !is_current_thread_window( msg->hwnd )) { accept_hardware_message( hw_id ); @@ -2470,7 +2464,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H { /* coordinates don't get translated while tracking a menu */ /* FIXME: should differentiate popups and top-level menus */ - if (!(info.flags & GUI_INMENUMODE)) + if (!(info->flags & GUI_INMENUMODE)) screen_to_client( msg->hwnd, &pt ); } } @@ -2489,7 +2483,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H * note that ...MOUSEMOVEs can slip in between * ...BUTTONDOWN and ...BUTTONDBLCLK messages */ - if ((info.flags & (GUI_INMENUMODE|GUI_INMOVESIZE)) || + if ((info->flags & (GUI_INMENUMODE|GUI_INMOVESIZE)) || hittest != HTCLIENT || (get_class_long( msg->hwnd, GCL_STYLE, FALSE ) & CS_DBLCLKS)) { @@ -2546,7 +2540,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H if (remove) accept_hardware_message( hw_id ); - if (!remove || info.hwndCapture) + if (!remove || info->hwndCapture) { msg->message = message; return TRUE; @@ -2567,7 +2561,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H /* Activate the window if needed */ - if (msg->hwnd != info.hwndActive) + if (msg->hwnd != info->hwndActive) { HWND hwndTop = NtUserGetAncestor( msg->hwnd, GA_ROOT ); @@ -2616,12 +2610,17 @@ static BOOL process_hardware_message( MSG *msg, UINT hw_id, const struct hardwar HWND hwnd_filter, UINT first, UINT last, BOOL remove ) { struct ntuser_thread_info *thread_info = NtUserGetThreadInfo(); + GUITHREADINFO info = {.cbSize = sizeof(info)}; UINT context; BOOL ret = FALSE; + INT hittest; thread_info->msg_source.deviceType = msg_data->source.device; thread_info->msg_source.originId = msg_data->source.origin; + NtUserGetGUIThreadInfo( GetCurrentThreadId(), &info ); + msg->hwnd = find_hardware_message_window( msg, &info, &hittest ); + /* hardware messages are always in physical coords */ context = set_thread_dpi_awareness_context( NTUSER_DPI_PER_MONITOR_AWARE ); @@ -2630,7 +2629,7 @@ static BOOL process_hardware_message( MSG *msg, UINT hw_id, const struct hardwar else if (is_keyboard_message( msg->message )) ret = process_keyboard_message( msg, hw_id, hwnd_filter, first, last, remove ); else if (is_mouse_message( msg->message )) - ret = process_mouse_message( msg, hw_id, msg_data->info, hwnd_filter, first, last, remove ); + ret = process_mouse_message( msg, hw_id, msg_data->info, hwnd_filter, first, last, remove, &info, hittest ); else if (msg->message >= WM_POINTERUPDATE && msg->message <= WM_POINTERLEAVE) ret = process_pointer_message( msg, hw_id, msg_data ); else if (msg->message == WM_WINE_CLIPCURSOR) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5819
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/message.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 7ff38a923fa..210885d59d1 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2460,12 +2460,11 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H message += WM_NCMOUSEMOVE - WM_MOUSEMOVE; wparam = hittest; } - else + /* coordinates don't get translated while tracking a menu */ + /* FIXME: should differentiate popups and top-level menus */ + else if (!(info->flags & GUI_INMENUMODE)) { - /* coordinates don't get translated while tracking a menu */ - /* FIXME: should differentiate popups and top-level menus */ - if (!(info->flags & GUI_INMENUMODE)) - screen_to_client( msg->hwnd, &pt ); + map_window_points( 0, msg->hwnd, &pt, 1, get_dpi_for_window( msg->hwnd ) ); } } msg->lParam = MAKELONG( pt.x, pt.y ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5819
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/message.c | 4 +--- dlls/win32u/rawinput.c | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 210885d59d1..c0f6cb2e7ec 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2305,7 +2305,6 @@ static void send_parent_notify( HWND hwnd, WORD event, WORD idChild, POINT pt ) */ static BOOL process_pointer_message( MSG *msg, UINT hw_id, const struct hardware_msg_data *msg_data ) { - msg->pt = point_phys_to_win_dpi( msg->hwnd, msg->pt ); return TRUE; } @@ -2384,7 +2383,6 @@ static BOOL process_keyboard_message( MSG *msg, UINT hw_id, HWND hwnd_filter, call_hooks( WH_CBT, HCBT_KEYSKIPPED, LOWORD(msg->wParam), msg->lParam, 0 ); return FALSE; } - msg->pt = point_phys_to_win_dpi( msg->hwnd, msg->pt ); if (remove && (msg->message == WM_KEYDOWN || msg->message == WM_KEYUP)) if (ImmProcessKey( msg->hwnd, NtUserGetKeyboardLayout(0), msg->wParam, msg->lParam, 0 )) @@ -2436,7 +2434,6 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H return FALSE; } - msg->pt = point_phys_to_win_dpi( msg->hwnd, msg->pt ); set_thread_dpi_awareness_context( get_window_dpi_awareness_context( msg->hwnd )); /* FIXME: is this really the right place for this hook? */ @@ -2619,6 +2616,7 @@ static BOOL process_hardware_message( MSG *msg, UINT hw_id, const struct hardwar NtUserGetGUIThreadInfo( GetCurrentThreadId(), &info ); msg->hwnd = find_hardware_message_window( msg, &info, &hittest ); + msg->pt = point_phys_to_win_dpi( msg->hwnd, msg->pt ); /* hardware messages are always in physical coords */ context = set_thread_dpi_awareness_context( NTUSER_DPI_PER_MONITOR_AWARE ); diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c index 62b1707dbfe..7af2de1cb73 100644 --- a/dlls/win32u/rawinput.c +++ b/dlls/win32u/rawinput.c @@ -597,7 +597,6 @@ BOOL process_rawinput_message( MSG *msg, UINT hw_id, const struct hardware_msg_d msg->lParam = (LPARAM)hw_id; } - msg->pt = point_phys_to_win_dpi( msg->hwnd, msg->pt ); return TRUE; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5819
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/message.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index c0f6cb2e7ec..d70edf0bc48 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2434,8 +2434,6 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H return FALSE; } - set_thread_dpi_awareness_context( get_window_dpi_awareness_context( msg->hwnd )); - /* FIXME: is this really the right place for this hook? */ event.message = msg->message; event.time = msg->time; @@ -2607,7 +2605,6 @@ static BOOL process_hardware_message( MSG *msg, UINT hw_id, const struct hardwar { struct ntuser_thread_info *thread_info = NtUserGetThreadInfo(); GUITHREADINFO info = {.cbSize = sizeof(info)}; - UINT context; BOOL ret = FALSE; INT hittest; @@ -2618,9 +2615,6 @@ static BOOL process_hardware_message( MSG *msg, UINT hw_id, const struct hardwar msg->hwnd = find_hardware_message_window( msg, &info, &hittest ); msg->pt = point_phys_to_win_dpi( msg->hwnd, msg->pt ); - /* hardware messages are always in physical coords */ - context = set_thread_dpi_awareness_context( NTUSER_DPI_PER_MONITOR_AWARE ); - if (msg->message == WM_INPUT || msg->message == WM_INPUT_DEVICE_CHANGE) ret = process_rawinput_message( msg, hw_id, msg_data ); else if (is_keyboard_message( msg->message )) @@ -2635,7 +2629,7 @@ static BOOL process_hardware_message( MSG *msg, UINT hw_id, const struct hardwar process_wine_setcursor( msg->hwnd, (HWND)msg->wParam, (HCURSOR)msg->lParam ); else ERR( "unknown message type %x\n", msg->message ); - set_thread_dpi_awareness_context( context ); + return ret; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5819
v3: Avoid having to change thread DPI awareness context at all, instead of changing it more. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5819#note_73052
participants (1)
-
Rémi Bernon