Zebediah Figura : user32: Retrieve the usage page and usage directly from the hid_preparsed_data structure.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c55980a47cf17079597e11291d97611355bab244
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=c55980a47cf17079597e11291...

Author: Zebediah Figura <zfigura(a)codeweavers.com>
Date:   Mon May  2 14:18:37 2022 -0500

user32: Retrieve the usage page and usage directly from the hid_preparsed_data structure.

Signed-off-by: Zebediah Figura <zfigura(a)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: