[PATCH 1/6] dinput/tests: Merge dinput8.c tests with dinput.c.

Rémi Bernon rbernon at codeweavers.com
Mon Feb 7 02:23:24 CST 2022


Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
---
 dlls/dinput/tests/Makefile.in |    1 -
 dlls/dinput/tests/dinput.c    | 1110 ++++++++++++++++++++++-----------
 dlls/dinput/tests/dinput8.c   |  728 ---------------------
 3 files changed, 730 insertions(+), 1109 deletions(-)
 delete mode 100644 dlls/dinput/tests/dinput8.c

diff --git a/dlls/dinput/tests/Makefile.in b/dlls/dinput/tests/Makefile.in
index 00295fed60f..b34afde882a 100644
--- a/dlls/dinput/tests/Makefile.in
+++ b/dlls/dinput/tests/Makefile.in
@@ -9,7 +9,6 @@ SOURCES = \
 	device.c \
 	device8.c \
 	dinput.c \
-	dinput8.c \
 	driver_hid.c \
 	driver_hid.spec \
 	force_feedback.c \
diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c
index 10da888fdd4..795a9ed39c6 100644
--- a/dlls/dinput/tests/dinput.c
+++ b/dlls/dinput/tests/dinput.c
@@ -30,37 +30,53 @@
 
 HINSTANCE hInstance;
 
-enum directinput_versions
-{
-    DIRECTINPUT_VERSION_300 = 0x0300,
-    DIRECTINPUT_VERSION_500 = 0x0500,
-    DIRECTINPUT_VERSION_50A = 0x050A,
-    DIRECTINPUT_VERSION_5B2 = 0x05B2,
-    DIRECTINPUT_VERSION_602 = 0x0602,
-    DIRECTINPUT_VERSION_61A = 0x061A,
-    DIRECTINPUT_VERSION_700 = 0x0700,
-};
-
-static const DWORD directinput_version_list[] =
-{
-    DIRECTINPUT_VERSION_300,
-    DIRECTINPUT_VERSION_500,
-    DIRECTINPUT_VERSION_50A,
-    DIRECTINPUT_VERSION_5B2,
-    DIRECTINPUT_VERSION_602,
-    DIRECTINPUT_VERSION_61A,
-    DIRECTINPUT_VERSION_700,
-};
-
 static HRESULT (WINAPI *pDirectInputCreateEx)(HINSTANCE, DWORD, REFIID, LPVOID *, LPUNKNOWN);
 
+static const DWORD dinput_versions[] =
+{
+    0x0300,
+    0x0500,
+    0x050A,
+    0x05B2,
+    0x0602,
+    0x061A,
+    0x0700,
+    0x0800,
+};
+
+static REFIID dinput7_interfaces[] =
+{
+    &IID_IDirectInputA,
+    &IID_IDirectInputW,
+    &IID_IDirectInput2A,
+    &IID_IDirectInput2W,
+    &IID_IDirectInput7A,
+    &IID_IDirectInput7W,
+};
+
+static REFIID dinput8_interfaces[] =
+{
+    &IID_IDirectInput8A,
+    &IID_IDirectInput8W,
+    &IID_IDirectInputJoyConfig8,
+};
+
+static HRESULT direct_input_create( DWORD version, IDirectInputA **out )
+{
+    HRESULT hr;
+    if (version < 0x800) hr = DirectInputCreateA( hInstance, version, out, NULL );
+    else hr = DirectInput8Create( hInstance, version, &IID_IDirectInput8A, (void **)out, NULL );
+    if (FAILED(hr)) win_skip( "Failed to instantiate a IDirectInput instance, hr %#x\n", hr );
+    return hr;
+}
+
 static BOOL CALLBACK dummy_callback(const DIDEVICEINSTANCEA *instance, void *context)
 {
     ok(0, "Callback was invoked with parameters (%p, %p)\n", instance, context);
     return DIENUM_STOP;
 }
 
-static void test_preinitialization(void)
+static void test_CoCreateInstance( DWORD version )
 {
     static const struct
     {
@@ -83,7 +99,6 @@ static void test_preinitialization(void)
         LPDIENUMDEVICESCALLBACKA lpCallback;
         DWORD dwFlags;
         HRESULT expected_hr;
-        int todo;
     } enum_devices_tests[] =
     {
         {0, NULL, 0, DIERR_INVALIDPARAM},
@@ -96,122 +111,159 @@ static void test_preinitialization(void)
         {0xdeadbeef, dummy_callback, ~0u, DIERR_INVALIDPARAM},
     };
 
-    IDirectInputA *pDI;
+    IDirectInputDeviceA *device;
+    IDirectInputA *dinput;
     HRESULT hr;
+    LONG ref;
     int i;
-    IDirectInputDeviceA *pDID;
 
-    hr = CoCreateInstance(&CLSID_DirectInput, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectInputA, (void **)&pDI);
+    if (version < 0x800) hr = CoCreateInstance( &CLSID_DirectInput, NULL, CLSCTX_INPROC_SERVER,
+                                                &IID_IDirectInputA, (void **)&dinput );
+    else hr = CoCreateInstance( &CLSID_DirectInput8, NULL, CLSCTX_INPROC_SERVER,
+                                &IID_IDirectInput8A, (void **)&dinput );
     if (FAILED(hr))
     {
-        skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr);
+        win_skip( "Failed to instantiate a IDirectInput instance, hr %#x\n", hr );
         return;
     }
 
     for (i = 0; i < ARRAY_SIZE(create_device_tests); i++)
     {
-        if (create_device_tests[i].pdev) pDID = (void *)0xdeadbeef;
-        hr = IDirectInput_CreateDevice(pDI, create_device_tests[i].rguid,
-                                            create_device_tests[i].pdev ? &pDID : NULL,
-                                            NULL);
-        ok(hr == create_device_tests[i].expected_hr, "[%d] IDirectInput_CreateDevice returned 0x%08x\n", i, hr);
-        if (create_device_tests[i].pdev)
-            ok(pDID == NULL, "[%d] Output interface pointer is %p\n", i, pDID);
+        winetest_push_context( "%u", i );
+        if (create_device_tests[i].pdev) device = (void *)0xdeadbeef;
+        hr = IDirectInput_CreateDevice( dinput, create_device_tests[i].rguid,
+                                        create_device_tests[i].pdev ? &device : NULL, NULL );
+        ok( hr == create_device_tests[i].expected_hr, "CreateDevice returned %#x\n", hr );
+        if (create_device_tests[i].pdev) ok( device == NULL, "got device %p\n", device );
+        winetest_pop_context();
     }
 
     for (i = 0; i < ARRAY_SIZE(enum_devices_tests); i++)
     {
-        hr = IDirectInput_EnumDevices(pDI, enum_devices_tests[i].dwDevType,
-                                           enum_devices_tests[i].lpCallback,
-                                           NULL,
-                                           enum_devices_tests[i].dwFlags);
-        todo_wine_if(enum_devices_tests[i].todo)
-            ok(hr == enum_devices_tests[i].expected_hr, "[%d] IDirectInput_EnumDevice returned 0x%08x\n", i, hr);
+        winetest_push_context( "%u", i );
+        hr = IDirectInput_EnumDevices( dinput, enum_devices_tests[i].dwDevType,
+                                       enum_devices_tests[i].lpCallback, NULL, enum_devices_tests[i].dwFlags );
+        ok( hr == enum_devices_tests[i].expected_hr, "EnumDevice returned %#x\n", hr );
+        winetest_pop_context();
     }
 
-    hr = IDirectInput_GetDeviceStatus(pDI, NULL);
-    ok(hr == E_POINTER, "IDirectInput_GetDeviceStatus returned 0x%08x\n", hr);
+    hr = IDirectInput_GetDeviceStatus( dinput, NULL );
+    ok( hr == E_POINTER, "GetDeviceStatus returned %#x\n", hr );
 
-    hr = IDirectInput_GetDeviceStatus(pDI, &GUID_Unknown);
-    ok(hr == DIERR_NOTINITIALIZED, "IDirectInput_GetDeviceStatus returned 0x%08x\n", hr);
+    hr = IDirectInput_GetDeviceStatus( dinput, &GUID_Unknown );
+    ok( hr == DIERR_NOTINITIALIZED, "GetDeviceStatus returned %#x\n", hr );
 
-    hr = IDirectInput_GetDeviceStatus(pDI, &GUID_SysMouse);
-    ok(hr == DIERR_NOTINITIALIZED, "IDirectInput_GetDeviceStatus returned 0x%08x\n", hr);
+    hr = IDirectInput_GetDeviceStatus( dinput, &GUID_SysMouse );
+    ok( hr == DIERR_NOTINITIALIZED, "GetDeviceStatus returned %#x\n", hr );
 
-    hr = IDirectInput_RunControlPanel(pDI, NULL, 0);
-    ok(hr == DIERR_NOTINITIALIZED, "IDirectInput_RunControlPanel returned 0x%08x\n", hr);
+    hr = IDirectInput_RunControlPanel( dinput, NULL, 0 );
+    ok( hr == DIERR_NOTINITIALIZED, "RunControlPanel returned %#x\n", hr );
 
-    hr = IDirectInput_RunControlPanel(pDI, NULL, ~0u);
-    ok(hr == DIERR_INVALIDPARAM, "IDirectInput_RunControlPanel returned 0x%08x\n", hr);
+    hr = IDirectInput_RunControlPanel( dinput, NULL, ~0u );
+    ok( hr == DIERR_INVALIDPARAM, "RunControlPanel returned %#x\n", hr );
 
-    hr = IDirectInput_RunControlPanel(pDI, (HWND)0xdeadbeef, 0);
-    ok(hr == E_HANDLE, "IDirectInput_RunControlPanel returned 0x%08x\n", hr);
+    hr = IDirectInput_RunControlPanel( dinput, (HWND)0xdeadbeef, 0 );
+    ok( hr == E_HANDLE, "RunControlPanel returned %#x\n", hr );
 
-    hr = IDirectInput_RunControlPanel(pDI, (HWND)0xdeadbeef, ~0u);
-    ok(hr == E_HANDLE, "IDirectInput_RunControlPanel returned 0x%08x\n", hr);
+    hr = IDirectInput_RunControlPanel( dinput, (HWND)0xdeadbeef, ~0u );
+    ok( hr == E_HANDLE, "RunControlPanel returned %#x\n", hr );
 
-    IDirectInput_Release(pDI);
+    ref = IDirectInput_Release( dinput );
+    ok( ref == 0, "Release returned %d\n", ref );
 }
 
-static void test_DirectInputCreateEx(void)
+static void test_DirectInputCreate( DWORD version )
 {
-    static const struct
+    IUnknown *unknown;
+    struct
     {
-        BOOL hinst;
-        DWORD dwVersion;
-        REFIID riid;
-        BOOL ppdi;
+        HMODULE instance;
+        DWORD version;
+        REFIID iid;
+        IUnknown **out;
+        IUnknown *expect_out;
         HRESULT expected_hr;
-        IUnknown *expected_ppdi;
-    } invalid_param_list[] =
+    } create_tests[] =
     {
-        {FALSE, 0,                       &IID_IUnknown,  FALSE, DIERR_NOINTERFACE},
-        {FALSE, 0,                       &IID_IUnknown,  TRUE,  DIERR_NOINTERFACE, (void *)0xdeadbeef},
-        {FALSE, 0,                       &IID_IDirectInputA, FALSE, E_POINTER},
-        {FALSE, 0,                       &IID_IDirectInputA, TRUE,  DIERR_INVALIDPARAM, NULL},
-        {FALSE, DIRECTINPUT_VERSION,     &IID_IUnknown,  FALSE, DIERR_NOINTERFACE},
-        {FALSE, DIRECTINPUT_VERSION,     &IID_IUnknown,  TRUE,  DIERR_NOINTERFACE, (void *)0xdeadbeef},
-        {FALSE, DIRECTINPUT_VERSION,     &IID_IDirectInputA, FALSE, E_POINTER},
-        {FALSE, DIRECTINPUT_VERSION,     &IID_IDirectInputA, TRUE,  DIERR_INVALIDPARAM, NULL},
-        {FALSE, DIRECTINPUT_VERSION - 1, &IID_IUnknown,  FALSE, DIERR_NOINTERFACE},
-        {FALSE, DIRECTINPUT_VERSION - 1, &IID_IUnknown,  TRUE,  DIERR_NOINTERFACE, (void *)0xdeadbeef},
-        {FALSE, DIRECTINPUT_VERSION - 1, &IID_IDirectInputA, FALSE, E_POINTER},
-        {FALSE, DIRECTINPUT_VERSION - 1, &IID_IDirectInputA, TRUE,  DIERR_INVALIDPARAM, NULL},
-        {FALSE, DIRECTINPUT_VERSION + 1, &IID_IUnknown,  FALSE, DIERR_NOINTERFACE},
-        {FALSE, DIRECTINPUT_VERSION + 1, &IID_IUnknown,  TRUE,  DIERR_NOINTERFACE, (void *)0xdeadbeef},
-        {FALSE, DIRECTINPUT_VERSION + 1, &IID_IDirectInputA, FALSE, E_POINTER},
-        {FALSE, DIRECTINPUT_VERSION + 1, &IID_IDirectInputA, TRUE,  DIERR_INVALIDPARAM, NULL},
-        {TRUE,  0,                       &IID_IUnknown,  FALSE, DIERR_NOINTERFACE},
-        {TRUE,  0,                       &IID_IUnknown,  TRUE,  DIERR_NOINTERFACE, (void *)0xdeadbeef},
-        {TRUE,  0,                       &IID_IDirectInputA, FALSE, E_POINTER},
-        {TRUE,  0,                       &IID_IDirectInputA, TRUE,  DIERR_NOTINITIALIZED, NULL},
-        {TRUE,  DIRECTINPUT_VERSION,     &IID_IUnknown,  FALSE, DIERR_NOINTERFACE},
-        {TRUE,  DIRECTINPUT_VERSION,     &IID_IUnknown,  TRUE,  DIERR_NOINTERFACE, (void *)0xdeadbeef},
-        {TRUE,  DIRECTINPUT_VERSION,     &IID_IDirectInputA, FALSE, E_POINTER},
-        {TRUE,  DIRECTINPUT_VERSION - 1, &IID_IUnknown,  FALSE, DIERR_NOINTERFACE},
-        {TRUE,  DIRECTINPUT_VERSION - 1, &IID_IUnknown,  TRUE,  DIERR_NOINTERFACE, (void *)0xdeadbeef},
-        {TRUE,  DIRECTINPUT_VERSION - 1, &IID_IDirectInputA, FALSE, E_POINTER},
-        {TRUE,  DIRECTINPUT_VERSION - 1, &IID_IDirectInputA, TRUE,  DIERR_BETADIRECTINPUTVERSION, NULL},
-        {TRUE,  DIRECTINPUT_VERSION + 1, &IID_IUnknown,  FALSE, DIERR_NOINTERFACE},
-        {TRUE,  DIRECTINPUT_VERSION + 1, &IID_IUnknown,  TRUE,  DIERR_NOINTERFACE, (void *)0xdeadbeef},
-        {TRUE,  DIRECTINPUT_VERSION + 1, &IID_IDirectInputA, FALSE, E_POINTER},
-        {TRUE,  DIRECTINPUT_VERSION + 1, &IID_IDirectInputA, TRUE,  DIERR_OLDDIRECTINPUTVERSION, NULL},
+        {NULL,       0,           NULL, NULL,     (void *)0xdeadbeef, E_POINTER},
+        {NULL,       0,           NULL, &unknown, NULL,               DIERR_INVALIDPARAM},
+        {NULL,       version,     NULL, NULL,     (void *)0xdeadbeef, E_POINTER},
+        {NULL,       version,     NULL, &unknown, NULL,               version == 0x300 ? DI_OK : DIERR_INVALIDPARAM},
+        {NULL,       version - 1, NULL, NULL,     (void *)0xdeadbeef, E_POINTER},
+        {NULL,       version - 1, NULL, &unknown, NULL,               DIERR_INVALIDPARAM},
+        {NULL,       version + 1, NULL, NULL,     (void *)0xdeadbeef, E_POINTER},
+        {NULL,       version + 1, NULL, &unknown, NULL,               DIERR_INVALIDPARAM},
+        {hInstance,  0,           NULL, NULL,     (void *)0xdeadbeef, E_POINTER},
+        {hInstance,  0,           NULL, &unknown, NULL,               DIERR_NOTINITIALIZED},
+        {hInstance,  version,     NULL, NULL,     (void *)0xdeadbeef, E_POINTER},
+        {hInstance,  version - 1, NULL, NULL,     (void *)0xdeadbeef, E_POINTER},
+        {hInstance,  version - 1, NULL, &unknown, NULL,               version <= 0x700 ? DIERR_BETADIRECTINPUTVERSION : DIERR_OLDDIRECTINPUTVERSION},
+        {hInstance,  version + 1, NULL, NULL,     (void *)0xdeadbeef, E_POINTER},
+        {hInstance,  version + 1, NULL, &unknown, NULL,               version < 0x700 ? DIERR_BETADIRECTINPUTVERSION : DIERR_OLDDIRECTINPUTVERSION},
     };
