Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 09:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOSKRNL]

Browse source 
- Use IopDeviceNodeSetFlag to set the DNF_HAS_BOOT_CONFIG flag
- Set DNF_START_FAILED and print a warning if we fail to start a device
- Clear the DNF_ASSIGNING_RESOURCES flag before failing
- TODO: Release device resources when start fails

svn path=/trunk/; revision=46844
This commit is contained in:
Cameron Gutman 2010-04-11 17:31:17 +00:00
parent e511742ca6
commit d568475220
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -147,7 +147,7 @@ IopStartDevice(
IO_STACK_LOCATION Stack; IO_STACK_LOCATION Stack;
ULONG RequiredLength; ULONG RequiredLength;
NTSTATUS Status; NTSTATUS Status;
HANDLE InstanceHandle, ControlHandle; HANDLE InstanceHandle = INVALID_HANDLE_VALUE, ControlHandle = INVALID_HANDLE_VALUE;
UNICODE_STRING KeyName; UNICODE_STRING KeyName;
OBJECT_ATTRIBUTES ObjectAttributes; OBJECT_ATTRIBUTES ObjectAttributes;
@ -162,6 +162,7 @@ IopStartDevice(
if (!NT_SUCCESS(Status) && Status != STATUS_NOT_SUPPORTED) if (!NT_SUCCESS(Status) && Status != STATUS_NOT_SUPPORTED)
{ {
DPRINT("IopInitiatePnpIrp(IRP_MN_FILTER_RESOURCE_REQUIREMENTS) failed\n"); DPRINT("IopInitiatePnpIrp(IRP_MN_FILTER_RESOURCE_REQUIREMENTS) failed\n");
IopDeviceNodeClearFlag(DeviceNode, DNF_ASSIGNING_RESOURCES);
return Status; return Status;
} }
else if (NT_SUCCESS(Status)) else if (NT_SUCCESS(Status))
@ -192,6 +193,9 @@ IopStartDevice(
} }
IopDeviceNodeClearFlag(DeviceNode, DNF_ASSIGNING_RESOURCES); IopDeviceNodeClearFlag(DeviceNode, DNF_ASSIGNING_RESOURCES);
if (!NT_SUCCESS(Status))
goto ByeBye;
DPRINT("Sending IRP_MN_START_DEVICE to driver\n"); DPRINT("Sending IRP_MN_START_DEVICE to driver\n");
Stack.Parameters.StartDevice.AllocatedResources = DeviceNode->ResourceList; Stack.Parameters.StartDevice.AllocatedResources = DeviceNode->ResourceList;
Stack.Parameters.StartDevice.AllocatedResourcesTranslated = DeviceNode->ResourceListTranslated; Stack.Parameters.StartDevice.AllocatedResourcesTranslated = DeviceNode->ResourceListTranslated;
@ -213,7 +217,9 @@ IopStartDevice(
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT("IopInitiatePnpIrp() failed\n"); DPRINT1("IRP_MN_START_DEVICE failed for %wZ\n", &DeviceNode->InstancePath);
IopDeviceNodeClearFlag(DeviceNode, DNF_NEED_ENUMERATION_ONLY);
goto ByeBye;
} }
else else
{ {
@ -229,7 +235,7 @@ IopStartDevice(
Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, 0, &InstanceHandle); Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, 0, &InstanceHandle);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
return Status; goto ByeBye;
RtlInitUnicodeString(&KeyName, L"Control"); RtlInitUnicodeString(&KeyName, L"Control");
InitializeObjectAttributes(&ObjectAttributes, InitializeObjectAttributes(&ObjectAttributes,
@ -239,10 +245,7 @@ IopStartDevice(
NULL); NULL);
Status = ZwCreateKey(&ControlHandle, KEY_SET_VALUE, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL); Status = ZwCreateKey(&ControlHandle, KEY_SET_VALUE, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ goto ByeBye;
ZwClose(InstanceHandle);
return Status;
}
RtlInitUnicodeString(&KeyName, L"ActiveService"); RtlInitUnicodeString(&KeyName, L"ActiveService");
Status = ZwSetValueKey(ControlHandle, &KeyName, 0, REG_SZ, DeviceNode->ServiceName.Buffer, DeviceNode->ServiceName.Length); Status = ZwSetValueKey(ControlHandle, &KeyName, 0, REG_SZ, DeviceNode->ServiceName.Buffer, DeviceNode->ServiceName.Length);
@ -254,10 +257,16 @@ IopStartDevice(
DeviceNode->ResourceList, CM_RESOURCE_LIST_SIZE(DeviceNode->ResourceList)); DeviceNode->ResourceList, CM_RESOURCE_LIST_SIZE(DeviceNode->ResourceList));
} }
ByeBye:
if (NT_SUCCESS(Status)) if (NT_SUCCESS(Status))
IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED); IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED);
else
IopDeviceNodeSetFlag(DeviceNode, DNF_START_FAILED);
if (ControlHandle != INVALID_HANDLE_VALUE)
ZwClose(ControlHandle); ZwClose(ControlHandle);
if (InstanceHandle != INVALID_HANDLE_VALUE)
ZwClose(InstanceHandle); ZwClose(InstanceHandle);
return Status; return Status;
@ -2497,7 +2506,7 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode,
{ {
DeviceNode->BootResources = DeviceNode->BootResources =
(PCM_RESOURCE_LIST)IoStatusBlock.Information; (PCM_RESOURCE_LIST)IoStatusBlock.Information;
DeviceNode->Flags |= DNF_HAS_BOOT_CONFIG; IopDeviceNodeSetFlag(DeviceNode, DNF_HAS_BOOT_CONFIG);
} }
else else
{ {