Zebediah Figura : user32: Perform HID ioctls on the right file handle.
Alexandre Julliard
julliard at winehq.org
Fri Jun 3 15:53:08 CDT 2022
Module: wine
Branch: master
Commit: 2ae59899bf905dc1d6e12bb6114a5c3ac12cbb69
URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ae59899bf905dc1d6e12bb6114a5c3ac12cbb69
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Thu Jun 2 23:22:13 2022 -0500
user32: Perform HID ioctls on the right file handle.
This fixes a regression from 8962ec5a83286488da6f839ceba3c39ad1cf00b3.
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/user32/rawinput.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c
index 90ca074f2a4..4dc240b58b3 100644
--- a/dlls/user32/rawinput.c
+++ b/dlls/user32/rawinput.c
@@ -153,7 +153,7 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface,
switch (type)
{
case RIM_TYPEHID:
- status = NtDeviceIoControlFile( device->file, NULL, NULL, NULL, &io,
+ status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io,
IOCTL_HID_GET_COLLECTION_INFORMATION,
NULL, 0, &hid_info, sizeof(hid_info) );
if (status)
@@ -172,7 +172,7 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface,
goto fail;
}
- status = NtDeviceIoControlFile( device->file, NULL, NULL, NULL, &io,
+ status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io,
IOCTL_HID_GET_COLLECTION_DESCRIPTOR,
NULL, 0, preparsed, hid_info.DescriptorSize );
if (status)
More information about the wine-cvs
mailing list