Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-24 21:59:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOS:IO]

Browse source 
- Make debug prints about IopOpenRegistryKeyEx failure consistent

svn path=/trunk/; revision=74283
This commit is contained in:
Thomas Faber 2017-04-08 09:26:42 +00:00
parent bbc430fc8c
commit 97053d19c0
3 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
reactos/ntoskrnl/io/iomgr/driver.c
View file

@ -337,7 +337,7 @@ IopLoadServiceModule(
Status = IopOpenRegistryKeyEx(&CCSKey, NULL, &CCSName, KEY_READ); Status = IopOpenRegistryKeyEx(&CCSKey, NULL, &CCSName, KEY_READ);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with Status %08X\n", DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n",
&CCSName, Status); &CCSName, Status);
return Status; return Status;
} }
@ -346,7 +346,7 @@ IopLoadServiceModule(
Status = IopOpenRegistryKeyEx(&ServiceKey, CCSKey, ServiceName, KEY_READ); Status = IopOpenRegistryKeyEx(&ServiceKey, CCSKey, ServiceName, KEY_READ);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with Status %08X\n", DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n",
ServiceName, Status); ServiceName, Status);
ZwClose(CCSKey); ZwClose(CCSKey);
return Status; return Status;
@ -656,7 +656,8 @@ IopAttachFilterDrivers(
KEY_READ); KEY_READ);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n",
&EnumRoot, Status);
return Status; return Status;
} }
@ -667,7 +668,8 @@ IopAttachFilterDrivers(
KEY_READ); KEY_READ);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n",
&DeviceNode->InstancePath, Status);
ZwClose(EnumRootKey); ZwClose(EnumRootKey);
return Status; return Status;
} }
@ -731,7 +733,8 @@ IopAttachFilterDrivers(
KEY_READ); KEY_READ);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n",
&ControlClass, Status);
return Status; return Status;
} }
@ -743,7 +746,8 @@ IopAttachFilterDrivers(
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
/* It's okay if there's no class key */ /* It's okay if there's no class key */
DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n",
&Class, Status);
ZwClose(EnumRootKey); ZwClose(EnumRootKey);
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }

15
reactos/ntoskrnl/io/pnpmgr/pnpinit.c
View file

@ -268,7 +268,8 @@ PipCallDriverAddDevice(IN PDEVICE_NODE DeviceNode,
KEY_READ); KEY_READ);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT1("IopOpenRegistryKeyEx() failed with Status %08X\n", Status); DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n",
&EnumRoot, Status);
return Status; return Status;
} }
@ -280,7 +281,8 @@ PipCallDriverAddDevice(IN PDEVICE_NODE DeviceNode,
ZwClose(EnumRootKey); ZwClose(EnumRootKey);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT1("IopOpenRegistryKeyEx() failed with Status %08X\n", Status); DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n",
&DeviceNode->InstancePath, Status);
return Status; return Status;
} }
@ -304,7 +306,8 @@ PipCallDriverAddDevice(IN PDEVICE_NODE DeviceNode,
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
/* No class key */ /* No class key */
DPRINT1("IopOpenRegistryKeyEx() failed with Status %08X\n", Status); DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n",
&ControlClass, Status);
ClassKey = NULL; ClassKey = NULL;
} }
else else
@ -318,7 +321,8 @@ PipCallDriverAddDevice(IN PDEVICE_NODE DeviceNode,
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
/* No class key */ /* No class key */
DPRINT1("IopOpenRegistryKeyEx() failed with Status %08X\n", Status); DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n",
&ClassGuid, Status);
ClassKey = NULL; ClassKey = NULL;
} }
} }
@ -336,7 +340,8 @@ PipCallDriverAddDevice(IN PDEVICE_NODE DeviceNode,
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
/* No properties */ /* No properties */
DPRINT("IopOpenRegistryKeyEx() failed with Status %08X\n", Status); DPRINT("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n",
&Properties, Status);
PropertiesKey = NULL; PropertiesKey = NULL;
} }
else else

6
reactos/ntoskrnl/io/pnpmgr/pnproot.c
View file

@ -525,7 +525,8 @@ EnumerateDevices(
Status = IopOpenRegistryKeyEx(&SubKeyHandle, KeyHandle, &SubKeyName, KEY_ENUMERATE_SUB_KEYS); Status = IopOpenRegistryKeyEx(&SubKeyHandle, KeyHandle, &SubKeyName, KEY_ENUMERATE_SUB_KEYS);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT("IopOpenRegistryKeyEx() failed with status 0x%08lx\n", Status); DPRINT("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n",
&SubKeyName, Status);
break; break;
} }
@ -585,7 +586,8 @@ EnumerateDevices(
Status = IopOpenRegistryKeyEx(&DeviceKeyHandle, SubKeyHandle, &Device->InstanceID, KEY_READ); Status = IopOpenRegistryKeyEx(&DeviceKeyHandle, SubKeyHandle, &Device->InstanceID, KEY_READ);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT1("IopOpenRegistryKeyEx() failed with status 0x%08lx\n", Status); DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n",
&Device->InstanceID, Status);
break; break;
} }