[ros-diffs] [weiden] 19648: Revert Filip's last 4 changes on his request as they break booting

Revert Filip's last 4 changes on his request as they break booting
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c
Modified: trunk/reactos/ntoskrnl/cm/regfile.c
Modified: trunk/reactos/tools/mkhive/binhive.c
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c
--- trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c
2005-11-26 17:07:54 UTC (rev 19647)
+++ trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c
2005-11-26 17:43:06 UTC (rev 19648)
@@ -809,7 +809,6 @@

     {
       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 @@
     }
 
   memset(*Block, 0, CellSize);
-  ((PCELL_HEADER)(*Block))->CellSize *= -1;
+  ((PCELL_HEADER)(*Block))->CellSize = -CellSize;
 
   return TRUE;
 }
  _____  

Modified: trunk/reactos/ntoskrnl/cm/regfile.c
--- trunk/reactos/ntoskrnl/cm/regfile.c	2005-11-26 17:07:54 UTC (rev
19647)
+++ trunk/reactos/ntoskrnl/cm/regfile.c	2005-11-26 17:43:06 UTC (rev
19648)
@@ -3417,7 +3417,6 @@

 	{
 	  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 @@
 
       RtlZeroMemory(*Cell,
 		    CellSize);
-      ((PCELL_HEADER) (*Cell))->CellSize *= -1;
+      ((PCELL_HEADER) (*Cell))->CellSize = -CellSize;
     }
 
   return STATUS_SUCCESS;
  _____  

Modified: trunk/reactos/tools/mkhive/binhive.c
--- trunk/reactos/tools/mkhive/binhive.c	2005-11-26 17:07:54 UTC
(rev 19647)
+++ trunk/reactos/tools/mkhive/binhive.c	2005-11-26 17:43:06 UTC
(rev 19648)
@@ -829,7 +829,6 @@

     {
       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 @@
     }
 
   memset(*Block, 0, CellSize);
-  ((PCELL_HEADER)(*Block))->CellSize *= -1;
+  ((PCELL_HEADER)(*Block))->CellSize = -CellSize;
 
   return TRUE;
 }