user32: Ignore application-specified DPI awareness when DPI scaling is disabled.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>

user32: Ignore application-specified DPI awareness when DPI scaling is disabled.
15059052 · Alexandre Julliard · 84ac7e15 · 15059052
Commit 15059052 authored Sep 07, 2018 by Alexandre Julliard
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

sysparams.c dlls/user32/sysparams.c +5 -1

No files found.
--- a/dlls/user32/sysparams.c
+++ b/dlls/user32/sysparams.c
@@ -1460,7 +1460,11 @@ void SYSPARAMS_Init(void)

    /* FIXME: what do the DpiScalingVer flags mean? */
    get_dword_entry( (union sysparam_all_entry *)&entry_DPISCALINGVER, 0, &dpi_scaling, 0 );
-    if (!dpi_scaling) default_awareness = DPI_AWARENESS_PER_MONITOR_AWARE;
+    if (!dpi_scaling)
+    {
+        default_awareness = DPI_AWARENESS_PER_MONITOR_AWARE;
+        if (dpi_awareness) dpi_awareness = 0x10 | default_awareness;
+    }

    if (volatile_base_key && dispos == REG_CREATED_NEW_KEY)  /* first process, initialize entries */
    {