Signed-off-by: Rémi Bernon rbernon@codeweavers.com --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 52 +++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 12 deletions(-)
diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 71dbfe1a5e9..5a7ca2b1f7b 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1841,6 +1841,8 @@ static void test_hidp(HANDLE file, int report_id) { .DataIndex = 1, }, { .DataIndex = 5, .RawValue = 1, }, { .DataIndex = 7, .RawValue = 1, }, + { .DataIndex = 19, .RawValue = 1, }, + { .DataIndex = 21, .RawValue = 1, }, { .DataIndex = 30, }, { .DataIndex = 31, }, { .DataIndex = 32, .RawValue = 0xfeedcafe, }, @@ -2199,6 +2201,20 @@ static void test_hidp(HANDLE file, int report_id) report, caps.InputReportByteLength); ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsages returned %#x\n", status);
+ usages[0] = 0x9; + usages[1] = 0xb; + usages[2] = 0xa; + value = 3; + ok(report[6] == 0, "got report[6] %x expected 0\n", report[6]); + ok(report[7] == 0, "got report[7] %x expected 0\n", report[7]); + memcpy(buffer, report, caps.InputReportByteLength); + status = HidP_SetUsages(HidP_Input, HID_USAGE_PAGE_KEYBOARD, 0, usages, &value, preparsed_data, + report, caps.InputReportByteLength); + todo_wine ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_SetUsages returned %#x\n", status); + buffer[6] = 2; + buffer[7] = 4; + todo_wine ok(!memcmp(buffer, report, caps.InputReportByteLength), "unexpected report data\n"); + status = HidP_SetUsageValue(HidP_Input, HID_USAGE_PAGE_LED, 0, 6, 1, preparsed_data, report, caps.InputReportByteLength); ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_SetUsageValue returned %#x\n", status); @@ -2237,23 +2253,35 @@ static void test_hidp(HANDLE file, int report_id) status = HidP_GetUsagesEx(HidP_Input, 0, usage_and_pages, &value, preparsed_data, report, caps.InputReportByteLength); ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsagesEx returned %#x\n", status); - ok(value == 4, "got usage count %d, expected %d\n", value, 4); + todo_wine ok(value == 6, "got usage count %d, expected %d\n", value, 4); ok(usage_and_pages[0].UsagePage == HID_USAGE_PAGE_BUTTON, "got usage_and_pages[0] UsagePage %x, expected %x\n", usage_and_pages[0].UsagePage, HID_USAGE_PAGE_BUTTON); ok(usage_and_pages[1].UsagePage == HID_USAGE_PAGE_BUTTON, "got usage_and_pages[1] UsagePage %x, expected %x\n", usage_and_pages[1].UsagePage, HID_USAGE_PAGE_BUTTON); - ok(usage_and_pages[2].UsagePage == HID_USAGE_PAGE_LED, "got usage_and_pages[2] UsagePage %x, expected %x\n", - usage_and_pages[2].UsagePage, HID_USAGE_PAGE_LED); - ok(usage_and_pages[3].UsagePage == HID_USAGE_PAGE_LED, "got usage_and_pages[3] UsagePage %x, expected %x\n", - usage_and_pages[3].UsagePage, HID_USAGE_PAGE_LED); + ok(usage_and_pages[2].UsagePage == HID_USAGE_PAGE_KEYBOARD, "got usage_and_pages[2] UsagePage %x, expected %x\n", + usage_and_pages[2].UsagePage, HID_USAGE_PAGE_KEYBOARD); + ok(usage_and_pages[3].UsagePage == HID_USAGE_PAGE_KEYBOARD, "got usage_and_pages[3] UsagePage %x, expected %x\n", + usage_and_pages[3].UsagePage, HID_USAGE_PAGE_KEYBOARD); + todo_wine + ok(usage_and_pages[4].UsagePage == HID_USAGE_PAGE_LED, "got usage_and_pages[4] UsagePage %x, expected %x\n", + usage_and_pages[4].UsagePage, HID_USAGE_PAGE_LED); + ok(usage_and_pages[5].UsagePage == HID_USAGE_PAGE_LED, "got usage_and_pages[5] UsagePage %x, expected %x\n", + usage_and_pages[5].UsagePage, HID_USAGE_PAGE_LED); ok(usage_and_pages[0].Usage == 4, "got usage_and_pages[0] Usage %x, expected %x\n", usage_and_pages[0].Usage, 4); ok(usage_and_pages[1].Usage == 6, "got usage_and_pages[1] Usage %x, expected %x\n", usage_and_pages[1].Usage, 6); - ok(usage_and_pages[2].Usage == 6, "got usage_and_pages[2] Usage %x, expected %x\n", - usage_and_pages[2].Usage, 6); - ok(usage_and_pages[3].Usage == 4, "got usage_and_pages[3] Usage %x, expected %x\n", - usage_and_pages[3].Usage, 4); + ok(usage_and_pages[2].Usage == 9, "got usage_and_pages[2] Usage %x, expected %x\n", + usage_and_pages[2].Usage, 9); + todo_wine + ok(usage_and_pages[3].Usage == 11, "got usage_and_pages[3] Usage %x, expected %x\n", + usage_and_pages[3].Usage, 11); + todo_wine + ok(usage_and_pages[4].Usage == 6, "got usage_and_pages[4] Usage %x, expected %x\n", + usage_and_pages[4].Usage, 6); + todo_wine + ok(usage_and_pages[5].Usage == 4, "got usage_and_pages[5] Usage %x, expected %x\n", + usage_and_pages[5].Usage, 4);
value = HidP_MaxDataListLength(HidP_Feature + 1, preparsed_data); ok(value == 0, "HidP_MaxDataListLength(HidP_Feature + 1) returned %d, expected %d\n", value, 0); @@ -2267,15 +2295,15 @@ static void test_hidp(HANDLE file, int report_id) value = 1; status = HidP_GetData(HidP_Input, data, &value, preparsed_data, report, caps.InputReportByteLength); ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetData returned %#x\n", status); - ok(value == 9, "got data count %d, expected %d\n", value, 9); + todo_wine ok(value == 11, "got data count %d, expected %d\n", value, 11); memset(data, 0, sizeof(data)); status = HidP_GetData(HidP_Input, data, &value, preparsed_data, report, caps.InputReportByteLength); ok(status == HIDP_STATUS_SUCCESS, "HidP_GetData returned %#x\n", status); for (i = 0; i < ARRAY_SIZE(expect_data); ++i) { winetest_push_context("data[%d]", i); - check_member(data[i], expect_data[i], "%d", DataIndex); - check_member(data[i], expect_data[i], "%d", RawValue); + todo_wine_if(i >= 4) check_member(data[i], expect_data[i], "%d", DataIndex); + todo_wine_if(i >= 4) check_member(data[i], expect_data[i], "%d", RawValue); winetest_pop_context(); }
Signed-off-by: Rémi Bernon rbernon@codeweavers.com --- dlls/ntoskrnl.exe/tests/driver_hid.c | 21 ++++++++++ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 57 ++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+)
diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index acb51d99816..793b25f3189 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -382,6 +382,27 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) break; }
+ case IOCTL_HID_GET_INPUT_REPORT: + { + HID_XFER_PACKET *packet = irp->UserBuffer; + ULONG expected_size = 23; + ok(!in_size, "got input size %u\n", in_size); + ok(out_size == sizeof(*packet), "got output size %u\n", out_size); + + todo_wine_if(packet->reportId == 0x5a) + ok(packet->reportId == report_id, "got packet report id %u\n", packet->reportId); + todo_wine_if(packet->reportBufferLen == 21 || packet->reportBufferLen == 22) + ok(packet->reportBufferLen >= expected_size, "got packet buffer len %u, expected %d or more\n", + packet->reportBufferLen, expected_size); + ok(!!packet->reportBuffer, "got packet 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; + break; + } + case IOCTL_HID_GET_STRING: ok(!in_size, "got input size %u\n", in_size); ok(out_size == 128, "got output size %u\n", out_size); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 5a7ca2b1f7b..0c579b9e1c7 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1660,6 +1660,21 @@ static inline void check_hidp_value_caps_(int line, HIDP_VALUE_CAPS *caps, const } }
+static BOOL sync_ioctl(HANDLE file, DWORD code, void *in_buf, DWORD in_len, void *out_buf, DWORD *ret_len) +{ + OVERLAPPED ovl = {0}; + DWORD out_len = ret_len ? *ret_len : 0; + BOOL ret; + + ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + ret = DeviceIoControl(file, code, in_buf, in_len, out_buf, out_len, &out_len, &ovl); + if (!ret && GetLastError() == ERROR_IO_PENDING) ret = GetOverlappedResult(file, &ovl, &out_len, TRUE); + CloseHandle(ovl.hEvent); + + if (ret_len) *ret_len = out_len; + return ret; +} + static void test_hidp(HANDLE file, int report_id) { const HIDP_CAPS expect_hidp_caps[] = @@ -2418,6 +2433,48 @@ static void test_hidp(HANDLE file, int report_id) memset(buffer + 16, 0xff, 8); ok(!memcmp(buffer, buffer + 16, 16), "unexpected report value\n");
+ + 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"); + todo_wine ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_GetInputReport returned error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = HidD_GetInputReport(file, report, caps.InputReportByteLength - 1); + todo_wine ok(!ret, "HidD_GetInputReport succeeded\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "HidD_GetInputReport returned error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + memset(buffer, 0x5a, sizeof(buffer)); + ret = HidD_GetInputReport(file, buffer, caps.InputReportByteLength); + if (!report_id) + { + ok(ret, "HidD_GetInputReport failed, last error %u\n", GetLastError()); + todo_wine ok(buffer[0] == 0x5a, "got buffer[0] %x, expected 0x5a\n", (BYTE)buffer[0]); + } + else + { + todo_wine ok(!ret, "HidD_GetInputReport succeeded, last error %u\n", GetLastError()); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "HidD_GetInputReport returned error %u\n", GetLastError()); + } + + 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()); + todo_wine 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); + + HidD_FreePreparsedData(preparsed_data); CloseHandle(file); }
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=93415
Your paranoid android.
=== w7u_2qxl (32 bit report) ===
ntoskrnl.exe: ntoskrnl.c:2449: Test failed: report 0: HidD_GetInputReport returned error 23 ntoskrnl.c:2456: Test failed: report 0: HidD_GetInputReport failed, last error 23 ntoskrnl.c:2449: Test failed: report 1: HidD_GetInputReport returned error 23 ntoskrnl.c:2462: Test failed: report 1: HidD_GetInputReport returned error 23
=== w7u_el (32 bit report) ===
ntoskrnl.exe: ntoskrnl.c:2449: Test failed: report 0: HidD_GetInputReport returned error 23 ntoskrnl.c:2456: Test failed: report 0: HidD_GetInputReport failed, last error 23 ntoskrnl.c:2449: Test failed: report 1: HidD_GetInputReport returned error 23 ntoskrnl.c:2462: Test failed: report 1: HidD_GetInputReport returned error 23
=== debiant2 (32 bit report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctlsexpected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls
Report validation errors: ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (32 bit Arabic:Morocco report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls
Report validation errors: ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (32 bit German report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls
Report validation errors: ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (32 bit French report) ===
Report validation errors: ntoskrnl.exe:ntoskrnl is missing some failure messages ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (32 bit Hebrew:Israel report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctlsexpected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEexpected IRP_MN_START_DEVICE before any ioctls driver_hid.c:373: Test succeeded inside todo block: got input size 0
Report validation errors: ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (32 bit Hindi:India report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctlsexpected IRP_MN_START_DEVICE before any ioctls
Report validation errors: ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (32 bit Japanese:Japan report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls
Report validation errors: ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (32 bit Chinese:China report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:373: Test succeeded inside todo block: got input size 0
Report validation errors: ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (64 bit WoW report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:373: Test succeeded inside todo block: got input size 0
Report validation errors: ntoskrnl.exe:ntoskrnl returned success despite having failures
Signed-off-by: Rémi Bernon rbernon@codeweavers.com --- dlls/ntoskrnl.exe/tests/driver_hid.c | 21 ++++++++++++++ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 43 ++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+)
diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index 793b25f3189..ae039c061de 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -403,6 +403,27 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) break; }
+ case IOCTL_HID_GET_FEATURE: + { + HID_XFER_PACKET *packet = irp->UserBuffer; + ULONG expected_size = 17; + ok(!in_size, "got input size %u\n", in_size); + ok(out_size == sizeof(*packet), "got output size %u\n", out_size); + + todo_wine_if(packet->reportId == 0x5a || packet->reportId == 0xa5) + ok(packet->reportId == report_id, "got packet report id %u\n", packet->reportId); + todo_wine_if(packet->reportBufferLen == 16) + ok(packet->reportBufferLen >= expected_size, "got packet buffer len %u, expected %d or more\n", + packet->reportBufferLen, expected_size); + ok(!!packet->reportBuffer, "got packet 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; + break; + } + case IOCTL_HID_GET_STRING: ok(!in_size, "got input size %u\n", in_size); ok(out_size == 128, "got output size %u\n", out_size); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 0c579b9e1c7..5861f88e4be 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2475,6 +2475,49 @@ static void test_hidp(HANDLE file, int report_id) 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"); + todo_wine ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_GetFeature returned error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = HidD_GetFeature(file, report, caps.FeatureReportByteLength - 1); + todo_wine ok(!ret, "HidD_GetFeature succeeded\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "HidD_GetFeature returned error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + memset(buffer, 0x5a, sizeof(buffer)); + ret = HidD_GetFeature(file, buffer, caps.FeatureReportByteLength); + if (!report_id) + { + ok(ret, "HidD_GetFeature failed, last error %u\n", GetLastError()); + todo_wine ok(buffer[0] == 0x5a, "got buffer[0] %x, expected 0x5a\n", (BYTE)buffer[0]); + } + else + { + todo_wine ok(!ret, "HidD_GetFeature succeeded, last error %u\n", GetLastError()); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "HidD_GetFeature returned error %u\n", GetLastError()); + } + + SetLastError(0xdeadbeef); + ret = HidD_GetFeature(file, report, caps.FeatureReportByteLength); + ok(ret, "HidD_GetFeature failed, last error %u\n", GetLastError()); + todo_wine_if(!report_id) + 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()); + todo_wine ok(value == 3, "got length %u, expected 3\n", value); + todo_wine_if(!report_id) + ok(report[0] == report_id, "got report[0] %02x, expected %02x\n", report[0], report_id); + + HidD_FreePreparsedData(preparsed_data); CloseHandle(file); }
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=93416
Your paranoid android.
=== w7u_2qxl (32 bit report) ===
ntoskrnl.exe: ntoskrnl.c:2449: Test failed: report 0: HidD_GetInputReport returned error 23 ntoskrnl.c:2456: Test failed: report 0: HidD_GetInputReport failed, last error 23 ntoskrnl.c:2490: Test failed: report 0: HidD_GetFeature returned error 23 ntoskrnl.c:2497: Test failed: report 0: HidD_GetFeature failed, last error 23 ntoskrnl.c:2449: Test failed: report 1: HidD_GetInputReport returned error 23 ntoskrnl.c:2462: Test failed: report 1: HidD_GetInputReport returned error 23 ntoskrnl.c:2490: Test failed: report 1: HidD_GetFeature returned error 23 ntoskrnl.c:2503: Test failed: report 1: HidD_GetFeature returned error 23
=== w7u_el (32 bit report) ===
ntoskrnl.exe: ntoskrnl.c:2449: Test failed: report 0: HidD_GetInputReport returned error 23 ntoskrnl.c:2456: Test failed: report 0: HidD_GetInputReport failed, last error 23 ntoskrnl.c:2490: Test failed: report 0: HidD_GetFeature returned error 23 ntoskrnl.c:2497: Test failed: report 0: HidD_GetFeature failed, last error 23 ntoskrnl.c:2449: Test failed: report 1: HidD_GetInputReport returned error 23 ntoskrnl.c:2462: Test failed: report 1: HidD_GetInputReport returned error 23 ntoskrnl.c:2490: Test failed: report 1: HidD_GetFeature returned error 23 ntoskrnl.c:2503: Test failed: report 1: HidD_GetFeature returned error 23
=== debiant2 (32 bit report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls
Report validation errors: ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (32 bit Arabic:Morocco report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctlsexpected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls
Report validation errors: ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (32 bit German report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls
Report validation errors: ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (32 bit French report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls
Report validation errors: ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (32 bit Hebrew:Israel report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: got packet buffer len 22, expected 23 or more driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls
Report validation errors: ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (32 bit Hindi:India report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctlsexpected IRP_MN_START_DEVICE before any ioctls
Report validation errors: ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (32 bit Japanese:Japan report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls
Report validation errors: ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (32 bit Chinese:China report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls
Report validation errors: ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (64 bit WoW report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls
Report validation errors: ntoskrnl.exe:ntoskrnl returned success despite having failures
On 7/1/21 10:35 AM, Marvin wrote:
=== debiant2 (32 bit report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls
Report validation errors: ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (32 bit Arabic:Morocco report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctlsexpected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls
Report validation errors: ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (32 bit German report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls
Report validation errors: ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (32 bit French report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls
Report validation errors: ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (32 bit Hebrew:Israel report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: got packet buffer len 22, expected 23 or more driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls
Report validation errors: ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (32 bit Hindi:India report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctlsexpected IRP_MN_START_DEVICE before any ioctls
Report validation errors: ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (32 bit Japanese:Japan report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls
Report validation errors: ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (32 bit Chinese:China report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls
Report validation errors: ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (64 bit WoW report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls
Report validation errors: ntoskrnl.exe:ntoskrnl returned success despite having failures
This test isn't even marked todo_wine?! And of course I can't reproduce the failure locally either.
Signed-off-by: Rémi Bernon rbernon@codeweavers.com --- dlls/ntoskrnl.exe/tests/driver_hid.c | 19 +++++++++++++ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 41 ++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+)
diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index ae039c061de..7c85e9a67db 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -424,6 +424,25 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) break; }
+ case IOCTL_HID_SET_FEATURE: + { + HID_XFER_PACKET *packet = irp->UserBuffer; + ULONG expected_size = 17; + todo_wine ok(in_size == sizeof(*packet), "got input size %u\n", in_size); + todo_wine ok(!out_size, "got output size %u\n", out_size); + + todo_wine_if(packet->reportId != report_id) + ok(packet->reportId == report_id, "got packet report id %u\n", packet->reportId); + todo_wine_if(packet->reportBufferLen == 0 || packet->reportBufferLen == 16) + ok(packet->reportBufferLen >= expected_size, "got packet buffer len %u, expected %d or more\n", + packet->reportBufferLen, expected_size); + ok(!!packet->reportBuffer, "got packet buffer %p\n", packet->reportBuffer); + + irp->IoStatus.Information = 3; + ret = STATUS_SUCCESS; + break; + } + case IOCTL_HID_GET_STRING: ok(!in_size, "got input size %u\n", in_size); ok(out_size == 128, "got output size %u\n", out_size); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 5861f88e4be..4fe63e8b833 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2518,6 +2518,47 @@ static void test_hidp(HANDLE file, int report_id) 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_SetFeature(file, report, 0); + todo_wine ok(!ret, "HidD_SetFeature succeeded\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_SetFeature returned error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = HidD_SetFeature(file, report, caps.FeatureReportByteLength - 1); + todo_wine ok(!ret, "HidD_SetFeature succeeded\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "HidD_SetFeature returned error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + memset(buffer, 0x5a, sizeof(buffer)); + ret = HidD_SetFeature(file, buffer, caps.FeatureReportByteLength); + if (!report_id) + ok(ret, "HidD_SetFeature failed, last error %u\n", GetLastError()); + else + { + todo_wine ok(!ret, "HidD_SetFeature succeeded, last error %u\n", GetLastError()); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "HidD_SetFeature returned error %u\n", GetLastError()); + } + + SetLastError(0xdeadbeef); + ret = HidD_SetFeature(file, report, caps.FeatureReportByteLength); + ok(ret, "HidD_SetFeature failed, last error %u\n", GetLastError()); + + value = caps.FeatureReportByteLength * 2; + SetLastError(0xdeadbeef); + ret = sync_ioctl(file, IOCTL_HID_SET_FEATURE, NULL, 0, report, &value); + todo_wine ok(!ret, "IOCTL_HID_SET_FEATURE succeeded\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "IOCTL_HID_SET_FEATURE returned error %u\n", GetLastError()); + value = 0; + SetLastError(0xdeadbeef); + ret = sync_ioctl(file, IOCTL_HID_SET_FEATURE, report, caps.FeatureReportByteLength * 2, NULL, &value); + ok(ret, "IOCTL_HID_SET_FEATURE failed, last error %u\n", GetLastError()); + todo_wine ok(value == 3, "got length %u, expected 3\n", value); + + HidD_FreePreparsedData(preparsed_data); CloseHandle(file); }
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=93417
Your paranoid android.
=== w7u_2qxl (32 bit report) ===
ntoskrnl.exe: ntoskrnl.c:2449: Test failed: report 0: HidD_GetInputReport returned error 23 ntoskrnl.c:2456: Test failed: report 0: HidD_GetInputReport failed, last error 23 ntoskrnl.c:2490: Test failed: report 0: HidD_GetFeature returned error 23 ntoskrnl.c:2497: Test failed: report 0: HidD_GetFeature failed, last error 23 ntoskrnl.c:2533: Test failed: report 0: HidD_SetFeature returned error 23 ntoskrnl.c:2539: Test failed: report 0: HidD_SetFeature failed, last error 23 ntoskrnl.c:2449: Test failed: report 1: HidD_GetInputReport returned error 23 ntoskrnl.c:2462: Test failed: report 1: HidD_GetInputReport returned error 23 ntoskrnl.c:2490: Test failed: report 1: HidD_GetFeature returned error 23 ntoskrnl.c:2503: Test failed: report 1: HidD_GetFeature returned error 23 ntoskrnl.c:2533: Test failed: report 1: HidD_SetFeature returned error 23 ntoskrnl.c:2543: Test failed: report 1: HidD_SetFeature returned error 23
=== w7u_el (32 bit report) ===
ntoskrnl.exe: ntoskrnl.c:2449: Test failed: report 0: HidD_GetInputReport returned error 23 ntoskrnl.c:2456: Test failed: report 0: HidD_GetInputReport failed, last error 23 ntoskrnl.c:2490: Test failed: report 0: HidD_GetFeature returned error 23 ntoskrnl.c:2497: Test failed: report 0: HidD_GetFeature failed, last error 23 ntoskrnl.c:2533: Test failed: report 0: HidD_SetFeature returned error 23 ntoskrnl.c:2539: Test failed: report 0: HidD_SetFeature failed, last error 23 ntoskrnl.c:2449: Test failed: report 1: HidD_GetInputReport returned error 23 ntoskrnl.c:2462: Test failed: report 1: HidD_GetInputReport returned error 23 ntoskrnl.c:2490: Test failed: report 1: HidD_GetFeature returned error 23 ntoskrnl.c:2503: Test failed: report 1: HidD_GetFeature returned error 23 ntoskrnl.c:2533: Test failed: report 1: HidD_SetFeature returned error 23 ntoskrnl.c:2543: Test failed: report 1: HidD_SetFeature returned error 23
=== debiant2 (32 bit report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:377: Test succeeded inside todo block: got output size 23 driver_hid.c:373: Test succeeded inside todo block: got input size 0 driver_hid.c:373: Test succeeded inside todo block: got input size 0 driver_hid.c:373: Test succeeded inside todo block: got input size 0
Report validation errors: ntoskrnl.exe:ntoskrnl has unaccounted for failure messages ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (32 bit Arabic:Morocco report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls d.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:373: Test succeeded inside todo block: got input size 0 driver_hid.c:377: Test succeeded inside todo block: got output size 23 driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:373: Test succeeded inside todo block: got input size 0
Report validation errors: ntoskrnl.exe:ntoskrnl contains a misplaced failure line for d
=== debiant2 (32 bit German report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:377: Test succeeded inside todo block: got output size 23 driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:377: Test succeeded inside todo block: got output size 23 driver_hid.c:377: Test succeeded inside todo block: got output size 12 driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:377: Test succeeded inside todo block: got output size 23 id.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:377: Test succeeded inside todo block: got output size 23
Report validation errors: ntoskrnl.exe:ntoskrnl contains a misplaced failure line for id
=== debiant2 (32 bit French report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: got packet buffer len 21, expected 23 or more driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctlsexpected IRP_MN_START_DEVICE before any ioctls river_hid.c:437: Test succeeded inside todo block: got packet buffer len 17, expected 17 or more driver_hid.c:307: Test succeeded inside todo block: got output size 12 driver_hid.c:373: Test succeeded inside todo block: got input size 0
Report validation errors: ntoskrnl.exe:ntoskrnl contains a misplaced failure line for river_hid
=== debiant2 (32 bit Hebrew:Israel report) ===
ntoskrnl.exe: driver_hid.c:373: Test succeeded inside todo block: got input size 0 driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctlsexpected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:439: Test succeeded inside todo block: got packet buffer 00426920
Report validation errors: ntoskrnl.exe:ntoskrnl has unaccounted for failure messages ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (32 bit Hindi:India report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctlsexpected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEexpected IRP_MN_START_DEVICE before any ioctls driver_hid.c:373: Test succeeded inside todo block: got input size 0 driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_Sexpected IRP_MN_START_DEVICE before any ioctls driver_hid.c:373: Test succeeded inside todo block: got input size 0
Report validation errors: ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (32 bit Japanese:Japan report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:373: Test succeeded inside todo block: got input size 0 driver_hid.c:373: Test succeeded inside todo block: got input size 0 driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:373: Test succeeded inside todo block: got input size 0 driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls
=== debiant2 (32 bit Chinese:China report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctlsexpected IRP_MN_START_DEVICE before any ioctls driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:373: Test succeeded inside todo block: got input size 0 driver_hid.c:439: Test succeeded inside todo block: driver_hid.c:439: Test succeeded inside todo block: got packet buffer 0got packet buffer 00426918
Report validation errors: ntoskrnl.exe:ntoskrnl has no test summary line (early exit of the main process?) ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (64 bit WoW report) ===
ntoskrnl.exe: driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:373: Test succeeded inside todo block: got input size 0 driver_hid.c:307: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:377: Test succeeded inside todo block: got output size 23 driver_hid.c:373: Test succeeded inside todo block: got input size 0 driver_hid.c:373: Test succeeded inside todo block: got input size 0 driver_hid.c:373: Test succeeded inside todo block: got input size 0
Report validation errors: ntoskrnl.exe:ntoskrnl has unaccounted for failure messages ntoskrnl.exe:ntoskrnl returned success despite having failures
Signed-off-by: Rémi Bernon rbernon@codeweavers.com --- dlls/ntoskrnl.exe/tests/driver_hid.c | 39 ++++++++++++++++++++ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 53 +++++++++++++++++++++++++--- 2 files changed, 88 insertions(+), 4 deletions(-)
diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index 7c85e9a67db..049b4232753 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -290,6 +290,26 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) REPORT_SIZE(1, 1), FEATURE(1, Data|Var|Abs), END_COLLECTION, + + USAGE_PAGE(1, HID_USAGE_PAGE_LED), + USAGE(1, HID_USAGE_LED_GREEN), + COLLECTION(1, Report), + REPORT_ID_OR_USAGE_PAGE(1, report_id, 0), + USAGE_PAGE(1, HID_USAGE_PAGE_LED), + REPORT_COUNT(1, 8), + REPORT_SIZE(1, 1), + OUTPUT(1, Cnst|Var|Abs), + END_COLLECTION, + + USAGE_PAGE(1, HID_USAGE_PAGE_LED), + USAGE(1, HID_USAGE_LED_RED), + COLLECTION(1, Report), + REPORT_ID_OR_USAGE_PAGE(1, report_id, 1), + USAGE_PAGE(1, HID_USAGE_PAGE_LED), + REPORT_COUNT(1, 8), + REPORT_SIZE(1, 1), + OUTPUT(1, Cnst|Var|Abs), + END_COLLECTION, END_COLLECTION, }; #undef REPORT_ID_OR_USAGE_PAGE @@ -403,6 +423,25 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) break; }
+ case IOCTL_HID_SET_OUTPUT_REPORT: + { + HID_XFER_PACKET *packet = irp->UserBuffer; + ULONG expected_size = 2; + todo_wine ok(in_size == sizeof(*packet), "got input size %u\n", in_size); + todo_wine ok(!out_size, "got output size %u\n", out_size); + + todo_wine_if(packet->reportId != report_id) + ok(packet->reportId == report_id, "got packet report id %u\n", packet->reportId); + todo_wine_if(packet->reportBufferLen == 0 || packet->reportBufferLen == 1) + ok(packet->reportBufferLen >= expected_size, "got packet buffer len %u, expected %d or more\n", + packet->reportBufferLen, expected_size); + ok(!!packet->reportBuffer, "got packet buffer %p\n", packet->reportBuffer); + + irp->IoStatus.Information = 3; + ret = STATUS_SUCCESS; + break; + } + case IOCTL_HID_GET_FEATURE: { HID_XFER_PACKET *packet = irp->UserBuffer; diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 4fe63e8b833..f33c56afcfc 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1684,8 +1684,9 @@ static void test_hidp(HANDLE file, int report_id) .Usage = HID_USAGE_GENERIC_JOYSTICK, .UsagePage = HID_USAGE_PAGE_GENERIC, .InputReportByteLength = 24, + .OutputReportByteLength = 3, .FeatureReportByteLength = 18, - .NumberLinkCollectionNodes = 8, + .NumberLinkCollectionNodes = 10, .NumberInputButtonCaps = 13, .NumberInputValueCaps = 7, .NumberInputDataIndices = 43, @@ -1698,8 +1699,9 @@ static void test_hidp(HANDLE file, int report_id) .Usage = HID_USAGE_GENERIC_JOYSTICK, .UsagePage = HID_USAGE_PAGE_GENERIC, .InputReportByteLength = 23, + .OutputReportByteLength = 2, .FeatureReportByteLength = 17, - .NumberLinkCollectionNodes = 8, + .NumberLinkCollectionNodes = 10, .NumberInputButtonCaps = 13, .NumberInputValueCaps = 7, .NumberInputDataIndices = 43, @@ -1841,8 +1843,8 @@ static void test_hidp(HANDLE file, int report_id) .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, .LinkUsagePage = HID_USAGE_PAGE_GENERIC, .CollectionType = 1, - .NumberOfChildren = 5, - .FirstChild = 7, + .NumberOfChildren = 7, + .FirstChild = 9, }, { .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, @@ -2559,6 +2561,49 @@ static void test_hidp(HANDLE file, int report_id) todo_wine ok(value == 3, "got length %u, expected 3\n", value);
+ 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); + todo_wine ok(!ret, "HidD_SetOutputReport succeeded\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_SetOutputReport returned error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = HidD_SetOutputReport(file, report, caps.OutputReportByteLength - 1); + todo_wine ok(!ret, "HidD_SetOutputReport succeeded\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "HidD_SetOutputReport returned error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + memset(buffer, 0x5a, sizeof(buffer)); + ret = HidD_SetOutputReport(file, buffer, caps.OutputReportByteLength); + if (!report_id) + ok(ret, "HidD_SetOutputReport failed, last error %u\n", GetLastError()); + else + { + todo_wine ok(!ret, "HidD_SetOutputReport succeeded, last error %u\n", GetLastError()); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "HidD_SetOutputReport returned 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); + todo_wine ok(!ret, "IOCTL_HID_SET_OUTPUT_REPORT succeeded\n"); + todo_wine 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()); + todo_wine ok(value == 3, "got length %u, expected 3\n", value); + + HidD_FreePreparsedData(preparsed_data); CloseHandle(file); }
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=93418
Your paranoid android.
=== w7u_2qxl (32 bit report) ===
ntoskrnl.exe: ntoskrnl.c:2451: Test failed: report 0: HidD_GetInputReport returned error 23 ntoskrnl.c:2458: Test failed: report 0: HidD_GetInputReport failed, last error 23 ntoskrnl.c:2492: Test failed: report 0: HidD_GetFeature returned error 23 ntoskrnl.c:2499: Test failed: report 0: HidD_GetFeature failed, last error 23 ntoskrnl.c:2535: Test failed: report 0: HidD_SetFeature returned error 23 ntoskrnl.c:2541: Test failed: report 0: HidD_SetFeature failed, last error 23 ntoskrnl.c:2578: Test failed: report 0: HidD_SetOutputReport returned error 23 ntoskrnl.c:2584: Test failed: report 0: HidD_SetOutputReport failed, last error 23 ntoskrnl.c:2451: Test failed: report 1: HidD_GetInputReport returned error 23 ntoskrnl.c:2464: Test failed: report 1: HidD_GetInputReport returned error 23 ntoskrnl.c:2492: Test failed: report 1: HidD_GetFeature returned error 23 ntoskrnl.c:2505: Test failed: report 1: HidD_GetFeature returned error 23 ntoskrnl.c:2535: Test failed: report 1: HidD_SetFeature returned error 23 ntoskrnl.c:2545: Test failed: report 1: HidD_SetFeature returned error 23 ntoskrnl.c:2578: Test failed: report 1: HidD_SetOutputReport returned error 23 ntoskrnl.c:2588: Test failed: report 1: HidD_SetOutputReport returned error 23
=== w7u_el (32 bit report) ===
ntoskrnl.exe: ntoskrnl.c:2451: Test failed: report 0: HidD_GetInputReport returned error 23 ntoskrnl.c:2458: Test failed: report 0: HidD_GetInputReport failed, last error 23 ntoskrnl.c:2492: Test failed: report 0: HidD_GetFeature returned error 23 ntoskrnl.c:2499: Test failed: report 0: HidD_GetFeature failed, last error 23 ntoskrnl.c:2535: Test failed: report 0: HidD_SetFeature returned error 23 ntoskrnl.c:2541: Test failed: report 0: HidD_SetFeature failed, last error 23 ntoskrnl.c:2578: Test failed: report 0: HidD_SetOutputReport returned error 23 ntoskrnl.c:2584: Test failed: report 0: HidD_SetOutputReport failed, last error 23 ntoskrnl.c:2451: Test failed: report 1: HidD_GetInputReport returned error 23 ntoskrnl.c:2464: Test failed: report 1: HidD_GetInputReport returned error 23 ntoskrnl.c:2492: Test failed: report 1: HidD_GetFeature returned error 23 ntoskrnl.c:2505: Test failed: report 1: HidD_GetFeature returned error 23 ntoskrnl.c:2535: Test failed: report 1: HidD_SetFeature returned error 23 ntoskrnl.c:2545: Test failed: report 1: HidD_SetFeature returned error 23 ntoskrnl.c:2578: Test failed: report 1: HidD_SetOutputReport returned error 23 ntoskrnl.c:2588: Test failed: report 1: HidD_SetOutputReport returned error 23
=== debiant2 (32 bit report) ===
ntoskrnl.exe: driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:438: Test succeeded inside todo block: got packet buffer 004269B0 driver_hid.c:327: Test succeeded inside todo block: got input size 0Sexpected IRP_MN_START_DEVICE before any ioctls driver_hid.c:393: Test succeeded inside todo block: got input size 0
Report validation errors: ntoskrnl.exe:ntoskrnl has no test summary line (early exit of the main process?) ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (32 bit Arabic:Morocco report) ===
ntoskrnl.exe: driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:393: Test succeeded inside todo block: got input size 0 driver_hid.c:393: Test succeeded inside todo block: got packet buffergot packet buffer len 16, expected 17 or more driver_hid.c:393: Test succeeded inside todo block: got input size 0 driver_hid.c:393: Test succeeded inside todo block: got input size 0 driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:397: Test succeeded inside todo block: got input size 0 driver_hid.c:397: Test succeeded inside todo block: got output size 23 ver_hid.c:397: Test succeeded inside todo block: got output size 23 er_hid.c:393: Test succeeded inside todo block: got input size 0 driver_hid.c:397: Test succeeded inside todo block: got output size 23 driver_hid.c:434: Test succeeded inside todo block: got packet report id 1
Report validation errors: ntoskrnl.exe:ntoskrnl contains a misplaced todo line for d
=== debiant2 (32 bit German report) ===
ntoskrnl.exe: driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:393: Test succeeded inside todo block: got input size 0 driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:393: Test succeeded inside todo block: got input size 0 driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:393: Test succeeded inside todo block: got input size 0 driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:393: Test succeeded inside todo block: got input size 0 driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:393: Test succeeded inside todo block: got input size 0 driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:393: Test succeeded inside todo block: got input size 0 driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:393: Test succeeded inside todo block: got input size 0 driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:393: Test succeeded inside todo block: got input size 0 driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls
Report validation errors: ntoskrnl.exe:ntoskrnl has no test summary line (early exit of the main process?) ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (32 bit French report) ===
ntoskrnl.exe: driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctlsexpected IRP_MN_START_DEVICE before any ioctls driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:327: Test succeeded inside todo block: got input size 0 r_hid.c:327: Test succeeded inside todo block: got input size 0 driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:393: Test succeeded inside todo block: got input size 6: Test marked todo: got input size 0 driver_hid.c:327: Test succeeded inside todo block: got output size 12 driver_hid.c:327: Test succeeded inside todo block: got packet buffer len 16, expected 17 or more driver_hid.c:327: Test succeeded inside todo block: got input size 0 driver_hid.c:393: Test succeeded inside todo block: got input size 0
Report validation errors: ntoskrnl.exe:ntoskrnl contains a misplaced failure line for r_hid
=== debiant2 (32 bit Hebrew:Israel report) ===
ntoskrnl.exe: driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:397: Test succeeded inside todo block: got output size 23 driver_hid.c:393: Test succeeded inside todo block: got input size 0 driver_hid.c:393: Test succeeded inside todo block: got input size 0 driver_hid.c:397: Test succeeded inside todo block: got output size 23 driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:393: Test succeeded inside todo block: got input size 0 driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:393: Test succeeded inside todo block: got input size 0 driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:393: Test succeeded inside todo block: got input size 0 driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:393: Test succeeded inside todo block: got input size 0 driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:393: Test succeeded inside todo block: got input size 0 driver_hid.c:393: Test succeeded inside todo block: got input size 0 driver_hid.c:327: Test succeeded inside todo block: driver_hid.c:393:TART_DEVICE before any ioctls driver_hid.c:393: Test succeeded inside todo block: got input size 0 driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:393: Test succeeded inside todo block: got input size 0
Report validation errors: ntoskrnl.exe:ntoskrnl contains a misplaced todo line for ver_hid
=== debiant2 (32 bit Hindi:India report) ===
ntoskrnl.exe: ver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls
Report validation errors: ntoskrnl.exe:ntoskrnl contains a misplaced failure line for ver_hid
=== debiant2 (32 bit Japanese:Japan report) ===
ntoskrnl.exe: driver_hid.c:327: Test succeeded inside todo block: got packet buffer len 21, expected 23 or more driver_hid.c:327: Test succeeded inside todo block: got packet report id 90 driver_hid.c:327: Test succeeded inside todo block: got packet buffer len 22, expected 23 or more driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:393: Test succeeded inside todo block: got input size 0
Report validation errors: ntoskrnl.exe:ntoskrnl returned success despite having failures
=== debiant2 (32 bit Chinese:China report) ===
ntoskrnl.exe: ntoskrnl: Timeout
=== debiant2 (64 bit WoW report) ===
ntoskrnl.exe: driver_hid.c:327: Test succeeded inside todo block: got packet report id 90 driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:327: Test succeeded inside todo block: driver_hid.c:471: Test marked todo: got output size START_DEVICE before any ioctls driver_hid.c:393: Test succeeded inside todo block: got input size 0 driver_hid.c:393: Test succeeded inside todo block: got input size 4: Test marked todo: got packet reportgot packet report id 80 driver_hid.c:393: Test succeeded inside todo block: got input size 0 driver_hid.c:393: Test succeeded inside todo block: got input size 0 driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls driver_hid.c:393: Test succeeded inside todo block: got input size 0 driver_hid.c:327: Test succeeded inside todo block: expected IRP_MN_START_DEVICE before any ioctls
Report validation errors: ntoskrnl.exe:ntoskrnl returned success despite having failures
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=93414
Your paranoid android.
=== debiant2 (32 bit Arabic:Morocco report) ===
ntoskrnl.exe: ntoskrnl: Timeout
=== debiant2 (32 bit Japanese:Japan report) ===
ntoskrnl.exe: ntoskrnl: Timeout
-
Marvin -
Rémi Bernon