wine-commits September 2021

wine-commits@winehq.org

2 participants
1030 discussions

Rémi Bernon : hidclass.sys: Complete all pending reads in polled mode only.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: 46f3ca4919f2834eb349607324bb31b92d5625ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=46f3ca4919f2834eb3496073… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 14 10:38:43 2021 +0200 hidclass.sys: Complete all pending reads in polled mode only. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 4 ---- dlls/hidclass.sys/device.c | 5 ++++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 5745fcedad3..86e878d5ecb 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -2194,9 +2194,7 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle /* second read should still be pending */ Sleep( 50 ); ret = GetOverlappedResult( async_file, &overlapped2, &value, FALSE ); - todo_wine ok( !ret, "GetOverlappedResult succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_IO_INCOMPLETE, "GetOverlappedResult returned error %u\n", GetLastError() ); memset( buffer + caps.InputReportByteLength, 0x3b, 5 ); @@ -2211,11 +2209,9 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle ok( value == caps.InputReportByteLength, "got length %u, expected %u\n", value, caps.InputReportByteLength ); off = report_id ? 0 : 1; - todo_wine ok( memcmp( report, buffer, caps.InputReportByteLength ), "expected different report\n" ); ok( !memcmp( report + off, report + caps.InputReportByteLength, caps.InputReportByteLength - off ), "expected identical reports\n" ); - todo_wine ok( !memcmp( buffer + off, buffer + caps.InputReportByteLength, caps.InputReportByteLength - off ), "expected identical reports\n" ); diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index b9b31045297..8e998bd71be 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -182,6 +182,7 @@ static void hid_device_queue_input( DEVICE_OBJECT *device, HID_XFER_PACKET *pack { BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; HIDP_COLLECTION_DESC *desc = ext->u.pdo.device_desc.CollectionDesc; + const BOOL polled = ext->u.pdo.information.Polled; struct hid_report *last_report, *report; struct hid_report_queue *queue; RAWINPUT *rawinput; @@ -223,8 +224,9 @@ static void hid_device_queue_input( DEVICE_OBJECT *device, HID_XFER_PACKET *pack hid_report_queue_push( queue, last_report ); KeReleaseSpinLock( &ext->u.pdo.report_queues_lock, irql ); - while ((irp = pop_irp_from_queue( ext ))) + do { + if (!(irp = pop_irp_from_queue( ext ))) break; queue = irp->Tail.Overlay.OriginalFileObject->FsContext; if (!(report = hid_report_queue_pop( queue ))) hid_report_incref( (report = last_report) ); @@ -235,6 +237,7 @@ static void hid_device_queue_input( DEVICE_OBJECT *device, HID_XFER_PACKET *pack IoCompleteRequest( irp, IO_NO_INCREMENT ); } + while (polled); hid_report_decref( last_report ); }

1 0

Rémi Bernon : dinput8/tests: Fix reported expected length in test message.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: 10dd6087003bda05206dd8fd46b4a2787761b8f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10dd6087003bda05206dd8fd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 14 10:38:42 2021 +0200 dinput8/tests: Fix reported expected length in test message. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 40d40b6fcdf..5745fcedad3 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -2105,7 +2105,8 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle ok( GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError() ); ret = GetOverlappedResult( async_file, &overlapped, &value, TRUE ); ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); - ok( value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected 3\n", value ); + ok( value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected %u\n", + value, (report_id ? 3 : 4) ); ResetEvent( overlapped.hEvent ); memcpy( buffer, report, caps.InputReportByteLength ); @@ -2124,11 +2125,13 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle /* wait for second report to be ready */ ret = GetOverlappedResult( async_file, &overlapped2, &value, TRUE ); ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); - ok( value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected 3\n", value ); + ok( value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected %u\n", + value, (report_id ? 3 : 4) ); /* first report should be ready and the same */ ret = GetOverlappedResult( async_file, &overlapped, &value, FALSE ); ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); - ok( value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected 3\n", value ); + ok( value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected %u\n", + value, (report_id ? 3 : 4) ); ok( memcmp( report, buffer + caps.InputReportByteLength, caps.InputReportByteLength ), "expected different report\n" ); ok( !memcmp( report, buffer, caps.InputReportByteLength ), "expected identical reports\n" );

