[PATCH v3 3/6] user32: Retrieve the usage page and usage directly from the hid_preparsed_data structure.
Zebediah Figura
wine at gitlab.winehq.org
Wed Jun 1 19:40:44 CDT 2022
From: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
dlls/user32/rawinput.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c
index a103751a109..e9ac5e9aff2 100644
--- a/dlls/user32/rawinput.c
+++ b/dlls/user32/rawinput.c
@@ -101,10 +101,10 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface,
SP_DEVINFO_DATA device_data = {sizeof(device_data)};
PHIDP_PREPARSED_DATA preparsed_data = NULL;
SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail;
+ struct hid_preparsed_data *preparsed;
struct device *device = NULL;
RID_DEVICE_INFO info;
HIDD_ATTRIBUTES attr;
- HIDP_CAPS caps;
UINT32 handle;
DWORD i, size;
HANDLE file;
@@ -167,15 +167,10 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface,
ERR( "Failed to get preparsed data.\n" );
goto fail;
}
+ preparsed = (struct hid_preparsed_data *)preparsed_data;
- if (!HidP_GetCaps( preparsed_data, &caps ))
- {
- ERR( "Failed to get caps.\n" );
- goto fail;
- }
-
- info.hid.usUsagePage = caps.UsagePage;
- info.hid.usUsage = caps.Usage;
+ info.hid.usUsagePage = preparsed->usage_page;
+ info.hid.usUsage = preparsed->usage;
break;
case RIM_TYPEMOUSE:
--
GitLab
https://gitlab.winehq.org/wine/wine/-/merge_requests/130
More information about the wine-devel
mailing list