-
-    static REFIID no_interface_list[] = {&IID_IUnknown, &IID_IDirectInput8A,
-                                         &IID_IDirectInput8W, &IID_IDirectInputDeviceA,
-                                         &IID_IDirectInputDeviceW, &IID_IDirectInputDevice2A,
-                                         &IID_IDirectInputDevice2W, &IID_IDirectInputDevice7A,
-                                         &IID_IDirectInputDevice7W, &IID_IDirectInputDevice8A,
-                                         &IID_IDirectInputDevice8W, &IID_IDirectInputEffect};
-
-    static REFIID iid_list[] = {&IID_IDirectInputA, &IID_IDirectInputW,
-                                &IID_IDirectInput2A, &IID_IDirectInput2W,
-                                &IID_IDirectInput7A, &IID_IDirectInput7W};
-
-    int i, j;
-    IUnknown *pUnk;
     HRESULT hr;
+    int i;
+
+    for (i = 0; i < ARRAY_SIZE(create_tests); i++)
+    {
+        winetest_push_context( "%u", i );
+        unknown = (void *)0xdeadbeef;
+        hr = DirectInputCreateW( create_tests[i].instance, create_tests[i].version, (IDirectInputW **)create_tests[i].out, NULL );
+        todo_wine_if(i == 3 && version == 0x300)
+        ok( hr == create_tests[i].expected_hr, "DirectInputCreateEx returned %#x\n", hr );
+        if (SUCCEEDED(hr)) IUnknown_Release( unknown );
+        else ok( unknown == create_tests[i].expect_out, "got IUnknown %p\n", unknown );
+        winetest_pop_context();
+    }
+}
+
+static void test_DirectInputCreateEx( DWORD version )
+{
+    IUnknown *unknown;
+    struct
+    {
+        HMODULE instance;
+        DWORD version;
+        REFIID iid;
+        IUnknown **out;
+        IUnknown *expect_out;
+        HRESULT expected_hr;
+    } create_tests[] =
+    {
+        {NULL,       0,           &IID_IUnknown,      NULL,     (void *)0xdeadbeef, DIERR_NOINTERFACE},
+        {NULL,       0,           &IID_IUnknown,      &unknown, (void *)0xdeadbeef, DIERR_NOINTERFACE},
+        {NULL,       0,           &IID_IDirectInputA, NULL,     (void *)0xdeadbeef, E_POINTER},
+        {NULL,       0,           &IID_IDirectInputA, &unknown, NULL,               DIERR_INVALIDPARAM},
+        {NULL,       version,     &IID_IUnknown,      NULL,     (void *)0xdeadbeef, DIERR_NOINTERFACE},
+        {NULL,       version,     &IID_IUnknown,      &unknown, (void *)0xdeadbeef, DIERR_NOINTERFACE},
+        {NULL,       version,     &IID_IDirectInputA, NULL,     (void *)0xdeadbeef, E_POINTER},
+        {NULL,       version,     &IID_IDirectInputA, &unknown, NULL,               version == 0x300 ? DI_OK : DIERR_INVALIDPARAM},
+        {NULL,       version - 1, &IID_IUnknown,      NULL,     (void *)0xdeadbeef, DIERR_NOINTERFACE},
+        {NULL,       version - 1, &IID_IUnknown,      &unknown, (void *)0xdeadbeef, DIERR_NOINTERFACE},
+        {NULL,       version - 1, &IID_IDirectInputA, NULL,     (void *)0xdeadbeef, E_POINTER},
+        {NULL,       version - 1, &IID_IDirectInputA, &unknown, NULL,               DIERR_INVALIDPARAM},
+        {NULL,       version + 1, &IID_IUnknown,      NULL,     (void *)0xdeadbeef, DIERR_NOINTERFACE},
+        {NULL,       version + 1, &IID_IUnknown,      &unknown, (void *)0xdeadbeef, DIERR_NOINTERFACE},
+        {NULL,       version + 1, &IID_IDirectInputA, NULL,     (void *)0xdeadbeef, E_POINTER},
+        {NULL,       version + 1, &IID_IDirectInputA, &unknown, NULL,               DIERR_INVALIDPARAM},
+        {hInstance,  0,           &IID_IUnknown,      NULL,     (void *)0xdeadbeef, DIERR_NOINTERFACE},
+        {hInstance,  0,           &IID_IUnknown,      &unknown, (void *)0xdeadbeef, DIERR_NOINTERFACE},
+        {hInstance,  0,           &IID_IDirectInputA, NULL,     (void *)0xdeadbeef, E_POINTER},
+        {hInstance,  0,           &IID_IDirectInputA, &unknown, NULL,               DIERR_NOTINITIALIZED},
+        {hInstance,  version,     &IID_IUnknown,      NULL,     (void *)0xdeadbeef, DIERR_NOINTERFACE},
+        {hInstance,  version,     &IID_IUnknown,      &unknown, (void *)0xdeadbeef, DIERR_NOINTERFACE},
+        {hInstance,  version,     &IID_IDirectInputA, NULL,     (void *)0xdeadbeef, E_POINTER},
+        {hInstance,  version - 1, &IID_IUnknown,      NULL,     (void *)0xdeadbeef, DIERR_NOINTERFACE},
+        {hInstance,  version - 1, &IID_IUnknown,      &unknown, (void *)0xdeadbeef, DIERR_NOINTERFACE},
+        {hInstance,  version - 1, &IID_IDirectInputA, NULL,     (void *)0xdeadbeef, E_POINTER},
+        {hInstance,  version - 1, &IID_IDirectInputA, &unknown, NULL,               version <= 0x700 ? DIERR_BETADIRECTINPUTVERSION : DIERR_OLDDIRECTINPUTVERSION},
+        {hInstance,  version + 1, &IID_IUnknown,      NULL,     (void *)0xdeadbeef, DIERR_NOINTERFACE},
+        {hInstance,  version + 1, &IID_IUnknown,      &unknown, (void *)0xdeadbeef, DIERR_NOINTERFACE},
+        {hInstance,  version + 1, &IID_IDirectInputA, NULL,     (void *)0xdeadbeef, E_POINTER},
+        {hInstance,  version + 1, &IID_IDirectInputA, &unknown, NULL,               version < 0x700 ? DIERR_BETADIRECTINPUTVERSION : DIERR_OLDDIRECTINPUTVERSION},
+    };
+    HRESULT hr;
+    int i;
 
     if (!pDirectInputCreateEx)
     {
@@ -219,391 +271,485 @@ static void test_DirectInputCreateEx(void)
         return;
     }
 
-    for (i = 0; i < ARRAY_SIZE(invalid_param_list); i++)
+    for (i = 0; i < ARRAY_SIZE(create_tests); i++)
     {
-        if (invalid_param_list[i].ppdi) pUnk = (void *)0xdeadbeef;
-        hr = pDirectInputCreateEx(invalid_param_list[i].hinst ? hInstance : NULL,
-                                  invalid_param_list[i].dwVersion,
-                                  invalid_param_list[i].riid,
-                                  invalid_param_list[i].ppdi ? (void **)&pUnk : NULL,
-                                  NULL);
-        ok(hr == invalid_param_list[i].expected_hr, "[%d] DirectInputCreateEx returned 0x%08x\n", i, hr);
-        if (invalid_param_list[i].ppdi)
-            ok(pUnk == invalid_param_list[i].expected_ppdi, "[%d] Output interface pointer is %p\n", i, pUnk);
+        winetest_push_context( "%u", i );
+        unknown = (void *)0xdeadbeef;
+        hr = pDirectInputCreateEx( create_tests[i].instance, create_tests[i].version, create_tests[i].iid,
+                                   (void **)create_tests[i].out, NULL );
+        todo_wine_if( version == 0x300 && i == 7 )
+        ok( hr == create_tests[i].expected_hr, "DirectInputCreateEx returned %#x\n", hr );
+        if (SUCCEEDED(hr)) IUnknown_Release( unknown );
+        else ok( unknown == create_tests[i].expect_out, "got IUnknown %p\n", unknown );
+        winetest_pop_context();
     }
 
-    for (i = 0; i < ARRAY_SIZE(no_interface_list); i++)
+    for (i = 0; i < ARRAY_SIZE(dinput8_interfaces); i++)
     {
-        pUnk = (void *)0xdeadbeef;
-        hr = pDirectInputCreateEx(hInstance, DIRECTINPUT_VERSION, no_interface_list[i], (void **)&pUnk, NULL);
-        ok(hr == DIERR_NOINTERFACE, "[%d] DirectInputCreateEx returned 0x%08x\n", i, hr);
-        ok(pUnk == (void *)0xdeadbeef, "[%d] Output interface pointer is %p\n", i, pUnk);
+        winetest_push_context( "%u", i );
+        unknown = (void *)0xdeadbeef;
+        hr = pDirectInputCreateEx( hInstance, version, dinput8_interfaces[i], (void **)&unknown, NULL );
+        ok( hr == DIERR_NOINTERFACE, "DirectInputCreateEx returned %#x\n", hr );
+        ok( unknown == (void *)0xdeadbeef, "got IUnknown %p\n", unknown );
+        winetest_pop_context();
     }
 
-    for (i = 0; i < ARRAY_SIZE(iid_list); i++)
+    for (i = 0; i < ARRAY_SIZE(dinput7_interfaces); i++)
     {
-        pUnk = NULL;
-        hr = pDirectInputCreateEx(hInstance, DIRECTINPUT_VERSION, iid_list[i], (void **)&pUnk, NULL);
-        ok(hr == DI_OK, "[%d] DirectInputCreateEx returned 0x%08x\n", i, hr);
-        ok(pUnk != NULL, "[%d] Output interface pointer is NULL\n", i);
-        if (pUnk)
-            IUnknown_Release(pUnk);
-    }
-
-    /* Examine combinations of requested interfaces and version numbers. */
-    for (i = 0; i < ARRAY_SIZE(directinput_version_list); i++)
-    {
-        for (j = 0; j < ARRAY_SIZE(iid_list); j++)
-        {
-            pUnk = NULL;
-            hr = pDirectInputCreateEx(hInstance, directinput_version_list[i], iid_list[j], (void **)&pUnk, NULL);
-            ok(hr == DI_OK, "[%d/%d] DirectInputCreateEx returned 0x%08x\n", i, j, hr);
-            ok(pUnk != NULL, "[%d] Output interface pointer is NULL\n", i);
-            if (pUnk)
-                IUnknown_Release(pUnk);
-        }
+        winetest_push_context( "%u", i );
+        unknown = NULL;
+        hr = pDirectInputCreateEx( hInstance, version, dinput7_interfaces[i], (void **)&unknown, NULL );
+        if (version < 0x800) ok( hr == DI_OK, "DirectInputCreateEx returned %#x\n", hr );
+        else ok( hr == DIERR_OLDDIRECTINPUTVERSION, "DirectInputCreateEx returned %#x\n", hr );
+        if (version < 0x800) ok( unknown != NULL, "got IUnknown NULL\n" );
+        else ok( unknown == NULL, "got IUnknown %p\n", unknown );
+        if (unknown) IUnknown_Release( unknown );
+        winetest_pop_context();
     }
 }
 