1 0

Rémi Bernon : hidclass.sys: Drop input packets with unexpected length in non-polled mode.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: d40d8d968658dca4a75afc97f9e48acda0654b0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d40d8d968658dca4a75afc97… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 14 10:38:41 2021 +0200 hidclass.sys: Drop input packets with unexpected length in non-polled mode. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 3 --- dlls/hidclass.sys/device.c | 10 ++++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 0d0e528bf40..40d40b6fcdf 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -2187,7 +2187,6 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle /* first read should be completed */ ret = GetOverlappedResult( async_file, &overlapped, &value, TRUE ); ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); - todo_wine ok( value == caps.InputReportByteLength, "got length %u, expected %u\n", value, caps.InputReportByteLength ); /* second read should still be pending */ Sleep( 50 ); @@ -2206,13 +2205,11 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle ret = GetOverlappedResult( async_file, &overlapped2, &value, TRUE ); ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); - todo_wine ok( value == caps.InputReportByteLength, "got length %u, expected %u\n", value, caps.InputReportByteLength ); off = report_id ? 0 : 1; todo_wine ok( memcmp( report, buffer, caps.InputReportByteLength ), "expected different report\n" ); - todo_wine ok( !memcmp( report + off, report + caps.InputReportByteLength, caps.InputReportByteLength - off ), "expected identical reports\n" ); todo_wine diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 71fb4a366db..b9b31045297 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -246,7 +246,8 @@ static DWORD CALLBACK hid_device_thread(void *args) HIDP_COLLECTION_DESC *desc = ext->u.pdo.device_desc.CollectionDesc; HIDP_REPORT_IDS *reports = ext->u.pdo.device_desc.ReportIDs; ULONG report_count = ext->u.pdo.device_desc.ReportIDsLength; - ULONG i, report_id = 0, poll_interval = 0; + BOOL polled = ext->u.pdo.information.Polled; + ULONG i, report_id = 0, timeout = 0; HID_XFER_PACKET *packet; IO_STATUS_BLOCK io; BYTE *buffer; @@ -256,7 +257,7 @@ static DWORD CALLBACK hid_device_thread(void *args) buffer = (BYTE *)(packet + 1); packet->reportBuffer = buffer; - if (ext->u.pdo.information.Polled) poll_interval = ext->u.pdo.poll_interval; + if (polled) timeout = ext->u.pdo.poll_interval; for (i = 0; i < report_count; ++i) { @@ -288,10 +289,11 @@ static DWORD CALLBACK hid_device_thread(void *args) packet->reportBuffer = buffer; packet->reportBufferLen = io.Information; - hid_device_queue_input( device, packet ); + if (polled || io.Information == desc->InputLength) + hid_device_queue_input( device, packet ); } - res = WaitForSingleObject(ext->u.pdo.halt_event, poll_interval); + res = WaitForSingleObject(ext->u.pdo.halt_event, timeout); } while (res == WAIT_TIMEOUT); TRACE("device thread exiting, res %#x\n", res);

1 0

Rémi Bernon : dinput8/tests: Don't expect any IOCTL_HID_GET_STRING call.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: 880d7a11d780e2a04379000b38a86ae34d5dc93a URL: https://source.winehq.org/git/wine.git/?a=commit;h=880d7a11d780e2a04379000b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 14 10:38:40 2021 +0200 dinput8/tests: Don't expect any IOCTL_HID_GET_STRING call. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/driver_hid.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dinput8/tests/driver_hid.c b/dlls/dinput8/tests/driver_hid.c index cbaa1e89959..28694e5a4c6 100644 --- a/dlls/dinput8/tests/driver_hid.c +++ b/dlls/dinput8/tests/driver_hid.c @@ -568,9 +568,8 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) } case IOCTL_HID_GET_STRING: - ok( !in_size, "got input size %u\n", in_size ); - ok( out_size == 128, "got output size %u\n", out_size ); - + todo_wine + ok( 0, "unexpected IOCTL_HID_GET_STRING\n" ); memcpy( irp->UserBuffer, L"Wine Test", sizeof(L"Wine Test") ); irp->IoStatus.Information = sizeof(L"Wine Test"); ret = STATUS_SUCCESS;

