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

[NTOSKRNL]

Browse Source 
- Make legacy device keys volatile

svn path=/trunk/; revision=46840
This commit is contained in:
Cameron Gutman
2010-04-11 16:08:20 +00:00
parent a4f5e7b912
commit 5d13bbcc06
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
+6 -4
View File
@@ -63,6 +63,7 @@ IopUpdateResourceMapForPnPDevice(
NTSTATUS
NTAPI
IopCreateDeviceKeyPath(IN PCUNICODE_STRING RegistryPath,
IN ULONG CreateOptions,
OUT PHANDLE Handle);
PDEVICE_NODE
@@ -226,7 +227,7 @@ IopStartDevice(
}
}
Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, &InstanceHandle);
Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, 0, &InstanceHandle);
if (!NT_SUCCESS(Status))
return Status;
@@ -458,7 +459,7 @@ IopCreateDeviceNode(PDEVICE_NODE ParentNode,
}
/* Create the device key for legacy drivers */
Status = IopCreateDeviceKeyPath(&Node->InstancePath, &InstanceHandle);
Status = IopCreateDeviceKeyPath(&Node->InstancePath, REG_OPTION_VOLATILE, &InstanceHandle);
if (!NT_SUCCESS(Status))
{
ZwClose(InstanceHandle);
@@ -761,6 +762,7 @@ IopTraverseDeviceTree(PDEVICETREE_TRAVERSE_CONTEXT Context)
NTSTATUS
NTAPI
IopCreateDeviceKeyPath(IN PCUNICODE_STRING RegistryPath,
IN ULONG CreateOptions,
OUT PHANDLE Handle)
{
UNICODE_STRING EnumU = RTL_CONSTANT_STRING(ENUM_ROOT);
@@ -811,7 +813,7 @@ IopCreateDeviceKeyPath(IN PCUNICODE_STRING RegistryPath,
&ObjectAttributes,
0,
NULL,
0,
CreateOptions,
NULL);
/* Close parent key handle, we don't need it anymore */
@@ -2244,7 +2246,7 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode,
/*
* Create registry key for the instance id, if it doesn't exist yet
*/
Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, &InstanceKey);
Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, 0, &InstanceKey);
if (!NT_SUCCESS(Status))
{
DPRINT1("Failed to create the instance key! (Status %lx)\n", Status);
reactos/ntoskrnl/io/pnpmgr/pnpreport.c
+2 -1
View File
@@ -15,6 +15,7 @@
NTSTATUS
NTAPI
IopCreateDeviceKeyPath(IN PCUNICODE_STRING RegistryPath,
IN ULONG CreateOptions,
OUT PHANDLE Handle);
NTSTATUS
@@ -196,7 +197,7 @@ IoReportDetectedDevice(IN PDRIVER_OBJECT DriverObject,
IopActionConfigureChildServices(DeviceNode, DeviceNode->Parent);
/* Open a handle to the instance path key */
Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, &InstanceKey);
Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, 0, &InstanceKey);
if (!NT_SUCCESS(Status))
return Status;
reactos/ntoskrnl/io/pnpmgr/pnproot.c
+1 -1
View File
@@ -172,7 +172,7 @@ PnpRootCreateDevice(
if (NT_SUCCESS(Status))
{
InitializeObjectAttributes(&ObjectAttributes, &Device->DeviceID, OBJ_CASE_INSENSITIVE, EnumHandle, NULL);
Status = ZwCreateKey(&DeviceKeyHandle, KEY_SET_VALUE, &ObjectAttributes, 0, NULL, 0, NULL);
Status = ZwCreateKey(&DeviceKeyHandle, KEY_SET_VALUE, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL);
ZwClose(EnumHandle);
}