-static void test_QueryInterface(void)
+static void test_DirectInput8Create( DWORD version )
 {
-    static REFIID iid_list[] = {&IID_IUnknown, &IID_IDirectInputA, &IID_IDirectInputW,
-                                &IID_IDirectInput2A, &IID_IDirectInput2W,
-                                &IID_IDirectInput7A, &IID_IDirectInput7W};
-
-    static REFIID no_interface_list[] =
+    IUnknown *unknown;
+    struct
     {
-        &IID_IDirectInput8A,
-        &IID_IDirectInput8W,
-        &IID_IDirectInputDeviceA,
-        &IID_IDirectInputDeviceW,
-        &IID_IDirectInputDevice2A,
-        &IID_IDirectInputDevice2W,
-        &IID_IDirectInputDevice7A,
-        &IID_IDirectInputDevice7W,
-        &IID_IDirectInputDevice8A,
-        &IID_IDirectInputDevice8W,
-        &IID_IDirectInputEffect,
+        HMODULE instance;
+        DWORD version;
+        REFIID iid;
+        IUnknown **out;
+        IUnknown *expect_out;
+        HRESULT expected_hr;
+    } create_tests[] =
+    {
+        {NULL,       0,           &IID_IDirectInputA,  NULL,     (void *)0xdeadbeef, E_POINTER},
+        {NULL,       0,           &IID_IDirectInputA,  &unknown, NULL,               DIERR_NOINTERFACE},
+        {NULL,       0,           &IID_IDirectInput8A, NULL,     (void *)0xdeadbeef, E_POINTER},
+        {NULL,       0,           &IID_IDirectInput8A, &unknown, NULL,               DIERR_INVALIDPARAM},
+        {NULL,       version,     &IID_IDirectInputA,  NULL,     (void *)0xdeadbeef, E_POINTER},
+        {NULL,       version,     &IID_IDirectInputA,  &unknown, NULL,               DIERR_NOINTERFACE},
+        {NULL,       version,     &IID_IDirectInput8A, NULL,     (void *)0xdeadbeef, E_POINTER},
+        {NULL,       version,     &IID_IDirectInput8A, &unknown, NULL,               DIERR_INVALIDPARAM},
+        {NULL,       version - 1, &IID_IDirectInputA,  NULL,     (void *)0xdeadbeef, E_POINTER},
+        {NULL,       version - 1, &IID_IDirectInputA,  &unknown, NULL,               DIERR_NOINTERFACE},
+        {NULL,       version - 1, &IID_IDirectInput8A, NULL,     (void *)0xdeadbeef, E_POINTER},
+        {NULL,       version - 1, &IID_IDirectInput8A, &unknown, NULL,               DIERR_INVALIDPARAM},
+        {NULL,       version + 1, &IID_IDirectInputA,  NULL,     (void *)0xdeadbeef, E_POINTER},
+        {NULL,       version + 1, &IID_IDirectInputA,  &unknown, NULL,               DIERR_NOINTERFACE},
+        {NULL,       version + 1, &IID_IDirectInput8A, NULL,     (void *)0xdeadbeef, E_POINTER},
+        {NULL,       version + 1, &IID_IDirectInput8A, &unknown, NULL,               DIERR_INVALIDPARAM},
+        {hInstance,  0,           &IID_IDirectInputA,  NULL,     (void *)0xdeadbeef, E_POINTER},
+        {hInstance,  0,           &IID_IDirectInputA,  &unknown, NULL,               DIERR_NOINTERFACE},
+        {hInstance,  0,           &IID_IDirectInput8A, NULL,     (void *)0xdeadbeef, E_POINTER},
+        {hInstance,  0,           &IID_IDirectInput8A, &unknown, NULL,               DIERR_NOTINITIALIZED},
+        {hInstance,  version,     &IID_IDirectInputA,  NULL,     (void *)0xdeadbeef, E_POINTER},
+        {hInstance,  version,     &IID_IDirectInputA,  &unknown, NULL,               DIERR_NOINTERFACE},
+        {hInstance,  version,     &IID_IDirectInput8A, NULL,     (void *)0xdeadbeef, E_POINTER},
+        {hInstance,  version - 1, &IID_IDirectInputA,  NULL,     (void *)0xdeadbeef, E_POINTER},
+        {hInstance,  version - 1, &IID_IDirectInputA,  &unknown, NULL,               DIERR_NOINTERFACE},
+        {hInstance,  version - 1, &IID_IDirectInput8A, NULL,     (void *)0xdeadbeef, E_POINTER},
+        {hInstance,  version - 1, &IID_IDirectInput8A, &unknown, NULL,               DIERR_BETADIRECTINPUTVERSION},
+        {hInstance,  version + 1, &IID_IDirectInputA,  NULL,     (void *)0xdeadbeef, E_POINTER},
+        {hInstance,  version + 1, &IID_IDirectInputA,  &unknown, NULL,               DIERR_NOINTERFACE},
+        {hInstance,  version + 1, &IID_IDirectInput8A, NULL,     (void *)0xdeadbeef, E_POINTER},
+        {hInstance,  version + 1, &IID_IDirectInput8A, &unknown, NULL,               version <= 0x700 ? DIERR_BETADIRECTINPUTVERSION : DIERR_OLDDIRECTINPUTVERSION},
     };
-
-    IDirectInputA *pDI;
     HRESULT hr;
-    IUnknown *pUnk, *iface, *tmp_iface;
     int i;
 
-    hr = DirectInputCreateA(hInstance, DIRECTINPUT_VERSION, &pDI, NULL);
-    if (FAILED(hr))
+    for (i = 0; i < ARRAY_SIZE(create_tests); i++)
     {
-        win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr);
-        return;
+        winetest_push_context( "%u", i );
+        unknown = (void *)0xdeadbeef;
+        hr = DirectInput8Create( create_tests[i].instance, create_tests[i].version, create_tests[i].iid,
+                                 (void **)create_tests[i].out, NULL );
+        ok( hr == create_tests[i].expected_hr, "DirectInput8Create returned %#x\n", hr );
+        if (SUCCEEDED(hr)) IUnknown_Release( unknown );
+        else ok( unknown == create_tests[i].expect_out, "got IUnknown %p\n", unknown );
+        winetest_pop_context();
     }
 
-    hr = IDirectInput_QueryInterface(pDI, NULL, NULL);
-    ok(hr == E_POINTER, "IDirectInput_QueryInterface returned 0x%08x\n", hr);
-
-    pUnk = (void *)0xdeadbeef;
-    hr = IDirectInput_QueryInterface(pDI, NULL, (void **)&pUnk);
-    ok(hr == E_POINTER, "IDirectInput_QueryInterface returned 0x%08x\n", hr);
-    ok(pUnk == (void *)0xdeadbeef, "Output interface pointer is %p\n", pUnk);
-
-    hr = IDirectInput_QueryInterface(pDI, &IID_IUnknown, NULL);
-    ok(hr == E_POINTER, "IDirectInput_QueryInterface returned 0x%08x\n", hr);
-
-    for (i = 0; i < ARRAY_SIZE(iid_list); i++)
+    for (i = 0; i < ARRAY_SIZE(dinput7_interfaces); i++)
     {
-        pUnk = NULL;
-        hr = IDirectInput_QueryInterface(pDI, iid_list[i], (void **)&pUnk);
-        ok(hr == S_OK, "[%d] IDirectInput_QueryInterface returned 0x%08x\n", i, hr);
-        ok(pUnk != NULL, "[%d] Output interface pointer is NULL\n", i);
-        if (pUnk) IUnknown_Release(pUnk);
+        winetest_push_context( "%u", i );
+        unknown = (void *)0xdeadbeef;
+        hr = DirectInput8Create( hInstance, version, dinput7_interfaces[i], (void **)&unknown, NULL );
+        ok( hr == DIERR_NOINTERFACE, "DirectInput8Create returned %#x\n", hr );
+        ok( unknown == NULL, "got IUnknown %p\n", unknown );
+        winetest_pop_context();
     }
 
-    for (i = 0; i < ARRAY_SIZE(no_interface_list); i++)
+    for (i = 0; i < ARRAY_SIZE(dinput8_interfaces); i++)
     {
-        pUnk = (void *)0xdeadbeef;
-        hr = IDirectInput_QueryInterface(pDI, no_interface_list[i], (void **)&pUnk);
-        ok(hr == E_NOINTERFACE, "[%d] IDirectInput_QueryInterface returned 0x%08x\n", i, hr);
-        ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk);
+        winetest_push_context( "%u", i );
+        unknown = NULL;
+        hr = DirectInput8Create( hInstance, version, dinput8_interfaces[i], (void **)&unknown, NULL );
+        if (i == 2) ok( hr == DIERR_NOINTERFACE, "DirectInput8Create returned %#x\n", hr );
+        else if (version == 0x800) ok( hr == DI_OK, "DirectInput8Create returned %#x\n", hr );
+        else ok( hr == DIERR_BETADIRECTINPUTVERSION, "DirectInput8Create returned %#x\n", hr );
+        if (i == 2) ok( unknown == NULL, "got IUnknown %p\n", unknown );
+        else if (version == 0x800) ok( unknown != NULL, "got NULL IUnknown\n" );
+        else ok( unknown == NULL, "got IUnknown %p\n", unknown );
+        if (unknown) IUnknown_Release( unknown );
+        winetest_pop_context();
     }
-
-    hr = IUnknown_QueryInterface( pDI, &IID_IDirectInputA, (void **)&iface );
-    ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInputA) failed: %08x\n", hr );
-    hr = IUnknown_QueryInterface( pDI, &IID_IDirectInput2A, (void **)&tmp_iface );
-    ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInput2A) failed: %08x\n", hr );
-    ok( tmp_iface == iface, "IID_IDirectInput2A iface differs from IID_IDirectInputA\n" );
-    IUnknown_Release( tmp_iface );
-    hr = IUnknown_QueryInterface( pDI, &IID_IDirectInput7A, (void **)&tmp_iface );
-    ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInput7A) failed: %08x\n", hr );
-    ok( tmp_iface == iface, "IID_IDirectInput7A iface differs from IID_IDirectInputA\n" );
-    IUnknown_Release( tmp_iface );
-    IUnknown_Release( iface );
-
-    hr = IUnknown_QueryInterface( pDI, &IID_IUnknown, (void **)&iface );
-    ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IUnknown) failed: %08x\n", hr );
-    hr = IUnknown_QueryInterface( pDI, &IID_IDirectInputW, (void **)&tmp_iface );
-    ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInputW) failed: %08x\n", hr );
-    ok( tmp_iface == iface, "IID_IDirectInputW iface differs from IID_IUnknown\n" );
-    IUnknown_Release( tmp_iface );
-    hr = IUnknown_QueryInterface( pDI, &IID_IDirectInput2W, (void **)&tmp_iface );
-    ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInput2W) failed: %08x\n", hr );
-    ok( tmp_iface == iface, "IID_IDirectInput2W iface differs from IID_IUnknown\n" );
-    IUnknown_Release( tmp_iface );
-    hr = IUnknown_QueryInterface( pDI, &IID_IDirectInput7W, (void **)&tmp_iface );
-    ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInput7W) failed: %08x\n", hr );
-    ok( tmp_iface == iface, "IID_IDirectInput7W iface differs from IID_IUnknown\n" );
-    IUnknown_Release( tmp_iface );
-    IUnknown_Release( iface );
-
-    IDirectInput_Release(pDI);
 }
 
-static void test_CreateDevice(void)
+static void test_QueryInterface( DWORD version )
 {
-    IDirectInputA *pDI;
+    IUnknown *iface, *tmp_iface;
+    IDirectInputA *dinput;
     HRESULT hr;
-    IDirectInputDeviceA *pDID;
+    ULONG ref;
+    int i;
 
-    hr = DirectInputCreateA(hInstance, DIRECTINPUT_VERSION, &pDI, NULL);
-    if (FAILED(hr))
+    if (FAILED(hr = direct_input_create( version, &dinput ))) return;
+
+    hr = IDirectInput_QueryInterface( dinput, NULL, NULL );
+    ok( hr == E_POINTER, "QueryInterface returned 0x%08x\n", hr );
+
+    iface = (void *)0xdeadbeef;
+    hr = IDirectInput_QueryInterface( dinput, NULL, (void **)&iface );
+    ok( hr == E_POINTER, "QueryInterface returned 0x%08x\n", hr );
+    ok( iface == (void *)0xdeadbeef, "Output interface pointer is %p\n", iface );
+
+    hr = IDirectInput_QueryInterface( dinput, &IID_IUnknown, NULL );
+    ok( hr == E_POINTER, "QueryInterface returned 0x%08x\n", hr );
+
+    hr = IDirectInput_QueryInterface( dinput, &IID_IUnknown, (void **)&iface );
+    ok( hr == S_OK, "QueryInterface returned 0x%08x\n", hr );
+    ok( iface != NULL, "got iface NULL\n" );
+    ref = IUnknown_Release( iface );
+    ok( ref == 1, "Release returned %u\n", ref );
+
+    for (i = 0; i < ARRAY_SIZE(dinput7_interfaces); i++)
     {
-        win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr);
-        return;
+        winetest_push_context("%u", i);
+        iface = (void *)0xdeadbeef;
+        hr = IDirectInput_QueryInterface( dinput, dinput7_interfaces[i], (void **)&iface );
+        if (version >= 0x800)
+        {
+            ok( hr == E_NOINTERFACE, "QueryInterface returned 0x%08x\n", hr );
+            ok( iface == NULL, "got iface %p\n", iface );
+        }
+        else
+        {
+            ok( hr == S_OK, "QueryInterface returned 0x%08x\n", hr );
+            ok( iface != NULL, "got iface NULL\n" );
+            ref = IUnknown_Release( iface );
+            ok( ref == 1, "Release returned %u\n", ref );
+        }
+        winetest_pop_context();
     }
 
-    hr = IDirectInput_CreateDevice(pDI, NULL, NULL, NULL);
-    ok(hr == E_POINTER, "IDirectInput_CreateDevice returned 0x%08x\n", hr);
+    for (i = 0; i < ARRAY_SIZE(dinput8_interfaces); i++)
+    {
+        winetest_push_context("%u", i);
+        iface = (void *)0xdeadbeef;
+        hr = IDirectInput_QueryInterface( dinput, dinput8_interfaces[i], (void **)&iface );
+        if (version < 0x800)
+        {
+            todo_wine_if(i == 2)
+            ok( hr == E_NOINTERFACE, "QueryInterface returned 0x%08x\n", hr );
+            todo_wine_if(i == 2)
+            ok( iface == NULL, "got iface %p\n", iface );
+        }
+        else
+        {
+            ok( hr == S_OK, "QueryInterface returned 0x%08x\n", hr );
+            ok( iface != NULL, "got iface NULL\n" );
+            ref = IUnknown_Release( iface );
+            ok( ref == 1, "Release returned %u\n", ref );
+        }
+        winetest_pop_context();
+    }
 
-    pDID = (void *)0xdeadbeef;
-    hr = IDirectInput_CreateDevice(pDI, NULL, &pDID, NULL);
-    ok(hr == E_POINTER, "IDirectInput_CreateDevice returned 0x%08x\n", hr);
-    ok(pDID == NULL, "Output interface pointer is %p\n", pDID);
+    if (version < 0x800)
+    {
+        hr = IUnknown_QueryInterface( dinput, &IID_IDirectInputA, (void **)&iface );
+        ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInputA) failed: %08x\n", hr );
+        hr = IUnknown_QueryInterface( dinput, &IID_IDirectInput2A, (void **)&tmp_iface );
+        ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInput2A) failed: %08x\n", hr );
+        ok( tmp_iface == iface, "IID_IDirectInput2A iface differs from IID_IDirectInputA\n" );
+        IUnknown_Release( tmp_iface );
+        hr = IUnknown_QueryInterface( dinput, &IID_IDirectInput7A, (void **)&tmp_iface );
+        ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInput7A) failed: %08x\n", hr );
+        ok( tmp_iface == iface, "IID_IDirectInput7A iface differs from IID_IDirectInputA\n" );
+        IUnknown_Release( tmp_iface );
+        IUnknown_Release( iface );
 
