Rémi Bernon : winebus.sys: Handle IRP_MN_SURPRISE_REMOVAL and set removed flag.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0f4820233523604cfd499093d891e6acf25abc37
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=0f4820233523604cfd499093d...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Wed Jun 30 10:19:09 2021 +0200

winebus.sys: Handle IRP_MN_SURPRISE_REMOVAL and set removed flag.

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/winebus.sys/main.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c
index b1e44c147bd..c1c59b8a8e1 100644
--- a/dlls/winebus.sys/main.c
+++ b/dlls/winebus.sys/main.c
@@ -372,10 +372,6 @@ void bus_unlink_hid_device(DEVICE_OBJECT *device)
     EnterCriticalSection(&device_list_cs);
     list_remove(&pnp_device->entry);
     LeaveCriticalSection(&device_list_cs);
-
-    EnterCriticalSection(&ext->cs);
-    ext->removed = TRUE;
-    LeaveCriticalSection(&ext->cs);
 }
 
 void bus_remove_hid_device(DEVICE_OBJECT *device)
@@ -698,13 +694,18 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp)
             status = STATUS_SUCCESS;
             break;
 
+        case IRP_MN_SURPRISE_REMOVAL:
+            EnterCriticalSection(&ext->cs);
+            remove_pending_irps(device);
+            ext->removed = TRUE;
+            LeaveCriticalSection(&ext->cs);
+            break;
+
         case IRP_MN_REMOVE_DEVICE:
         {
             struct pnp_device *pnp_device = ext->pnp_device;
 
-            EnterCriticalSection(&ext->cs);
             remove_pending_irps(device);
-            LeaveCriticalSection(&ext->cs);
 
             ext->vtbl->free_device(device);