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

hidclass.sys: Use the instance id for the device link. 

Signed-off-by: Aric Stewart <aric@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Aric Stewart 2016-04-05 08:45:48 -05:00 committed by Alexandre Julliard
parent 4b5bed4557
commit 0564257349
3 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/hidclass.sys/device.c
View File

@ -40,12 +40,7 @@ WINE_DECLARE_DEBUG_CHANNEL(hid_report);
static const WCHAR device_name_fmtW[] = {'\\','D','e','v','i','c','e', static const WCHAR device_name_fmtW[] = {'\\','D','e','v','i','c','e',
'\\','H','I','D','#','%','p','&','%','p',0}; '\\','H','I','D','#','%','p','&','%','p',0};
static const WCHAR device_regname_fmtW[] = {'H','I','D','\\', static const WCHAR device_link_fmtW[] = {'\\','?','?','\\','%','s','#','%','s',0};
'v','i','d','_','%','0','4','x','&','p','i','d','_','%',
'0','4','x','&','%','s','\\','%','i','&','%','s',0};
static const WCHAR device_link_fmtW[] = {'\\','?','?','\\','h','i','d','#',
'v','i','d','_','%','0','4','x','&','p','i','d','_','%',
'0','4','x','&','%','s','#','%','i','&','%','s','#','%','s',0};
/* GUID_DEVINTERFACE_HID */ /* GUID_DEVINTERFACE_HID */
static const WCHAR class_guid[] = {'{','4','D','1','E','5','5','B','2', static const WCHAR class_guid[] = {'{','4','D','1','E','5','5','B','2',
'-','F','1','6','F','-','1','1','C','F','-','8','8','C','B','-','0','0', '-','F','1','6','F','-','1','1','C','F','-','8','8','C','B','-','0','0',
@ -83,10 +78,10 @@ NTSTATUS HID_CreateDevice(DEVICE_OBJECT *native_device, HID_MINIDRIVER_REGISTRAT
return S_OK; return S_OK;
} }
NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device, LPCWSTR serial, LPCWSTR index) NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device)
{ {
WCHAR regname[255];
WCHAR dev_link[255]; WCHAR dev_link[255];
WCHAR *ptr;
SP_DEVINFO_DATA Data; SP_DEVINFO_DATA Data;
UNICODE_STRING nameW, linkW; UNICODE_STRING nameW, linkW;
NTSTATUS status; NTSTATUS status;
@ -97,9 +92,9 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device, LPCWSTR serial, LPCWSTR index)
HidD_GetHidGuid(&hidGuid); HidD_GetHidGuid(&hidGuid);
ext = device->DeviceExtension; ext = device->DeviceExtension;
sprintfW(dev_link, device_link_fmtW, ext->information.VendorID, sprintfW(dev_link, device_link_fmtW, ext->instance_id, class_guid);
ext->information.ProductID, index, ext->information.VersionNumber, serial, ptr = dev_link + 4;
class_guid); do { if (*ptr == '\\') *ptr = '#'; } while (*ptr++);
struprW(dev_link); struprW(dev_link);
RtlInitUnicodeString( &nameW, ext->device_name); RtlInitUnicodeString( &nameW, ext->device_name);
@ -117,8 +112,6 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device, LPCWSTR serial, LPCWSTR index)
return status; return status;
} }
sprintfW(regname, device_regname_fmtW, ext->information.VendorID, ext->information.ProductID, index, ext->information.VersionNumber, serial);
devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_HIDCLASS, NULL, NULL, DIGCF_DEVICEINTERFACE); devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_HIDCLASS, NULL, NULL, DIGCF_DEVICEINTERFACE);
if (!devinfo) if (!devinfo)
{ {
@ -126,7 +119,7 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device, LPCWSTR serial, LPCWSTR index)
return GetLastError(); return GetLastError();
} }
Data.cbSize = sizeof(Data); Data.cbSize = sizeof(Data);
if (!SetupDiCreateDeviceInfoW(devinfo, regname, &GUID_DEVCLASS_HIDCLASS, NULL, NULL, DICD_INHERIT_CLASSDRVS, &Data)) if (!SetupDiCreateDeviceInfoW(devinfo, ext->instance_id, &GUID_DEVCLASS_HIDCLASS, NULL, NULL, DICD_INHERIT_CLASSDRVS, &Data))
{ {
if (GetLastError() == ERROR_DEVINST_ALREADY_EXISTS) if (GetLastError() == ERROR_DEVINST_ALREADY_EXISTS)
{ {

2
dlls/hidclass.sys/hid.h
View File

@ -86,7 +86,7 @@ minidriver* find_minidriver(DRIVER_OBJECT* driver) DECLSPEC_HIDDEN;
/* Internal device functions */ /* Internal device functions */
NTSTATUS HID_CreateDevice(DEVICE_OBJECT *native_device, HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT **device) DECLSPEC_HIDDEN; NTSTATUS HID_CreateDevice(DEVICE_OBJECT *native_device, HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT **device) DECLSPEC_HIDDEN;
NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device, LPCWSTR serial, LPCWSTR index) DECLSPEC_HIDDEN; NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) DECLSPEC_HIDDEN;
void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device) DECLSPEC_HIDDEN; void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device) DECLSPEC_HIDDEN;
void HID_StartDeviceThread(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; void HID_StartDeviceThread(DEVICE_OBJECT *device) DECLSPEC_HIDDEN;

2
dlls/hidclass.sys/pnp.c
View File

@ -250,7 +250,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO)
sprintfW(ext->instance_id, device_instanceid_fmtW, device_enumeratorW, ext->information.VendorID, ext->information.ProductID, interface, ext->information.VersionNumber, serial); sprintfW(ext->instance_id, device_instanceid_fmtW, device_enumeratorW, ext->information.VendorID, ext->information.ProductID, interface, ext->information.VersionNumber, serial);
sprintfW(ext->device_id, device_deviceid_fmtW, device_enumeratorW, ext->information.VendorID, ext->information.ProductID); sprintfW(ext->device_id, device_deviceid_fmtW, device_enumeratorW, ext->information.VendorID, ext->information.ProductID);
HID_LinkDevice(device, serial, interface); HID_LinkDevice(device);
ext->poll_interval = DEFAULT_POLL_INTERVAL; ext->poll_interval = DEFAULT_POLL_INTERVAL;