Rémi Bernon : hidclass.sys: Return irp->IoStatus.Information from minidriver.
Alexandre Julliard
julliard at winehq.org
Wed Aug 4 16:41:38 CDT 2021
Module: wine
Branch: master
Commit: ecf6a16b8e9e983f0bc55d1acfe40abfe157f33b
URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecf6a16b8e9e983f0bc55d1acfe40abfe157f33b
Author: Rémi Bernon <rbernon at codeweavers.com>
Date: Tue Aug 3 18:55:22 2021 +0200
hidclass.sys: Return irp->IoStatus.Information from minidriver.
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
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 76d8898f00e..61126571ac6 100644
--- a/dlls/hidclass.sys/device.c
+++ b/dlls/hidclass.sys/device.c
@@ -526,12 +526,7 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp)
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);
More information about the wine-cvs
mailing list