[PATCH 3/3] user32/tests: Add a helper to initialize function pointers.

[Zhiyi Zhang]

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>
---
 dlls/user32/tests/sysparams.c | 57 +++++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 22 deletions(-)

diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c
index 89a524407bf..9b9dfe4f089 100644
--- a/dlls/user32/tests/sysparams.c
+++ b/dlls/user32/tests/sysparams.c
@@ -4128,6 +4128,39 @@ static void test_GetAutoRotationState(void)
     ok(ret, "Expected GetAutoRotationState to succeed, error %d\n", GetLastError());
 }
 
+static void init_function_pointers(void)
+{
+    HMODULE user32 = GetModuleHandleA("user32.dll");
+
+#define GET_PROC(module, func)                       \
+    p##func = (void *)GetProcAddress(module, #func); \
+    if (!p##func)                                    \
+        trace("GetProcAddress(%s, %s) failed.\n", #module, #func);
+
+    GET_PROC(user32, AdjustWindowRectExForDpi)
+    GET_PROC(user32, ChangeDisplaySettingsExA)
+    GET_PROC(user32, GetAutoRotationState)
+    GET_PROC(user32, GetAwarenessFromDpiAwarenessContext)
+    GET_PROC(user32, GetDpiForMonitorInternal)
+    GET_PROC(user32, GetDpiForSystem)
+    GET_PROC(user32, GetDpiForWindow)
+    GET_PROC(user32, GetProcessDpiAwarenessInternal)
+    GET_PROC(user32, GetSystemMetricsForDpi)
+    GET_PROC(user32, GetThreadDpiAwarenessContext)
+    GET_PROC(user32, GetWindowDpiAwarenessContext)
+    GET_PROC(user32, IsProcessDPIAware)
+    GET_PROC(user32, IsValidDpiAwarenessContext)
+    GET_PROC(user32, LogicalToPhysicalPointForPerMonitorDPI)
+    GET_PROC(user32, PhysicalToLogicalPointForPerMonitorDPI)
+    GET_PROC(user32, SetProcessDPIAware)
+    GET_PROC(user32, SetProcessDpiAwarenessContext)
+    GET_PROC(user32, SetProcessDpiAwarenessInternal)
+    GET_PROC(user32, SetThreadDpiAwarenessContext)
+    GET_PROC(user32, SystemParametersInfoForDpi)
+
+#undef GET_PROC
+}
+
 START_TEST(sysparams)
 {
     int argc;
@@ -4137,29 +4170,9 @@ START_TEST(sysparams)
     HDC hdc;
     HANDLE hThread;
     DWORD dwThreadId;
-    HANDLE hInstance, hdll;
+    HANDLE hInstance;
 
-    hdll = GetModuleHandleA("user32.dll");
-    pChangeDisplaySettingsExA = (void*)GetProcAddress(hdll, "ChangeDisplaySettingsExA");
-    pIsProcessDPIAware = (void*)GetProcAddress(hdll, "IsProcessDPIAware");
-    pSetProcessDPIAware = (void*)GetProcAddress(hdll, "SetProcessDPIAware");
-    pGetDpiForSystem = (void*)GetProcAddress(hdll, "GetDpiForSystem");
-    pGetDpiForWindow = (void*)GetProcAddress(hdll, "GetDpiForWindow");
-    pGetDpiForMonitorInternal = (void*)GetProcAddress(hdll, "GetDpiForMonitorInternal");
-    pSetProcessDpiAwarenessContext = (void*)GetProcAddress(hdll, "SetProcessDpiAwarenessContext");
-    pGetProcessDpiAwarenessInternal = (void*)GetProcAddress(hdll, "GetProcessDpiAwarenessInternal");
-    pSetProcessDpiAwarenessInternal = (void*)GetProcAddress(hdll, "SetProcessDpiAwarenessInternal");
-    pGetThreadDpiAwarenessContext = (void*)GetProcAddress(hdll, "GetThreadDpiAwarenessContext");
-    pSetThreadDpiAwarenessContext = (void*)GetProcAddress(hdll, "SetThreadDpiAwarenessContext");
-    pGetWindowDpiAwarenessContext = (void*)GetProcAddress(hdll, "GetWindowDpiAwarenessContext");
-    pGetAwarenessFromDpiAwarenessContext = (void*)GetProcAddress(hdll, "GetAwarenessFromDpiAwarenessContext");
-    pIsValidDpiAwarenessContext = (void*)GetProcAddress(hdll, "IsValidDpiAwarenessContext");
-    pGetSystemMetricsForDpi = (void*)GetProcAddress(hdll, "GetSystemMetricsForDpi");
-    pSystemParametersInfoForDpi = (void*)GetProcAddress(hdll, "SystemParametersInfoForDpi");
-    pAdjustWindowRectExForDpi = (void*)GetProcAddress(hdll, "AdjustWindowRectExForDpi");
-    pLogicalToPhysicalPointForPerMonitorDPI = (void*)GetProcAddress(hdll, "LogicalToPhysicalPointForPerMonitorDPI");
-    pPhysicalToLogicalPointForPerMonitorDPI = (void*)GetProcAddress(hdll, "PhysicalToLogicalPointForPerMonitorDPI");
-    pGetAutoRotationState = (void*)GetProcAddress(hdll, "GetAutoRotationState");
+    init_function_pointers();
 
     hInstance = GetModuleHandleA( NULL );
     hdc = GetDC(0);
-- 
2.30.2

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=96355

Your paranoid android.


=== w8 (32 bit report) ===

user32:
sysparams.c:2494: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out
sysparams.c:2505: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1

=== w8adm (32 bit report) ===

user32:
sysparams.c:2494: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out
sysparams.c:2505: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1

=== w864 (32 bit report) ===

user32:
sysparams.c:2494: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out
sysparams.c:2505: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1

=== w1064v1809 (32 bit report) ===

user32:
sysparams.c:2494: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out
sysparams.c:2505: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1

=== w1064 (32 bit report) ===

user32:
sysparams.c:2494: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out
sysparams.c:2505: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1

=== w1064_tsign (32 bit report) ===

user32:
sysparams.c:2494: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out
sysparams.c:2505: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1

=== w10pro64 (32 bit report) ===

user32:
sysparams.c:2494: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out
sysparams.c:2505: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1