dinput: Make sure converted direction values are always positive.

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

dinput: Make sure converted direction values are always positive.
11cb3bbf · Rémi Bernon · Alexandre Julliard · 37abfa73 · 11cb3bbf · 11cb3bbf
Commit 11cb3bbf authored Apr 29, 2022 by Rémi Bernon Committed by Alexandre Julliard May 18, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 27 deletions

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

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

No files found.
--- a/dlls/dinput/joystick_hid.c
+++ b/dlls/dinput/joystick_hid.c
@@ -2307,6 +2307,7 @@ static void convert_directions_to_spherical( const DIEFFECT *in, DIEFFECT *out )
            for (j = 1; j < i; ++j) tmp = sqrt( tmp * tmp + in->rglDirection[j] * in->rglDirection[j] );
            tmp = atan2( in->rglDirection[i], tmp );
            out->rglDirection[i - 1] = tmp * 18000 / M_PI;
+            if (out->rglDirection[i - 1] < 0) out->rglDirection[i - 1] += 36000;
        }
        if (in->cAxes) out->rglDirection[in->cAxes - 1] = 0;
        out->cAxes = in->cAxes;

--- a/dlls/dinput/tests/force_feedback.c
+++ b/dlls/dinput/tests/force_feedback.c
@@ -5480,16 +5480,7 @@ static void test_windows_gaming_input(void)
            .code = IOCTL_HID_WRITE_REPORT,
            .report_id = 3,
            .report_len = 18,
-            .report_buf = {3,0x01,0x02,0x08,0x78,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,0xff,0xff,0xce,0x00,0x00,0x00},
-            .wine_only = TRUE,
-            .todo = TRUE,
-        },
-        {
-            .code = IOCTL_HID_WRITE_REPORT,
-            .report_id = 3,
-            .report_len = 18,
            .report_buf = {3,0x01,0x02,0x08,0x78,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,0xff,0xff,0x4e,0x01,0x00,0x00},
-            .todo = TRUE,
        },
    };
    struct hid_expect expect_create_condition[] =
@@ -5558,16 +5549,7 @@ static void test_windows_gaming_input(void)
            .code = IOCTL_HID_WRITE_REPORT,
            .report_id = 3,
            .report_len = 18,
-            .report_buf = {3,0x01,0x04,0x08,0x5a,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,0xff,0x7f,0xce,0x00,0x00,0x00},
-            .wine_only = TRUE,
-            .todo = TRUE,
-        },
-        {
-            .code = IOCTL_HID_WRITE_REPORT,
-            .report_id = 3,
-            .report_len = 18,
            .report_buf = {3,0x01,0x04,0x08,0x5a,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,0xff,0x7f,0x4e,0x01,0x00,0x00},
-            .todo = TRUE,
        },
    };
    struct hid_expect expect_create_ramp[] =
@@ -5605,16 +5587,7 @@ static void test_windows_gaming_input(void)
            .code = IOCTL_HID_WRITE_REPORT,
            .report_id = 3,
            .report_len = 18,
-            .report_buf = {3,0x01,0x05,0x08,0x5a,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,0xff,0xff,0xce,0x00,0x00,0x00},
-            .wine_only = TRUE,
-            .todo = TRUE,
-        },
-        {
-            .code = IOCTL_HID_WRITE_REPORT,
-            .report_id = 3,
-            .report_len = 18,
            .report_buf = {3,0x01,0x05,0x08,0x5a,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,0xff,0xff,0x4e,0x01,0x00,0x00},
-            .todo = TRUE,
        },
    };
    struct hid_expect expect_effect_start =