dinput: Check data format dwObjSize in IDirectInputDevice2WImpl_SetDataFormat.

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

dinput: Check data format dwObjSize in IDirectInputDevice2WImpl_SetDataFormat.
0e757229 · Rémi Bernon · Alexandre Julliard · 2064181c · 0e757229 · 0e757229
Commit 0e757229 authored Sep 23, 2021 by Rémi Bernon Committed by Alexandre Julliard Sep 23, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

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

No files found.
--- a/dlls/dinput/device.c
+++ b/dlls/dinput/device.c
@@ -1094,6 +1094,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetDataFormat(LPDIRECTINPUTDEVICE8W ifac
    _dump_DIDATAFORMAT(df);

    if (df->dwSize != sizeof(DIDATAFORMAT)) return DIERR_INVALIDPARAM;
+    if (df->dwObjSize != sizeof(DIOBJECTDATAFORMAT)) return DIERR_INVALIDPARAM;
    if (This->acquired) return DIERR_ACQUIRED;

    EnterCriticalSection(&This->crit);

--- a/dlls/dinput8/tests/hid.c
+++ b/dlls/dinput8/tests/hid.c
@@ -4015,7 +4015,6 @@ static void test_simple_joystick(void)
    ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr );
    dataformat.dwSize = sizeof(DIDATAFORMAT);
    hr = IDirectInputDevice8_SetDataFormat( device, &dataformat );
-    todo_wine
    ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr );
    dataformat.dwObjSize = sizeof(DIOBJECTDATAFORMAT);
    hr = IDirectInputDevice8_SetDataFormat( device, &dataformat );