commit 1a85a57e0e45e396c31baa04e7af1b00fd57aca9
author Christian Costa <titan.costa@wanadoo.fr> Thu May 27 01:54:43 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu May 27 01:54:43 2004 +0000
tree 48f9a26fca9a80e27234cd78e45dc6e88f10d1b5
parent c51c46badaa49dde41beac0e2a7a01f123e939a9

Fixed joystick device type for dinput8.

dlls/dinput/joystick_linux.c

diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c
index 2a132e8..2fa869a 100644
--- a/dlls/dinput/joystick_linux.c
+++ b/dlls/dinput/joystick_linux.c
@@ -111,8 +111,10 @@
       lpddi->guidInstance	= GUID_Joystick;
       lpddi->guidProduct	= DInput_Wine_Joystick_GUID;
       /* we only support traditional joysticks for now */
-      lpddi->dwDevType	= DIDEVTYPE_JOYSTICK |
-	 		 (DIDEVTYPEJOYSTICK_TRADITIONAL<<8);
+      if (version >= 8)
+        lpddi->dwDevType	= DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8);
+      else
+        lpddi->dwDevType	= DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8);
       strcpy(lpddi->tszInstanceName,	"Joystick");
       /* ioctl JSIOCGNAME(len) */
       strcpy(lpddi->tszProductName,	"Wine Joystick");

dlls/dinput/joystick_linuxinput.c

diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c
index 2387bc6..402a695 100644
--- a/dlls/dinput/joystick_linuxinput.c
+++ b/dlls/dinput/joystick_linuxinput.c
@@ -189,7 +189,10 @@
   lpddi->guidProduct	= DInput_Wine_Joystick_GUID;
 
   lpddi->guidFFDriver = GUID_NULL;
-  lpddi->dwDevType    = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL<<8);
+  if (version >= 8)
+    lpddi->dwDevType    = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8);
+  else
+    lpddi->dwDevType    = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8);
 
   strcpy(lpddi->tszInstanceName, "Joystick");
   /* ioctl JSIOCGNAME(len) */