[PATCH] xinput1_3/tests: Cope with XInputGetStateEx not being present by name

Bruno Jesus 00cpxxx at gmail.com
Thu Sep 1 14:26:12 CDT 2016


Signed-off-by: Bruno Jesus <00cpxxx at gmail.com>
---
 dlls/xinput1_3/tests/xinput.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c
index 5261425..fadacae 100644
--- a/dlls/xinput1_3/tests/xinput.c
+++ b/dlls/xinput1_3/tests/xinput.c
@@ -238,10 +238,10 @@ START_TEST(xinput)
     pXInputGetDSoundAudioDeviceGuids = (void*)GetProcAddress(hXinput, "XInputGetDSoundAudioDeviceGuids");
     pXInputGetBatteryInformation = (void*)GetProcAddress(hXinput, "XInputGetBatteryInformation");
 
-    if (pXInputGetStateEx_Ordinal)
-        ok (pXInputGetStateEx_Ordinal == pXInputGetStateEx, "XInputGetStateEx in the wrong ordinal\n");
-    else
-        ok (broken(1), "XInputGetStateEx not found in this dll version\n");
+    /* XInputGetStateEx may not be present by name, use ordinal in this case */
+    if (!pXInputGetStateEx)
+        pXInputGetStateEx = pXInputGetStateEx_Ordinal;
+    ok (pXInputGetStateEx != NULL, "XInputGetStateEx not found in this dll version\n");
 
     test_set_state();
     test_get_state();
-- 
2.9.3




More information about the wine-patches mailing list