Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 01:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert r18064 and correctly set the cell size for hash cells.

Browse source 
svn path=/trunk/; revision=18070
This commit is contained in:
Filip Navara 2005-09-25 20:54:40 +00:00
parent 800ecc9875
commit 7df1c3d13b
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3033,6 +3033,7 @@ CmiAllocateHashTableCell (IN PREGISTRY_HIVE RegistryHive,
else
{
ASSERT(SubKeyCount <= 0xffff); /* should really be USHORT_MAX or similar */
NewHashBlock->CellSize = -NewHashSize;
NewHashBlock->Id = REG_HASH_TABLE_CELL_ID;
NewHashBlock->HashTableSize = (USHORT)SubKeyCount;
*HashBlock = NewHashBlock;
@ -3456,20 +3457,14 @@ CmiDestroyCell (PREGISTRY_HIVE RegistryHive,
else
{
PCELL_HEADER pFree = Cell;
PHASH_TABLE_CELL pHash = Cell;
LONG CellSize;
if (pHash->Id == REG_HASH_TABLE_CELL_ID)
CellSize = sizeof(HASH_TABLE_CELL) + pHash->HashTableSize * sizeof(HASH_RECORD);
else
CellSize = abs(pFree->CellSize);
if (pFree->CellSize < 0)
pFree->CellSize = -pFree->CellSize;
/* Clear block (except the block size) */
RtlZeroMemory(((char*)pFree) + sizeof(ULONG),
pFree->CellSize - sizeof(ULONG));
/* Clear block */
RtlZeroMemory(pFree, CellSize);
/* restore CellSize */
pFree->CellSize = CellSize;
/* Add block to the list of free blocks */
CmiAddFree(RegistryHive, Cell, CellOffset, TRUE);