-    hr = IDirectInput_CreateDevice(pDI, &GUID_Unknown, NULL, NULL);
-    ok(hr == E_POINTER, "IDirectInput_CreateDevice returned 0x%08x\n", hr);
+        hr = IUnknown_QueryInterface( dinput, &IID_IUnknown, (void **)&iface );
+        ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IUnknown) failed: %08x\n", hr );
+        hr = IUnknown_QueryInterface( dinput, &IID_IDirectInputW, (void **)&tmp_iface );
+        ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInputW) failed: %08x\n", hr );
+        ok( tmp_iface == iface, "IID_IDirectInputW iface differs from IID_IUnknown\n" );
+        IUnknown_Release( tmp_iface );
+        hr = IUnknown_QueryInterface( dinput, &IID_IDirectInput2W, (void **)&tmp_iface );
+        ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInput2W) failed: %08x\n", hr );
+        ok( tmp_iface == iface, "IID_IDirectInput2W iface differs from IID_IUnknown\n" );
+        IUnknown_Release( tmp_iface );
+        hr = IUnknown_QueryInterface( dinput, &IID_IDirectInput7W, (void **)&tmp_iface );
+        ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInput7W) failed: %08x\n", hr );
+        ok( tmp_iface == iface, "IID_IDirectInput7W iface differs from IID_IUnknown\n" );
+        IUnknown_Release( tmp_iface );
+        IUnknown_Release( iface );
+    }
 
-    pDID = (void *)0xdeadbeef;
-    hr = IDirectInput_CreateDevice(pDI, &GUID_Unknown, &pDID, NULL);
-    ok(hr == DIERR_DEVICENOTREG, "IDirectInput_CreateDevice returned 0x%08x\n", hr);
-    ok(pDID == NULL, "Output interface pointer is %p\n", pDID);
+    ref = IDirectInput_Release( dinput );
+    todo_wine_if( version < 0x800 )
+    ok( ref == 0, "Release returned %u\n", ref );
+}
 
-    hr = IDirectInput_CreateDevice(pDI, &GUID_SysMouse, NULL, NULL);
-    ok(hr == E_POINTER, "IDirectInput_CreateDevice returned 0x%08x\n", hr);
+static void test_CreateDevice( DWORD version )
+{
+    IDirectInputDeviceA *device;
+    IDirectInputA *dinput;
+    HRESULT hr;
+    ULONG ref;
 
-    hr = IDirectInput_CreateDevice(pDI, &GUID_SysMouse, &pDID, NULL);
-    ok(hr == DI_OK, "IDirectInput_CreateDevice returned 0x%08x\n", hr);
+    if (FAILED(hr = direct_input_create( version, &dinput ))) return;
 
-    IDirectInputDevice_Release(pDID);
-    IDirectInput_Release(pDI);
+    hr = IDirectInput_CreateDevice( dinput, NULL, NULL, NULL );
+    ok( hr == E_POINTER, "CreateDevice returned 0x%08x\n", hr );
+
+    device = (void *)0xdeadbeef;
+    hr = IDirectInput_CreateDevice( dinput, NULL, &device, NULL );
+    ok( hr == E_POINTER, "CreateDevice returned 0x%08x\n", hr );
+    ok( device == NULL, "Output interface pointer is %p\n", device );
+
+    hr = IDirectInput_CreateDevice( dinput, &GUID_Unknown, NULL, NULL );
+    ok( hr == E_POINTER, "CreateDevice returned 0x%08x\n", hr );
+
+    device = (void *)0xdeadbeef;
+    hr = IDirectInput_CreateDevice( dinput, &GUID_Unknown, &device, NULL );
+    ok( hr == DIERR_DEVICENOTREG, "CreateDevice returned 0x%08x\n", hr );
+    ok( device == NULL, "Output interface pointer is %p\n", device );
+
+    hr = IDirectInput_CreateDevice( dinput, &GUID_SysMouse, NULL, NULL );
+    ok( hr == E_POINTER, "CreateDevice returned 0x%08x\n", hr );
+
+    hr = IDirectInput_CreateDevice( dinput, &GUID_SysMouse, &device, NULL );
+    ok( hr == DI_OK, "CreateDevice returned 0x%08x\n", hr );
+
+    ref = IDirectInputDevice_Release( device );
+    ok( ref == 0, "Release returned %u\n", ref );
+    ref = IDirectInput_Release( dinput );
+    ok( ref == 0, "Release returned %u\n", ref );
 }
 
 struct enum_devices_test
 {
     unsigned int device_count;
     BOOL return_value;
+    DWORD version;
 };
 
+DEFINE_GUID( pidvid_product_guid, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 'P', 'I', 'D', 'V', 'I', 'D' );
+
 static BOOL CALLBACK enum_devices_callback(const DIDEVICEINSTANCEA *instance, void *context)
 {
+    BYTE type = GET_DIDEVICE_TYPE( instance->dwDevType );
     struct enum_devices_test *enum_test = context;
 
-    if ((instance->dwDevType & 0xff) == DIDEVTYPE_KEYBOARD ||
-           (instance->dwDevType & 0xff) == DIDEVTYPE_MOUSE) {
-        const char *device = ((instance->dwDevType & 0xff) ==
-                                   DIDEVTYPE_KEYBOARD) ? "Keyboard" : "Mouse";
-        ok(IsEqualGUID(&instance->guidInstance, &instance->guidProduct),
-           "%s guidInstance (%s) does not match guidProduct (%s)\n",
-           device, wine_dbgstr_guid(&instance->guidInstance),
-           wine_dbgstr_guid(&instance->guidProduct));
+    if (winetest_debug > 1)
+    {
+        trace( "---- Device Information ----\n"
+               "Product Name  : %s\n"
+               "Instance Name : %s\n"
+               "devType       : 0x%08x\n"
+               "GUID Product  : %s\n"
+               "GUID Instance : %s\n"
+               "HID Page      : 0x%04x\n"
+               "HID Usage     : 0x%04x\n",
+               instance->tszProductName, instance->tszInstanceName, instance->dwDevType,
+               wine_dbgstr_guid( &instance->guidProduct ),
+               wine_dbgstr_guid( &instance->guidInstance ), instance->wUsagePage, instance->wUsage );
     }
 
-    if ((instance->dwDevType & 0xff) == DIDEVTYPE_KEYBOARD)
-        ok(IsEqualGUID(&instance->guidProduct, &GUID_SysKeyboard),
-           "Keyboard guidProduct (%s) does not match GUID_SysKeyboard (%s)\n",
-           wine_dbgstr_guid(&instance->guidProduct),
-           wine_dbgstr_guid(&GUID_SysMouse));
-    else if ((instance->dwDevType & 0xff) == DIDEVTYPE_MOUSE)
-        ok(IsEqualGUID(&instance->guidProduct, &GUID_SysMouse),
-           "Mouse guidProduct (%s) does not match GUID_SysMouse (%s)\n",
-           wine_dbgstr_guid(&instance->guidProduct),
-           wine_dbgstr_guid(&GUID_SysMouse));
-    else {
-        /* Non-keyboard/mouse devices use the "PIDVID" guidProduct */
-        static const GUID pidvid_product_guid = { /* device_pidvid-0000-0000-0000-504944564944 "PIDVID" */
-          0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44}
-        };
+    if (enum_test->version >= 0x800)
+    {
+        if (type == DI8DEVTYPE_KEYBOARD || type == DI8DEVTYPE_MOUSE)
+        {
+            const char *device = (type == DI8DEVTYPE_KEYBOARD) ? "Keyboard" : "Mouse";
+            ok( IsEqualGUID( &instance->guidInstance, &instance->guidProduct ),
+                "%s guidInstance (%s) does not match guidProduct (%s)\n", device,
+                wine_dbgstr_guid( &instance->guidInstance ), wine_dbgstr_guid( &instance->guidProduct ) );
+        }
+    }
+    else
+    {
+        if (type == DIDEVTYPE_KEYBOARD || type == DIDEVTYPE_MOUSE)
+        {
+            const char *device = (type == DIDEVTYPE_KEYBOARD) ? "Keyboard" : "Mouse";
+            ok( IsEqualGUID( &instance->guidInstance, &instance->guidProduct ),
+                "%s guidInstance (%s) does not match guidProduct (%s)\n", device,
+                wine_dbgstr_guid( &instance->guidInstance ), wine_dbgstr_guid( &instance->guidProduct ) );
+        }
 
-        ok(instance->guidProduct.Data2 == pidvid_product_guid.Data2,
-           "guidProduct.Data2 is %04x\n", instance->guidProduct.Data2);
-        ok(instance->guidProduct.Data3 == pidvid_product_guid.Data3,
-           "guidProduct.Data3 is %04x\n", instance->guidProduct.Data3);
-        ok(!memcmp(instance->guidProduct.Data4, pidvid_product_guid.Data4, sizeof(pidvid_product_guid.Data4)),
-           "guidProduct.Data4 does not match: %s\n", wine_dbgstr_guid(&instance->guidProduct));
+        if (type == DIDEVTYPE_KEYBOARD)
+            ok( IsEqualGUID( &instance->guidProduct, &GUID_SysKeyboard ),
+                "Keyboard guidProduct (%s) does not match GUID_SysKeyboard (%s)\n",
+                wine_dbgstr_guid( &instance->guidProduct ), wine_dbgstr_guid( &GUID_SysMouse ) );
+        else if (type == DIDEVTYPE_MOUSE)
+            ok( IsEqualGUID( &instance->guidProduct, &GUID_SysMouse ),
+                "Mouse guidProduct (%s) does not match GUID_SysMouse (%s)\n",
+                wine_dbgstr_guid( &instance->guidProduct ), wine_dbgstr_guid( &GUID_SysMouse ) );
+        else
+        {
+            ok( instance->guidProduct.Data2 == pidvid_product_guid.Data2,
+                "guidProduct.Data2 is %04x\n", instance->guidProduct.Data2 );
+            ok( instance->guidProduct.Data3 == pidvid_product_guid.Data3,
+                "guidProduct.Data3 is %04x\n", instance->guidProduct.Data3 );
+            ok( !memcmp( instance->guidProduct.Data4, pidvid_product_guid.Data4,
+                         sizeof(pidvid_product_guid.Data4) ),
+                "guidProduct.Data4 does not match: %s\n", wine_dbgstr_guid( &instance->guidProduct ) );
+        }
     }
 
     enum_test->device_count++;
     return enum_test->return_value;
 }
 
-static void test_EnumDevices(void)
+static void test_EnumDevices( DWORD version )
 {
-    IDirectInputA *pDI;
+    struct enum_devices_test enum_test = {.version = version}, enum_test_return = {.version = version};
+    IDirectInputA *dinput;
     HRESULT hr;
-    struct enum_devices_test enum_test, enum_test_return;
+    ULONG ref;
 
-    hr = DirectInputCreateA(hInstance, DIRECTINPUT_VERSION, &pDI, NULL);
-    if (FAILED(hr))
-    {
-        win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr);
-        return;
-    }
+    if (FAILED(hr = direct_input_create( version, &dinput ))) return;
 
-    hr = IDirectInput_EnumDevices(pDI, 0, NULL, NULL, 0);
-    ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr);
+    hr = IDirectInput_EnumDevices( dinput, 0, NULL, NULL, 0 );
+    ok( hr == DIERR_INVALIDPARAM, "EnumDevices returned 0x%08x\n", hr );
 
-    hr = IDirectInput_EnumDevices(pDI, 0, NULL, NULL, ~0u);
-    ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr);
+    hr = IDirectInput_EnumDevices( dinput, 0, NULL, NULL, ~0u );
+    ok( hr == DIERR_INVALIDPARAM, "EnumDevices returned 0x%08x\n", hr );
 
     /* Test crashes on Wine. */
     if (0)
     {
-        hr = IDirectInput_EnumDevices(pDI, 0, enum_devices_callback, NULL, ~0u);
-        ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr);
+        hr = IDirectInput_EnumDevices( dinput, 0, enum_devices_callback, NULL, ~0u );
+        ok( hr == DIERR_INVALIDPARAM, "EnumDevices returned 0x%08x\n", hr );
     }
 
-    hr = IDirectInput_EnumDevices(pDI, 0xdeadbeef, NULL, NULL, 0);
-    ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr);
+    hr = IDirectInput_EnumDevices( dinput, 0xdeadbeef, NULL, NULL, 0 );
+    ok( hr == DIERR_INVALIDPARAM, "EnumDevices returned 0x%08x\n", hr );
 
-    hr = IDirectInput_EnumDevices(pDI, 0xdeadbeef, NULL, NULL, ~0u);
-    ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr);
+    hr = IDirectInput_EnumDevices( dinput, 0xdeadbeef, NULL, NULL, ~0u );
+    ok( hr == DIERR_INVALIDPARAM, "EnumDevices returned 0x%08x\n", hr );
 
-    hr = IDirectInput_EnumDevices(pDI, 0xdeadbeef, enum_devices_callback, NULL, 0);
-    ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr);
+    hr = IDirectInput_EnumDevices( dinput, 0xdeadbeef, enum_devices_callback, NULL, 0 );
+    ok( hr == DIERR_INVALIDPARAM, "EnumDevices returned 0x%08x\n", hr );
 
-    hr = IDirectInput_EnumDevices(pDI, 0xdeadbeef, enum_devices_callback, NULL, ~0u);
-    ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr);
+    hr = IDirectInput_EnumDevices( dinput, 0xdeadbeef, enum_devices_callback, NULL, ~0u );
+    ok( hr == DIERR_INVALIDPARAM, "EnumDevices returned 0x%08x\n", hr );
 
     enum_test.device_count = 0;
     enum_test.return_value = DIENUM_CONTINUE;
-    hr = IDirectInput_EnumDevices(pDI, 0, enum_devices_callback, &enum_test, 0);
-    ok(hr == DI_OK, "IDirectInput_EnumDevices returned 0x%08x\n", hr);
+    hr = IDirectInput_EnumDevices( dinput, 0, enum_devices_callback, &enum_test, 0 );
+    ok( hr == DI_OK, "EnumDevices returned 0x%08x\n", hr );
     ok(enum_test.device_count != 0, "Device count is %u\n", enum_test.device_count);
 
     /* Enumeration only stops with an explicit DIENUM_STOP. */
     enum_test_return.device_count = 0;
     enum_test_return.return_value = 42;
-    hr = IDirectInput_EnumDevices(pDI, 0, enum_devices_callback, &enum_test_return, 0);
-    ok(hr == DI_OK, "IDirectInput_EnumDevices returned 0x%08x\n", hr);
+    hr = IDirectInput_EnumDevices( dinput, 0, enum_devices_callback, &enum_test_return, 0 );
+    ok( hr == DI_OK, "EnumDevices returned 0x%08x\n", hr );
     ok(enum_test_return.device_count == enum_test.device_count,
        "Device count is %u vs. %u\n", enum_test_return.device_count, enum_test.device_count);
 
     enum_test.device_count = 0;
     enum_test.return_value = DIENUM_STOP;