1 0

Rémi Bernon : dinput8/tests: Add some non-polled READ_REPORT tests.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: 0b0d0cd6ed9f975d8986a9dd7ccbc43d1aeb0d7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b0d0cd6ed9f975d8986a9dd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 14 10:38:39 2021 +0200 dinput8/tests: Add some non-polled READ_REPORT tests. Using the new custom IOCTL to complete reads on demand. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 87 insertions(+), 1 deletion(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 0623ad9ae50..0d0e528bf40 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -1374,11 +1374,11 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle DWORD waveform_list; HIDP_DATA data[64]; USAGE usages[16]; + ULONG off, value; NTSTATUS status; HIDP_CAPS caps; unsigned int i; USHORT count; - ULONG value; BOOL ret; ret = HidD_GetPreparsedData( file, &preparsed_data ); @@ -2136,6 +2136,92 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle CloseHandle( overlapped.hEvent ); CloseHandle( overlapped2.hEvent ); } + else + { + struct hid_expect expect[] = + { + { + .code = IOCTL_HID_READ_REPORT, + .report_len = caps.InputReportByteLength - (report_id ? 0 : 1), + .report_buf = {report_id ? report_id : 0x5a,0x5a,0x5a}, + .ret_length = 3, + .ret_status = STATUS_SUCCESS, + }, + { + .code = IOCTL_HID_READ_REPORT, + .report_len = caps.InputReportByteLength - (report_id ? 0 : 1), + .report_buf = {report_id ? report_id : 0xa5,0xa5,0xa5,0xa5,0xa5}, + .ret_length = caps.InputReportByteLength - (report_id ? 0 : 1), + .ret_status = STATUS_SUCCESS, + }, + }; + + overlapped.hEvent = CreateEventW( NULL, FALSE, FALSE, NULL ); + overlapped2.hEvent = CreateEventW( NULL, FALSE, FALSE, NULL ); + + SetLastError( 0xdeadbeef ); + memset( report, 0, sizeof(report) ); + ret = ReadFile( async_file, report, caps.InputReportByteLength, NULL, &overlapped ); + ok( !ret, "ReadFile succeeded\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError() ); + Sleep( 50 ); + ret = GetOverlappedResult( async_file, &overlapped, &value, FALSE ); + ok( !ret, "GetOverlappedResult succeeded\n" ); + ok( GetLastError() == ERROR_IO_INCOMPLETE, "GetOverlappedResult returned error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + memset( buffer, 0, sizeof(buffer) ); + ret = ReadFile( async_file, buffer, caps.InputReportByteLength, NULL, &overlapped2 ); + ok( !ret, "ReadFile succeeded\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError() ); + Sleep( 50 ); + ret = GetOverlappedResult( async_file, &overlapped2, &value, FALSE ); + ok( !ret, "GetOverlappedResult succeeded\n" ); + ok( GetLastError() == ERROR_IO_INCOMPLETE, "GetOverlappedResult returned error %u\n", GetLastError() ); + + memset( report + caps.InputReportByteLength, 0xa5, 5 ); + if (report_id) report[caps.InputReportByteLength] = report_id; + + send_hid_input( file, expect, sizeof(expect) ); + + /* first read should be completed */ + ret = GetOverlappedResult( async_file, &overlapped, &value, TRUE ); + ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); + todo_wine + ok( value == caps.InputReportByteLength, "got length %u, expected %u\n", value, caps.InputReportByteLength ); + /* second read should still be pending */ + Sleep( 50 ); + ret = GetOverlappedResult( async_file, &overlapped2, &value, FALSE ); + todo_wine + ok( !ret, "GetOverlappedResult succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_IO_INCOMPLETE, "GetOverlappedResult returned error %u\n", GetLastError() ); + + memset( buffer + caps.InputReportByteLength, 0x3b, 5 ); + if (report_id) buffer[caps.InputReportByteLength] = report_id; + memset( expect[1].report_buf, 0x3b, 5 ); + if (report_id) expect[1].report_buf[0] = report_id; + + send_hid_input( file, expect, sizeof(expect) ); + + ret = GetOverlappedResult( async_file, &overlapped2, &value, TRUE ); + ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); + todo_wine + ok( value == caps.InputReportByteLength, "got length %u, expected %u\n", value, caps.InputReportByteLength ); + + off = report_id ? 0 : 1; + todo_wine + ok( memcmp( report, buffer, caps.InputReportByteLength ), "expected different report\n" ); + todo_wine + ok( !memcmp( report + off, report + caps.InputReportByteLength, caps.InputReportByteLength - off ), + "expected identical reports\n" ); + todo_wine + ok( !memcmp( buffer + off, buffer + caps.InputReportByteLength, caps.InputReportByteLength - off ), + "expected identical reports\n" ); + + CloseHandle( overlapped.hEvent ); + CloseHandle( overlapped2.hEvent ); + } HidD_FreePreparsedData( preparsed_data ); }

