From b0eb9d0b8990e13b5744d4bfd9ed286c438d987e Mon Sep 17 00:00:00 2001
From: Christoph Frick <frick@sc-networks.de>
Date: Wed, 20 Dec 2006 12:28:07 +0100
Subject: [PATCH] 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.
---
 dlls/dinput/data_formats.c        | 2 +-
 dlls/dinput/joystick_linuxinput.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/dinput/data_formats.c b/dlls/dinput/data_formats.c
index bc492631416..1f25556665f 100644
--- 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
 };
diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c
index aea00df9cdb..4cce22219b7 100644
--- 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;
     }