Fix splitting of cells (noticed by Hartmut).

svn path=/trunk/; revision=19642

diff --git a/reactos/boot/freeldr/freeldr/reactos/binhive.c b/reactos/boot/freeldr/freeldr/reactos/binhive.c
index 584a11f..b062b96 100644 (file)
--- a/reactos/boot/freeldr/freeldr/reactos/binhive.c
+++ b/reactos/boot/freeldr/freeldr/reactos/binhive.c
@@ -809,6 +809,7 @@ CmiAllocateCell (PREGISTRY_HIVE RegistryHive,
     {
       NewBlock = (PCELL_HEADER) ((ULONG)NewBlock + CellSize);
       NewBlock->CellSize = ((PCELL_HEADER) (*Block))->CellSize - CellSize;
     {
       NewBlock = (PCELL_HEADER) ((ULONG)NewBlock + CellSize);
       NewBlock->CellSize = ((PCELL_HEADER) (*Block))->CellSize - CellSize;

+      ((PCELL_HEADER) (*Block))->CellSize = CellSize;

       CmiAddFree (RegistryHive,
                  NewBlock,
                  *pBlockOffset + CellSize,
       CmiAddFree (RegistryHive,
                  NewBlock,
                  *pBlockOffset + CellSize,

diff --git a/reactos/ntoskrnl/cm/regfile.c b/reactos/ntoskrnl/cm/regfile.c
index 48bd8dc..85b3409 100644 (file)
--- a/reactos/ntoskrnl/cm/regfile.c
+++ b/reactos/ntoskrnl/cm/regfile.c
@@ -3417,6 +3417,7 @@ CmiAllocateCell (PREGISTRY_HIVE RegistryHive,
        {
          NewCell = (PCELL_HEADER) ((ULONG_PTR) NewCell + CellSize);
          NewCell->CellSize = ((PCELL_HEADER) (*Cell))->CellSize - CellSize;
        {
          NewCell = (PCELL_HEADER) ((ULONG_PTR) NewCell + CellSize);
          NewCell->CellSize = ((PCELL_HEADER) (*Cell))->CellSize - CellSize;

+         ((PCELL_HEADER) (*Cell))->CellSize = CellSize;

          CmiAddFree(RegistryHive,
                     NewCell,
                     *CellOffset + CellSize,
          CmiAddFree(RegistryHive,
                     NewCell,
                     *CellOffset + CellSize,

diff --git a/reactos/tools/mkhive/binhive.c b/reactos/tools/mkhive/binhive.c
index 381e459..6b3dfb8 100644 (file)
--- a/reactos/tools/mkhive/binhive.c
+++ b/reactos/tools/mkhive/binhive.c
@@ -829,6 +829,7 @@ CmiAllocateCell (PREGISTRY_HIVE RegistryHive,
     {
       NewBlock = (PCELL_HEADER) ((ULONG_PTR) NewBlock + CellSize);
       NewBlock->CellSize = ((PCELL_HEADER) (*Block))->CellSize - CellSize;
     {
       NewBlock = (PCELL_HEADER) ((ULONG_PTR) NewBlock + CellSize);
       NewBlock->CellSize = ((PCELL_HEADER) (*Block))->CellSize - CellSize;

+      ((PCELL_HEADER) (*Block))->CellSize = CellSize;

       CmiAddFree (RegistryHive,
                  NewBlock,
                  *pBlockOffset + CellSize,
       CmiAddFree (RegistryHive,
                  NewBlock,
                  *pBlockOffset + CellSize,