Fixed: Windows always fails with SDL_HapticOpenFromJoystick
authorSam Lantinga <slouken@libsdl.org>
Tue, 19 Apr 2011 08:08:50 -0700
changeset 5539 b305e3c2d2e7
parent 5538 b395a72329c3
child 5540 918efbff8259
Fixed: Windows always fails with SDL_HapticOpenFromJoystick The windows function SDL_SYS_HapticOpenFromJoystick fails because DIDEVICEINSTANCE joy_instance does not have its dwSize field initialized. The attached patch includes the fix along with a fix for two similar problems. Daniel Heath
src/haptic/windows/SDL_syshaptic.c
--- a/src/haptic/windows/SDL_syshaptic.c	Mon Apr 18 12:20:30 2011 -0700
+++ b/src/haptic/windows/SDL_syshaptic.c	Tue Apr 19 08:08:50 2011 -0700
@@ -549,6 +549,8 @@
 {
     HRESULT ret;
     DIDEVICEINSTANCE hap_instance, joy_instance;
+    hap_instance.dwSize = sizeof(DIDEVICEINSTANCE);
+    joy_instance.dwSize = sizeof(DIDEVICEINSTANCE);
 
     /* Get the device instances. */
     ret = IDirectInputDevice2_GetDeviceInfo(haptic->hwdata->device,
@@ -578,6 +580,7 @@
     int i, ret;
     HRESULT idret;
     DIDEVICEINSTANCE joy_instance;
+    joy_instance.dwSize = sizeof(DIDEVICEINSTANCE);
 
     /* 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++) {