Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 07:43:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
svn path=/trunk/; revision=19648
This commit is contained in:
Thomas Bluemel 2005-11-26 17:43:06 +00:00
parent 0a92dbc27d
commit a3ac3f00d6
3 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
reactos/boot/freeldr/freeldr/reactos/binhive.c
View file

@ -809,7 +809,6 @@ CmiAllocateCell (PREGISTRY_HIVE RegistryHive,
{ {
NewBlock = (PCELL_HEADER) ((ULONG)NewBlock + CellSize); NewBlock = (PCELL_HEADER) ((ULONG)NewBlock + CellSize);
NewBlock->CellSize = ((PCELL_HEADER) (*Block))->CellSize - CellSize; NewBlock->CellSize = ((PCELL_HEADER) (*Block))->CellSize - CellSize;
((PCELL_HEADER) (*Block))->CellSize = CellSize;
CmiAddFree (RegistryHive, CmiAddFree (RegistryHive,
NewBlock, NewBlock,
*pBlockOffset + CellSize, *pBlockOffset + CellSize,
@ -821,7 +820,7 @@ CmiAllocateCell (PREGISTRY_HIVE RegistryHive,
} }
memset(*Block, 0, CellSize); memset(*Block, 0, CellSize);
((PCELL_HEADER)(*Block))->CellSize *= -1; ((PCELL_HEADER)(*Block))->CellSize = -CellSize;
return TRUE; return TRUE;
} }

3
reactos/ntoskrnl/cm/regfile.c
View file

@ -3417,7 +3417,6 @@ CmiAllocateCell (PREGISTRY_HIVE RegistryHive,
{ {
NewCell = (PCELL_HEADER) ((ULONG_PTR) NewCell + CellSize); NewCell = (PCELL_HEADER) ((ULONG_PTR) NewCell + CellSize);
NewCell->CellSize = ((PCELL_HEADER) (*Cell))->CellSize - CellSize; NewCell->CellSize = ((PCELL_HEADER) (*Cell))->CellSize - CellSize;
((PCELL_HEADER) (*Cell))->CellSize = CellSize;
CmiAddFree(RegistryHive, CmiAddFree(RegistryHive,
NewCell, NewCell,
*CellOffset + CellSize, *CellOffset + CellSize,
@ -3432,7 +3431,7 @@ CmiAllocateCell (PREGISTRY_HIVE RegistryHive,
RtlZeroMemory(*Cell, RtlZeroMemory(*Cell,
CellSize); CellSize);
((PCELL_HEADER) (*Cell))->CellSize *= -1; ((PCELL_HEADER) (*Cell))->CellSize = -CellSize;
} }
return STATUS_SUCCESS; return STATUS_SUCCESS;

3
reactos/tools/mkhive/binhive.c
View file

@ -829,7 +829,6 @@ CmiAllocateCell (PREGISTRY_HIVE RegistryHive,
{ {
NewBlock = (PCELL_HEADER) ((ULONG_PTR) NewBlock + CellSize); NewBlock = (PCELL_HEADER) ((ULONG_PTR) NewBlock + CellSize);
NewBlock->CellSize = ((PCELL_HEADER) (*Block))->CellSize - CellSize; NewBlock->CellSize = ((PCELL_HEADER) (*Block))->CellSize - CellSize;
((PCELL_HEADER) (*Block))->CellSize = CellSize;
CmiAddFree (RegistryHive, CmiAddFree (RegistryHive,
NewBlock, NewBlock,
*pBlockOffset + CellSize, *pBlockOffset + CellSize,
@ -841,7 +840,7 @@ CmiAllocateCell (PREGISTRY_HIVE RegistryHive,
} }
memset(*Block, 0, CellSize); memset(*Block, 0, CellSize);
((PCELL_HEADER)(*Block))->CellSize *= -1; ((PCELL_HEADER)(*Block))->CellSize = -CellSize;
return TRUE; return TRUE;
} }