uxtheme: Use system DPI for OpenThemeData() without valid window handles.

Tested manually on Wine for 96, 120, 144, 168, 192 and 216 DPI. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53298Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>

uxtheme: Use system DPI for OpenThemeData() without valid window handles.
8d69490f · Zhiyi Zhang · Alexandre Julliard · e2daffda · 8d69490f · 8d69490f
Commit 8d69490f authored Jul 04, 2022 by Zhiyi Zhang Committed by Alexandre Julliard Jul 06, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

system.c dlls/uxtheme/system.c +1 -1

system.c dlls/uxtheme/tests/system.c +0 -4

No files found.
--- a/dlls/uxtheme/system.c
+++ b/dlls/uxtheme/system.c
@@ -663,7 +663,7 @@ HTHEME WINAPI OpenThemeDataEx(HWND hwnd, LPCWSTR pszClassList, DWORD flags)

    dpi = GetDpiForWindow(hwnd);
    if (!dpi)
-        dpi = 96;
+        dpi = GetDpiForSystem();

    return open_theme_data(hwnd, pszClassList, flags, dpi);
 }

--- a/dlls/uxtheme/tests/system.c
+++ b/dlls/uxtheme/tests/system.c
@@ -1122,12 +1122,10 @@ static void test_GetThemePartSize(void)

    hr = GetThemePartSize(htheme, hdc, BP_CHECKBOX, CBS_CHECKEDNORMAL, NULL, TS_DRAW, &size);
    ok(hr == S_OK, "GetThemePartSize failed, hr %#lx.\n", hr);
-    todo_wine_if(target_dpi != 96)
    ok(compare_uint(size.cx, expected, 1) && compare_uint(size.cy, expected, 1),
       "Got unexpected size %ldx%ld.\n", size.cx, size.cy);
    hr = GetThemePartSize(htheme, NULL, BP_CHECKBOX, CBS_CHECKEDNORMAL, NULL, TS_DRAW, &size);
    ok(hr == S_OK, "GetThemePartSize failed, hr %#lx.\n", hr);
-    todo_wine_if(target_dpi != 96)
    ok(compare_uint(size.cx, expected, 1) && compare_uint(size.cy, expected, 1),
       "Got unexpected size %ldx%ld.\n", size.cx, size.cy);
    CloseThemeData(htheme);
@@ -1145,12 +1143,10 @@ static void test_GetThemePartSize(void)
    htheme = OpenThemeData(NULL, WC_BUTTONW);
    hr = GetThemePartSize(htheme, hdc, BP_CHECKBOX, CBS_CHECKEDNORMAL, NULL, TS_DRAW, &size);
    ok(hr == S_OK, "GetThemePartSize failed, hr %#lx.\n", hr);
-    todo_wine_if(target_dpi != 96)
    ok(compare_uint(size.cx, expected, 1) && compare_uint(size.cy, expected, 1),
       "Got unexpected size %ldx%ld.\n", size.cx, size.cy);
    hr = GetThemePartSize(htheme, NULL, BP_CHECKBOX, CBS_CHECKEDNORMAL, NULL, TS_DRAW, &size);
    ok(hr == S_OK, "GetThemePartSize failed, hr %#lx.\n", hr);
-    todo_wine_if(target_dpi != 96)
    ok(compare_uint(size.cx, expected, 1) && compare_uint(size.cy, expected, 1),
       "Got unexpected size %ldx%ld.\n", size.cx, size.cy);
    CloseThemeData(htheme);