From a85c7594dc30658bc1e99380c0118815ae10d231 Mon Sep 17 00:00:00 2001 From: Paul Vriens Date: Fri, 7 Mar 2008 20:26:57 +0100 Subject: [PATCH] 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(+) diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index 2a9c24abb74..0088d5b34f6 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 4503f2ffe3e..76ecec8c56c 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 3ea21475e06..8860457b836 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;