1 0

Rémi Bernon : dinput8/tests: Control expected READ_REPORT reports from the test executable.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: 10ddee1cdaa2e84cd76f66baf49e2ca4eb2c2e07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10ddee1cdaa2e84cd76f66ba… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 14 10:38:38 2021 +0200 dinput8/tests: Control expected READ_REPORT reports from the test executable. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/driver_hid.c | 125 +++++++++++++++++++++++++++++++++------- dlls/dinput8/tests/driver_hid.h | 1 + dlls/dinput8/tests/hid.c | 50 ++++++++++++++++ 3 files changed, 155 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=10ddee1cdaa2e84cd76f…

1 0

Zebediah Figura : ntdll: Explicitly return whether an async is complete in async_callback_t.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: 1eb56b20baefcdccaafbb622cadc71670c149e18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1eb56b20baefcdccaafbb622… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Sep 14 01:02:48 2021 -0500 ntdll: Explicitly return whether an async is complete in async_callback_t. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 92 ++++++++++++++++---------------- dlls/ntdll/unix/server.c | 6 ++- dlls/ntdll/unix/socket.c | 104 +++++++++++++++++-------------------- dlls/ntdll/unix/unix_private.h | 3 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 50 ++++++------------ 5 files changed, 112 insertions(+), 143 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1eb56b20baefcdccaafb…

1 0

Zebediah Figura : kernelbase: Don't set the output size in DeviceIoControl() if the NT status denotes error.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: f5bd94639911b918eb5ee2c0d93bd08fb1cb1778 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5bd94639911b918eb5ee2c0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Sep 14 01:02:47 2021 -0500 kernelbase: Don't set the output size in DeviceIoControl() if the NT status denotes error. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/file.c | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index a4d26c2a1be..5c7b649d805 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -4115,7 +4115,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH DeviceIoControl( HANDLE handle, DWORD code, void * status = NtDeviceIoControlFile( handle, event, NULL, cvalue, piosb, code, in_buff, in_count, out_buff, out_count ); - if (returned) *returned = piosb->Information; + if (returned && !NT_ERROR(status)) *returned = piosb->Information; if (status == STATUS_PENDING || !NT_SUCCESS( status )) return set_ntstatus( status ); return TRUE; } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index a1c6b68e6cb..614f263c5a3 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -675,7 +675,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) ok(GetLastError() == RtlNtStatusToDosError(expect_status), "got error %u\n", GetLastError()); } if (NT_ERROR(expect_status)) - todo_wine ok(size == 0xdeadf00d, "got size %u\n", size); + ok(size == 0xdeadf00d, "got size %u\n", size); else if (!NT_ERROR(params->iosb_status)) todo_wine_if (params->iosb_status == STATUS_PENDING) ok(size == 3, "got size %u\n", size); /* size is garbage if !NT_ERROR(expect_status) && NT_ERROR(iosb_status) */

1 0

