Module: wine Branch: master Commit: 5ffed8830cbc619219eae9a9f48b5f83bced7ad4 URL: https://gitlab.winehq.org/wine/wine/-/commit/5ffed8830cbc619219eae9a9f48b5f8...
Author: Fabian Maurer dark.shadow4@web.de Date: Fri Feb 9 20:11:44 2024 +0100
user32/sysparams: Handle more contexts in GetAwarenessFromDpiAwarenessContext.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55630
---
dlls/user32/sysparams.c | 4 ++++ dlls/user32/tests/sysparams.c | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 18e02f1524b..ec8dc11af17 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -656,14 +656,18 @@ DPI_AWARENESS WINAPI GetAwarenessFromDpiAwarenessContext( DPI_AWARENESS_CONTEXT case 0x10: case 0x11: case 0x12: + case 0x22: case 0x80000010: case 0x80000011: case 0x80000012: + case 0x80000022: return (ULONG_PTR)context & 3; case (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE: case (ULONG_PTR)DPI_AWARENESS_CONTEXT_SYSTEM_AWARE: case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE: return ~(ULONG_PTR)context; + case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2: + return ~(ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE; default: return DPI_AWARENESS_INVALID; } diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index ba6ed0c8b4c..16756ecb06a 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3940,7 +3940,6 @@ static void test_dpi_context(void) ok( awareness == (i & ~0x10), "%Ix: wrong value %u\n", i, awareness ); break; case 0x22: - todo_wine ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE || broken( awareness == DPI_AWARENESS_INVALID ) /* Win10 1709+ */, "%Ix: wrong value %u\n", i, awareness ); break; @@ -3967,7 +3966,6 @@ static void test_dpi_context(void) ok( awareness == (i & ~0x10), "%Ix: wrong value %u\n", i | 0x80000000, awareness ); break; case 0x22: - todo_wine ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE || broken ( awareness == DPI_AWARENESS_INVALID ) /* Win10 1709+ */, "%Ix: wrong value %u\n", i, awareness ); break; @@ -3989,7 +3987,6 @@ static void test_dpi_context(void) ok( pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~i ), "%Ix: not valid\n", ~i ); break; case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2: - todo_wine ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE || broken ( awareness == DPI_AWARENESS_INVALID ), "%Ix: wrong value %u\n", ~i, awareness ); break; case (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE_GDISCALED: