Rémi Bernon : win32u: Pass the DPI awareness context in win_proc_params.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: dc05a4499e6c25af22e45e247114ceb464c6b554
URL:    https://gitlab.winehq.org/wine/wine/-/commit/dc05a4499e6c25af22e45e247114ceb...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Thu May 23 15:58:02 2024 +0200

win32u: Pass the DPI awareness context in win_proc_params.

---

 dlls/user32/winproc.c | 2 +-
 dlls/win32u/message.c | 4 ++--
 dlls/wow64win/user.c  | 4 ++--
 include/ntuser.h      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c
index 4525f604beb..5678e75b4e9 100644
--- a/dlls/user32/winproc.c
+++ b/dlls/user32/winproc.c
@@ -698,7 +698,7 @@ static LRESULT WINPROC_CallProcWtoA( winproc_callback_t callback, HWND hwnd, UIN
 
 LRESULT dispatch_win_proc_params( struct win_proc_params *params )
 {
-    DPI_AWARENESS_CONTEXT context = SetThreadDpiAwarenessContext( params->dpi_awareness );
+    DPI_AWARENESS_CONTEXT context = SetThreadDpiAwarenessContext( ULongToHandle( params->dpi_context ) );
     LRESULT result = 0;
 
     if (!params->ansi)
diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c
index bf393e2b7c9..877be545810 100644
--- a/dlls/win32u/message.c
+++ b/dlls/win32u/message.c
@@ -379,7 +379,7 @@ static BOOL init_win_proc_params( struct win_proc_params *params, HWND hwnd, UIN
     params->lparam = lparam;
     params->ansi = params->ansi_dst = ansi;
     params->mapping = WMCHAR_MAP_CALLWINDOWPROC;
-    params->dpi_awareness = ULongToHandle( get_window_dpi_awareness_context( params->hwnd ) );
+    params->dpi_context = get_window_dpi_awareness_context( params->hwnd );
     get_winproc_params( params, TRUE );
     return TRUE;
 }
@@ -410,7 +410,7 @@ static BOOL init_window_call_params( struct win_proc_params *params, HWND hwnd,
     params->lparam = lParam;
     params->ansi = ansi;
     params->mapping = mapping;
-    params->dpi_awareness = ULongToHandle( get_window_dpi_awareness_context( params->hwnd ) );
+    params->dpi_context = get_window_dpi_awareness_context( params->hwnd );
     get_winproc_params( params, !is_dialog );
     return TRUE;
 }
diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c
index 9a293826ba9..33d4d786714 100644
--- a/dlls/wow64win/user.c
+++ b/dlls/wow64win/user.c
@@ -355,7 +355,7 @@ struct win_proc_params32
     BOOL ansi;
     BOOL ansi_dst;
     enum wm_char_mapping mapping;
-    ULONG dpi_awareness;
+    ULONG dpi_context;
     ULONG procA;
     ULONG procW;
 };
@@ -471,7 +471,7 @@ static void win_proc_params_64to32( const struct win_proc_params *src, struct wi
     params.ansi = src->ansi;
     params.ansi_dst = src->ansi_dst;
     params.mapping = src->mapping;
-    params.dpi_awareness = HandleToUlong( src->dpi_awareness );
+    params.dpi_context = src->dpi_context;
     params.procA = PtrToUlong( src->procA );
     params.procW = PtrToUlong( src->procW );
     memcpy( dst, ¶ms, sizeof(params) );
diff --git a/include/ntuser.h b/include/ntuser.h
index b58413ac4db..88453c46749 100644
--- a/include/ntuser.h
+++ b/include/ntuser.h
@@ -160,7 +160,7 @@ struct win_proc_params
     BOOL ansi;
     BOOL ansi_dst;
     enum wm_char_mapping mapping;
-    DPI_AWARENESS_CONTEXT dpi_awareness;
+    UINT dpi_context;
     WNDPROC procA;
     WNDPROC procW;
 };