Zebediah Figura : server: Create pseudo-fds as initially signaled.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: cc7e3ec8e269f628cb834915d562b747f96f70d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc7e3ec8e269f628cb834915… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Sep 14 01:02:46 2021 -0500 server: Create pseudo-fds as initially signaled. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 2 +- server/fd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index f9fd9aa23e8..a1c6b68e6cb 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -711,7 +711,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) ok(port != NULL, "failed to create port, error %u\n", GetLastError()); ret = WaitForSingleObject(file, 0); - todo_wine ok(!ret, "got %d\n", ret); + ok(!ret, "got %d\n", ret); ResetEvent(event); strcpy(buffer, "abcdef"); diff --git a/server/fd.c b/server/fd.c index 9486a1c3c7c..ad1b7a1bd4a 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1742,7 +1742,7 @@ struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *use fd->nt_namelen = 0; fd->unix_fd = -1; fd->cacheable = 0; - fd->signaled = 0; + fd->signaled = 1; fd->fs_locks = 0; fd->poll_index = -1; fd->completion = NULL;

1 0

Chip Davis : ntoskrnl: Always copy the output buffer for non-buffered ioctls.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: 7c0f6420059974ab127ae944b55d11dd71df3b85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c0f6420059974ab127ae944… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Tue Sep 14 01:02:45 2021 -0500 ntoskrnl: Always copy the output buffer for non-buffered ioctls. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30155 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 51 +++++++++++++++++++++++++++----------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 21 ++++++---------- 2 files changed, 44 insertions(+), 28 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 1bd5d6fb351..f2fb0a6d66e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -440,15 +440,43 @@ static void free_dispatch_irp( struct irp_data *irp_data ) free( irp_data ); } +static ULONG get_irp_output_size( IRP *irp ) +{ + IO_STACK_LOCATION *stack = IoGetNextIrpStackLocation( irp ); + + if (!irp->UserBuffer || (irp->Flags & IRP_WRITE_OPERATION)) + return 0; + + /* For IRPs not using buffered I/O, the driver is supposed to have direct + * access to the user's output buffer, either via an MDL (direct I/O) or + * with the raw user VA (neither). We can't fully support this, but we + * should at least copy the entire buffer back to the caller. */ + switch (stack->MajorFunction) + { + case IRP_MJ_FILE_SYSTEM_CONTROL: + case IRP_MJ_DEVICE_CONTROL: + case IRP_MJ_INTERNAL_DEVICE_CONTROL: + if ((stack->Parameters.DeviceIoControl.IoControlCode & 3) != METHOD_BUFFERED) + return stack->Parameters.DeviceIoControl.OutputBufferLength; + break; + + case IRP_MJ_READ: + /* FIXME: Handle non-buffered reads. */ + default: + break; + } + + if (NT_ERROR(irp->IoStatus.u.Status)) + return 0; + return irp->IoStatus.Information; +} + /* transfer result of IRP back to wineserver */ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, void *context ) { struct irp_data *irp_data = context; - void *out_buff = irp->UserBuffer; NTSTATUS status; - - if (irp->Flags & IRP_WRITE_OPERATION) - out_buff = NULL; /* do not transfer back input buffer */ + ULONG out_size; EnterCriticalSection( &irp_completion_cs ); @@ -460,15 +488,14 @@ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, return STATUS_MORE_PROCESSING_REQUIRED; } + out_size = get_irp_output_size( irp ); + SERVER_START_REQ( set_irp_result ) { req->handle = wine_server_obj_handle( irp_data->handle ); req->status = irp->IoStatus.u.Status; req->size = irp->IoStatus.Information; - if (!NT_ERROR(irp->IoStatus.u.Status)) - { - if (out_buff) wine_server_add_data( req, out_buff, irp->IoStatus.Information ); - } + if (out_size) wine_server_add_data( req, irp->UserBuffer, out_size ); status = wine_server_call( req ); } SERVER_END_REQ; @@ -943,17 +970,13 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) if (context.irp_data->complete) { /* IRP completed even before we got here; we can report completion now */ - void *out_buff = irp->UserBuffer; - - if (irp->Flags & IRP_WRITE_OPERATION) - out_buff = NULL; /* do not transfer back input buffer */ + unsigned int out_size = get_irp_output_size( irp ); req->prev = wine_server_obj_handle( context.irp_data->handle ); req->pending = irp->PendingReturned; req->iosb_status = irp->IoStatus.u.Status; req->result = irp->IoStatus.Information; - if (!NT_ERROR(irp->IoStatus.u.Status) && out_buff) - wine_server_add_data( req, out_buff, irp->IoStatus.Information ); + if (out_size) wine_server_add_data( req, irp->UserBuffer, out_size ); } else { diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index edc4a607225..f9fd9aa23e8 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -679,8 +679,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) else if (!NT_ERROR(params->iosb_status)) todo_wine_if (params->iosb_status == STATUS_PENDING) ok(size == 3, "got size %u\n", size); /* size is garbage if !NT_ERROR(expect_status) && NT_ERROR(iosb_status) */ - todo_wine_if (ioctl != IOCTL_WINETEST_RETURN_STATUS_BUFFERED) - ok(!strcmp(buffer, expect_buffer), "got buffer %s\n", buffer); + ok(!strcmp(buffer, expect_buffer), "got buffer %s\n", buffer); strcpy(buffer, "abcdef"); io.Status = 0xdeadf00d; @@ -701,8 +700,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) ok(io.Information == 3, "got size %Iu\n", io.Information); } } - todo_wine_if (ioctl != IOCTL_WINETEST_RETURN_STATUS_BUFFERED) - ok(!strcmp(buffer, expect_buffer), "got buffer %s\n", buffer); + ok(!strcmp(buffer, expect_buffer), "got buffer %s\n", buffer); /* Test the overlapped case. */ @@ -741,8 +739,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) ret = WaitForSingleObject(event, 0); ok(!ret, "got %d\n", ret); } - todo_wine_if (ioctl != IOCTL_WINETEST_RETURN_STATUS_BUFFERED) - ok(!strcmp(buffer, expect_buffer), "got buffer %s\n", buffer); + ok(!strcmp(buffer, expect_buffer), "got buffer %s\n", buffer); ret = WaitForSingleObject(file, 0); ok(ret == WAIT_TIMEOUT, "got %d\n", ret); @@ -793,8 +790,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) ret = WaitForSingleObject(event, 0); ok(!ret, "got %d\n", ret); } - todo_wine_if (ioctl != IOCTL_WINETEST_RETURN_STATUS_BUFFERED) - ok(!strcmp(buffer, expect_buffer), "got buffer %s\n", buffer); + ok(!strcmp(buffer, expect_buffer), "got buffer %s\n", buffer); /* As above, but use the file handle instead of an event. */ ret = WaitForSingleObject(file, 0); @@ -825,8 +821,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) ret = WaitForSingleObject(file, 0); ok(!ret, "got %d\n", ret); } - todo_wine_if (ioctl != IOCTL_WINETEST_RETURN_STATUS_BUFFERED) - ok(!strcmp(buffer, expect_buffer), "got buffer %s\n", buffer); + ok(!strcmp(buffer, expect_buffer), "got buffer %s\n", buffer); /* Test FILE_SKIP_COMPLETION_PORT_ON_SUCCESS. */ @@ -861,8 +856,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) ret = WaitForSingleObject(event, 0); ok(!ret, "got %d\n", ret); } - todo_wine_if (ioctl != IOCTL_WINETEST_RETURN_STATUS_BUFFERED) - ok(!strcmp(buffer, expect_buffer), "got buffer %s\n", buffer); + ok(!strcmp(buffer, expect_buffer), "got buffer %s\n", buffer); key = 0xdeadf00d; value = 0xdeadf00d; @@ -926,8 +920,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) ok(io.Information == 3, "got size %Iu\n", io.Information); } } - todo_wine_if (ioctl != IOCTL_WINETEST_RETURN_STATUS_BUFFERED) - ok(!strcmp(buffer, expect_buffer), "got buffer %s\n", buffer); + ok(!strcmp(buffer, expect_buffer), "got buffer %s\n", buffer); ret = SleepEx(0, TRUE); if (!params->pending && NT_ERROR(params->iosb_status))

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2021