Revert Filip's last 4 changes on his request as they break booting

svn path=/trunk/; revision=19648

diff --git a/reactos/boot/freeldr/freeldr/reactos/binhive.c b/reactos/boot/freeldr/freeldr/reactos/binhive.c
index b062b96..f9ea51f 100644 (file)
--- a/reactos/boot/freeldr/freeldr/reactos/binhive.c
+++ b/reactos/boot/freeldr/freeldr/reactos/binhive.c
@@ -809,7 +809,6 @@ CmiAllocateCell (PREGISTRY_HIVE RegistryHive,
     {
       NewBlock = (PCELL_HEADER) ((ULONG)NewBlock + CellSize);
       NewBlock->CellSize = ((PCELL_HEADER) (*Block))->CellSize - CellSize;
-      ((PCELL_HEADER) (*Block))->CellSize = CellSize;
       CmiAddFree (RegistryHive,
                  NewBlock,
                  *pBlockOffset + CellSize,
@@ -821,7 +820,7 @@ CmiAllocateCell (PREGISTRY_HIVE RegistryHive,
     }
 
   memset(*Block, 0, CellSize);
-  ((PCELL_HEADER)(*Block))->CellSize *= -1;
+  ((PCELL_HEADER)(*Block))->CellSize = -CellSize;
 
   return TRUE;
 }

diff --git a/reactos/ntoskrnl/cm/regfile.c b/reactos/ntoskrnl/cm/regfile.c
index 85b3409..237638a 100644 (file)
--- a/reactos/ntoskrnl/cm/regfile.c
+++ b/reactos/ntoskrnl/cm/regfile.c
@@ -3417,7 +3417,6 @@ CmiAllocateCell (PREGISTRY_HIVE RegistryHive,
        {
          NewCell = (PCELL_HEADER) ((ULONG_PTR) NewCell + CellSize);
          NewCell->CellSize = ((PCELL_HEADER) (*Cell))->CellSize - CellSize;
-         ((PCELL_HEADER) (*Cell))->CellSize = CellSize;
          CmiAddFree(RegistryHive,
                     NewCell,
                     *CellOffset + CellSize,
@@ -3432,7 +3431,7 @@ CmiAllocateCell (PREGISTRY_HIVE RegistryHive,
 
       RtlZeroMemory(*Cell,
                    CellSize);
-      ((PCELL_HEADER) (*Cell))->CellSize *= -1;
+      ((PCELL_HEADER) (*Cell))->CellSize = -CellSize;
     }
 
   return STATUS_SUCCESS;

diff --git a/reactos/tools/mkhive/binhive.c b/reactos/tools/mkhive/binhive.c
index 6b3dfb8..6b999f5 100644 (file)
--- a/reactos/tools/mkhive/binhive.c
+++ b/reactos/tools/mkhive/binhive.c
@@ -829,7 +829,6 @@ CmiAllocateCell (PREGISTRY_HIVE RegistryHive,
     {
       NewBlock = (PCELL_HEADER) ((ULONG_PTR) NewBlock + CellSize);
       NewBlock->CellSize = ((PCELL_HEADER) (*Block))->CellSize - CellSize;
-      ((PCELL_HEADER) (*Block))->CellSize = CellSize;
       CmiAddFree (RegistryHive,
                  NewBlock,
                  *pBlockOffset + CellSize,
@@ -841,7 +840,7 @@ CmiAllocateCell (PREGISTRY_HIVE RegistryHive,
     }
 
   memset(*Block, 0, CellSize);
-  ((PCELL_HEADER)(*Block))->CellSize *= -1;
+  ((PCELL_HEADER)(*Block))->CellSize = -CellSize;
 
   return TRUE;
 }