Rémi Bernon : include: Add more HID digitizer usage definitions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: aaf34e3f7e34be54e5645de97f8318071a620ded
URL:    https://gitlab.winehq.org/wine/wine/-/commit/aaf34e3f7e34be54e5645de97f83180...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Tue May 31 22:07:02 2022 +0200

include: Add more HID digitizer usage definitions.

---

 include/hidusage.h |  2 ++
 include/wine/hid.h | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/include/hidusage.h b/include/hidusage.h
index 2ea3784d626..58ae5aab3e6 100644
--- a/include/hidusage.h
+++ b/include/hidusage.h
@@ -31,6 +31,7 @@ typedef USHORT USAGE, *PUSAGE;
 #define HID_USAGE_DIGITIZER_PEN                  ((USAGE) 0x02)
 #define HID_USAGE_DIGITIZER_TOUCH_SCREEN         ((USAGE) 0x04)
 #define HID_USAGE_DIGITIZER_TOUCH_PAD            ((USAGE) 0x05)
+#define HID_USAGE_DIGITIZER_FINGER               ((USAGE) 0x22)
 #define HID_USAGE_DIGITIZER_TIP_PRESSURE         ((USAGE) 0x30)
 #define HID_USAGE_DIGITIZER_IN_RANGE             ((USAGE) 0x32)
 #define HID_USAGE_DIGITIZER_X_TILT               ((USAGE) 0x3D)
@@ -38,6 +39,7 @@ typedef USHORT USAGE, *PUSAGE;
 #define HID_USAGE_DIGITIZER_AZIMUTH              ((USAGE) 0x3F)
 #define HID_USAGE_DIGITIZER_TIP_SWITCH           ((USAGE) 0x42)
 #define HID_USAGE_DIGITIZER_BARREL_SWITCH        ((USAGE) 0x44)
+#define HID_USAGE_DIGITIZER_CONFIDENCE           ((USAGE) 0x47)
 
 #define HID_USAGE_GENERIC_POINTER             ((USAGE) 0x01)
 #define HID_USAGE_GENERIC_MOUSE               ((USAGE) 0x02)
diff --git a/include/wine/hid.h b/include/wine/hid.h
index 6a92317551f..8200ca9beec 100644
--- a/include/wine/hid.h
+++ b/include/wine/hid.h
@@ -117,6 +117,18 @@ struct hid_preparsed_data
 #define HID_FEATURE_VALUE_CAPS(d) ((d)->value_caps + (d)->feature_caps_start)
 #define HID_COLLECTION_NODES(d) (struct hid_collection_node *)((char *)(d)->value_caps + (d)->caps_size)
 
+
+/* Wine-specific Digitizer page usages, not declared in hidusage.h */
+/* From HID Usage Tables */
+/* https://usb.org/sites/default/files/hut1_22.pdf */
+#define HID_USAGE_DIGITIZER_WIDTH                ((USAGE) 0x48)
+#define HID_USAGE_DIGITIZER_HEIGHT               ((USAGE) 0x49)
+#define HID_USAGE_DIGITIZER_CONTACT_ID           ((USAGE) 0x51)
+#define HID_USAGE_DIGITIZER_CONTACT_COUNT        ((USAGE) 0x54)
+#define HID_USAGE_DIGITIZER_CONTACT_COUNT_MAX    ((USAGE) 0x55)
+#define HID_USAGE_DIGITIZER_SCAN_TIME            ((USAGE) 0x56)
+
+
 /* Wine-specific Physical Interface Device usages */
 /* From USB Device Class Definition for Physical Interface Devices */
 /* https://www.usb.org/sites/default/files/documents/pid1_01.pdf */