Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 26712: - Get rid of CmiCopyKey since it was dead code. Make CmiScanKeyForValue and CmiScanForSubKey simple wrappers around the newer CmpFindSubKeyByName and CmpFindValueByName routines. - Allow cmlib to support HINIT_FILE flag for HvInitializeHive. This means the kernel doesn't need to create a section for the hive, then call HvInitializeHive with HINIT_MEMORY anymore, and can simply send the file handle. I wrote a sneaky little hack in cmlib which actually ends up doing the same idea, alb
by ion＠svn.reactos.org 12 May '07

12 May '07

Author: ion Date: Sat May 12 07:28:04 2007 New Revision: 26712 URL: http://svn.reactos.org/svn/reactos?rev=26712&view=rev Log: - Get rid of CmiCopyKey since it was dead code. Make CmiScanKeyForValue and CmiScanForSubKey simple wrappers around the newer CmpFindSubKeyByName and CmpFindValueByName routines. - Allow cmlib to support HINIT_FILE flag for HvInitializeHive. This means the kernel doesn't need to create a section for the hive, then call HvInitializeHive with HINIT_MEMORY anymore, and can simply send the file handle. I wrote a sneaky little hack in cmlib which actually ends up doing the same idea, albeit not by using a section, making it portable. - Fix a serious bug in CmpFindSubKeyInLeaf affected by our lack of alphabetically-sorted cells; the linear search I hacked was slightly broken. - Remove the need to hold a LogFileName in the hive structure, since we generate it dynamically now. Modified: trunk/reactos/lib/cmlib/hiveinit.c trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/regfile.c trunk/reactos/ntoskrnl/config/cmindex.c trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/lib/cmlib/hiveinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=2… ============================================================================== --- trunk/reactos/lib/cmlib/hiveinit.c (original) +++ trunk/reactos/lib/cmlib/hiveinit.c Sat May 12 07:28:04 2007 @@ -269,6 +269,130 @@ Hive->Flat = TRUE; return STATUS_SUCCESS; +} + +typedef enum _RESULT +{ + NotHive, + Fail, + NoMemory, + HiveSuccess, + RecoverHeader, + RecoverData, + SelfHeal +} RESULT; + +RESULT CMAPI +HvpGetHiveHeader(IN PHHIVE Hive, + IN PHBASE_BLOCK *BaseBlock, + IN PLARGE_INTEGER TimeStamp) +{ + PHBASE_BLOCK HiveHeader; + ULONG Alignment; + ULONG Result; + ULONGLONG Offset = 0; + ASSERT(sizeof(HBASE_BLOCK) >= (HV_BLOCK_SIZE * Hive->Cluster)); + + /* Assume failure and allocate the buffer */ + *BaseBlock = 0; + HiveHeader = Hive->Allocate(sizeof(HBASE_BLOCK), TRUE); + if (!HiveHeader) return NoMemory; + + /* Check for, and enforce, alignment */ + Alignment = Hive->Cluster * HV_BLOCK_SIZE -1; + if ((ULONG_PTR)HiveHeader & Alignment) + { + /* Free the old header */ + Hive->Free(HiveHeader); + HiveHeader = Hive->Allocate(PAGE_SIZE, TRUE); + if (!HiveHeader) return NoMemory; + + //HiveHeader->Length = PAGE_SIZE; ?? + } + + /* Clear it */ + RtlZeroMemory(HiveHeader, sizeof(HBASE_BLOCK)); + + /* Now read it from disk */ + Result = Hive->FileRead(Hive, + HV_TYPE_PRIMARY, + Offset, + HiveHeader, + Hive->Cluster * HV_BLOCK_SIZE); + + /* Couldn't read: assume it's not a hive */ + if (!Result) return NotHive; + + /* Do validation */ + if (!HvpVerifyHiveHeader(HiveHeader)) return NotHive; + + /* Return information */ + *BaseBlock = HiveHeader; + *TimeStamp = HiveHeader->TimeStamp; + return HiveSuccess; +} + +NTSTATUS CMAPI +HvLoadHive(IN PHHIVE Hive, + IN ULONG FileSize) +{ + PHBASE_BLOCK BaseBlock = NULL; + ULONG Result; + LARGE_INTEGER TimeStamp; + ULONGLONG Offset = 0; + PVOID HiveData; + + /* Get the hive header */ + Result = HvpGetHiveHeader(Hive, &BaseBlock, &TimeStamp); + switch (Result) + { + /* Out of memory */ + case NoMemory: + + /* Fail */ + return STATUS_INSUFFICIENT_RESOURCES; + + /* Not a hive */ + case NotHive: + + /* Fail */ + return STATUS_NOT_REGISTRY_FILE; + + /* Has recovery data */ + case RecoverData: + case RecoverHeader: + + /* Fail */ + return STATUS_REGISTRY_CORRUPT; + } + + /* Set default boot type */ + BaseBlock->BootType = 0; + + /* Setup hive data */ + Hive->HiveHeader = BaseBlock; + Hive->Version = Hive->HiveHeader->Minor; + + /* Allocate a buffer large enough to hold the hive */ + HiveData = Hive->Allocate(FileSize, TRUE); + if (!HiveData) return STATUS_INSUFFICIENT_RESOURCES; + + /* Now read the whole hive */ + Result = Hive->FileRead(Hive, + HV_TYPE_PRIMARY, + Offset, + HiveData, + FileSize); + if (!Result) return STATUS_NOT_REGISTRY_FILE; + + /* Apply "US National Debt" hack */ + ((PHBASE_BLOCK)HiveData)->Length = FileSize; + + /* Free our base block... it's usless in this implementation */ + Hive->Free(BaseBlock); + + /* Initialize the hive directly from memory */ + return HvpInitializeMemoryHive(Hive, (ULONG_PTR)HiveData); } /** @@ -334,6 +458,7 @@ Hive->FileSetSize = FileSetSize; Hive->FileFlush = FileFlush; Hive->StorageTypeCount = 2; + Hive->Cluster = 1; switch (Operation) { @@ -347,6 +472,21 @@ case HV_OPERATION_MEMORY_INPLACE: Status = HvpInitializeMemoryInplaceHive(Hive, HiveData); + break; + + case 2: + + /* Hack of doom: Cluster is actually the file size. */ + Status = HvLoadHive(Hive, Cluster); + if ((Status != STATUS_SUCCESS) && + (Status != STATUS_REGISTRY_RECOVERED)) + { + /* Unrecoverable failure */ + return Status; + } + + /* Check for previous damage */ + if (Status == STATUS_REGISTRY_RECOVERED) ASSERT(FALSE); break; default: Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=26712… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Sat May 12 07:28:04 2007 @@ -332,6 +332,22 @@ IN USHORT NameBufferSize, IN BOOLEAN NamePacked); +HCELL_INDEX +NTAPI +CmpFindValueByName( + IN PHHIVE Hive, + IN PCM_KEY_NODE KeyNode, + IN PUNICODE_STRING Name +); + +HCELL_INDEX +NTAPI +CmpFindSubKeyByName( + IN PHHIVE Hive, + IN PCM_KEY_NODE Parent, + IN PUNICODE_STRING SearchName +); + VOID CmiCopyPackedName(PWCHAR NameBuffer, PUCHAR PackedNameBuffer, @@ -360,12 +376,6 @@ NTSTATUS CmiCreateTempHive(PEREGISTRY_HIVE *RegistryHive); - -NTSTATUS -CmiCopyKey (PEREGISTRY_HIVE DstHive, - PCM_KEY_NODE DstKeyCell, - PEREGISTRY_HIVE SrcHive, - PCM_KEY_NODE SrcKeyCell); NTSTATUS CmiSaveTempHive (PEREGISTRY_HIVE Hive, Modified: trunk/reactos/ntoskrnl/cm/regfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regfile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regfile.c (original) +++ trunk/reactos/ntoskrnl/cm/regfile.c Sat May 12 07:28:04 2007 @@ -64,10 +64,8 @@ ULONG CreateDisposition; IO_STATUS_BLOCK IoSB; HANDLE FileHandle; - PVOID SectionObject; - PUCHAR ViewBase; - ULONG ViewSize; NTSTATUS Status; + FILE_STANDARD_INFORMATION FileInformation; DPRINT("CmiInitNonVolatileRegistryHive(%p, %S) called\n", RegistryHive, Filename); @@ -80,23 +78,6 @@ DPRINT("RtlCreateUnicodeString() failed (Status %lx)\n", Status); return(Status); } - - /* Create log file name */ - RegistryHive->LogFileName.Length = (wcslen(Filename) + 4) * sizeof(WCHAR); - RegistryHive->LogFileName.MaximumLength = RegistryHive->LogFileName.Length + sizeof(WCHAR); - RegistryHive->LogFileName.Buffer = ExAllocatePoolWithTag(PagedPool, - RegistryHive->LogFileName.MaximumLength, - TAG('U', 'S', 'T', 'R')); - if (RegistryHive->LogFileName.Buffer == NULL) - { - RtlFreeUnicodeString(&RegistryHive->HiveFileName); - DPRINT("ExAllocatePool() failed\n"); - return(STATUS_INSUFFICIENT_RESOURCES); - } - wcscpy(RegistryHive->LogFileName.Buffer, - Filename); - wcscat(RegistryHive->LogFileName.Buffer, - L".log"); InitializeObjectAttributes(&ObjectAttributes, &RegistryHive->HiveFileName, @@ -119,7 +100,6 @@ if (!NT_SUCCESS(Status)) { RtlFreeUnicodeString(&RegistryHive->HiveFileName); - RtlFreeUnicodeString(&RegistryHive->LogFileName); DPRINT("ZwCreateFile() failed (Status %lx)\n", Status); return(Status); } @@ -132,76 +112,32 @@ DPRINT("CmiCreateNewRegFile() failed (Status %lx)\n", Status); ZwClose(FileHandle); RtlFreeUnicodeString(&RegistryHive->HiveFileName); - RtlFreeUnicodeString(&RegistryHive->LogFileName); return(Status); } } - /* Create the hive section */ - Status = MmCreateSection(&SectionObject, - SECTION_ALL_ACCESS, - NULL, - NULL, - PAGE_READWRITE, - SEC_COMMIT, - FileHandle, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("MmCreateSection() failed (Status %lx)\n", Status); - RtlFreeUnicodeString(&RegistryHive->HiveFileName); - RtlFreeUnicodeString(&RegistryHive->LogFileName); - return(Status); - } - - /* Map the hive file */ - ViewBase = NULL; - ViewSize = 0; - Status = MmMapViewOfSection(SectionObject, - PsGetCurrentProcess(), - (PVOID*)&ViewBase, - 0, - ViewSize, - NULL, - &ViewSize, - 0, - MEM_COMMIT, - PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("MmMapViewOfSection() failed (Status %lx)\n", Status); - ObDereferenceObject(SectionObject); - RtlFreeUnicodeString(&RegistryHive->HiveFileName); - RtlFreeUnicodeString(&RegistryHive->LogFileName); - ZwClose(FileHandle); - return(Status); - } - DPRINT("ViewBase %p ViewSize %lx\n", ViewBase, ViewSize); - - ((PHBASE_BLOCK)ViewBase)->Length = ViewSize; - Status = HvInitialize(&RegistryHive->Hive, HV_OPERATION_MEMORY, 0, 0, - (ULONG_PTR)ViewBase, 0, + RegistryHive->HiveHandle = FileHandle; + + /* Check how large the file is */ + ZwQueryInformationFile(FileHandle, + &IoSB, + &FileInformation, + sizeof(FileInformation), + FileStandardInformation); + Status = HvInitialize(&RegistryHive->Hive, HINIT_FILE, 0, 0, + 0, FileInformation.EndOfFile.LowPart, CmpAllocate, CmpFree, CmpFileRead, CmpFileWrite, CmpFileSetSize, CmpFileFlush, NULL); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to open hive\n"); - MmUnmapViewOfSection(PsGetCurrentProcess(), - ViewBase); - ObDereferenceObject(SectionObject); RtlFreeUnicodeString(&RegistryHive->HiveFileName); - RtlFreeUnicodeString(&RegistryHive->LogFileName); ZwClose(FileHandle); return Status; } CmPrepareHive(&RegistryHive->Hive); - - /* Unmap and dereference the hive section */ - MmUnmapViewOfSection(PsGetCurrentProcess(), - ViewBase); - ObDereferenceObject(SectionObject); /* Close the hive file */ ZwClose(FileHandle); @@ -275,7 +211,6 @@ /* Release file names */ RtlFreeUnicodeString (&RegistryHive->HiveFileName); - RtlFreeUnicodeString (&RegistryHive->LogFileName); /* Release hive */ HvFree (&RegistryHive->Hive); @@ -511,81 +446,52 @@ return MaxValueData; } +NTSTATUS +CmiScanKeyForValue(IN PEREGISTRY_HIVE RegistryHive, + IN PCM_KEY_NODE KeyCell, + IN PUNICODE_STRING ValueName, + OUT PCM_KEY_VALUE *ValueCell, + OUT HCELL_INDEX *ValueCellOffset) +{ + HCELL_INDEX CellIndex; + + /* Assume failure */ + *ValueCell = NULL; + if (ValueCellOffset) *ValueCellOffset = HCELL_NIL; + + /* Call newer Cm API */ + CellIndex = CmpFindValueByName(&RegistryHive->Hive, KeyCell, ValueName); + if (CellIndex == HCELL_NIL) return STATUS_OBJECT_NAME_NOT_FOUND; + + /* Otherwise, get the cell data back too */ + if (ValueCellOffset) *ValueCellOffset = CellIndex; + *ValueCell = HvGetCell(&RegistryHive->Hive, CellIndex); + return STATUS_SUCCESS; +} NTSTATUS CmiScanForSubKey(IN PEREGISTRY_HIVE RegistryHive, - IN PCM_KEY_NODE KeyCell, - OUT PCM_KEY_NODE *SubKeyCell, - OUT HCELL_INDEX *BlockOffset, - IN PUNICODE_STRING KeyName, - IN ACCESS_MASK DesiredAccess, - IN ULONG Attributes) -{ - PHASH_TABLE_CELL HashBlock; - PCM_KEY_NODE CurSubKeyCell; - ULONG Storage; - ULONG i; - - VERIFY_KEY_CELL(KeyCell); - - DPRINT("Scanning for sub key %wZ\n", KeyName); - - ASSERT(RegistryHive); - - *SubKeyCell = NULL; - - for (Storage = HvStable; Storage < HvMaxStorageType; Storage++) - { - /* The key does not have any subkeys */ - if (KeyCell->SubKeyLists[Storage] == HCELL_NULL) - { - continue; - } - - /* Get hash table */ - HashBlock = HvGetCell (&RegistryHive->Hive, KeyCell->SubKeyLists[Storage]); - ASSERT(HashBlock->Id == REG_HASH_TABLE_CELL_ID); - - for (i = 0; i < KeyCell->SubKeyCounts[Storage]; i++) - { - if (Attributes & OBJ_CASE_INSENSITIVE) - { - if ((HashBlock->Table[i].HashValue == 0 || - CmiCompareHashI(KeyName, (PCHAR)&HashBlock->Table[i].HashValue))) - { - CurSubKeyCell = HvGetCell (&RegistryHive->Hive, - HashBlock->Table[i].KeyOffset); - - if (CmiCompareKeyNamesI(KeyName, CurSubKeyCell)) - { - *SubKeyCell = CurSubKeyCell; - *BlockOffset = HashBlock->Table[i].KeyOffset; - return STATUS_SUCCESS; - } - } - } - else - { - if ((HashBlock->Table[i].HashValue == 0 || - CmiCompareHash(KeyName, (PCHAR)&HashBlock->Table[i].HashValue))) - { - CurSubKeyCell = HvGetCell (&RegistryHive->Hive, - HashBlock->Table[i].KeyOffset); - - if (CmiCompareKeyNames(KeyName, CurSubKeyCell)) - { - *SubKeyCell = CurSubKeyCell; - *BlockOffset = HashBlock->Table[i].KeyOffset; - return STATUS_SUCCESS; - } - } - } - } - } - - return STATUS_OBJECT_NAME_NOT_FOUND; -} - + IN PCM_KEY_NODE KeyCell, + OUT PCM_KEY_NODE *SubKeyCell, + OUT HCELL_INDEX *BlockOffset, + IN PUNICODE_STRING KeyName, + IN ACCESS_MASK DesiredAccess, + IN ULONG Attributes) +{ + HCELL_INDEX CellIndex; + + /* Assume failure */ + *SubKeyCell = NULL; + + /* Call newer Cm API */ + CellIndex = CmpFindSubKeyByName(&RegistryHive->Hive, KeyCell, KeyName); + if (CellIndex == HCELL_NIL) return STATUS_OBJECT_NAME_NOT_FOUND; + + /* Otherwise, get the cell data back too */ + *BlockOffset = CellIndex; + *SubKeyCell = HvGetCell(&RegistryHive->Hive, CellIndex); + return STATUS_SUCCESS; +} NTSTATUS CmiAddSubKey(PEREGISTRY_HIVE RegistryHive, @@ -884,54 +790,6 @@ return STATUS_SUCCESS; } - -NTSTATUS -CmiScanKeyForValue(IN PEREGISTRY_HIVE RegistryHive, - IN PCM_KEY_NODE KeyCell, - IN PUNICODE_STRING ValueName, - OUT PCM_KEY_VALUE *ValueCell, - OUT HCELL_INDEX *ValueCellOffset) -{ - PVALUE_LIST_CELL ValueListCell; - PCM_KEY_VALUE CurValueCell; - ULONG i; - - *ValueCell = NULL; - if (ValueCellOffset != NULL) - *ValueCellOffset = (HCELL_INDEX)-1; - - /* The key does not have any values */ - if (KeyCell->ValueList.List == (HCELL_INDEX)-1) - { - return STATUS_OBJECT_NAME_NOT_FOUND; - } - - ValueListCell = HvGetCell (&RegistryHive->Hive, KeyCell->ValueList.List); - - VERIFY_VALUE_LIST_CELL(ValueListCell); - - for (i = 0; i < KeyCell->ValueList.Count; i++) - { - CurValueCell = HvGetCell (&RegistryHive->Hive, - ValueListCell->ValueOffset[i]); - - if (CmiComparePackedNames(ValueName, - CurValueCell->Name, - CurValueCell->NameSize, - (BOOLEAN)((CurValueCell->Flags & REG_VALUE_NAME_PACKED) ? TRUE : FALSE))) - { - *ValueCell = CurValueCell; - if (ValueCellOffset != NULL) - *ValueCellOffset = ValueListCell->ValueOffset[i]; - //DPRINT("Found value %s\n", ValueName); - return STATUS_SUCCESS; - } - } - - return STATUS_OBJECT_NAME_NOT_FOUND; -} - - NTSTATUS CmiGetValueFromKeyByIndex(IN PEREGISTRY_HIVE RegistryHive, IN PCM_KEY_NODE KeyCell, @@ -1481,241 +1339,6 @@ NTSTATUS -CmiCopyKey (PEREGISTRY_HIVE DstHive, - PCM_KEY_NODE DstKeyCell, - PEREGISTRY_HIVE SrcHive, - PCM_KEY_NODE SrcKeyCell) -{ - PCM_KEY_NODE NewKeyCell; - ULONG NewKeyCellSize; - HCELL_INDEX NewKeyCellOffset; - PHASH_TABLE_CELL NewHashTableCell; - ULONG NewHashTableSize; - HCELL_INDEX NewHashTableOffset; - ULONG i; - NTSTATUS Status = STATUS_SUCCESS; - - DPRINT ("CmiCopyKey() called\n"); - - if (DstKeyCell == NULL) - { - /* Allocate and copy key cell */ - NewKeyCellSize = sizeof(CM_KEY_NODE) + SrcKeyCell->NameSize; - NewKeyCellOffset = HvAllocateCell (&DstHive->Hive, NewKeyCellSize, HvStable); - if (NewKeyCellOffset == HCELL_NULL) - { - DPRINT1 ("Failed to allocate a key cell\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - NewKeyCell = HvGetCell (&DstHive->Hive, NewKeyCellOffset); - RtlCopyMemory (NewKeyCell, - SrcKeyCell, - NewKeyCellSize); - - DstHive->Hive.HiveHeader->RootCell = NewKeyCellOffset; - - /* Copy class name */ - if (SrcKeyCell->ClassNameOffset != (HCELL_INDEX) -1) - { - PVOID SrcClassNameCell; - PVOID NewClassNameCell; - HCELL_INDEX NewClassNameOffset; - - SrcClassNameCell = HvGetCell (&SrcHive->Hive, SrcKeyCell->ClassNameOffset); - - NewKeyCell->ClassSize = SrcKeyCell->ClassSize; - NewClassNameOffset = HvAllocateCell (&DstHive->Hive, NewKeyCell->ClassSize, HvStable); - if (NewClassNameOffset == HCELL_NULL) - { - DPRINT1 ("CmiAllocateBlock() failed\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - NewClassNameCell = HvGetCell (&DstHive->Hive, NewClassNameOffset); - RtlCopyMemory (NewClassNameCell, - SrcClassNameCell, - NewKeyCell->ClassSize); - NewKeyCell->ClassNameOffset = NewClassNameOffset; - } - } - else - { - NewKeyCell = DstKeyCell; - } - - /* Allocate hash table */ - if (SrcKeyCell->SubKeyCounts[HvStable] > 0) - { - NewHashTableSize = ROUND_UP(SrcKeyCell->SubKeyCounts[HvStable] + 1, 4) - 1; - Status = CmiAllocateHashTableCell (DstHive, - &NewHashTableCell, - &NewHashTableOffset, - NewHashTableSize, - HvStable); - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("CmiAllocateHashTableBlock() failed (Status %lx)\n", Status); - return Status; - } - NewKeyCell->SubKeyLists[HvStable] = NewHashTableOffset; - } - else - { - NewHashTableCell = NULL; - } - - /* Allocate and copy value list and values */ - if (SrcKeyCell->ValueList.Count != 0) - { - PVALUE_LIST_CELL NewValueListCell; - PVALUE_LIST_CELL SrcValueListCell; - PCM_KEY_VALUE NewValueCell; - PCM_KEY_VALUE SrcValueCell; - PVOID SrcValueDataCell; - PVOID NewValueDataCell; - HCELL_INDEX ValueCellOffset; - HCELL_INDEX ValueDataCellOffset; - ULONG NewValueListCellSize; - ULONG NewValueCellSize; - - - NewValueListCellSize = - ROUND_UP(SrcKeyCell->ValueList.Count, 4) * sizeof(HCELL_INDEX); - NewKeyCell->ValueList.List = HvAllocateCell (&DstHive->Hive, - NewValueListCellSize, - HvStable); - if (NewKeyCell->ValueList.List == HCELL_NULL) - { - DPRINT1 ("HvAllocateCell() failed\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - DPRINT1("KeyCell->ValueList.List: %x\n", NewKeyCell->ValueList.List); - - NewValueListCell = HvGetCell (&DstHive->Hive, NewKeyCell->ValueList.List); - RtlZeroMemory (NewValueListCell, - NewValueListCellSize); - - /* Copy values */ - SrcValueListCell = HvGetCell (&SrcHive->Hive, SrcKeyCell->ValueList.List); - for (i = 0; i < SrcKeyCell->ValueList.Count; i++) - { - /* Copy value cell */ - SrcValueCell = HvGetCell (&SrcHive->Hive, SrcValueListCell->ValueOffset[i]); - - NewValueCellSize = sizeof(CM_KEY_VALUE) + SrcValueCell->NameSize; - ValueCellOffset = HvAllocateCell (&DstHive->Hive, NewValueCellSize, HvStable); - if (ValueCellOffset == HCELL_NULL) - { - DPRINT1 ("HvAllocateCell() failed (Status %lx)\n", Status); - return STATUS_INSUFFICIENT_RESOURCES; - } - - NewValueCell = HvGetCell (&DstHive->Hive, ValueCellOffset); - NewValueListCell->ValueOffset[i] = ValueCellOffset; - RtlCopyMemory (NewValueCell, - SrcValueCell, - NewValueCellSize); - - /* Copy value data cell */ - if (SrcValueCell->DataSize > (LONG) sizeof(PVOID)) - { - SrcValueDataCell = HvGetCell (&SrcHive->Hive, SrcValueCell->DataOffset); - - ValueDataCellOffset = HvAllocateCell (&DstHive->Hive, SrcValueCell->DataSize, HvStable); - if (ValueDataCellOffset == HCELL_NULL) - { - DPRINT1 ("HvAllocateCell() failed\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - NewValueDataCell = HvGetCell (&DstHive->Hive, ValueDataCellOffset); - RtlCopyMemory (NewValueDataCell, - SrcValueDataCell, - SrcValueCell->DataSize); - NewValueCell->DataOffset = ValueDataCellOffset; - } - } - } - - /* Copy subkeys */ - if (SrcKeyCell->SubKeyCounts[HvStable] > 0) - { - PHASH_TABLE_CELL SrcHashTableCell; - PCM_KEY_NODE SrcSubKeyCell; - PCM_KEY_NODE NewSubKeyCell; - ULONG NewSubKeyCellSize; - HCELL_INDEX NewSubKeyCellOffset; - PHASH_RECORD SrcHashRecord; - - SrcHashTableCell = HvGetCell (&SrcHive->Hive, SrcKeyCell->SubKeyLists[HvStable]); - - for (i = 0; i < SrcKeyCell->SubKeyCounts[HvStable]; i++) - { - SrcHashRecord = &SrcHashTableCell->Table[i]; - SrcSubKeyCell = HvGetCell (&SrcHive->Hive, SrcHashRecord->KeyOffset); - - /* Allocate and copy key cell */ - NewSubKeyCellSize = sizeof(CM_KEY_NODE) + SrcSubKeyCell->NameSize; - NewSubKeyCellOffset = HvAllocateCell (&DstHive->Hive, NewSubKeyCellSize, HvStable); - if (NewSubKeyCellOffset == HCELL_NULL) - { - DPRINT1 ("Failed to allocate a sub key cell\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - NewSubKeyCell = HvGetCell (&DstHive->Hive, NewSubKeyCellOffset); - NewHashTableCell->Table[i].KeyOffset = NewSubKeyCellOffset; - NewHashTableCell->Table[i].HashValue = SrcHashRecord->HashValue; - - RtlCopyMemory (NewSubKeyCell, - SrcSubKeyCell, - NewSubKeyCellSize); - - /* Copy class name */ - if (SrcSubKeyCell->ClassNameOffset != (HCELL_INDEX) -1) - { - PVOID SrcClassNameCell; - PVOID NewClassNameCell; - HCELL_INDEX NewClassNameOffset; - - SrcClassNameCell = HvGetCell (&SrcHive->Hive, - SrcSubKeyCell->ClassNameOffset); - - NewSubKeyCell->ClassSize = SrcSubKeyCell->ClassSize; - NewClassNameOffset = HvAllocateCell (&DstHive->Hive, - NewSubKeyCell->ClassSize, - HvStable); - if (NewClassNameOffset == HCELL_NULL) - { - DPRINT1 ("HvAllocateCell() failed (Status %lx)\n", Status); - return STATUS_INSUFFICIENT_RESOURCES; - } - - NewClassNameCell = HvGetCell (&DstHive->Hive, NewClassNameOffset); - NewSubKeyCell->ClassNameOffset = NewClassNameOffset; - RtlCopyMemory (NewClassNameCell, - SrcClassNameCell, - NewSubKeyCell->ClassSize); - } - - /* Copy subkey data and subkeys */ - Status = CmiCopyKey (DstHive, - NewSubKeyCell, - SrcHive, - SrcSubKeyCell); - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("CmiAllocateBlock() failed (Status %lx)\n", Status); - return Status; - } - } - } - - return STATUS_SUCCESS; -} - - -NTSTATUS CmiSaveTempHive (PEREGISTRY_HIVE Hive, HANDLE FileHandle) { Modified: trunk/reactos/ntoskrnl/config/cmindex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmindex.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmindex.c (original) +++ trunk/reactos/ntoskrnl/config/cmindex.c Sat May 12 07:28:04 2007 @@ -391,6 +391,7 @@ /* Check if we got lucky and found it */ if (!Result) return i; +#ifdef SOMEONE_WAS_NICE_ENOUGH_TO_MAKE_OUR_CELLS_LEXICALLY_SORTED /* Check if the result is below us */ if (Result < 0) { @@ -405,7 +406,6 @@ Low = i; } -#ifdef SOMEONE_WAS_NICE_ENOUGH_TO_MAKE_OUR_CELLS_LEXICALLY_SORTED /* Check if this is the last entry, if so, break out and handle it */ if ((High - Low) <= 1) break; Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Sat May 12 07:28:04 2007 @@ -364,9 +364,6 @@ /* Set the hive filename */ RtlCreateUnicodeString(&SystemHive->HiveFileName, SYSTEM_REG_FILE); - /* Set the log filename */ - RtlCreateUnicodeString(&SystemHive->LogFileName, SYSTEM_LOG_FILE); - /* We imported, no need to create a new hive */ Allocate = FALSE;

1 0

[ion] 26711: - Update Cm Rewrite branch status with work that was done on Trunk.
by ion＠svn.reactos.org 11 May '07

11 May '07

Author: ion Date: Sat May 12 03:47:02 2007 New Revision: 26711 URL: http://svn.reactos.org/svn/reactos?rev=26711&view=rev Log: - Update Cm Rewrite branch status with work that was done on Trunk. Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cminfo.txt Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cminfo.txt URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cminfo.txt (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cminfo.txt Sat May 12 03:47:02 2007 @@ -5,7 +5,7 @@ -= At a Glance =- Owner: Alex Ionescu (alex.ionescu(a)reactos.org) -ETC: 1st October 2006 +ETC: 1st October 2007 Purose: Rewriting the Configuration Manager nearly from scratch. -= Design Goals =- @@ -24,7 +24,7 @@ form and delayed close and private allocations, which allow re-using pool memory and delaying deletion for better paralel- lism. - + - Scalability and Thread Safety/MP: The NT Configuration Manager is also extremly scalable and has over 8 highly-scalable locks (based on the pushlock implementation, and also guarded mutex) which also @@ -33,14 +33,14 @@ nously on a hive, while still maintaining full thread safety, due to the fact that key structures are separated and have their own locks. - + - Reliability: The NT Configuration Manager offers a variety of complex algorithms which continously check the state of a loaded hive or a hive that is being loaded, as well as per-key node damage. Furthermore, upon detection of a damaged node, the Configuration Manager is often able to repair the Registry and bring it back to a usable state, through a process called self healing. - + - Object-Oriented: Like many other core structures in NT, the Configuration Manager exposes its interfaces to drivers and user-mode through the Key Object, which is an abstraction and interface that is @@ -52,7 +52,7 @@ access to the Key Object and allowing the optimization of look- ups and respect of complex semantics such as those of security or registry symbolic linking. - + -= Sources =- The reimplementation of the NT Configuration Manager benefits from an extensive @@ -72,7 +72,7 @@ As far as references go, Mark Russinovich has written one or two interesting papers on the topic, which also deal with some internals, as well as chapter 4, section 1, in the Windows Internals 4th Edition book, which explains some of -the internals behind KCBs, NCBs and Key OBjects. Chapter 9 of Windows Intenrals +the internals behind KCBs, NCBs and Key Objects. Chapter 9 of Windows Internals II also has some high-level information on the Registry. Finally, the KD Extension DLL that comes with WinDBG has an extensive array of @@ -96,11 +96,30 @@ ~90% of the KCB/NCB code is complete. ~70% of Initialization code is complete. +**As of 11/5/2007 + Significant parts of the rewrite have been merged in and bugfixed with + existing cm code into the main tree, in the /config directory. + ~100% of the Initialization code is now complete, including reading the + System Control Vector. + ~80% of the ARC Hardware Configuration Node/Tree code has been written. + It has been decided to stick with internal NT names since this simplifies + PDB and Internet lookups, even though some of these names aren't fully to my + taste. + TODOs: - Complete KCB implementation with CmpEnlistKeyWithKcb. - Re-write some parts of CmInitSystem1 to handle NTLDR-style Hardware Hive. - The idea is that, by the time this branch is ready, this will be compatible - with ROS. Otherwise, I'll work with Hervé, Filip and Aleksey to make it happen. + Write Driver-list APIs directly into main branch since they should be low- + level enough to bypass the Object Manager interface (just like the System + Vector code). + Fix Cm Wrapper routines to read/write in chunks of 64K to avoid issues when + working with a large set of data (this is what NT does as well). + Try to make more code in trunk to use CmpOpenHiveFiles instead of the code + being used now. + Modify FreeLDR to actually send an ARC Configuration Root Tree instead of + writing to the hardware hive itself. + Once the above is done, modify current hacks to handle proper hardware hive + creation and initialization. + Once the above is done, merge trunk back into the Cm Rewrite branch, and + resume work on rewrite when will/time is available. -= Structure =-

1 0

[ion] 26710: - Move CmInitSystem1 to cmsysini.c and merge in existing code from Cm rewrite branch. - Merge code into cmkcbncb.c related to KCB/Cache initialization (This is "Dead" code for now, since it's not used, just initailized.) - Rename CmiRegistryLock to CmpRegistryLock. - The new /config registry code is now totally isolated from the old /cm code, although some of the old structures are still used until the actual rewrite is fully merged/finished.
by ion＠svn.reactos.org 11 May '07

11 May '07

Author: ion Date: Sat May 12 03:35:19 2007 New Revision: 26710 URL: http://svn.reactos.org/svn/reactos?rev=26710&view=rev Log: - Move CmInitSystem1 to cmsysini.c and merge in existing code from Cm rewrite branch. - Merge code into cmkcbncb.c related to KCB/Cache initialization (This is "Dead" code for now, since it's not used, just initailized.) - Rename CmiRegistryLock to CmpRegistryLock. - The new /config registry code is now totally isolated from the old /cm code, although some of the old structures are still used until the actual rewrite is fully merged/finished. Modified: trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/cm/regobj.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmdata.c trunk/reactos/ntoskrnl/config/cmhook.c trunk/reactos/ntoskrnl/config/cmkcbncb.c trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=26710… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Sat May 12 03:35:19 2007 @@ -112,7 +112,7 @@ extern LIST_ENTRY CmpHiveListHead; -extern ERESOURCE CmiRegistryLock; +extern ERESOURCE CmpRegistryLock; extern EX_PUSH_LOCK CmpHiveListHeadLock; /* Registry Callback Function */ @@ -422,80 +422,6 @@ CmiCheckKey(BOOLEAN Verbose, HANDLE Key); -BOOLEAN -INIT_FUNCTION -CmImportSystemHive(PCHAR ChunkBase, - ULONG ChunkSize, - OUT PEREGISTRY_HIVE *RegistryHive); - -BOOLEAN -INIT_FUNCTION -CmImportHardwareHive(PCHAR ChunkBase, - ULONG ChunkSize, - OUT PEREGISTRY_HIVE *RegistryHive); - -NTSTATUS -NTAPI -CmpSetSystemValues(IN PLOADER_PARAMETER_BLOCK LoaderBlock); - -NTSTATUS -NTAPI -CmpCreateControlSet(IN PLOADER_PARAMETER_BLOCK LoaderBlock); - -NTSTATUS -NTAPI -CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBlock); - -NTSTATUS -NTAPI -CmpInitializeHive(PEREGISTRY_HIVE *RegistryHive, - ULONG OperationType, - ULONG HiveFlags, - ULONG FileType, - PVOID HiveData OPTIONAL, - HANDLE Primary, - HANDLE Log, - HANDLE External, - PUNICODE_STRING FileName OPTIONAL, - ULONG CheckFlags); - -USHORT -NTAPI -CmpCopyName(IN PHHIVE Hive, - IN PWCHAR Destination, - IN PUNICODE_STRING Source); - -USHORT -NTAPI -CmpNameSize(IN PHHIVE Hive, - IN PUNICODE_STRING Name); - -NTSTATUS -NTAPI -CmpInitializeHardwareConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBlock); - -PSECURITY_DESCRIPTOR -NTAPI -CmpHiveRootSecurityDescriptor(VOID); - -BOOLEAN -NTAPI -CmpInitializeSystemHive(IN PLOADER_PARAMETER_BLOCK LoaderBlock); - -NTSTATUS -NTAPI -CmpCreateObjectTypes(VOID); - -BOOLEAN -NTAPI -CmpCreateRootNode(IN PHHIVE Hive, - IN PCWSTR Name, - OUT PHCELL_INDEX Index); - -BOOLEAN -NTAPI -CmpCreateRegistryRoot(VOID); - NTSTATUS NTAPI CmpOpenHiveFiles(IN PUNICODE_STRING BaseName, Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Sat May 12 03:35:19 2007 @@ -345,7 +345,7 @@ /* Acquire hive lock */ KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); + ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); InsertTailList(&CmiKeyObjectListHead, &KeyObject->ListEntry); @@ -361,7 +361,7 @@ { DPRINT1("CmiAddSubKey() failed (Status %lx)\n", Status); /* Release hive lock */ - ExReleaseResourceLite(&CmiRegistryLock); + ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); ObDereferenceObject(KeyObject); @@ -393,7 +393,7 @@ VERIFY_KEY_OBJECT(KeyObject); /* Release hive lock */ - ExReleaseResourceLite(&CmiRegistryLock); + ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); PostCreateKeyInfo.Object = KeyObject; @@ -475,7 +475,7 @@ /* Acquire hive lock */ KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); + ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); VERIFY_KEY_OBJECT(KeyObject); @@ -493,7 +493,7 @@ } /* Release hive lock */ - ExReleaseResourceLite(&CmiRegistryLock); + ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); DPRINT("PointerCount %lu\n", ObGetObjectPointerCount((PVOID)KeyObject)); @@ -591,7 +591,7 @@ /* Acquire hive lock */ KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(&CmiRegistryLock, TRUE); + ExAcquireResourceSharedLite(&CmpRegistryLock, TRUE); VERIFY_KEY_OBJECT(KeyObject); @@ -603,7 +603,7 @@ if (Index >= KeyCell->SubKeyCounts[HvStable] + KeyCell->SubKeyCounts[HvVolatile]) { - ExReleaseResourceLite(&CmiRegistryLock); + ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); PostOperationInfo.Status = STATUS_NO_MORE_ENTRIES; CmiCallRegisteredCallbacks(RegNtPostEnumerateKey, &PostOperationInfo); @@ -626,7 +626,7 @@ if (KeyCell->SubKeyLists[Storage] == HCELL_NULL) { - ExReleaseResourceLite(&CmiRegistryLock); + ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); PostOperationInfo.Status = STATUS_NO_MORE_ENTRIES; CmiCallRegisteredCallbacks(RegNtPostEnumerateKey, &PostOperationInfo); @@ -815,7 +815,7 @@ break; } - ExReleaseResourceLite(&CmiRegistryLock); + ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); PostOperationInfo.Status = Status; @@ -892,7 +892,7 @@ /* Acquire hive lock */ KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(&CmiRegistryLock, TRUE); + ExAcquireResourceSharedLite(&CmpRegistryLock, TRUE); VERIFY_KEY_OBJECT(KeyObject); @@ -908,7 +908,7 @@ if (!NT_SUCCESS(Status)) { - ExReleaseResourceLite(&CmiRegistryLock); + ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); ObDereferenceObject(KeyObject); PostOperationInfo.Status = Status; @@ -1089,7 +1089,7 @@ Status = STATUS_UNSUCCESSFUL; } - ExReleaseResourceLite(&CmiRegistryLock); + ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); ObDereferenceObject(KeyObject); PostOperationInfo.Status = Status; @@ -1131,7 +1131,7 @@ /* Acquire hive lock */ KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); + ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); if (IsNoFileHive(RegistryHive)) { @@ -1143,7 +1143,7 @@ Status = CmiFlushRegistryHive(RegistryHive); } - ExReleaseResourceLite(&CmiRegistryLock); + ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); ObDereferenceObject(KeyObject); @@ -1367,7 +1367,7 @@ /* Acquire hive lock */ KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(&CmiRegistryLock, TRUE); + ExAcquireResourceSharedLite(&CmpRegistryLock, TRUE); VERIFY_KEY_OBJECT(KeyObject); @@ -1525,7 +1525,7 @@ break; } - ExReleaseResourceLite(&CmiRegistryLock); + ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); PostOperationInfo.Status = Status; @@ -1595,7 +1595,7 @@ /* Acquire hive lock */ KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(&CmiRegistryLock, TRUE); + ExAcquireResourceSharedLite(&CmpRegistryLock, TRUE); VERIFY_KEY_OBJECT(KeyObject); @@ -1789,7 +1789,7 @@ } ByeBye:; - ExReleaseResourceLite(&CmiRegistryLock); + ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); PostOperationInfo.Status = Status; @@ -1855,7 +1855,7 @@ /* Acquire hive lock exclucively */ KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); + ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); VERIFY_KEY_OBJECT(KeyObject); @@ -1882,7 +1882,7 @@ { DPRINT("Cannot add value. Status 0x%X\n", Status); - ExReleaseResourceLite(&CmiRegistryLock); + ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); PostOperationInfo.Status = Status; CmiCallRegisteredCallbacks(RegNtPostSetValueKey, &PostOperationInfo); @@ -1938,7 +1938,7 @@ { DPRINT("CmiAllocateBlock() failed (Status %lx)\n", Status); - ExReleaseResourceLite(&CmiRegistryLock); + ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); PostOperationInfo.Status = Status; CmiCallRegisteredCallbacks(RegNtPostSetValueKey, &PostOperationInfo); @@ -1973,7 +1973,7 @@ KeQuerySystemTime (&KeyCell->LastWriteTime); HvMarkCellDirty (&RegistryHive->Hive, KeyObject->KeyCellOffset); - ExReleaseResourceLite(&CmiRegistryLock); + ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); PostOperationInfo.Status = Status; CmiCallRegisteredCallbacks(RegNtPostSetValueKey, &PostOperationInfo); @@ -2040,7 +2040,7 @@ /* Acquire hive lock */ KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); + ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); VERIFY_KEY_OBJECT(KeyObject); @@ -2053,7 +2053,7 @@ HvMarkCellDirty (&KeyObject->RegistryHive->Hive, KeyObject->KeyCellOffset); /* Release hive lock */ - ExReleaseResourceLite(&CmiRegistryLock); + ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); ReleaseCapturedUnicodeString(&CapturedValueName, @@ -2173,7 +2173,7 @@ /* Acquire hive lock */ KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); + ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); Status = CmiLoadHive (KeyObjectAttributes, NamePointer, @@ -2184,7 +2184,7 @@ } /* Release hive lock */ - ExReleaseResourceLite(&CmiRegistryLock); + ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); if (Buffer != NULL) @@ -2247,7 +2247,7 @@ /* Acquire hive lock */ KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(&CmiRegistryLock, TRUE); + ExAcquireResourceSharedLite(&CmpRegistryLock, TRUE); VERIFY_KEY_OBJECT(KeyObject); @@ -2319,7 +2319,7 @@ *ReturnLength = BufferLength; /* Release hive lock */ - ExReleaseResourceLite(&CmiRegistryLock); + ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); PostOperationInfo.Status = Status; Modified: trunk/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/registry.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cm/registry.c (original) +++ trunk/reactos/ntoskrnl/cm/registry.c Sat May 12 03:35:19 2007 @@ -34,7 +34,7 @@ LIST_ENTRY CmpHiveListHead; -ERESOURCE CmiRegistryLock; +ERESOURCE CmpRegistryLock; KTIMER CmiWorkerTimer; LIST_ENTRY CmiKeyObjectListHead; @@ -81,7 +81,7 @@ /* Acquire hive lock */ KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); + ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); CmiTimer++; @@ -107,7 +107,7 @@ CurrentEntry = CurrentEntry->Blink; } } - ExReleaseResourceLite(&CmiRegistryLock); + ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); DPRINT("Removed %d key objects\n", Count); @@ -190,215 +190,6 @@ /* Connect the hive */ return CmiConnectHive(&ObjectAttributes, RegistryHive); -} - -BOOLEAN -INIT_FUNCTION -NTAPI -CmInitSystem1(VOID) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - HANDLE KeyHandle; - NTSTATUS Status; - LARGE_INTEGER DueTime; - HANDLE ThreadHandle; - CLIENT_ID ThreadId; - PEREGISTRY_HIVE HardwareHive; - PVOID BaseAddress; - ULONG Length; - PSECURITY_DESCRIPTOR SecurityDescriptor; - PAGED_CODE(); - - /* Initialize the hive list and lock */ - InitializeListHead(&CmpHiveListHead); - ExInitializePushLock((PVOID)&CmpHiveListHeadLock); - - /* Initialize registry lock */ - ExInitializeResourceLite(&CmiRegistryLock); - - /* Initialize the key object list */ - InitializeListHead(&CmiKeyObjectListHead); - InitializeListHead(&CmiConnectedHiveList); - - /* Initialize the worker timer */ - KeInitializeTimerEx(&CmiWorkerTimer, SynchronizationTimer); - - /* Initialize the worker thread */ - Status = PsCreateSystemThread(&ThreadHandle, - THREAD_ALL_ACCESS, - NULL, - NULL, - &ThreadId, - CmiWorkerThread, - NULL); - if (!NT_SUCCESS(Status)) return FALSE; - - /* Start the timer */ - DueTime.QuadPart = -1; - KeSetTimerEx(&CmiWorkerTimer, DueTime, 5000, NULL); /* 5sec */ - - InitializeListHead(&CmiCallbackHead); - ExInitializeFastMutex(&CmiCallbackLock); - - /* Create the key object types */ - Status = CmpCreateObjectTypes(); - if (!NT_SUCCESS(Status)) - { - /* Bugcheck */ - KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 1, Status, 0); - } - - /* Build the master hive */ - Status = CmpInitializeHive(&CmiVolatileHive, - HINIT_CREATE, - HIVE_VOLATILE | HIVE_NO_FILE, - HFILE_TYPE_PRIMARY, - NULL, - NULL, - NULL, - NULL, - NULL, - 0); - if (!NT_SUCCESS(Status)) - { - /* Bugcheck */ - KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 2, Status, 0); - } - - /* Create the \REGISTRY key node */ - if (!CmpCreateRegistryRoot()) - { - /* Bugcheck */ - KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 3, 0, 0); - } - - /* Create the default security descriptor */ - SecurityDescriptor = CmpHiveRootSecurityDescriptor(); - - /* Create '\Registry\Machine' key. */ - RtlInitUnicodeString(&KeyName, L"\\REGISTRY\\MACHINE"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - SecurityDescriptor); - Status = NtCreateKey(&KeyHandle, - KEY_READ | KEY_WRITE, - &ObjectAttributes, - 0, - NULL, - 0, - NULL); - if (!NT_SUCCESS(Status)) - { - /* Bugcheck */ - KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 5, Status, 0); - } - - /* Close the handle */ - NtClose(KeyHandle); - - /* Create '\Registry\User' key. */ - RtlInitUnicodeString(&KeyName, L"\\REGISTRY\\USER"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - SecurityDescriptor); - Status = NtCreateKey(&KeyHandle, - KEY_READ | KEY_WRITE, - &ObjectAttributes, - 0, - NULL, - 0, - NULL); - if (!NT_SUCCESS(Status)) - { - /* Bugcheck */ - KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 6, Status, 0); - } - - /* Close the handle */ - NtClose(KeyHandle); - - /* Initialize the system hive */ - if (!CmpInitializeSystemHive(KeLoaderBlock)) - { - /* Bugcheck */ - KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 7, 0, 0); - } - - /* Create the 'CurrentControlSet' link. */ - Status = CmpCreateControlSet(KeLoaderBlock); - if (!NT_SUCCESS(Status)) - { - /* Bugcheck */ - KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 8, Status, 0); - } - - /* Import the hardware hive (FIXME: We should create it from scratch) */ - BaseAddress = CmpRosGetHardwareHive(&Length); - ((PHBASE_BLOCK)BaseAddress)->Length = Length; - Status = CmpInitializeHive(&HardwareHive, - HINIT_MEMORY, //HINIT_CREATE, - HIVE_NO_FILE, //HIVE_VOLATILE, - HFILE_TYPE_PRIMARY, - BaseAddress, // NULL, - NULL, - NULL, - NULL, - NULL, - 0); - CmPrepareHive(&HardwareHive->Hive); - if (!NT_SUCCESS(Status)) - { - /* Bugcheck */ - KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 11, Status, 0); - } - - /* Attach it to the machine key */ - RtlInitUnicodeString(&KeyName, REG_HARDWARE_KEY_NAME); - Status = CmpLinkHiveToMaster(&KeyName, - NULL, - HardwareHive, - FALSE, - SecurityDescriptor); - if (!NT_SUCCESS(Status)) - { - /* Bugcheck */ - KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 12, Status, 0); - } - - /* Fill out the Hardware key with the ARC Data from the Loader */ - Status = CmpInitializeHardwareConfiguration(KeLoaderBlock); - if (!NT_SUCCESS(Status)) - { - /* Bugcheck */ - KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 13, Status, 0); - } - - /* Initialize machine-dependent information into the registry */ - Status = CmpInitializeMachineDependentConfiguration(KeLoaderBlock); - if (!NT_SUCCESS(Status)) - { - /* Bugcheck */ - KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 14, Status, 0); - } - - /* Initialize volatile registry settings */ - Status = CmpSetSystemValues(KeLoaderBlock); - if (!NT_SUCCESS(Status)) - { - /* Bugcheck */ - KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 15, Status, 0); - } - - /* Free the load options */ - ExFreePool(CmpLoadOptions.Buffer); - - /* If we got here, all went well */ - return TRUE; } NTSTATUS Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Sat May 12 03:35:19 2007 @@ -403,7 +403,7 @@ /* Acquire hive lock */ KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); + ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); Status = CmiScanKeyList(ParsedKey, &KeyName, @@ -411,7 +411,7 @@ &FoundObject); if (!NT_SUCCESS(Status)) { - ExReleaseResourceLite(&CmiRegistryLock); + ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); RtlFreeUnicodeString(&KeyName); return Status; @@ -427,7 +427,7 @@ Attributes); if (!NT_SUCCESS(Status)) { - ExReleaseResourceLite(&CmiRegistryLock); + ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); RtlFreeUnicodeString(&KeyName); return(STATUS_UNSUCCESSFUL); @@ -442,7 +442,7 @@ &LinkPath); if (NT_SUCCESS(Status)) { - ExReleaseResourceLite(&CmiRegistryLock); + ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); DPRINT("LinkPath '%wZ'\n", &LinkPath); @@ -493,7 +493,7 @@ (PVOID*)&FoundObject); if (!NT_SUCCESS(Status)) { - ExReleaseResourceLite(&CmiRegistryLock); + ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); RtlFreeUnicodeString(&KeyName); return(Status); @@ -540,7 +540,7 @@ { DPRINT("LinkPath '%wZ'\n", &LinkPath); - ExReleaseResourceLite(&CmiRegistryLock); + ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); ObDereferenceObject(FoundObject); @@ -583,7 +583,7 @@ InsertHeadList(&CmiKeyObjectListHead, &FoundObject->ListEntry); FoundObject->TimeStamp = CmiTimer; - ExReleaseResourceLite(&CmiRegistryLock); + ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); DPRINT("CmpParseKey: %wZ\n", &FoundObject->Name); @@ -628,7 +628,7 @@ /* Acquire hive lock */ KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); + ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); if (!NT_SUCCESS(CmiRemoveKeyFromList(KeyObject))) { @@ -669,7 +669,7 @@ ExFreePool(KeyObject->SubKeys); } - ExReleaseResourceLite(&CmiRegistryLock); + ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); PostOperationInfo.Status = STATUS_SUCCESS; CmiCallRegisteredCallbacks(RegNtPostKeyHandleClose, &PostOperationInfo); Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Sat May 12 03:35:19 2007 @@ -641,9 +641,10 @@ // // BUGBUG Old Hive Stuff for Temporary Support // -#define SYSTEM_REG_FILE L"\\SystemRoot\\System32\\Config\\SYSTEM" -#define SYSTEM_LOG_FILE L"\\SystemRoot\\System32\\Config\\SYSTEM.log" -#define REG_SYSTEM_KEY_NAME L"\\Registry\\Machine\\SYSTEM" +#define SYSTEM_REG_FILE L"\\SystemRoot\\System32\\Config\\SYSTEM" +#define SYSTEM_LOG_FILE L"\\SystemRoot\\System32\\Config\\SYSTEM.log" +#define REG_SYSTEM_KEY_NAME L"\\Registry\\Machine\\SYSTEM" +#define REG_HARDWARE_KEY_NAME L"\\Registry\\Machine\\HARDWARE" typedef struct _EREGISTRY_HIVE { HHIVE Hive; @@ -673,6 +674,11 @@ LIST_ENTRY HiveList; } KEY_OBJECT, *PKEY_OBJECT; extern PEREGISTRY_HIVE CmiVolatileHive; +extern LIST_ENTRY CmiKeyObjectListHead, CmiConnectedHiveList; +extern KTIMER CmiWorkerTimer; +VOID NTAPI CmiWorkerThread(IN PVOID Param); +PVOID NTAPI CmpRosGetHardwareHive(OUT PULONG Length); +#define HIVE_NO_FILE 0x00000002 /////////////////////////////////////////////////////////////////////////////// // @@ -707,6 +713,7 @@ // Notification Routines // VOID +NTAPI CmpReportNotify( IN PCM_KEY_CONTROL_BLOCK Kcb, IN PHHIVE Hive, @@ -714,6 +721,12 @@ IN ULONG Filter ); +VOID +NTAPI +CmpInitCallback( + VOID +); + // // KCB Cache/Delay Routines // @@ -725,13 +738,19 @@ VOID NTAPI -CmpInitializeCmAllocations( +CmpInitCmPrivateDelayAlloc( VOID ); VOID NTAPI -CmpInitializeKcbDelayedDeref( +CmpInitCmPrivateAlloc( + VOID +); + +VOID +NTAPI +CmpInitDelayDerefKCBEngine( VOID ); @@ -1004,6 +1023,18 @@ IN PUSHORT DeviceIndexTable ); +NTSTATUS +NTAPI +CmpInitializeMachineDependentConfiguration( + IN PLOADER_PARAMETER_BLOCK LoaderBlock +); + +NTSTATUS +NTAPI +CmpInitializeHardwareConfiguration( + IN PLOADER_PARAMETER_BLOCK LoaderBlock +); + // // Wrapper Routines // @@ -1070,7 +1101,7 @@ extern BOOLEAN CmpFlushOnLockRelease; extern BOOLEAN CmpShareSystemHives; extern BOOLEAN CmpMiniNTBoot; -extern EX_PUSH_LOCK CmpHiveListHeadLock; +extern EX_PUSH_LOCK CmpHiveListHeadLock, CmpLoadHiveLock; extern LIST_ENTRY CmpHiveListHead; extern POBJECT_TYPE CmpKeyObjectType; extern ERESOURCE CmpRegistryLock; @@ -1099,6 +1130,7 @@ extern ULONG CmpBootType; extern HANDLE CmpRegistryRootHandle; extern BOOLEAN ExpInTextModeSetup; +extern BOOLEAN InitIsWinPEMode; // // Inlined functions Modified: trunk/reactos/ntoskrnl/config/cmdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmdata.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmdata.c (original) +++ trunk/reactos/ntoskrnl/config/cmdata.c Sat May 12 03:35:19 2007 @@ -36,7 +36,7 @@ ULONG CmpConfigurationAreaSize = PAGE_SIZE * 4; PCM_FULL_RESOURCE_DESCRIPTOR CmpConfigurationData; -EX_PUSH_LOCK CmpHiveListHeadLock; +EX_PUSH_LOCK CmpHiveListHeadLock, CmpLoadHiveLock; HIVE_LIST_ENTRY CmpMachineHiveList[5]; Modified: trunk/reactos/ntoskrnl/config/cmhook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmhook.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmhook.c (original) +++ trunk/reactos/ntoskrnl/config/cmhook.c Sat May 12 03:35:19 2007 @@ -15,6 +15,9 @@ /* GLOBALS *******************************************************************/ +ULONG CmpCallBackCount = 0; +EX_CALLBACK CmpCallBackVector[100]; + LIST_ENTRY CmiCallbackHead; FAST_MUTEX CmiCallbackLock; @@ -29,6 +32,28 @@ } REGISTRY_CALLBACK, *PREGISTRY_CALLBACK; /* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +CmpInitCallback(VOID) +{ + ULONG i; + PAGED_CODE(); + + /* Reset counter */ + CmpCallBackCount = 0; + + /* Loop all the callbacks */ + for (i = 0; i < CMP_MAX_CALLBACKS; i++) + { + /* Initialize this one */ + ExInitializeCallBack(&CmpCallBackVector[i]); + } + + /* ROS: Initialize old-style callbacks for now */ + InitializeListHead(&CmiCallbackHead); + ExInitializeFastMutex(&CmiCallbackLock); +} NTSTATUS CmiCallRegisteredCallbacks(IN REG_NOTIFY_CLASS Argument1, Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkcbncb.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmkcbncb.c (original) +++ trunk/reactos/ntoskrnl/config/cmkcbncb.c Sat May 12 03:35:19 2007 @@ -15,7 +15,164 @@ /* GLOBALS *******************************************************************/ +ULONG CmpHashTableSize = 2048; +PCM_KEY_HASH_TABLE_ENTRY *CmpCacheTable; +PCM_NAME_HASH_TABLE_ENTRY *CmpNameCacheTable; + +LIST_ENTRY CmpFreeKCBListHead; + +BOOLEAN CmpAllocInited; +KGUARDED_MUTEX CmpAllocBucketLock, CmpDelayAllocBucketLock; +WORK_QUEUE_ITEM CmpDelayDerefKCBWorkItem; +LIST_ENTRY CmpFreeDelayItemsListHead; + +ULONG CmpDelayedCloseSize; +ULONG CmpDelayedCloseElements; +KGUARDED_MUTEX CmpDelayedCloseTableLock; +BOOLEAN CmpDelayCloseWorkItemActive; +WORK_QUEUE_ITEM CmpDelayCloseWorkItem; +LIST_ENTRY CmpDelayedLRUListHead; +ULONG CmpDelayCloseIntervalInSeconds = 5; +KDPC CmpDelayCloseDpc; +KTIMER CmpDelayCloseTimer; + +KGUARDED_MUTEX CmpDelayDerefKCBLock; +BOOLEAN CmpDelayDerefKCBWorkItemActive; +LIST_ENTRY CmpDelayDerefKCBListHead; +ULONG CmpDelayDerefKCBIntervalInSeconds = 5; +KDPC CmpDelayDerefKCBDpc; +KTIMER CmpDelayDerefKCBTimer; + +BOOLEAN CmpHoldLazyFlush; + /* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +CmpDelayCloseDpcRoutine(IN PKDPC Dpc, + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2) +{ + /* Sanity check */ + ASSERT(CmpDelayCloseWorkItemActive); + + /* Queue the work item */ + ExQueueWorkItem(&CmpDelayCloseWorkItem, DelayedWorkQueue); +} + +VOID +NTAPI +CmpDelayCloseWorker(IN PVOID Context) +{ + PAGED_CODE(); + + /* Sanity check */ + ASSERT(CmpDelayCloseWorkItemActive); + + /* FIXME: TODO */ +} + +VOID +NTAPI +CmpInitializeCache(VOID) +{ + ULONG Length; + + /* Calculate length for the table */ + Length = CmpHashTableSize * sizeof(PCM_KEY_HASH); + + /* Allocate it */ + CmpCacheTable = ExAllocatePoolWithTag(PagedPool, Length, TAG_CM); + if (!CmpCacheTable) KeBugCheck(CONFIG_INITIALIZATION_FAILED); + RtlZeroMemory(CmpCacheTable, Length); + + /* Calculate length for the name cache */ + Length = CmpHashTableSize * sizeof(PCM_NAME_HASH); + + /* Now allocate the name cache table */ + CmpNameCacheTable = ExAllocatePoolWithTag(PagedPool, Length, TAG_CM); + if (!CmpCacheTable) KeBugCheck(CONFIG_INITIALIZATION_FAILED); + RtlZeroMemory(CmpNameCacheTable, Length); + + /* Setup the delayed close lock */ + KeInitializeGuardedMutex(&CmpDelayedCloseTableLock); + + /* Setup the work item */ + ExInitializeWorkItem(&CmpDelayCloseWorkItem, CmpDelayCloseWorker, NULL); + + /* Setup the DPC and its timer */ + KeInitializeDpc(&CmpDelayCloseDpc, CmpDelayCloseDpcRoutine, NULL); + KeInitializeTimer(&CmpDelayCloseTimer); +} + +VOID +NTAPI +CmpInitCmPrivateDelayAlloc(VOID) +{ + /* Initialize the delay allocation list and lock */ + KeInitializeGuardedMutex(&CmpDelayAllocBucketLock); + InitializeListHead(&CmpFreeDelayItemsListHead); +} + +VOID +NTAPI +CmpInitCmPrivateAlloc(VOID) +{ + /* Make sure we didn't already do this */ + if (!CmpAllocInited) + { + /* Setup the lock and list */ + KeInitializeGuardedMutex(&CmpAllocBucketLock); + InitializeListHead(&CmpFreeKCBListHead); + CmpAllocInited = TRUE; + } +} + +VOID +NTAPI +CmpDelayDerefKCBDpcRoutine(IN PKDPC Dpc, + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2) +{ + /* Sanity check */ + ASSERT(CmpDelayDerefKCBWorkItemActive); + + /* Queue the work item */ + ExQueueWorkItem(&CmpDelayDerefKCBWorkItem, DelayedWorkQueue); +} + +VOID +NTAPI +CmpDelayDerefKCBWorker(IN PVOID Context) +{ + PAGED_CODE(); + + /* Sanity check */ + ASSERT(CmpDelayDerefKCBWorkItemActive); + + /* FIXME: TODO */ + ASSERT(FALSE); +} + +VOID +NTAPI +CmpInitDelayDerefKCBEngine(VOID) +{ + /* Initialize lock and list */ + KeInitializeGuardedMutex(&CmpDelayDerefKCBLock); + InitializeListHead(&CmpDelayDerefKCBListHead); + + /* Setup the work item */ + ExInitializeWorkItem(&CmpDelayDerefKCBWorkItem, + CmpDelayDerefKCBWorker, + NULL); + + /* Setup the DPC and timer for it */ + KeInitializeDpc(&CmpDelayDerefKCBDpc, CmpDelayDerefKCBDpcRoutine, NULL); + KeInitializeTimer(&CmpDelayDerefKCBTimer); +} PCM_KEY_CONTROL_BLOCK NTAPI Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Sat May 12 03:35:19 2007 @@ -12,6 +12,10 @@ #include "cm.h" #define NDEBUG #include "debug.h" + +KGUARDED_MUTEX CmpSelfHealQueueLock; +LIST_ENTRY CmpSelfHealQueueListHead; +PEPROCESS CmpSystemProcess; /* FUNCTIONS *****************************************************************/ @@ -624,3 +628,237 @@ /* Completely sucessful */ return TRUE; } + +BOOLEAN +NTAPI +CmInitSystem1(VOID) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + HANDLE KeyHandle; + NTSTATUS Status; + LARGE_INTEGER DueTime; + HANDLE ThreadHandle; + CLIENT_ID ThreadId; + PEREGISTRY_HIVE HardwareHive; + PVOID BaseAddress; + ULONG Length; + PSECURITY_DESCRIPTOR SecurityDescriptor; + PAGED_CODE(); + + /* Check if this is PE-boot */ + if (InitIsWinPEMode) + { + /* Set registry to PE mode */ + CmpMiniNTBoot = TRUE; + CmpShareSystemHives = TRUE; + } + + /* Initialize the hive list and lock */ + InitializeListHead(&CmpHiveListHead); + ExInitializePushLock((PVOID)&CmpHiveListHeadLock); + ExInitializePushLock((PVOID)&CmpLoadHiveLock); + + /* Initialize registry lock */ + ExInitializeResourceLite(&CmpRegistryLock); + + /* Initialize the cache */ + CmpInitializeCache(); + + /* Initialize allocation and delayed dereferencing */ + CmpInitCmPrivateAlloc(); + CmpInitCmPrivateDelayAlloc(); + CmpInitDelayDerefKCBEngine(); + + /* Initialize callbacks */ + CmpInitCallback(); + + /* Initialize self healing */ + KeInitializeGuardedMutex(&CmpSelfHealQueueLock); + InitializeListHead(&CmpSelfHealQueueListHead); + + /* Save the current process and lock the registry */ + CmpSystemProcess = PsGetCurrentProcess(); + +#if 1 + /* OLD CM: Initialize the key object list */ + InitializeListHead(&CmiKeyObjectListHead); + InitializeListHead(&CmiConnectedHiveList); + + /* OLD CM: Initialize the worker timer */ + KeInitializeTimerEx(&CmiWorkerTimer, SynchronizationTimer); + + /* OLD CM: Initialize the worker thread */ + Status = PsCreateSystemThread(&ThreadHandle, + THREAD_ALL_ACCESS, + NULL, + NULL, + &ThreadId, + CmiWorkerThread, + NULL); + if (!NT_SUCCESS(Status)) return FALSE; + + /* OLD CM: Start the timer */ + DueTime.QuadPart = -1; + KeSetTimerEx(&CmiWorkerTimer, DueTime, 5000, NULL); /* 5sec */ +#endif + + /* Create the key object types */ + Status = CmpCreateObjectTypes(); + if (!NT_SUCCESS(Status)) + { + /* Bugcheck */ + KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 1, Status, 0); + } + + /* Build the master hive */ + Status = CmpInitializeHive((PCMHIVE*)&CmiVolatileHive, + HINIT_CREATE, + HIVE_VOLATILE | HIVE_NO_FILE, + HFILE_TYPE_PRIMARY, + NULL, + NULL, + NULL, + NULL, + NULL, + 0); + if (!NT_SUCCESS(Status)) + { + /* Bugcheck */ + KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 2, Status, 0); + } + + /* Create the \REGISTRY key node */ + if (!CmpCreateRegistryRoot()) + { + /* Bugcheck */ + KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 3, 0, 0); + } + + /* Create the default security descriptor */ + SecurityDescriptor = CmpHiveRootSecurityDescriptor(); + + /* Create '\Registry\Machine' key. */ + RtlInitUnicodeString(&KeyName, L"\\REGISTRY\\MACHINE"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + SecurityDescriptor); + Status = NtCreateKey(&KeyHandle, + KEY_READ | KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + if (!NT_SUCCESS(Status)) + { + /* Bugcheck */ + KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 5, Status, 0); + } + + /* Close the handle */ + NtClose(KeyHandle); + + /* Create '\Registry\User' key. */ + RtlInitUnicodeString(&KeyName, L"\\REGISTRY\\USER"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + SecurityDescriptor); + Status = NtCreateKey(&KeyHandle, + KEY_READ | KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + if (!NT_SUCCESS(Status)) + { + /* Bugcheck */ + KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 6, Status, 0); + } + + /* Close the handle */ + NtClose(KeyHandle); + + /* Initialize the system hive */ + if (!CmpInitializeSystemHive(KeLoaderBlock)) + { + /* Bugcheck */ + KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 7, 0, 0); + } + + /* Create the 'CurrentControlSet' link. */ + Status = CmpCreateControlSet(KeLoaderBlock); + if (!NT_SUCCESS(Status)) + { + /* Bugcheck */ + KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 8, Status, 0); + } + + /* Import the hardware hive (FIXME: We should create it from scratch) */ + BaseAddress = CmpRosGetHardwareHive(&Length); + ((PHBASE_BLOCK)BaseAddress)->Length = Length; + Status = CmpInitializeHive((PCMHIVE*)&HardwareHive, + HINIT_MEMORY, //HINIT_CREATE, + HIVE_NO_FILE, //HIVE_VOLATILE, + HFILE_TYPE_PRIMARY, + BaseAddress, // NULL, + NULL, + NULL, + NULL, + NULL, + 0); + CmPrepareHive(&HardwareHive->Hive); + if (!NT_SUCCESS(Status)) + { + /* Bugcheck */ + KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 11, Status, 0); + } + + /* Attach it to the machine key */ + RtlInitUnicodeString(&KeyName, REG_HARDWARE_KEY_NAME); + Status = CmpLinkHiveToMaster(&KeyName, + NULL, + (PCMHIVE)HardwareHive, + FALSE, + SecurityDescriptor); + if (!NT_SUCCESS(Status)) + { + /* Bugcheck */ + KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 12, Status, 0); + } + + /* Fill out the Hardware key with the ARC Data from the Loader */ + Status = CmpInitializeHardwareConfiguration(KeLoaderBlock); + if (!NT_SUCCESS(Status)) + { + /* Bugcheck */ + KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 13, Status, 0); + } + + /* Initialize machine-dependent information into the registry */ + Status = CmpInitializeMachineDependentConfiguration(KeLoaderBlock); + if (!NT_SUCCESS(Status)) + { + /* Bugcheck */ + KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 14, Status, 0); + } + + /* Initialize volatile registry settings */ + Status = CmpSetSystemValues(KeLoaderBlock); + if (!NT_SUCCESS(Status)) + { + /* Bugcheck */ + KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 15, Status, 0); + } + + /* Free the load options */ + ExFreePool(CmpLoadOptions.Buffer); + + /* If we got here, all went well */ + return TRUE; +}

1 0

[dgorbachev] 26709: Do not write beyond the buffer.
by dgorbachev＠svn.reactos.org 11 May '07

11 May '07

Author: dgorbachev Date: Sat May 12 03:17:44 2007 New Revision: 26709 URL: http://svn.reactos.org/svn/reactos?rev=26709&view=rev Log: Do not write beyond the buffer. Modified: trunk/reactos/dll/win32/aclui/sidcache.c Modified: trunk/reactos/dll/win32/aclui/sidcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/sidcache.c… ============================================================================== --- trunk/reactos/dll/win32/aclui/sidcache.c (original) +++ trunk/reactos/dll/win32/aclui/sidcache.c Sat May 12 03:17:44 2007 @@ -588,7 +588,8 @@ { /* zero the static part of the structure */ ZeroMemory(scm, - sizeof(SIDCACHEMGR)); + FIELD_OFFSET(SIDCACHEMGR, + SystemName)); scm->RefCount = 1; scm->Heap = Heap;

1 0

[dgorbachev] 26708: Do not write beyond the buffer.
by dgorbachev＠svn.reactos.org 11 May '07

11 May '07

Author: dgorbachev Date: Sat May 12 03:15:53 2007 New Revision: 26708 URL: http://svn.reactos.org/svn/reactos?rev=26708&view=rev Log: Do not write beyond the buffer. Modified: trunk/reactos/base/applications/regedit/security.c Modified: trunk/reactos/base/applications/regedit/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/security.c (original) +++ trunk/reactos/base/applications/regedit/security.c Sat May 12 03:15:53 2007 @@ -763,7 +763,7 @@ obj = (PCRegKeySecurity)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET(CRegKeySecurity, - szRegKey[_tcslen(lpRegKey)])); + szRegKey[_tcslen(lpRegKey)+1])); if (obj != NULL) { obj->ref = 1;

1 0

[dgorbachev] 26707: Do not fail with less then two arguments.
by dgorbachev＠svn.reactos.org 11 May '07

11 May '07

Author: dgorbachev Date: Sat May 12 03:12:49 2007 New Revision: 26707 URL: http://svn.reactos.org/svn/reactos?rev=26707&view=rev Log: Do not fail with less then two arguments. Modified: trunk/reactos/base/applications/cmdutils/more/more.c Modified: trunk/reactos/base/applications/cmdutils/more/more.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/more.c (original) +++ trunk/reactos/base/applications/cmdutils/more/more.c Sat May 12 03:12:49 2007 @@ -79,8 +79,8 @@ rdtscll(timeStart); - randfile = fopen(argv[1],"r"); - sortfile = fopen(argv[2],"w"); + randfile = (argc < 2) ? stdin : fopen(argv[1],"r"); + sortfile = (argc < 3) ? stdout : fopen(argv[2],"w"); if (randfile == NULL || sortfile == NULL) { fprintf(stderr,"Could not open all files.\n"); return 1;

1 0

[tkreuzer] 26706: make caption font bold again
by tkreuzer＠svn.reactos.org 11 May '07

11 May '07

Author: tkreuzer Date: Sat May 12 02:57:21 2007 New Revision: 26706 URL: http://svn.reactos.org/svn/reactos?rev=26706&view=rev Log: make caption font bold again Modified: trunk/reactos/boot/bootdata/hivedef.inf Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf (original) +++ trunk/reactos/boot/bootdata/hivedef.inf Sat May 12 02:57:21 2007 @@ -92,7 +92,7 @@ ; GUI Setup HKCU, "Control Panel\Desktop\WindowMetrics","CaptionFont",0x00000001,f5,ff,ff,ff,00,00,00,\ -00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,44,00,65,00,6a,00,61,00,56,\ +00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,44,00,65,00,6a,00,61,00,56,\ 00,75,00,20,00,53,00,61,00,6e,00,73,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKCU, "Control Panel\Desktop\WindowMetrics","IconFont",0x00000001,f5,ff,ff,ff,00,00,00,00,\

1 0

[ion] 26705: - Copy CmOpenHiveFiles to cminit.c and rename to CmpOpenHiveFiles. Extend the functionality of the routine: - Allow caller to have full power over handles and filenames being used instead of hard-coding a pointer to the registry hive. - Setup proper I/O flags to disable compression and open for random access, backup-intent and allow disabling buffering. - Allow proper access mask/share mode when booting off read-only media. - Call the FS driver with FSCTL_MARK_AS_SYSTEM_HIVE if inst
by ion＠svn.reactos.org 11 May '07

11 May '07

Author: ion Date: Sat May 12 02:51:11 2007 New Revision: 26705 URL: http://svn.reactos.org/svn/reactos?rev=26705&view=rev Log: - Copy CmOpenHiveFiles to cminit.c and rename to CmpOpenHiveFiles. Extend the functionality of the routine: - Allow caller to have full power over handles and filenames being used instead of hard-coding a pointer to the registry hive. - Setup proper I/O flags to disable compression and open for random access, backup-intent and allow disabling buffering. - Allow proper access mask/share mode when booting off read-only media. - Call the FS driver with FSCTL_MARK_AS_SYSTEM_HIVE if instructed. - Call with FSCTL_SET_COMPRESSION to make sure compression is off. - Allow creating the hive if it doesn't exist already. - Consider 0-byte opened hives as new hives. - Allow caller to request volume sector size and validate with hive cluster size. - Make .log hives hidden. - Implemement CmpCreateEvent to allowed for overlapped I/O registry operations. - Move more globals to cmdata.c. Modified: trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/regfile.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmdata.c trunk/reactos/ntoskrnl/config/cminit.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/config/cmwraprs.c Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=26705… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Sat May 12 02:51:11 2007 @@ -496,6 +496,19 @@ NTAPI CmpCreateRegistryRoot(VOID); +NTSTATUS +NTAPI +CmpOpenHiveFiles(IN PUNICODE_STRING BaseName, + IN PWCHAR Extension OPTIONAL, + IN PHANDLE Primary, + IN PHANDLE Log, + IN PULONG PrimaryDisposition, + IN PULONG LogDisposition, + IN BOOLEAN CreateAllowed, + IN BOOLEAN MarkAsSystemHive, + IN BOOLEAN NoBuffering, + OUT PULONG ClusterSize OPTIONAL); + #if 0 static __inline PVOID xHvGetCell(char *file, int line, PHHIVE Hive, HCELL_INDEX Cell) { Modified: trunk/reactos/ntoskrnl/cm/regfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regfile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regfile.c (original) +++ trunk/reactos/ntoskrnl/cm/regfile.c Sat May 12 02:51:11 2007 @@ -283,63 +283,6 @@ return STATUS_SUCCESS; } - -NTSTATUS -CmOpenHiveFiles(PEREGISTRY_HIVE RegistryHive) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; - NTSTATUS Status; - - InitializeObjectAttributes(&ObjectAttributes, - &RegistryHive->HiveFileName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = ZwCreateFile(&RegistryHive->HiveHandle, - FILE_ALL_ACCESS, - &ObjectAttributes, - &IoStatusBlock, - NULL, - FILE_ATTRIBUTE_NORMAL, - 0, - FILE_OPEN, - FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, - NULL, - 0); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - InitializeObjectAttributes(&ObjectAttributes, - &RegistryHive->LogFileName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = ZwCreateFile(&RegistryHive->LogHandle, - FILE_ALL_ACCESS, - &ObjectAttributes, - &IoStatusBlock, - NULL, - FILE_ATTRIBUTE_NORMAL, - 0, - FILE_SUPERSEDE, - FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, - NULL, - 0); - if (!NT_SUCCESS(Status)) - { - ZwClose(RegistryHive->HiveHandle); - return(Status); - } - - return STATUS_SUCCESS; -} - - VOID CmCloseHiveFiles(PEREGISTRY_HIVE RegistryHive) { @@ -353,6 +296,7 @@ { BOOLEAN Success; NTSTATUS Status; + ULONG Disposition; ASSERT(!IsNoFileHive(RegistryHive)); @@ -361,7 +305,16 @@ return(STATUS_SUCCESS); } - Status = CmOpenHiveFiles(RegistryHive); + Status = CmpOpenHiveFiles(&RegistryHive->HiveFileName, + L".LOG", + &RegistryHive->HiveHandle, + &RegistryHive->LogHandle, + &Disposition, + &Disposition, + FALSE, + FALSE, + TRUE, + NULL); if (!NT_SUCCESS(Status)) { return Status; Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Sat May 12 02:51:11 2007 @@ -1007,6 +1007,14 @@ // // Wrapper Routines // +NTSTATUS +NTAPI +CmpCreateEvent( + IN EVENT_TYPE EventType, + OUT PHANDLE EventHandle, + OUT PKEVENT *Event +); + PVOID NTAPI CmpAllocate( @@ -1060,6 +1068,8 @@ // extern BOOLEAN CmpSpecialBootCondition; extern BOOLEAN CmpFlushOnLockRelease; +extern BOOLEAN CmpShareSystemHives; +extern BOOLEAN CmpMiniNTBoot; extern EX_PUSH_LOCK CmpHiveListHeadLock; extern LIST_ENTRY CmpHiveListHead; extern POBJECT_TYPE CmpKeyObjectType; @@ -1080,6 +1090,14 @@ extern ULONG CmpConfigurationAreaSize; extern PCM_FULL_RESOURCE_DESCRIPTOR CmpConfigurationData; extern UNICODE_STRING CmTypeName[]; +extern HIVE_LIST_ENTRY CmpMachineHiveList[5]; +extern UNICODE_STRING CmSymbolicLinkValueName; +extern UNICODE_STRING CmpSystemStartOptions; +extern UNICODE_STRING CmpLoadOptions; +extern BOOLEAN CmSelfHeal; +extern BOOLEAN CmpSelfHeal; +extern ULONG CmpBootType; +extern HANDLE CmpRegistryRootHandle; extern BOOLEAN ExpInTextModeSetup; // Modified: trunk/reactos/ntoskrnl/config/cmdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmdata.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmdata.c (original) +++ trunk/reactos/ntoskrnl/config/cmdata.c Sat May 12 02:51:11 2007 @@ -37,6 +37,22 @@ PCM_FULL_RESOURCE_DESCRIPTOR CmpConfigurationData; EX_PUSH_LOCK CmpHiveListHeadLock; + +HIVE_LIST_ENTRY CmpMachineHiveList[5]; + +UNICODE_STRING CmSymbolicLinkValueName = + RTL_CONSTANT_STRING(L"SymbolicLinkValue"); + +UNICODE_STRING CmpSystemStartOptions; +UNICODE_STRING CmpLoadOptions; + +BOOLEAN CmpShareSystemHives; +BOOLEAN CmSelfHeal = TRUE; +BOOLEAN CmpSelfHeal = TRUE; +BOOLEAN CmpMiniNTBoot; +ULONG CmpBootType; + +HANDLE CmpRegistryRootHandle; UNICODE_STRING CmTypeName[MaximumType + 1] = { Modified: trunk/reactos/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cminit.c (original) +++ trunk/reactos/ntoskrnl/config/cminit.c Sat May 12 02:51:11 2007 @@ -226,3 +226,357 @@ *RegistryHive = (PCMHIVE)Hive; return STATUS_SUCCESS; } + +NTSTATUS +NTAPI +CmpOpenHiveFiles(IN PUNICODE_STRING BaseName, + IN PWCHAR Extension OPTIONAL, + IN PHANDLE Primary, + IN PHANDLE Log, + IN PULONG PrimaryDisposition, + IN PULONG LogDisposition, + IN BOOLEAN CreateAllowed, + IN BOOLEAN MarkAsSystemHive, + IN BOOLEAN NoBuffering, + OUT PULONG ClusterSize OPTIONAL) +{ + HANDLE EventHandle; + PKEVENT Event; + NTSTATUS Status; + UNICODE_STRING FullName, ExtensionName; + PWCHAR NameBuffer; + USHORT Length; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + ULONG AttributeFlags, ShareMode, DesiredAccess, CreateDisposition, IoFlags; + USHORT CompressionState; + FILE_STANDARD_INFORMATION FileInformation; + FILE_FS_SIZE_INFORMATION FsSizeInformation; + + /* Create event */ + Status = CmpCreateEvent(NotificationEvent, &EventHandle, &Event); + if (!NT_SUCCESS(Status)) return Status; + + /* Initialize the full name */ + RtlInitEmptyUnicodeString(&FullName, NULL, 0); + Length = BaseName->Length; + + /* Check if we have an extension */ + if (Extension) + { + /* Update the name length */ + Length += wcslen(Extension) * sizeof(WCHAR) + sizeof(UNICODE_NULL); + + /* Allocate the buffer for the full name */ + NameBuffer = ExAllocatePoolWithTag(PagedPool, Length, TAG_CM); + if (!NameBuffer) + { + /* Fail */ + ObDereferenceObject(Event); + ZwClose(EventHandle); + return STATUS_NO_MEMORY; + } + + /* Build the full name */ + FullName.Buffer = NameBuffer; + FullName.MaximumLength = Length; + RtlAppendUnicodeStringToString(&FullName, BaseName); + } + else + { + /* The base name is the full name */ + FullName = *BaseName; + NameBuffer = NULL; + } + + /* Initialize the attributes */ + InitializeObjectAttributes(&ObjectAttributes, + &FullName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + + /* Check if we can create the hive */ + if ((CreateAllowed) && !(CmpShareSystemHives)) + { + /* Open only or create */ + CreateDisposition = FILE_OPEN_IF; + } + else + { + /* Open only */ + CreateDisposition = FILE_OPEN; + } + + /* Setup the flags */ + IoFlags = FILE_OPEN_FOR_BACKUP_INTENT | + FILE_NO_COMPRESSION | + FILE_RANDOM_ACCESS | + (NoBuffering) ? FILE_NO_INTERMEDIATE_BUFFERING : 0; + + /* Set share and access modes */ + if ((CmpMiniNTBoot) && (CmpShareSystemHives)) + { + /* We're on Live CD or otherwise sharing */ + DesiredAccess = FILE_READ_DATA; + ShareMode = FILE_SHARE_READ; + } + else + { + /* We want to write exclusively */ + ShareMode = 0; + DesiredAccess = FILE_READ_DATA | FILE_WRITE_DATA; + } + + /* Default attributes */ + AttributeFlags = FILE_ATTRIBUTE_NORMAL; + + /* Now create the file */ + Status = ZwCreateFile(Primary, + DesiredAccess, + &ObjectAttributes, + &IoStatusBlock, + NULL, + AttributeFlags, + ShareMode, + CreateDisposition, + FILE_SYNCHRONOUS_IO_NONALERT | IoFlags, + NULL, + 0); + if ((NT_SUCCESS(Status)) && (MarkAsSystemHive)) + { + /* We opened it, mark it as a system hive */ + Status = ZwFsControlFile(*Primary, + EventHandle, + NULL, + NULL, + &IoStatusBlock, + FSCTL_MARK_AS_SYSTEM_HIVE, + NULL, + 0, + NULL, + 0); + if (Status == STATUS_PENDING) + { + /* Wait for completion */ + KeWaitForSingleObject(Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = IoStatusBlock.Status; + } + + /* If we don't support it, ignore the failure */ + if (Status == STATUS_INVALID_DEVICE_REQUEST) Status = STATUS_SUCCESS; + + /* If we failed, close the handle */ + if (!NT_SUCCESS(Status)) ZwClose(*Primary); + } + + /* Check if anything failed until now */ + if (!NT_SUCCESS(Status)) + { + /* Close handles and free buffers */ + if (NameBuffer) ExFreePool(NameBuffer); + ObDereferenceObject(Event); + ZwClose(EventHandle); + return Status; + } + + /* Disable compression */ + CompressionState = 0; + Status = ZwFsControlFile(*Primary, + EventHandle, + NULL, + NULL, + &IoStatusBlock, + FSCTL_SET_COMPRESSION, + &CompressionState, + sizeof(CompressionState), + NULL, + 0); + if (Status == STATUS_PENDING) + { + /* Wait for completion */ + KeWaitForSingleObject(Event, + Executive, + KernelMode, + FALSE, + NULL); + } + + /* Get the disposition */ + *PrimaryDisposition = IoStatusBlock.Information; + if (IoStatusBlock.Information != FILE_CREATED) + { + /* Check how large the file is */ + Status = ZwQueryInformationFile(*Primary, + &IoStatusBlock, + &FileInformation, + sizeof(FileInformation), + FileStandardInformation); + if (NT_SUCCESS(Status)) + { + /* Check if it's 0 bytes */ + if (!FileInformation.EndOfFile.QuadPart) + { + /* Assume it's a new file */ + *PrimaryDisposition = FILE_CREATED; + } + } + } + + /* Check if the caller wants cluster size returned */ + if (ClusterSize) + { + /* Query it */ + Status = ZwQueryVolumeInformationFile(*Primary, + &IoStatusBlock, + &FsSizeInformation, + sizeof(FsSizeInformation), + FileFsSizeInformation); + if (!NT_SUCCESS(Status)) + { + /* Close handles and free buffers */ + if (NameBuffer) ExFreePool(NameBuffer); + ObDereferenceObject(Event); + ZwClose(EventHandle); + return Status; + } + + /* Check if the sector size is invalid */ + if (FsSizeInformation.BytesPerSector > HBLOCK_SIZE) + { + /* Close handles and free buffers */ + if (NameBuffer) ExFreePool(NameBuffer); + ObDereferenceObject(Event); + ZwClose(EventHandle); + return STATUS_CANNOT_LOAD_REGISTRY_FILE; + } + + /* Return cluster size */ + *ClusterSize = max(1, FsSizeInformation.BytesPerSector / HSECTOR_SIZE); + } + + /* Check if we don't need to create a log file */ + if (!Extension) + { + /* We're done, close handles and free buffers */ + if (NameBuffer) ExFreePool(NameBuffer); + ObDereferenceObject(Event); + ZwClose(EventHandle); + return STATUS_SUCCESS; + } + + /* Check if we can create the hive */ + CreateDisposition = CmpShareSystemHives ? FILE_OPEN : FILE_OPEN_IF; + if (*PrimaryDisposition == FILE_CREATED) + { + /* Over-write the existing log file, since this is a new hive */ + CreateDisposition = FILE_SUPERSEDE; + } + + /* Setup the name */ + RtlInitUnicodeString(&ExtensionName, Extension); + RtlAppendUnicodeStringToString(&FullName, &ExtensionName); + + /* Initialize the attributes */ + InitializeObjectAttributes(&ObjectAttributes, + &FullName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + + /* Setup the flags */ + IoFlags = FILE_NO_COMPRESSION | FILE_NO_INTERMEDIATE_BUFFERING; + + /* Check if this is a log file */ + if (!_wcsnicmp(Extension, L".log", 4)) + { + /* Hide log files */ + AttributeFlags |= FILE_ATTRIBUTE_HIDDEN; + } + + /* Now create the file */ + Status = ZwCreateFile(Log, + DesiredAccess, + &ObjectAttributes, + &IoStatusBlock, + NULL, + AttributeFlags, + ShareMode, + CreateDisposition, + IoFlags, + NULL, + 0); + if ((NT_SUCCESS(Status)) && (MarkAsSystemHive)) + { + /* We opened it, mark it as a system hive */ + Status = ZwFsControlFile(*Log, + EventHandle, + NULL, + NULL, + &IoStatusBlock, + FSCTL_MARK_AS_SYSTEM_HIVE, + NULL, + 0, + NULL, + 0); + if (Status == STATUS_PENDING) + { + /* Wait for completion */ + KeWaitForSingleObject(Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = IoStatusBlock.Status; + } + + /* If we don't support it, ignore the failure */ + if (Status == STATUS_INVALID_DEVICE_REQUEST) Status = STATUS_SUCCESS; + + /* If we failed, close the handle */ + if (!NT_SUCCESS(Status)) ZwClose(*Log); + } + + /* Check if anything failed until now */ + if (!NT_SUCCESS(Status)) + { + /* Clear the handle */ + *Log = NULL; + } + else + { + /* Disable compression */ + Status = ZwFsControlFile(*Log, + EventHandle, + NULL, + NULL, + &IoStatusBlock, + FSCTL_SET_COMPRESSION, + &CompressionState, + sizeof(CompressionState), + NULL, + 0); + if (Status == STATUS_PENDING) + { + /* Wait for completion */ + KeWaitForSingleObject(Event, + Executive, + KernelMode, + FALSE, + NULL); + } + + /* Return the disposition */ + *LogDisposition = IoStatusBlock.Information; + } + + /* We're done, close handles and free buffers */ + if (NameBuffer) ExFreePool(NameBuffer); + ObDereferenceObject(Event); + ZwClose(EventHandle); + return STATUS_SUCCESS; +} Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Sat May 12 02:51:11 2007 @@ -12,25 +12,6 @@ #include "cm.h" #define NDEBUG #include "debug.h" - -/* GLOBALS *******************************************************************/ - -HIVE_LIST_ENTRY CmpMachineHiveList[5]; - -UNICODE_STRING CmSymbolicLinkValueName = - RTL_CONSTANT_STRING(L"SymbolicLinkValue"); - -UNICODE_STRING CmpSystemStartOptions; -UNICODE_STRING CmpLoadOptions; - -BOOLEAN CmpShareSystemHives; -BOOLEAN CmSelfHeal = TRUE; -BOOLEAN CmpSelfHeal = TRUE; -ULONG CmpBootType; - -HANDLE CmpRegistryRootHandle; - -extern BOOLEAN ExpInTextModeSetup; /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/config/cmwraprs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmwraprs.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmwraprs.c (original) +++ trunk/reactos/ntoskrnl/config/cmwraprs.c Sat May 12 02:51:11 2007 @@ -14,6 +14,41 @@ #include "debug.h" /* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +CmpCreateEvent(IN EVENT_TYPE EventType, + OUT PHANDLE EventHandle, + OUT PKEVENT *Event) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + + /* Create the event */ + InitializeObjectAttributes(&ObjectAttributes, + NULL, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = ZwCreateEvent(EventHandle, + EVENT_ALL_ACCESS, + &ObjectAttributes, + EventType, + FALSE); + if (!NT_SUCCESS(Status)) return Status; + + /* Get a pointer to the object itself */ + Status = ObReferenceObjectByHandle(*EventHandle, + EVENT_ALL_ACCESS, + NULL, + KernelMode, + (PVOID*)Event, + NULL); + if (!NT_SUCCESS(Status)) ZwClose(*EventHandle); + + /* Return status */ + return Status; +} PVOID NTAPI

1 0

[ion] 26704: - Move Cmlib wrapper functions to cmwraprs.c and add the file -- no code change. - Move CmCheckRegistry stub to cmcheck.c and add the file. - Move CmpInitializeHive to cminit.c and add the file. Modify it to add Cm-rewrite compatible code (but #ifed out). - Change the HiveList lock to a pushlock instead of an ERESOURCE. Rename CmiHiveListHead to CmpHiveListHead. - Get rid of Cm security functions and stub the CmpSecurityMethod in cmse.c to always return success. Key security was nev
by ion＠svn.reactos.org 11 May '07

11 May '07

Author: ion Date: Sat May 12 01:35:56 2007 New Revision: 26704 URL: http://svn.reactos.org/svn/reactos?rev=26704&view=rev Log: - Move Cmlib wrapper functions to cmwraprs.c and add the file -- no code change. - Move CmCheckRegistry stub to cmcheck.c and add the file. - Move CmpInitializeHive to cminit.c and add the file. Modify it to add Cm-rewrite compatible code (but #ifed out). - Change the HiveList lock to a pushlock instead of an ERESOURCE. Rename CmiHiveListHead to CmpHiveListHead. - Get rid of Cm security functions and stub the CmpSecurityMethod in cmse.c to always return success. Key security was never really working anyway, this just removes more code. Added: trunk/reactos/ntoskrnl/config/cmcheck.c trunk/reactos/ntoskrnl/config/cminit.c trunk/reactos/ntoskrnl/config/cmwraprs.c Modified: trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/regfile.c trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/cm/regobj.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmdata.c trunk/reactos/ntoskrnl/config/cmse.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=26704… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Sat May 12 01:35:56 2007 @@ -110,10 +110,10 @@ extern POBJECT_TYPE CmpKeyObjectType; extern KSPIN_LOCK CmiKeyListLock; -extern LIST_ENTRY CmiHiveListHead; +extern LIST_ENTRY CmpHiveListHead; extern ERESOURCE CmiRegistryLock; - +extern EX_PUSH_LOCK CmpHiveListHeadLock; /* Registry Callback Function */ typedef struct _REGISTRY_CALLBACK Modified: trunk/reactos/ntoskrnl/cm/regfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regfile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regfile.c (original) +++ trunk/reactos/ntoskrnl/cm/regfile.c Sat May 12 01:35:56 2007 @@ -22,113 +22,6 @@ #define ABS_VALUE(V) (((V) < 0) ? -(V) : (V)) /* FUNCTIONS ****************************************************************/ - -PVOID CMAPI -CmpAllocate( - ULONG Size, - BOOLEAN Paged) -{ - return ExAllocatePoolWithTag(Paged ? PagedPool : NonPagedPool, - Size, TAG('R','E','G',' ')); -} - -VOID CMAPI -CmpFree( - PVOID Ptr) -{ - ExFreePool(Ptr); -} - - -BOOLEAN CMAPI -CmpFileRead( - PHHIVE RegistryHive, - ULONG FileType, - ULONGLONG FileOffset, - PVOID Buffer, - SIZE_T BufferLength) -{ - PEREGISTRY_HIVE CmHive = (PEREGISTRY_HIVE)RegistryHive; - HANDLE HiveHandle = FileType == HV_TYPE_PRIMARY ? CmHive->HiveHandle : CmHive->LogHandle; - LARGE_INTEGER _FileOffset; - IO_STATUS_BLOCK IoStatusBlock; - NTSTATUS Status; - - _FileOffset.QuadPart = FileOffset; - Status = ZwReadFile(HiveHandle, 0, 0, 0, &IoStatusBlock, - Buffer, BufferLength, &_FileOffset, 0); - return NT_SUCCESS(Status) ? TRUE : FALSE; -} - - -BOOLEAN CMAPI -CmpFileWrite( - PHHIVE RegistryHive, - ULONG FileType, - ULONGLONG FileOffset, - PVOID Buffer, - SIZE_T BufferLength) -{ - PEREGISTRY_HIVE CmHive = (PEREGISTRY_HIVE)RegistryHive; - HANDLE HiveHandle = FileType == HV_TYPE_PRIMARY ? CmHive->HiveHandle : CmHive->LogHandle; - LARGE_INTEGER _FileOffset; - IO_STATUS_BLOCK IoStatusBlock; - NTSTATUS Status; - - _FileOffset.QuadPart = FileOffset; - Status = ZwWriteFile(HiveHandle, 0, 0, 0, &IoStatusBlock, - Buffer, BufferLength, &_FileOffset, 0); - return NT_SUCCESS(Status) ? TRUE : FALSE; -} - - -BOOLEAN CMAPI -CmpFileSetSize( - PHHIVE RegistryHive, - ULONG FileType, - ULONGLONG FileSize) -{ - PEREGISTRY_HIVE CmHive = (PEREGISTRY_HIVE)RegistryHive; - HANDLE HiveHandle = FileType == HV_TYPE_PRIMARY ? CmHive->HiveHandle : CmHive->LogHandle; - FILE_END_OF_FILE_INFORMATION EndOfFileInfo; - FILE_ALLOCATION_INFORMATION FileAllocationInfo; - IO_STATUS_BLOCK IoStatusBlock; - NTSTATUS Status; - - EndOfFileInfo.EndOfFile.QuadPart = FileSize; - Status = ZwSetInformationFile(HiveHandle, &IoStatusBlock, - &EndOfFileInfo, - sizeof(FILE_END_OF_FILE_INFORMATION), - FileEndOfFileInformation); - if (!NT_SUCCESS(Status)) - return FALSE; - - FileAllocationInfo.AllocationSize.QuadPart = FileSize; - Status = ZwSetInformationFile(HiveHandle, &IoStatusBlock, - &FileAllocationInfo, - sizeof(FILE_ALLOCATION_INFORMATION), - FileAllocationInformation); - if (!NT_SUCCESS(Status)) - return FALSE; - - return TRUE; -} - - -BOOLEAN CMAPI -CmpFileFlush( - PHHIVE RegistryHive, - ULONG FileType) -{ - PEREGISTRY_HIVE CmHive = (PEREGISTRY_HIVE)RegistryHive; - HANDLE HiveHandle = FileType == HV_TYPE_PRIMARY ? CmHive->HiveHandle : CmHive->LogHandle; - IO_STATUS_BLOCK IoStatusBlock; - NTSTATUS Status; - - Status = ZwFlushBuffersFile(HiveHandle, &IoStatusBlock); - return NT_SUCCESS(Status) ? TRUE : FALSE; -} - static NTSTATUS CmiCreateNewRegFile(HANDLE FileHandle) @@ -319,144 +212,6 @@ return STATUS_SUCCESS; } -ULONG -NTAPI -CmCheckRegistry(IN PEREGISTRY_HIVE RegistryHive, - IN ULONG Flags) -{ - /* FIXME: HACK! */ - return 0; -} - -NTSTATUS -NTAPI -CmpInitializeHive(OUT PEREGISTRY_HIVE *RegistryHive, - IN ULONG OperationType, - IN ULONG HiveFlags, - IN ULONG FileType, - IN PVOID HiveData OPTIONAL, - IN HANDLE Primary, - IN HANDLE Log, - IN HANDLE External, - IN PUNICODE_STRING FileName OPTIONAL, - IN ULONG CheckFlags) -{ - PEREGISTRY_HIVE Hive; - IO_STATUS_BLOCK IoStatusBlock; - FILE_FS_SIZE_INFORMATION FileSizeInformation; - NTSTATUS Status; - ULONG Cluster; - - /* Assume failure */ - *RegistryHive = NULL; - - /* - * The following are invalid: - * An external hive that is also internal. - * A log hive that's not a primary hive too. - * A volatile hive that's linked to permanent storage. - * An in-memory initialization without hive data. - * A log hive that's not linked to a correct file type. - */ - if (((External) && ((Primary) || (Log))) || - ((Log) && !(Primary)) || - ((HiveFlags & HIVE_VOLATILE) && ((Primary) || (External) || (Log))) || - ((OperationType == HINIT_MEMORY) && (!HiveData)) || - ((Log) && (FileType != HFILE_TYPE_LOG))) - { - /* Fail the request */ - return STATUS_INVALID_PARAMETER; - } - - /* Check if this is a primary hive */ - if (Primary) - { - /* Get the cluster size */ - Status = ZwQueryVolumeInformationFile(Primary, - &IoStatusBlock, - &FileSizeInformation, - sizeof(FILE_FS_SIZE_INFORMATION), - FileFsSizeInformation); - if (!NT_SUCCESS(Status)) return Status; - - /* Make sure it's not larger then the block size */ - if (FileSizeInformation.BytesPerSector > HBLOCK_SIZE) - { - /* Fail */ - return STATUS_REGISTRY_IO_FAILED; - } - - /* Otherwise, calculate the cluster */ - Cluster = FileSizeInformation.BytesPerSector / HSECTOR_SIZE; - Cluster = max(1, Cluster); - } - else - { - /* Otherwise use cluster 1 */ - Cluster = 1; - } - - /* Allocate and clear the hive */ - Hive = ExAllocatePoolWithTag(NonPagedPool, sizeof(EREGISTRY_HIVE), TAG_CM); - if (!Hive) return STATUS_INSUFFICIENT_RESOURCES; - RtlZeroMemory(Hive, sizeof(EREGISTRY_HIVE)); - - /* Initialize it */ - Status = HvInitialize(&Hive->Hive, - OperationType, - HiveFlags, - FileType, - (ULONG_PTR)HiveData, - Cluster, - CmpAllocate, - CmpFree, - CmpFileRead, - CmpFileWrite, - CmpFileSetSize, - CmpFileFlush, - FileName); - if (!NT_SUCCESS(Status)) - { - /* Clear allocations and fail */ - ExFreePool(Hive); - return Status; - } - - /* Set flags */ - Hive->Flags = HiveFlags; - - /* Check if we should verify the registry */ - if ((OperationType == HINIT_FILE) || - (OperationType == HINIT_MEMORY) || - (OperationType == HINIT_MEMORY_INPLACE) || - (OperationType == HINIT_MAPFILE)) - { - /* Verify integrity */ - if (CmCheckRegistry(Hive, TRUE)) - { - /* Free all alocations */ - ExFreePool(Hive); - return STATUS_REGISTRY_CORRUPT; - } - } - - /* Acquire hive list lock exclusively */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); - - /* Add the new hive to the hive list */ - InsertTailList(&CmiHiveListHead, &Hive->HiveList); - - /* Release hive list lock */ - ExReleaseResourceLite(&CmiRegistryLock); - KeLeaveCriticalRegion(); - - /* Return the hive and success */ - VERIFY_REGISTRY_HIVE(Hive); - *RegistryHive = Hive; - return STATUS_SUCCESS; -} - NTSTATUS CmiLoadHive(IN POBJECT_ATTRIBUTES KeyObjectAttributes, IN PUNICODE_STRING FileName, @@ -493,7 +248,7 @@ } /* Add the new hive to the hive list */ - InsertTailList (&CmiHiveListHead, + InsertTailList (&CmpHiveListHead, &Hive->HiveList); VERIFY_REGISTRY_HIVE(Hive); Modified: trunk/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/registry.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cm/registry.c (original) +++ trunk/reactos/ntoskrnl/cm/registry.c Sat May 12 01:35:56 2007 @@ -32,7 +32,7 @@ POBJECT_TYPE CmpKeyObjectType = NULL; PEREGISTRY_HIVE CmiVolatileHive = NULL; -LIST_ENTRY CmiHiveListHead; +LIST_ENTRY CmpHiveListHead; ERESOURCE CmiRegistryLock; @@ -210,8 +210,9 @@ PSECURITY_DESCRIPTOR SecurityDescriptor; PAGED_CODE(); - /* Initialize the hive list */ - InitializeListHead(&CmiHiveListHead); + /* Initialize the hive list and lock */ + InitializeListHead(&CmpHiveListHead); + ExInitializePushLock((PVOID)&CmpHiveListHeadLock); /* Initialize registry lock */ ExInitializeResourceLite(&CmiRegistryLock); @@ -854,12 +855,11 @@ CmiHiveSyncPending = FALSE; } - /* Acquire hive list lock exclusively */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); - - Entry = CmiHiveListHead.Flink; - while (Entry != &CmiHiveListHead) + /* Lock the hive list */ + ExAcquirePushLockExclusive(&CmpHiveListHeadLock); + + Entry = CmpHiveListHead.Flink; + while (Entry != &CmpHiveListHead) { Hive = CONTAINING_RECORD(Entry, EREGISTRY_HIVE, HiveList); @@ -872,9 +872,8 @@ Entry = Entry->Flink; } - /* Release hive list lock */ - ExReleaseResourceLite(&CmiRegistryLock); - KeLeaveCriticalRegion(); + /* Release the lock */ + ExReleasePushLock(&CmpHiveListHeadLock); DPRINT("CmShutdownRegistry() done\n"); } @@ -890,12 +889,11 @@ CmiHiveSyncPending = FALSE; - /* Acquire hive list lock exclusively */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); - - Entry = CmiHiveListHead.Flink; - while (Entry != &CmiHiveListHead) + /* Lock the hive list */ + ExAcquirePushLockExclusive(&CmpHiveListHeadLock); + + Entry = CmpHiveListHead.Flink; + while (Entry != &CmpHiveListHead) { Hive = CONTAINING_RECORD(Entry, EREGISTRY_HIVE, HiveList); @@ -908,9 +906,8 @@ Entry = Entry->Flink; } - /* Release hive list lock */ - ExReleaseResourceLite(&CmiRegistryLock); - KeLeaveCriticalRegion(); + /* Release the lock */ + ExReleasePushLock(&CmpHiveListHeadLock); DPRINT("DeferredContext 0x%p\n", DeferredContext); ExFreePool(DeferredContext); Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Sat May 12 01:35:56 2007 @@ -675,158 +675,6 @@ CmiCallRegisteredCallbacks(RegNtPostKeyHandleClose, &PostOperationInfo); } - -static NTSTATUS -CmiQuerySecurityDescriptor(PKEY_OBJECT KeyObject, - SECURITY_INFORMATION SecurityInformation, - PISECURITY_DESCRIPTOR SecurityDescriptor, - PULONG BufferLength) -{ - ULONG_PTR Current; - ULONG SidSize; - ULONG SdSize; - NTSTATUS Status; - - DPRINT("CmiQuerySecurityDescriptor() called\n"); - - /* - * FIXME: - * This is a big hack!! - * We need to retrieve the security descriptor from the keys security cell! - */ - - if (SecurityInformation == 0) - { - return STATUS_ACCESS_DENIED; - } - - SidSize = RtlLengthSid(SeWorldSid); - SdSize = sizeof(SECURITY_DESCRIPTOR) + (2 * SidSize); - - if (*BufferLength < SdSize) - { - *BufferLength = SdSize; - return STATUS_BUFFER_TOO_SMALL; - } - - *BufferLength = SdSize; - - Status = RtlCreateSecurityDescriptor(SecurityDescriptor, - SECURITY_DESCRIPTOR_REVISION); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - SecurityDescriptor->Control |= SE_SELF_RELATIVE; - Current = (ULONG_PTR)SecurityDescriptor + sizeof(SECURITY_DESCRIPTOR); - - if (SecurityInformation & OWNER_SECURITY_INFORMATION) - { - RtlCopyMemory((PVOID)Current, - SeWorldSid, - SidSize); - SecurityDescriptor->Owner = (PSID)((ULONG_PTR)Current - (ULONG_PTR)SecurityDescriptor); - Current += SidSize; - } - - if (SecurityInformation & GROUP_SECURITY_INFORMATION) - { - RtlCopyMemory((PVOID)Current, - SeWorldSid, - SidSize); - SecurityDescriptor->Group = (PSID)((ULONG_PTR)Current - (ULONG_PTR)SecurityDescriptor); - Current += SidSize; - } - - if (SecurityInformation & DACL_SECURITY_INFORMATION) - { - SecurityDescriptor->Control |= SE_DACL_PRESENT; - } - - if (SecurityInformation & SACL_SECURITY_INFORMATION) - { - SecurityDescriptor->Control |= SE_SACL_PRESENT; - } - - return STATUS_SUCCESS; -} - - -static NTSTATUS -CmiAssignSecurityDescriptor(PKEY_OBJECT KeyObject, - PSECURITY_DESCRIPTOR SecurityDescriptor) -{ -#if 0 - PEREGISTRY_HIVE Hive; - - DPRINT1("CmiAssignSecurityDescriptor() callled\n"); - - DPRINT1("KeyObject %p\n", KeyObject); - DPRINT1("KeyObject->RegistryHive %p\n", KeyObject->RegistryHive); - - Hive = KeyObject->RegistryHive; - if (Hive == NULL) - { - DPRINT1("Create new root security cell\n"); - return STATUS_SUCCESS; - } - - if (Hive->RootSecurityCell == NULL) - { - DPRINT1("Create new root security cell\n"); - - } - else - { - DPRINT1("Search for security cell\n"); - - } -#endif - - return STATUS_SUCCESS; -} - - -NTSTATUS STDCALL -CmpSecurityMethod(PVOID ObjectBody, - SECURITY_OPERATION_CODE OperationCode, - PSECURITY_INFORMATION SecurityInformation, - PSECURITY_DESCRIPTOR SecurityDescriptor, - PULONG BufferLength, - PSECURITY_DESCRIPTOR *OldSecurityDescriptor, - POOL_TYPE PoolType, - PGENERIC_MAPPING GenericMapping) -{ - DPRINT("CmpSecurityMethod() called\n"); - - switch (OperationCode) - { - case SetSecurityDescriptor: - DPRINT("Set security descriptor\n"); - return STATUS_SUCCESS; - - case QuerySecurityDescriptor: - DPRINT("Query security descriptor\n"); - return CmiQuerySecurityDescriptor((PKEY_OBJECT)ObjectBody, - *SecurityInformation, - SecurityDescriptor, - BufferLength); - - case DeleteSecurityDescriptor: - DPRINT("Delete security descriptor\n"); - return STATUS_SUCCESS; - - case AssignSecurityDescriptor: - DPRINT("Assign security descriptor\n"); - return CmiAssignSecurityDescriptor((PKEY_OBJECT)ObjectBody, - SecurityDescriptor); - } - - return STATUS_UNSUCCESSFUL; -} - - NTSTATUS STDCALL CmpQueryKeyName (PVOID ObjectBody, IN BOOLEAN HasName, Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Sat May 12 01:35:56 2007 @@ -696,11 +696,11 @@ // // Registry Validation Functions // -BOOLEAN +ULONG NTAPI CmCheckRegistry( IN PCMHIVE Hive, - IN BOOLEAN CleanFlag + IN ULONG Flags ); // @@ -1002,6 +1002,57 @@ IN INTERFACE_TYPE InterfaceType, IN ULONG BusNumber, IN PUSHORT DeviceIndexTable +); + +// +// Wrapper Routines +// +PVOID +NTAPI +CmpAllocate( + IN ULONG Size, + IN BOOLEAN Paged +); + +VOID +NTAPI +CmpFree( + IN PVOID Ptr +); + +BOOLEAN +NTAPI +CmpFileRead( + IN PHHIVE RegistryHive, + IN ULONG FileType, + IN ULONGLONG FileOffset, + OUT PVOID Buffer, + IN SIZE_T BufferLength +); + +BOOLEAN +NTAPI +CmpFileWrite( + IN PHHIVE RegistryHive, + IN ULONG FileType, + IN ULONGLONG FileOffset, + IN PVOID Buffer, + IN SIZE_T BufferLength +); + +BOOLEAN +NTAPI +CmpFileSetSize( + IN PHHIVE RegistryHive, + IN ULONG FileType, + IN ULONGLONG FileSize +); + +BOOLEAN +NTAPI +CmpFileFlush( + IN PHHIVE RegistryHive, + IN ULONG FileType ); // Added: trunk/reactos/ntoskrnl/config/cmcheck.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmcheck.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmcheck.c (added) +++ trunk/reactos/ntoskrnl/config/cmcheck.c Sat May 12 01:35:56 2007 @@ -1,0 +1,27 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/cmcheck.c + * PURPOSE: Configuration Manager - Hive and Key Validation + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "ntoskrnl.h" +#include "cm.h" +#define NDEBUG +#include "debug.h" + +/* GLOBALS *******************************************************************/ + +/* FUNCTIONS *****************************************************************/ + +ULONG +NTAPI +CmCheckRegistry(IN PCMHIVE RegistryHive, + IN ULONG Flags) +{ + /* FIXME: HACK! */ + return 0; +} Modified: trunk/reactos/ntoskrnl/config/cmdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmdata.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmdata.c (original) +++ trunk/reactos/ntoskrnl/config/cmdata.c Sat May 12 01:35:56 2007 @@ -35,6 +35,8 @@ ULONG CmpConfigurationAreaSize = PAGE_SIZE * 4; PCM_FULL_RESOURCE_DESCRIPTOR CmpConfigurationData; + +EX_PUSH_LOCK CmpHiveListHeadLock; UNICODE_STRING CmTypeName[MaximumType + 1] = { Added: trunk/reactos/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cminit.c (added) +++ trunk/reactos/ntoskrnl/config/cminit.c Sat May 12 01:35:56 2007 @@ -1,0 +1,228 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/cminit.c + * PURPOSE: Configuration Manager - Hive Initialization + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "ntoskrnl.h" +#include "cm.h" +#define NDEBUG +#include "debug.h" + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +CmpInitializeHive(OUT PCMHIVE *RegistryHive, + IN ULONG OperationType, + IN ULONG HiveFlags, + IN ULONG FileType, + IN PVOID HiveData OPTIONAL, + IN HANDLE Primary, + IN HANDLE Log, + IN HANDLE External, + IN PUNICODE_STRING FileName OPTIONAL, + IN ULONG CheckFlags) +{ +#if 0 + PCMHIVE Hive; +#else + PEREGISTRY_HIVE Hive; +#endif + IO_STATUS_BLOCK IoStatusBlock; + FILE_FS_SIZE_INFORMATION FileSizeInformation; + NTSTATUS Status; + ULONG Cluster; + + /* Assume failure */ + *RegistryHive = NULL; + + /* + * The following are invalid: + * An external hive that is also internal. + * A log hive that's not a primary hive too. + * A volatile hive that's linked to permanent storage. + * An in-memory initialization without hive data. + * A log hive that's not linked to a correct file type. + */ + if (((External) && ((Primary) || (Log))) || + ((Log) && !(Primary)) || + ((HiveFlags & HIVE_VOLATILE) && ((Primary) || (External) || (Log))) || + ((OperationType == HINIT_MEMORY) && (!HiveData)) || + ((Log) && (FileType != HFILE_TYPE_LOG))) + { + /* Fail the request */ + return STATUS_INVALID_PARAMETER; + } + + /* Check if this is a primary hive */ + if (Primary) + { + /* Get the cluster size */ + Status = ZwQueryVolumeInformationFile(Primary, + &IoStatusBlock, + &FileSizeInformation, + sizeof(FILE_FS_SIZE_INFORMATION), + FileFsSizeInformation); + if (!NT_SUCCESS(Status)) return Status; + + /* Make sure it's not larger then the block size */ + if (FileSizeInformation.BytesPerSector > HBLOCK_SIZE) + { + /* Fail */ + return STATUS_REGISTRY_IO_FAILED; + } + + /* Otherwise, calculate the cluster */ + Cluster = FileSizeInformation.BytesPerSector / HSECTOR_SIZE; + Cluster = max(1, Cluster); + } + else + { + /* Otherwise use cluster 1 */ + Cluster = 1; + } + + /* Allocate the hive */ + Hive = ExAllocatePoolWithTag(NonPagedPool, sizeof(EREGISTRY_HIVE), TAG_CM); + if (!Hive) return STATUS_INSUFFICIENT_RESOURCES; +#if 0 + /* Setup null fields */ + Hive->UnloadEvent = NULL; + Hive->RootKcb = NULL; + Hive->Frozen = FALSE; + Hive->UnloadWorkItem = NULL; + Hive->GrowOnlyMode = FALSE; + Hive->GrowOffset = 0; + Hive->CellRemapArray = NULL; + Hive->UseCountLog.Next = 0; + Hive->LockHiveLog.Next = 0; + Hive->FileObject = NULL; + Hive->NotifyList.Flink = NULL; + Hive->NotifyList.Blink = NULL; + + /* Set loading flag */ + Hive->HiveIsLoading = TRUE; + + /* Set the current thread as creator */ + Hive->CreatorOwner = KeGetCurrentThread(); + + /* Initialize lists */ + InitializeListHead(&Hive->KcbConvertListHead); + InitializeListHead(&Hive->KnodeConvertListHead); + InitializeListHead(&Hive->TrustClassEntry); + + /* Allocate the view log */ + Hive->ViewLock = ExAllocatePoolWithTag(NonPagedPool, + sizeof(KGUARDED_MUTEX), + TAG_CM); + if (!Hive->ViewLock) return STATUS_INSUFFICIENT_RESOURCES; + + /* Allocate the flush lock */ + Hive->FlusherLock = ExAllocatePoolWithTag(NonPagedPool, + sizeof(ERESOURCE), + TAG_CM); + if (!Hive->FlusherLock) return STATUS_INSUFFICIENT_RESOURCES; + + /* Setup the handles */ + Hive->FileHandles[HFILE_TYPE_PRIMARY] = Primary; + Hive->FileHandles[HFILE_TYPE_LOG] = Log; + Hive->FileHandles[HFILE_TYPE_EXTERNAL] = External; + + /* Initailize the guarded mutex */ + KeInitializeGuardedMutex(Hive->ViewLock); + Hive->ViewLockOwner = NULL; + + /* Initialize the flush lock */ + ExInitializeResourceLite(Hive->FlusherLock); + + /* Setup hive locks */ + ExInitializePushLock(&Hive->HiveLock); + Hive->HiveLockOwner = NULL; + ExInitializePushLock(&Hive->WriterLock); + Hive->WriterLockOwner = NULL; + ExInitializePushLock(&Hive->SecurityLock); + Hive->HiveSecurityLockOwner = NULL; + + /* Clear file names */ + RtlInitEmptyUnicodeString(&Hive->FileUserName, NULL, 0); + RtlInitEmptyUnicodeString(&Hive->FileFullPath, NULL, 0); + + /* Initialize the view list */ + CmpInitializeHiveViewList(Hive); + + /* Initailize the security cache */ + CmpInitializeSecurityCache(Hive); + + /* Setup flags */ + Hive->Flags = 0; + Hive->FlushCount = 0; +#else + /* Clear it */ + RtlZeroMemory(Hive, sizeof(EREGISTRY_HIVE)); + + /* Set flags */ + Hive->Flags = HiveFlags; +#endif + + /* Initialize it */ + Status = HvInitialize(&Hive->Hive, + OperationType, + HiveFlags, + FileType, + (ULONG_PTR)HiveData, + Cluster, + CmpAllocate, + CmpFree, + CmpFileRead, + CmpFileWrite, + CmpFileSetSize, + CmpFileFlush, + FileName); + if (!NT_SUCCESS(Status)) + { + /* Clear allocations and fail */ +#if 0 + ExFreePool(Hive->ViewLock); + ExFreePool(Hive->FlusherLock); +#endif + ExFreePool(Hive); + return Status; + } + + /* Check if we should verify the registry */ + if ((OperationType == HINIT_FILE) || + (OperationType == HINIT_MEMORY) || + (OperationType == HINIT_MEMORY_INPLACE) || + (OperationType == HINIT_MAPFILE)) + { + /* Verify integrity */ + if (CmCheckRegistry((PCMHIVE)Hive, TRUE)) + { + /* Free all alocations */ +#if 0 + ExFreePool(Hive->ViewLock); + ExFreePool(Hive->FlusherLock); +#endif + ExFreePool(Hive); + return STATUS_REGISTRY_CORRUPT; + } + } + + /* Lock the hive list */ + ExAcquirePushLockExclusive(&CmpHiveListHeadLock); + + /* Insert this hive */ + InsertHeadList(&CmpHiveListHead, &Hive->HiveList); + + /* Release the lock */ + ExReleasePushLock(&CmpHiveListHeadLock); + + /* Return the hive and success */ + *RegistryHive = (PCMHIVE)Hive; + return STATUS_SUCCESS; +} Modified: trunk/reactos/ntoskrnl/config/cmse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmse.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmse.c (original) +++ trunk/reactos/ntoskrnl/config/cmse.c Sat May 12 01:35:56 2007 @@ -136,3 +136,18 @@ /* Return the security descriptor */ return SecurityDescriptor; } + +NTSTATUS +NTAPI +CmpSecurityMethod(IN PVOID ObjectBody, + IN SECURITY_OPERATION_CODE OperationCode, + IN PSECURITY_INFORMATION SecurityInformation, + IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor, + IN OUT PULONG BufferLength, + IN OUT PSECURITY_DESCRIPTOR *OldSecurityDescriptor, + IN POOL_TYPE PoolType, + IN PGENERIC_MAPPING GenericMapping) +{ + /* HACK */ + return STATUS_SUCCESS; +} Added: trunk/reactos/ntoskrnl/config/cmwraprs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmwraprs.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmwraprs.c (added) +++ trunk/reactos/ntoskrnl/config/cmwraprs.c Sat May 12 01:35:56 2007 @@ -1,0 +1,119 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/cmwraprs.c + * PURPOSE: Configuration Manager - Wrappers for Hive Operations + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "ntoskrnl.h" +#include "cm.h" +#define NDEBUG +#include "debug.h" + +/* FUNCTIONS *****************************************************************/ + +PVOID +NTAPI +CmpAllocate(IN ULONG Size, + IN BOOLEAN Paged) +{ + return ExAllocatePoolWithTag(Paged ? PagedPool : NonPagedPool, + Size, + TAG('R','E','G',' ')); +} + +VOID +NTAPI +CmpFree(IN PVOID Ptr) +{ + ExFreePool(Ptr); +} + +BOOLEAN +NTAPI +CmpFileRead(IN PHHIVE RegistryHive, + IN ULONG FileType, + IN ULONGLONG FileOffset, + OUT PVOID Buffer, + IN SIZE_T BufferLength) +{ + PEREGISTRY_HIVE CmHive = (PEREGISTRY_HIVE)RegistryHive; + HANDLE HiveHandle = FileType == HV_TYPE_PRIMARY ? CmHive->HiveHandle : CmHive->LogHandle; + LARGE_INTEGER _FileOffset; + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + _FileOffset.QuadPart = FileOffset; + Status = ZwReadFile(HiveHandle, 0, 0, 0, &IoStatusBlock, + Buffer, BufferLength, &_FileOffset, 0); + return NT_SUCCESS(Status) ? TRUE : FALSE; +} + +BOOLEAN +NTAPI +CmpFileWrite(IN PHHIVE RegistryHive, + IN ULONG FileType, + IN ULONGLONG FileOffset, + IN PVOID Buffer, + IN SIZE_T BufferLength) +{ + PEREGISTRY_HIVE CmHive = (PEREGISTRY_HIVE)RegistryHive; + HANDLE HiveHandle = FileType == HV_TYPE_PRIMARY ? CmHive->HiveHandle : CmHive->LogHandle; + LARGE_INTEGER _FileOffset; + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + _FileOffset.QuadPart = FileOffset; + Status = ZwWriteFile(HiveHandle, 0, 0, 0, &IoStatusBlock, + Buffer, BufferLength, &_FileOffset, 0); + return NT_SUCCESS(Status) ? TRUE : FALSE; +} + +BOOLEAN +NTAPI +CmpFileSetSize(IN PHHIVE RegistryHive, + IN ULONG FileType, + IN ULONGLONG FileSize) +{ + PEREGISTRY_HIVE CmHive = (PEREGISTRY_HIVE)RegistryHive; + HANDLE HiveHandle = FileType == HV_TYPE_PRIMARY ? CmHive->HiveHandle : CmHive->LogHandle; + FILE_END_OF_FILE_INFORMATION EndOfFileInfo; + FILE_ALLOCATION_INFORMATION FileAllocationInfo; + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + EndOfFileInfo.EndOfFile.QuadPart = FileSize; + Status = ZwSetInformationFile(HiveHandle, + &IoStatusBlock, + &EndOfFileInfo, + sizeof(FILE_END_OF_FILE_INFORMATION), + FileEndOfFileInformation); + if (!NT_SUCCESS(Status)) return FALSE; + + FileAllocationInfo.AllocationSize.QuadPart = FileSize; + Status = ZwSetInformationFile(HiveHandle, + &IoStatusBlock, + &FileAllocationInfo, + sizeof(FILE_ALLOCATION_INFORMATION), + FileAllocationInformation); + if (!NT_SUCCESS(Status)) return FALSE; + + return TRUE; +} + +BOOLEAN +NTAPI +CmpFileFlush(IN PHHIVE RegistryHive, + IN ULONG FileType) +{ + PEREGISTRY_HIVE CmHive = (PEREGISTRY_HIVE)RegistryHive; + HANDLE HiveHandle = FileType == HV_TYPE_PRIMARY ? CmHive->HiveHandle : CmHive->LogHandle; + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + Status = ZwFlushBuffersFile(HiveHandle, &IoStatusBlock); + return NT_SUCCESS(Status) ? TRUE : FALSE; +} Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Sat May 12 01:35:56 2007 @@ -90,10 +90,12 @@ </directory> </if> <file>cmboot.c</file> + <file>cmcheck.c</file> <file>cmcontrl.c</file> <file>cmconfig.c</file> <file>cmdata.c</file> <file>cmindex.c</file> + <file>cminit.c</file> <file>cmhook.c</file> <file>cmkcbncb.c</file> <file>cmmapvw.c</file> @@ -103,6 +105,7 @@ <file>cmsecach.c</file> <file>cmsysini.c</file> <file>cmvalue.c</file> + <file>cmwraprs.c</file> </directory> <directory name="cm"> <file>ntfunc.c</file>

1 0

[ion] 26703: - Move CmpCreateRootNode and CmpCreateRegistryRoot to cmsysini.c as well, and add some fixes to CmpCreateRegistryRoot to make it compatible with the Cm Rewrite when it's done. - Initialize some stuff that wasn't being initialized in CmpCreateRootNode. - Use CmpHiveRootSecurityDescriptor in CmpCreateRegistryRoot to protect the key. - Save the root handle globally so we can close it during shutdown. - Add cmkcbncb.c with an empty stub for CmpCreateKeyControlBlock. Will copy from Cm re
by ion＠svn.reactos.org 11 May '07

11 May '07

Author: ion Date: Fri May 11 23:34:11 2007 New Revision: 26703 URL: http://svn.reactos.org/svn/reactos?rev=26703&view=rev Log: - Move CmpCreateRootNode and CmpCreateRegistryRoot to cmsysini.c as well, and add some fixes to CmpCreateRegistryRoot to make it compatible with the Cm Rewrite when it's done. - Initialize some stuff that wasn't being initialized in CmpCreateRootNode. - Use CmpHiveRootSecurityDescriptor in CmpCreateRegistryRoot to protect the key. - Save the root handle globally so we can close it during shutdown. - Add cmkcbncb.c with an empty stub for CmpCreateKeyControlBlock. Will copy from Cm rewrite branch later. - Properly name fields of CM_KEY_NODE in the headers of the /config tree. Added: trunk/reactos/ntoskrnl/config/cmkcbncb.c Modified: trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=26703… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Fri May 11 23:34:11 2007 @@ -486,6 +486,16 @@ NTAPI CmpCreateObjectTypes(VOID); +BOOLEAN +NTAPI +CmpCreateRootNode(IN PHHIVE Hive, + IN PCWSTR Name, + OUT PHCELL_INDEX Index); + +BOOLEAN +NTAPI +CmpCreateRegistryRoot(VOID); + #if 0 static __inline PVOID xHvGetCell(char *file, int line, PHHIVE Hive, HCELL_INDEX Cell) { Modified: trunk/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/registry.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cm/registry.c (original) +++ trunk/reactos/ntoskrnl/cm/registry.c Fri May 11 23:34:11 2007 @@ -159,6 +159,15 @@ return (PVOID)(MdBlock->BasePage << PAGE_SHIFT); } +VOID +NTAPI +EnlistKeyBodyWithKCB(IN PKEY_OBJECT KeyObject, + IN ULONG Flags) +{ + /* Insert it into the global list (we don't have KCBs here) */ + InsertTailList(&CmiKeyObjectListHead, &KeyObject->ListEntry); +} + NTSTATUS NTAPI CmpLinkHiveToMaster(IN PUNICODE_STRING LinkName, @@ -181,142 +190,6 @@ /* Connect the hive */ return CmiConnectHive(&ObjectAttributes, RegistryHive); -} - -BOOLEAN -NTAPI -CmpCreateRootNode(IN PHHIVE Hive, - IN PCWSTR Name, - OUT PHCELL_INDEX Index) -{ - UNICODE_STRING KeyName; - PCM_KEY_NODE KeyCell; - LARGE_INTEGER SystemTime; - PAGED_CODE(); - - /* Initialize the node name and allocate it */ - RtlInitUnicodeString(&KeyName, Name); - *Index = HvAllocateCell(Hive, - FIELD_OFFSET(CM_KEY_NODE, Name) + - CmpNameSize(Hive, &KeyName), - HvStable); // FIXME: , HCELL_NIL); - if (*Index == HCELL_NIL) return FALSE; - - /* Set the cell index and get the data */ - Hive->HiveHeader->RootCell = *Index; - KeyCell = (PCM_KEY_NODE)HvGetCell(Hive, *Index); - if (!KeyCell) return FALSE; - - /* Setup the cell */ - KeyCell->Id = (USHORT)CM_KEY_NODE_SIGNATURE;; - KeyCell->Flags = KEY_HIVE_ENTRY | KEY_NO_DELETE; - KeQuerySystemTime(&SystemTime); - KeyCell->LastWriteTime = SystemTime; - KeyCell->Parent = HCELL_NIL; - KeyCell->SubKeyCounts[HvStable] = 0; - KeyCell->SubKeyCounts[HvVolatile] = 0; - KeyCell->SubKeyLists[HvStable] = HCELL_NIL; - KeyCell->SubKeyLists[HvVolatile] = HCELL_NIL; - KeyCell->ValueList.Count = 0; - KeyCell->ValueList.List = HCELL_NIL; - KeyCell->SecurityKeyOffset = HCELL_NIL; - KeyCell->ClassNameOffset = HCELL_NIL; - KeyCell->ClassSize = 0; - - /* Copy the name (this will also set the length) */ - KeyCell->NameSize = CmpCopyName(Hive, (PWCHAR)KeyCell->Name, &KeyName); - - /* Check if the name was compressed */ - if (KeyCell->NameSize < KeyName.Length) - { - /* Set the flag */ - KeyCell->Flags |= KEY_COMP_NAME; - } - - /* Return success */ - HvReleaseCell(Hive, *Index); - return TRUE; -} - -BOOLEAN -NTAPI -CmpCreateRegistryRoot(VOID) -{ - UNICODE_STRING KeyName; - OBJECT_ATTRIBUTES ObjectAttributes; - PKEY_OBJECT RootKey; - HANDLE RootKeyHandle; - HCELL_INDEX RootIndex; - NTSTATUS Status; - PCM_KEY_NODE KeyCell; - PAGED_CODE(); - - /* Setup the root node */ - if (!CmpCreateRootNode(&CmiVolatileHive->Hive, L"REGISTRY", &RootIndex)) - { - /* We failed */ - return FALSE; - } - - /* Create '\Registry' key. */ - RtlInitUnicodeString(&KeyName, REG_ROOT_KEY_NAME); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ObCreateObject(KernelMode, - CmpKeyObjectType, - &ObjectAttributes, - KernelMode, - NULL, - sizeof(KEY_OBJECT), - 0, - 0, - (PVOID*)&RootKey); - if (!NT_SUCCESS(Status)) return FALSE; - - /* Sanity check, and get the key cell */ - ASSERT((&CmiVolatileHive->Hive)->ReleaseCellRoutine == NULL); - KeyCell = (PCM_KEY_NODE)HvGetCell(&CmiVolatileHive->Hive, RootIndex); - if (!KeyCell) return FALSE; - - /* Setup the root key */ - RootKey->RegistryHive = CmiVolatileHive; - RootKey->KeyCellOffset = RootIndex; - RootKey->KeyCell = KeyCell; - RootKey->ParentKey = RootKey; - RootKey->Flags = 0; - RootKey->SubKeyCounts = 0; - RootKey->SubKeys = NULL; - RootKey->SizeOfSubKeys = 0; - - /* Insert it into the object list head */ - InsertTailList(&CmiKeyObjectListHead, &RootKey->ListEntry); - - /* Setup the name */ - RtlpCreateUnicodeString(&RootKey->Name, L"Registry", NonPagedPool); - - /* Insert the key into the namespace */ - Status = ObInsertObject(RootKey, - NULL, - KEY_ALL_ACCESS, - 0, - NULL, - &RootKeyHandle); - if (!NT_SUCCESS(Status)) return FALSE; - - /* Reference the key again so that we never lose it */ - Status = ObReferenceObjectByHandle(RootKeyHandle, - KEY_READ, - NULL, - KernelMode, - (PVOID*)&RootKey, - NULL); - if (!NT_SUCCESS(Status)) return FALSE; - - /* Completely sucessful */ - return TRUE; } BOOLEAN Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Fri May 11 23:34:11 2007 @@ -145,7 +145,7 @@ #define CMP_HASH_PRIME 1000000007 // -// CmpCreateKcb Flags +// CmpCreateKeyControlBlock Flags // #define CMP_CREATE_FAKE_KCB 0x1 #define CMP_LOCK_HASHES_FOR_KCB 0x2 @@ -468,7 +468,7 @@ typedef struct _CM_KEY_NODE { - USHORT Id; + USHORT Signature; USHORT Flags; LARGE_INTEGER LastWriteTime; ULONG Spare; @@ -476,15 +476,15 @@ ULONG SubKeyCounts[HvMaxStorageType]; HCELL_INDEX SubKeyLists[HvMaxStorageType]; CHILD_LIST ValueList; - HCELL_INDEX SecurityKeyOffset; - HCELL_INDEX ClassNameOffset; + HCELL_INDEX Security; + HCELL_INDEX Class; ULONG MaxNameLen; ULONG MaxClassLen; ULONG MaxValueNameLen; ULONG MaxValueDataLen; ULONG WorkVar; USHORT NameLength; - USHORT ClassSize; + USHORT ClassLength; WCHAR Name[0]; } CM_KEY_NODE, *PCM_KEY_NODE; @@ -637,6 +637,44 @@ PULONG Type; } CM_SYSTEM_CONTROL_VECTOR, *PCM_SYSTEM_CONTROL_VECTOR; +/////////////////////////////////////////////////////////////////////////////// +// +// BUGBUG Old Hive Stuff for Temporary Support +// +#define SYSTEM_REG_FILE L"\\SystemRoot\\System32\\Config\\SYSTEM" +#define SYSTEM_LOG_FILE L"\\SystemRoot\\System32\\Config\\SYSTEM.log" +#define REG_SYSTEM_KEY_NAME L"\\Registry\\Machine\\SYSTEM" +typedef struct _EREGISTRY_HIVE +{ + HHIVE Hive; + LIST_ENTRY HiveList; + UNICODE_STRING HiveFileName; + UNICODE_STRING LogFileName; + PCM_KEY_SECURITY RootSecurityCell; + ULONG Flags; + HANDLE HiveHandle; + HANDLE LogHandle; +} EREGISTRY_HIVE, *PEREGISTRY_HIVE; +typedef struct _KEY_OBJECT +{ + CSHORT Type; + CSHORT Size; + ULONG Flags; + UNICODE_STRING Name; + PEREGISTRY_HIVE RegistryHive; + HCELL_INDEX KeyCellOffset; + PCM_KEY_NODE KeyCell; + struct _KEY_OBJECT *ParentKey; + LIST_ENTRY ListEntry; + ULONG SubKeyCounts; + ULONG SizeOfSubKeys; + struct _KEY_OBJECT **SubKeys; + ULONG TimeStamp; + LIST_ENTRY HiveList; +} KEY_OBJECT, *PKEY_OBJECT; +extern PEREGISTRY_HIVE CmiVolatileHive; +/////////////////////////////////////////////////////////////////////////////// + // // Mapped View Hive Functions // @@ -827,7 +865,7 @@ // PCM_KEY_CONTROL_BLOCK NTAPI -CmpCreateKcb( +CmpCreateKeyControlBlock( IN PHHIVE Hive, IN HCELL_INDEX Index, IN PCM_KEY_NODE Node, @@ -841,6 +879,17 @@ CmpDereferenceKcbWithLock( IN PCM_KEY_CONTROL_BLOCK Kcb, IN BOOLEAN LockHeldExclusively +); + +VOID +NTAPI +EnlistKeyBodyWithKCB( +#if 0 + IN PCM_KEY_BODY KeyObject, +#else + IN PKEY_OBJECT KeyObject, +#endif + IN ULONG Flags ); // @@ -983,24 +1032,6 @@ extern BOOLEAN ExpInTextModeSetup; // -// BUGBUG Old Hive Stuff for Temporary Support -// -#define SYSTEM_REG_FILE L"\\SystemRoot\\System32\\Config\\SYSTEM" -#define SYSTEM_LOG_FILE L"\\SystemRoot\\System32\\Config\\SYSTEM.log" -#define REG_SYSTEM_KEY_NAME L"\\Registry\\Machine\\SYSTEM" -typedef struct _EREGISTRY_HIVE -{ - HHIVE Hive; - LIST_ENTRY HiveList; - UNICODE_STRING HiveFileName; - UNICODE_STRING LogFileName; - PCM_KEY_SECURITY RootSecurityCell; - ULONG Flags; - HANDLE HiveHandle; - HANDLE LogHandle; -} EREGISTRY_HIVE, *PEREGISTRY_HIVE; - -// // Inlined functions // #include "cm_x.h" Added: trunk/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkcbncb.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmkcbncb.c (added) +++ trunk/reactos/ntoskrnl/config/cmkcbncb.c Fri May 11 23:34:11 2007 @@ -1,0 +1,31 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/cmkcbncb.c + * PURPOSE: Configuration Manager - Key Control and Name Control Blocks + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "ntoskrnl.h" +#include "cm.h" +#define NDEBUG +#include "debug.h" + +/* GLOBALS *******************************************************************/ + +/* FUNCTIONS *****************************************************************/ + +PCM_KEY_CONTROL_BLOCK +NTAPI +CmpCreateKeyControlBlock(IN PHHIVE Hive, + IN HCELL_INDEX Index, + IN PCM_KEY_NODE Node, + IN PCM_KEY_CONTROL_BLOCK Parent, + IN ULONG Flags, + IN PUNICODE_STRING KeyName) +{ + /* Temporary hack */ + return (PVOID)1; +} Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Fri May 11 23:34:11 2007 @@ -27,6 +27,8 @@ BOOLEAN CmSelfHeal = TRUE; BOOLEAN CmpSelfHeal = TRUE; ULONG CmpBootType; + +HANDLE CmpRegistryRootHandle; extern BOOLEAN ExpInTextModeSetup; @@ -480,3 +482,164 @@ return ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &CmpKeyObjectType); } +BOOLEAN +NTAPI +CmpCreateRootNode(IN PHHIVE Hive, + IN PCWSTR Name, + OUT PHCELL_INDEX Index) +{ + UNICODE_STRING KeyName; + PCM_KEY_NODE KeyCell; + LARGE_INTEGER SystemTime; + PAGED_CODE(); + + /* Initialize the node name and allocate it */ + RtlInitUnicodeString(&KeyName, Name); + *Index = HvAllocateCell(Hive, + FIELD_OFFSET(CM_KEY_NODE, Name) + + CmpNameSize(Hive, &KeyName), + HvStable); // FIXME: , HCELL_NIL); + if (*Index == HCELL_NIL) return FALSE; + + /* Set the cell index and get the data */ + Hive->HiveHeader->RootCell = *Index; + KeyCell = (PCM_KEY_NODE)HvGetCell(Hive, *Index); + if (!KeyCell) return FALSE; + + /* Setup the cell */ + KeyCell->Signature = (USHORT)CM_KEY_NODE_SIGNATURE;; + KeyCell->Flags = KEY_HIVE_ENTRY | KEY_NO_DELETE; + KeQuerySystemTime(&SystemTime); + KeyCell->LastWriteTime = SystemTime; + KeyCell->Parent = HCELL_NIL; + KeyCell->SubKeyCounts[HvStable] = 0; + KeyCell->SubKeyCounts[HvVolatile] = 0; + KeyCell->SubKeyLists[HvStable] = HCELL_NIL; + KeyCell->SubKeyLists[HvVolatile] = HCELL_NIL; + KeyCell->ValueList.Count = 0; + KeyCell->ValueList.List = HCELL_NIL; + KeyCell->Security = HCELL_NIL; + KeyCell->Class = HCELL_NIL; + KeyCell->ClassLength = 0; + KeyCell->MaxNameLen = 0; + KeyCell->MaxClassLen = 0; + KeyCell->MaxValueNameLen = 0; + KeyCell->MaxValueDataLen = 0; + + /* Copy the name (this will also set the length) */ + KeyCell->NameLength = CmpCopyName(Hive, (PWCHAR)KeyCell->Name, &KeyName); + + /* Check if the name was compressed */ + if (KeyCell->NameLength < KeyName.Length) + { + /* Set the flag */ + KeyCell->Flags |= KEY_COMP_NAME; + } + + /* Return success */ + HvReleaseCell(Hive, *Index); + return TRUE; +} + +BOOLEAN +NTAPI +CmpCreateRegistryRoot(VOID) +{ + UNICODE_STRING KeyName; + OBJECT_ATTRIBUTES ObjectAttributes; +#if 0 + PCM_KEY_BODY RootKey; +#else + PKEY_OBJECT RootKey; +#endif + HCELL_INDEX RootIndex; + NTSTATUS Status; + PCM_KEY_NODE KeyCell; + PSECURITY_DESCRIPTOR SecurityDescriptor; + PCM_KEY_CONTROL_BLOCK Kcb; + PAGED_CODE(); + + /* Setup the root node */ + if (!CmpCreateRootNode(&CmiVolatileHive->Hive, L"REGISTRY", &RootIndex)) + { + /* We failed */ + return FALSE; + } + + /* Create '\Registry' key. */ + RtlInitUnicodeString(&KeyName, L"\\Registry"); + SecurityDescriptor = CmpHiveRootSecurityDescriptor(); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ObCreateObject(KernelMode, + CmpKeyObjectType, + &ObjectAttributes, + KernelMode, + NULL, + sizeof(KEY_OBJECT), + 0, + 0, + (PVOID*)&RootKey); + ExFreePool(SecurityDescriptor); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Sanity check, and get the key cell */ + ASSERT((&CmiVolatileHive->Hive)->ReleaseCellRoutine == NULL); + KeyCell = (PCM_KEY_NODE)HvGetCell(&CmiVolatileHive->Hive, RootIndex); + if (!KeyCell) return FALSE; + + /* Create the KCB */ + RtlInitUnicodeString(&KeyName, L"Registry"); + Kcb = CmpCreateKeyControlBlock(&CmiVolatileHive->Hive, + RootIndex, + KeyCell, + NULL, + 0, + &KeyName); + if (!Kcb) return FALSE; + + /* Initialize the object */ +#if 0 + RootKey->Type = TAG('k', 'v', '0', '2'; + RootKey->KeyControlBlock = Kcb; + RootKey->NotifyBlock = NULL; + RootKey->ProcessID = PsGetCurrentProcessId(); +#else + RtlpCreateUnicodeString(&RootKey->Name, L"Registry", NonPagedPool); + RootKey->RegistryHive = CmiVolatileHive; + RootKey->KeyCellOffset = RootIndex; + RootKey->KeyCell = KeyCell; + RootKey->ParentKey = RootKey; + RootKey->Flags = 0; + RootKey->SubKeyCounts = 0; + RootKey->SubKeys = NULL; + RootKey->SizeOfSubKeys = 0; +#endif + + /* Insert it into the object list head */ + EnlistKeyBodyWithKCB(RootKey, 0); + + /* Insert the key into the namespace */ + Status = ObInsertObject(RootKey, + NULL, + KEY_ALL_ACCESS, + 0, + NULL, + &CmpRegistryRootHandle); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Reference the key again so that we never lose it */ + Status = ObReferenceObjectByHandle(CmpRegistryRootHandle, + KEY_READ, + NULL, + KernelMode, + (PVOID*)&RootKey, + NULL); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Completely sucessful */ + return TRUE; +} Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Fri May 11 23:34:11 2007 @@ -95,6 +95,7 @@ <file>cmdata.c</file> <file>cmindex.c</file> <file>cmhook.c</file> + <file>cmkcbncb.c</file> <file>cmmapvw.c</file> <file>cmname.c</file> <file>cmparse.c</file>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs