dinput: Rewrite and simplify user data format object matching.

Signed-off-by: Rémi Bernon <rbernon@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dinput: Rewrite and simplify user data format object matching.
4e56801a · Rémi Bernon · Alexandre Julliard · 621af39c · 4e56801a · 4e56801a
Commit 4e56801a authored Oct 29, 2021 by Rémi Bernon Committed by Alexandre Julliard Oct 29, 2021
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 13 deletions

device.c dlls/dinput/device.c +0 -0

device_private.h dlls/dinput/device_private.h +0 -8

hid.c dlls/dinput8/tests/hid.c +0 -5

No files found.
--- a/dlls/dinput/device.c
+++ b/dlls/dinput/device.c
--- a/dlls/dinput/device_private.h
+++ b/dlls/dinput/device_private.h
@@ -30,14 +30,6 @@

 typedef struct
 {
-    int size;
-    int offset_in;
-    int offset_out;
-    int value;
-} DataTransform;
-
-typedef struct
-{
    LPDIDATAFORMAT              wine_df;     /* wine internal data format */
 } DataFormat;


--- a/dlls/dinput8/tests/hid.c
+++ b/dlls/dinput8/tests/hid.c
@@ -4475,26 +4475,21 @@ static void test_simple_joystick(void)
    objdataformat[3].dwType = 0xff|DIDFT_ANYINSTANCE;
    objdataformat[3].dwFlags = 0;
    hr = IDirectInputDevice8_SetDataFormat( device, &dataformat );
-    todo_wine
    ok( hr == DIERR_INVALIDPARAM, "SetDataFormat returned: %#x\n", hr );
    objdataformat[1].dwType = DIDFT_AXIS|DIDFT_MAKEINSTANCE( 12 );
    hr = IDirectInputDevice8_SetDataFormat( device, &dataformat );
-    todo_wine
    ok( hr == DIERR_INVALIDPARAM, "SetDataFormat returned: %#x\n", hr );
    objdataformat[1].dwType = DIDFT_AXIS|DIDFT_MAKEINSTANCE( 0xff );
    hr = IDirectInputDevice8_SetDataFormat( device, &dataformat );
-    todo_wine
    ok( hr == DIERR_INVALIDPARAM, "SetDataFormat returned: %#x\n", hr );
    objdataformat[1].dwType = DIDFT_AXIS|DIDFT_MAKEINSTANCE( 1 );
    hr = IDirectInputDevice8_SetDataFormat( device, &dataformat );
    ok( hr == DI_OK, "SetDataFormat returned: %#x\n", hr );
    objdataformat[1].pguid = &GUID_RzAxis;
    hr = IDirectInputDevice8_SetDataFormat( device, &dataformat );
-    todo_wine
    ok( hr == DIERR_INVALIDPARAM, "SetDataFormat returned: %#x\n", hr );
    objdataformat[1].pguid = &GUID_Unknown;
    hr = IDirectInputDevice8_SetDataFormat( device, &dataformat );
-    todo_wine
    ok( hr == DIERR_INVALIDPARAM, "SetDataFormat returned: %#x\n", hr );
    objdataformat[1].pguid = &GUID_YAxis;
    hr = IDirectInputDevice8_SetDataFormat( device, &dataformat );