[PATCH v6 6/7] win32u: Factor hardware message point DPI mapping together.

[Rémi Bernon]

From: Rémi Bernon

---
 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;
 }