[MKHIVE]

- Fix max key name length, max value name length, max value data length properties of registry key not being set correctly
- Fixes #6042 - regedit on LiveCD shows keys and values now

svn path=/trunk/; revision=53614

diff --git a/reactos/tools/mkhive/cmi.c b/reactos/tools/mkhive/cmi.c
index 98914ed..bb8f48f 100644 (file)
--- a/reactos/tools/mkhive/cmi.c
+++ b/reactos/tools/mkhive/cmi.c
@@ -388,6 +388,19 @@ CmiAddSubKey(
        if (NT_SUCCESS(Status))
        {
                ParentKeyCell->SubKeyCounts[Storage]++;
+               if (Packable)
+        {
+            if (NameLength*sizeof(WCHAR) > ParentKeyCell->MaxNameLen)
+                ParentKeyCell->MaxNameLen = NameLength*sizeof(WCHAR);
+        }
+        else
+        {
+            if (NameLength > ParentKeyCell->MaxNameLen)
+                ParentKeyCell->MaxNameLen = NameLength;
+        }
+        if (NewKeyCell->ClassLength > ParentKeyCell->MaxClassLen)
+            ParentKeyCell->MaxClassLen = NewKeyCell->ClassLength;
+
                *pSubKeyCell = NewKeyCell;
                *pBlockOffset = NKBOffset;
        }
@@ -720,6 +733,16 @@ CmiAddValueKey(
 
        ValueListCell->ValueOffset[KeyCell->ValueList.Count] = NewValueCellOffset;
        KeyCell->ValueList.Count++;
+       if (NewValueCell->Flags & VALUE_COMP_NAME)
+       {
+           if (NewValueCell->NameLength*sizeof(WCHAR) > KeyCell->MaxValueNameLen)
+            KeyCell->MaxValueNameLen = NewValueCell->NameLength*sizeof(WCHAR);
+       }
+       else
+       {
+           if (NewValueCell->NameLength > KeyCell->MaxValueNameLen)
+            KeyCell->MaxValueNameLen = NewValueCell->NameLength;
+       }
 
        HvMarkCellDirty(&RegistryHive->Hive, KeyCellOffset, FALSE);
        HvMarkCellDirty(&RegistryHive->Hive, KeyCell->ValueList.List, FALSE);

diff --git a/reactos/tools/mkhive/registry.c b/reactos/tools/mkhive/registry.c
index 07339af..82915eb 100644 (file)
--- a/reactos/tools/mkhive/registry.c
+++ b/reactos/tools/mkhive/registry.c
@@ -448,6 +448,9 @@ RegSetValueExW(
                HvMarkCellDirty(&Key->RegistryHive->Hive, ValueCellOffset, FALSE);
        }
 
+    if (cbData > Key->KeyCell->MaxValueDataLen)
+        Key->KeyCell->MaxValueDataLen = cbData;
+
        HvMarkCellDirty(&Key->RegistryHive->Hive, Key->KeyCellOffset, FALSE);
 
        DPRINT("Return status 0x%08x\n", Status);