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

[NTOS:FORMATTING]

Browse source 
- Fix spacing in IopActionInterrogateDeviceStack. No code changes.

svn path=/trunk/; revision=74016
This commit is contained in:
Thomas Faber 2017-03-01 19:07:13 +00:00
parent 3238412b08
commit b6a16efc88
1 changed files with 297 additions and 302 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1891,7 +1891,6 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode,
* We are called for the parent too, but we don't need to do special * We are called for the parent too, but we don't need to do special
* handling for this node * handling for this node
*/ */
if (DeviceNode == ParentDeviceNode) if (DeviceNode == ParentDeviceNode)
{ {
DPRINT("Success\n"); DPRINT("Success\n");
@ -1902,7 +1901,6 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode,
* Make sure this device node is a direct child of the parent device node * Make sure this device node is a direct child of the parent device node
* that is given as an argument * that is given as an argument
*/ */
if (DeviceNode->Parent != ParentDeviceNode) if (DeviceNode->Parent != ParentDeviceNode)
{ {
DPRINT("Skipping 2+ level child\n"); DPRINT("Skipping 2+ level child\n");
@ -1973,7 +1971,9 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode,
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
else else
{
DeviceNode->Flags &= ~DNF_DISABLED; DeviceNode->Flags &= ~DNF_DISABLED;
}
if (!DeviceCapabilities.UniqueID) if (!DeviceCapabilities.UniqueID)
{ {
@ -2005,10 +2005,14 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode,
/* Add information from parent bus device to InstancePath */ /* Add information from parent bus device to InstancePath */
wcscat(InstancePath, ParentIdPrefix.Buffer); wcscat(InstancePath, ParentIdPrefix.Buffer);
if (IoStatusBlock.Information && *(PWSTR)IoStatusBlock.Information) if (IoStatusBlock.Information && *(PWSTR)IoStatusBlock.Information)
{
wcscat(InstancePath, L"&"); wcscat(InstancePath, L"&");
} }
}
if (IoStatusBlock.Information) if (IoStatusBlock.Information)
{
wcscat(InstancePath, (PWSTR)IoStatusBlock.Information); wcscat(InstancePath, (PWSTR)IoStatusBlock.Information);
}
/* /*
* FIXME: Check for valid characters, if there is invalid characters * FIXME: Check for valid characters, if there is invalid characters
@ -2068,8 +2072,7 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode,
Stack.Parameters.QueryDeviceText.DeviceTextType = DeviceTextDescription; Stack.Parameters.QueryDeviceText.DeviceTextType = DeviceTextDescription;
Stack.Parameters.QueryDeviceText.LocaleId = LocaleId; Stack.Parameters.QueryDeviceText.LocaleId = LocaleId;
Status = IopInitiatePnpIrp( Status = IopInitiatePnpIrp(DeviceNode->PhysicalDeviceObject,
DeviceNode->PhysicalDeviceObject,
&IoStatusBlock, &IoStatusBlock,
IRP_MN_QUERY_DEVICE_TEXT, IRP_MN_QUERY_DEVICE_TEXT,
&Stack); &Stack);
@ -2101,7 +2104,6 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode,
REG_SZ, REG_SZ,
DeviceDesc.Buffer, DeviceDesc.Buffer,
DeviceDesc.MaximumLength); DeviceDesc.MaximumLength);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT1("ZwSetValueKey() failed (Status 0x%lx)\n", Status); DPRINT1("ZwSetValueKey() failed (Status 0x%lx)\n", Status);
@ -2114,8 +2116,7 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode,
Stack.Parameters.QueryDeviceText.DeviceTextType = DeviceTextLocationInformation; Stack.Parameters.QueryDeviceText.DeviceTextType = DeviceTextLocationInformation;
Stack.Parameters.QueryDeviceText.LocaleId = LocaleId; Stack.Parameters.QueryDeviceText.LocaleId = LocaleId;
Status = IopInitiatePnpIrp( Status = IopInitiatePnpIrp(DeviceNode->PhysicalDeviceObject,
DeviceNode->PhysicalDeviceObject,
&IoStatusBlock, &IoStatusBlock,
IRP_MN_QUERY_DEVICE_TEXT, IRP_MN_QUERY_DEVICE_TEXT,
&Stack); &Stack);
@ -2141,15 +2142,13 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode,
DPRINT("Sending IRP_MN_QUERY_BUS_INFORMATION to device stack\n"); DPRINT("Sending IRP_MN_QUERY_BUS_INFORMATION to device stack\n");
Status = IopInitiatePnpIrp( Status = IopInitiatePnpIrp(DeviceNode->PhysicalDeviceObject,
DeviceNode->PhysicalDeviceObject,
&IoStatusBlock, &IoStatusBlock,
IRP_MN_QUERY_BUS_INFORMATION, IRP_MN_QUERY_BUS_INFORMATION,
NULL); NULL);
if (NT_SUCCESS(Status) && IoStatusBlock.Information) if (NT_SUCCESS(Status) && IoStatusBlock.Information)
{ {
PPNP_BUS_INFORMATION BusInformation = PPNP_BUS_INFORMATION BusInformation = (PPNP_BUS_INFORMATION)IoStatusBlock.Information;
(PPNP_BUS_INFORMATION)IoStatusBlock.Information;
DeviceNode->ChildBusNumber = BusInformation->BusNumber; DeviceNode->ChildBusNumber = BusInformation->BusNumber;
DeviceNode->ChildInterfaceType = BusInformation->LegacyBusType; DeviceNode->ChildInterfaceType = BusInformation->LegacyBusType;
@ -2167,15 +2166,13 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode,
DPRINT("Sending IRP_MN_QUERY_RESOURCES to device stack\n"); DPRINT("Sending IRP_MN_QUERY_RESOURCES to device stack\n");
Status = IopInitiatePnpIrp( Status = IopInitiatePnpIrp(DeviceNode->PhysicalDeviceObject,
DeviceNode->PhysicalDeviceObject,
&IoStatusBlock, &IoStatusBlock,
IRP_MN_QUERY_RESOURCES, IRP_MN_QUERY_RESOURCES,
NULL); NULL);
if (NT_SUCCESS(Status) && IoStatusBlock.Information) if (NT_SUCCESS(Status) && IoStatusBlock.Information)
{ {
DeviceNode->BootResources = DeviceNode->BootResources = (PCM_RESOURCE_LIST)IoStatusBlock.Information;
(PCM_RESOURCE_LIST)IoStatusBlock.Information;
IopDeviceNodeSetFlag(DeviceNode, DNF_HAS_BOOT_CONFIG); IopDeviceNodeSetFlag(DeviceNode, DNF_HAS_BOOT_CONFIG);
} }
else else
@ -2186,15 +2183,13 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode,
DPRINT("Sending IRP_MN_QUERY_RESOURCE_REQUIREMENTS to device stack\n"); DPRINT("Sending IRP_MN_QUERY_RESOURCE_REQUIREMENTS to device stack\n");
Status = IopInitiatePnpIrp( Status = IopInitiatePnpIrp(DeviceNode->PhysicalDeviceObject,
DeviceNode->PhysicalDeviceObject,
&IoStatusBlock, &IoStatusBlock,
IRP_MN_QUERY_RESOURCE_REQUIREMENTS, IRP_MN_QUERY_RESOURCE_REQUIREMENTS,
NULL); NULL);
if (NT_SUCCESS(Status)) if (NT_SUCCESS(Status))
{ {
DeviceNode->ResourceRequirements = DeviceNode->ResourceRequirements = (PIO_RESOURCE_REQUIREMENTS_LIST)IoStatusBlock.Information;
(PIO_RESOURCE_REQUIREMENTS_LIST)IoStatusBlock.Information;
} }
else else
{ {