dinput: Allow DIEFF_CARTESIAN directions when cAxes matches.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51922Signed-off-by: Rémi Bernon <rbernon@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dinput: Allow DIEFF_CARTESIAN directions when cAxes matches.
bc2ba90b · Rémi Bernon · Alexandre Julliard · 20476319 · bc2ba90b · bc2ba90b
Commit bc2ba90b authored Nov 10, 2021 by Rémi Bernon Committed by Alexandre Julliard Nov 10, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

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

hid.c dlls/dinput8/tests/hid.c +0 -2

No files found.
--- a/dlls/dinput/joystick_hid.c
+++ b/dlls/dinput/joystick_hid.c
@@ -2224,7 +2224,7 @@ static HRESULT WINAPI hid_joystick_effect_SetParameters( IDirectInputEffect *ifa
        count = impl->params.cAxes;
        if (params->cAxes < count) return DIERR_INVALIDPARAM;
        if ((direction_flags & DIEFF_POLAR) && count != 2) return DIERR_INVALIDPARAM;
-        if ((direction_flags & DIEFF_CARTESIAN) && count < 2) return DIERR_INVALIDPARAM;
+        if ((direction_flags & DIEFF_CARTESIAN) && params->cAxes != count) return DIERR_INVALIDPARAM;

        if (!count) memset( directions, 0, sizeof(directions) );
        else if (direction_flags & DIEFF_POLAR)

--- a/dlls/dinput8/tests/hid.c
+++ b/dlls/dinput8/tests/hid.c
@@ -6061,11 +6061,9 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO
        desc.rglDirection[1] = 2000;
        desc.rglDirection[2] = 3000;
        hr = IDirectInputEffect_SetParameters( effect, &desc, DIEP_DIRECTION | DIEP_NODOWNLOAD );
-        todo_wine_if( i == 2 )
        ok( hr == DIERR_INVALIDPARAM, "SetParameters returned %#x\n", hr );
        desc.cAxes = i;
        hr = IDirectInputEffect_SetParameters( effect, &desc, DIEP_DIRECTION | DIEP_NODOWNLOAD );
-        todo_wine_if( i == 1 )
        ok( hr == DI_DOWNLOADSKIPPED, "SetParameters returned %#x\n", hr );

        desc.dwFlags = DIEFF_SPHERICAL;