Aric Stewart : hidclass.sys: Handle IRP_MN_REMOVE_DEVICE.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b13924a6c962dd99983d76d01a991d84904b54e3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b13924a6c962dd99983d76d01a...

Author: Aric Stewart <aric(a)codeweavers.com>
Date:   Wed Aug 17 10:30:52 2016 -0500

hidclass.sys: Handle IRP_MN_REMOVE_DEVICE.

We no longer track PNP devices, that is the PNP manager's job.

Signed-off-by: Aric Stewart <aric(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/hidclass.sys/hid.h  |  1 -
 dlls/hidclass.sys/main.c |  1 -
 dlls/hidclass.sys/pnp.c  | 42 +++++++-----------------------------------
 3 files changed, 7 insertions(+), 37 deletions(-)

diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h
index 34c2a09..adc547c 100644
--- a/dlls/hidclass.sys/hid.h
+++ b/dlls/hidclass.sys/hid.h
@@ -99,7 +99,6 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDE
 
 /* Pseudo-Plug and Play support*/
 NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT* PDO) DECLSPEC_HIDDEN;
-void PNP_CleanupPNP(DRIVER_OBJECT *driver) DECLSPEC_HIDDEN;
 
 /* Parsing HID Report Descriptors into preparsed data */
 WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) DECLSPEC_HIDDEN;
diff --git a/dlls/hidclass.sys/main.c b/dlls/hidclass.sys/main.c
index 7fdcd59..1ab25da 100644
--- a/dlls/hidclass.sys/main.c
+++ b/dlls/hidclass.sys/main.c
@@ -51,7 +51,6 @@ static VOID WINAPI UnloadDriver(DRIVER_OBJECT *driver)
     {
         if (md->DriverUnload)
             md->DriverUnload(md->minidriver.DriverObject);
-        PNP_CleanupPNP(md->minidriver.DriverObject);
         list_remove(&md->entry);
         HeapFree( GetProcessHeap(), 0, md );
     }
diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c
index 8fd5c17..87cd94e 100644
--- a/dlls/hidclass.sys/pnp.c
+++ b/dlls/hidclass.sys/pnp.c
@@ -35,17 +35,6 @@ static const WCHAR separator_W[] = {'\\',0};
 static const WCHAR device_deviceid_fmtW[] = {'%','s','\\',
     'v','i','d','_','%','0','4','x','&','p','i','d','_','%', '0','4','x'};
 
-typedef struct _NATIVE_DEVICE {
-    struct list entry;
-
-    DEVICE_OBJECT *PDO;
-    DEVICE_OBJECT *FDO;
-    HID_MINIDRIVER_REGISTRATION *minidriver;
-
-} NATIVE_DEVICE;
-
-static struct list tracked_devices = LIST_INIT(tracked_devices);
-
 static NTSTATUS WINAPI internalComplete(DEVICE_OBJECT *deviceObject, IRP *irp,
     void *context )
 {
@@ -91,7 +80,6 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO)
     minidriver *minidriver;
     HID_DEVICE_ATTRIBUTES attr;
     BASE_DEVICE_EXTENSION *ext = NULL;
-    NATIVE_DEVICE *tracked_device;
     HID_DESCRIPTOR descriptor;
     BYTE *reportDescriptor;
     INT i;
@@ -145,12 +133,6 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO)
     ext->information.VersionNumber = attr.VersionNumber;
     ext->information.Polled = minidriver->minidriver.DevicesArePolled;
 
-    tracked_device = HeapAlloc(GetProcessHeap(), 0, sizeof(*tracked_device));
-    tracked_device->PDO = PDO;
-    tracked_device->FDO = device;
-    tracked_device->minidriver = &minidriver->minidriver;
-    list_add_tail(&tracked_devices, &tracked_device->entry);
-
     status = call_minidriver(IOCTL_HID_GET_DEVICE_DESCRIPTOR, device, NULL, 0,
         &descriptor, sizeof(descriptor));
     if (status != STATUS_SUCCESS)
@@ -218,26 +200,11 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO)
     return STATUS_SUCCESS;
 }
 
-void PNP_CleanupPNP(DRIVER_OBJECT *driver)
-{
-    NATIVE_DEVICE *tracked_device, *ptr;
-
-    LIST_FOR_EACH_ENTRY_SAFE(tracked_device, ptr, &tracked_devices,
-        NATIVE_DEVICE, entry)
-    {
-        if (tracked_device->minidriver->DriverObject == driver)
-        {
-            list_remove(&tracked_device->entry);
-            HID_DeleteDevice(tracked_device->minidriver, tracked_device->FDO);
-            HeapFree(GetProcessHeap(), 0, tracked_device);
-        }
-    }
-}
-
 NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp)
 {
     NTSTATUS rc = STATUS_NOT_SUPPORTED;
     IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp);
+    minidriver *minidriver = find_minidriver(device->DriverObject);
 
     TRACE("%p, %p\n", device, irp);
 
@@ -286,10 +253,15 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp)
             }
             break;
         }
+        case IRP_MN_REMOVE_DEVICE:
+        {
+            HID_DeleteDevice(&minidriver->minidriver, device);
+            minidriver->PNPDispatch(device, irp);
+            break;
+        }
         default:
         {
             /* Forward IRP to the minidriver */
-            minidriver *minidriver = find_minidriver(device->DriverObject);
             return minidriver->PNPDispatch(device, irp);
         }
     }