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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 15059052904910b9efab898b43a264bc91e261f9
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=15059052904910b9efab898b43a264bc91e261f9

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Sep  7 18:16:10 2018 +0200

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

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

---

 dlls/user32/sysparams.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c
index 028a0a9..224d2f9 100644
--- 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 */
     {