[MKHIVE] Remove key name in our custom registry tree; use cell index instead

[reactos.git] / reactos / tools / mkhive / registry.c

diff --git a/reactos/tools/mkhive/registry.c b/reactos/tools/mkhive/registry.c
index 7b6359b..d42454d 100644 (file)
--- a/reactos/tools/mkhive/registry.c
+++ b/reactos/tools/mkhive/registry.c
@@ -20,7 +20,7 @@
  * PROJECT:         ReactOS hive maker
  * FILE:            tools/mkhive/registry.c
  * PURPOSE:         Registry code
- * PROGRAMMER:      Hervé Poussineau
+ * PROGRAMMER:      Hervé Poussineau
  */
 
 /*
@@ -67,27 +67,20 @@ CreateInMemoryStructure(
        Key->SubKeyCount = 0;
        Key->ValueCount = 0;
 
-       Key->NameSize = KeyName->Length;
-       /* FIXME: It's not enough to allocate this way, because later
-                 this memory gets overwritten with bigger names */
-       Key->Name = malloc (Key->NameSize);
-       if (!Key->Name)
-               return NULL;
-       memcpy(Key->Name, KeyName->Buffer, KeyName->Length);
-
        Key->DataType = 0;
        Key->DataSize = 0;
        Key->Data = NULL;
 
        Key->RegistryHive = RegistryHive;
-       Key->KeyCellOffset = KeyCellOffset;
+       Key->KeyCellOffset = Key->KeyCellOffsetInParentHive = KeyCellOffset;
        Key->KeyCell = (PCM_KEY_NODE)HvGetCell (&RegistryHive->Hive, Key->KeyCellOffset);
        if (!Key->KeyCell)
        {
-        free(Key->Name);
                free(Key);
                return NULL;
        }
+       Key->KeyCell->SubKeyLists[Stable] = HCELL_NIL;
+       Key->KeyCell->SubKeyLists[Volatile] = HCELL_NIL;
        Key->LinkedKey = NULL;
        return Key;
 }
@@ -108,6 +101,7 @@ RegpOpenOrCreateKey(
        PLIST_ENTRY Ptr;
        PCM_KEY_NODE SubKeyCell;
        HCELL_INDEX BlockOffset;
+       BOOLEAN ParentIsSystem = FALSE;
 
        DPRINT("RegpCreateOpenKey('%S')\n", KeyName);
 
@@ -136,26 +130,24 @@ RegpOpenOrCreateKey(
                                (USHORT)((ULONG_PTR)End - (ULONG_PTR)LocalKeyName);
                }
                else
+               {
                        RtlInitUnicodeString(&KeyString, LocalKeyName);
+                       if (KeyString.Length == 0)
+                       {
+                               /* Trailing backslash char; we're done */
+                               break;
+                       }
+               }
 
                /* Redirect from 'CurrentControlSet' to 'ControlSet001' */
-               if (!strncmpW(LocalKeyName, L"CurrentControlSet", 17) &&
-                   ParentKey->NameSize == 12 &&
-                   !memcmp(ParentKey->Name, L"SYSTEM", 12))
+               if (!strncmpiW(LocalKeyName, L"CurrentControlSet", 17) && ParentIsSystem)
+               {
                        RtlInitUnicodeString(&KeyString, L"ControlSet001");
-
-               /* Check subkey in memory structure */
-               Ptr = ParentKey->SubKeyList.Flink;
-               while (Ptr != &ParentKey->SubKeyList)
+                       ParentIsSystem = FALSE;
+               }
+               else
                {
-                       CurrentKey = CONTAINING_RECORD(Ptr, KEY, KeyList);
-                       if (CurrentKey->NameSize == KeyString.Length
-                        && memcmp(CurrentKey->Name, KeyString.Buffer, KeyString.Length) == 0)
-                       {
-                               goto nextsubkey;
-                       }
-
-                       Ptr = Ptr->Flink;
+                       ParentIsSystem = (strncmpiW(LocalKeyName, L"SYSTEM", 6) == 0);
                }
 
                Status = CmiScanForSubKey(
@@ -165,6 +157,24 @@ RegpOpenOrCreateKey(
                        OBJ_CASE_INSENSITIVE,
                        &SubKeyCell,
                        &BlockOffset);
+               if (NT_SUCCESS(Status))
+               {
+                       /* Check subkey in memory structure */
+                       Ptr = ParentKey->SubKeyList.Flink;
+                       while (Ptr != &ParentKey->SubKeyList)
+                       {
+                               CurrentKey = CONTAINING_RECORD(Ptr, KEY, KeyList);
+                               if (CurrentKey->KeyCellOffsetInParentHive == BlockOffset)
+                               {
+                                       goto nextsubkey;
+                               }
+
+                               Ptr = Ptr->Flink;
+                       }
+                       /* If we go there, this means that key exists, but we don't know it */
+                       ASSERT(FALSE);
+               }
+
                if (AllowCreation && Status == STATUS_OBJECT_NAME_NOT_FOUND)
                {
                        Status = CmiAddSubKey(
@@ -175,22 +185,23 @@ RegpOpenOrCreateKey(
                                0,
                                &SubKeyCell,
                                &BlockOffset);
+                       if (NT_SUCCESS(Status))
+                       {
+                               /* Now, SubKeyCell/BlockOffset are valid */
+                               CurrentKey = CreateInMemoryStructure(
+                                       ParentKey->RegistryHive,
+                                       BlockOffset,
+                                       &KeyString);
+                               if (!CurrentKey)
+                                       return ERROR_OUTOFMEMORY;
+                               /* Add CurrentKey in ParentKey */
+                               InsertTailList(&ParentKey->SubKeyList, &CurrentKey->KeyList);
+                               ParentKey->SubKeyCount++;
+                       }
                }
                if (!NT_SUCCESS(Status))
                        return ERROR_UNSUCCESSFUL;
 
-               /* Now, SubKeyCell/BlockOffset are valid */
-               CurrentKey = CreateInMemoryStructure(
-                       ParentKey->RegistryHive,
-                       BlockOffset,
-                       &KeyString);
-               if (!CurrentKey)
-                       return ERROR_OUTOFMEMORY;
-
-               /* Add CurrentKey in ParentKey */
-               InsertTailList(&ParentKey->SubKeyList, &CurrentKey->KeyList);
-               ParentKey->SubKeyCount++;
-
 nextsubkey:
                ParentKey = CurrentKey;
                if (End)
@@ -691,7 +702,6 @@ RegShutdownRegistry(VOID)
 {
        /* FIXME: clean up the complete hive */
 
-       free(RootKey->Name);
        free(RootKey);
 }