September 2021 - Wine-commits

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

13 Sep '21

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

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

13 Sep '21

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_OUTPUT reports from the test executable.
by Alexandre Julliard 13 Sep '21

13 Sep '21

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 WRITE_REPORT reports from the test executable.
by Alexandre Julliard 13 Sep '21

13 Sep '21

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 GET_INPUT reports from the test executable.
by Alexandre Julliard 13 Sep '21

13 Sep '21

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 : hidclass.sys: Enforce output packet lengths to match report lengths.
by Alexandre Julliard 13 Sep '21

13 Sep '21

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 : ntoskrnl.exe/tests: Fix inverted winetest_win_skip condition.
by Alexandre Julliard 13 Sep '21

13 Sep '21

Module: wine Branch: master Commit: 757325bf7712ae4fecd974f1a52a38586423037e URL: https://source.winehq.org/git/wine.git/?a=commit;h=757325bf7712ae4fecd974f1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 13 10:48:59 2021 +0200 ntoskrnl.exe/tests: Fix inverted winetest_win_skip condition. And change skipped test message. It's not really useful and it will fail the tests if the main test summary doesn't match the number of skipped messages. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/utils.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/utils.h b/dlls/ntoskrnl.exe/tests/utils.h index f73f6f938ca..98fe3f97864 100644 --- a/dlls/ntoskrnl.exe/tests/utils.h +++ b/dlls/ntoskrnl.exe/tests/utils.h @@ -306,7 +306,7 @@ static inline void winetest_vskip( const char *msg, __ms_va_list args ) { if (winetest_add_line() < winetest_mute_threshold) { - winetest_print_context( "Tests skipped: " ); + winetest_print_context( "Driver tests skipped: " ); kvprintf(msg, args); InterlockedIncrement(&skipped); } @@ -328,7 +328,7 @@ static inline void WINAPIV winetest_win_skip( const char *msg, ... ) { __ms_va_list args; __ms_va_start(args, msg); - if (running_under_wine) + if (!running_under_wine) winetest_vskip(msg, args); else winetest_vok(0, msg, args);

1 0

Alexandre Julliard : comdlg32: Fix path validation of UNC paths in the file dialog.
by Alexandre Julliard 13 Sep '21

13 Sep '21

Module: wine Branch: master Commit: c8e2802391b060a5ff7fe7b0f9db08fa186ad1c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8e2802391b060a5ff7fe7b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 13 17:47:48 2021 +0200 comdlg32: Fix path validation of UNC paths in the file dialog. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 0ada09aad96..0f74c85fcd8 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2454,11 +2454,16 @@ int FILEDLG95_ValidatePathAction(LPWSTR lpstrPathAndFile, IShellFolder **ppsf, LPWSTR p; lstrcpyW(lpwstrTemp, lpszTemp); - p = PathFindNextComponentW(lpwstrTemp); - - if (!p) break; /* end of path */ - - *p = 0; + if (lpszTemp == lpstrPathAndFile && (p = PathSkipRootW(lpwstrTemp))) + { + *p = 0; + } + else + { + p = PathFindNextComponentW(lpwstrTemp); + if (!p) break; /* end of path */ + *p = 0; + } lpszTemp = lpszTemp + lstrlenW(lpwstrTemp); /* There are no wildcards when OFN_NOVALIDATE is set */

1 0

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

13 Sep '21

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

Fabian Maurer : msi: Set dialog as parent in subsequent dialog.
by Alexandre Julliard 13 Sep '21

13 Sep '21

Module: wine Branch: master Commit: 4b88e290521ef9fde9290c9bcbae7420966a6f46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b88e290521ef9fde9290c9b… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Sep 12 01:56:58 2021 +0200 msi: Set dialog as parent in subsequent dialog. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51576 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 703f9d43957..6463c3062ac 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3904,7 +3904,7 @@ static void process_pending_messages( HWND hdlg ) static UINT dialog_run_message_loop( msi_dialog *dialog ) { DWORD style; - HWND hwnd; + HWND hwnd, parent; if( uiThreadId != GetCurrentThreadId() ) return SendMessageW( hMsiHiddenWindow, WM_MSI_DIALOG_CREATE, 0, (LPARAM) dialog ); @@ -3917,9 +3917,11 @@ static UINT dialog_run_message_loop( msi_dialog *dialog ) if (dialog->parent == NULL && (dialog->attributes & msidbDialogAttributesMinimize)) style |= WS_MINIMIZEBOX; + parent = dialog->parent ? dialog->parent->hwnd : 0; + hwnd = CreateWindowW( L"MsiDialogCloseClass", dialog->name, style, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - NULL, NULL, NULL, dialog ); + parent, NULL, NULL, dialog ); if( !hwnd ) { ERR("Failed to create dialog %s\n", debugstr_w( dialog->name ));

1 0