[PATCH v2 4/5] winebus.sys: Introduce new remove_pending_irps helper.

Rémi Bernon rbernon at codeweavers.com
Tue Jun 29 02:21:42 CDT 2021


Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
---
 dlls/winebus.sys/main.c | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c
index a512015d478..897be25ed51 100644
--- a/dlls/winebus.sys/main.c
+++ b/dlls/winebus.sys/main.c
@@ -235,6 +235,22 @@ static WCHAR *get_compatible_ids(DEVICE_OBJECT *device)
     return dst;
 }
 
+static void remove_pending_irps(DEVICE_OBJECT *device)
+{
+    struct device_extension *ext = device->DeviceExtension;
+    LIST_ENTRY *entry;
+
+    EnterCriticalSection(&ext->cs);
+    while ((entry = RemoveHeadList(&ext->irp_queue)) != &ext->irp_queue)
+    {
+        IRP *queued_irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry);
+        queued_irp->IoStatus.u.Status = STATUS_DELETE_PENDING;
+        queued_irp->IoStatus.Information = 0;
+        IoCompleteRequest(queued_irp, IO_NO_INCREMENT);
+    }
+    LeaveCriticalSection(&ext->cs);
+}
+
 DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid,
                                      WORD input, DWORD version, DWORD uid, const WCHAR *serialW, BOOL is_gamepad,
                                      const platform_vtbl *vtbl, DWORD platform_data_size)
@@ -687,17 +703,8 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp)
         case IRP_MN_REMOVE_DEVICE:
         {
             struct pnp_device *pnp_device = ext->pnp_device;
-            LIST_ENTRY *entry;
 
-            EnterCriticalSection(&ext->cs);
-            while ((entry = RemoveHeadList(&ext->irp_queue)) != &ext->irp_queue)
-            {
-                IRP *queued_irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry);
-                queued_irp->IoStatus.u.Status = STATUS_DELETE_PENDING;
-                queued_irp->IoStatus.Information = 0;
-                IoCompleteRequest(queued_irp, IO_NO_INCREMENT);
-            }
-            LeaveCriticalSection(&ext->cs);
+            remove_pending_irps(device);
 
             ext->vtbl->free_device(device);
 
-- 
2.32.0




More information about the wine-devel mailing list