Signed-off-by: Rémi Bernon rbernon@codeweavers.com --- 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 );