Skip to content

W
wine-winehq
Commit b065daa6 authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard
Browse files
Options

ntoskrnl.exe: Send IRP_MN_SURPRISE_REMOVAL to the device stack first.

Instead of sending both IRP_MN_SURPRISE_REMOVAL and IRP_MN_REMOVE_DEVICE to all children first. They may have pending IRPs sent to their parent PDO driver, which need to be cancelled before IRP_MN_REMOVE_DEVICE can complete. This is the case for hidclass.sys and its thread calling the lower driver for instance. Signed-off-by: 's avatarRémi Bernon <rbernon@codeweavers.com> Signed-off-by: 's avatarZebediah Figura <zfigura@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent e3b28631
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 8 deletions
dlls/ntoskrnl.exe/pnp.c
View file @ b065daa6
......@@ -350,21 +350,20 @@ static void enumerate_new_device( DEVICE_OBJECT *device, HDEVINFO set )
start_device( device, set, &sp_device );
}
static void remove_device( DEVICE_OBJECT *device )
static void send_remove_device_irp( DEVICE_OBJECT *device, UCHAR code )
{
struct wine_device *wine_device = CONTAINING_RECORD(device, struct wine_device, device_obj);
TRACE("Removing device %p.\n", device);
TRACE( "Removing device %p, code %x.\n", device, code );
if (wine_device->children)
{
ULONG i;
for (i = 0; i < wine_device->children->Count; ++i)
remove_device( wine_device->children->Objects[i] );
send_remove_device_irp( wine_device->children->Objects[i], code );
}
send_pnp_irp( device, IRP_MN_SURPRISE_REMOVAL );
send_pnp_irp( device, IRP_MN_REMOVE_DEVICE );
send_pnp_irp( device, code );
}
static BOOL device_in_list( const DEVICE_RELATIONS *list, const DEVICE_OBJECT *device )
......@@ -441,7 +440,8 @@ static void handle_bus_relations( DEVICE_OBJECT *parent )
if (!device_in_list( relations, child ))
{
TRACE("Removing device %p.\n", child);
remove_device( child );
send_remove_device_irp( child, IRP_MN_SURPRISE_REMOVAL );
send_remove_device_irp( child, IRP_MN_REMOVE_DEVICE );
}
ObDereferenceObject( child );
}
......@@ -1105,7 +1105,10 @@ void pnp_manager_stop_driver( struct wine_driver *driver )
struct root_pnp_device *device, *next;
LIST_FOR_EACH_ENTRY_SAFE( device, next, &driver->root_pnp_devices, struct root_pnp_device, entry )
remove_device( device->device );
{
send_remove_device_irp( device->device, IRP_MN_SURPRISE_REMOVAL );
send_remove_device_irp( device->device, IRP_MN_REMOVE_DEVICE );
}
}
void pnp_manager_stop(void)
......@@ -1179,7 +1182,8 @@ void CDECL wine_enumerate_root_devices( const WCHAR *driver_name )
{
TRACE("Removing device %s.\n", debugstr_w(pnp_device->id));
remove_device( pnp_device->device );
send_remove_device_irp( pnp_device->device, IRP_MN_SURPRISE_REMOVAL );
send_remove_device_irp( pnp_device->device, IRP_MN_REMOVE_DEVICE );
}
list_move_head( &driver->root_pnp_devices, &new_list );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment