niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

dinput/tests: Differentiate missing from broken HID reports.

Browse source
This commit is contained in:
Rémi Bernon 2024-01-19 10:14:50 +01:00 • committed by Alexandre Julliard
parent 6c44228c1f
commit 96b823c2d4
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dlls/dinput/tests/driver_bus.c
View file

@ -131,7 +131,7 @@ static void expect_queue_reset( struct expect_queue *queue, void *buffer, unsign
while (tmp != missing_end) while (tmp != missing_end)
{ {
winetest_push_context( "%s expect[%Id]", context, tmp - missing ); winetest_push_context( "%s expect[%Id]", context, tmp - missing );
if (tmp->broken) if (tmp->broken_id)
{ {
todo_wine_if( tmp->todo ) todo_wine_if( tmp->todo )
win_skip( "broken (code %#lx id %u len %u)\n", tmp->code, tmp->report_id, tmp->report_len ); win_skip( "broken (code %#lx id %u len %u)\n", tmp->code, tmp->report_id, tmp->report_len );
@ -251,8 +251,9 @@ static void expect_queue_next( struct expect_queue *queue, ULONG code, HID_XFER_
tmp = queue->pos; tmp = queue->pos;
while (tmp < queue->end) while (tmp < queue->end)
{ {
BOOL is_missing = tmp->broken_id == (BYTE)-1;
if (winetest_platform_is_wine && !tmp->todo) break; if (winetest_platform_is_wine && !tmp->todo) break;
if (!winetest_platform_is_wine && !tmp->broken && !tmp->wine_only) break; if (!winetest_platform_is_wine && !is_missing && !tmp->wine_only) break;
if (tmp->code == code && tmp->report_id == id && tmp->report_len == len && if (tmp->code == code && tmp->report_id == id && tmp->report_len == len &&
(!compare_buf || RtlCompareMemory( tmp->report_buf, buf, len ) == len)) (!compare_buf || RtlCompareMemory( tmp->report_buf, buf, len ) == len))
break; break;
@ -303,7 +304,7 @@ static void expect_queue_next( struct expect_queue *queue, ULONG code, HID_XFER_
while (tmp != missing_end) while (tmp != missing_end)
{ {
winetest_push_context( "%s expect[%Id]", context, tmp - missing ); winetest_push_context( "%s expect[%Id]", context, tmp - missing );
if (tmp->broken) if (tmp->broken_id)
{ {
todo_wine_if( tmp->todo ) todo_wine_if( tmp->todo )
win_skip( "broken (code %#lx id %u len %u)\n", tmp->code, tmp->report_id, tmp->report_len ); win_skip( "broken (code %#lx id %u len %u)\n", tmp->code, tmp->report_id, tmp->report_len );

2
dlls/dinput/tests/driver_hid.h
View file

@ -56,7 +56,7 @@ struct hid_expect
DWORD ret_length; DWORD ret_length;
DWORD ret_status; DWORD ret_status;
BYTE todo; /* missing on wine */ BYTE todo; /* missing on wine */
BYTE broken; /* missing on some win versions */ BYTE broken_id; /* different or missing (-1) report on some win versions */
BYTE wine_only; BYTE wine_only;
BYTE report_id; BYTE report_id;
BYTE report_len; BYTE report_len;

8
dlls/dinput/tests/hid.c
View file

@ -1048,7 +1048,7 @@ static void test_hidp_get_input( HANDLE file, int report_id, ULONG report_len, P
struct hid_expect broken_expect = struct hid_expect broken_expect =
{ {
.code = IOCTL_HID_GET_INPUT_REPORT, .code = IOCTL_HID_GET_INPUT_REPORT,
.broken = TRUE, .broken_id = -1,
.report_len = report_len - 1, .report_len = report_len - 1,
.report_buf = .report_buf =
{ {
@ -1142,7 +1142,7 @@ static void test_hidp_get_feature( HANDLE file, int report_id, ULONG report_len,
struct hid_expect broken_expect = struct hid_expect broken_expect =
{ {
.code = IOCTL_HID_GET_FEATURE, .code = IOCTL_HID_GET_FEATURE,
.broken = TRUE, .broken_id = -1,
.report_len = report_len - 1, .report_len = report_len - 1,
.report_buf = .report_buf =
{ {
@ -1240,7 +1240,7 @@ static void test_hidp_set_feature( HANDLE file, int report_id, ULONG report_len,
struct hid_expect broken_expect = struct hid_expect broken_expect =
{ {
.code = IOCTL_HID_SET_FEATURE, .code = IOCTL_HID_SET_FEATURE,
.broken = TRUE, .broken_id = -1,
.report_len = report_len - 1, .report_len = report_len - 1,
.report_buf = .report_buf =
{ {
@ -1341,7 +1341,7 @@ static void test_hidp_set_output( HANDLE file, int report_id, ULONG report_len,
struct hid_expect broken_expect = struct hid_expect broken_expect =
{ {
.code = IOCTL_HID_SET_OUTPUT_REPORT, .code = IOCTL_HID_SET_OUTPUT_REPORT,
.broken = TRUE, .broken_id = -1,
.report_len = report_len - 1, .report_len = report_len - 1,
.report_buf = {0x5a,0x5a}, .report_buf = {0x5a,0x5a},
.ret_length = 3, .ret_length = 3,