Fabian Maurer : user32: Fix Set/GetThreadDpiAwarenessContext for DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 21bdc585f3eb8b23b7973b01e60543e417492a8a
URL:    https://gitlab.winehq.org/wine/wine/-/commit/21bdc585f3eb8b23b7973b01e60543e...

Author: Fabian Maurer 
Date:   Sat Feb 24 20:29:05 2024 +0100

user32: Fix Set/GetThreadDpiAwarenessContext for DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56360

---

dlls/user32/sysparams.c       |  4 +++-
 dlls/user32/tests/sysparams.c | 10 +++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c
index ec8dc11af17..d30bed44b31 100644
--- a/dlls/user32/sysparams.c
+++ b/dlls/user32/sysparams.c
@@ -747,7 +747,9 @@ DPI_AWARENESS_CONTEXT WINAPI SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT
         prev = NtUserGetProcessDpiAwarenessContext( GetCurrentProcess() ) & 3;
         prev |= 0x80000010;  /* restore to process default */
     }
-    if (((ULONG_PTR)context & ~(ULONG_PTR)0x13) == 0x80000000) info->dpi_awareness = 0;
+    if (((ULONG_PTR)context & ~(ULONG_PTR)0x33) == 0x80000000) info->dpi_awareness = 0;
+    else if (context == DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 || context == (DPI_AWARENESS_CONTEXT)0x22)
+        info->dpi_awareness = 0x22;
     else info->dpi_awareness = val | 0x10;
     return ULongToHandle( prev );
 }
diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c
index 68fe455a002..d086725a2b6 100644
--- a/dlls/user32/tests/sysparams.c
+++ b/dlls/user32/tests/sysparams.c
@@ -3790,21 +3790,19 @@ static void test_ThreadDpiAwarenessContext(ULONG_PTR flags)
         ULONG_PTR context;
         ULONG_PTR result_get;
         ULONG_PTR result_set;
-        BOOL todo_get;
-        BOOL todo_set;
     } awareness_contexts[] = {
         { 0x10 | flags, 0x10 | flags, 0x10 | flags },
         { 0x11 | flags, 0x11 | flags, 0x11 | flags },
         { 0x12, 0x12, 0x12 },
-        { 0x22, 0x22, 0x22, TRUE, TRUE },
+        { 0x22, 0x22, 0x22},
         { 0x80000010 | flags, 0x10 | awareness | flags, 0x80000010 | awareness | flags },
         { 0x80000011 | flags, 0x10 | awareness | flags, 0x80000010 | awareness | flags },
         { 0x80000012, 0x10 | awareness | flags, 0x80000010 | awareness | flags },
-        { 0x80000022, 0x10 | awareness | flags, 0x80000010 | awareness | flags, FALSE, TRUE },
+        { 0x80000022, 0x10 | awareness | flags, 0x80000010 | awareness | flags },
         { (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE, 0x10 | flags, 0x10 | flags },
         { (ULONG_PTR)DPI_AWARENESS_CONTEXT_SYSTEM_AWARE, 0x11 | flags, 0x11 | flags },
         { (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE, 0x12, 0x12 },
-        { (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2, 0x22, 0x22, TRUE, TRUE },
+        { (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2, 0x22, 0x22 },
         { 0x12, 0x12 }, /* Only for last_result test */
     };

@@ -3818,11 +3816,9 @@ static void test_ThreadDpiAwarenessContext(ULONG_PTR flags)
         if (i != 0)
         {
             struct awareness_context_thread *last = &awareness_contexts[i - 1];
-            todo_wine_if(awareness_contexts[i - 1].todo_set)
             ok( last_context == (DPI_AWARENESS_CONTEXT)last->result_set, "For context %p - after set expected %p, got %p\n", (DPI_AWARENESS_CONTEXT)last->context, (DPI_AWARENESS_CONTEXT)last->result_set, last_context );
         }
         context = pGetThreadDpiAwarenessContext();
-        todo_wine_if(item->todo_get)
         ok( context == (DPI_AWARENESS_CONTEXT)item->result_get, "For context %p - after get expected %p, got %p\n", (DPI_AWARENESS_CONTEXT)item->context, (DPI_AWARENESS_CONTEXT)item->result_get, context );
     }
 }