dinput: Set the correct size for the old dinput joystick.

This also reverts my previous patch as this is the real cause for the problems with Grand Prix Legends.

dinput: Set the correct size for the old dinput joystick.
b0eb9d0b · Christoph Frick · Alexandre Julliard · df97fd3e · b0eb9d0b · b0eb9d0b
Commit b0eb9d0b authored Dec 20, 2006 by Christoph Frick Committed by Alexandre Julliard Dec 20, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

data_formats.c dlls/dinput/data_formats.c +1 -1

joystick_linuxinput.c dlls/dinput/joystick_linuxinput.c +1 -1

No files found.
--- a/dlls/dinput/data_formats.c
+++ b/dlls/dinput/data_formats.c
@@ -74,7 +74,7 @@ const DIDATAFORMAT c_dfDIJoystick = {
    sizeof(DIDATAFORMAT),
    sizeof(DIOBJECTDATAFORMAT),
    DIDF_ABSAXIS,
-    sizeof(DIJOYSTATE2),
+    sizeof(DIJOYSTATE),
    numObjects(dfDIJoystick),
    (LPDIOBJECTDATAFORMAT)dfDIJoystick
 };

--- a/dlls/dinput/joystick_linuxinput.c
+++ b/dlls/dinput/joystick_linuxinput.c
@@ -899,7 +899,7 @@ static HRESULT WINAPI JoystickAImpl_GetCapabilities(
 	return E_POINTER;
    }

-    if (lpDIDevCaps->dwSize < sizeof(DIDEVCAPS)) {
+    if (lpDIDevCaps->dwSize != sizeof(DIDEVCAPS)) {
        WARN("invalid argument\n");
        return DIERR_INVALIDPARAM;
    }