ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winebus.sys: Use SDL_HAPTIC_INFINITY for the infinity durations in the SDL backend. 

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51922
Signed-off-by: Ivo Ivanov <logos128@gmail.com>
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Ivo Ivanov 2021-12-09 14:44:12 +01:00 committed by Alexandre Julliard
parent bc36b50c07
commit b3faad66cf
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/winebus.sys/bus_sdl.c
View File

@ -515,7 +515,7 @@ static NTSTATUS sdl_device_physical_effect_control(struct unix_device *iface, BY
pSDL_HapticStopAll(impl->sdl_haptic); pSDL_HapticStopAll(impl->sdl_haptic);
/* fallthrough */ /* fallthrough */
case PID_USAGE_OP_EFFECT_START: case PID_USAGE_OP_EFFECT_START:
pSDL_HapticRunEffect(impl->sdl_haptic, id, iterations); pSDL_HapticRunEffect(impl->sdl_haptic, id, (iterations == 0xff ? SDL_HAPTIC_INFINITY : iterations));
break; break;
case PID_USAGE_OP_EFFECT_STOP: case PID_USAGE_OP_EFFECT_STOP:
pSDL_HapticStopEffect(impl->sdl_haptic, id); pSDL_HapticStopEffect(impl->sdl_haptic, id);
@ -592,7 +592,7 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT
case PID_USAGE_ET_TRIANGLE: case PID_USAGE_ET_TRIANGLE:
case PID_USAGE_ET_SAWTOOTH_UP: case PID_USAGE_ET_SAWTOOTH_UP:
case PID_USAGE_ET_SAWTOOTH_DOWN: case PID_USAGE_ET_SAWTOOTH_DOWN:
effect.periodic.length = params->duration; effect.periodic.length = (params->duration == 0xffff ? SDL_HAPTIC_INFINITY : params->duration);
effect.periodic.delay = params->start_delay; effect.periodic.delay = params->start_delay;
effect.periodic.button = params->trigger_button; effect.periodic.button = params->trigger_button;
effect.periodic.interval = params->trigger_repeat_interval; effect.periodic.interval = params->trigger_repeat_interval;
@ -613,7 +613,7 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT
case PID_USAGE_ET_DAMPER: case PID_USAGE_ET_DAMPER:
case PID_USAGE_ET_INERTIA: case PID_USAGE_ET_INERTIA:
case PID_USAGE_ET_FRICTION: case PID_USAGE_ET_FRICTION:
effect.condition.length = params->duration; effect.condition.length = (params->duration == 0xffff ? SDL_HAPTIC_INFINITY : params->duration);
effect.condition.delay = params->start_delay; effect.condition.delay = params->start_delay;
effect.condition.button = params->trigger_button; effect.condition.button = params->trigger_button;
effect.condition.interval = params->trigger_repeat_interval; effect.condition.interval = params->trigger_repeat_interval;
@ -641,7 +641,7 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT
break; break;
case PID_USAGE_ET_CONSTANT_FORCE: case PID_USAGE_ET_CONSTANT_FORCE:
effect.constant.length = params->duration; effect.constant.length = (params->duration == 0xffff ? SDL_HAPTIC_INFINITY : params->duration);
effect.constant.delay = params->start_delay; effect.constant.delay = params->start_delay;
effect.constant.button = params->trigger_button; effect.constant.button = params->trigger_button;
effect.constant.interval = params->trigger_repeat_interval; effect.constant.interval = params->trigger_repeat_interval;
@ -655,6 +655,8 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT
effect.constant.fade_level = params->envelope.fade_level; effect.constant.fade_level = params->envelope.fade_level;
break; break;
/* According to the SDL documentation, ramp effect doesn't
* support SDL_HAPTIC_INFINITY. */
case PID_USAGE_ET_RAMP: case PID_USAGE_ET_RAMP:
effect.ramp.length = params->duration; effect.ramp.length = params->duration;
effect.ramp.delay = params->start_delay; effect.ramp.delay = params->start_delay;