[PATCH v2 4/6] ntoskrnl.exe/tests: Add some buttons and hatswitch controls.

Rémi Bernon rbernon at codeweavers.com
Thu Jun 3 07:55:44 CDT 2021


Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
---
 dlls/ntoskrnl.exe/tests/driver_hid.c | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c
index 033c2925616..741fd9f639b 100644
--- a/dlls/ntoskrnl.exe/tests/driver_hid.c
+++ b/dlls/ntoskrnl.exe/tests/driver_hid.c
@@ -100,6 +100,27 @@ static const unsigned char report_descriptor[] =
         REPORT_SIZE(1, 8),
         REPORT_COUNT(1, 2),
         INPUT(1, Data|Var|Abs),
+
+        USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON),
+        USAGE_MINIMUM(1, 1),
+        USAGE_MAXIMUM(1, 8),
+        LOGICAL_MINIMUM(1, 0),
+        LOGICAL_MAXIMUM(1, 1),
+        PHYSICAL_MINIMUM(1, 0),
+        PHYSICAL_MAXIMUM(1, 1),
+        REPORT_COUNT(1, 8),
+        REPORT_SIZE(1, 1),
+        INPUT(1, Data|Var|Abs),
+
+        USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC),
+        USAGE(1, HID_USAGE_GENERIC_HATSWITCH),
+        LOGICAL_MINIMUM(1, 1),
+        LOGICAL_MAXIMUM(1, 8),
+        PHYSICAL_MINIMUM(1, 0),
+        PHYSICAL_MAXIMUM(1, 8),
+        REPORT_SIZE(1, 4),
+        REPORT_COUNT(1, 2),
+        INPUT(1, Data|Var|Abs),
     END_COLLECTION,
 };
 
@@ -181,7 +202,7 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp)
 
         case IOCTL_HID_READ_REPORT:
             ok(!in_size, "got input size %u\n", in_size);
-            if (test_failed++ < 10) todo_wine ok(out_size == 2, "got output size %u\n", out_size);
+            if (test_failed++ < 10) todo_wine ok(out_size == 4, "got output size %u\n", out_size);
 
             ret = STATUS_NOT_IMPLEMENTED;
             break;
-- 
2.31.0




More information about the wine-devel mailing list