-    hr = IDirectInput_EnumDevices(pDI, 0, enum_devices_callback, &enum_test, 0);
-    ok(hr == DI_OK, "IDirectInput_EnumDevices returned 0x%08x\n", hr);
+    hr = IDirectInput_EnumDevices( dinput, 0, enum_devices_callback, &enum_test, 0 );
+    ok( hr == DI_OK, "EnumDevices returned 0x%08x\n", hr );
     ok(enum_test.device_count == 1, "Device count is %u\n", enum_test.device_count);
 
-    IDirectInput_Release(pDI);
+    ref = IDirectInput_Release( dinput );
+    ok( ref == 0, "Release returned %u\n", ref );
 }
 
-static void test_GetDeviceStatus(void)
+static void test_GetDeviceStatus( DWORD version )
 {
-    IDirectInputA *pDI;
+    IDirectInputA *dinput;
     HRESULT hr;
+    ULONG ref;
 
-    hr = DirectInputCreateA(hInstance, DIRECTINPUT_VERSION, &pDI, NULL);
-    if (FAILED(hr))
-    {
-        win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr);
-        return;
-    }
+    if (FAILED(hr = direct_input_create( version, &dinput ))) return;
 
-    hr = IDirectInput_GetDeviceStatus(pDI, NULL);
-    ok(hr == E_POINTER, "IDirectInput_GetDeviceStatus returned 0x%08x\n", hr);
+    hr = IDirectInput_GetDeviceStatus( dinput, NULL );
+    ok( hr == E_POINTER, "GetDeviceStatus returned %#x\n", hr );
 
-    hr = IDirectInput_GetDeviceStatus(pDI, &GUID_Unknown);
+    hr = IDirectInput_GetDeviceStatus( dinput, &GUID_Unknown );
     todo_wine
-    ok(hr == DIERR_DEVICENOTREG, "IDirectInput_GetDeviceStatus returned 0x%08x\n", hr);
+    ok( hr == DIERR_DEVICENOTREG, "GetDeviceStatus returned %#x\n", hr );
 
-    hr = IDirectInput_GetDeviceStatus(pDI, &GUID_SysMouse);
-    ok(hr == DI_OK, "IDirectInput_GetDeviceStatus returned 0x%08x\n", hr);
+    hr = IDirectInput_GetDeviceStatus( dinput, &GUID_SysMouse );
+    ok( hr == DI_OK, "GetDeviceStatus returned %#x\n", hr );
 
-    IDirectInput_Release(pDI);
+    ref = IDirectInput_Release( dinput );
+    ok( ref == 0, "Release returned %u\n", ref );
 }
 
-static void test_Initialize(void)
+static void test_Initialize( DWORD version )
 {
-    IDirectInputA *pDI;
+    IDirectInputA *dinput;
     HRESULT hr;
-    int i;
+    ULONG ref;
 
-    hr = CoCreateInstance(&CLSID_DirectInput, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectInputA, (void **)&pDI);
-    if (FAILED(hr))
-    {
-        win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr);
-        return;
-    }
+    if (FAILED(hr = direct_input_create( version, &dinput ))) return;
 
-    hr = IDirectInput_Initialize(pDI, NULL, 0);
-    ok(hr == DIERR_INVALIDPARAM, "IDirectInput_Initialize returned 0x%08x\n", hr);
+    hr = IDirectInput_Initialize( dinput, NULL, 0 );
+    ok( hr == DIERR_INVALIDPARAM, "Initialize returned %#x\n", hr );
 
-    hr = IDirectInput_Initialize(pDI, NULL, DIRECTINPUT_VERSION);
-    ok(hr == DIERR_INVALIDPARAM, "IDirectInput_Initialize returned 0x%08x\n", hr);
+    hr = IDirectInput_Initialize( dinput, NULL, version );
+    if (version == 0x300) todo_wine ok( hr == S_OK, "Initialize returned %#x\n", hr );
+    else ok( hr == DIERR_INVALIDPARAM, "Initialize returned %#x\n", hr );
 
-    hr = IDirectInput_Initialize(pDI, hInstance, 0);
-    ok(hr == DIERR_NOTINITIALIZED, "IDirectInput_Initialize returned 0x%08x\n", hr);
+    hr = IDirectInput_Initialize( dinput, hInstance, 0 );
+    ok( hr == DIERR_NOTINITIALIZED, "Initialize returned %#x\n", hr );
 
-    /* Invalid DirectInput versions less than 0x0700 yield DIERR_BETADIRECTINPUTVERSION. */
-    hr = IDirectInput_Initialize(pDI, hInstance, 0x0123);
-    ok(hr == DIERR_BETADIRECTINPUTVERSION, "IDirectInput_Initialize returned 0x%08x\n", hr);
+    hr = IDirectInput_Initialize( dinput, hInstance, version - 1 );
+    ok( hr == DIERR_BETADIRECTINPUTVERSION, "Initialize returned %#x\n", hr );
 
-    /* Invalid DirectInput versions greater than 0x0700 yield DIERR_BETADIRECTINPUTVERSION. */
-    hr = IDirectInput_Initialize(pDI, hInstance, 0xcafe);
-    ok(hr == DIERR_OLDDIRECTINPUTVERSION, "IDirectInput_Initialize returned 0x%08x\n", hr);
-
-    for (i = 0; i < ARRAY_SIZE(directinput_version_list); i++)
-    {
-        hr = IDirectInput_Initialize(pDI, hInstance, directinput_version_list[i]);
-        ok(hr == DI_OK, "IDirectInput_Initialize returned 0x%08x\n", hr);
-    }
+    hr = IDirectInput_Initialize( dinput, hInstance, version + 1 );
+    if (version >= 0x700) ok( hr == DIERR_OLDDIRECTINPUTVERSION, "Initialize returned %#x\n", hr );
+    else ok( hr == DIERR_BETADIRECTINPUTVERSION, "Initialize returned %#x\n", hr );
 
     /* Parameters are still validated after successful initialization. */
-    hr = IDirectInput_Initialize(pDI, hInstance, 0);
-    ok(hr == DIERR_NOTINITIALIZED, "IDirectInput_Initialize returned 0x%08x\n", hr);
+    hr = IDirectInput_Initialize( dinput, hInstance, 0 );
+    ok( hr == DIERR_NOTINITIALIZED, "Initialize returned %#x\n", hr );
 
-    IDirectInput_Release(pDI);
+    ref = IDirectInput_Release( dinput );
+    ok( ref == 0, "Release returned %u\n", ref );
 }
 
-static void test_RunControlPanel(void)
+static void test_RunControlPanel( DWORD version )
 {
-    IDirectInputA *pDI;
+    IDirectInputA *dinput;
     HRESULT hr;
+    ULONG ref;
 
-    hr = DirectInputCreateA(hInstance, DIRECTINPUT_VERSION, &pDI, NULL);
-    if (FAILED(hr))
-    {
-        win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr);
-        return;
-    }
+    if (FAILED(hr = direct_input_create( version, &dinput ))) return;
 
     if (winetest_interactive)
     {
-        hr = IDirectInput_RunControlPanel(pDI, NULL, 0);
-        ok(hr == S_OK, "IDirectInput_RunControlPanel returned 0x%08x\n", hr);
+        hr = IDirectInput_RunControlPanel( dinput, NULL, 0 );
+        ok( hr == S_OK, "RunControlPanel returned %#x\n", hr );
 
-        hr = IDirectInput_RunControlPanel(pDI, GetDesktopWindow(), 0);
-        ok(hr == S_OK, "IDirectInput_RunControlPanel returned 0x%08x\n", hr);
+        hr = IDirectInput_RunControlPanel( dinput, GetDesktopWindow(), 0 );
+        ok( hr == S_OK, "RunControlPanel returned %#x\n", hr );
     }
 
-    hr = IDirectInput_RunControlPanel(pDI, NULL, ~0u);
-    ok(hr == DIERR_INVALIDPARAM, "IDirectInput_RunControlPanel returned 0x%08x\n", hr);
+    hr = IDirectInput_RunControlPanel( dinput, NULL, ~0u );
+    ok( hr == DIERR_INVALIDPARAM, "RunControlPanel returned %#x\n", hr );
 
-    hr = IDirectInput_RunControlPanel(pDI, (HWND)0xdeadbeef, 0);
-    ok(hr == E_HANDLE, "IDirectInput_RunControlPanel returned 0x%08x\n", hr);
+    hr = IDirectInput_RunControlPanel( dinput, (HWND)0xdeadbeef, 0 );
+    ok( hr == E_HANDLE, "RunControlPanel returned %#x\n", hr );
 
-    hr = IDirectInput_RunControlPanel(pDI, (HWND)0xdeadbeef, ~0u);
-    ok(hr == E_HANDLE, "IDirectInput_RunControlPanel returned 0x%08x\n", hr);
+    hr = IDirectInput_RunControlPanel( dinput, (HWND)0xdeadbeef, ~0u );
+    ok( hr == E_HANDLE, "RunControlPanel returned %#x\n", hr );
 
-    IDirectInput_Release(pDI);
+    ref = IDirectInput_Release( dinput );
+    ok( ref == 0, "Release returned %u\n", ref );
 }
 
 static void test_DirectInputJoyConfig8(void)
@@ -644,7 +790,7 @@ static void test_DirectInputJoyConfig8(void)
         if (SUCCEEDED(hr))
         {
             hr = IDirectInput_CreateDevice(pDI, &info.guidInstance, &pDID, NULL);
-            ok (SUCCEEDED(hr), "IDirectInput_CreateDevice failed with guid from GetConfig hr = 0x%08x\n", hr);
+            ok( SUCCEEDED(hr), "CreateDevice failed with guid from GetConfig hr = 0x%08x\n", hr );
             IDirectInputDevice_Release(pDID);
         }
     }
@@ -653,23 +799,227 @@ static void test_DirectInputJoyConfig8(void)
     IDirectInput_Release(pDI);
 }
 
