Rémi Bernon : hidclass.sys: Send rawinput messages with HID report.
Alexandre Julliard
julliard at winehq.org
Thu May 13 15:30:59 CDT 2021
Module: wine
Branch: master
Commit: 9a4fa43a81790aa403bf14a0a6bdf6309281e263
URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a4fa43a81790aa403bf14a0a6bdf6309281e263
Author: Rémi Bernon <rbernon at codeweavers.com>
Date: Wed May 12 11:25:28 2021 +0200
hidclass.sys: Send rawinput messages with HID report.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/hidclass.sys/device.c | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c
index 7dc97781b6b..4d031ffcaa0 100644
--- a/dlls/hidclass.sys/device.c
+++ b/dlls/hidclass.sys/device.c
@@ -104,6 +104,43 @@ static NTSTATUS copy_packet_into_buffer(HID_XFER_PACKET *packet, BYTE* buffer, U
return STATUS_BUFFER_OVERFLOW;
}
+static void hid_device_send_input(DEVICE_OBJECT *device, HID_XFER_PACKET *packet)
+{
+ BASE_DEVICE_EXTENSION *ext = device->DeviceExtension;
+ RAWINPUT *rawinput;
+ UCHAR *report, id;
+ ULONG data_size;
+ INPUT input;
+
+ data_size = offsetof(RAWINPUT, data.hid.bRawData) + packet->reportBufferLen;
+ if (!(id = ext->u.pdo.preparsed_data->reports[0].reportID)) data_size += 1;
+
+ if (!(rawinput = HeapAlloc(GetProcessHeap(), 0, data_size)))
+ {
+ ERR("Failed to allocate rawinput data!\n");
+ return;
+ }
+
+ rawinput->header.dwType = RIM_TYPEHID;
+ rawinput->header.dwSize = data_size;
+ rawinput->header.hDevice = ULongToHandle(ext->u.pdo.rawinput_handle);
+ rawinput->header.wParam = RIM_INPUT;
+ rawinput->data.hid.dwCount = 1;
+ rawinput->data.hid.dwSizeHid = data_size - offsetof(RAWINPUT, data.hid.bRawData);
+
+ report = rawinput->data.hid.bRawData;
+ if (!id) *report++ = 0;
+ memcpy(report, packet->reportBuffer, packet->reportBufferLen);
+
+ input.type = INPUT_HARDWARE;
+ input.u.hi.uMsg = WM_INPUT;
+ input.u.hi.wParamH = 0;
+ input.u.hi.wParamL = 0;
+ __wine_send_input(0, &input, rawinput);
+
+ HeapFree(GetProcessHeap(), 0, rawinput);
+}
+
static void HID_Device_processQueue(DEVICE_OBJECT *device)
{
IRP *irp;
@@ -175,6 +212,7 @@ static DWORD CALLBACK hid_device_thread(void *args)
if (irp_status.u.Status == STATUS_SUCCESS)
{
RingBuffer_Write(ext->u.pdo.ring_buffer, packet);
+ hid_device_send_input(device, packet);
HID_Device_processQueue(device);
}
@@ -215,6 +253,7 @@ static DWORD CALLBACK hid_device_thread(void *args)
else
packet->reportId = 0;
RingBuffer_Write(ext->u.pdo.ring_buffer, packet);
+ hid_device_send_input(device, packet);
HID_Device_processQueue(device);
}
More information about the wine-cvs
mailing list