[PATCH 0/1] MR446: uxtheme/tests: Use the GetDpiForSystem() function pointer.

[Zhiyi Zhang (＠zhiyi)]

GetDpiForSystem() requires Windows 10 1607+.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53341
Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/446

[PATCH 1/1] uxtheme/tests: Use the GetDpiForSystem() function pointer.

[Zhiyi Zhang]

From: Zhiyi Zhang <zzhang(a)codeweavers.com>

GetDpiForSystem() requires Windows 10 1607+.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53341
Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>
---
 dlls/uxtheme/tests/system.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c
index 22762ecd4a9..debc712a73c 100644
--- a/dlls/uxtheme/tests/system.c
+++ b/dlls/uxtheme/tests/system.c
@@ -52,6 +52,7 @@ static HRESULT (WINAPI *pGetThemeTransitionDuration)(HTHEME, int, int, int, int,
 static LONG (WINAPI *pDisplayConfigGetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *);
 static LONG (WINAPI *pDisplayConfigSetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *);
 static BOOL (WINAPI *pGetDpiForMonitorInternal)(HMONITOR, UINT, UINT *, UINT *);
+static UINT (WINAPI *pGetDpiForSystem)(void);
 static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT);
 
 static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *);
@@ -94,6 +95,7 @@ static void init_funcs(void)
     GET_PROC(user32, DisplayConfigGetDeviceInfo)
     GET_PROC(user32, DisplayConfigSetDeviceInfo)
     GET_PROC(user32, GetDpiForMonitorInternal)
+    GET_PROC(user32, GetDpiForSystem)
     GET_PROC(user32, SetThreadDpiAwarenessContext)
 
     GET_PROC(gdi32, D3DKMTCloseAdapter)
@@ -1073,9 +1075,9 @@ static void test_GetThemePartSize(void)
     HRESULT hr;
     SIZE size;
 
-    if (!pSetThreadDpiAwarenessContext)
+    if (!pSetThreadDpiAwarenessContext || !pGetDpiForSystem)
     {
-        win_skip("SetThreadDpiAwarenessContext is unavailable.\n");
+        win_skip("SetThreadDpiAwarenessContext() or GetDpiForSystem() is unavailable.\n");
         return;
     }
 
@@ -1088,7 +1090,7 @@ static void test_GetThemePartSize(void)
     old_context = pSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
     current_dpi = get_primary_monitor_effective_dpi();
     old_dpi = current_dpi;
-    system_dpi = GetDpiForSystem();
+    system_dpi = pGetDpiForSystem();
     target_dpi = system_dpi;
 
     hwnd = CreateWindowA("Button", "Test", WS_POPUP, 100, 100, 100, 100, NULL, NULL, NULL, NULL);
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/446