- Add some missing OBJ_KERNEL_HANDLE
CORE-10207

svn path=/trunk/; revision=69269
This commit is contained in:
Thomas Faber 2015-09-18 14:22:12 +00:00
parent c4503f35a1
commit cf070e1e2f
6 changed files with 24 additions and 21 deletions

View file

@ -1203,7 +1203,7 @@ CmpGetRegistryPath(IN PWCHAR ConfigPath)
/* Setup the object attributes */ /* Setup the object attributes */
InitializeObjectAttributes(&ObjectAttributes, InitializeObjectAttributes(&ObjectAttributes,
&KeyName, &KeyName,
OBJ_CASE_INSENSITIVE, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE,
NULL, NULL,
NULL); NULL);
/* Open the key */ /* Open the key */
@ -2185,7 +2185,7 @@ CmpSetVersionData(VOID)
RtlInitUnicodeString(&KeyName, L"\\REGISTRY\\MACHINE\\SOFTWARE"); RtlInitUnicodeString(&KeyName, L"\\REGISTRY\\MACHINE\\SOFTWARE");
InitializeObjectAttributes(&ObjectAttributes, InitializeObjectAttributes(&ObjectAttributes,
&KeyName, &KeyName,
OBJ_CASE_INSENSITIVE, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE,
NULL, NULL,
NULL); NULL);
Status = NtCreateKey(&SoftwareKeyHandle, Status = NtCreateKey(&SoftwareKeyHandle,
@ -2204,7 +2204,7 @@ CmpSetVersionData(VOID)
RtlInitUnicodeString(&KeyName, L"Microsoft"); RtlInitUnicodeString(&KeyName, L"Microsoft");
InitializeObjectAttributes(&ObjectAttributes, InitializeObjectAttributes(&ObjectAttributes,
&KeyName, &KeyName,
OBJ_CASE_INSENSITIVE, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE,
SoftwareKeyHandle, SoftwareKeyHandle,
NULL); NULL);
Status = NtCreateKey(&MicrosoftKeyHandle, Status = NtCreateKey(&MicrosoftKeyHandle,
@ -2223,7 +2223,7 @@ CmpSetVersionData(VOID)
RtlInitUnicodeString(&KeyName, L"Windows NT"); RtlInitUnicodeString(&KeyName, L"Windows NT");
InitializeObjectAttributes(&ObjectAttributes, InitializeObjectAttributes(&ObjectAttributes,
&KeyName, &KeyName,
OBJ_CASE_INSENSITIVE, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE,
MicrosoftKeyHandle, MicrosoftKeyHandle,
NULL); NULL);
Status = NtCreateKey(&WindowsNtKeyHandle, Status = NtCreateKey(&WindowsNtKeyHandle,
@ -2242,7 +2242,7 @@ CmpSetVersionData(VOID)
RtlInitUnicodeString(&KeyName, L"CurrentVersion"); RtlInitUnicodeString(&KeyName, L"CurrentVersion");
InitializeObjectAttributes(&ObjectAttributes, InitializeObjectAttributes(&ObjectAttributes,
&KeyName, &KeyName,
OBJ_CASE_INSENSITIVE, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE,
WindowsNtKeyHandle, WindowsNtKeyHandle,
NULL); NULL);
Status = NtCreateKey(&CurrentVersionKeyHandle, Status = NtCreateKey(&CurrentVersionKeyHandle,

View file

@ -1510,7 +1510,7 @@ try_again:
ObjectSize = sizeof(DRIVER_OBJECT) + sizeof(EXTENDED_DRIVER_EXTENSION); ObjectSize = sizeof(DRIVER_OBJECT) + sizeof(EXTENDED_DRIVER_EXTENSION);
InitializeObjectAttributes(&ObjectAttributes, InitializeObjectAttributes(&ObjectAttributes,
&LocalDriverName, &LocalDriverName,
OBJ_PERMANENT | OBJ_CASE_INSENSITIVE, OBJ_PERMANENT | OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE,
NULL, NULL,
NULL); NULL);

View file

@ -805,7 +805,7 @@ IopStartDevice(
RtlInitUnicodeString(&KeyName, L"Control"); RtlInitUnicodeString(&KeyName, L"Control");
InitializeObjectAttributes(&ObjectAttributes, InitializeObjectAttributes(&ObjectAttributes,
&KeyName, &KeyName,
OBJ_CASE_INSENSITIVE, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE,
InstanceHandle, InstanceHandle,
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);
@ -1474,7 +1474,7 @@ IopCreateDeviceKeyPath(IN PCUNICODE_STRING RegistryPath,
/* Open key */ /* Open key */
InitializeObjectAttributes(&ObjectAttributes, InitializeObjectAttributes(&ObjectAttributes,
&KeyName, &KeyName,
OBJ_CASE_INSENSITIVE, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE,
hParent, hParent,
NULL); NULL);
Status = ZwCreateKey(&hKey, Status = ZwCreateKey(&hKey,
@ -1531,7 +1531,7 @@ IopSetDeviceInstanceData(HANDLE InstanceKey,
RtlInitUnicodeString(&KeyName, L"LogConf"); RtlInitUnicodeString(&KeyName, L"LogConf");
InitializeObjectAttributes(&ObjectAttributes, InitializeObjectAttributes(&ObjectAttributes,
&KeyName, &KeyName,
OBJ_CASE_INSENSITIVE, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE,
InstanceKey, InstanceKey,
NULL); NULL);
Status = ZwCreateKey(&LogConfKey, Status = ZwCreateKey(&LogConfKey,
@ -1599,7 +1599,7 @@ IopSetDeviceInstanceData(HANDLE InstanceKey,
RtlInitUnicodeString(&KeyName, L"Control"); RtlInitUnicodeString(&KeyName, L"Control");
InitializeObjectAttributes(&ObjectAttributes, InitializeObjectAttributes(&ObjectAttributes,
&KeyName, &KeyName,
OBJ_CASE_INSENSITIVE, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE,
InstanceKey, InstanceKey,
NULL); NULL);
Status = ZwCreateKey(&ControlHandle, 0, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL); Status = ZwCreateKey(&ControlHandle, 0, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL);
@ -4298,8 +4298,11 @@ IoOpenDeviceRegistryKey(IN PDEVICE_OBJECT DeviceObject,
*/ */
RtlInitUnicodeString(&KeyName, DeviceParametersKeyName); RtlInitUnicodeString(&KeyName, DeviceParametersKeyName);
InitializeObjectAttributes(&ObjectAttributes, &KeyName, InitializeObjectAttributes(&ObjectAttributes,
OBJ_CASE_INSENSITIVE, *DevInstRegKey, NULL); &KeyName,
OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE,
*DevInstRegKey,
NULL);
Status = ZwCreateKey(DevInstRegKey, DesiredAccess, &ObjectAttributes, Status = ZwCreateKey(DevInstRegKey, DesiredAccess, &ObjectAttributes,
0, NULL, ExpInTextModeSetup ? REG_OPTION_VOLATILE : 0, NULL); 0, NULL, ExpInTextModeSetup ? REG_OPTION_VOLATILE : 0, NULL);
ZwClose(ObjectAttributes.RootDirectory); ZwClose(ObjectAttributes.RootDirectory);

View file

@ -699,7 +699,7 @@ IopUpdateControlKeyWithResources(IN PDEVICE_NODE DeviceNode)
/* Create/Open the Control key */ /* Create/Open the Control key */
InitializeObjectAttributes(&ObjectAttributes, InitializeObjectAttributes(&ObjectAttributes,
&Control, &Control,
OBJ_CASE_INSENSITIVE, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE,
InstanceKey, InstanceKey,
NULL); NULL);
Status = ZwCreateKey(&ControlKey, Status = ZwCreateKey(&ControlKey,
@ -772,8 +772,8 @@ IopUpdateResourceMap(IN PDEVICE_NODE DeviceNode, PWCHAR Level1Key, PWCHAR Level2
L"\\Registry\\Machine\\HARDWARE\\RESOURCEMAP"); L"\\Registry\\Machine\\HARDWARE\\RESOURCEMAP");
InitializeObjectAttributes(&ObjectAttributes, InitializeObjectAttributes(&ObjectAttributes,
&KeyName, &KeyName,
OBJ_CASE_INSENSITIVE | OBJ_OPENIF, OBJ_CASE_INSENSITIVE | OBJ_OPENIF | OBJ_KERNEL_HANDLE,
0, NULL,
NULL); NULL);
Status = ZwCreateKey(&ResourceMapKey, Status = ZwCreateKey(&ResourceMapKey,
KEY_ALL_ACCESS, KEY_ALL_ACCESS,
@ -788,7 +788,7 @@ IopUpdateResourceMap(IN PDEVICE_NODE DeviceNode, PWCHAR Level1Key, PWCHAR Level2
RtlInitUnicodeString(&KeyName, Level1Key); RtlInitUnicodeString(&KeyName, Level1Key);
InitializeObjectAttributes(&ObjectAttributes, InitializeObjectAttributes(&ObjectAttributes,
&KeyName, &KeyName,
OBJ_CASE_INSENSITIVE | OBJ_OPENIF, OBJ_CASE_INSENSITIVE | OBJ_OPENIF | OBJ_KERNEL_HANDLE,
ResourceMapKey, ResourceMapKey,
NULL); NULL);
Status = ZwCreateKey(&PnpMgrLevel1, Status = ZwCreateKey(&PnpMgrLevel1,
@ -805,7 +805,7 @@ IopUpdateResourceMap(IN PDEVICE_NODE DeviceNode, PWCHAR Level1Key, PWCHAR Level2
RtlInitUnicodeString(&KeyName, Level2Key); RtlInitUnicodeString(&KeyName, Level2Key);
InitializeObjectAttributes(&ObjectAttributes, InitializeObjectAttributes(&ObjectAttributes,
&KeyName, &KeyName,
OBJ_CASE_INSENSITIVE | OBJ_OPENIF, OBJ_CASE_INSENSITIVE | OBJ_OPENIF | OBJ_KERNEL_HANDLE,
PnpMgrLevel1, PnpMgrLevel1,
NULL); NULL);
Status = ZwCreateKey(&PnpMgrLevel2, Status = ZwCreateKey(&PnpMgrLevel2,

View file

@ -559,7 +559,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName,
InitializeObjectAttributes(&ObjectAttributes, InitializeObjectAttributes(&ObjectAttributes,
&CapturedFileName, &CapturedFileName,
0, OBJ_KERNEL_HANDLE,
NULL, NULL,
NULL); NULL);
@ -625,7 +625,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName,
Status = ObReferenceObjectByHandle(FileHandle, Status = ObReferenceObjectByHandle(FileHandle,
FILE_ALL_ACCESS, FILE_ALL_ACCESS,
IoFileObjectType, IoFileObjectType,
PreviousMode, KernelMode,
(PVOID*)&FileObject, (PVOID*)&FileObject,
NULL); NULL);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))

View file

@ -54,7 +54,7 @@ KeI386VdmInitialize(VOID)
L"Control\\Wow"); L"Control\\Wow");
InitializeObjectAttributes(&ObjectAttributes, InitializeObjectAttributes(&ObjectAttributes,
&Name, &Name,
OBJ_CASE_INSENSITIVE, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE,
NULL, NULL,
NULL); NULL);
Status = ZwOpenKey(&RegHandle, KEY_READ, &ObjectAttributes); Status = ZwOpenKey(&RegHandle, KEY_READ, &ObjectAttributes);
@ -99,7 +99,7 @@ VdmpInitialize(PVOID ControlData)
/* Open the physical memory section */ /* Open the physical memory section */
InitializeObjectAttributes(&ObjectAttributes, InitializeObjectAttributes(&ObjectAttributes,
&PhysMemName, &PhysMemName,
0, OBJ_KERNEL_HANDLE,
NULL, NULL,
NULL); NULL);
Status = ZwOpenSection(&PhysMemHandle, Status = ZwOpenSection(&PhysMemHandle,