Commit c1c3c68e authored by Zhiyi Zhang's avatar Zhiyi Zhang Committed by Alexandre Julliard

uxtheme/tests: Use the GetDpiForSystem() function pointer.

GetDpiForSystem() requires Windows 10 1607+. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53341Signed-off-by: 's avatarZhiyi Zhang <zzhang@codeweavers.com>
parent ea930bec
...@@ -52,6 +52,7 @@ static HRESULT (WINAPI *pGetThemeTransitionDuration)(HTHEME, int, int, int, int, ...@@ -52,6 +52,7 @@ static HRESULT (WINAPI *pGetThemeTransitionDuration)(HTHEME, int, int, int, int,
static LONG (WINAPI *pDisplayConfigGetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *); static LONG (WINAPI *pDisplayConfigGetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *);
static LONG (WINAPI *pDisplayConfigSetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *); static LONG (WINAPI *pDisplayConfigSetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *);
static BOOL (WINAPI *pGetDpiForMonitorInternal)(HMONITOR, UINT, UINT *, UINT *); static BOOL (WINAPI *pGetDpiForMonitorInternal)(HMONITOR, UINT, UINT *, UINT *);
static UINT (WINAPI *pGetDpiForSystem)(void);
static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT);
static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *); static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *);
...@@ -94,6 +95,7 @@ static void init_funcs(void) ...@@ -94,6 +95,7 @@ static void init_funcs(void)
GET_PROC(user32, DisplayConfigGetDeviceInfo) GET_PROC(user32, DisplayConfigGetDeviceInfo)
GET_PROC(user32, DisplayConfigSetDeviceInfo) GET_PROC(user32, DisplayConfigSetDeviceInfo)
GET_PROC(user32, GetDpiForMonitorInternal) GET_PROC(user32, GetDpiForMonitorInternal)
GET_PROC(user32, GetDpiForSystem)
GET_PROC(user32, SetThreadDpiAwarenessContext) GET_PROC(user32, SetThreadDpiAwarenessContext)
GET_PROC(gdi32, D3DKMTCloseAdapter) GET_PROC(gdi32, D3DKMTCloseAdapter)
...@@ -1073,9 +1075,9 @@ static void test_GetThemePartSize(void) ...@@ -1073,9 +1075,9 @@ static void test_GetThemePartSize(void)
HRESULT hr; HRESULT hr;
SIZE size; SIZE size;
if (!pSetThreadDpiAwarenessContext) if (!pSetThreadDpiAwarenessContext || !pGetDpiForSystem)
{ {
win_skip("SetThreadDpiAwarenessContext is unavailable.\n"); win_skip("SetThreadDpiAwarenessContext() or GetDpiForSystem() is unavailable.\n");
return; return;
} }
...@@ -1088,7 +1090,7 @@ static void test_GetThemePartSize(void) ...@@ -1088,7 +1090,7 @@ static void test_GetThemePartSize(void)
old_context = pSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2); old_context = pSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
current_dpi = get_primary_monitor_effective_dpi(); current_dpi = get_primary_monitor_effective_dpi();
old_dpi = current_dpi; old_dpi = current_dpi;
system_dpi = GetDpiForSystem(); system_dpi = pGetDpiForSystem();
target_dpi = system_dpi; target_dpi = system_dpi;
hwnd = CreateWindowA("Button", "Test", WS_POPUP, 100, 100, 100, 100, NULL, NULL, NULL, NULL); hwnd = CreateWindowA("Button", "Test", WS_POPUP, 100, 100, 100, 100, NULL, NULL, NULL, NULL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment