ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntoskrnl.exe: BusRelations is also used when devices are removed. 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2019-11-06 23:55:03 -06:00 committed by Alexandre Julliard
parent ca683dcaad
commit 81cda52d15
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/ntoskrnl.exe/pnp.c
View File

@ -435,6 +435,21 @@ static void handle_bus_relations( DEVICE_OBJECT *parent )
}
}
if (wine_parent->children)
{
for (i = 0; i < wine_parent->children->Count; ++i)
{
DEVICE_OBJECT *child = wine_parent->children->Objects[i];
if (!device_in_list( relations, child ))
{
TRACE("Removing device %p.\n", child);
remove_device( child );
}
ObDereferenceObject( child );
}
}
ExFreePool( wine_parent->children );
wine_parent->children = relations;
@ -453,9 +468,6 @@ void WINAPI IoInvalidateDeviceRelations( DEVICE_OBJECT *device_object, DEVICE_RE
case BusRelations:
handle_bus_relations( device_object );
break;
case RemovalRelations:
remove_device( device_object );
break;
default:
FIXME("Unhandled relation %#x.\n", type);
break;

2
dlls/winebus.sys/bus_iohid.c
View File

@ -371,7 +371,7 @@ static void handle_RemovalCallback(void *context, IOReturn result, void *sender,
device = bus_find_hid_device(&iohid_vtbl, IOHIDDevice);
if (device)
{
IoInvalidateDeviceRelations(device, RemovalRelations);
IoInvalidateDeviceRelations(bus_pdo, BusRelations);
bus_remove_hid_device(device);
}
}

2
dlls/winebus.sys/bus_sdl.c
View File

@ -902,7 +902,7 @@ static void try_remove_device(SDL_JoystickID id)
sdl_controller = private->sdl_controller;
sdl_haptic = private->sdl_haptic;
IoInvalidateDeviceRelations(device, RemovalRelations);
IoInvalidateDeviceRelations(bus_pdo, BusRelations);
bus_remove_hid_device(device);

2
dlls/winebus.sys/bus_udev.c
View File

@ -1297,7 +1297,7 @@ static void try_remove_device(struct udev_device *dev)
#endif
if (!device) return;
IoInvalidateDeviceRelations(device, RemovalRelations);
IoInvalidateDeviceRelations(bus_pdo, BusRelations);
private = impl_from_DEVICE_OBJECT(device);