dinput/tests: Load the test driver in the WinePlugPlay group.

So that it shares hidclass.sys with other device drivers. This won't make all the tests to pass if there's some physical devices, but it'll avoid a few spurious failures. Signed-off-by: Rémi Bernon <rbernon@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dinput/tests: Load the test driver in the WinePlugPlay group.
b5f92fe7 · Rémi Bernon · Alexandre Julliard · feea75c6 · b5f92fe7 · b5f92fe7
Commit b5f92fe7 authored Jan 20, 2022 by Rémi Bernon Committed by Alexandre Julliard Jan 20, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

hid.c dlls/dinput/tests/hid.c +1 -1

joystick8.c dlls/dinput/tests/joystick8.c +0 -3

No files found.
--- a/dlls/dinput/tests/hid.c
+++ b/dlls/dinput/tests/hid.c
@@ -339,7 +339,7 @@ static const char inf_text[] =
    "ServiceType=1\n"
    "StartType=3\n"
    "ErrorControl=1\n"
-    "LoadOrderGroup=Extended Base\n"
+    "LoadOrderGroup=WinePlugPlay\n"
    "DisplayName=\"winetest bus driver\"\n"
    "; they don't sleep anymore, on the beach\n";


--- a/dlls/dinput/tests/joystick8.c
+++ b/dlls/dinput/tests/joystick8.c
@@ -248,9 +248,6 @@ static void check_dinput_devices( DWORD version, DIDEVICEINSTANCEW *devinst )
        prop_dword.dwData = 0xdeadbeef;
        hr = IDirectInputDevice8_GetProperty( device, DIPROP_VIDPID, &prop_dword.diph );
        ok( hr == DI_OK, "GetProperty DIPROP_VIDPID returned %#x\n", hr );
-        /* Wine may get the wrong device here, because the test driver creates another instance of
-           hidclass.sys, and gets duplicate rawinput handles, which we use in the guidInstance */
-        todo_wine_if( prop_dword.dwData != EXPECT_VIDPID )
        ok( prop_dword.dwData == EXPECT_VIDPID, "got %#x expected %#x\n", prop_dword.dwData, EXPECT_VIDPID );

        ref = IDirectInputDevice8_Release( device );