Commit a85c7594 authored by Paul Vriens's avatar Paul Vriens Committed by Alexandre Julliard

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

parent ee69858e
...@@ -144,6 +144,11 @@ static void device_tests(void) ...@@ -144,6 +144,11 @@ static void device_tests(void)
struct enum_data data; struct enum_data data;
hr = DirectInputCreate(hInstance, DIRECTINPUT_VERSION, &pDI, NULL); 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)); ok(SUCCEEDED(hr), "DirectInputCreate() failed: %s\n", DXGetErrorString8(hr));
if (FAILED(hr)) return; if (FAILED(hr)) return;
......
...@@ -143,6 +143,11 @@ static void keyboard_tests(DWORD version) ...@@ -143,6 +143,11 @@ static void keyboard_tests(DWORD version)
ULONG ref = 0; ULONG ref = 0;
hr = DirectInputCreate(hInstance, version, &pDI, NULL); 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)); ok(SUCCEEDED(hr), "DirectInputCreate() failed: %s\n", DXGetErrorString8(hr));
if (FAILED(hr)) return; if (FAILED(hr)) return;
......
...@@ -118,6 +118,11 @@ static void mouse_tests(void) ...@@ -118,6 +118,11 @@ static void mouse_tests(void)
ULONG ref = 0; ULONG ref = 0;
hr = DirectInputCreate(hInstance, DIRECTINPUT_VERSION, &pDI, NULL); 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)); ok(SUCCEEDED(hr), "DirectInputCreate() failed: %s\n", DXGetErrorString8(hr));
if (FAILED(hr)) return; if (FAILED(hr)) return;
......
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