Signed-off-by: Aric Stewart aric@codeweavers.com --- dlls/hidclass.sys/device.c | 60 ++++++++++++++++------------------------------ dlls/hidclass.sys/hid.h | 2 +- dlls/hidclass.sys/pnp.c | 4 +--- 3 files changed, 22 insertions(+), 44 deletions(-)
On 05/10/18 08:09, Aric Stewart wrote:
devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_HIDCLASS, NULL, NULL, DIGCF_DEVICEINTERFACE); if (!devinfo)@@ -138,13 +112,22 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) FIXME( "failed to Register Device Info %x\n", GetLastError()); goto error; }
- if (!SetupDiCreateDeviceInterfaceW( devinfo, &Data, &hidGuid, NULL, 0, NULL))
- SetupDiDestroyDeviceInfoList(devinfo);
IoRegisterDeviceInterface() also calls SetupDiCreateDeviceInfo(), so do we need to make any setupapi calls here at all? I see the flag DICD_INHERIT_CLASSDRVS differs, but we don't implement that, and I'm not entirely sure from the documentation what it's supposed to do, or whether or not it's correct here or in IoRegisterDeviceInterface().
On 10/5/18 2:53 PM, Zebediah Figura wrote:
On 05/10/18 08:09, Aric Stewart wrote:
devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_HIDCLASS, NULL, NULL, DIGCF_DEVICEINTERFACE); if (!devinfo)@@ -138,13 +112,22 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) FIXME( "failed to Register Device Info %x\n", GetLastError()); goto error; }
- if (!SetupDiCreateDeviceInterfaceW( devinfo, &Data, &hidGuid, NULL, 0, NULL))
- SetupDiDestroyDeviceInfoList(devinfo);
IoRegisterDeviceInterface() also calls SetupDiCreateDeviceInfo(), so do we need to make any setupapi calls here at all? I see the flag DICD_INHERIT_CLASSDRVS differs, but we don't implement that, and I'm not entirely sure from the documentation what it's supposed to do, or whether or not it's correct here or in IoRegisterDeviceInterface().
True, Now it does. But I still feel a bit nervous relying on that behavior in hidclass because it is wine specific behavior. If we rely on that and then ntoskrnl needs to change again in some what then we would have unintended and mysterious changes in hidclass.
-aric
On 08/10/18 08:41, Aric Stewart wrote:
On 10/5/18 2:53 PM, Zebediah Figura wrote:
On 05/10/18 08:09, Aric Stewart wrote:
devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_HIDCLASS, NULL, NULL, DIGCF_DEVICEINTERFACE); if (!devinfo)@@ -138,13 +112,22 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) FIXME( "failed to Register Device Info %x\n", GetLastError()); goto error; }
- if (!SetupDiCreateDeviceInterfaceW( devinfo, &Data, &hidGuid, NULL, 0, NULL))
- SetupDiDestroyDeviceInfoList(devinfo);
IoRegisterDeviceInterface() also calls SetupDiCreateDeviceInfo(), so do we need to make any setupapi calls here at all? I see the flag DICD_INHERIT_CLASSDRVS differs, but we don't implement that, and I'm not entirely sure from the documentation what it's supposed to do, or whether or not it's correct here or in IoRegisterDeviceInterface().
True, Now it does. But I still feel a bit nervous relying on that behavior in hidclass because it is wine specific behavior. If we rely on that and then ntoskrnl needs to change again in some what then we would have unintended and mysterious changes in hidclass.
-aric
MSDN says that a new class is registered if it didn't previously exist. Regardless, I guess it shouldn't be too hard to add some tests for this.
On 10/8/18 10:34 AM, Zebediah Figura wrote:
On 08/10/18 08:41, Aric Stewart wrote:
On 10/5/18 2:53 PM, Zebediah Figura wrote:
On 05/10/18 08:09, Aric Stewart wrote:
devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_HIDCLASS, NULL, NULL, DIGCF_DEVICEINTERFACE); if (!devinfo)@@ -138,13 +112,22 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) FIXME( "failed to Register Device Info %x\n", GetLastError()); goto error; }
- if (!SetupDiCreateDeviceInterfaceW( devinfo, &Data, &hidGuid, NULL, 0, NULL))
- SetupDiDestroyDeviceInfoList(devinfo);
IoRegisterDeviceInterface() also calls SetupDiCreateDeviceInfo(), so do we need to make any setupapi calls here at all? I see the flag DICD_INHERIT_CLASSDRVS differs, but we don't implement that, and I'm not entirely sure from the documentation what it's supposed to do, or whether or not it's correct here or in IoRegisterDeviceInterface().
True, Now it does. But I still feel a bit nervous relying on that behavior in hidclass because it is wine specific behavior. If we rely on that and then ntoskrnl needs to change again in some what then we would have unintended and mysterious changes in hidclass.
-aric
MSDN says that a new class is registered if it didn't previously exist. Regardless, I guess it shouldn't be too hard to add some tests for this.
I have found that tests for ntoskrnl and kernel level drivers and helpers are pretty irritating to write. A quick dependency walk shows no connection between ntoskrnl and setupapi so that is wine specific.
-aric
-
Aric Stewart -
Zebediah Figura