Seems like you have to get capabilities after setting data format.

libsdl-org · Aug 4, 2008 · 4bb9877 · 4bb9877
1 parent 2245ba6
commit 4bb9877
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/src/haptic/win32/SDL_syshaptic.c b/src/haptic/win32/SDL_syshaptic.c
@@ -230,6 +230,7 @@ DI_EffectCallback(LPCDIEFFECTINFO pei, LPVOID pv)
  *       - Release DirectInputDevice interface.
  *       - Set cooperative level.
  *       - Set data format.
+ *       - Get capabilities.
  *       - Acquire exclusiveness.
  *       - Reset actuators.
  *       - Get supported featuers.
@@ -286,6 +287,14 @@ SDL_SYS_HapticOpenFromInstance(SDL_Haptic * haptic, DIDEVICEINSTANCE instance)
       goto query_err;
    }
 
+   /* Get capabilities. */
+   ret = IDirectInputDevice2_GetCapabilities( haptic->hwdata->device,
+                                              &haptic->hwdata->capabilities );
+   if (FAILED(ret)) {
+      DI_SetError("Getting device capabilities",ret);
+      goto acquire_err;
+   }
+
    /* Acquire the device. */
    ret = IDirectInputDevice2_Acquire(haptic->hwdata->device);
    if (FAILED(ret)) {
@@ -310,16 +319,6 @@ SDL_SYS_HapticOpenFromInstance(SDL_Haptic * haptic, DIDEVICEINSTANCE instance)
       goto acquire_err;
    }
 
-
-   /* Get capabilities. */
-   ret = IDirectInputDevice2_GetCapabilities( haptic->hwdata->device,
-                                              &haptic->hwdata->capabilities );
-   if (FAILED(ret)) {
-      DI_SetError("Getting device capabilities",ret);
-      goto acquire_err;
-   }
-
-
    /* Get supported effects. */
    ret = IDirectInputDevice2_EnumEffects( haptic->hwdata->device, 
                                           DI_EffectCallback, haptic, DIEFT_ALL );