- Correctly set DN_DRIVER_LOADED flag.

- This fixes "i8042prt/kbdclass.sys get installed one more time at each boot".
See issue #2330 for more details.

svn path=/trunk/; revision=27385
This commit is contained in:
Aleksey Bragin 2007-07-04 13:58:30 +00:00
parent 4d91599bd6
commit 122331f605
2 changed files with 16 additions and 12 deletions

View file

@ -1645,6 +1645,9 @@ NtLoadDriver(IN PUNICODE_STRING DriverServiceName)
goto ReleaseCapturedString;
}
}
/* We have a driver for this DeviceNode */
DeviceNode->Flags |= DN_DRIVER_LOADED;
}
IopInitializeDevice(DeviceNode, DriverObject);

View file

@ -2389,7 +2389,6 @@ IopActionInitChildServices(PDEVICE_NODE DeviceNode,
if (Status != STATUS_IMAGE_ALREADY_LOADED)
{
/* Initialize the driver */
DeviceNode->Flags |= DN_DRIVER_LOADED;
Status = IopInitializeDriverModule(DeviceNode, ModuleObject,
&DeviceNode->ServiceName, FALSE, &DriverObject);
}
@ -2403,6 +2402,8 @@ IopActionInitChildServices(PDEVICE_NODE DeviceNode,
/* Driver is loaded and initialized at this point */
if (NT_SUCCESS(Status))
{
/* We have a driver for this DeviceNode */
DeviceNode->Flags |= DN_DRIVER_LOADED;
/* Attach lower level filter drivers. */
IopAttachFilterDrivers(DeviceNode, TRUE);
/* Initialize the function driver for the device node */