dinput: Always send both "Type Specific" and "Set Effect" reports on initial Download.

Fixes the Download method not sending an initial type specific HID PID report in the rare cases where all type specific params are set to 0 through the initial SetParameters call, so they aren't considered as modified. FH5 is affected by this issue, since it initially sets the direction of its constant effect to 0, which translates to 0 magnitude in dinput.

dinput: Always send both "Type Specific" and "Set Effect" reports on initial Download.
cd75ed18 · Ivo Ivanov · Alexandre Julliard · a146f9b6 · cd75ed18 · cd75ed18
Commit cd75ed18 authored Jul 26, 2022 by Ivo Ivanov Committed by Alexandre Julliard Nov 25, 2022
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

joystick_hid.c dlls/dinput/joystick_hid.c +3 -1

force_feedback.c dlls/dinput/tests/force_feedback.c +0 -3

No files found.
--- a/dlls/dinput/joystick_hid.c
+++ b/dlls/dinput/joystick_hid.c
@@ -2993,6 +2993,7 @@ static HRESULT WINAPI hid_joystick_effect_Download( IDirectInputEffect *iface )
        case PID_USAGE_ET_SAWTOOTH_DOWN:
        case PID_USAGE_ET_CONSTANT_FORCE:
        case PID_USAGE_ET_RAMP:
+            if (!(impl->flags & DIEP_ENVELOPE)) break;
            if (!(impl->modified & DIEP_ENVELOPE)) break;

            set_parameter_value( impl, impl->set_envelope_buf, set_envelope->attack_level_caps,
@@ -3100,7 +3101,7 @@ static HRESULT WINAPI hid_joystick_effect_Unload( IDirectInputEffect *iface )
            else hr = DIERR_INPUTLOST;
        }

-        impl->modified = impl->flags;
+        impl->modified = ~0;
        impl->index = 0;
        check_empty_force_feedback_state( joystick );
    }
@@ -3161,6 +3162,7 @@ static HRESULT hid_joystick_create_effect( IDirectInputDevice8W *iface, IDirectI
    impl->params.rgdwAxes = impl->axes;
    impl->params.rglDirection = impl->directions;
    impl->params.dwTriggerButton = -1;
+    impl->modified = ~0;
    impl->status = 0;

    *out = &impl->IDirectInputEffect_iface;

--- a/dlls/dinput/tests/force_feedback.c
+++ b/dlls/dinput/tests/force_feedback.c
@@ -367,7 +367,6 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO
            .report_id = 5,
            .report_len = 2,
            .report_buf = {0x05,0x00},
-            .todo = TRUE,
        },
        /* set envelope */
        {
@@ -375,7 +374,6 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO
            .report_id = 6,
            .report_len = 7,
            .report_buf = {0x06,0x00,0x00,0x00,0x00,0x00,0x00},
-            .todo = TRUE,
        },
        /* update effect */
        {
@@ -393,7 +391,6 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO
            .report_id = 5,
            .report_len = 2,
            .report_buf = {0x05,0x00},
-            .todo = TRUE,
        },
        /* update effect */
        {