[PATCH v10 10/10] Update expected reports len

[Tomasz Pakuła]

From: Tomasz Pakuła

---
 dlls/dinput/tests/driver_bus.c     |  2 +-
 dlls/dinput/tests/force_feedback.c | 25 ++++++++++++-------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/dlls/dinput/tests/driver_bus.c b/dlls/dinput/tests/driver_bus.c
index cf42a1bcf6e..1cf36d024fa 100644
--- a/dlls/dinput/tests/driver_bus.c
+++ b/dlls/dinput/tests/driver_bus.c
@@ -1118,7 +1118,7 @@ static NTSTATUS pdo_internal_ioctl( DEVICE_OBJECT *device, IRP *irp )
     {
         ULONG expected_size = impl->caps.InputReportByteLength - (impl->use_report_id ? 0 : 1);
         ok( !in_size, "got input size %lu\n", in_size );
-        ok( out_size == expected_size, "got output size %lu\n", out_size );
+        ok( out_size == expected_size, "got output size %lu\n, expected: %lu", out_size, expected_size );
         status = input_queue_read( &impl->input_queue, irp );
         irp_queue_complete( &impl->input_queue.completed, FALSE );

diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c
index f12ccef7ed3..464acb6ce97 100644
--- a/dlls/dinput/tests/force_feedback.c
+++ b/dlls/dinput/tests/force_feedback.c
@@ -3667,51 +3667,51 @@ static void test_condition_effect_six_axes( IDirectInputDevice8W *device, HANDLE
         {
             .code = IOCTL_HID_WRITE_REPORT,
             .report_id = 7,
-            .report_len = 7,
+            .report_len = 8,
             .report_buf = {0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
         },
         /* set condition */
         {
             .code = IOCTL_HID_WRITE_REPORT,
             .report_id = 7,
-            .report_len = 7,
+            .report_len = 8,
             .report_buf = {0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
         },
         /* set condition */
         {
             .code = IOCTL_HID_WRITE_REPORT,
             .report_id = 7,
-            .report_len = 7,
+            .report_len = 8,
             .report_buf = {0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
         },
         /* set condition */
         {
             .code = IOCTL_HID_WRITE_REPORT,
             .report_id = 7,
-            .report_len = 7,
+            .report_len = 8,
             .report_buf = {0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
         },
         /* set condition */
         {
             .code = IOCTL_HID_WRITE_REPORT,
             .report_id = 7,
-            .report_len = 7,
+            .report_len = 8,
             .report_buf = {0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
         },
         /* set condition */
         {
             .code = IOCTL_HID_WRITE_REPORT,
             .report_id = 7,
-            .report_len = 7,
+            .report_len = 8,
             .report_buf = {0x07,0x00,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,0x00,0x00,0x01,0x55,0x00,0x55,0x00,0x55,0x00},
-        // },
+        {
+            .code = IOCTL_HID_WRITE_REPORT,
+            .report_id = 3,
+            .report_len = 15,
+            .report_buf = {0x03,0x01,0x03,0x40,0x01,0x00,0x00,0x00,0x01,0x55,0x00,0x55,0x00,0x55,0x00},
+        },
     };
     static const DWORD expect_axes[6] =
     {
@@ -4308,7 +4308,6 @@ static BOOL test_force_feedback_six_axes( DWORD version )
     hr = IDirectInputDevice8_GetDeviceInfo( device, &devinst );
     ok( hr == DI_OK, "GetDeviceInfo returned %#lx\n", hr );
     check_member( devinst, expect_devinst, "%lu", dwSize );
-    todo_wine
     check_member_guid( devinst, expect_devinst, guidInstance );
     check_member_guid( devinst, expect_devinst, guidProduct );
     check_member( devinst, expect_devinst, "%#lx", dwDevType );