Ivo Ivanov : dinput: Remove redundant check for DIEP_DIRECTION.
Alexandre Julliard
julliard at winehq.org
Fri Nov 12 16:16:04 CST 2021
Module: wine
Branch: master
Commit: f486811d5a92ee1c5ba5803afb2807431fa905c4
URL: https://source.winehq.org/git/wine.git/?a=commit;h=f486811d5a92ee1c5ba5803afb2807431fa905c4
Author: Ivo Ivanov <logos128 at gmail.com>
Date: Fri Nov 12 09:49:42 2021 +0100
dinput: Remove redundant check for DIEP_DIRECTION.
It is implied from the complete_mask check above.
Signed-off-by: Ivo Ivanov <logos128 at gmail.com>
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dinput/joystick_hid.c | 29 +++++++++++++----------------
1 file changed, 13 insertions(+), 16 deletions(-)
diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c
index b5b3c73d3de..4fdf961a04d 100644
--- a/dlls/dinput/joystick_hid.c
+++ b/dlls/dinput/joystick_hid.c
@@ -2698,24 +2698,21 @@ static HRESULT WINAPI hid_joystick_effect_Download( IDirectInputEffect *iface )
set_parameter_value_us( impl, impl->effect_update_buf, effect_update->trigger_repeat_interval_caps,
impl->params.dwTriggerRepeatInterval );
- if (impl->flags & DIEP_DIRECTION)
- {
- count = 1;
- usage = PID_USAGE_DIRECTION_ENABLE;
- status = HidP_SetUsages( HidP_Output, HID_USAGE_PAGE_PID, 0, &usage, &count,
- impl->joystick->preparsed, impl->effect_update_buf, report_len );
- if (status != HIDP_STATUS_SUCCESS) WARN( "HidP_SetUsages returned %#x\n", status );
+ count = 1;
+ usage = PID_USAGE_DIRECTION_ENABLE;
+ status = HidP_SetUsages( HidP_Output, HID_USAGE_PAGE_PID, 0, &usage, &count,
+ impl->joystick->preparsed, impl->effect_update_buf, report_len );
+ if (status != HIDP_STATUS_SUCCESS) WARN( "HidP_SetUsages returned %#x\n", status );
- spherical.rglDirection = directions;
- convert_directions_to_spherical( &impl->params, &spherical );
+ spherical.rglDirection = directions;
+ convert_directions_to_spherical( &impl->params, &spherical );
- if (!effect_update->direction_count) WARN( "no PID effect direction caps found\n" );
- else for (i = 0; i < spherical.cAxes - 1; ++i)
- {
- tmp = directions[i] + (i == 0 ? 9000 : 0);
- caps = effect_update->direction_caps[effect_update->direction_count - i - 1];
- set_parameter_value( impl, impl->effect_update_buf, caps, tmp % 36000 );
- }
+ if (!effect_update->direction_count) WARN( "no PID effect direction caps found\n" );
+ else for (i = 0; i < spherical.cAxes - 1; ++i)
+ {
+ tmp = directions[i] + (i == 0 ? 9000 : 0);
+ caps = effect_update->direction_caps[effect_update->direction_count - i - 1];
+ set_parameter_value( impl, impl->effect_update_buf, caps, tmp % 36000 );
}
status = HidP_SetUsageValue( HidP_Output, HID_USAGE_PAGE_PID, 0, PID_USAGE_TRIGGER_BUTTON,
More information about the wine-cvs
mailing list