From b8a805e2f2c2411aa3ed6a4650d6ab3a5a852f78 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Wed, 23 Mar 2022 14:00:43 +0100
Subject: [PATCH] user32: Move more code out of call_window_proc.

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/user32/winproc.c | 20 ++++++++++++--------
 include/ntuser.h      |  1 +
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c
index b3da8d26cb3..c46cd373b4e 100644
--- a/dlls/user32/winproc.c
+++ b/dlls/user32/winproc.c
@@ -119,18 +119,12 @@ static WPARAM map_wparam_char_WtoA( WPARAM wParam, DWORD len )
 /* call a 32-bit window procedure */
 static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRESULT *result, void *arg )
 {
-    DPI_AWARENESS_CONTEXT context;
     WNDPROC proc = arg;
 
-    USER_CheckNotLock();
-
-    hwnd = WIN_GetFullHandle( hwnd );
     TRACE_(relay)( "\1Call window proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx)\n",
                    proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp );
 
-    context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd ));
     *result = WINPROC_wrapper( proc, hwnd, msg, wp, lp );
-    SetThreadDpiAwarenessContext( context );
 
     TRACE_(relay)( "\1Ret  window proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx) retval=%08lx\n",
                    proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp, *result );
@@ -711,6 +705,10 @@ static LRESULT WINPROC_CallProcWtoA( winproc_callback_t callback, HWND hwnd, UIN
 
 static void dispatch_win_proc_params( struct win_proc_params *params )
 {
+    DPI_AWARENESS_CONTEXT context = SetThreadDpiAwarenessContext( params->dpi_awareness );
+
+    USER_CheckNotLock();
+
     if (!params->ansi)
     {
         if (params->procW == WINPROC_PROC16)
@@ -789,6 +787,8 @@ static void dispatch_win_proc_params( struct win_proc_params *params )
             call_window_proc( params->hwnd, params->msg, params->wparam, params->lparam,
                               params->result, params->func );
     }
+
+    SetThreadDpiAwarenessContext( context );
 }
 
 
@@ -818,13 +818,14 @@ BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam,
     params.is_dialog = wndPtr->dlgInfo != NULL;
     WIN_ReleasePtr( wndPtr );
 
-    params.hwnd = hwnd;
+    params.hwnd = WIN_GetFullHandle( hwnd );
     params.msg = msg;
     params.wparam = wParam;
     params.lparam = lParam;
     params.result = result;
     params.ansi = !unicode;
     params.mapping = mapping;
+    params.dpi_awareness = GetWindowDpiAwarenessContext( params.hwnd );
 
     if (!proc)
     {
@@ -855,7 +856,9 @@ static void init_win_proc_params( struct win_proc_params *info, WNDPROC func, HW
 {
     WINDOWPROC *proc;
 
-    info->hwnd = hwnd;
+    USER_CheckNotLock();
+
+    info->hwnd = WIN_GetFullHandle( hwnd );
     info->msg = msg;
     info->wparam = wparam;
     info->lparam = lparam;
@@ -863,6 +866,7 @@ static void init_win_proc_params( struct win_proc_params *info, WNDPROC func, HW
     info->ansi = info->ansi_dst = ansi;
     info->is_dialog = FALSE;
     info->mapping = WMCHAR_MAP_CALLWINDOWPROC;
+    info->dpi_awareness = GetWindowDpiAwarenessContext( info->hwnd );
     info->func = func;
 
     if (!(proc = handle_to_proc( func )))
diff --git a/include/ntuser.h b/include/ntuser.h
index 19f303f0dae..12e9b5b3025 100644
--- a/include/ntuser.h
+++ b/include/ntuser.h
@@ -87,6 +87,7 @@ struct win_proc_params
     BOOL ansi_dst;
     BOOL is_dialog;
     enum wm_char_mapping mapping;
+    DPI_AWARENESS_CONTEXT dpi_awareness;
     WNDPROC procA;
     WNDPROC procW;
 };