We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Untested patch to fix haptic index being 0 always when opening from joystick in windows.

sdl_hapticindex_win.diff (text/plain), 1.04 KB, created by Edgar Simo on 2011-02-20 09:18:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Edgar Simo

Created: 2011-02-20 09:18:40 UTC

Size: 1.04 KB

patch

obsolete

>diff -r 192f2d605339 src/haptic/windows/SDL_syshaptic.c
>--- a/src/haptic/windows/SDL_syshaptic.c	Wed Feb 16 04:08:28 2011 -0800
>+++ b/src/haptic/windows/SDL_syshaptic.c	Sun Feb 20 18:17:23 2011 +0100
>@@ -576,7 +576,26 @@
> int
> SDL_SYS_HapticOpenFromJoystick(SDL_Haptic * haptic, SDL_Joystick * joystick)
> {
>-    int ret;
>+    int i, ret;
>+    HRESULT idret;
>+    DIDEVICEINSTANCE joy_instance;
>+
>+    /* Since it comes from a joystick we have to try to match it with a haptic device on our haptic list. */
>+    for (i=0; i<SDL_numhaptics; i++) {
>+        idret = IDirectInputDevice2_GetDeviceInfo(joystick->hwdata->InputDevice,
>+              &joy_instance);
>+        if (FAILED(idret)) {
>+            return -1;
>+        }
>+        if (DI_GUIDIsSame(&SDL_hapticlist[i].instance.guidInstance,
>+                          &joy_instance.guidInstance)) {
>+            haptic->index = i;
>+            break;
>+        }
>+    }
>+    if (i >= SDL_numhaptics) {
>+        return -1;
>+    }
> 
>     /* Allocate the hwdata */
>     haptic->hwdata = (struct haptic_hwdata *)

Actions: View | Diff

Attachments on bug 946: 580 | 581

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.