+struct enum_semantics_test
+{
+    unsigned int device_count;
+    DWORD first_remaining;
+    BOOL mouse;
+    BOOL keyboard;
+    DIACTIONFORMATA *action_format;
+    const char *username;
+};
+
+static DIACTIONA actionMapping[] = {
+    /* axis */
+    {0, 0x01008A01 /* DIAXIS_DRIVINGR_STEER */, 0, {"Steer.\0"}},
+    /* button */
+    {1, 0x01000C01 /* DIBUTTON_DRIVINGR_SHIFTUP */, 0, {"Upshift.\0"}},
+    /* keyboard key */
+    {2, DIKEYBOARD_SPACE, 0, {"Missile.\0"}},
+    /* mouse button */
+    {3, DIMOUSE_BUTTON0, 0, {"Select\0"}},
+    /* mouse axis */
+    {4, DIMOUSE_YAXIS, 0, {"Y Axis\0"}}};
+/* By placing the memory pointed to by lptszActionName right before memory with PAGE_NOACCESS
+ * one can find out that the regular ansi string termination is not respected by
+ * EnumDevicesBySemantics. Adding a double termination, making it a valid wide string termination,
+ * made the test succeed. Therefore it looks like ansi version of EnumDevicesBySemantics forwards
+ * the string to the wide variant without conversation. */
+
+static BOOL CALLBACK enum_semantics_callback( const DIDEVICEINSTANCEA *lpddi, IDirectInputDevice8A *lpdid,
+                                              DWORD dwFlags, DWORD dwRemaining, void *context )
+{
+    struct enum_semantics_test *data = context;
+
+    if (context == NULL) return DIENUM_STOP;
+
+    if (!data->device_count)
+    {
+        data->first_remaining = dwRemaining;
+    }
+    ok( dwRemaining == data->first_remaining - data->device_count,
+        "enum semantics remaining devices is wrong, expected %d, had %d\n",
+        data->first_remaining - data->device_count, dwRemaining );
+    data->device_count++;
+
+    if (IsEqualGUID( &lpddi->guidInstance, &GUID_SysKeyboard )) data->keyboard = TRUE;
+
+    if (IsEqualGUID( &lpddi->guidInstance, &GUID_SysMouse )) data->mouse = TRUE;
+
+    return DIENUM_CONTINUE;
+}
+
+static BOOL CALLBACK set_action_map_callback( const DIDEVICEINSTANCEA *lpddi, IDirectInputDevice8A *lpdid,
+                                              DWORD dwFlags, DWORD dwRemaining, void *context )
+{
+    HRESULT hr;
+    struct enum_semantics_test *data = context;
+
+    /* Building and setting an action map */
+    /* It should not use any pre-stored mappings so we use DIDBAM_INITIALIZE */
+    hr = IDirectInputDevice8_BuildActionMap( lpdid, data->action_format, NULL, DIDBAM_INITIALIZE );
+    ok( SUCCEEDED(hr), "BuildActionMap failed hr=%08x\n", hr );
+
+    hr = IDirectInputDevice8_SetActionMap( lpdid, data->action_format, data->username, 0 );
+    ok( SUCCEEDED(hr), "SetActionMap failed hr=%08x\n", hr );
+
+    return DIENUM_CONTINUE;
+}
+
+static void test_EnumDevicesBySemantics(void)
+{
+    DIACTIONFORMATA action_format;
+    const GUID ACTION_MAPPING_GUID = {0x1, 0x2, 0x3, {0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb}};
+    struct enum_semantics_test data = {0, 0, FALSE, FALSE, &action_format, NULL};
+    IDirectInput8A *dinput;
+    int device_total = 0;
+    HRESULT hr;
+
+    hr = DirectInput8Create( hInstance, 0x800, &IID_IDirectInput8A, (void **)&dinput, NULL );
+    if (FAILED(hr))
+    {
+        win_skip( "Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr );
+        return;
+    }
+
+    memset( &action_format, 0, sizeof(action_format) );
+    action_format.dwSize = sizeof(action_format);
+    action_format.dwActionSize = sizeof(DIACTIONA);
+    action_format.dwNumActions = ARRAY_SIZE(actionMapping);
+    action_format.dwDataSize = 4 * action_format.dwNumActions;
+    action_format.rgoAction = actionMapping;
+    action_format.guidActionMap = ACTION_MAPPING_GUID;
+    action_format.dwGenre = 0x01000000; /* DIVIRTUAL_DRIVING_RACE */
+    action_format.dwBufferSize = 32;
+
+    /* Test enumerating all attached and installed devices */
+    data.keyboard = FALSE;
+    data.mouse = FALSE;
+    data.device_count = 0;
+    hr = IDirectInput8_EnumDevicesBySemantics( dinput, NULL, &action_format, enum_semantics_callback,
+                                               &data, DIEDBSFL_ATTACHEDONLY );
+    ok( data.device_count > 0, "EnumDevicesBySemantics did not call the callback hr=%08x\n", hr );
+    ok( data.keyboard, "EnumDevicesBySemantics should enumerate the keyboard\n" );
+    ok( data.mouse, "EnumDevicesBySemantics should enumerate the mouse\n" );
+
+    /* Enumerate Force feedback devices. We should get no mouse nor keyboard */
+    data.keyboard = FALSE;
+    data.mouse = FALSE;
+    data.device_count = 0;
+    hr = IDirectInput8_EnumDevicesBySemantics( dinput, NULL, &action_format, enum_semantics_callback,
+                                               &data, DIEDBSFL_FORCEFEEDBACK );
+    ok( SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr );
+    ok( !data.keyboard, "Keyboard should not be enumerated when asking for forcefeedback\n" );
+    ok( !data.mouse, "Mouse should not be enumerated when asking for forcefeedback\n" );
+
+    /* Enumerate available devices. That is devices not owned by any user.
+       Before setting the action map for all devices we still have them available. */
+    data.device_count = 0;
+    hr = IDirectInput8_EnumDevicesBySemantics( dinput, NULL, &action_format, enum_semantics_callback,
+                                               &data, DIEDBSFL_AVAILABLEDEVICES );
+    ok( SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr );
+    ok( data.device_count > 0,
+        "There should be devices available before action mapping available=%d\n", data.device_count );
+
+    /* Keep the device total */
+    device_total = data.device_count;
+
+    /* There should be no devices for any user. No device should be enumerated with DIEDBSFL_THISUSER.
+       MSDN defines that all unowned devices are also enumerated but this doesn't seem to be happening. */
+    data.device_count = 0;
+    hr = IDirectInput8_EnumDevicesBySemantics( dinput, "Sh4d0w M4g3", &action_format,
+                                               enum_semantics_callback, &data, DIEDBSFL_THISUSER );
+    ok( SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr );
+    ok( data.device_count == 0, "No devices should be assigned for this user assigned=%d\n", data.device_count );
+
+    /* This enumeration builds and sets the action map for all devices with a NULL username */
+    hr = IDirectInput8_EnumDevicesBySemantics( dinput, NULL, &action_format, set_action_map_callback,
+                                               &data, DIEDBSFL_ATTACHEDONLY );
+    ok( SUCCEEDED(hr), "EnumDevicesBySemantics failed: hr=%08x\n", hr );
+
+    /* After a successful action mapping we should have no devices available */
+    data.device_count = 0;
+    hr = IDirectInput8_EnumDevicesBySemantics( dinput, NULL, &action_format, enum_semantics_callback,
+                                               &data, DIEDBSFL_AVAILABLEDEVICES );
+    ok( SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr );
+    ok( data.device_count == 0, "No device should be available after action mapping available=%d\n",
+        data.device_count );
+
+    /* Now we'll give all the devices to a specific user */
+    data.username = "Sh4d0w M4g3";
+    hr = IDirectInput8_EnumDevicesBySemantics( dinput, NULL, &action_format, set_action_map_callback,
+                                               &data, DIEDBSFL_ATTACHEDONLY );
+    ok( SUCCEEDED(hr), "EnumDevicesBySemantics failed: hr=%08x\n", hr );
+
+    /* Testing with the default user, DIEDBSFL_THISUSER has no effect */
+    data.device_count = 0;
+    hr = IDirectInput8_EnumDevicesBySemantics( dinput, NULL, &action_format,
+                                               enum_semantics_callback, &data, DIEDBSFL_THISUSER );
+    ok( SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr );
+    ok( data.device_count == device_total, "THISUSER has no effect with NULL username owned=%d, expected=%d\n",
+        data.device_count, device_total );
+
+    /* Using an empty user string is the same as passing NULL, DIEDBSFL_THISUSER has no effect */
+    data.device_count = 0;
+    hr = IDirectInput8_EnumDevicesBySemantics( dinput, "", &action_format, enum_semantics_callback, &data, DIEDBSFL_THISUSER );
+    ok( SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr );
+    ok( data.device_count == device_total, "THISUSER has no effect with \"\" as username owned=%d, expected=%d\n",
+        data.device_count, device_total );
+
+    /* Testing with a user with no ownership of the devices */
+    data.device_count = 0;
+    hr = IDirectInput8_EnumDevicesBySemantics( dinput, "Ninja Brian", &action_format,
+                                               enum_semantics_callback, &data, DIEDBSFL_THISUSER );
+    ok( SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr );
+    ok( data.device_count == 0, "This user should own no devices owned=%d\n", data.device_count );
+
+    /* Sh4d0w M4g3 has ownership of all devices */
+    data.device_count = 0;
+    hr = IDirectInput8_EnumDevicesBySemantics( dinput, "Sh4d0w M4g3", &action_format,
+                                               enum_semantics_callback, &data, DIEDBSFL_THISUSER );
+    ok( SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr );
+    ok( data.device_count == device_total, "This user should own %d devices owned=%d\n",
+        device_total, data.device_count );
+
+    /* The call fails with a zeroed GUID */
+    memset( &action_format.guidActionMap, 0, sizeof(GUID) );
+    data.device_count = 0;
+    hr = IDirectInput8_EnumDevicesBySemantics( dinput, NULL, &action_format, enum_semantics_callback, NULL, 0 );
+    todo_wine
+    ok( FAILED(hr), "EnumDevicesBySemantics succeeded with invalid GUID hr=%08x\n", hr );
+
+    IDirectInput8_Release( dinput );
+}
+
 START_TEST(dinput)
 {
     HMODULE dinput_mod = GetModuleHandleA("dinput.dll");
+    DWORD i;
 
     hInstance = GetModuleHandleA(NULL);
 
     pDirectInputCreateEx = (void *)GetProcAddress(dinput_mod, "DirectInputCreateEx");
 
-    CoInitialize(NULL);
-    test_preinitialization();
-    test_DirectInputCreateEx();
-    test_QueryInterface();
-    test_CreateDevice();
-    test_EnumDevices();
-    test_GetDeviceStatus();
-    test_Initialize();
-    test_RunControlPanel();
-    test_DirectInputJoyConfig8();
+    CoInitialize( NULL );
+    test_CoCreateInstance( 0x700 );
+    test_CoCreateInstance( 0x800 );
     CoUninitialize();
+
+    for (i = 0; i < ARRAY_SIZE(dinput_versions); i++)
+    {
+        winetest_push_context( "%#x", dinput_versions[i] );
+        test_DirectInputCreate( dinput_versions[i] );
+        test_DirectInputCreateEx( dinput_versions[i] );
+        test_DirectInput8Create( dinput_versions[i] );
+        test_QueryInterface( dinput_versions[i] );
+        test_CreateDevice( dinput_versions[i] );
+        test_EnumDevices( dinput_versions[i] );
+        test_GetDeviceStatus( dinput_versions[i] );
+        test_RunControlPanel( dinput_versions[i] );
+        test_Initialize( dinput_versions[i] );
+        winetest_pop_context();
+    }
+
+    test_DirectInputJoyConfig8();
+    test_EnumDevicesBySemantics();
 }
diff --git a/dlls/dinput/tests/dinput8.c b/dlls/dinput/tests/dinput8.c
deleted file mode 100644
index 81aeb8191f6..00000000000
--- a/dlls/dinput/tests/dinput8.c
+++ /dev/null
@@ -1,728 +0,0 @@
-/*
- * Copyright (c) 2011 Andrew Nguyen
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#define DIRECTINPUT_VERSION 0x0800
-
-#define COBJMACROS
-#include <windows.h>
-#include <objidl.h>
-
-#include <dinput.h>
-#include <dinputd.h>
-
-#include "wine/test.h"
-
-static HINSTANCE hInstance;
-
-static BOOL CALLBACK dummy_callback(const DIDEVICEINSTANCEA *instance, void *context)
-{
-    ok(0, "Callback was invoked with parameters (%p, %p)\n", instance, context);
-    return DIENUM_STOP;
-}
-
-static void test_preinitialization(void)
-{
-    static const struct
-    {
-        REFGUID rguid;
-        BOOL pdev;
-        HRESULT expected_hr;
-    } create_device_tests[] =
-    {
-        {NULL, FALSE, E_POINTER},
-        {NULL, TRUE, E_POINTER},
-        {&GUID_Unknown, FALSE, E_POINTER},
-        {&GUID_Unknown, TRUE, DIERR_NOTINITIALIZED},
-        {&GUID_SysMouse, FALSE, E_POINTER},
-        {&GUID_SysMouse, TRUE, DIERR_NOTINITIALIZED},
-    };
-
-    static const struct
-    {
-        DWORD dwDevType;
-        LPDIENUMDEVICESCALLBACKA lpCallback;
-        DWORD dwFlags;
-        HRESULT expected_hr;
-        int todo;
-    } enum_devices_tests[] =
-    {
-        {0, NULL, 0, DIERR_INVALIDPARAM},
-        {0, NULL, ~0u, DIERR_INVALIDPARAM},
-        {0, dummy_callback, 0, DIERR_NOTINITIALIZED},
-        {0, dummy_callback, ~0u, DIERR_INVALIDPARAM},
-        {0xdeadbeef, NULL, 0, DIERR_INVALIDPARAM},
-        {0xdeadbeef, NULL, ~0u, DIERR_INVALIDPARAM},
-        {0xdeadbeef, dummy_callback, 0, DIERR_INVALIDPARAM},
-        {0xdeadbeef, dummy_callback, ~0u, DIERR_INVALIDPARAM},
-    };
-
-    IDirectInput8A *pDI;
-    HRESULT hr;
-    int i;
-    IDirectInputDevice8A *pDID;
-
-    hr = CoCreateInstance(&CLSID_DirectInput8, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectInput8A, (void **)&pDI);
-    if (FAILED(hr))
-    {
-        skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr);
-        return;
-    }
-
-    for (i = 0; i < ARRAY_SIZE(create_device_tests); i++)
-    {
-        if (create_device_tests[i].pdev) pDID = (void *)0xdeadbeef;
-        hr = IDirectInput8_CreateDevice(pDI, create_device_tests[i].rguid,
-                                            create_device_tests[i].pdev ? &pDID : NULL,
-                                            NULL);
-        ok(hr == create_device_tests[i].expected_hr, "[%d] IDirectInput8_CreateDevice returned 0x%08x\n", i, hr);
-        if (create_device_tests[i].pdev)
-            ok(pDID == NULL, "[%d] Output interface pointer is %p\n", i, pDID);
-    }
-
-    for (i = 0; i < ARRAY_SIZE(enum_devices_tests); i++)
-    {
-        hr = IDirectInput8_EnumDevices(pDI, enum_devices_tests[i].dwDevType,
-                                           enum_devices_tests[i].lpCallback,
-                                           NULL,
-                                           enum_devices_tests[i].dwFlags);
-        todo_wine_if(enum_devices_tests[i].todo)
-            ok(hr == enum_devices_tests[i].expected_hr, "[%d] IDirectInput8_EnumDevice returned 0x%08x\n", i, hr);
-    }
-
-    hr = IDirectInput8_GetDeviceStatus(pDI, NULL);
-    ok(hr == E_POINTER, "IDirectInput8_GetDeviceStatus returned 0x%08x\n", hr);
-
-    hr = IDirectInput8_GetDeviceStatus(pDI, &GUID_Unknown);
-    ok(hr == DIERR_NOTINITIALIZED, "IDirectInput8_GetDeviceStatus returned 0x%08x\n", hr);
-
-    hr = IDirectInput8_GetDeviceStatus(pDI, &GUID_SysMouse);
-    ok(hr == DIERR_NOTINITIALIZED, "IDirectInput8_GetDeviceStatus returned 0x%08x\n", hr);
-
-    hr = IDirectInput8_RunControlPanel(pDI, NULL, 0);
-    ok(hr == DIERR_NOTINITIALIZED, "IDirectInput8_RunControlPanel returned 0x%08x\n", hr);
-
-    hr = IDirectInput8_RunControlPanel(pDI, NULL, ~0u);
-    ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_RunControlPanel returned 0x%08x\n", hr);
-
-    hr = IDirectInput8_RunControlPanel(pDI, (HWND)0xdeadbeef, 0);
-    ok(hr == E_HANDLE, "IDirectInput8_RunControlPanel returned 0x%08x\n", hr);
-
-    hr = IDirectInput8_RunControlPanel(pDI, (HWND)0xdeadbeef, ~0u);
-    ok(hr == E_HANDLE, "IDirectInput8_RunControlPanel returned 0x%08x\n", hr);
-
-    IDirectInput8_Release(pDI);
-}
-
-static void test_DirectInput8Create(void)
-{
-    static const struct
-    {
-        BOOL hinst;
-        DWORD dwVersion;
-        REFIID riid;
-        BOOL ppdi;
-        HRESULT expected_hr;
-    } invalid_param_list[] =
-    {
-        {FALSE, 0,                       &IID_IDirectInputA,  FALSE, E_POINTER},
-        {FALSE, 0,                       &IID_IDirectInputA,  TRUE,  DIERR_NOINTERFACE},
-        {FALSE, 0,                       &IID_IDirectInput8A, FALSE, E_POINTER},
-        {FALSE, 0,                       &IID_IDirectInput8A, TRUE,  DIERR_INVALIDPARAM},
-        {FALSE, DIRECTINPUT_VERSION,     &IID_IDirectInputA,  FALSE, E_POINTER},
-        {FALSE, DIRECTINPUT_VERSION,     &IID_IDirectInputA,  TRUE,  DIERR_NOINTERFACE},
-        {FALSE, DIRECTINPUT_VERSION,     &IID_IDirectInput8A, FALSE, E_POINTER},
-        {FALSE, DIRECTINPUT_VERSION,     &IID_IDirectInput8A, TRUE,  DIERR_INVALIDPARAM},
-        {FALSE, DIRECTINPUT_VERSION - 1, &IID_IDirectInputA,  FALSE, E_POINTER},
-        {FALSE, DIRECTINPUT_VERSION - 1, &IID_IDirectInputA,  TRUE,  DIERR_NOINTERFACE},
-        {FALSE, DIRECTINPUT_VERSION - 1, &IID_IDirectInput8A, FALSE, E_POINTER},
-        {FALSE, DIRECTINPUT_VERSION - 1, &IID_IDirectInput8A, TRUE,  DIERR_INVALIDPARAM},
-        {FALSE, DIRECTINPUT_VERSION + 1, &IID_IDirectInputA,  FALSE, E_POINTER},
-        {FALSE, DIRECTINPUT_VERSION + 1, &IID_IDirectInputA,  TRUE,  DIERR_NOINTERFACE},
-        {FALSE, DIRECTINPUT_VERSION + 1, &IID_IDirectInput8A, FALSE, E_POINTER},
-        {FALSE, DIRECTINPUT_VERSION + 1, &IID_IDirectInput8A, TRUE,  DIERR_INVALIDPARAM},
-        {TRUE,  0,                       &IID_IDirectInputA,  FALSE, E_POINTER},
-        {TRUE,  0,                       &IID_IDirectInputA,  TRUE,  DIERR_NOINTERFACE},
-        {TRUE,  0,                       &IID_IDirectInput8A, FALSE, E_POINTER},
-        {TRUE,  0,                       &IID_IDirectInput8A, TRUE,  DIERR_NOTINITIALIZED},
-        {TRUE,  DIRECTINPUT_VERSION,     &IID_IDirectInputA,  FALSE, E_POINTER},
-        {TRUE,  DIRECTINPUT_VERSION,     &IID_IDirectInputA,  TRUE,  DIERR_NOINTERFACE},
-        {TRUE,  DIRECTINPUT_VERSION,     &IID_IDirectInput8A, FALSE, E_POINTER},
-        {TRUE,  DIRECTINPUT_VERSION - 1, &IID_IDirectInputA,  FALSE, E_POINTER},
-        {TRUE,  DIRECTINPUT_VERSION - 1, &IID_IDirectInputA,  TRUE,  DIERR_NOINTERFACE},
-        {TRUE,  DIRECTINPUT_VERSION - 1, &IID_IDirectInput8A, FALSE, E_POINTER},
-        {TRUE,  DIRECTINPUT_VERSION - 1, &IID_IDirectInput8A, TRUE,  DIERR_BETADIRECTINPUTVERSION},
-        {TRUE,  DIRECTINPUT_VERSION + 1, &IID_IDirectInputA,  FALSE, E_POINTER},
-        {TRUE,  DIRECTINPUT_VERSION + 1, &IID_IDirectInputA,  TRUE,  DIERR_NOINTERFACE},
-        {TRUE,  DIRECTINPUT_VERSION + 1, &IID_IDirectInput8A, FALSE, E_POINTER},
-        {TRUE,  DIRECTINPUT_VERSION + 1, &IID_IDirectInput8A, TRUE,  DIERR_OLDDIRECTINPUTVERSION},
-    };
-
-    static REFIID no_interface_list[] = {&IID_IDirectInputA, &IID_IDirectInputW,
-                                         &IID_IDirectInput2A, &IID_IDirectInput2W,
-                                         &IID_IDirectInput7A, &IID_IDirectInput7W,
-                                         &IID_IDirectInputDeviceA, &IID_IDirectInputDeviceW,
-                                         &IID_IDirectInputDevice2A, &IID_IDirectInputDevice2W,
-                                         &IID_IDirectInputDevice7A, &IID_IDirectInputDevice7W,
-                                         &IID_IDirectInputDevice8A, &IID_IDirectInputDevice8W,
-                                         &IID_IDirectInputEffect};
-
-    static REFIID iid_list[] = {&IID_IUnknown, &IID_IDirectInput8A, &IID_IDirectInput8W};
-
-    int i;
-    IUnknown *pUnk;
-    HRESULT hr;
-
-    for (i = 0; i < ARRAY_SIZE(invalid_param_list); i++)
-    {
-        if (invalid_param_list[i].ppdi) pUnk = (void *)0xdeadbeef;
-        hr = DirectInput8Create(invalid_param_list[i].hinst ? hInstance : NULL,
-                                invalid_param_list[i].dwVersion,
-                                invalid_param_list[i].riid,
-                                invalid_param_list[i].ppdi ? (void **)&pUnk : NULL,
-                                NULL);
-        ok(hr == invalid_param_list[i].expected_hr, "[%d] DirectInput8Create returned 0x%08x\n", i, hr);
-        if (invalid_param_list[i].ppdi)
-            ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk);
-    }
-
-    for (i = 0; i < ARRAY_SIZE(no_interface_list); i++)
-    {
-        pUnk = (void *)0xdeadbeef;
-        hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, no_interface_list[i], (void **)&pUnk, NULL);
-        ok(hr == DIERR_NOINTERFACE, "[%d] DirectInput8Create returned 0x%08x\n", i, hr);
-        ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk);
-    }
-
-    for (i = 0; i < ARRAY_SIZE(iid_list); i++)
-    {
-        pUnk = NULL;
-        hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, iid_list[i], (void **)&pUnk, NULL);
-        ok(hr == DI_OK, "[%d] DirectInput8Create returned 0x%08x\n", i, hr);
-        ok(pUnk != NULL, "[%d] Output interface pointer is NULL\n", i);
-        if (pUnk)
-            IUnknown_Release(pUnk);
-    }
-}
-
-static void test_QueryInterface(void)
-{
-    static REFIID iid_list[] = {&IID_IUnknown, &IID_IDirectInput8A, &IID_IDirectInput8W, &IID_IDirectInputJoyConfig8};
-
-    static REFIID no_interface_list[] =
-    {
-        &IID_IDirectInputA,
-        &IID_IDirectInputW,
-        &IID_IDirectInput2A,
-        &IID_IDirectInput2W,
-        &IID_IDirectInput7A,
-        &IID_IDirectInput7W,
-        &IID_IDirectInputDeviceA,
-        &IID_IDirectInputDeviceW,
-        &IID_IDirectInputDevice2A,
-        &IID_IDirectInputDevice2W,
-        &IID_IDirectInputDevice7A,
-        &IID_IDirectInputDevice7W,
-        &IID_IDirectInputDevice8A,
-        &IID_IDirectInputDevice8W,
-        &IID_IDirectInputEffect,
-    };
-
-    IDirectInput8A *pDI;
-    HRESULT hr;
-    IUnknown *pUnk;
-    int i;
-
-    hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, &IID_IDirectInput8A, (void **)&pDI, NULL);
-    if (FAILED(hr))
-    {
-        win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr);
-        return;
-    }
-
-    hr = IDirectInput8_QueryInterface(pDI, NULL, NULL);
-    ok(hr == E_POINTER, "IDirectInput8_QueryInterface returned 0x%08x\n", hr);
-
-    pUnk = (void *)0xdeadbeef;
-    hr = IDirectInput8_QueryInterface(pDI, NULL, (void **)&pUnk);
-    ok(hr == E_POINTER, "IDirectInput8_QueryInterface returned 0x%08x\n", hr);
-    ok(pUnk == (void *)0xdeadbeef, "Output interface pointer is %p\n", pUnk);
-
-    hr = IDirectInput8_QueryInterface(pDI, &IID_IUnknown, NULL);
-    ok(hr == E_POINTER, "IDirectInput8_QueryInterface returned 0x%08x\n", hr);
-
-    for (i = 0; i < ARRAY_SIZE(iid_list); i++)
-    {
-        pUnk = NULL;
-        hr = IDirectInput8_QueryInterface(pDI, iid_list[i], (void **)&pUnk);
-        ok(hr == S_OK, "[%d] IDirectInput8_QueryInterface returned 0x%08x\n", i, hr);
-        ok(pUnk != NULL, "[%d] Output interface pointer is NULL\n", i);
-        if (pUnk)
-        {
-            int j;
-            for (j = 0; j < ARRAY_SIZE(iid_list); j++)
-            {
-                IUnknown *pUnk1 = NULL;
-                hr = IDirectInput8_QueryInterface(pUnk, iid_list[j], (void **)&pUnk1);
-                ok(hr == S_OK, "[%d] IDirectInput8_QueryInterface(pUnk) returned 0x%08x\n", j, hr);
-                ok(pUnk1 != NULL, "[%d] Output interface pointer is NULL\n", i);
-                if (pUnk1) IUnknown_Release(pUnk1);
-            }
-            IUnknown_Release(pUnk);
-        }
-    }
-
-    for (i = 0; i < ARRAY_SIZE(no_interface_list); i++)
-    {
-        pUnk = (void *)0xdeadbeef;
-        hr = IDirectInput8_QueryInterface(pDI, no_interface_list[i], (void **)&pUnk);
-
-        ok(hr == E_NOINTERFACE, "[%d] IDirectInput8_QueryInterface returned 0x%08x\n", i, hr);
-        ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk);
-    }
-
-    IDirectInput8_Release(pDI);
-}
-
-static void test_CreateDevice(void)
-{
-    IDirectInput8A *pDI;
-    HRESULT hr;
-    IDirectInputDevice8A *pDID;
-
-    hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, &IID_IDirectInput8A, (void **)&pDI, NULL);
-    if (FAILED(hr))
-    {
-        win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr);
-        return;
-    }
-
-    hr = IDirectInput8_CreateDevice(pDI, NULL, NULL, NULL);
-    ok(hr == E_POINTER, "IDirectInput8_CreateDevice returned 0x%08x\n", hr);
-
-    pDID = (void *)0xdeadbeef;
-    hr = IDirectInput8_CreateDevice(pDI, NULL, &pDID, NULL);
-    ok(hr == E_POINTER, "IDirectInput8_CreateDevice returned 0x%08x\n", hr);
-    ok(pDID == NULL, "Output interface pointer is %p\n", pDID);
-
-    hr = IDirectInput8_CreateDevice(pDI, &GUID_Unknown, NULL, NULL);
-    ok(hr == E_POINTER, "IDirectInput8_CreateDevice returned 0x%08x\n", hr);
-
-    pDID = (void *)0xdeadbeef;
-    hr = IDirectInput8_CreateDevice(pDI, &GUID_Unknown, &pDID, NULL);
-    ok(hr == DIERR_DEVICENOTREG, "IDirectInput8_CreateDevice returned 0x%08x\n", hr);
-    ok(pDID == NULL, "Output interface pointer is %p\n", pDID);
-
-    hr = IDirectInput8_CreateDevice(pDI, &GUID_SysMouse, NULL, NULL);
-    ok(hr == E_POINTER, "IDirectInput8_CreateDevice returned 0x%08x\n", hr);
-
-    hr = IDirectInput8_CreateDevice(pDI, &GUID_SysMouse, &pDID, NULL);
-    ok(hr == DI_OK, "IDirectInput8_CreateDevice returned 0x%08x\n", hr);
-
-    IDirectInputDevice_Release(pDID);
-    IDirectInput8_Release(pDI);
-}
-
-struct enum_devices_test
-{
-    unsigned int device_count;
-    BOOL return_value;
-};
-
-static BOOL CALLBACK enum_devices_callback(const DIDEVICEINSTANCEA *instance, void *context)
-{
-    struct enum_devices_test *enum_test = context;
-
-    trace("---- Device Information ----\n"
-          "Product Name  : %s\n"
-          "Instance Name : %s\n"
-          "devType       : 0x%08x\n"
-          "GUID Product  : %s\n"
-          "GUID Instance : %s\n"
-          "HID Page      : 0x%04x\n"
-          "HID Usage     : 0x%04x\n",
-          instance->tszProductName,
-          instance->tszInstanceName,
-          instance->dwDevType,
-          wine_dbgstr_guid(&instance->guidProduct),
-          wine_dbgstr_guid(&instance->guidInstance),
-          instance->wUsagePage,
-          instance->wUsage);
-
-    if ((instance->dwDevType & 0xff) == DI8DEVTYPE_KEYBOARD ||
-           (instance->dwDevType & 0xff) == DI8DEVTYPE_MOUSE) {
-        const char *device = ((instance->dwDevType & 0xff) ==
-                                   DI8DEVTYPE_KEYBOARD) ? "Keyboard" : "Mouse";
-        ok(IsEqualGUID(&instance->guidInstance, &instance->guidProduct),
-           "%s guidInstance (%s) does not match guidProduct (%s)\n",
-           device, wine_dbgstr_guid(&instance->guidInstance),
-           wine_dbgstr_guid(&instance->guidProduct));
-    }
-
-    enum_test->device_count++;
-    return enum_test->return_value;
-}
-
-static void test_EnumDevices(void)
-{
-    IDirectInput8A *pDI;
-    HRESULT hr;
-    struct enum_devices_test enum_test, enum_test_return;
-
-    hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, &IID_IDirectInput8A, (void **)&pDI, NULL);
-    if (FAILED(hr))
-    {
-        win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr);
-        return;
-    }
-
-    hr = IDirectInput8_EnumDevices(pDI, 0, NULL, NULL, 0);
-    ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_EnumDevices returned 0x%08x\n", hr);
-
-    hr = IDirectInput8_EnumDevices(pDI, 0, NULL, NULL, ~0u);
-    ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_EnumDevices returned 0x%08x\n", hr);
-
-    /* Test crashes on Wine. */
-    if (0)
-    {
-        hr = IDirectInput8_EnumDevices(pDI, 0, enum_devices_callback, NULL, ~0u);
-        ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_EnumDevices returned 0x%08x\n", hr);
-    }
-
-    hr = IDirectInput8_EnumDevices(pDI, 0xdeadbeef, NULL, NULL, 0);
-    ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_EnumDevices returned 0x%08x\n", hr);
-
-    hr = IDirectInput8_EnumDevices(pDI, 0xdeadbeef, NULL, NULL, ~0u);
-    ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_EnumDevices returned 0x%08x\n", hr);
-
-    hr = IDirectInput8_EnumDevices(pDI, 0xdeadbeef, enum_devices_callback, NULL, 0);
-    ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_EnumDevices returned 0x%08x\n", hr);
-
-    hr = IDirectInput8_EnumDevices(pDI, 0xdeadbeef, enum_devices_callback, NULL, ~0u);
-    ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_EnumDevices returned 0x%08x\n", hr);
-
-    enum_test.device_count = 0;
-    enum_test.return_value = DIENUM_CONTINUE;
-    hr = IDirectInput8_EnumDevices(pDI, 0, enum_devices_callback, &enum_test, 0);
-    ok(hr == DI_OK, "IDirectInput8_EnumDevices returned 0x%08x\n", hr);
-    ok(enum_test.device_count != 0, "Device count is %u\n", enum_test.device_count);
-
-    /* Enumeration only stops with an explicit DIENUM_STOP. */
-    enum_test_return.device_count = 0;
-    enum_test_return.return_value = 42;
-    hr = IDirectInput8_EnumDevices(pDI, 0, enum_devices_callback, &enum_test_return, 0);
-    ok(hr == DI_OK, "IDirectInput8_EnumDevices returned 0x%08x\n", hr);
-    ok(enum_test_return.device_count == enum_test.device_count,
-       "Device count is %u vs. %u\n", enum_test_return.device_count, enum_test.device_count);
-
-    enum_test.device_count = 0;
-    enum_test.return_value = DIENUM_STOP;
-    hr = IDirectInput8_EnumDevices(pDI, 0, enum_devices_callback, &enum_test, 0);
-    ok(hr == DI_OK, "IDirectInput8_EnumDevices returned 0x%08x\n", hr);
-    ok(enum_test.device_count == 1, "Device count is %u\n", enum_test.device_count);
-
-    IDirectInput8_Release(pDI);
-}
-
-struct enum_semantics_test
-{
-    unsigned int device_count;
-    DWORD first_remaining;
-    BOOL mouse;
-    BOOL keyboard;
-    DIACTIONFORMATA *lpdiaf;
-    const char* username;
-};
-
-static DIACTIONA actionMapping[]=
-{
-  /* axis */
-  { 0, 0x01008A01 /* DIAXIS_DRIVINGR_STEER */,      0, { "Steer.\0" }   },
-  /* button */
-  { 1, 0x01000C01 /* DIBUTTON_DRIVINGR_SHIFTUP */,  0, { "Upshift.\0" } },
-  /* keyboard key */
-  { 2, DIKEYBOARD_SPACE,                            0, { "Missile.\0" } },
-  /* mouse button */
-  { 3, DIMOUSE_BUTTON0,                             0, { "Select\0" }   },
-  /* mouse axis */
-  { 4, DIMOUSE_YAXIS,                               0, { "Y Axis\0" }   }
-};
-/* By placing the memory pointed to by lptszActionName right before memory with PAGE_NOACCESS
- * one can find out that the regular ansi string termination is not respected by EnumDevicesBySemantics.
- * Adding a double termination, making it a valid wide string termination, made the test succeed.
- * Therefore it looks like ansi version of EnumDevicesBySemantics forwards the string to
- * the wide variant without conversation. */
-
-static BOOL CALLBACK enum_semantics_callback(const DIDEVICEINSTANCEA *lpddi, IDirectInputDevice8A *lpdid, DWORD dwFlags, DWORD dwRemaining, void *context)
-{
-    struct enum_semantics_test *data = context;
-
-    if (context == NULL) return DIENUM_STOP;
-
-    if (!data->device_count) {
-        data->first_remaining = dwRemaining;
-    }
-    ok (dwRemaining == data->first_remaining - data->device_count,
-        "enum semantics remaining devices is wrong, expected %d, had %d\n",
-        data->first_remaining - data->device_count, dwRemaining);
-    data->device_count++;
-
-    if (IsEqualGUID(&lpddi->guidInstance, &GUID_SysKeyboard)) data->keyboard = TRUE;
-
-    if (IsEqualGUID(&lpddi->guidInstance, &GUID_SysMouse)) data->mouse = TRUE;
-
-    return DIENUM_CONTINUE;
-}
-
-static BOOL CALLBACK set_action_map_callback(const DIDEVICEINSTANCEA *lpddi, IDirectInputDevice8A *lpdid, DWORD dwFlags, DWORD dwRemaining, void *context)
-{
-    HRESULT hr;
-    struct enum_semantics_test *data = context;
-
-    /* Building and setting an action map */
-    /* It should not use any pre-stored mappings so we use DIDBAM_INITIALIZE */
-    hr = IDirectInputDevice8_BuildActionMap(lpdid, data->lpdiaf, NULL, DIDBAM_INITIALIZE);
-    ok (SUCCEEDED(hr), "BuildActionMap failed hr=%08x\n", hr);
-
-    hr = IDirectInputDevice8_SetActionMap(lpdid, data->lpdiaf, data->username, 0);
-    ok (SUCCEEDED(hr), "SetActionMap failed hr=%08x\n", hr);
-
-    return DIENUM_CONTINUE;
-}
-
-static void test_EnumDevicesBySemantics(void)
-{
-    IDirectInput8A *pDI;
-    HRESULT hr;
-    DIACTIONFORMATA diaf;
-    const GUID ACTION_MAPPING_GUID = { 0x1, 0x2, 0x3, { 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb } };
-    struct enum_semantics_test data = { 0, 0, FALSE, FALSE, &diaf, NULL };
-    int device_total = 0;
-
-    hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, &IID_IDirectInput8A, (void **)&pDI, NULL);
-    if (FAILED(hr))
-    {
-        win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr);
-        return;
-    }
-
-    memset (&diaf, 0, sizeof(diaf));
-    diaf.dwSize = sizeof(diaf);
-    diaf.dwActionSize = sizeof(DIACTIONA);
-    diaf.dwNumActions = ARRAY_SIZE(actionMapping);
-    diaf.dwDataSize = 4 * diaf.dwNumActions;
-    diaf.rgoAction = actionMapping;
-    diaf.guidActionMap = ACTION_MAPPING_GUID;
-    diaf.dwGenre = 0x01000000; /* DIVIRTUAL_DRIVING_RACE */
-    diaf.dwBufferSize = 32;
-
-    /* Test enumerating all attached and installed devices */
-    data.keyboard = FALSE;
-    data.mouse = FALSE;
-    data.device_count = 0;
-    hr = IDirectInput8_EnumDevicesBySemantics(pDI, NULL, &diaf, enum_semantics_callback, &data, DIEDBSFL_ATTACHEDONLY);
-    ok (data.device_count > 0, "EnumDevicesBySemantics did not call the callback hr=%08x\n", hr);
-    ok (data.keyboard, "EnumDevicesBySemantics should enumerate the keyboard\n");
-    ok (data.mouse, "EnumDevicesBySemantics should enumerate the mouse\n");
-
-    /* Enumerate Force feedback devices. We should get no mouse nor keyboard */
-    data.keyboard = FALSE;
-    data.mouse = FALSE;
-    data.device_count = 0;
-    hr = IDirectInput8_EnumDevicesBySemantics(pDI, NULL, &diaf, enum_semantics_callback, &data, DIEDBSFL_FORCEFEEDBACK);
-    ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr);
-    ok (!data.keyboard, "Keyboard should not be enumerated when asking for forcefeedback\n");
-    ok (!data.mouse, "Mouse should not be enumerated when asking for forcefeedback\n");
-
-    /* Enumerate available devices. That is devices not owned by any user.
-       Before setting the action map for all devices we still have them available. */
-    data.device_count = 0;
-    hr = IDirectInput8_EnumDevicesBySemantics(pDI, NULL, &diaf, enum_semantics_callback, &data, DIEDBSFL_AVAILABLEDEVICES);
-    ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr);
-    ok (data.device_count > 0, "There should be devices available before action mapping available=%d\n", data.device_count);
-
-    /* Keep the device total */
-    device_total = data.device_count;
-
-    /* There should be no devices for any user. No device should be enumerated with DIEDBSFL_THISUSER.
-       MSDN defines that all unowned devices are also enumerated but this doesn't seem to be happening. */
-    data.device_count = 0;
-    hr = IDirectInput8_EnumDevicesBySemantics(pDI, "Sh4d0w M4g3", &diaf, enum_semantics_callback, &data, DIEDBSFL_THISUSER);
-    ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr);
-    ok (data.device_count == 0, "No devices should be assigned for this user assigned=%d\n", data.device_count);
-
-    /* This enumeration builds and sets the action map for all devices with a NULL username */
-    hr = IDirectInput8_EnumDevicesBySemantics(pDI, NULL, &diaf, set_action_map_callback, &data, DIEDBSFL_ATTACHEDONLY);
-    ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed: hr=%08x\n", hr);
-
-    /* After a successful action mapping we should have no devices available */
-    data.device_count = 0;
-    hr = IDirectInput8_EnumDevicesBySemantics(pDI, NULL, &diaf, enum_semantics_callback, &data, DIEDBSFL_AVAILABLEDEVICES);
-    ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr);
-    ok (data.device_count == 0, "No device should be available after action mapping available=%d\n", data.device_count);
-
-    /* Now we'll give all the devices to a specific user */
-    data.username = "Sh4d0w M4g3";
-    hr = IDirectInput8_EnumDevicesBySemantics(pDI, NULL, &diaf, set_action_map_callback, &data, DIEDBSFL_ATTACHEDONLY);
-    ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed: hr=%08x\n", hr);
-
-    /* Testing with the default user, DIEDBSFL_THISUSER has no effect */
-    data.device_count = 0;
-    hr = IDirectInput8_EnumDevicesBySemantics(pDI, NULL, &diaf, enum_semantics_callback, &data, DIEDBSFL_THISUSER);
-    ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr);
-    ok (data.device_count == device_total, "THISUSER has no effect with NULL username owned=%d, expected=%d\n", data.device_count, device_total);
-
-    /* Using an empty user string is the same as passing NULL, DIEDBSFL_THISUSER has no effect */
-    data.device_count = 0;
-    hr = IDirectInput8_EnumDevicesBySemantics(pDI, "", &diaf, enum_semantics_callback, &data, DIEDBSFL_THISUSER);
-    ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr);
-    ok (data.device_count == device_total, "THISUSER has no effect with \"\" as username owned=%d, expected=%d\n", data.device_count, device_total);
-
-    /* Testing with a user with no ownership of the devices */
-    data.device_count = 0;
-    hr = IDirectInput8_EnumDevicesBySemantics(pDI, "Ninja Brian", &diaf, enum_semantics_callback, &data, DIEDBSFL_THISUSER);
-    ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr);
-    ok (data.device_count == 0, "This user should own no devices owned=%d\n", data.device_count);
-
-    /* Sh4d0w M4g3 has ownership of all devices */
-    data.device_count = 0;
-    hr = IDirectInput8_EnumDevicesBySemantics(pDI, "Sh4d0w M4g3", &diaf, enum_semantics_callback, &data, DIEDBSFL_THISUSER);
-    ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr);
-    ok (data.device_count == device_total, "This user should own %d devices owned=%d\n", device_total, data.device_count);
-
-    /* The call fails with a zeroed GUID */
-    memset(&diaf.guidActionMap, 0, sizeof(GUID));
-    data.device_count = 0;
-    hr = IDirectInput8_EnumDevicesBySemantics(pDI, NULL, &diaf, enum_semantics_callback, NULL, 0);
-    todo_wine ok(FAILED(hr), "EnumDevicesBySemantics succeeded with invalid GUID hr=%08x\n", hr);
-
-    IDirectInput8_Release(pDI);
-}
-
-static void test_GetDeviceStatus(void)
-{
-    IDirectInput8A *pDI;
-    HRESULT hr;
-
-    hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, &IID_IDirectInput8A, (void **)&pDI, NULL);
-    if (FAILED(hr))
-    {
-        win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr);
-        return;
-    }
-
-    hr = IDirectInput8_GetDeviceStatus(pDI, NULL);
-    ok(hr == E_POINTER, "IDirectInput8_GetDeviceStatus returned 0x%08x\n", hr);
-
-    hr = IDirectInput8_GetDeviceStatus(pDI, &GUID_Unknown);
-    todo_wine
-    ok(hr == DIERR_DEVICENOTREG, "IDirectInput8_GetDeviceStatus returned 0x%08x\n", hr);
-
-    hr = IDirectInput8_GetDeviceStatus(pDI, &GUID_SysMouse);
-    ok(hr == DI_OK, "IDirectInput8_GetDeviceStatus returned 0x%08x\n", hr);
-
-    IDirectInput8_Release(pDI);
-}
-
-static void test_RunControlPanel(void)
-{
-    IDirectInput8A *pDI;
-    HRESULT hr;
-
-    hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, &IID_IDirectInput8A, (void **)&pDI, NULL);
-    if (FAILED(hr))
-    {
-        win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr);
-        return;
-    }
-
-    if (winetest_interactive)
-    {
-        hr = IDirectInput8_RunControlPanel(pDI, NULL, 0);
-        ok(hr == S_OK, "IDirectInput8_RunControlPanel returned 0x%08x\n", hr);
-
-        hr = IDirectInput8_RunControlPanel(pDI, GetDesktopWindow(), 0);
-        ok(hr == S_OK, "IDirectInput8_RunControlPanel returned 0x%08x\n", hr);
-    }
-
-    hr = IDirectInput8_RunControlPanel(pDI, NULL, ~0u);
-    ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_RunControlPanel returned 0x%08x\n", hr);
-
-    hr = IDirectInput8_RunControlPanel(pDI, (HWND)0xdeadbeef, 0);
-    ok(hr == E_HANDLE, "IDirectInput8_RunControlPanel returned 0x%08x\n", hr);
-
-    hr = IDirectInput8_RunControlPanel(pDI, (HWND)0xdeadbeef, ~0u);
-    ok(hr == E_HANDLE, "IDirectInput8_RunControlPanel returned 0x%08x\n", hr);
-
-    IDirectInput8_Release(pDI);
-}
-
-static void test_Initialize(void)
-{
-    IDirectInput8A *pDI;
-    HRESULT hr;
-
-    hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, &IID_IDirectInput8A, (void **)&pDI, NULL);
-    if (FAILED(hr))
-    {
-        win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr);
-        return;
-    }
-
-    hr = IDirectInput8_Initialize(pDI, NULL, 0);
-    ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_Initialize returned 0x%08x\n", hr);
-
-    hr = IDirectInput8_Initialize(pDI, NULL, DIRECTINPUT_VERSION);
-    ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_Initialize returned 0x%08x\n", hr);
-
-    hr = IDirectInput8_Initialize(pDI, hInstance, 0);
-    ok(hr == DIERR_NOTINITIALIZED, "IDirectInput8_Initialize returned 0x%08x\n", hr);
-
-    /* Invalid DirectInput versions less than DIRECTINPUT_VERSION yield DIERR_BETADIRECTINPUTVERSION. */
-    hr = IDirectInput8_Initialize(pDI, hInstance, DIRECTINPUT_VERSION - 1);
-    ok(hr == DIERR_BETADIRECTINPUTVERSION, "IDirectInput8_Initialize returned 0x%08x\n", hr);
-
-    /* Invalid DirectInput versions greater than DIRECTINPUT_VERSION yield DIERR_BETADIRECTINPUTVERSION. */
-    hr = IDirectInput8_Initialize(pDI, hInstance, DIRECTINPUT_VERSION + 1);
-    ok(hr == DIERR_OLDDIRECTINPUTVERSION, "IDirectInput8_Initialize returned 0x%08x\n", hr);
-
-    hr = IDirectInput8_Initialize(pDI, hInstance, DIRECTINPUT_VERSION);
-    ok(hr == DI_OK, "IDirectInput8_Initialize returned 0x%08x\n", hr);
-
-    /* Parameters are still validated after successful initialization. */
-    hr = IDirectInput8_Initialize(pDI, hInstance, 0);
-    ok(hr == DIERR_NOTINITIALIZED, "IDirectInput8_Initialize returned 0x%08x\n", hr);
-
-    IDirectInput8_Release(pDI);
-}
-
-START_TEST(dinput8)
-{
-    hInstance = GetModuleHandleA(NULL);
-
-    CoInitialize(NULL);
-    test_preinitialization();
-    test_DirectInput8Create();
-    test_QueryInterface();
-    test_CreateDevice();
-    test_EnumDevices();
-    test_EnumDevicesBySemantics();
-    test_GetDeviceStatus();
-    test_RunControlPanel();
-    test_Initialize();
-    CoUninitialize();
-}
-- 
2.34.1




More information about the wine-devel mailing list