Skip to content

W
wine-winehq
Commit 5ffed883 authored by Fabian Maurer's avatar Fabian Maurer Committed by Alexandre Julliard
Browse files
Options

user32/sysparams: Handle more contexts in GetAwarenessFromDpiAwarenessContext.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55630
parent d34cbe61
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
dlls/user32/sysparams.c
View file @ 5ffed883
...@@ -656,14 +656,18 @@ DPI_AWARENESS WINAPI GetAwarenessFromDpiAwarenessContext( DPI_AWARENESS_CONTEXT ...@@ -656,14 +656,18 @@ DPI_AWARENESS WINAPI GetAwarenessFromDpiAwarenessContext( DPI_AWARENESS_CONTEXT
case 0x10: case 0x10:
case 0x11: case 0x11:
case 0x12: case 0x12:
case 0x22:
case 0x80000010: case 0x80000010:
case 0x80000011: case 0x80000011:
case 0x80000012: case 0x80000012:
case 0x80000022:
return (ULONG_PTR)context & 3; return (ULONG_PTR)context & 3;
case (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE: case (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE:
case (ULONG_PTR)DPI_AWARENESS_CONTEXT_SYSTEM_AWARE: case (ULONG_PTR)DPI_AWARENESS_CONTEXT_SYSTEM_AWARE:
case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE: case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE:
return ~(ULONG_PTR)context; return ~(ULONG_PTR)context;
case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2:
return ~(ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE;
default: default:
return DPI_AWARENESS_INVALID; return DPI_AWARENESS_INVALID;
} }
......
dlls/user32/tests/sysparams.c
View file @ 5ffed883
...@@ -3940,7 +3940,6 @@ static void test_dpi_context(void) ...@@ -3940,7 +3940,6 @@ static void test_dpi_context(void)
ok( awareness == (i & ~0x10), "%Ix: wrong value %u\n", i, awareness ); ok( awareness == (i & ~0x10), "%Ix: wrong value %u\n", i, awareness );
break; break;
case 0x22: case 0x22:
todo_wine
ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE || broken( awareness == DPI_AWARENESS_INVALID ) /* Win10 1709+ */, ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE || broken( awareness == DPI_AWARENESS_INVALID ) /* Win10 1709+ */,
"%Ix: wrong value %u\n", i, awareness ); "%Ix: wrong value %u\n", i, awareness );
break; break;
...@@ -3967,7 +3966,6 @@ static void test_dpi_context(void) ...@@ -3967,7 +3966,6 @@ static void test_dpi_context(void)
ok( awareness == (i & ~0x10), "%Ix: wrong value %u\n", i | 0x80000000, awareness ); ok( awareness == (i & ~0x10), "%Ix: wrong value %u\n", i | 0x80000000, awareness );
break; break;
case 0x22: case 0x22:
todo_wine
ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE || broken ( awareness == DPI_AWARENESS_INVALID ) /* Win10 1709+ */, ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE || broken ( awareness == DPI_AWARENESS_INVALID ) /* Win10 1709+ */,
"%Ix: wrong value %u\n", i, awareness ); "%Ix: wrong value %u\n", i, awareness );
break; break;
...@@ -3989,7 +3987,6 @@ static void test_dpi_context(void) ...@@ -3989,7 +3987,6 @@ static void test_dpi_context(void)
ok( pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~i ), "%Ix: not valid\n", ~i ); ok( pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~i ), "%Ix: not valid\n", ~i );
break; break;
case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2: 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 ); ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE || broken ( awareness == DPI_AWARENESS_INVALID ), "%Ix: wrong value %u\n", ~i, awareness );
break; break;
case (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE_GDISCALED: case (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE_GDISCALED:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment