mirror of
https://github.com/reactos/reactos.git
synced 2024-12-29 10:35:28 +00:00
Added checks for invalid block pointers.
Update free cell list when three cells are merged. svn path=/trunk/; revision=4561
This commit is contained in:
Eric Kohl
parent
c1ce9a4b84
commit
a2ba772d42
5 changed files with 235 additions and 95 deletions
|
|
@ -139,6 +139,7 @@ NtCreateKey(OUT PHANDLE KeyHandle,
|
|||
CreateOptions);
|
||||
if (!NT_SUCCESS(Status))
|
||||
{
|
||||
DPRINT("CmiAddSubKey() failed (Status %lx)\n", Status);
|
||||
/* Release hive lock */
|
||||
ExReleaseResourceLite(&KeyObject->RegistryHive->HiveResource);
|
||||
ObDereferenceObject(KeyObject);
|
||||
|
|
@ -225,14 +226,14 @@ NtDeleteKey(IN HANDLE KeyHandle)
|
|||
/* Release hive lock */
|
||||
ExReleaseResourceLite(&KeyObject->RegistryHive->HiveResource);
|
||||
|
||||
DPRINT1("PointerCount %lu\n", ObGetObjectPointerCount((PVOID)KeyObject));
|
||||
DPRINT("PointerCount %lu\n", ObGetObjectPointerCount((PVOID)KeyObject));
|
||||
|
||||
/* Dereference the object */
|
||||
ObDereferenceObject(KeyObject);
|
||||
if(KeyObject->RegistryHive != KeyObject->ParentKey->RegistryHive)
|
||||
ObDereferenceObject(KeyObject);
|
||||
|
||||
DPRINT1("PointerCount %lu\n", ObGetObjectPointerCount((PVOID)KeyObject));
|
||||
DPRINT("PointerCount %lu\n", ObGetObjectPointerCount((PVOID)KeyObject));
|
||||
|
||||
/*
|
||||
* Note:
|
||||
|
|
@ -332,7 +333,21 @@ NtEnumerateKey(
|
|||
}
|
||||
else
|
||||
{
|
||||
if (KeyCell->HashTableOffset == (BLOCK_OFFSET)-1)
|
||||
{
|
||||
return(STATUS_NO_MORE_ENTRIES);
|
||||
ExReleaseResourceLite(&KeyObject->RegistryHive->HiveResource);
|
||||
ObDereferenceObject(KeyObject);
|
||||
}
|
||||
|
||||
HashTableBlock = CmiGetBlock(RegistryHive, KeyCell->HashTableOffset, NULL);
|
||||
if (HashTableBlock == NULL)
|
||||
{
|
||||
DPRINT("CmiGetBlock() failed\n");
|
||||
ExReleaseResourceLite(&KeyObject->RegistryHive->HiveResource);
|
||||
ObDereferenceObject(KeyObject);
|
||||
return STATUS_UNSUCCESSFUL;
|
||||
}
|
||||
SubKeyCell = CmiGetKeyFromHashByIndex(RegistryHive,
|
||||
HashTableBlock,
|
||||
Index);
|
||||
|
|
@ -1196,7 +1211,7 @@ NtSetValueKey(IN HANDLE KeyHandle,
|
|||
&VBOffset);
|
||||
if (!NT_SUCCESS(Status))
|
||||
{
|
||||
DPRINT1("Value not found. Status 0x%X\n", Status);
|
||||
DPRINT("Value not found. Status 0x%X\n", Status);
|
||||
|
||||
ExReleaseResourceLite(&KeyObject->RegistryHive->HiveResource);
|
||||
ObDereferenceObject(KeyObject);
|
||||
|
|
@ -1219,7 +1234,7 @@ NtSetValueKey(IN HANDLE KeyHandle,
|
|||
|
||||
if (!NT_SUCCESS(Status))
|
||||
{
|
||||
DPRINT1("Cannot add value. Status 0x%X\n", Status);
|
||||
DPRINT("Cannot add value. Status 0x%X\n", Status);
|
||||
|
||||
ExReleaseResourceLite(&KeyObject->RegistryHive->HiveResource);
|
||||
ObDereferenceObject(KeyObject);
|
||||
|
|
|
|||
|
|
@ -1172,7 +1172,6 @@ CmiStartLogUpdate(PREGISTRY_HIVE RegistryHive)
|
|||
PUCHAR Buffer;
|
||||
PUCHAR Ptr;
|
||||
ULONG BlockIndex;
|
||||
ULONG BlockOffset;
|
||||
PVOID BlockPtr;
|
||||
NTSTATUS Status;
|
||||
|
||||
|
|
@ -1264,7 +1263,8 @@ CmiStartLogUpdate(PREGISTRY_HIVE RegistryHive)
|
|||
BlockIndex = RtlFindSetBits(&RegistryHive->DirtyBitMap,
|
||||
1,
|
||||
BlockIndex);
|
||||
if (BlockIndex == (ULONG)-1)
|
||||
if ((BlockIndex == (ULONG)-1) ||
|
||||
(BlockIndex >= RegistryHive->BlockListSize))
|
||||
{
|
||||
DPRINT("No more set bits\n");
|
||||
Status = STATUS_SUCCESS;
|
||||
|
|
@ -1273,12 +1273,8 @@ CmiStartLogUpdate(PREGISTRY_HIVE RegistryHive)
|
|||
|
||||
DPRINT("Block %lu is dirty\n", BlockIndex);
|
||||
|
||||
BlockOffset = RegistryHive->BlockList[BlockIndex]->BlockOffset;
|
||||
DPRINT("Block offset %lx\n", BlockOffset);
|
||||
|
||||
BlockPtr = RegistryHive->BlockList[BlockIndex] + ((BlockIndex * 4096) - BlockOffset);
|
||||
BlockPtr = RegistryHive->BlockList[BlockIndex];
|
||||
DPRINT("BlockPtr %p\n", BlockPtr);
|
||||
|
||||
DPRINT("File offset %I64x\n", FileOffset.QuadPart);
|
||||
|
||||
/* Write hive block */
|
||||
|
|
@ -1293,7 +1289,7 @@ CmiStartLogUpdate(PREGISTRY_HIVE RegistryHive)
|
|||
NULL);
|
||||
if (!NT_SUCCESS(Status))
|
||||
{
|
||||
DPRINT("NtWriteFile() failed (Status %lx)\n", Status);
|
||||
DPRINT1("NtWriteFile() failed (Status %lx)\n", Status);
|
||||
NtClose(FileHandle);
|
||||
return(Status);
|
||||
}
|
||||
|
|
@ -1464,7 +1460,7 @@ CmiCleanupLogUpdate(PREGISTRY_HIVE RegistryHive)
|
|||
ULONG BitmapSize;
|
||||
NTSTATUS Status;
|
||||
|
||||
DPRINT("CmiFinishLogUpdate() called\n");
|
||||
DPRINT("CmiCleanupLogUpdate() called\n");
|
||||
|
||||
BitmapSize = ROUND_UP(RegistryHive->BlockListSize, sizeof(ULONG) * 8) / 8;
|
||||
BufferSize = sizeof(HIVE_HEADER) +
|
||||
|
|
@ -1547,7 +1543,6 @@ CmiStartHiveUpdate(PREGISTRY_HIVE RegistryHive)
|
|||
HANDLE FileHandle;
|
||||
LARGE_INTEGER FileOffset;
|
||||
ULONG BlockIndex;
|
||||
ULONG BlockOffset;
|
||||
PVOID BlockPtr;
|
||||
NTSTATUS Status;
|
||||
|
||||
|
|
@ -1605,7 +1600,8 @@ CmiStartHiveUpdate(PREGISTRY_HIVE RegistryHive)
|
|||
BlockIndex = RtlFindSetBits(&RegistryHive->DirtyBitMap,
|
||||
1,
|
||||
BlockIndex);
|
||||
if (BlockIndex == (ULONG)-1)
|
||||
if ((BlockIndex == (ULONG)-1) ||
|
||||
(BlockIndex >= RegistryHive->BlockListSize))
|
||||
{
|
||||
DPRINT("No more set bits\n");
|
||||
Status = STATUS_SUCCESS;
|
||||
|
|
@ -1614,16 +1610,12 @@ CmiStartHiveUpdate(PREGISTRY_HIVE RegistryHive)
|
|||
|
||||
DPRINT("Block %lu is dirty\n", BlockIndex);
|
||||
|
||||
BlockOffset = RegistryHive->BlockList[BlockIndex]->BlockOffset;
|
||||
DPRINT("Block offset %lx\n", BlockOffset);
|
||||
|
||||
BlockPtr = RegistryHive->BlockList[BlockIndex] + ((BlockIndex * 4096) - BlockOffset);
|
||||
BlockPtr = RegistryHive->BlockList[BlockIndex];
|
||||
DPRINT("BlockPtr %p\n", BlockPtr);
|
||||
|
||||
FileOffset.QuadPart = (ULONGLONG)(BlockIndex + 1) * 4096ULL;
|
||||
DPRINT("File offset %I64x\n", FileOffset.QuadPart);
|
||||
|
||||
|
||||
/* Write hive block */
|
||||
Status = NtWriteFile(FileHandle,
|
||||
NULL,
|
||||
|
|
@ -1815,6 +1807,7 @@ CmiGetMaxNameLength(PREGISTRY_HIVE RegistryHive,
|
|||
HashBlock = CmiGetBlock(RegistryHive, KeyCell->HashTableOffset, NULL);
|
||||
if (HashBlock == NULL)
|
||||
{
|
||||
DPRINT("CmiGetBlock() failed\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -1825,6 +1818,12 @@ CmiGetMaxNameLength(PREGISTRY_HIVE RegistryHive,
|
|||
CurSubKeyCell = CmiGetBlock(RegistryHive,
|
||||
HashBlock->Table[i].KeyOffset,
|
||||
NULL);
|
||||
if (CurSubKeyCell == NULL)
|
||||
{
|
||||
DPRINT("CmiGetBlock() failed\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (MaxName < CurSubKeyCell->NameSize)
|
||||
{
|
||||
MaxName = CurSubKeyCell->NameSize;
|
||||
|
|
@ -1851,6 +1850,7 @@ CmiGetMaxClassLength(PREGISTRY_HIVE RegistryHive,
|
|||
HashBlock = CmiGetBlock(RegistryHive, KeyCell->HashTableOffset, NULL);
|
||||
if (HashBlock == NULL)
|
||||
{
|
||||
DPRINT("CmiGetBlock() failed\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -1861,6 +1861,12 @@ CmiGetMaxClassLength(PREGISTRY_HIVE RegistryHive,
|
|||
CurSubKeyCell = CmiGetBlock(RegistryHive,
|
||||
HashBlock->Table[i].KeyOffset,
|
||||
NULL);
|
||||
if (CurSubKeyCell == NULL)
|
||||
{
|
||||
DPRINT("CmiGetBlock() failed\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (MaxClass < CurSubKeyCell->ClassSize)
|
||||
{
|
||||
MaxClass = CurSubKeyCell->ClassSize;
|
||||
|
|
@ -1883,12 +1889,13 @@ CmiGetMaxValueNameLength(PREGISTRY_HIVE RegistryHive,
|
|||
|
||||
VERIFY_KEY_CELL(KeyCell);
|
||||
|
||||
MaxValueName = 0;
|
||||
ValueListCell = CmiGetBlock(RegistryHive,
|
||||
KeyCell->ValuesOffset,
|
||||
NULL);
|
||||
MaxValueName = 0;
|
||||
if (ValueListCell == NULL)
|
||||
{
|
||||
DPRINT("CmiGetBlock() failed\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -1897,6 +1904,11 @@ CmiGetMaxValueNameLength(PREGISTRY_HIVE RegistryHive,
|
|||
CurValueCell = CmiGetBlock (RegistryHive,
|
||||
ValueListCell->Values[i],
|
||||
NULL);
|
||||
if (CurValueCell == NULL)
|
||||
{
|
||||
DPRINT("CmiGetBlock() failed\n");
|
||||
}
|
||||
|
||||
if (CurValueCell != NULL &&
|
||||
MaxValueName < CurValueCell->NameSize)
|
||||
{
|
||||
|
|
@ -1919,8 +1931,8 @@ CmiGetMaxValueDataLength(PREGISTRY_HIVE RegistryHive,
|
|||
|
||||
VERIFY_KEY_CELL(KeyCell);
|
||||
|
||||
ValueListCell = CmiGetBlock(RegistryHive, KeyCell->ValuesOffset, NULL);
|
||||
MaxValueData = 0;
|
||||
ValueListCell = CmiGetBlock(RegistryHive, KeyCell->ValuesOffset, NULL);
|
||||
if (ValueListCell == NULL)
|
||||
{
|
||||
return 0;
|
||||
|
|
@ -1952,7 +1964,7 @@ CmiScanForSubKey(IN PREGISTRY_HIVE RegistryHive,
|
|||
{
|
||||
PHASH_TABLE_CELL HashBlock;
|
||||
PKEY_CELL CurSubKeyCell;
|
||||
WORD KeyLength;
|
||||
USHORT KeyLength;
|
||||
ULONG i;
|
||||
|
||||
VERIFY_KEY_CELL(KeyCell);
|
||||
|
|
@ -1962,16 +1974,23 @@ CmiScanForSubKey(IN PREGISTRY_HIVE RegistryHive,
|
|||
assert(RegistryHive);
|
||||
|
||||
*SubKeyCell = NULL;
|
||||
KeyLength = strlen(KeyName);
|
||||
|
||||
HashBlock = CmiGetBlock(RegistryHive, KeyCell->HashTableOffset, NULL);
|
||||
if (HashBlock == NULL)
|
||||
/* The key does not have any subkeys */
|
||||
if (KeyCell->HashTableOffset == (BLOCK_OFFSET)-1)
|
||||
{
|
||||
return STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
for (i = 0; (i < KeyCell->NumberOfSubKeys)
|
||||
&& (i < HashBlock->HashTableSize); i++)
|
||||
/* Get hash table */
|
||||
HashBlock = CmiGetBlock(RegistryHive, KeyCell->HashTableOffset, NULL);
|
||||
if (HashBlock == NULL)
|
||||
{
|
||||
DPRINT("CmiGetBlock() failed\n");
|
||||
return STATUS_UNSUCCESSFUL;
|
||||
}
|
||||
|
||||
KeyLength = strlen(KeyName);
|
||||
for (i = 0; (i < KeyCell->NumberOfSubKeys) && (i < HashBlock->HashTableSize); i++)
|
||||
{
|
||||
if (Attributes & OBJ_CASE_INSENSITIVE)
|
||||
{
|
||||
|
|
@ -1982,6 +2001,12 @@ CmiScanForSubKey(IN PREGISTRY_HIVE RegistryHive,
|
|||
CurSubKeyCell = CmiGetBlock(RegistryHive,
|
||||
HashBlock->Table[i].KeyOffset,
|
||||
NULL);
|
||||
if (CurSubKeyCell == NULL)
|
||||
{
|
||||
DPRINT("CmiGetBlock() failed\n");
|
||||
return STATUS_UNSUCCESSFUL;
|
||||
}
|
||||
|
||||
if ((CurSubKeyCell->NameSize == KeyLength)
|
||||
&& (_strnicmp(KeyName, CurSubKeyCell->Name, KeyLength) == 0))
|
||||
{
|
||||
|
|
@ -1998,7 +2023,14 @@ CmiScanForSubKey(IN PREGISTRY_HIVE RegistryHive,
|
|||
!strncmp(KeyName, (PCHAR) &HashBlock->Table[i].HashValue, 4))
|
||||
{
|
||||
CurSubKeyCell = CmiGetBlock(RegistryHive,
|
||||
HashBlock->Table[i].KeyOffset,NULL);
|
||||
HashBlock->Table[i].KeyOffset,
|
||||
NULL);
|
||||
if (CurSubKeyCell == NULL)
|
||||
{
|
||||
DPRINT("CmiGetBlock() failed\n");
|
||||
return STATUS_UNSUCCESSFUL;
|
||||
}
|
||||
|
||||
if (CurSubKeyCell->NameSize == KeyLength
|
||||
&& !_strnicmp(KeyName, CurSubKeyCell->Name, KeyLength))
|
||||
{
|
||||
|
|
@ -2053,7 +2085,6 @@ CmiAddSubKey(PREGISTRY_HIVE RegistryHive,
|
|||
(PVOID) &NewKeyCell,
|
||||
NewBlockSize,
|
||||
&NKBOffset);
|
||||
|
||||
if (NewKeyCell == NULL)
|
||||
{
|
||||
Status = STATUS_INSUFFICIENT_RESOURCES;
|
||||
|
|
@ -2117,6 +2148,12 @@ CmiAddSubKey(PREGISTRY_HIVE RegistryHive,
|
|||
else
|
||||
{
|
||||
HashBlock = CmiGetBlock(RegistryHive, KeyCell->HashTableOffset, NULL);
|
||||
if (HashBlock == NULL)
|
||||
{
|
||||
DPRINT("CmiGetBlock() failed\n");
|
||||
return STATUS_UNSUCCESSFUL;
|
||||
}
|
||||
|
||||
if (((KeyCell->NumberOfSubKeys + 1) >= HashBlock->HashTableSize))
|
||||
{
|
||||
BLOCK_OFFSET HTOffset;
|
||||
|
|
@ -2178,6 +2215,12 @@ CmiRemoveSubKey(PREGISTRY_HIVE RegistryHive,
|
|||
ValueList = CmiGetBlock(RegistryHive,
|
||||
SubKey->KeyCell->ValuesOffset,
|
||||
NULL);
|
||||
if (ValueList == NULL)
|
||||
{
|
||||
DPRINT("CmiGetBlock() failed\n");
|
||||
return STATUS_UNSUCCESSFUL;
|
||||
}
|
||||
|
||||
if (ValueList != NULL)
|
||||
{
|
||||
/* Enumerate all values */
|
||||
|
|
@ -2194,6 +2237,12 @@ CmiRemoveSubKey(PREGISTRY_HIVE RegistryHive,
|
|||
DataCell = CmiGetBlock(RegistryHive,
|
||||
ValueCell->DataOffset,
|
||||
NULL);
|
||||
if (DataCell == NULL)
|
||||
{
|
||||
DPRINT("CmiGetBlock() failed\n");
|
||||
return STATUS_UNSUCCESSFUL;
|
||||
}
|
||||
|
||||
if (DataCell != NULL)
|
||||
{
|
||||
/* Destroy data cell */
|
||||
|
|
@ -2227,6 +2276,11 @@ CmiRemoveSubKey(PREGISTRY_HIVE RegistryHive,
|
|||
HashBlock = CmiGetBlock(RegistryHive,
|
||||
ParentKey->KeyCell->HashTableOffset,
|
||||
NULL);
|
||||
if (HashBlock == NULL)
|
||||
{
|
||||
DPRINT("CmiGetBlock() failed\n");
|
||||
return STATUS_UNSUCCESSFUL;
|
||||
}
|
||||
DPRINT("ParentKey HashBlock %p\n", HashBlock)
|
||||
if (HashBlock != NULL)
|
||||
{
|
||||
|
|
@ -2245,6 +2299,11 @@ CmiRemoveSubKey(PREGISTRY_HIVE RegistryHive,
|
|||
HashBlock = CmiGetBlock(RegistryHive,
|
||||
SubKey->KeyCell->HashTableOffset,
|
||||
NULL);
|
||||
if (HashBlock == NULL)
|
||||
{
|
||||
DPRINT("CmiGetBlock() failed\n");
|
||||
return STATUS_UNSUCCESSFUL;
|
||||
}
|
||||
DPRINT("SubKey HashBlock %p\n", HashBlock)
|
||||
if (HashBlock != NULL)
|
||||
{
|
||||
|
|
@ -2268,6 +2327,11 @@ CmiRemoveSubKey(PREGISTRY_HIVE RegistryHive,
|
|||
HashBlock = CmiGetBlock(RegistryHive,
|
||||
ParentKey->KeyCell->HashTableOffset,
|
||||
NULL);
|
||||
if (HashBlock == NULL)
|
||||
{
|
||||
DPRINT("CmiGetBlock() failed\n");
|
||||
return STATUS_UNSUCCESSFUL;
|
||||
}
|
||||
DPRINT("ParentKey HashBlock %p\n", HashBlock)
|
||||
if (HashBlock != NULL)
|
||||
{
|
||||
|
|
@ -2307,11 +2371,17 @@ CmiScanKeyForValue(IN PREGISTRY_HIVE RegistryHive,
|
|||
|
||||
*ValueCell = NULL;
|
||||
|
||||
/* The key does not have any values */
|
||||
if (KeyCell->ValuesOffset == (BLOCK_OFFSET)-1)
|
||||
{
|
||||
return STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
ValueListCell = CmiGetBlock(RegistryHive, KeyCell->ValuesOffset, NULL);
|
||||
if (ValueListCell == NULL)
|
||||
{
|
||||
DPRINT("ValueListCell is NULL\n");
|
||||
return STATUS_SUCCESS;
|
||||
return STATUS_UNSUCCESSFUL;
|
||||
}
|
||||
|
||||
VERIFY_VALUE_LIST_CELL(ValueListCell);
|
||||
|
|
@ -2321,6 +2391,11 @@ CmiScanKeyForValue(IN PREGISTRY_HIVE RegistryHive,
|
|||
CurValueCell = CmiGetBlock(RegistryHive,
|
||||
ValueListCell->Values[i],
|
||||
NULL);
|
||||
if (CurValueCell == NULL)
|
||||
{
|
||||
DPRINT("CmiGetBlock() failed\n");
|
||||
return STATUS_UNSUCCESSFUL;
|
||||
}
|
||||
|
||||
if ((CurValueCell != NULL) &&
|
||||
CmiComparePackedNames(ValueName,
|
||||
|
|
@ -2351,27 +2426,38 @@ CmiGetValueFromKeyByIndex(IN PREGISTRY_HIVE RegistryHive,
|
|||
|
||||
*ValueCell = NULL;
|
||||
|
||||
ValueListCell = CmiGetBlock(RegistryHive, KeyCell->ValuesOffset, NULL);
|
||||
if (ValueListCell == NULL)
|
||||
if (KeyCell->ValuesOffset == (BLOCK_OFFSET)-1)
|
||||
{
|
||||
return STATUS_NO_MORE_ENTRIES;
|
||||
}
|
||||
|
||||
VERIFY_VALUE_LIST_CELL(ValueListCell);
|
||||
|
||||
if (Index >= KeyCell->NumberOfValues)
|
||||
{
|
||||
return STATUS_NO_MORE_ENTRIES;
|
||||
}
|
||||
|
||||
|
||||
ValueListCell = CmiGetBlock(RegistryHive, KeyCell->ValuesOffset, NULL);
|
||||
if (ValueListCell == NULL)
|
||||
{
|
||||
DPRINT("CmiGetBlock() failed\n");
|
||||
return STATUS_UNSUCCESSFUL;
|
||||
}
|
||||
|
||||
VERIFY_VALUE_LIST_CELL(ValueListCell);
|
||||
|
||||
|
||||
CurValueCell = CmiGetBlock(RegistryHive,
|
||||
ValueListCell->Values[Index],
|
||||
NULL);
|
||||
if (CurValueCell != NULL)
|
||||
if (CurValueCell == NULL)
|
||||
{
|
||||
*ValueCell = CurValueCell;
|
||||
DPRINT("CmiGetBlock() failed\n");
|
||||
return STATUS_UNSUCCESSFUL;
|
||||
}
|
||||
|
||||
*ValueCell = CurValueCell;
|
||||
|
||||
return STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
|
|
@ -2401,6 +2487,8 @@ CmiAddValueToKey(IN PREGISTRY_HIVE RegistryHive,
|
|||
return Status;
|
||||
}
|
||||
|
||||
DPRINT("KeyCell->ValuesOffset %lu\n", (ULONG)KeyCell->ValuesOffset);
|
||||
|
||||
ValueListCell = CmiGetBlock(RegistryHive, KeyCell->ValuesOffset, NULL);
|
||||
|
||||
if (ValueListCell == NULL)
|
||||
|
|
@ -2468,6 +2556,7 @@ CmiDeleteValueFromKey(IN PREGISTRY_HIVE RegistryHive,
|
|||
|
||||
if (ValueListCell == NULL)
|
||||
{
|
||||
DPRINT("CmiGetBlock() failed\n");
|
||||
return STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
|
|
@ -2476,6 +2565,11 @@ CmiDeleteValueFromKey(IN PREGISTRY_HIVE RegistryHive,
|
|||
for (i = 0; i < KeyCell->NumberOfValues; i++)
|
||||
{
|
||||
CurValueCell = CmiGetBlock(RegistryHive, ValueListCell->Values[i], NULL);
|
||||
if (CurValueCell == NULL)
|
||||
{
|
||||
DPRINT("CmiGetBlock() failed\n");
|
||||
return STATUS_UNSUCCESSFUL;
|
||||
}
|
||||
|
||||
if ((CurValueCell != NULL) &&
|
||||
CmiComparePackedNames(ValueName,
|
||||
|
|
@ -2695,6 +2789,12 @@ CmiDestroyValueCell(PREGISTRY_HIVE RegistryHive,
|
|||
if (ValueCell->DataSize > 4)
|
||||
{
|
||||
pBlock = CmiGetBlock(RegistryHive, ValueCell->DataOffset, &pBin);
|
||||
if (pBlock == NULL)
|
||||
{
|
||||
DPRINT("CmiGetBlock() failed\n");
|
||||
return STATUS_UNSUCCESSFUL;
|
||||
}
|
||||
|
||||
Status = CmiDestroyBlock(RegistryHive, pBlock, ValueCell->DataOffset);
|
||||
if (!NT_SUCCESS(Status))
|
||||
{
|
||||
|
|
@ -2753,14 +2853,15 @@ CmiAddBin(PREGISTRY_HIVE RegistryHive,
|
|||
|
||||
if (RegistryHive->BlockListSize > 0)
|
||||
{
|
||||
memcpy(tmpBlockList,
|
||||
RtlCopyMemory (tmpBlockList,
|
||||
RegistryHive->BlockList,
|
||||
sizeof(PHBIN *)*(RegistryHive->BlockListSize));
|
||||
ExFreePool(RegistryHive->BlockList);
|
||||
}
|
||||
|
||||
RegistryHive->BlockList = tmpBlockList;
|
||||
RegistryHive->BlockList[RegistryHive->BlockListSize++] = tmpBin;
|
||||
RegistryHive->BlockList[RegistryHive->BlockListSize] = tmpBin;
|
||||
RegistryHive->BlockListSize++;
|
||||
|
||||
/* Initialize a free block in this heap : */
|
||||
tmpBlock = (PCELL_HEADER)((ULONG_PTR) tmpBin + REG_HBIN_DATA_OFFSET);
|
||||
|
|
@ -2773,12 +2874,12 @@ CmiAddBin(PREGISTRY_HIVE RegistryHive,
|
|||
PULONG BitmapBuffer;
|
||||
ULONG BitmapSize;
|
||||
|
||||
DPRINT1("Grow hive bitmap\n");
|
||||
DPRINT("Grow hive bitmap\n");
|
||||
|
||||
/* Calculate bitmap size in bytes (always a multiple of 32 bits) */
|
||||
BitmapSize = ROUND_UP(RegistryHive->BlockListSize, sizeof(ULONG) * 8) / 8;
|
||||
DPRINT1("RegistryHive->BlockListSize: %lu\n", RegistryHive->BlockListSize);
|
||||
DPRINT1("BitmapSize: %lu Bytes %lu Bits\n", BitmapSize, BitmapSize * 8);
|
||||
DPRINT("RegistryHive->BlockListSize: %lu\n", RegistryHive->BlockListSize);
|
||||
DPRINT("BitmapSize: %lu Bytes %lu Bits\n", BitmapSize, BitmapSize * 8);
|
||||
BitmapBuffer = (PULONG)ExAllocatePool(PagedPool,
|
||||
BitmapSize);
|
||||
RtlZeroMemory(BitmapBuffer, BitmapSize);
|
||||
|
|
@ -2814,6 +2915,8 @@ CmiAllocateBlock(PREGISTRY_HIVE RegistryHive,
|
|||
PCELL_HEADER NewBlock;
|
||||
NTSTATUS Status;
|
||||
PHBIN pBin;
|
||||
ULONG i;
|
||||
PVOID Temp;
|
||||
|
||||
Status = STATUS_SUCCESS;
|
||||
|
||||
|
|
@ -2840,22 +2943,23 @@ CmiAllocateBlock(PREGISTRY_HIVE RegistryHive,
|
|||
}
|
||||
else
|
||||
{
|
||||
ULONG i;
|
||||
|
||||
/* first search in free blocks */
|
||||
NewBlock = NULL;
|
||||
for (i = 0; i < RegistryHive->FreeListSize; i++)
|
||||
{
|
||||
if (RegistryHive->FreeList[i]->CellSize >= BlockSize)
|
||||
{
|
||||
PVOID Temp;
|
||||
|
||||
NewBlock = RegistryHive->FreeList[i];
|
||||
if (pBlockOffset)
|
||||
*pBlockOffset = RegistryHive->FreeListOffset[i];
|
||||
|
||||
/* Update time of heap */
|
||||
Temp = CmiGetBlock(RegistryHive, RegistryHive->FreeListOffset[i], &pBin);
|
||||
if (Temp == NULL)
|
||||
{
|
||||
DPRINT("CmiGetBlock() failed\n");
|
||||
return STATUS_UNSUCCESSFUL;
|
||||
}
|
||||
|
||||
if (Temp)
|
||||
{
|
||||
|
|
@ -3006,6 +3110,10 @@ CmiMergeFree(PREGISTRY_HIVE RegistryHive,
|
|||
|
||||
if ((i + 2) < RegistryHive->FreeListSize)
|
||||
{
|
||||
RtlMoveMemory(&RegistryHive->FreeList[i + 1],
|
||||
&RegistryHive->FreeList[i + 2],
|
||||
sizeof(RegistryHive->FreeList[0])
|
||||
* (RegistryHive->FreeListSize - i - 2));
|
||||
RtlMoveMemory(&RegistryHive->FreeListOffset[i + 1],
|
||||
&RegistryHive->FreeListOffset[i + 2],
|
||||
sizeof(RegistryHive->FreeListOffset[0])
|
||||
|
|
@ -3161,11 +3269,15 @@ CmiGetBlock(PREGISTRY_HIVE RegistryHive,
|
|||
BLOCK_OFFSET BlockOffset,
|
||||
PHBIN * ppBin)
|
||||
{
|
||||
PHBIN pBin;
|
||||
|
||||
if (ppBin)
|
||||
*ppBin = NULL;
|
||||
|
||||
if ((BlockOffset == 0) || (BlockOffset == (ULONG_PTR) -1))
|
||||
if (BlockOffset == (BLOCK_OFFSET)-1)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (IsPointerHive (RegistryHive))
|
||||
{
|
||||
|
|
@ -3173,8 +3285,12 @@ CmiGetBlock(PREGISTRY_HIVE RegistryHive,
|
|||
}
|
||||
else
|
||||
{
|
||||
PHBIN pBin;
|
||||
|
||||
if (BlockOffset > RegistryHive->BlockListSize * 4096)
|
||||
{
|
||||
DPRINT1("BlockOffset exceeds valid range (%lu > %lu)\n",
|
||||
BlockOffset, RegistryHive->BlockListSize * 4096);
|
||||
return NULL;
|
||||
}
|
||||
pBin = RegistryHive->BlockList[BlockOffset / 4096];
|
||||
if (ppBin)
|
||||
*ppBin = pBin;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: registry.c,v 1.93 2003/04/17 11:07:21 ekohl Exp $
|
||||
/* $Id: registry.c,v 1.94 2003/04/22 21:14:04 ekohl Exp $
|
||||
*
|
||||
* COPYRIGHT: See COPYING in the top level directory
|
||||
* PROJECT: ReactOS kernel
|
||||
|
|
@ -978,7 +978,7 @@ CmiHiveSyncRoutine(PVOID DeferredContext)
|
|||
PREGISTRY_HIVE Hive;
|
||||
PLIST_ENTRY Entry;
|
||||
|
||||
DPRINT1("CmiHiveSyncRoutine() called\n");
|
||||
DPRINT("CmiHiveSyncRoutine() called\n");
|
||||
|
||||
CmiHiveSyncPending = FALSE;
|
||||
|
||||
|
|
@ -1012,7 +1012,7 @@ CmiHiveSyncRoutine(PVOID DeferredContext)
|
|||
DPRINT("DeferredContext %x\n", DeferredContext);
|
||||
ExFreePool(DeferredContext);
|
||||
|
||||
DPRINT1("CmiHiveSyncRoutine() done\n");
|
||||
DPRINT("CmiHiveSyncRoutine() done\n");
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -305,13 +305,13 @@ CmiAddKeyToList(PKEY_OBJECT ParentKey,
|
|||
if (ParentKey->SizeOfSubKeys <= ParentKey->NumberOfSubKeys)
|
||||
{
|
||||
PKEY_OBJECT *tmpSubKeys = ExAllocatePool(NonPagedPool,
|
||||
(ParentKey->NumberOfSubKeys + 1) * sizeof(DWORD));
|
||||
(ParentKey->NumberOfSubKeys + 1) * sizeof(ULONG));
|
||||
|
||||
if (ParentKey->NumberOfSubKeys > 0)
|
||||
{
|
||||
memcpy(tmpSubKeys,
|
||||
RtlCopyMemory (tmpSubKeys,
|
||||
ParentKey->SubKeys,
|
||||
ParentKey->NumberOfSubKeys * sizeof(DWORD));
|
||||
ParentKey->NumberOfSubKeys * sizeof(ULONG));
|
||||
}
|
||||
|
||||
if (ParentKey->SubKeys)
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
/* $Id: binhive.c,v 1.2 2003/04/16 15:06:33 ekohl Exp $
|
||||
/* $Id: binhive.c,v 1.3 2003/04/22 21:14:39 ekohl Exp $
|
||||
* COPYRIGHT: See COPYING in the top level directory
|
||||
* PROJECT: ReactOS hive maker
|
||||
* FILE: tools/mkhive/binhive.c
|
||||
|
|
@ -454,14 +454,19 @@ CmiGetBlock(PREGISTRY_HIVE Hive,
|
|||
PHBIN * ppBin)
|
||||
{
|
||||
PHBIN pBin;
|
||||
ULONG BlockIndex;
|
||||
|
||||
if (ppBin)
|
||||
*ppBin = NULL;
|
||||
|
||||
if ((BlockOffset == 0) || (BlockOffset == (ULONG_PTR) -1))
|
||||
if (BlockOffset == (ULONG_PTR) -1)
|
||||
return NULL;
|
||||
|
||||
pBin = Hive->BlockList[BlockOffset / 4096];
|
||||
BlockIndex = BlockOffset / 4096;
|
||||
if (BlockIndex >= Hive->BlockListSize)
|
||||
return NULL;
|
||||
|
||||
pBin = Hive->BlockList[BlockIndex];
|
||||
if (ppBin)
|
||||
*ppBin = pBin;
|
||||
|
||||
|
|
@ -520,6 +525,10 @@ CmiMergeFree(PREGISTRY_HIVE RegistryHive,
|
|||
|
||||
if ((i + 2) < RegistryHive->FreeListSize)
|
||||
{
|
||||
memmove (&RegistryHive->FreeList[i + 1],
|
||||
&RegistryHive->FreeList[i + 2],
|
||||
sizeof(RegistryHive->FreeList[0])
|
||||
* (RegistryHive->FreeListSize - i - 2));
|
||||
memmove (&RegistryHive->FreeListOffset[i + 1],
|
||||
&RegistryHive->FreeListOffset[i + 2],
|
||||
sizeof(RegistryHive->FreeListOffset[0])
|
||||
|
|
|
|||
Loading…
Reference in a new issue