Rémi Bernon : winebus.sys: Stop haptics effects using the right function.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: db456c946b2e49addf7c63f31b0c0f9a865006d0
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=db456c946b2e49addf7c63f31...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Mon Feb 14 17:26:18 2022 +0100

winebus.sys: Stop haptics effects using the right function.

Depending on the API the device supports, in preferred order.

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/winebus.sys/bus_sdl.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c
index eda37e42c2c..7fc95b54f95 100644
--- a/dlls/winebus.sys/bus_sdl.c
+++ b/dlls/winebus.sys/bus_sdl.c
@@ -100,6 +100,7 @@ MAKE_FUNCPTR(SDL_HapticPause);
 MAKE_FUNCPTR(SDL_HapticQuery);
 MAKE_FUNCPTR(SDL_HapticRumbleInit);
 MAKE_FUNCPTR(SDL_HapticRumblePlay);
+MAKE_FUNCPTR(SDL_HapticRumbleStop);
 MAKE_FUNCPTR(SDL_HapticRumbleSupported);
 MAKE_FUNCPTR(SDL_HapticRunEffect);
 MAKE_FUNCPTR(SDL_HapticSetGain);
@@ -418,10 +419,12 @@ NTSTATUS sdl_device_haptics_start(struct unix_device *iface, UINT duration_ms,
 
     if (!effect.leftright.large_magnitude && !effect.leftright.small_magnitude)
     {
-        if (impl->effect_support & WINE_SDL_JOYSTICK_RUMBLE)
-            pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0);
-        else if (impl->sdl_haptic)
+        if (impl->effect_support & SDL_HAPTIC_LEFTRIGHT)
             pSDL_HapticStopAll(impl->sdl_haptic);
+        else if (impl->effect_support & WINE_SDL_HAPTIC_RUMBLE)
+            pSDL_HapticRumbleStop(impl->sdl_haptic);
+        else if (impl->effect_support & WINE_SDL_JOYSTICK_RUMBLE)
+            pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0);
 
         return STATUS_SUCCESS;
     }
@@ -998,6 +1001,7 @@ NTSTATUS sdl_bus_init(void *args)
     LOAD_FUNCPTR(SDL_HapticQuery);
     LOAD_FUNCPTR(SDL_HapticRumbleInit);
     LOAD_FUNCPTR(SDL_HapticRumblePlay);
+    LOAD_FUNCPTR(SDL_HapticRumbleStop);
     LOAD_FUNCPTR(SDL_HapticRumbleSupported);
     LOAD_FUNCPTR(SDL_HapticRunEffect);
     LOAD_FUNCPTR(SDL_HapticSetGain);