[dinput] Set the correct size for the old dinput joystick

[Christoph Frick]

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 bc49263..1f25556 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 aea00df..4cce222 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;
     }
-- 
1.4.4.2

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 163 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20061220/41d6a0ea/attachment.pgp