ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-30 04:13:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTOS:IO]

Browse Source 
- Save an indentation level in IopAttachFilterDrivers
CORE-13336

svn path=/trunk/; revision=74699
This commit is contained in:
Thomas Faber
2017-05-30 17:22:13 +00:00
parent 9e82e9f1d6
commit 23da2b0594
1 changed files with 50 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/ntoskrnl/io/iomgr/driver.c
+50 -48
View File
@@ -646,6 +646,7 @@ IopAttachFilterDrivers(
UNICODE_STRING Class;
WCHAR ClassBuffer[40];
UNICODE_STRING EnumRoot = RTL_CONSTANT_STRING(ENUM_ROOT);
UNICODE_STRING ControlClass = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Class");
HANDLE EnumRootKey, SubKey;
NTSTATUS Status;
@@ -720,65 +721,66 @@ IopAttachFilterDrivers(
ZwClose(SubKey);
ZwClose(EnumRootKey);
/* If there is no class GUID, we're done */
if (!NT_SUCCESS(Status))
{
return STATUS_SUCCESS;
}
/*
* Load the class filter driver
*/
if (NT_SUCCESS(Status))
Status = IopOpenRegistryKeyEx(&EnumRootKey,
NULL,
&ControlClass,
KEY_READ);
if (!NT_SUCCESS(Status))
{
UNICODE_STRING ControlClass = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Class");
DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n",
&ControlClass, Status);
return Status;
}
Status = IopOpenRegistryKeyEx(&EnumRootKey,
NULL,
&ControlClass,
KEY_READ);
if (!NT_SUCCESS(Status))
{
DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n",
&ControlClass, Status);
return Status;
}
/* Open subkey */
Status = IopOpenRegistryKeyEx(&SubKey,
EnumRootKey,
&Class,
KEY_READ);
if (!NT_SUCCESS(Status))
{
/* It's okay if there's no class key */
DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n",
&Class, Status);
ZwClose(EnumRootKey);
return STATUS_SUCCESS;
}
/* Open subkey */
Status = IopOpenRegistryKeyEx(&SubKey,
EnumRootKey,
&Class,
KEY_READ);
if (!NT_SUCCESS(Status))
{
/* It's okay if there's no class key */
DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n",
&Class, Status);
ZwClose(EnumRootKey);
return STATUS_SUCCESS;
}
QueryTable[0].QueryRoutine = IopAttachFilterDriversCallback;
if (Lower)
QueryTable[0].Name = L"LowerFilters";
else
QueryTable[0].Name = L"UpperFilters";
QueryTable[0].EntryContext = NULL;
QueryTable[0].Flags = 0;
QueryTable[0].DefaultType = REG_NONE;
QueryTable[0].QueryRoutine = IopAttachFilterDriversCallback;
if (Lower)
QueryTable[0].Name = L"LowerFilters";
else
QueryTable[0].Name = L"UpperFilters";
QueryTable[0].EntryContext = NULL;
QueryTable[0].Flags = 0;
QueryTable[0].DefaultType = REG_NONE;
Status = RtlQueryRegistryValues(RTL_REGISTRY_HANDLE,
(PWSTR)SubKey,
QueryTable,
DeviceNode,
NULL);
Status = RtlQueryRegistryValues(RTL_REGISTRY_HANDLE,
(PWSTR)SubKey,
QueryTable,
DeviceNode,
NULL);
/* Clean up */
ZwClose(SubKey);
ZwClose(EnumRootKey);
/* Clean up */
if (!NT_SUCCESS(Status))
{
DPRINT1("Failed to load class %s filters: %08X\n",
Lower ? "lower" : "upper", Status);
ZwClose(SubKey);
ZwClose(EnumRootKey);
if (!NT_SUCCESS(Status))
{
DPRINT1("Failed to load class %s filters: %08X\n",
Lower ? "lower" : "upper", Status);
ZwClose(SubKey);
ZwClose(EnumRootKey);
return Status;
}
return Status;
}
return STATUS_SUCCESS;