[PATCH v19 10/10] Update

[Tomasz Pakuła]

From: Tomasz Pakuła

---
 dlls/dinput/tests/force_feedback.c | 62 +++++++++++++++---------------
 1 file changed, 30 insertions(+), 32 deletions(-)

diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c
index c8f509ea8ab..228ef686588 100644
--- a/dlls/dinput/tests/force_feedback.c
+++ b/dlls/dinput/tests/force_feedback.c
@@ -3661,37 +3661,37 @@ done:

static void test_condition_effect_six_axes( IDirectInputDevice8W *device, HANDLE file, DWORD version )
 {
-    struct hid_expect expect_create[] =
-    {
-        /* set condition */
-        {
-            .code = IOCTL_HID_WRITE_REPORT,
-            .report_id = 7,
-            .report_len = 8,
-            .report_buf = {0x07,0x01,0x00,0x00,0x00,0x00,0x00,0x00},
-        },
-        /* set condition */
-        {
-            .code = IOCTL_HID_WRITE_REPORT,
-            .report_id = 7,
-            .report_len = 8,
-            .report_buf = {0x07,0x01,0x00,0x00,0x00,0x00,0x00,0x00},
-        },
-        /* update effect */
-        {
-            .code = IOCTL_HID_WRITE_REPORT,
-            .report_id = 3,
-            .report_len = 15,
-            .report_buf = {0x03,0x01,0x03,0x40,0x01,0x00,version >= 0x700 ? 0x06 : 0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00},
-        },
-    };
+    // struct hid_expect expect_create[] =
+    // {
+    //     /* set condition */
+    //     {
+    //         .code = IOCTL_HID_WRITE_REPORT,
+    //         .report_id = 7,
+    //         .report_len = 8,
+    //         .report_buf = {0x07,0x01,0x00,0x00,0x00,0x00,0x00,0x00},
+    //     },
+    //     /* set condition */
+    //     {
+    //         .code = IOCTL_HID_WRITE_REPORT,
+    //         .report_id = 7,
+    //         .report_len = 8,
+    //         .report_buf = {0x07,0x01,0x00,0x00,0x00,0x00,0x00,0x00},
+    //     },
+    //     /* update effect */
+    //     {
+    //         .code = IOCTL_HID_WRITE_REPORT,
+    //         .report_id = 3,
+    //         .report_len = 8,
+    //         .report_buf = {0x03,0x01,0x03,0x40,0x01,0x00,0x00,0x00},
+    //     },
+    // };
     static const DWORD expect_axes[2] =
     {
-        DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 0 ) | DIDFT_FFACTUATOR,
-        DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 1 ) | DIDFT_FFACTUATOR,
+        DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 4 ) | DIDFT_FFACTUATOR,
+        DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 5 ) | DIDFT_FFACTUATOR,
     };
     static const LONG expect_directions[2] = {
-        0,
+        9000,
         0,
     };
     static const DICONDITION expect_condition[2] =
@@ -3716,10 +3716,9 @@ static void test_condition_effect_six_axes( IDirectInputDevice8W *device, HANDLE
     const DIEFFECT expect_desc =
     {
         .dwSize = version >= 0x700 ? sizeof(DIEFFECT_DX6) : sizeof(DIEFFECT_DX5),
-        .dwFlags = DIEFF_POLAR | DIEFF_OBJECTIDS,
+        .dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTIDS,
         .dwDuration = 1000,
         .dwGain = 3000,
-        .dwTriggerButton = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( 0 ) | DIDFT_FFEFFECTTRIGGER,
         .dwTriggerRepeatInterval = 0,
         .cAxes = 2,
         .rgdwAxes = (void *)expect_axes,
@@ -3749,11 +3748,10 @@ static void test_condition_effect_six_axes( IDirectInputDevice8W *device, HANDLE
     ULONG ref;
     GUID guid;

-    set_hid_expect( file, NULL, 0 );
-    set_hid_expect( file, expect_create, sizeof(expect_create) );
+    // set_hid_expect( file, expect_create, sizeof(expect_create) );
     hr = IDirectInputDevice8_CreateEffect( device, &GUID_Spring, &expect_desc, &effect, NULL );
     ok( hr == DI_OK, "CreateEffect returned %#lx\n", hr );
-    set_hid_expect( file, NULL, 0 );
+    // set_hid_expect( file, NULL, 0 );

check_params.expect_effect = effect;
     hr = IDirectInputDevice8_EnumCreatedEffectObjects( device, check_created_effect_objects, &check_params, 0 );