Rémi Bernon : dinput8/tests: Control expected GET_FEATURE reports from the test executable.
Alexandre Julliard
julliard at winehq.org
Mon Sep 13 16:12:33 CDT 2021
Module: wine
Branch: master
Commit: c9bcc74c860f86a9edd1c12153be4b2e42199aa0
URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9bcc74c860f86a9edd1c12153be4b2e42199aa0
Author: Rémi Bernon <rbernon at 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 at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at 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) );
More information about the wine-cvs
mailing list