Vitaliy Margolen : dinput: Joysticks are not supported for DX v3.

Alexandre Julliard julliard at winehq.org
Mon Apr 14 07:14:09 CDT 2008


Module: wine
Branch: master
Commit: e67c1cbf698f713761cf39abf9fe12375ab5e6e3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e67c1cbf698f713761cf39abf9fe12375ab5e6e3

Author: Vitaliy Margolen <wine-patches at kievinfo.com>
Date:   Sat Apr 12 11:33:18 2008 -0600

dinput: Joysticks are not supported for DX v3.

---

 dlls/dinput/joystick_linuxinput.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c
index 76456b0..f318392 100644
--- a/dlls/dinput/joystick_linuxinput.c
+++ b/dlls/dinput/joystick_linuxinput.c
@@ -375,7 +375,7 @@ static BOOL joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTAN
   }
 
   if (!((dwDevType == 0) ||
-        ((dwDevType == DIDEVTYPE_JOYSTICK) && (version < 0x0800)) ||
+        ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) ||
         (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))))
     return FALSE;
 
@@ -400,7 +400,7 @@ static BOOL joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTAN
   }
 
   if (!((dwDevType == 0) ||
-        ((dwDevType == DIDEVTYPE_JOYSTICK) && (version < 0x0800)) ||
+        ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) ||
         (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))))
     return FALSE;
 




More information about the wine-cvs mailing list