Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 17:56:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add a message in case of error when loading/initializing driver

Browse source 
svn path=/trunk/; revision=27386
This commit is contained in:
Hervé Poussineau 2007-07-04 14:13:30 +00:00
parent 122331f605
commit 9c03ef676e
2 changed files with 42 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/ntoskrnl/cm/ntfunc.c
View file

@ -290,7 +290,7 @@ NtCreateKey(OUT PHANDLE KeyHandle,
{
if (L'\\' == RemainingPath.Buffer[i])
{
DPRINT1("NtCreateKey() doesn't create trees! (found \'\\\' in remaining path: \"%wZ\"!)\n", &RemainingPath);
DPRINT("NtCreateKey() doesn't create trees! (found \'\\\' in remaining path: \"%wZ\"!)\n", &RemainingPath);
PostCreateKeyInfo.Object = NULL;
PostCreateKeyInfo.Status = STATUS_OBJECT_NAME_NOT_FOUND;

72
reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
View file

@ -2379,45 +2379,55 @@ IopActionInitChildServices(PDEVICE_NODE DeviceNode,
if (!NT_SUCCESS(Status))
{
/* Driver is not initialized, try to load it */
Status = IopLoadServiceModule(&DeviceNode->ServiceName, &ModuleObject);
/* Driver is not initialized, try to load it */
Status = IopLoadServiceModule(&DeviceNode->ServiceName, &ModuleObject);
if (NT_SUCCESS(Status) || Status == STATUS_IMAGE_ALREADY_LOADED)
{
/* STATUS_IMAGE_ALREADY_LOADED means this driver
was loaded by the bootloader */
if (Status != STATUS_IMAGE_ALREADY_LOADED)
{
/* Initialize the driver */
Status = IopInitializeDriverModule(DeviceNode, ModuleObject,
&DeviceNode->ServiceName, FALSE, &DriverObject);
}
else
{
Status = STATUS_SUCCESS;
}
}
if (NT_SUCCESS(Status) || Status == STATUS_IMAGE_ALREADY_LOADED)
{
/* STATUS_IMAGE_ALREADY_LOADED means this driver
was loaded by the bootloader */
if (Status != STATUS_IMAGE_ALREADY_LOADED)
{
/* Initialize the driver */
Status = IopInitializeDriverModule(DeviceNode, ModuleObject,
&DeviceNode->ServiceName, FALSE, &DriverObject);
}
else
{
Status = STATUS_SUCCESS;
}
}
else
{
DPRINT1("IopLoadServiceModule(%wZ) failed with status 0x%08x\n",
&DeviceNode->ServiceName, Status);
}
}
/* 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 */
Status = IopInitializeDevice(DeviceNode, DriverObject);
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 */
Status = IopInitializeDevice(DeviceNode, DriverObject);
/* Attach upper level filter drivers. */
IopAttachFilterDrivers(DeviceNode, FALSE);
IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED);
if (NT_SUCCESS(Status))
{
/* Attach upper level filter drivers. */
IopAttachFilterDrivers(DeviceNode, FALSE);
IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED);
Status = IopStartDevice(DeviceNode);
}
Status = IopStartDevice(DeviceNode);
}
else
{
DPRINT1("IopInitializeDevice(%wZ) failed with status 0x%08x\n",
&DeviceNode->InstancePath, Status);
}
}
else
{
/*