Paul Vriens : dinput/tests: Don't treat old dinput versions as an error.

Alexandre Julliard julliard at winehq.org
Mon Mar 10 07:16:46 CDT 2008


Module: wine
Branch: master
Commit: a85c7594dc30658bc1e99380c0118815ae10d231
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a85c7594dc30658bc1e99380c0118815ae10d231

Author: Paul Vriens <paul.vriens.wine at gmail.com>
Date:   Fri Mar  7 20:26:57 2008 +0100

dinput/tests: Don't treat old dinput versions as an error.

---

 dlls/dinput/tests/device.c   |    5 +++++
 dlls/dinput/tests/keyboard.c |    5 +++++
 dlls/dinput/tests/mouse.c    |    5 +++++
 3 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c
index 2a9c24a..0088d5b 100644
--- a/dlls/dinput/tests/device.c
+++ b/dlls/dinput/tests/device.c
@@ -144,6 +144,11 @@ static void device_tests(void)
     struct enum_data data;
 
     hr = DirectInputCreate(hInstance, DIRECTINPUT_VERSION, &pDI, NULL);
+    if (hr == DIERR_OLDDIRECTINPUTVERSION)
+    {
+        skip("Tests require a newer dinput version\n");
+        return;
+    }
     ok(SUCCEEDED(hr), "DirectInputCreate() failed: %s\n", DXGetErrorString8(hr));
     if (FAILED(hr)) return;
 
diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c
index 4503f2f..76ecec8 100644
--- a/dlls/dinput/tests/keyboard.c
+++ b/dlls/dinput/tests/keyboard.c
@@ -143,6 +143,11 @@ static void keyboard_tests(DWORD version)
     ULONG ref = 0;
 
     hr = DirectInputCreate(hInstance, version, &pDI, NULL);
+    if (hr == DIERR_OLDDIRECTINPUTVERSION)
+    {
+        skip("Tests require a newer dinput version\n");
+        return;
+    }
     ok(SUCCEEDED(hr), "DirectInputCreate() failed: %s\n", DXGetErrorString8(hr));
     if (FAILED(hr)) return;
 
diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c
index 3ea2147..8860457 100644
--- a/dlls/dinput/tests/mouse.c
+++ b/dlls/dinput/tests/mouse.c
@@ -118,6 +118,11 @@ static void mouse_tests(void)
     ULONG ref = 0;
 
     hr = DirectInputCreate(hInstance, DIRECTINPUT_VERSION, &pDI, NULL);
+    if (hr == DIERR_OLDDIRECTINPUTVERSION)
+    {
+        skip("Tests require a newer dinput version\n");
+        return;
+    }
     ok(SUCCEEDED(hr), "DirectInputCreate() failed: %s\n", DXGetErrorString8(hr));
     if (FAILED(hr)) return;
 




More information about the wine-cvs mailing list