Lucas Zawacki : dinput: Initialize all axis (from 0 to ABS_MAX) with -1.
Alexandre Julliard
julliard at winehq.org
Mon Mar 25 14:19:39 CDT 2013
Module: wine
Branch: master
Commit: 45a19b0c9b32b9a02be11b597a7db5341b310474
URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a19b0c9b32b9a02be11b597a7db5341b310474
Author: Lucas Zawacki <lfzawacki at gmail.com>
Date: Wed Mar 20 19:35:08 2013 -0300
dinput: Initialize all axis (from 0 to ABS_MAX) with -1.
---
dlls/dinput/joystick_linuxinput.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c
index 0a044a5..5ed9bde 100644
--- a/dlls/dinput/joystick_linuxinput.c
+++ b/dlls/dinput/joystick_linuxinput.c
@@ -445,9 +445,10 @@ static JoystickImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput, unsig
newDevice->generic.base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JoystickImpl*->base.crit");
/* Count number of available axes - supported Axis & POVs */
- for (i = 0; i < WINE_JOYSTICK_MAX_AXES; i++)
+ for (i = 0; i < ABS_MAX; i++)
{
- if (test_bit(newDevice->joydev->absbits, i))
+ if (i < WINE_JOYSTICK_MAX_AXES &&
+ test_bit(newDevice->joydev->absbits, i))
{
newDevice->generic.device_axis_count++;
newDevice->dev_axes_to_di[i] = idx;
More information about the wine-cvs
mailing list