ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winebus.sys: Report WINEBUS\WINE_COMP_HID compatible id. 

And match it in winehid.sys instead of individual bus ids.

Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Rémi Bernon 2021-09-01 07:47:25 +02:00 committed by Alexandre Julliard
parent b755d58b13
commit 06ab0d5405
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/winebus.sys/main.c
View File

@ -226,7 +226,7 @@ static WCHAR *get_device_id(DEVICE_OBJECT *device)
return dst;
}
static WCHAR *get_compatible_ids(DEVICE_OBJECT *device)
static WCHAR *get_hardware_ids(DEVICE_OBJECT *device)
{
struct device_extension *ext = (struct device_extension *)device->DeviceExtension;
WCHAR *dst;
@ -240,6 +240,24 @@ static WCHAR *get_compatible_ids(DEVICE_OBJECT *device)
return dst;
}
static WCHAR *get_compatible_ids(DEVICE_OBJECT *device)
{
static const WCHAR hid_compat[] =
{
'W','I','N','E','B','U','S','\\','W','I','N','E','_','C','O','M','P','_','H','I','D',0
};
DWORD size = sizeof(hid_compat);
WCHAR *dst;
if ((dst = ExAllocatePool(PagedPool, size + sizeof(WCHAR))))
{
memcpy(dst, hid_compat, sizeof(hid_compat));
dst[size / sizeof(WCHAR)] = 0;
}
return dst;
}
static void remove_pending_irps(DEVICE_OBJECT *device)
{
struct device_extension *ext = device->DeviceExtension;
@ -444,7 +462,7 @@ static NTSTATUS handle_IRP_MN_QUERY_ID(DEVICE_OBJECT *device, IRP *irp)
{
case BusQueryHardwareIDs:
TRACE("BusQueryHardwareIDs\n");
irp->IoStatus.Information = (ULONG_PTR)get_compatible_ids(device);
irp->IoStatus.Information = (ULONG_PTR)get_hardware_ids(device);
break;
case BusQueryCompatibleIDs:
TRACE("BusQueryCompatibleIDs\n");

7
dlls/winehid.sys/winehid.inf
View File

@ -7,12 +7,7 @@ Class=HIDClass
Wine=mfg_section
[mfg_section]
Wine hidraw device=device_section,HIDRAW
Wine IOHID device=device_section,IOHID
Wine libevent device=device_section,LNXEV
Wine SDL HID device=device_section,SDLJOY
Wine mouse device=device_section,WINEMOUSE
Wine keyboard device=device_section,WINEKEYBOARD
Wine HID compatible device=device_section,WINEBUS\WINE_COMP_HID
[device_section.Services]
AddService = winehid,0x2,svc_section