September 2021 - Wine-Commits

Zebediah Figura : ntoskrnl: Report separately whether an IRP was marked pending.
by Alexandre Julliard Sept. 13, 2021

Sept. 13, 2021

Module: wine Branch: master Commit: 097685aa9ea06440b69ef0a1555771b08cb97ce4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=097685aa9ea06440b69ef0a1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Sep 12 16:07:52 2021 -0500 ntoskrnl: Report separately whether an IRP was marked pending. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 5 +++++ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 3 +-- include/wine/server_protocol.h | 4 +++- server/device.c | 2 +- server/protocol.def | 1 + server/request.h | 7 ++++--- server/trace.c | 1 + 7 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 42976f4905e..1bd5d6fb351 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -949,11 +949,16 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) out_buff = NULL; /* do not transfer back input buffer */ 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 ); } + else + { + req->pending = 1; + } } else { diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 3798c3d59c1..49498a5e0e8 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -882,8 +882,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) } else { - todo_wine_if (params->ret_status != STATUS_PENDING) - ok(!ret, "got %#x\n", ret); + ok(!ret, "got %#x\n", ret); } if (!ret) { diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 4a12e6533f6..e22da223894 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4801,9 +4801,11 @@ struct get_next_device_request_request obj_handle_t prev; unsigned int status; client_ptr_t user_ptr; + int pending; unsigned int iosb_status; data_size_t result; /* VARARG(data,bytes); */ + char __pad_44[4]; }; struct get_next_device_request_reply { @@ -6255,7 +6257,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 728 +#define SERVER_PROTOCOL_VERSION 729 /* ### protocol_version end ### */ diff --git a/server/device.c b/server/device.c index df1a71a5a4d..5abe1e3bb00 100644 --- a/server/device.c +++ b/server/device.c @@ -954,7 +954,7 @@ DECL_HANDLER(get_next_device_request) if (irp->async) { - if (req->status == STATUS_PENDING) + if (req->pending) set_async_pending( irp->async ); async_set_initial_status( irp->async, req->status ); diff --git a/server/protocol.def b/server/protocol.def index 608c481db27..02c1f269be7 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3368,6 +3368,7 @@ struct handle_info obj_handle_t prev; /* handle to the previous irp */ unsigned int status; /* status of the previous irp */ client_ptr_t user_ptr; /* user pointer of the previous irp */ + int pending; /* was the previous irp marked pending? */ unsigned int iosb_status; /* IOSB status of the previous irp */ data_size_t result; /* IOSB result of the previous irp */ VARARG(data,bytes); /* output data of the previous irp */ diff --git a/server/request.h b/server/request.h index c2e8e30d1e1..f3567cd967f 100644 --- a/server/request.h +++ b/server/request.h @@ -2053,9 +2053,10 @@ C_ASSERT( FIELD_OFFSET(struct get_next_device_request_request, manager) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_next_device_request_request, prev) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_next_device_request_request, status) == 20 ); C_ASSERT( FIELD_OFFSET(struct get_next_device_request_request, user_ptr) == 24 ); -C_ASSERT( FIELD_OFFSET(struct get_next_device_request_request, iosb_status) == 32 ); -C_ASSERT( FIELD_OFFSET(struct get_next_device_request_request, result) == 36 ); -C_ASSERT( sizeof(struct get_next_device_request_request) == 40 ); +C_ASSERT( FIELD_OFFSET(struct get_next_device_request_request, pending) == 32 ); +C_ASSERT( FIELD_OFFSET(struct get_next_device_request_request, iosb_status) == 36 ); +C_ASSERT( FIELD_OFFSET(struct get_next_device_request_request, result) == 40 ); +C_ASSERT( sizeof(struct get_next_device_request_request) == 48 ); C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, params) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, next) == 40 ); C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, client_tid) == 44 ); diff --git a/server/trace.c b/server/trace.c index fa943d217bb..da8c74cea2b 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4177,6 +4177,7 @@ static void dump_get_next_device_request_request( const struct get_next_device_r fprintf( stderr, ", prev=%04x", req->prev ); fprintf( stderr, ", status=%08x", req->status ); dump_uint64( ", user_ptr=", &req->user_ptr ); + fprintf( stderr, ", pending=%d", req->pending ); fprintf( stderr, ", iosb_status=%08x", req->iosb_status ); fprintf( stderr, ", result=%u", req->result ); dump_varargs_bytes( ", data=", cur_size );

1 0

Rémi Bernon : hidclass.sys: Enforce output packet lengths to match report lengths.
by Alexandre Julliard Sept. 13, 2021

Sept. 13, 2021

Module: wine Branch: master Commit: 88a8e824e69a6160e6b87a354b2ab55f6fbe5278 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88a8e824e69a6160e6b87a35… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 13 10:48:58 2021 +0200 hidclass.sys: Enforce output packet lengths to match report lengths. 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 | 3 --- dlls/dinput8/tests/driver_hid.h | 1 - dlls/dinput8/tests/hid.c | 3 --- dlls/hidclass.sys/device.c | 17 ++++++----------- 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/dlls/dinput8/tests/driver_hid.c b/dlls/dinput8/tests/driver_hid.c index 7d613f1d92c..91f420d7bf6 100644 --- a/dlls/dinput8/tests/driver_hid.c +++ b/dlls/dinput8/tests/driver_hid.c @@ -389,7 +389,6 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) winetest_push_context( "%s expect[%d]", expect.context, index ); ok( expect.code == code, "got %#x, expected %#x\n", expect.code, code ); ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); - todo_wine_if( expect.todo_report_len ) ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); ok( RtlCompareMemory( packet->reportBuffer, expect.report_buf, expect.report_len ) == expect.report_len, "unexpected data\n" ); @@ -439,7 +438,6 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) winetest_push_context( "%s expect[%d]", expect.context, index ); ok( expect.code == code, "got %#x, expected %#x\n", expect.code, code ); ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); - todo_wine_if( expect.todo_report_len ) ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); ok( RtlCompareMemory( packet->reportBuffer, expect.report_buf, expect.report_len ) == expect.report_len, "unexpected data\n" ); @@ -489,7 +487,6 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) winetest_push_context( "%s expect[%d]", expect.context, index ); ok( expect.code == code, "got %#x, expected %#x\n", expect.code, code ); ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); - todo_wine_if( expect.todo_report_len ) ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); ok( RtlCompareMemory( packet->reportBuffer, expect.report_buf, expect.report_len ) == expect.report_len, "unexpected data\n" ); diff --git a/dlls/dinput8/tests/driver_hid.h b/dlls/dinput8/tests/driver_hid.h index e7202594c25..c9c75c6d081 100644 --- a/dlls/dinput8/tests/driver_hid.h +++ b/dlls/dinput8/tests/driver_hid.h @@ -48,7 +48,6 @@ struct hid_expect DWORD ret_status; BYTE broken; /* missing on some win versions */ BYTE report_id; - BYTE todo_report_len; BYTE report_len; BYTE report_buf[128]; char context[64]; diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 5bcfc5b9f83..85ccc2a05df 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -946,7 +946,6 @@ static void test_hidp_set_feature( HANDLE file, int report_id, ULONG report_len, { .code = IOCTL_HID_SET_FEATURE, .report_id = report_id, - .todo_report_len = TRUE, .report_len = report_len - (report_id ? 0 : 1), .report_buf = { @@ -1048,7 +1047,6 @@ static void test_hidp_set_output( HANDLE file, int report_id, ULONG report_len, { .code = IOCTL_HID_SET_OUTPUT_REPORT, .report_id = report_id, - .todo_report_len = TRUE, .report_len = report_len - (report_id ? 0 : 1), .report_buf = {report_id,0,0xcd,0xcd,0xcd}, .ret_length = 3, @@ -1135,7 +1133,6 @@ static void test_write_file( HANDLE file, int report_id, ULONG report_len ) { .code = IOCTL_HID_WRITE_REPORT, .report_id = report_id, - .todo_report_len = report_id == 0, .report_len = report_len - (report_id ? 0 : 1), .report_buf = {report_id ? report_id : 0xcd,0xcd,0xcd,0xcd,0xcd}, .ret_length = 3, diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 9b91834267e..71fb4a366db 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -365,7 +365,7 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP HIDP_REPORT_IDS *reports = ext->u.pdo.device_desc.ReportIDs; ULONG report_count = ext->u.pdo.device_desc.ReportIDsLength; IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); - ULONG i, report_len = 0, buffer_len = 0; + ULONG i, offset = 0, report_len = 0, buffer_len = 0; HID_XFER_PACKET packet; BYTE *buffer = NULL; @@ -402,6 +402,7 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP irp->IoStatus.Status = STATUS_INVALID_PARAMETER; return; } + if (!reports[i].ReportID) offset = 1; switch (code) { @@ -423,26 +424,20 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP return; } - packet.reportId = buffer[0]; - packet.reportBuffer = buffer; - packet.reportBufferLen = buffer_len; - - if (!reports[i].ReportID) - { - packet.reportId = 0; - packet.reportBuffer++; - packet.reportBufferLen--; - } + packet.reportId = reports[i].ReportID; + packet.reportBuffer = buffer + offset; switch (code) { case IOCTL_HID_GET_FEATURE: case IOCTL_HID_GET_INPUT_REPORT: + packet.reportBufferLen = buffer_len - offset; call_minidriver( code, ext->u.pdo.parent_fdo, NULL, 0, &packet, sizeof(packet), &irp->IoStatus ); break; case IOCTL_HID_SET_FEATURE: case IOCTL_HID_SET_OUTPUT_REPORT: case IOCTL_HID_WRITE_REPORT: + packet.reportBufferLen = report_len - offset; call_minidriver( code, ext->u.pdo.parent_fdo, NULL, sizeof(packet), &packet, 0, &irp->IoStatus ); if (code == IOCTL_HID_WRITE_REPORT && packet.reportId) irp->IoStatus.Information--; break;

1 0

Rémi Bernon : dinput8/tests: Control expected GET_INPUT reports from the test executable.
by Alexandre Julliard Sept. 13, 2021

Sept. 13, 2021

Module: wine Branch: master Commit: 29b90620c17082ca9a17f94e2c91afd46d121134 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29b90620c17082ca9a17f94e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 13 10:48:57 2021 +0200 dinput8/tests: Control expected GET_INPUT 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 | 14 ++-- dlls/dinput8/tests/hid.c | 137 ++++++++++++++++++++++++++++------------ 2 files changed, 105 insertions(+), 46 deletions(-) diff --git a/dlls/dinput8/tests/driver_hid.c b/dlls/dinput8/tests/driver_hid.c index 528f4af9939..7d613f1d92c 100644 --- a/dlls/dinput8/tests/driver_hid.c +++ b/dlls/dinput8/tests/driver_hid.c @@ -411,10 +411,16 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen ); ok( !!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer ); - memset( packet->reportBuffer, 0xa5, 3 ); - if (report_id) ((char *)packet->reportBuffer)[0] = report_id; - irp->IoStatus.Information = 3; - ret = STATUS_SUCCESS; + expect_queue_next( &expect_queue, code, packet, &index, &expect, FALSE ); + winetest_push_context( "%s expect[%d]", expect.context, index ); + ok( expect.code == code, "got %#x, expected %#x\n", expect.code, code ); + ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); + ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); + winetest_pop_context(); + + memcpy( packet->reportBuffer, expect.report_buf, expect.ret_length ); + irp->IoStatus.Information = expect.ret_length; + ret = expect.ret_status; break; } diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index b8188690c1d..5bcfc5b9f83 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -743,6 +743,100 @@ static void set_hid_expect_( int line, HANDLE file, struct hid_expect *expect, D ok( ret, "IOCTL_WINETEST_HID_SET_EXPECT failed, last error %u\n", GetLastError() ); } +static void test_hidp_get_input( HANDLE file, int report_id, ULONG report_len, PHIDP_PREPARSED_DATA preparsed ) +{ + struct hid_expect expect[] = + { + { + .code = IOCTL_HID_GET_INPUT_REPORT, + .report_id = report_id, + .report_len = report_len - (report_id ? 0 : 1), + .report_buf = {report_id ? report_id : 0xa5,0xa5,2}, + .ret_length = 3, + .ret_status = STATUS_SUCCESS, + }, + { + .code = IOCTL_HID_GET_INPUT_REPORT, + .report_id = report_id, + .report_len = 2 * report_len - (report_id ? 0 : 1), + .report_buf = {report_id ? report_id : 0xa5,0xa5,1}, + .ret_length = 3, + .ret_status = STATUS_SUCCESS, + }, + }; + + char buffer[200], report[200]; + NTSTATUS status; + ULONG length; + BOOL ret; + + memset( report, 0xcd, sizeof(report) ); + status = HidP_InitializeReportForID( HidP_Input, report_id, preparsed, report, report_len ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_InitializeReportForID returned %#x\n", status ); + + SetLastError( 0xdeadbeef ); + ret = HidD_GetInputReport( file, report, 0 ); + ok( !ret, "HidD_GetInputReport succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_GetInputReport returned error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = HidD_GetInputReport( file, report, report_len - 1 ); + ok( !ret, "HidD_GetInputReport succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || broken( GetLastError() == ERROR_CRC ), + "HidD_GetInputReport returned error %u\n", GetLastError() ); + + if (!report_id) + { + struct hid_expect broken_expect = + { + .code = IOCTL_HID_GET_INPUT_REPORT, + .broken = TRUE, + .report_len = report_len - 1, + .report_buf = + { + 0x5a,0x5a,0x5a,0x5a,0x5a,0x5a,0x5a,0x5a, + 0x5a,0x5a,0x5a,0x5a,0x5a,0x5a,0x5a,0x5a, + 0x5a,0x5a,0x5a,0x5a,0x5a, + }, + .ret_length = 3, + .ret_status = STATUS_SUCCESS, + }; + + set_hid_expect( file, &broken_expect, sizeof(broken_expect) ); + } + + SetLastError( 0xdeadbeef ); + memset( buffer, 0x5a, sizeof(buffer) ); + ret = HidD_GetInputReport( file, buffer, report_len ); + if (report_id || broken( !ret ) /* w7u */) + { + ok( !ret, "HidD_GetInputReport succeeded, last error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || broken( GetLastError() == ERROR_CRC ), + "HidD_GetInputReport returned error %u\n", GetLastError() ); + } + else + { + ok( ret, "HidD_GetInputReport failed, last error %u\n", GetLastError() ); + ok( buffer[0] == 0x5a, "got buffer[0] %x, expected 0x5a\n", (BYTE)buffer[0] ); + } + + set_hid_expect( file, expect, sizeof(expect) ); + + SetLastError( 0xdeadbeef ); + ret = HidD_GetInputReport( file, report, report_len ); + ok( ret, "HidD_GetInputReport failed, last error %u\n", GetLastError() ); + ok( report[0] == report_id, "got report[0] %02x, expected %02x\n", report[0], report_id ); + + SetLastError( 0xdeadbeef ); + length = report_len * 2; + ret = sync_ioctl( file, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, report, &length ); + ok( ret, "IOCTL_HID_GET_INPUT_REPORT failed, last error %u\n", GetLastError() ); + ok( length == 3, "got length %u, expected 3\n", length ); + ok( report[0] == report_id, "got report[0] %02x, expected %02x\n", report[0], report_id ); + + set_hid_expect( file, NULL, 0 ); +} + static void test_hidp_get_feature( HANDLE file, int report_id, ULONG report_len, PHIDP_PREPARSED_DATA preparsed ) { struct hid_expect expect[] = @@ -1938,48 +2032,7 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle ok( status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status ); ok( value == 0xfffffd0b, "got value %x, expected %#x\n", value, 0xfffffd0b ); - memset( report, 0xcd, sizeof(report) ); - status = HidP_InitializeReportForID( HidP_Input, report_id, preparsed_data, report, caps.InputReportByteLength ); - ok( status == HIDP_STATUS_SUCCESS, "HidP_InitializeReportForID returned %#x\n", status ); - - SetLastError( 0xdeadbeef ); - ret = HidD_GetInputReport( file, report, 0 ); - ok( !ret, "HidD_GetInputReport succeeded\n" ); - ok( GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_GetInputReport returned error %u\n", GetLastError() ); - - SetLastError( 0xdeadbeef ); - ret = HidD_GetInputReport( file, report, caps.InputReportByteLength - 1 ); - ok( !ret, "HidD_GetInputReport succeeded\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER || broken( GetLastError() == ERROR_CRC ), - "HidD_GetInputReport returned error %u\n", GetLastError() ); - - SetLastError( 0xdeadbeef ); - memset( buffer, 0x5a, sizeof(buffer) ); - ret = HidD_GetInputReport( file, buffer, caps.InputReportByteLength ); - if (report_id || broken( !ret ) /* w7u */) - { - ok( !ret, "HidD_GetInputReport succeeded, last error %u\n", GetLastError() ); - ok( GetLastError() == ERROR_INVALID_PARAMETER || broken( GetLastError() == ERROR_CRC ), - "HidD_GetInputReport returned error %u\n", GetLastError() ); - } - else - { - ok( ret, "HidD_GetInputReport failed, last error %u\n", GetLastError() ); - ok( buffer[0] == 0x5a, "got buffer[0] %x, expected 0x5a\n", (BYTE)buffer[0] ); - } - - SetLastError( 0xdeadbeef ); - ret = HidD_GetInputReport( file, report, caps.InputReportByteLength ); - ok( ret, "HidD_GetInputReport failed, last error %u\n", GetLastError() ); - ok( report[0] == report_id, "got report[0] %02x, expected %02x\n", report[0], report_id ); - - SetLastError( 0xdeadbeef ); - 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() ); - 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 ); - + test_hidp_get_input( file, report_id, caps.InputReportByteLength, preparsed_data ); test_hidp_get_feature( file, report_id, caps.FeatureReportByteLength, preparsed_data ); test_hidp_set_feature( file, report_id, caps.FeatureReportByteLength, preparsed_data ); test_hidp_set_output( file, report_id, caps.OutputReportByteLength, preparsed_data );

1 0

Rémi Bernon : dinput8/tests: Control expected WRITE_REPORT reports from the test executable.
by Alexandre Julliard Sept. 13, 2021

Sept. 13, 2021

Module: wine Branch: master Commit: 441baa556a6b0690ab5ca75e76961957ecc173b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=441baa556a6b0690ab5ca75e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 13 10:48:56 2021 +0200 dinput8/tests: Control expected WRITE_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 | 16 ++++--- dlls/dinput8/tests/hid.c | 97 +++++++++++++++++++++++++---------------- 2 files changed, 71 insertions(+), 42 deletions(-) diff --git a/dlls/dinput8/tests/driver_hid.c b/dlls/dinput8/tests/driver_hid.c index fea826c8b63..528f4af9939 100644 --- a/dlls/dinput8/tests/driver_hid.c +++ b/dlls/dinput8/tests/driver_hid.c @@ -385,12 +385,18 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( !out_size, "got output size %u\n", out_size ); ok( packet->reportBufferLen >= expected_size, "got report size %u\n", packet->reportBufferLen ); - if (report_id) - ok( packet->reportBuffer[0] == report_id, "got report id %x\n", packet->reportBuffer[0] ); - else ok( packet->reportBuffer[0] == 0xcd, "got first byte %x\n", packet->reportBuffer[0] ); + expect_queue_next( &expect_queue, code, packet, &index, &expect, TRUE ); + winetest_push_context( "%s expect[%d]", expect.context, index ); + ok( expect.code == code, "got %#x, expected %#x\n", expect.code, code ); + ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); + todo_wine_if( expect.todo_report_len ) + ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); + ok( RtlCompareMemory( packet->reportBuffer, expect.report_buf, expect.report_len ) == expect.report_len, + "unexpected data\n" ); + winetest_pop_context(); - irp->IoStatus.Information = 3; - ret = STATUS_SUCCESS; + irp->IoStatus.Information = expect.ret_length; + ret = expect.ret_status; break; } diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index f7efdad25ee..b8188690c1d 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -1035,6 +1035,65 @@ static void test_hidp_set_output( HANDLE file, int report_id, ULONG report_len, set_hid_expect( file, NULL, 0 ); } +static void test_write_file( HANDLE file, int report_id, ULONG report_len ) +{ + struct hid_expect expect = + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = report_id, + .todo_report_len = report_id == 0, + .report_len = report_len - (report_id ? 0 : 1), + .report_buf = {report_id ? report_id : 0xcd,0xcd,0xcd,0xcd,0xcd}, + .ret_length = 3, + .ret_status = STATUS_SUCCESS, + }; + + char report[200]; + ULONG length; + BOOL ret; + + SetLastError( 0xdeadbeef ); + ret = WriteFile( file, report, 0, &length, NULL ); + ok( !ret, "WriteFile succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_USER_BUFFER, "WriteFile returned error %u\n", GetLastError() ); + ok( length == 0, "WriteFile returned %x\n", length ); + SetLastError( 0xdeadbeef ); + ret = WriteFile( file, report, report_len - 1, &length, NULL ); + ok( !ret, "WriteFile succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_INVALID_USER_BUFFER, + "WriteFile returned error %u\n", GetLastError() ); + ok( length == 0, "WriteFile returned %x\n", length ); + + set_hid_expect( file, &expect, sizeof(expect) ); + + memset( report, 0xcd, sizeof(report) ); + report[0] = 0xa5; + SetLastError( 0xdeadbeef ); + ret = WriteFile( file, report, report_len * 2, &length, NULL ); + if (report_id || broken( !ret ) /* w7u */) + { + ok( !ret, "WriteFile succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "WriteFile returned error %u\n", GetLastError() ); + ok( length == 0, "WriteFile wrote %u\n", length ); + SetLastError( 0xdeadbeef ); + report[0] = report_id; + ret = WriteFile( file, report, report_len, &length, NULL ); + } + + if (report_id) + { + ok( ret, "WriteFile failed, last error %u\n", GetLastError() ); + ok( length == 2, "WriteFile wrote %u\n", length ); + } + else + { + ok( ret, "WriteFile failed, last error %u\n", GetLastError() ); + ok( length == 3, "WriteFile wrote %u\n", length ); + } + + set_hid_expect( file, NULL, 0 ); +} + static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polled, const HIDP_CAPS *expect_caps ) { const HIDP_BUTTON_CAPS expect_button_caps[] = @@ -1924,43 +1983,7 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle test_hidp_get_feature( file, report_id, caps.FeatureReportByteLength, preparsed_data ); test_hidp_set_feature( file, report_id, caps.FeatureReportByteLength, preparsed_data ); test_hidp_set_output( file, report_id, caps.OutputReportByteLength, preparsed_data ); - - SetLastError( 0xdeadbeef ); - ret = WriteFile( file, report, 0, &value, NULL ); - ok( !ret, "WriteFile succeeded\n" ); - ok( GetLastError() == ERROR_INVALID_USER_BUFFER, "WriteFile returned error %u\n", GetLastError() ); - ok( value == 0, "WriteFile returned %x\n", value ); - SetLastError( 0xdeadbeef ); - ret = WriteFile( file, report, caps.OutputReportByteLength - 1, &value, NULL ); - ok( !ret, "WriteFile succeeded\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_INVALID_USER_BUFFER, - "WriteFile returned error %u\n", GetLastError() ); - ok( value == 0, "WriteFile returned %x\n", value ); - - memset( report, 0xcd, sizeof(report) ); - report[0] = 0xa5; - SetLastError( 0xdeadbeef ); - ret = WriteFile( file, report, caps.OutputReportByteLength * 2, &value, NULL ); - if (report_id || broken( !ret ) /* w7u */) - { - ok( !ret, "WriteFile succeeded\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, "WriteFile returned error %u\n", GetLastError() ); - ok( value == 0, "WriteFile wrote %u\n", value ); - SetLastError( 0xdeadbeef ); - report[0] = report_id; - ret = WriteFile( file, report, caps.OutputReportByteLength, &value, NULL ); - } - - if (report_id) - { - ok( ret, "WriteFile failed, last error %u\n", GetLastError() ); - ok( value == 2, "WriteFile wrote %u\n", value ); - } - else - { - ok( ret, "WriteFile failed, last error %u\n", GetLastError() ); - ok( value == 3, "WriteFile wrote %u\n", value ); - } + test_write_file( file, report_id, caps.OutputReportByteLength ); memset( report, 0xcd, sizeof(report) ); SetLastError( 0xdeadbeef );

1 0

Rémi Bernon : dinput8/tests: Control expected SET_OUTPUT reports from the test executable.
by Alexandre Julliard Sept. 13, 2021

Sept. 13, 2021

Module: wine Branch: master Commit: e56d6e496ba793c0e1ebf79f5c7a95394be4a23e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e56d6e496ba793c0e1ebf79f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 13 10:48:55 2021 +0200 dinput8/tests: Control expected SET_OUTPUT 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 | 14 +++- dlls/dinput8/tests/hid.c | 145 +++++++++++++++++++++++++++------------- 2 files changed, 109 insertions(+), 50 deletions(-) diff --git a/dlls/dinput8/tests/driver_hid.c b/dlls/dinput8/tests/driver_hid.c index 043a1555dbd..fea826c8b63 100644 --- a/dlls/dinput8/tests/driver_hid.c +++ b/dlls/dinput8/tests/driver_hid.c @@ -423,8 +423,18 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen ); ok( !!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer ); - irp->IoStatus.Information = 3; - ret = STATUS_SUCCESS; + expect_queue_next( &expect_queue, code, packet, &index, &expect, TRUE ); + winetest_push_context( "%s expect[%d]", expect.context, index ); + ok( expect.code == code, "got %#x, expected %#x\n", expect.code, code ); + ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); + todo_wine_if( expect.todo_report_len ) + ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); + ok( RtlCompareMemory( packet->reportBuffer, expect.report_buf, expect.report_len ) == expect.report_len, + "unexpected data\n" ); + winetest_pop_context(); + + irp->IoStatus.Information = expect.ret_length; + ret = expect.ret_status; break; } diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 98366c878e6..f7efdad25ee 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -939,6 +939,102 @@ static void test_hidp_set_feature( HANDLE file, int report_id, ULONG report_len, set_hid_expect( file, NULL, 0 ); } +static void test_hidp_set_output( HANDLE file, int report_id, ULONG report_len, PHIDP_PREPARSED_DATA preparsed ) +{ + struct hid_expect expect[] = + { + { + .code = IOCTL_HID_SET_OUTPUT_REPORT, + .report_id = report_id, + .report_len = report_len - (report_id ? 0 : 1), + .report_buf = {report_id}, + .ret_length = 3, + .ret_status = STATUS_SUCCESS, + }, + { + .code = IOCTL_HID_SET_OUTPUT_REPORT, + .report_id = report_id, + .todo_report_len = TRUE, + .report_len = report_len - (report_id ? 0 : 1), + .report_buf = {report_id,0,0xcd,0xcd,0xcd}, + .ret_length = 3, + .ret_status = STATUS_SUCCESS, + }, + }; + + char buffer[200], report[200]; + NTSTATUS status; + ULONG length; + BOOL ret; + + memset( report, 0xcd, sizeof(report) ); + status = HidP_InitializeReportForID( HidP_Output, report_id, preparsed, report, report_len ); + ok( status == HIDP_STATUS_REPORT_DOES_NOT_EXIST, "HidP_InitializeReportForID returned %#x\n", status ); + memset( report, 0, report_len ); + report[0] = report_id; + + SetLastError( 0xdeadbeef ); + ret = HidD_SetOutputReport( file, report, 0 ); + ok( !ret, "HidD_SetOutputReport succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_SetOutputReport returned error %u\n", + GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = HidD_SetOutputReport( file, report, report_len - 1 ); + ok( !ret, "HidD_SetOutputReport succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || broken( GetLastError() == ERROR_CRC ), + "HidD_SetOutputReport returned error %u\n", GetLastError() ); + + if (!report_id) + { + struct hid_expect broken_expect = + { + .code = IOCTL_HID_SET_OUTPUT_REPORT, + .broken = TRUE, + .report_len = report_len - 1, + .report_buf = {0x5a,0x5a}, + .ret_length = 3, + .ret_status = STATUS_SUCCESS, + }; + + set_hid_expect( file, &broken_expect, sizeof(broken_expect) ); + } + + SetLastError( 0xdeadbeef ); + memset( buffer, 0x5a, sizeof(buffer) ); + ret = HidD_SetOutputReport( file, buffer, report_len ); + if (report_id || broken( !ret )) + { + ok( !ret, "HidD_SetOutputReport succeeded, last error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || broken( GetLastError() == ERROR_CRC ), + "HidD_SetOutputReport returned error %u\n", GetLastError() ); + } + else + { + ok( ret, "HidD_SetOutputReport failed, last error %u\n", GetLastError() ); + } + + set_hid_expect( file, expect, sizeof(expect) ); + + SetLastError( 0xdeadbeef ); + ret = HidD_SetOutputReport( file, report, report_len ); + ok( ret, "HidD_SetOutputReport failed, last error %u\n", GetLastError() ); + + length = report_len * 2; + SetLastError( 0xdeadbeef ); + ret = sync_ioctl( file, IOCTL_HID_SET_OUTPUT_REPORT, NULL, 0, report, &length ); + ok( !ret, "IOCTL_HID_SET_OUTPUT_REPORT succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_USER_BUFFER, + "IOCTL_HID_SET_OUTPUT_REPORT returned error %u\n", GetLastError() ); + length = 0; + SetLastError( 0xdeadbeef ); + ret = sync_ioctl( file, IOCTL_HID_SET_OUTPUT_REPORT, report, report_len * 2, NULL, &length ); + ok( ret, "IOCTL_HID_SET_OUTPUT_REPORT failed, last error %u\n", GetLastError() ); + ok( length == 3, "got length %u, expected 3\n", length ); + + set_hid_expect( file, NULL, 0 ); +} + static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polled, const HIDP_CAPS *expect_caps ) { const HIDP_BUTTON_CAPS expect_button_caps[] = @@ -1827,54 +1923,7 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle test_hidp_get_feature( file, report_id, caps.FeatureReportByteLength, preparsed_data ); test_hidp_set_feature( file, report_id, caps.FeatureReportByteLength, preparsed_data ); - - memset( report, 0xcd, sizeof(report) ); - status = HidP_InitializeReportForID( HidP_Output, report_id, preparsed_data, report, caps.OutputReportByteLength ); - ok( status == HIDP_STATUS_REPORT_DOES_NOT_EXIST, "HidP_InitializeReportForID returned %#x\n", status ); - memset( report, 0, caps.OutputReportByteLength ); - report[0] = report_id; - - SetLastError( 0xdeadbeef ); - ret = HidD_SetOutputReport( file, report, 0 ); - ok( !ret, "HidD_SetOutputReport succeeded\n" ); - ok( GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_SetOutputReport returned error %u\n", - GetLastError() ); - - SetLastError( 0xdeadbeef ); - ret = HidD_SetOutputReport( file, report, caps.OutputReportByteLength - 1 ); - ok( !ret, "HidD_SetOutputReport succeeded\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER || broken( GetLastError() == ERROR_CRC ), - "HidD_SetOutputReport returned error %u\n", GetLastError() ); - - SetLastError( 0xdeadbeef ); - memset( buffer, 0x5a, sizeof(buffer) ); - ret = HidD_SetOutputReport( file, buffer, caps.OutputReportByteLength ); - if (report_id || broken( !ret )) - { - ok( !ret, "HidD_SetOutputReport succeeded, last error %u\n", GetLastError() ); - ok( GetLastError() == ERROR_INVALID_PARAMETER || broken( GetLastError() == ERROR_CRC ), - "HidD_SetOutputReport returned error %u\n", GetLastError() ); - } - else - { - ok( ret, "HidD_SetOutputReport failed, last error %u\n", GetLastError() ); - } - - SetLastError( 0xdeadbeef ); - ret = HidD_SetOutputReport( file, report, caps.OutputReportByteLength ); - ok( ret, "HidD_SetOutputReport failed, last error %u\n", GetLastError() ); - - value = caps.OutputReportByteLength * 2; - SetLastError( 0xdeadbeef ); - ret = sync_ioctl( file, IOCTL_HID_SET_OUTPUT_REPORT, NULL, 0, report, &value ); - ok( !ret, "IOCTL_HID_SET_OUTPUT_REPORT succeeded\n" ); - ok( GetLastError() == ERROR_INVALID_USER_BUFFER, - "IOCTL_HID_SET_OUTPUT_REPORT returned error %u\n", GetLastError() ); - value = 0; - SetLastError( 0xdeadbeef ); - ret = sync_ioctl( file, IOCTL_HID_SET_OUTPUT_REPORT, report, caps.OutputReportByteLength * 2, NULL, &value ); - ok( ret, "IOCTL_HID_SET_OUTPUT_REPORT failed, last error %u\n", GetLastError() ); - ok( value == 3, "got length %u, expected 3\n", value ); + test_hidp_set_output( file, report_id, caps.OutputReportByteLength, preparsed_data ); SetLastError( 0xdeadbeef ); ret = WriteFile( file, report, 0, &value, NULL );

1 0

Rémi Bernon : dinput8/tests: Control expected GET_FEATURE reports from the test executable.
by Alexandre Julliard Sept. 13, 2021

Sept. 13, 2021

Module: wine Branch: master Commit: c9bcc74c860f86a9edd1c12153be4b2e42199aa0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9bcc74c860f86a9edd1c121… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 13 10:48:54 2021 +0200 dinput8/tests: Control expected GET_FEATURE 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 | 20 ++++-- dlls/dinput8/tests/hid.c | 138 +++++++++++++++++++++++++++------------- 2 files changed, 108 insertions(+), 50 deletions(-) diff --git a/dlls/dinput8/tests/driver_hid.c b/dlls/dinput8/tests/driver_hid.c index 9256bb4922e..043a1555dbd 100644 --- a/dlls/dinput8/tests/driver_hid.c +++ b/dlls/dinput8/tests/driver_hid.c @@ -107,7 +107,7 @@ static void expect_queue_reset( struct expect_queue *queue, void *buffer, unsign } static void expect_queue_next( struct expect_queue *queue, ULONG code, HID_XFER_PACKET *packet, - LONG *index, struct hid_expect *expect ) + LONG *index, struct hid_expect *expect, BOOL compare_buf ) { struct hid_expect *missing, *missing_end, *tmp; ULONG len = packet->reportBufferLen; @@ -125,7 +125,7 @@ static void expect_queue_next( struct expect_queue *queue, ULONG code, HID_XFER_ { if (!tmp->broken || running_under_wine) break; if (tmp->code == code && tmp->report_id == id && tmp->report_len == len && - RtlCompareMemory( tmp->report_buf, buf, len ) == len) + (!compare_buf || RtlCompareMemory( tmp->report_buf, buf, len ) == len)) break; *missing_end++ = *tmp++; } @@ -439,10 +439,16 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen ); ok( !!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer ); - memset( packet->reportBuffer, 0xa5, 3 ); - if (report_id) ((char *)packet->reportBuffer)[0] = report_id; - irp->IoStatus.Information = 3; - ret = STATUS_SUCCESS; + expect_queue_next( &expect_queue, code, packet, &index, &expect, FALSE ); + winetest_push_context( "%s expect[%d]", expect.context, index ); + ok( expect.code == code, "got %#x, expected %#x\n", expect.code, code ); + ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); + ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); + winetest_pop_context(); + + memcpy( packet->reportBuffer, expect.report_buf, expect.ret_length ); + irp->IoStatus.Information = expect.ret_length; + ret = expect.ret_status; break; } @@ -457,7 +463,7 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen ); ok( !!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer ); - expect_queue_next( &expect_queue, code, packet, &index, &expect ); + expect_queue_next( &expect_queue, code, packet, &index, &expect, TRUE ); winetest_push_context( "%s expect[%d]", expect.context, index ); ok( expect.code == code, "got %#x, expected %#x\n", expect.code, code ); ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 4f60c9f2194..98366c878e6 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -743,6 +743,100 @@ static void set_hid_expect_( int line, HANDLE file, struct hid_expect *expect, D ok( ret, "IOCTL_WINETEST_HID_SET_EXPECT failed, last error %u\n", GetLastError() ); } +static void test_hidp_get_feature( HANDLE file, int report_id, ULONG report_len, PHIDP_PREPARSED_DATA preparsed ) +{ + struct hid_expect expect[] = + { + { + .code = IOCTL_HID_GET_FEATURE, + .report_id = report_id, + .report_len = report_len - (report_id ? 0 : 1), + .report_buf = {report_id ? report_id : 0xa5,0xa5,0xa5}, + .ret_length = 3, + .ret_status = STATUS_SUCCESS, + }, + { + .code = IOCTL_HID_GET_FEATURE, + .report_id = report_id, + .report_len = 2 * report_len - (report_id ? 0 : 1), + .report_buf = {report_id ? report_id : 0xa5,0xa5,0xa5}, + .ret_length = 3, + .ret_status = STATUS_SUCCESS, + }, + }; + + char buffer[200], report[200]; + NTSTATUS status; + ULONG length; + BOOL ret; + + memset( report, 0xcd, sizeof(report) ); + status = HidP_InitializeReportForID( HidP_Feature, report_id, preparsed, report, report_len ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_InitializeReportForID returned %#x\n", status ); + + SetLastError( 0xdeadbeef ); + ret = HidD_GetFeature( file, report, 0 ); + ok( !ret, "HidD_GetFeature succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_GetFeature returned error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = HidD_GetFeature( file, report, report_len - 1 ); + ok( !ret, "HidD_GetFeature succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || broken( GetLastError() == ERROR_CRC ), + "HidD_GetFeature returned error %u\n", GetLastError() ); + + if (!report_id) + { + struct hid_expect broken_expect = + { + .code = IOCTL_HID_GET_FEATURE, + .broken = TRUE, + .report_len = report_len - 1, + .report_buf = + { + 0x5a,0x5a,0x5a,0x5a,0x5a,0x5a,0x5a,0x5a, + 0x5a,0x5a,0x5a,0x5a,0x5a,0x5a,0x5a,0x5a, + 0x5a,0x5a,0x5a,0x5a,0x5a, + }, + .ret_length = 3, + .ret_status = STATUS_SUCCESS, + }; + + set_hid_expect( file, &broken_expect, sizeof(broken_expect) ); + } + + SetLastError( 0xdeadbeef ); + memset( buffer, 0x5a, sizeof(buffer) ); + ret = HidD_GetFeature( file, buffer, report_len ); + if (report_id || broken( !ret )) + { + ok( !ret, "HidD_GetFeature succeeded, last error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || broken( GetLastError() == ERROR_CRC ), + "HidD_GetFeature returned error %u\n", GetLastError() ); + } + else + { + ok( ret, "HidD_GetFeature failed, last error %u\n", GetLastError() ); + ok( buffer[0] == 0x5a, "got buffer[0] %x, expected 0x5a\n", (BYTE)buffer[0] ); + } + + set_hid_expect( file, expect, sizeof(expect) ); + + SetLastError( 0xdeadbeef ); + ret = HidD_GetFeature( file, report, report_len ); + ok( ret, "HidD_GetFeature failed, last error %u\n", GetLastError() ); + ok( report[0] == report_id, "got report[0] %02x, expected %02x\n", report[0], report_id ); + + length = report_len * 2; + SetLastError( 0xdeadbeef ); + ret = sync_ioctl( file, IOCTL_HID_GET_FEATURE, NULL, 0, report, &length ); + ok( ret, "IOCTL_HID_GET_FEATURE failed, last error %u\n", GetLastError() ); + ok( length == 3, "got length %u, expected 3\n", length ); + ok( report[0] == report_id, "got report[0] %02x, expected %02x\n", report[0], report_id ); + + set_hid_expect( file, NULL, 0 ); +} + static void test_hidp_set_feature( HANDLE file, int report_id, ULONG report_len, PHIDP_PREPARSED_DATA preparsed ) { struct hid_expect expect[] = @@ -1731,49 +1825,7 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle 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 ); - memset( report, 0xcd, sizeof(report) ); - status = HidP_InitializeReportForID( HidP_Feature, report_id, preparsed_data, report, - caps.FeatureReportByteLength ); - ok( status == HIDP_STATUS_SUCCESS, "HidP_InitializeReportForID returned %#x\n", status ); - - SetLastError( 0xdeadbeef ); - ret = HidD_GetFeature( file, report, 0 ); - ok( !ret, "HidD_GetFeature succeeded\n" ); - ok( GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_GetFeature returned error %u\n", GetLastError() ); - - SetLastError( 0xdeadbeef ); - ret = HidD_GetFeature( file, report, caps.FeatureReportByteLength - 1 ); - ok( !ret, "HidD_GetFeature succeeded\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER || broken( GetLastError() == ERROR_CRC ), - "HidD_GetFeature returned error %u\n", GetLastError() ); - - SetLastError( 0xdeadbeef ); - memset( buffer, 0x5a, sizeof(buffer) ); - ret = HidD_GetFeature( file, buffer, caps.FeatureReportByteLength ); - if (report_id || broken( !ret )) - { - ok( !ret, "HidD_GetFeature succeeded, last error %u\n", GetLastError() ); - ok( GetLastError() == ERROR_INVALID_PARAMETER || broken( GetLastError() == ERROR_CRC ), - "HidD_GetFeature returned error %u\n", GetLastError() ); - } - else - { - ok( ret, "HidD_GetFeature failed, last error %u\n", GetLastError() ); - ok( buffer[0] == 0x5a, "got buffer[0] %x, expected 0x5a\n", (BYTE)buffer[0] ); - } - - SetLastError( 0xdeadbeef ); - ret = HidD_GetFeature( file, report, caps.FeatureReportByteLength ); - ok( ret, "HidD_GetFeature failed, last error %u\n", GetLastError() ); - ok( report[0] == report_id, "got report[0] %02x, expected %02x\n", report[0], report_id ); - - value = caps.FeatureReportByteLength * 2; - SetLastError( 0xdeadbeef ); - ret = sync_ioctl( file, IOCTL_HID_GET_FEATURE, NULL, 0, report, &value ); - ok( ret, "IOCTL_HID_GET_FEATURE failed, last error %u\n", GetLastError() ); - 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 ); - + test_hidp_get_feature( file, report_id, caps.FeatureReportByteLength, preparsed_data ); test_hidp_set_feature( file, report_id, caps.FeatureReportByteLength, preparsed_data ); memset( report, 0xcd, sizeof(report) );

1 0

Rémi Bernon : dinput8/tests: Control expected SET_FEATURE reports from the test executable.
by Alexandre Julliard Sept. 13, 2021

Sept. 13, 2021

Module: wine Branch: master Commit: af6971b5d06d8247b70f3667650abd7730938202 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af6971b5d06d8247b70f3667… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 13 10:48:53 2021 +0200 dinput8/tests: Control expected SET_FEATURE 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 | 165 ++++++++++++++++++++++++++++++++++++-- dlls/dinput8/tests/driver_hid.h | 15 ++++ dlls/dinput8/tests/hid.c | 170 +++++++++++++++++++++++++++++----------- 3 files changed, 298 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=af6971b5d06d8247b70f…

1 0

Jacek Caban : gdi32: Remove ordinal exports.
by Alexandre Julliard Sept. 13, 2021

Sept. 13, 2021

Module: wine Branch: master Commit: 689046b2162a7eaade0b6902eadb7b7396628640 URL: https://source.winehq.org/git/wine.git/?a=commit;h=689046b2162a7eaade0b6902… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 13 13:50:58 2021 +0200 gdi32: Remove ordinal exports. We no longer need them for our winspool and they are not present on Windows. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/driver.c | 134 -------------------------------------------------- dlls/gdi32/gdi32.spec | 7 --- 2 files changed, 141 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index d5528128089..ea857599b93 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -935,140 +935,6 @@ BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) } -/***************************************************************************** - * @ [GDI32.100] - * - * This should thunk to 16-bit and simply call the proc with the given args. - */ -INT WINAPI GDI_CallDevInstall16( FARPROC16 lpfnDevInstallProc, HWND hWnd, - LPSTR lpModelName, LPSTR OldPort, LPSTR NewPort ) -{ - FIXME("(%p, %p, %s, %s, %s)\n", lpfnDevInstallProc, hWnd, lpModelName, OldPort, NewPort ); - return -1; -} - -/***************************************************************************** - * @ [GDI32.101] - * - * This should load the correct driver for lpszDevice and calls this driver's - * ExtDeviceModePropSheet proc. - * - * Note: The driver calls a callback routine for each property sheet page; these - * pages are supposed to be filled into the structure pointed to by lpPropSheet. - * The layout of this structure is: - * - * struct - * { - * DWORD nPages; - * DWORD unknown; - * HPROPSHEETPAGE pages[10]; - * }; - */ -INT WINAPI GDI_CallExtDeviceModePropSheet16( HWND hWnd, LPCSTR lpszDevice, - LPCSTR lpszPort, LPVOID lpPropSheet ) -{ - FIXME("(%p, %s, %s, %p)\n", hWnd, lpszDevice, lpszPort, lpPropSheet ); - return -1; -} - -/***************************************************************************** - * @ [GDI32.102] - * - * This should load the correct driver for lpszDevice and call this driver's - * ExtDeviceMode proc. - * - * FIXME: convert ExtDeviceMode to unicode in the driver interface - */ -INT WINAPI GDI_CallExtDeviceMode16( HWND hwnd, - LPDEVMODEA lpdmOutput, LPSTR lpszDevice, - LPSTR lpszPort, LPDEVMODEA lpdmInput, - LPSTR lpszProfile, DWORD fwMode ) -{ - WCHAR deviceW[300]; - WCHAR bufW[300]; - char buf[300]; - HDC hdc; - DC *dc; - INT ret = -1; - - TRACE("(%p, %p, %s, %s, %p, %s, %d)\n", - hwnd, lpdmOutput, lpszDevice, lpszPort, lpdmInput, lpszProfile, fwMode ); - - if (!lpszDevice) return -1; - if (!MultiByteToWideChar(CP_ACP, 0, lpszDevice, -1, deviceW, 300)) return -1; - - if(!DRIVER_GetDriverName( deviceW, bufW, 300 )) return -1; - - if (!WideCharToMultiByte(CP_ACP, 0, bufW, -1, buf, 300, NULL, NULL)) return -1; - - if (!(hdc = CreateICA( buf, lpszDevice, lpszPort, NULL ))) return -1; - - if ((dc = get_dc_ptr( hdc ))) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pExtDeviceMode ); - ret = physdev->funcs->pExtDeviceMode( buf, hwnd, lpdmOutput, lpszDevice, lpszPort, - lpdmInput, lpszProfile, fwMode ); - release_dc_ptr( dc ); - } - DeleteDC( hdc ); - return ret; -} - -/**************************************************************************** - * @ [GDI32.103] - * - * This should load the correct driver for lpszDevice and calls this driver's - * AdvancedSetupDialog proc. - */ -INT WINAPI GDI_CallAdvancedSetupDialog16( HWND hwnd, LPSTR lpszDevice, - LPDEVMODEA devin, LPDEVMODEA devout ) -{ - TRACE("(%p, %s, %p, %p)\n", hwnd, lpszDevice, devin, devout ); - return -1; -} - -/***************************************************************************** - * @ [GDI32.104] - * - * This should load the correct driver for lpszDevice and calls this driver's - * DeviceCapabilities proc. - * - * FIXME: convert DeviceCapabilities to unicode in the driver interface - */ -DWORD WINAPI GDI_CallDeviceCapabilities16( LPCSTR lpszDevice, LPCSTR lpszPort, - WORD fwCapability, LPSTR lpszOutput, - LPDEVMODEA lpdm ) -{ - WCHAR deviceW[300]; - WCHAR bufW[300]; - char buf[300]; - HDC hdc; - DC *dc; - INT ret = -1; - - TRACE("(%s, %s, %d, %p, %p)\n", lpszDevice, lpszPort, fwCapability, lpszOutput, lpdm ); - - if (!lpszDevice) return -1; - if (!MultiByteToWideChar(CP_ACP, 0, lpszDevice, -1, deviceW, 300)) return -1; - - if(!DRIVER_GetDriverName( deviceW, bufW, 300 )) return -1; - - if (!WideCharToMultiByte(CP_ACP, 0, bufW, -1, buf, 300, NULL, NULL)) return -1; - - if (!(hdc = CreateICA( buf, lpszDevice, lpszPort, NULL ))) return -1; - - if ((dc = get_dc_ptr( hdc ))) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pDeviceCapabilities ); - ret = physdev->funcs->pDeviceCapabilities( buf, lpszDevice, lpszPort, - fwCapability, lpszOutput, lpdm ); - release_dc_ptr( dc ); - } - DeleteDC( hdc ); - return ret; -} - - /****************************************************************************** * NtGdiExtEscape (win32u.@) * diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 81a4dd5d1e9..6dbc8a9bf12 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -1,10 +1,3 @@ -# ordinal exports -100 stdcall @(long long str str str) GDI_CallDevInstall16 -101 stdcall @(long str str ptr) GDI_CallExtDeviceModePropSheet16 -102 stdcall @(long ptr str str ptr str long) GDI_CallExtDeviceMode16 -103 stdcall @(long str ptr ptr) GDI_CallAdvancedSetupDialog16 -104 stdcall @(str str long ptr ptr) GDI_CallDeviceCapabilities16 - @ stdcall AbortDoc(long) @ stdcall AbortPath(long) @ stdcall AddFontMemResourceEx(ptr long ptr ptr)

1 0

Jacek Caban : winspool: Use DocumentPropertiesW for DocumentPropertiesA.
by Alexandre Julliard Sept. 13, 2021

Sept. 13, 2021

Module: wine Branch: master Commit: 8eddb793a6f287cdaa3d9952d07e752b7755a3ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=8eddb793a6f287cdaa3d9952… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 13 13:50:24 2021 +0200 winspool: Use DocumentPropertiesW for DocumentPropertiesA. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 82 +++++++++++++++++++----------------------------- 1 file changed, 33 insertions(+), 49 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 76c83345ebb..edfdab218c4 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -198,11 +198,6 @@ static opened_printer_t **printer_handles; static UINT nb_printer_handles; static LONG next_job_id = 1; -static INT (WINAPI *GDI_CallExtDeviceMode16)( HWND hwnd, LPDEVMODEA lpdmOutput, - LPSTR lpszDevice, LPSTR lpszPort, - LPDEVMODEA lpdmInput, LPSTR lpszProfile, - DWORD fwMode ); - static const WCHAR DriversW[] = { 'S','y','s','t','e','m','\\', 'C','u', 'r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'c','o','n','t','r','o','l','\\', @@ -394,18 +389,6 @@ static LPWSTR strdupW(LPCWSTR p) return ret; } -static LPSTR strdupWtoA( LPCWSTR str ) -{ - LPSTR ret; - INT len; - - if (!str) return NULL; - len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL ); - ret = HeapAlloc( GetProcessHeap(), 0, len ); - if(ret) WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL ); - return ret; -} - static DEVMODEW *dup_devmode( const DEVMODEW *dm ) { DEVMODEW *ret; @@ -2513,46 +2496,47 @@ INT WINAPI DeviceCapabilitiesW(LPCWSTR pDevice, LPCWSTR pPort, /****************************************************************** * DocumentPropertiesA [WINSPOOL.@] - * - * FIXME: implement DocumentPropertiesA via DocumentPropertiesW, not vice versa */ -LONG WINAPI DocumentPropertiesA(HWND hWnd,HANDLE hPrinter, - LPSTR pDeviceName, LPDEVMODEA pDevModeOutput, - LPDEVMODEA pDevModeInput,DWORD fMode ) +LONG WINAPI DocumentPropertiesA(HWND hwnd, HANDLE printer, char *device_name, DEVMODEA *output, + DEVMODEA *input, DWORD mode) { - LPSTR lpName = pDeviceName, dupname = NULL; - static CHAR port[] = "LPT1:"; - LONG ret; + DEVMODEW *outputW = NULL, *inputW = NULL; + WCHAR *device = NULL; + unsigned int len; + int ret; - TRACE("(%p,%p,%s,%p,%p,%d)\n", - hWnd,hPrinter,pDeviceName,pDevModeOutput,pDevModeInput,fMode - ); + TRACE("(%p,%p,%s,%p,%p,%d)\n", hwnd, printer, debugstr_a(device_name), output, input, mode); - if(!pDeviceName || !*pDeviceName) { - LPCWSTR lpNameW = get_opened_printer_name(hPrinter); - if(!lpNameW) { - ERR("no name from hPrinter?\n"); - SetLastError(ERROR_INVALID_HANDLE); - return -1; - } - lpName = dupname = strdupWtoA(lpNameW); + len = MultiByteToWideChar(CP_ACP, 0, device_name, -1, NULL, 0); + if (len) { + device = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, device_name, -1, device, len); } - if (!GDI_CallExtDeviceMode16) - { - GDI_CallExtDeviceMode16 = (void*)GetProcAddress( GetModuleHandleA("gdi32"), - (LPCSTR)102 ); - if (!GDI_CallExtDeviceMode16) { - ERR("No CallExtDeviceMode16?\n"); - ret = -1; - goto end; - } + if (output && (mode & (DM_COPY | DM_UPDATE))) { + ret = DocumentPropertiesW(hwnd, printer, device, NULL, NULL, 0); + if (ret <= 0) { + HeapFree(GetProcessHeap(), 0, device); + return -1; + } + outputW = HeapAlloc(GetProcessHeap(), 0, ret); } - ret = GDI_CallExtDeviceMode16(hWnd, pDevModeOutput, lpName, port, - pDevModeInput, NULL, fMode); -end: - HeapFree(GetProcessHeap(), 0, dupname); + if (input) inputW = GdiConvertToDevmodeW(input); + + ret = DocumentPropertiesW(hwnd, printer, device, outputW, inputW, mode); + + if (ret >= 0 && outputW && (mode & (DM_COPY | DM_UPDATE))) { + DEVMODEA *dmA = DEVMODEdupWtoA( outputW ); + if (dmA) memcpy(output, dmA, dmA->dmSize + dmA->dmDriverExtra); + HeapFree(GetProcessHeap(), 0, dmA); + } + + HeapFree(GetProcessHeap(), 0, device); + HeapFree(GetProcessHeap(), 0, inputW); + HeapFree(GetProcessHeap(), 0, outputW); + + if (!mode && ret > 0) ret -= CCHDEVICENAME + CCHFORMNAME; return ret; }

1 0

Hans Leidekker : msi: Don't leak the file handle on error in cabinet_close_file_info().
by Alexandre Julliard Sept. 13, 2021

Sept. 13, 2021

Module: wine Branch: master Commit: a0a800ab1bd174e78b03d4592d1caca0322cd1c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0a800ab1bd174e78b03d459… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 13 12:05:00 2021 +0200 msi: Don't leak the file handle on error in cabinet_close_file_info(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/media.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index cc4648481ba..af6e83b893e 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -507,16 +507,23 @@ static INT_PTR cabinet_close_file_info(FDINOTIFICATIONTYPE fdint, data->mi->is_continuous = FALSE; if (!DosDateTimeToFileTime(pfdin->date, pfdin->time, &ft)) + { + CloseHandle(handle); return -1; + } if (!LocalFileTimeToFileTime(&ft, &ftLocal)) + { + CloseHandle(handle); return -1; + } if (!SetFileTime(handle, &ftLocal, 0, &ftLocal)) + { + CloseHandle(handle); return -1; + } CloseHandle(handle); - - data->cb(data->package, data->curfile, MSICABEXTRACT_FILEEXTRACTED, NULL, NULL, - data->user); + data->cb(data->package, data->curfile, MSICABEXTRACT_FILEEXTRACTED, NULL, NULL, data->user); msi_free(data->curfile); data->curfile = NULL;

1 0