[PATCH 6/6] hidclass.sys: Return irp->IoStatus.Information from minidriver.

Rémi Bernon rbernon at codeweavers.com
Tue Aug 3 03:19:29 CDT 2021


Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
---
 dlls/hidclass.sys/device.c         | 5 -----
 dlls/ntoskrnl.exe/tests/ntoskrnl.c | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c
index 7c2ecb9b4df..5de946a0d17 100644
--- a/dlls/hidclass.sys/device.c
+++ b/dlls/hidclass.sys/device.c
@@ -523,12 +523,7 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp)
             call_minidriver( IOCTL_HID_GET_INPUT_REPORT, ext->u.pdo.parent_fdo, NULL, 0, packet,
                              sizeof(*packet), &irp->IoStatus );
             if (irp->IoStatus.Status == STATUS_SUCCESS)
-            {
                 irp->IoStatus.Status = copy_packet_into_buffer( packet, buffer, buffer_len, &out_length );
-                irp->IoStatus.Information = out_length;
-            }
-            else
-                irp->IoStatus.Information = 0;
             free(packet);
             break;
         }
diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c
index 91fa7e73c88..02f37773c67 100644
--- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c
@@ -2475,7 +2475,7 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled
     value = caps.InputReportByteLength * 2;
     ret = sync_ioctl(file, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, report, &value);
     ok(ret, "IOCTL_HID_GET_INPUT_REPORT failed, last error %u\n", GetLastError());
-    todo_wine ok(value == 3, "got length %u, expected 3\n", value);
+    ok(value == 3, "got length %u, expected 3\n", value);
     ok(report[0] == report_id, "got report[0] %02x, expected %02x\n", report[0], report_id);
 
 
-- 
2.32.0




More information about the wine-devel mailing list