Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-11 07:05:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTOSKRNL]

Browse source 
- Add back the reset hack of doom to circumvent broken removal code in just about every driver

svn path=/trunk/; revision=55819
This commit is contained in:
Cameron Gutman 2012-02-22 23:08:52 +00:00
parent eadaa2c3de
commit 86ebeb35cc
1 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
reactos/ntoskrnl/io/pnpmgr/plugplay.c
View file

@ -552,38 +552,40 @@ IopResetDevice(PPLUGPLAY_CONTROL_RESET_DEVICE_DATA ResetDeviceData)
/* Get the device node */
DeviceNode = IopGetDeviceNode(DeviceObject);
/* Check if an FDO has been added to the stack */
if (DeviceNode->Flags & DNF_ADDED)
#if 0
/* Remove the device node */
Status = IopRemoveDevice(DeviceNode);
if (NT_SUCCESS(Status))
{
/* Remove the device node */
Status = IopRemoveDevice(DeviceNode);
if (!NT_SUCCESS(Status))
{
DPRINT1("WARNING: Ignoring failed IopRemoveDevice() for %wZ (likely a driver bug)\n", &DeviceNode->InstancePath);
}
/* Invalidate device relations for the parent to reenumerate the device */
Status = IoSynchronousInvalidateDeviceRelations(DeviceNode->Parent->PhysicalDeviceObject, BusRelations);
DPRINT1("A new driver has been loaded for '%wZ'\n", &DeviceInstance);
}
#else
/* FIXME: We might clear some important flags */
ASSERT(DeviceNode->Flags & DNF_ENUMERATED);
ASSERT(DeviceNode->Flags & DNF_PROCESSED);
DeviceNode->Flags = DNF_ENUMERATED | DNF_PROCESSED;
DPRINT1("Reset PDO with FDO present: 0x%x\n", Status);
/* Load service data from the registry */
Status = IopActionConfigureChildServices(DeviceNode, DeviceNode->Parent);
if (NT_SUCCESS(Status))
{
/* Start the service and begin PnP initialization of the device again */
Status = IopActionInitChildServices(DeviceNode, DeviceNode->Parent);
DPRINT1("HACK: A new driver has been loaded for '%wZ' WITHOUT removing the old one\n", &DeviceInstance);
}
#endif
else if (DeviceNode->Flags & DNF_ADDED)
{
/* A driver has already been loaded for this device */
DPRINT1("A reboot is required for the current driver for '%wZ' to be replaced\n", &DeviceInstance);
}
else
{
/* FIXME: We might clear some important flags */
ASSERT(DeviceNode->Flags & DNF_ENUMERATED);
ASSERT(DeviceNode->Flags & DNF_PROCESSED);
DeviceNode->Flags = DNF_ENUMERATED | DNF_PROCESSED;
/* Load service data from the registry */
Status = IopActionConfigureChildServices(DeviceNode, DeviceNode->Parent);
if (NT_SUCCESS(Status))
{
/* Start the service and begin PnP initialization of the device again */
Status = IopActionInitChildServices(DeviceNode, DeviceNode->Parent);
}
DPRINT1("Reset PDO with no FDO present: 0x%x\n", Status);
/* This device needs a driver */
DPRINT1("A reboot is required for the new driver for '%wZ' to load\n", &DeviceInstance);
}
ObDereferenceObject(DeviceObject);