Huw Davies : winex11: Try to read the dpi from the user key first.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d645c6ffacd9871b94f1552515e353d47ffc0865
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d645c6ffacd9871b94f1552515e353d47ffc0865

Author: Huw Davies <huw at codeweavers.com>
Date:   Thu Apr 27 11:02:33 2017 +0100

winex11: Try to read the dpi from the user key first.

Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/winex11.drv/init.c | 49 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 15 deletions(-)

diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
index 7efd603..3929b55 100644
--- a/dlls/winex11.drv/init.c
+++ b/dlls/winex11.drv/init.c
@@ -42,35 +42,51 @@ static Pixmap stock_bitmap_pixmap;  /* phys bitmap for the default stock bitmap
 
 static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT;
 
-static const WCHAR dpi_key_name[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s','\0'};
+static const WCHAR dpi_key_name[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p','\0'};
+static const WCHAR def_dpi_key_name[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s','\0'};
 static const WCHAR dpi_value_name[] = {'L','o','g','P','i','x','e','l','s','\0'};
 
 static const struct gdi_dc_funcs x11drv_funcs;
 static const struct gdi_dc_funcs *xrender_funcs;
 
 /******************************************************************************
- *      get_dpi
+ *              get_reg_dword
  *
- * get the dpi from the registry
+ * Read a DWORD value from the registry
  */
-static DWORD get_dpi( void )
+static BOOL get_reg_dword(HKEY base, const WCHAR *key_name, const WCHAR *value_name, DWORD *value)
 {
-    DWORD dpi = 96;
-    HKEY hkey;
+    HKEY key;
+    DWORD type, data, size = sizeof(data);
+    BOOL ret = FALSE;
 
-    if (RegOpenKeyW(HKEY_CURRENT_CONFIG, dpi_key_name, &hkey) == ERROR_SUCCESS)
+    if (RegOpenKeyW(base, key_name, &key) == ERROR_SUCCESS)
     {
-        DWORD type, size, new_dpi;
-
-        size = sizeof(new_dpi);
-        if(RegQueryValueExW(hkey, dpi_value_name, NULL, &type, (void *)&new_dpi, &size) == ERROR_SUCCESS)
+        if (RegQueryValueExW(key, value_name, NULL, &type, (void *)&data, &size) == ERROR_SUCCESS &&
+            type == REG_DWORD)
         {
-            if(type == REG_DWORD && new_dpi != 0)
-                dpi = new_dpi;
+            *value = data;
+            ret = TRUE;
         }
-        RegCloseKey(hkey);
+        RegCloseKey(key);
     }
-    return dpi;
+    return ret;
+}
+
+/******************************************************************************
+ *              get_dpi
+ *
+ * get the dpi from the registry
+ */
+static DWORD get_dpi(void)
+{
+    DWORD dpi;
+
+    if (get_reg_dword(HKEY_CURRENT_USER, dpi_key_name, dpi_value_name, &dpi))
+        return dpi;
+    if (get_reg_dword(HKEY_CURRENT_CONFIG, def_dpi_key_name, dpi_value_name, &dpi))
+        return dpi;
+    return 0;
 }
 
 /**********************************************************************
@@ -92,6 +108,9 @@ static BOOL WINAPI device_init( INIT_ONCE *once, void *param, void **context )
 
     /* Initialize device caps */
     log_pixels_x = log_pixels_y = get_dpi();
+    if (!log_pixels_x)
+        log_pixels_x = log_pixels_y = USER_DEFAULT_SCREEN_DPI;
+
     return TRUE;
 }