mirror of
https://github.com/reactos/reactos.git
synced 2024-09-06 02:37:06 +00:00
- Actually create KCB where needed.
svn path=/trunk/; revision=29958
This commit is contained in:
parent
904dde02c7
commit
b26a87eed3
|
@ -365,6 +365,7 @@ CmpParseKey(IN PVOID ParsedObject,
|
|||
UNICODE_STRING TargetPath;
|
||||
UNICODE_STRING KeyName;
|
||||
PWSTR *Path = &RemainingName->Buffer;
|
||||
PCM_KEY_CONTROL_BLOCK ParentKcb = NULL, Kcb;
|
||||
|
||||
ParsedKey = ParsedObject;
|
||||
|
||||
|
@ -415,16 +416,16 @@ CmpParseKey(IN PVOID ParsedObject,
|
|||
RtlFreeUnicodeString(&KeyName);
|
||||
return Status;
|
||||
}
|
||||
|
||||
ParentKcb = ParsedKey->KeyControlBlock;
|
||||
|
||||
if (FoundObject == NULL)
|
||||
{
|
||||
Status = CmiScanForSubKey(ParsedKey->RegistryHive,
|
||||
/* Search for the subkey */
|
||||
BlockOffset = CmpFindSubKeyByName(&ParsedKey->RegistryHive->Hive,
|
||||
ParsedKey->KeyCell,
|
||||
&SubKeyCell,
|
||||
&BlockOffset,
|
||||
&KeyName,
|
||||
0,
|
||||
Attributes);
|
||||
if (!NT_SUCCESS(Status))
|
||||
&KeyName);
|
||||
if (BlockOffset == HCELL_NIL)
|
||||
{
|
||||
ExReleaseResourceLite(&CmpRegistryLock);
|
||||
KeLeaveCriticalRegion();
|
||||
|
@ -432,6 +433,9 @@ CmpParseKey(IN PVOID ParsedObject,
|
|||
return(STATUS_UNSUCCESSFUL);
|
||||
}
|
||||
|
||||
/* Get the node */
|
||||
SubKeyCell = (PCM_KEY_NODE)HvGetCell(&ParsedKey->RegistryHive->Hive, BlockOffset);
|
||||
|
||||
if ((SubKeyCell->Flags & KEY_SYM_LINK) &&
|
||||
!((Attributes & OBJ_OPENLINK) && (EndPtr == NULL)))
|
||||
{
|
||||
|
@ -515,6 +519,22 @@ CmpParseKey(IN PVOID ParsedObject,
|
|||
/* Add the keep-alive reference */
|
||||
ObReferenceObject(FoundObject);
|
||||
|
||||
/* Create the KCB */
|
||||
Kcb = CmpCreateKeyControlBlock(&ParsedKey->RegistryHive->Hive,
|
||||
BlockOffset,
|
||||
SubKeyCell,
|
||||
ParentKcb,
|
||||
0,
|
||||
&KeyName);
|
||||
if (!Kcb)
|
||||
{
|
||||
ExReleaseResourceLite(&CmpRegistryLock);
|
||||
KeLeaveCriticalRegion();
|
||||
RtlFreeUnicodeString(&KeyName);
|
||||
return STATUS_INSUFFICIENT_RESOURCES;
|
||||
}
|
||||
|
||||
FoundObject->KeyControlBlock = Kcb;
|
||||
FoundObject->Flags = 0;
|
||||
FoundObject->KeyCell = SubKeyCell;
|
||||
FoundObject->KeyCellOffset = BlockOffset;
|
||||
|
|
|
@ -520,6 +520,7 @@ typedef struct _KEY_OBJECT
|
|||
ULONG TimeStamp;
|
||||
LIST_ENTRY HiveList;
|
||||
CACHED_CHILD_LIST ValueCache;
|
||||
PCM_KEY_CONTROL_BLOCK KeyControlBlock;
|
||||
} KEY_OBJECT, *PKEY_OBJECT;
|
||||
extern PCMHIVE CmiVolatileHive;
|
||||
extern LIST_ENTRY CmiKeyObjectListHead, CmiConnectedHiveList;
|
||||
|
|
|
@ -96,6 +96,7 @@ CmpDoCreateChild(IN PHHIVE Hive,
|
|||
ULONG StorageType;
|
||||
LARGE_INTEGER SystemTime;
|
||||
BOOLEAN Hack = FALSE;
|
||||
PCM_KEY_CONTROL_BLOCK Kcb;
|
||||
|
||||
/* ReactOS Hack */
|
||||
if (Name->Buffer[0] == OBJ_NAME_PATH_SEPARATOR)
|
||||
|
@ -209,7 +210,26 @@ CmpDoCreateChild(IN PHHIVE Hive,
|
|||
KeyNode->NameLength = CmpCopyName(Hive, KeyNode->Name, Name);
|
||||
if (KeyNode->NameLength < Name->Length) KeyNode->Flags |= KEY_COMP_NAME;
|
||||
|
||||
/* Create the KCB */
|
||||
Kcb = CmpCreateKeyControlBlock(Hive,
|
||||
*KeyCell,
|
||||
KeyNode,
|
||||
Parent->KeyControlBlock,
|
||||
0,
|
||||
Name);
|
||||
if (!Kcb)
|
||||
{
|
||||
/* Fail */
|
||||
ObDereferenceObjectDeferDelete(*Object);
|
||||
Status = STATUS_INSUFFICIENT_RESOURCES;
|
||||
goto Quickie;
|
||||
}
|
||||
|
||||
/* Sanity check */
|
||||
ASSERT(Kcb->RefCount == 1);
|
||||
|
||||
/* Now fill out the Cm object */
|
||||
KeyBody->KeyControlBlock = Kcb;
|
||||
KeyBody->KeyCell = KeyNode;
|
||||
KeyBody->KeyCellOffset = *KeyCell;
|
||||
KeyBody->Flags = 0;
|
||||
|
|
|
@ -669,7 +669,6 @@ CmpCreateRegistryRoot(VOID)
|
|||
if (!CmpCreateRootNode(&CmiVolatileHive->Hive, L"REGISTRY", &RootIndex))
|
||||
{
|
||||
/* We failed */
|
||||
DPRINT1("Fail\n");
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
@ -716,6 +715,7 @@ CmpCreateRegistryRoot(VOID)
|
|||
RootKey->ProcessID = PsGetCurrentProcessId();
|
||||
#else
|
||||
RtlpCreateUnicodeString(&RootKey->Name, L"Registry", NonPagedPool);
|
||||
RootKey->KeyControlBlock = Kcb;
|
||||
RootKey->RegistryHive = CmiVolatileHive;
|
||||
RootKey->KeyCellOffset = RootIndex;
|
||||
RootKey->KeyCell = KeyCell;
|
||||
|
|
Loading…
Reference in a new issue