Ros-diffs November 2023

ros-diffs@reactos.org

20 participants
274 discussions

[reactos] 07/15: [NTOS:CM] Use the appropriate flags on functions that will call CmCheckRegistry & add missing CmCheckRegistry calls

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d2b8b9ec9689443ed311c… commit d2b8b9ec9689443ed311cf6821f2723054aca1b1 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Wed Oct 26 19:59:21 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun Nov 19 20:44:27 2023 +0100 [NTOS:CM] Use the appropriate flags on functions that will call CmCheckRegistry & add missing CmCheckRegistry calls In addition to that, in some functions like CmFlushKey, CmSaveKey and CmSaveMergedKeys we must validate the underlying hives as a matter of precaution that everything is alright and we don't fuck all the shit up. --- ntoskrnl/config/cmapi.c | 69 ++++++++++++++++++++++++++++++++++++++++++++-- ntoskrnl/config/cminit.c | 4 +-- ntoskrnl/config/cmsysini.c | 10 +++---- 3 files changed, 73 insertions(+), 10 deletions(-) diff --git a/ntoskrnl/config/cmapi.c b/ntoskrnl/config/cmapi.c index e21eea3b793..287caecf245 100644 --- a/ntoskrnl/config/cmapi.c +++ b/ntoskrnl/config/cmapi.c @@ -1939,6 +1939,9 @@ CmFlushKey(IN PCM_KEY_CONTROL_BLOCK Kcb, IN BOOLEAN ExclusiveLock) { PCMHIVE CmHive; +#if DBG + CM_CHECK_REGISTRY_STATUS CheckStatus; +#endif NTSTATUS Status = STATUS_SUCCESS; PHHIVE Hive; @@ -1957,6 +1960,12 @@ CmFlushKey(IN PCM_KEY_CONTROL_BLOCK Kcb, } else { +#if DBG + /* Make sure the registry hive we're going to flush is OK */ + CheckStatus = CmCheckRegistry(CmHive, CM_CHECK_REGISTRY_DONT_PURGE_VOLATILES | CM_CHECK_REGISTRY_VALIDATE_HIVE); + ASSERT(CM_CHECK_REGISTRY_SUCCESS(CheckStatus)); +#endif + /* Don't touch the hive */ CmpLockHiveFlusherExclusive(CmHive); @@ -2054,7 +2063,7 @@ CmLoadKey(IN POBJECT_ATTRIBUTES TargetKey, &ClientSecurityContext, &Allocate, &CmHive, - 0); + CM_CHECK_REGISTRY_PURGE_VOLATILES); /* Get rid of the security context */ SeDeleteClientSecurity(&ClientSecurityContext); @@ -2645,6 +2654,10 @@ CmSaveKey(IN PCM_KEY_CONTROL_BLOCK Kcb, IN HANDLE FileHandle, IN ULONG Flags) { +#if DBG + CM_CHECK_REGISTRY_STATUS CheckStatus; + PCMHIVE HiveToValidate = NULL; +#endif NTSTATUS Status = STATUS_SUCCESS; PCMHIVE KeyHive = NULL; PAGED_CODE(); @@ -2655,6 +2668,11 @@ CmSaveKey(IN PCM_KEY_CONTROL_BLOCK Kcb, CmpLockRegistry(); CmpAcquireKcbLockShared(Kcb); +#if DBG + /* Get the hive for validation */ + HiveToValidate = (PCMHIVE)Kcb->KeyHive; +#endif + if (Kcb->Delete) { /* The source key has been deleted, do nothing */ @@ -2669,6 +2687,12 @@ CmSaveKey(IN PCM_KEY_CONTROL_BLOCK Kcb, goto Cleanup; } +#if DBG + /* Make sure this control block has a sane hive */ + CheckStatus = CmCheckRegistry(HiveToValidate, CM_CHECK_REGISTRY_DONT_PURGE_VOLATILES | CM_CHECK_REGISTRY_VALIDATE_HIVE); + ASSERT(CM_CHECK_REGISTRY_SUCCESS(CheckStatus)); +#endif + /* Create a new hive that will hold the key */ Status = CmpInitializeHive(&KeyHive, HINIT_CREATE, @@ -2679,7 +2703,7 @@ CmSaveKey(IN PCM_KEY_CONTROL_BLOCK Kcb, NULL, NULL, NULL, - 0); + CM_CHECK_REGISTRY_DONT_PURGE_VOLATILES); if (!NT_SUCCESS(Status)) goto Cleanup; /* Copy the key recursively into the new hive */ @@ -2701,6 +2725,15 @@ Cleanup: /* Free the hive */ if (KeyHive) CmpDestroyHive(KeyHive); +#if DBG + if (NT_SUCCESS(Status)) + { + /* Before we say goodbye, make sure the hive is still OK */ + CheckStatus = CmCheckRegistry(HiveToValidate, CM_CHECK_REGISTRY_DONT_PURGE_VOLATILES | CM_CHECK_REGISTRY_VALIDATE_HIVE); + ASSERT(CM_CHECK_REGISTRY_SUCCESS(CheckStatus)); + } +#endif + /* Release the locks */ CmpReleaseKcbLock(Kcb); CmpUnlockRegistry(); @@ -2714,6 +2747,11 @@ CmSaveMergedKeys(IN PCM_KEY_CONTROL_BLOCK HighKcb, IN PCM_KEY_CONTROL_BLOCK LowKcb, IN HANDLE FileHandle) { +#if DBG + CM_CHECK_REGISTRY_STATUS CheckStatus; + PCMHIVE LowHiveToValidate = NULL; + PCMHIVE HighHiveToValidate = NULL; +#endif PCMHIVE KeyHive = NULL; NTSTATUS Status = STATUS_SUCCESS; @@ -2726,6 +2764,12 @@ CmSaveMergedKeys(IN PCM_KEY_CONTROL_BLOCK HighKcb, CmpAcquireKcbLockShared(HighKcb); CmpAcquireKcbLockShared(LowKcb); +#if DBG + /* Get the high and low hives for validation */ + HighHiveToValidate = (PCMHIVE)HighKcb->KeyHive; + LowHiveToValidate = (PCMHIVE)LowKcb->KeyHive; +#endif + if (LowKcb->Delete || HighKcb->Delete) { /* The source key has been deleted, do nothing */ @@ -2733,6 +2777,14 @@ CmSaveMergedKeys(IN PCM_KEY_CONTROL_BLOCK HighKcb, goto done; } +#if DBG + /* Make sure that both the high and low precedence hives are OK */ + CheckStatus = CmCheckRegistry(HighHiveToValidate, CM_CHECK_REGISTRY_DONT_PURGE_VOLATILES | CM_CHECK_REGISTRY_VALIDATE_HIVE); + ASSERT(CM_CHECK_REGISTRY_SUCCESS(CheckStatus)); + CheckStatus = CmCheckRegistry(LowHiveToValidate, CM_CHECK_REGISTRY_DONT_PURGE_VOLATILES | CM_CHECK_REGISTRY_VALIDATE_HIVE); + ASSERT(CM_CHECK_REGISTRY_SUCCESS(CheckStatus)); +#endif + /* Create a new hive that will hold the key */ Status = CmpInitializeHive(&KeyHive, HINIT_CREATE, @@ -2743,7 +2795,7 @@ CmSaveMergedKeys(IN PCM_KEY_CONTROL_BLOCK HighKcb, NULL, NULL, NULL, - 0); + CM_CHECK_REGISTRY_DONT_PURGE_VOLATILES); if (!NT_SUCCESS(Status)) goto done; @@ -2776,6 +2828,17 @@ done: if (KeyHive) CmpDestroyHive(KeyHive); +#if DBG + if (NT_SUCCESS(Status)) + { + /* Check those hives again before we say goodbye */ + CheckStatus = CmCheckRegistry(HighHiveToValidate, CM_CHECK_REGISTRY_DONT_PURGE_VOLATILES | CM_CHECK_REGISTRY_VALIDATE_HIVE); + ASSERT(CM_CHECK_REGISTRY_SUCCESS(CheckStatus)); + CheckStatus = CmCheckRegistry(LowHiveToValidate, CM_CHECK_REGISTRY_DONT_PURGE_VOLATILES | CM_CHECK_REGISTRY_VALIDATE_HIVE); + ASSERT(CM_CHECK_REGISTRY_SUCCESS(CheckStatus)); + } +#endif + /* Release the locks */ CmpReleaseKcbLock(LowKcb); CmpReleaseKcbLock(HighKcb); diff --git a/ntoskrnl/config/cminit.c b/ntoskrnl/config/cminit.c index dd3a051e959..3406bfea302 100644 --- a/ntoskrnl/config/cminit.c +++ b/ntoskrnl/config/cminit.c @@ -201,8 +201,8 @@ CmpInitializeHive(OUT PCMHIVE *CmHive, (OperationType == HINIT_MAPFILE)) { /* Verify integrity */ - ULONG CheckStatus = CmCheckRegistry(Hive, CheckFlags); - if (CheckStatus != 0) + CM_CHECK_REGISTRY_STATUS CheckStatus = CmCheckRegistry(Hive, CheckFlags); + if (!CM_CHECK_REGISTRY_SUCCESS(CheckStatus)) { /* Cleanup allocations and fail */ ExDeleteResourceLite(Hive->FlusherLock); diff --git a/ntoskrnl/config/cmsysini.c b/ntoskrnl/config/cmsysini.c index 0e3a647de66..f65449d1962 100644 --- a/ntoskrnl/config/cmsysini.c +++ b/ntoskrnl/config/cmsysini.c @@ -912,7 +912,7 @@ CmpInitializeSystemHive(IN PLOADER_PARAMETER_BLOCK LoaderBlock) NULL, NULL, &HiveName, - HiveBase ? 2 : 0); + HiveBase ? CM_CHECK_REGISTRY_PURGE_VOLATILES : CM_CHECK_REGISTRY_DONT_PURGE_VOLATILES); if (!NT_SUCCESS(Status)) { return FALSE; @@ -936,7 +936,7 @@ CmpInitializeSystemHive(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { /* Disable self-healing internally and check if boot type wanted it */ CmpSelfHeal = FALSE; - if (CmpBootType & 4) + if (CmpBootType & HBOOT_TYPE_SELF_HEAL) { /* We're disabled, so bugcheck */ KeBugCheckEx(BAD_SYSTEM_CONFIG_INFO, @@ -1245,7 +1245,7 @@ CmpLoadHiveThread(IN PVOID StartContext) CmpMachineHiveList[i].HHiveFlags, &CmHive, &CmpMachineHiveList[i].Allocate, - 0); + CM_CHECK_REGISTRY_PURGE_VOLATILES); if (!(NT_SUCCESS(Status)) || (!(CmpShareSystemHives) && !(CmHive->FileHandles[HFILE_TYPE_LOG]))) { @@ -1565,7 +1565,7 @@ CmInitSystem1(VOID) NULL, NULL, NULL, - 0); + CM_CHECK_REGISTRY_DONT_PURGE_VOLATILES); if (!NT_SUCCESS(Status)) { /* Bugcheck */ @@ -1656,7 +1656,7 @@ CmInitSystem1(VOID) NULL, NULL, NULL, - 0); + CM_CHECK_REGISTRY_DONT_PURGE_VOLATILES); if (!NT_SUCCESS(Status)) { /* Bugcheck */

10 months

[reactos] 06/15: [SDK][CMLIB] Implement CmCheckRegistry and validation private helpers

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f33da480af6c50eb48880… commit f33da480af6c50eb4888057bdcf0e929761f9b96 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Wed Oct 26 19:41:59 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun Nov 19 20:44:27 2023 +0100 [SDK][CMLIB] Implement CmCheckRegistry and validation private helpers CmCheckRegistry is a function that provides the necessary validation checks for a registry hive. This function usually comes into action when logs have been replayed for example, or when a registry hive internals have changed such as when saving a key, loading a key, etc. This commit implements the whole Check Registry infrastructure (cmcheck.c) in CMLIB library for ease of usage and wide accessibility across parts of the OS. In addition, two more functions for registry checks are also implemented -- HvValidateHive and HvValidateBin. Instead of having the CmCheckRegistry implementation in the kernel, it's better to have it in the Configuration Manager library instead (aka CMLIB). The benefits of having it in the library are the following: - CmCheckRegistry can be used in FreeLdr to fix the SYSTEM hive - It can be used on-demand in the kernel - It can be used for offline registry repair tools - It makes the underlying CmCheckRegistry implementation code debug-able in user mode CORE-9195 CORE-6762 --- ntoskrnl/config/cmcheck.c | 27 - ntoskrnl/include/internal/cm.h | 10 - ntoskrnl/ntos.cmake | 1 - sdk/lib/cmlib/CMakeLists.txt | 1 + sdk/lib/cmlib/cmcheck.c | 1718 ++++++++++++++++++++++++++++++++++++++++ sdk/lib/cmlib/cmlib.h | 92 ++- 6 files changed, 1807 insertions(+), 42 deletions(-) diff --git a/ntoskrnl/config/cmcheck.c b/ntoskrnl/config/cmcheck.c deleted file mode 100644 index 4172dddc332..00000000000 --- a/ntoskrnl/config/cmcheck.c +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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" -#define NDEBUG -#include "debug.h" - -/* GLOBALS *******************************************************************/ - -/* FUNCTIONS *****************************************************************/ - -ULONG -NTAPI -CmCheckRegistry(IN PCMHIVE RegistryHive, - IN ULONG Flags) -{ - /* FIXME: HACK! */ - DPRINT1("CmCheckRegistry(0x%p, %lu) is UNIMPLEMENTED!\n", RegistryHive, Flags); - return 0; -} diff --git a/ntoskrnl/include/internal/cm.h b/ntoskrnl/include/internal/cm.h index 5c2f352f753..04869a812bc 100644 --- a/ntoskrnl/include/internal/cm.h +++ b/ntoskrnl/include/internal/cm.h @@ -595,16 +595,6 @@ CmpCompareNewValueDataAgainstKCBCache( IN ULONG DataSize ); -// -// Registry Validation Functions -// -ULONG -NTAPI -CmCheckRegistry( - IN PCMHIVE Hive, - IN ULONG Flags -); - // // Hive List Routines // diff --git a/ntoskrnl/ntos.cmake b/ntoskrnl/ntos.cmake index 47e7c01eda3..d9328ae3d01 100644 --- a/ntoskrnl/ntos.cmake +++ b/ntoskrnl/ntos.cmake @@ -48,7 +48,6 @@ list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmalloc.c ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmapi.c ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmboot.c - ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmcheck.c ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmconfig.c ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmcontrl.c ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmdata.c diff --git a/sdk/lib/cmlib/CMakeLists.txt b/sdk/lib/cmlib/CMakeLists.txt index 91ccbe6c3e5..ef8bff3ea66 100644 --- a/sdk/lib/cmlib/CMakeLists.txt +++ b/sdk/lib/cmlib/CMakeLists.txt @@ -4,6 +4,7 @@ add_definitions( -DNASSERT) list(APPEND SOURCE + cmcheck.c cminit.c cmheal.c cmindex.c diff --git a/sdk/lib/cmlib/cmcheck.c b/sdk/lib/cmlib/cmcheck.c new file mode 100644 index 00000000000..0c1d82b0555 --- /dev/null +++ b/sdk/lib/cmlib/cmcheck.c @@ -0,0 +1,1718 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Configuration Manager Library - Registry Validation + * COPYRIGHT: Copyright 2022 George Bișoc <george.bisoc(a)reactos.org> + */ + +#include "cmlib.h" +#define NDEBUG +#include <debug.h> + +/* STRUCTURES ****************************************************************/ + +typedef struct _CMP_REGISTRY_STACK_WORK_STATE +{ + ULONG ChildCellIndex; + HCELL_INDEX Parent; + HCELL_INDEX Current; + HCELL_INDEX Sibling; +} CMP_REGISTRY_STACK_WORK_STATE, *PCMP_REGISTRY_STACK_WORK_STATE; + +/* DEFINES ******************************************************************/ + +#define GET_HHIVE(CmHive) (&((CmHive)->Hive)) +#define GET_HHIVE_ROOT_CELL(Hive) ((Hive)->BaseBlock->RootCell) +#define GET_HHIVE_BIN(Hive, StorageIndex, BlockIndex) ((PHBIN)Hive->Storage[StorageIndex].BlockList[BlockIndex].BinAddress) +#define GET_CELL_BIN(Bin) ((PHCELL)((PUCHAR)Bin + sizeof(HBIN))) + +#define IS_CELL_VOLATILE(Cell) (HvGetCellType(Cell) == Volatile) + +#if !defined(CMLIB_HOST) && !defined(_BLDR_) +extern PCMHIVE CmiVolatileHive; +#endif + +#define CMP_PRIOR_STACK 1 +#define CMP_REGISTRY_MAX_LEVELS_TREE_DEPTH 512 + +#define CMP_KEY_SIZE_THRESHOLD 0x45C +#define CMP_VOLATILE_LIST_UNINTIALIZED 0xBAADF00D + +/* PRIVATE FUNCTIONS **********************************************************/ + +/** + * @brief + * Validates the lexicographical order between a child + * and prior sibling of the said child. + * + * @param[in] Hive + * A pointer to a hive descriptor of which lexicographical + * order of keys are to be checked. + * + * @param[in] Child + * A child subkey cell used for lexicographical order + * validation checks. + * + * @param[in] Sibling + * A subkey cell which is the prior sibling of the child. + * This is used in conjuction with the child to perfrom + * lexical order checks. + * + * @return + * Returns TRUE if the order is legal, FALSE otherwise. + */ +static +BOOLEAN +CmpValidateLexicalOrder( + _In_ PHHIVE Hive, + _In_ HCELL_INDEX Child, + _In_ HCELL_INDEX Sibling) +{ + LONG Result; + UNICODE_STRING ChildString, SiblingString; + PCM_KEY_NODE ChildNode, SiblingNode; + + PAGED_CODE(); + + /* Obtain the child node */ + ChildNode = (PCM_KEY_NODE)HvGetCell(Hive, Child); + if (!ChildNode) + { + /* Couldn't get the child node, bail out */ + DPRINT1("Failed to get the child node\n"); + return FALSE; + } + + /* Obtain the sibling node */ + SiblingNode = (PCM_KEY_NODE)HvGetCell(Hive, Sibling); + if (!SiblingNode) + { + /* Couldn't get the sibling node, bail out */ + DPRINT1("Failed to get the sibling node\n"); + return FALSE; + } + + /* CASE 1: Two distinct non-compressed Unicode names */ + if ((ChildNode->Flags & KEY_COMP_NAME) == 0 && + (SiblingNode->Flags & KEY_COMP_NAME) == 0) + { + /* Build the sibling string */ + SiblingString.Buffer = &(SiblingNode->Name[0]); + SiblingString.Length = SiblingNode->NameLength; + SiblingString.MaximumLength = SiblingNode->NameLength; + + /* Build the child string */ + ChildString.Buffer = &(ChildNode->Name[0]); + ChildString.Length = ChildNode->NameLength; + ChildString.MaximumLength = ChildNode->NameLength; + + Result = RtlCompareUnicodeString(&SiblingString, &ChildString, TRUE); + if (Result >= 0) + { + DPRINT1("The sibling node name is greater or equal to that of the child\n"); + return FALSE; + } + } + + /* CASE 2: Both compressed Unicode names */ + if ((ChildNode->Flags & KEY_COMP_NAME) && + (SiblingNode->Flags & KEY_COMP_NAME)) + { + /* FIXME: Checks for two compressed names not implemented yet */ + DPRINT("Lexicographical order checks for two compressed names is UNIMPLEMENTED, assume the key is healthy...\n"); + return TRUE; + } + + /* CASE 3: The child name is compressed but the sibling is not */ + if ((ChildNode->Flags & KEY_COMP_NAME) && + (SiblingNode->Flags & KEY_COMP_NAME) == 0) + { + SiblingString.Buffer = &(SiblingNode->Name[0]); + SiblingString.Length = SiblingNode->NameLength; + SiblingString.MaximumLength = SiblingNode->NameLength; + Result = CmpCompareCompressedName(&SiblingString, + ChildNode->Name, + ChildNode->NameLength); + if (Result >= 0) + { + DPRINT1("The sibling node name is greater or equal to that of the compressed child\n"); + return FALSE; + } + } + + /* CASE 4: The sibling name is compressed but the child is not */ + if ((SiblingNode->Flags & KEY_COMP_NAME) && + (ChildNode->Flags & KEY_COMP_NAME) == 0) + { + ChildString.Buffer = &(ChildNode->Name[0]); + ChildString.Length = ChildNode->NameLength; + ChildString.MaximumLength = ChildNode->NameLength; + Result = CmpCompareCompressedName(&ChildString, + SiblingNode->Name, + SiblingNode->NameLength); + if (Result <= 0) + { + DPRINT1("The compressed sibling node name is lesser or equal to that of the child\n"); + return FALSE; + } + } + + /* + * One of the cases above has met the conditions + * successfully, the lexicographical order is legal. + */ + return TRUE; +} + +/** + * @brief + * Validates the class of a given key cell. + * + * @param[in] Hive + * A pointer to a hive descriptor of which + * the registry call is to be validated. + * + * @param[in] CurrentCell + * The current key cell that the class points to. + * + * @param[in] CellData + * A pointer to cell data of the current key cell + * that contains the class to be validated. + * + * @return + * Returns CM_CHECK_REGISTRY_GOOD if the class is in good shape. + * The same CM status code is returned if the class doesn't + * but the class length says otherwise. CM_CHECK_REGISTRY_KEY_CLASS_UNALLOCATED + * is returned if the class cell is not allocated. + */ +static +CM_CHECK_REGISTRY_STATUS +CmpValidateClass( + _In_ PHHIVE Hive, + _In_ HCELL_INDEX CurrentCell, + _Inout_ PCELL_DATA CellData) +{ + ULONG ClassLength; + HCELL_INDEX ClassCell; + + PAGED_CODE(); + + ASSERT(CurrentCell != HCELL_NIL); + ASSERT(CellData); + + /* Cache the class cell and validate it (if any) */ + ClassCell = CellData->u.KeyNode.Class; + ClassLength = CellData->u.KeyNode.ClassLength; + if (ClassLength > 0) + { + if (ClassCell == HCELL_NIL) + { + /* + * Somebody has freed the class but left the + * length as is, reset it. + */ + DPRINT1("The key node class is NIL but the class length is not 0, resetting it\n"); + HvMarkCellDirty(Hive, CurrentCell, FALSE); + CellData->u.KeyNode.ClassLength = 0; + return CM_CHECK_REGISTRY_GOOD; + } + + if (!HvIsCellAllocated(Hive, ClassCell)) + { + DPRINT1("The key class is not allocated\n"); + return CM_CHECK_REGISTRY_KEY_CLASS_UNALLOCATED; + } + } + + return CM_CHECK_REGISTRY_GOOD; +} + +/** + * @brief + * Validates each value in the list by count. A + * value that is damaged gets removed from the list. + * This routine performs self-healing process in + * this case. + * + * @param[in] Hive + * A pointer to a hive descriptor of which a list + * of registry values is to be validated. + * + * @param[in] CurrentCell + * The current key cell that the value list points to. + * + * @param[in] ListCount + * The list count that describes the actual number of + * values in the list. + * + * @param[in] ValueListData + * A pointer to cell data of the current key cell + * that contains the value list to be validated. + * + * @param[out] ValuesRemoved + * When the function finishes doing its operations, + * this parameter contains the amount of removed values + * from the list. A value of 0 indicates no values have + * been removed (which that would imply a self-healing + * process of the value list has occurred). + * + * @param[in] FixHive + * If set to TRUE, the target hive will be fixed. + * + * @return + * Returns CM_CHECK_REGISTRY_GOOD if the value list is + * sane. CM_CHECK_REGISTRY_VALUE_CELL_NIL is returned + * if a certain value cell is HCELL_NIL at specific + * count index. CM_CHECK_REGISTRY_VALUE_CELL_UNALLOCATED is + * returned if a certain value cell is unallocated at specific + * count index. CM_CHECK_REGISTRY_VALUE_CELL_DATA_NOT_FOUND is + * returned if cell data could not be mapped from the value cell, + * the value list is totally torn apart in this case. + * CM_CHECK_REGISTRY_VALUE_CELL_SIZE_NOT_SANE is returned if the + * value's size is bogus. CM_CHECK_REGISTRY_CORRUPT_VALUE_DATA + * is returned if the data inside the value is HCELL_NIL. + * CM_CHECK_REGISTRY_DATA_CELL_NOT_ALLOCATED is returned if the + * data cell inside the value is not allocated. + * CM_CHECK_REGISTRY_BAD_KEY_VALUE_SIGNATURE is returned if the + * value's signature is not valid. + */ +static +CM_CHECK_REGISTRY_STATUS +CmpValidateValueListByCount( + _In_ PHHIVE Hive, + _In_ HCELL_INDEX CurrentCell, + _In_ ULONG ListCount, + _In_ PCELL_DATA ValueListData, + _Out_ PULONG ValuesRemoved, + _In_ BOOLEAN FixHive) +{ + ULONG ValueDataSize; + ULONG ListCountIndex; + ULONG DataSize; + HCELL_INDEX DataCell; + HCELL_INDEX ValueCell; + PCELL_DATA ValueData; + ULONG ValueNameLength, TotalValueNameLength; + + PAGED_CODE(); + + ASSERT(ValueListData); + ASSERT(ListCount != 0); + + /* Assume we haven't removed any value counts for now */ + *ValuesRemoved = 0; + + /* + * Begin looping each value in the list and + * validate it accordingly. + */ + ListCountIndex = 0; + while (ListCountIndex < ListCount) + { + ValueCell = ValueListData->u.KeyList[ListCountIndex]; + if (ValueCell == HCELL_NIL) + { + if (!CmpRepairValueListCount(Hive, + CurrentCell, + ListCountIndex, + ValueListData, + FixHive)) + { + DPRINT1("The value cell is NIL (at index %lu, list count %lu)\n", + ListCountIndex, ListCount); + return CM_CHECK_REGISTRY_VALUE_CELL_NIL; + } + + /* Decrease the list count and go to the next value */ + ListCount--; + *ValuesRemoved++; + DPRINT1("Damaged value removed, continuing with the next value...\n"); + continue; + } + + if (!HvIsCellAllocated(Hive, ValueCell)) + { + if (!CmpRepairValueListCount(Hive, + CurrentCell, + ListCountIndex, + ValueListData, + FixHive)) + { + DPRINT1("The value cell is not allocated (at index %lu, list count %lu)\n", + ListCountIndex, ListCount); + return CM_CHECK_REGISTRY_VALUE_CELL_UNALLOCATED; + } + + /* Decrease the list count and go to the next value */ + ListCount--; + *ValuesRemoved++; + DPRINT1("Damaged value removed, continuing with the next value...\n"); + continue; + } + + /* Obtain a cell data from this value */ + ValueData = (PCELL_DATA)HvGetCell(Hive, ValueCell); + if (!ValueData) + { + DPRINT1("Cell data of the value cell not found (at index %lu, value count %lu)\n", + ListCountIndex, ListCount); + return CM_CHECK_REGISTRY_VALUE_CELL_DATA_NOT_FOUND; + } + + /* Check that the value size is sane */ + ValueDataSize = HvGetCellSize(Hive, ValueData); + ValueNameLength = ValueData->u.KeyValue.NameLength; + TotalValueNameLength = ValueNameLength + FIELD_OFFSET(CM_KEY_VALUE, Name); + if (TotalValueNameLength > ValueDataSize) + { + if (!CmpRepairValueListCount(Hive, + CurrentCell, + ListCountIndex, + ValueListData, + FixHive)) + { + DPRINT1("The total size is bigger than the actual cell size (total size %lu, cell size %lu, at index %lu)\n", + TotalValueNameLength, ValueDataSize, ListCountIndex); + return CM_CHECK_REGISTRY_VALUE_CELL_SIZE_NOT_SANE; + } + + /* Decrease the list count and go to the next value */ + ListCount--; + *ValuesRemoved++; + DPRINT1("Damaged value removed, continuing with the next value...\n"); + continue; + } + + /* + * The value cell has a sane size. The last thing + * to validate is the actual data of the value cell. + * That is, we want that the data itself and length + * are consistent. Technically speaking, value keys + * that are small are directly located in the value + * cell and it's built-in, in other words, the data + * is immediately present in the cell so we don't have + * to bother validating them since they're alright on + * their own. This can't be said the same about normal + * values though. + */ + DataCell = ValueData->u.KeyValue.Data; + if (!CmpIsKeyValueSmall(&DataSize, ValueData->u.KeyValue.DataLength)) + { + /* Validate the actual data based on size */ + if (DataSize == 0) + { + if (DataCell != HCELL_NIL) + { + if (!CmpRepairValueListCount(Hive, + CurrentCell, + ListCountIndex, + ValueListData, + FixHive)) + { + DPRINT1("The data is not NIL on a 0 length, data is corrupt\n"); + return CM_CHECK_REGISTRY_CORRUPT_VALUE_DATA; + } + + /* Decrease the list count and go to the next value */ + ListCount--; + *ValuesRemoved++; + DPRINT1("Damaged value removed, continuing with the next value...\n"); + continue; + } + } + else + { + if (!HvIsCellAllocated(Hive, DataCell)) + { + if (!CmpRepairValueListCount(Hive, + CurrentCell, + ListCountIndex, + ValueListData, + FixHive)) + { + DPRINT1("The data is not NIL on a 0 length, data is corrupt\n"); + return CM_CHECK_REGISTRY_DATA_CELL_NOT_ALLOCATED; + } + + /* Decrease the list count and go to the next value */ + ListCount--; + *ValuesRemoved++; + DPRINT1("Damaged value removed, continuing with the next value...\n"); + continue; + } + } + + /* FIXME: Big values not supported yet */ + ASSERT_VALUE_BIG(Hive, DataSize); + } + + /* Is the signature valid? */ + if (ValueData->u.KeyValue.Signature != CM_KEY_VALUE_SIGNATURE) + { + if (!CmpRepairValueListCount(Hive, + CurrentCell, + ListCountIndex, + ValueListData, + FixHive)) + { + DPRINT1("The key value signature is invalid\n"); + return CM_CHECK_REGISTRY_BAD_KEY_VALUE_SIGNATURE; + } + + /* Decrease the list count and go to the next value */ + ListCount--; + *ValuesRemoved++; + DPRINT1("Damaged value removed, continuing with the next value...\n"); + continue; + } + + /* Advance to the next value */ + ListCountIndex++; + } + + return CM_CHECK_REGISTRY_GOOD; +} + +/** + * @brief + * Validates the value list of a key. If the list + * is damaged due to corruption, the whole list + * is expunged. This function performs self-healing + * procedures in this case. + * + * @param[in] Hive + * A pointer to a hive descriptor of which a list of + * registry values is to be validated. + * + * @param[in] CurrentCell + * The current key cell that the value list points to. + * + * @param[in] CellData + * The cell data of the current cell of which the value + * list comes from. + * + * @param[in] FixHive + * If set to TRUE, the target hive will be fixed. + * + * @return + * Returns CM_CHECK_REGISTRY_GOOD if the value list is + * sane. CM_CHECK_REGISTRY_VALUE_LIST_UNALLOCATED is returned + * if the value list cell is not allocated. CM_CHECK_REGISTRY_VALUE_LIST_DATA_NOT_FOUND + * is returned if cell data could not be mapped from the value + * list cell. CM_CHECK_REGISTRY_VALUE_LIST_SIZE_NOT_SANE is returned + * if the size of the value list is bogus. A failure CM status code + * is returned otherwise. + */ +static +CM_CHECK_REGISTRY_STATUS +CmpValidateValueList( + _In_ PHHIVE Hive, + _In_ HCELL_INDEX CurrentCell, + _Inout_ PCELL_DATA CellData, + _In_ BOOLEAN FixHive) +{ + CM_CHECK_REGISTRY_STATUS CmStatusCode; + ULONG TotalValueLength, ValueSize; + ULONG ValueListCount; + ULONG ValuesRemoved; + HCELL_INDEX ValueListCell; + PCELL_DATA ValueListData; + + PAGED_CODE(); + + ASSERT(CurrentCell != HCELL_NIL); + ASSERT(CellData); + + /* Cache the value list and validate it */ + ValueListCell = CellData->u.KeyNode.ValueList.List; + ValueListCount = CellData->u.KeyNode.ValueList.Count; + if (ValueListCount > 0) + { + if (!HvIsCellAllocated(Hive, ValueListCell)) + { + DPRINT1("The value list is not allocated\n"); + return CM_CHECK_REGISTRY_VALUE_LIST_UNALLOCATED; + } + + /* Obtain cell data from the value list cell */ + ValueListData = (PCELL_DATA)HvGetCell(Hive, ValueListCell); + if (!ValueListData) + { + DPRINT1("Could not get cell data from the value list\n"); + return CM_CHECK_REGISTRY_VALUE_LIST_DATA_NOT_FOUND; + } + + /* + * Cache the value size and total length and + * assert ourselves this is a sane value list + * to begin with. + */ + ValueSize = HvGetCellSize(Hive, ValueListData); + TotalValueLength = ValueListCount * sizeof(HCELL_INDEX); + if (TotalValueLength > ValueSize) + { + DPRINT1("The value list is bigger than the cell (value list size %lu, cell size %lu)\n", + TotalValueLength, ValueSize); + return CM_CHECK_REGISTRY_VALUE_LIST_SIZE_NOT_SANE; + } + + /* + * The value list is sane, now we would + * need to validate the actual list + * by its count. + */ + CmStatusCode = CmpValidateValueListByCount(Hive, + CurrentCell, + ValueListCount, + ValueListData, + &ValuesRemoved, + FixHive); + if (!CM_CHECK_REGISTRY_SUCCESS(CmStatusCode)) + { + DPRINT1("One of the values is corrupt and couldn't be repaired\n"); + return CmStatusCode; + } + + /* Log how much values have been removed */ + if (ValuesRemoved > 0) + { + DPRINT1("Values removed in the list -- %lu\n", ValuesRemoved); + } + } + + return CM_CHECK_REGISTRY_GOOD; +} + +/** + * @brief + * Validates the subkeys list of a key. If the list is + * damaged from corruption, the function can either + * salvage this list or purge the whole of it. The + * function performs different validation steps for + * different storage types. + * + * @param[in] Hive + * A pointer to a hive descriptor of which a list of + * subkeys is to be validated. + * + * @param[in] CurrentCell + * The current key cell that the subkeys list points to. + * + * @param[in] CellData + * The cell data of the current cell of which the subkeys + * list comes from. + * + * @param[in] FixHive + * If set to TRUE, the target hive will be fixed. + * + * @param[out] DoRepair + * A pointer to a boolean value set up by the function itself. + * The function automatically sets this to FALSE indicating + * that repairs can't be done onto the list itself. If the + * list can be salvaged, then the function sets this to TRUE. + * See Remarks for further information. + * + * @return + * Returns CM_CHECK_REGISTRY_GOOD if the subkeys list is in + * perfect shape. CM_CHECK_REGISTRY_STABLE_KEYS_ON_VOLATILE is + * returned if the volatile storage has stable data which + * that should not happen (this is only for the case of volatile + * cells). CM_CHECK_REGISTRY_SUBKEYS_LIST_UNALLOCATED is returned + * if the subkeys list cell is not allocated. CM_CHECK_REGISTRY_CORRUPT_SUBKEYS_INDEX + * is returned if a key index could not be mapped from the subkeys + * list cell. CM_CHECK_REGISTRY_BAD_SUBKEY_COUNT is returned if + * the key index is a leaf and the subkeys count doesn't match up + * with that of the leaf. CM_CHECK_REGISTRY_KEY_INDEX_CELL_UNALLOCATED is + * returned if the key index cell at the specific index in the list of + * the index is not allocated. CM_CHECK_REGISTRY_CORRUPT_LEAF_ON_ROOT is + * returned if a leaf could not be mapped from an index. + * CM_CHECK_REGISTRY_CORRUPT_LEAF_SIGNATURE is returned if the leaf has + * an invalid signature. CM_CHECK_REGISTRY_CORRUPT_KEY_INDEX_SIGNATURE + * is returned if the key index has an invalid signature, that is, it's + * not a leaf nor a root. + * + * @remarks + * Deep subkeys list healing can be done in specific cases where only + * a subkey doesn't actually affect the key itself. The function will + * mark the subkeys list as repairable by setting DoRepair parameter + * to TRUE and the caller is responsible to heal the key by purging + * the whole subkeys list. If the damage is so bad that there's + * possibility the key itself is even damaged, no healing is done. + */ +static +CM_CHECK_REGISTRY_STATUS +CmpValidateSubKeyList( + _In_ PHHIVE Hive, + _In_ HCELL_INDEX CurrentCell, + _Inout_ PCELL_DATA CellData, + _In_ BOOLEAN FixHive, + _Out_ PBOOLEAN DoRepair) +{ + ULONG SubKeyCounts; + HCELL_INDEX KeyIndexCell, SubKeysListCell; + PCM_KEY_INDEX RootKeyIndex, LeafKeyIndex; + ULONG RootIndex; + ULONG TotalLeafCount; + + PAGED_CODE(); + + ASSERT(CurrentCell != HCELL_NIL); + ASSERT(CellData); + + RootKeyIndex = NULL; + LeafKeyIndex = NULL; + TotalLeafCount = 0; + + /* + * Assume for now that the caller should not + * do any kind of repairs on the subkeys list, + * unless explicitly given the consent by us. + */ + *DoRepair = FALSE; + + /* + * For volatile keys they have data that can + * fluctuate and change on the fly so there's + * pretty much nothing that we can validate those. + * But still, we would want that the volatile key + * is not damaged by external factors, like e.g., + * having stable keys on a volatile space. + */ + if (IS_CELL_VOLATILE(CurrentCell)) + { + if (CellData->u.KeyNode.SubKeyCounts[Stable] != 0) + { + DPRINT1("The volatile key has stable subkeys\n"); + return CM_CHECK_REGISTRY_STABLE_KEYS_ON_VOLATILE; + } + + return CM_CHECK_REGISTRY_GOOD; + } + + /* + * This is not a volatile key, cache the subkeys list + * and validate it. + */ + SubKeysListCell = CellData->u.KeyNode.SubKeyLists[Stable]; + SubKeyCounts = CellData->u.KeyNode.SubKeyCounts[Stable]; + if (SubKeyCounts > 0) + { + if (!HvIsCellAllocated(Hive, SubKeysListCell)) + { + DPRINT1("The subkeys list cell is not allocated\n"); + *DoRepair = TRUE; + return CM_CHECK_REGISTRY_SUBKEYS_LIST_UNALLOCATED; + } + + /* Obtain a root index and validate it */ + RootKeyIndex = (PCM_KEY_INDEX)HvGetCell(Hive, SubKeysListCell); + if (!RootKeyIndex) + { + DPRINT1("Could not get the root key index of the subkeys list cell\n"); + return CM_CHECK_REGISTRY_CORRUPT_SUBKEYS_INDEX; + } + + /* + * For simple, fast and hashed leaves we would want + * that the corresponding root index count matches with + * that of the subkey counts itself. If this is not the + * case we can isolate this problem and fix the count. + */ + if (RootKeyIndex->Signature == CM_KEY_INDEX_LEAF || + RootKeyIndex->Signature == CM_KEY_FAST_LEAF || + RootKeyIndex->Signature == CM_KEY_HASH_LEAF) + { + if (SubKeyCounts != RootKeyIndex->Count) + { + if (!CmpRepairSubKeyCounts(Hive, + CurrentCell, + RootKeyIndex->Count, + CellData, + FixHive)) + { + DPRINT1("The subkeys list has invalid count (subkeys count %lu, root key index count %lu)\n", + SubKeyCounts, RootKeyIndex->Count); + return CM_CHECK_REGISTRY_BAD_SUBKEY_COUNT; + } + } + + return CM_CHECK_REGISTRY_GOOD; + } + + /* + * The root index is not a leaf, check if the index + * is an actual root then. + */ + if (RootKeyIndex->Signature == CM_KEY_INDEX_ROOT) + { + /* + * For the root we have to loop each leaf + * from it and increase the total leaf count + * in the root after we determined the validity + * of a leaf. This way we can see if the subcount + * matches with that of the subkeys list count. + */ + for (RootIndex = 0; RootIndex < RootKeyIndex->Count; RootIndex++) + { + KeyIndexCell = RootKeyIndex->List[RootIndex]; + if (!HvIsCellAllocated(Hive, KeyIndexCell)) + { + DPRINT1("The key index cell is not allocated at index %lu\n", RootIndex); + *DoRepair = TRUE; + return CM_CHECK_REGISTRY_KEY_INDEX_CELL_UNALLOCATED; + } + + /* Obtain a leaf from the root */ + LeafKeyIndex = (PCM_KEY_INDEX)HvGetCell(Hive, KeyIndexCell); + if (!LeafKeyIndex) + { + DPRINT1("The root key index's signature is invalid!\n"); + return CM_CHECK_REGISTRY_CORRUPT_LEAF_ON_ROOT; + } + + /* Check that the leaf has valid signature */ + if (LeafKeyIndex->Signature != CM_KEY_INDEX_LEAF && + LeafKeyIndex->Signature != CM_KEY_FAST_LEAF && + LeafKeyIndex->Signature != CM_KEY_HASH_LEAF) + { + DPRINT1("The leaf's signature is invalid!\n"); + *DoRepair = TRUE; + return CM_CHECK_REGISTRY_CORRUPT_LEAF_SIGNATURE; + } + + /* Add up the count of the leaf */ + TotalLeafCount += LeafKeyIndex->Count; + } + + /* + * We have built up the total leaf count, + * we have to determine this count is exactly + * the same as the subkeys list count. Otherwise + * just fix it. + */ + if (SubKeyCounts != TotalLeafCount) + { + if (!CmpRepairSubKeyCounts(Hive, + CurrentCell, + TotalLeafCount, + CellData, + FixHive)) + { + DPRINT1("The subkeys list has invalid count (subkeys count %lu, total leaf count %lu)\n", + SubKeyCounts, TotalLeafCount); + return CM_CHECK_REGISTRY_BAD_SUBKEY_COUNT; + } + } + + return CM_CHECK_REGISTRY_GOOD; + } + + /* + * None of the valid signatures match with that of + * the root key index. By definition, the whole subkey + * list is total toast. + */ + DPRINT1("The root key index's signature is invalid\n"); + *DoRepair = TRUE; + return CM_CHECK_REGISTRY_CORRUPT_KEY_INDEX_SIGNATURE; + } + + /* If we reach here then this key has no subkeys */ + return CM_CHECK_REGISTRY_GOOD; +} + +/** + * @brief + * Purges the volatile storage of a registry + * hive. This operation is done mainly during + * the bootup of the system. + * + * @param[in] Hive + * A pointer to a hive descriptor of which volatiles + * are to be purged. + * + * @param[in] CurrentCell + * The current key cell that the volatile storage of + * the hive points to. + * + * @param[in] CellData + * The cell data of the current cell of which the volatile + * subkeys storage comes from. + * + * @param[in] Flags + * A bit mask flag that is used to influence how is the + * purging operation to be done. See CmCheckRegistry documentation + * below for more information. + */ +static +VOID +CmpPurgeVolatiles( + _In_ PHHIVE Hive, + _In_ HCELL_INDEX CurrentCell, + _Inout_ PCELL_DATA CellData, + _In_ ULONG Flags) +{ + PAGED_CODE(); + + ASSERT(CellData); + + /* Did the caller ask to purge volatiles? */ + if (((Flags & CM_CHECK_REGISTRY_PURGE_VOLATILES) || + (Flags & CM_CHECK_REGISTRY_BOOTLOADER_PURGE_VOLATILES)) && + (CellData->u.KeyNode.SubKeyCounts[Volatile] != 0)) + { + /* + * OK, the caller wants them cleaned from this + * hive. For XP Beta 1 or newer hives, we unintialize + * the whole volatile subkeys list. For older hives, + * we just do a cleanup. + */ +#if !defined(_BLDR_) + HvMarkCellDirty(Hive, CurrentCell, FALSE); +#endif + if ((Flags & CM_CHECK_REGISTRY_BOOTLOADER_PURGE_VOLATILES) && + (Hive->Version >= HSYS_WHISTLER_BETA1)) + { + CellData->u.KeyNode.SubKeyLists[Volatile] = CMP_VOLATILE_LIST_UNINTIALIZED; + } + else + { + CellData->u.KeyNode.SubKeyLists[Volatile] = HCELL_NIL; + } + + /* Clear the count */ + CellData->u.KeyNode.SubKeyCounts[Volatile] = 0; + } +} + +/** + * @brief + * Validates the key cell, ensuring that + * the key in the registry is valid and not corrupted. + * + * @param[in] Hive + * A pointer to a hive descriptor of the registry where + * the key is to be validated. + * + * @param[in] SecurityDefaulted + * If the caller sets this to TRUE, this indicates the + * hive has its security property defaulted due to + * heal recovery of the said security. If the caller + * sets this to FALSE, the hive comes with its own + * security details. This parameter is currently unused. + * + * @param[in] ParentCell + * The parent key cell that comes before the current cell. + * This parameter can be HCELL_NIL if the first cell is + * the root cell which is the parent of its own. + * + * @param[in] CurrentCell + * The current child key cell that is to be validated. + * + * @param[in] Flags + * A bit mask flag that is used to influence how is the + * purging operation of volatile keys in the volatile storage + * to be done. See CmCheckRegistry documentation below for more + * information. + * + * @param[in] FixHive + * If set to TRUE, the target hive will be fixed. + * + * @return + * Returns CM_CHECK_REGISTRY_GOOD if the key that has been validated + * is valid and not corrupted. CM_CHECK_REGISTRY_KEY_CELL_NOT_ALLOCATED is + * returned if the key cell is not allocated. CM_CHECK_REGISTRY_CELL_DATA_NOT_FOUND + * is returned if cell data could not be mapped from the key cell. + * CM_CHECK_REGISTRY_CELL_SIZE_NOT_SANE is returned if the key cell + * has an abnormal size that is above the trehshold the validation checks + * can permit. CM_CHECK_REGISTRY_KEY_NAME_LENGTH_ZERO is returned if the + * name length of the key node is 0, meaning that the key has no name. + * CM_CHECK_REGISTRY_KEY_TOO_BIG_THAN_CELL is returned if the key is too + * big than the cell itself. CM_CHECK_REGISTRY_BAD_KEY_NODE_PARENT is + * returned if the parent node of the key is incosistent and it couldn't + * be fixed. CM_CHECK_REGISTRY_BAD_KEY_NODE_SIGNATURE is returned if + * the signature of the key node is corrupt and it couldn't be fixed. + * A failure CM status code is returned otherwise. + */ +static +CM_CHECK_REGISTRY_STATUS +CmpValidateKey( + _In_ PHHIVE Hive, + _In_ BOOLEAN SecurityDefaulted, + _In_ HCELL_INDEX ParentCell, + _In_ HCELL_INDEX CurrentCell, + _In_ ULONG Flags, + _In_ BOOLEAN FixHive) +{ + CM_CHECK_REGISTRY_STATUS CmStatusCode; + PCELL_DATA CellData; + ULONG CellSize; + BOOLEAN DoSubkeysRepair; + ULONG TotalKeyNameLength, NameLength; + + PAGED_CODE(); + + /* The current key cell mustn't be NIL here! */ + ASSERT(CurrentCell != HCELL_NIL); + + /* TODO: To be removed once we support security caching in Cm */ + UNREFERENCED_PARAMETER(SecurityDefaulted); + + /* + * We must ensure that the key cell is + * allocated in the first place before + * we go further. + */ + if (!HvIsCellAllocated(Hive, CurrentCell)) + { + DPRINT1("The key cell is not allocated\n"); + return CM_CHECK_REGISTRY_KEY_CELL_NOT_ALLOCATED; + } + + /* Obtain cell data from it */ + CellData = (PCELL_DATA)HvGetCell(Hive, CurrentCell); + if (!CellData) + { + DPRINT1("Could not get cell data from the cell\n"); + return CM_CHECK_REGISTRY_CELL_DATA_NOT_FOUND; + } + + /* Get the size of this cell and validate its size */ + CellSize = HvGetCellSize(Hive, CellData); + if (CellSize > CMP_KEY_SIZE_THRESHOLD) + { + DPRINT1("The cell size is above the threshold size (size %lu)\n", CellSize); + return CM_CHECK_REGISTRY_CELL_SIZE_NOT_SANE; + } + + /* + * The cell size is OK but we must ensure + * the key is not bigger than the container + * of the cell. + */ + NameLength = CellData->u.KeyNode.NameLength; + if (NameLength == 0) + { + DPRINT1("The key node name length is 0!\n"); + return CM_CHECK_REGISTRY_KEY_NAME_LENGTH_ZERO; + } + + TotalKeyNameLength = NameLength + FIELD_OFFSET(CM_KEY_NODE, Name); + if (TotalKeyNameLength > CellSize) + { + DPRINT1("The key is too big than the cell (key size %lu, cell size %lu)\n", TotalKeyNameLength, CellSize); + return CM_CHECK_REGISTRY_KEY_TOO_BIG_THAN_CELL; + } + + /* Is the parent cell consistent? */ + if (ParentCell != HCELL_NIL && + ParentCell != CellData->u.KeyNode.Parent) + { + if (!CmpRepairParentNode(Hive, + CurrentCell, + ParentCell, + CellData, + FixHive)) + { + DPRINT1("The parent key node doesn't point to the actual parent\n"); + return CM_CHECK_REGISTRY_BAD_KEY_NODE_PARENT; + } + } + + /* Is the key node signature valid? */ + if (CellData->u.KeyNode.Signature != CM_KEY_NODE_SIGNATURE) + { + if (!CmpRepairKeyNodeSignature(Hive, + CurrentCell, + CellData, + FixHive)) + { + DPRINT1("The parent key node signature is not valid\n"); + return CM_CHECK_REGISTRY_BAD_KEY_NODE_SIGNATURE; + } + } + + /* + * FIXME: Security cell checks have to be implemented here + * once we properly and reliably implement security caching + * in the kernel. + */ + + /* Validate the class */ + CmStatusCode = CmpValidateClass(Hive, CurrentCell, CellData); + if (!CM_CHECK_REGISTRY_SUCCESS(CmStatusCode)) + { + if (!CmpRepairClassOfNodeKey(Hive, + CurrentCell, + CellData, + FixHive)) + { + DPRINT1("Failed to repair the hive, the cell class is not valid\n"); + return CmStatusCode; + } + } + + /* Validate the value list */ + CmStatusCode = CmpValidateValueList(Hive, CurrentCell, CellData, FixHive); + if (!CM_CHECK_REGISTRY_SUCCESS(CmStatusCode)) + { + /* + * It happens that a certain value in the list + * is so bad like we couldn't map a cell data from it + * or the list itself is toast. In such cases what we + * can do here is to do a "value list sacrifice", aka + * purge the whole list. + */ + if (!CmpRepairValueList(Hive, CurrentCell, FixHive)) + { + DPRINT1("Failed to repair the hive, the value list is corrupt\n"); + return CmStatusCode; + } + } + + /* Validate the subkeys list */ + CmStatusCode = CmpValidateSubKeyList(Hive, CurrentCell, CellData, FixHive, &DoSubkeysRepair); + if (!CM_CHECK_REGISTRY_SUCCESS(CmStatusCode)) + { + /* + * The subkeys list is in trouble. Worse when the actual + * subkey list is so severed this key is also kaput on itself. + */ + if (!DoSubkeysRepair) + { + DPRINT1("The subkeys list is totally corrupt, can't repair\n"); + return CmStatusCode; + } + + /* + * OK, there's still some salvation for this key. + * Purge the whole subkeys list in order to fix it. + */ + if (!CmpRepairSubKeyList(Hive, + CurrentCell, + CellData, + FixHive)) + { + DPRINT1("Failed to repair the hive, the subkeys list is corrupt!\n"); + return CmStatusCode; + } + } + + /* Purge volatile data if needed */ + CmpPurgeVolatiles(Hive, CurrentCell, CellData, Flags); + return CM_CHECK_REGISTRY_GOOD; +} + +/** + * @brief + * Performs deep checking of the registry by walking + * down the registry tree using a stack based pool. + * This function is the guts of CmCheckRegistry. + * + * @param[in] Hive + * A pointer to a hive descriptor of the registry where + * the validation is to be performed. + * + * @param[in] Flags + * Bit mask flag used for volatiles purging. Such + * flags influence on how volatile purging is actually + * done. See CmCheckRegistry documentation for more + * information. + * + * @param[in] SecurityDefaulted + * If the caller sets this to FALSE, the registry hive + * uses its own unique security details. Otherwise + * registry hive has the security details defaulted. + * + * @param[in] FixHive + * If set to TRUE, the target hive will be fixed. + * + * @return + * Returns CM_CHECK_REGISTRY_GOOD is returned if the function + * has successfully performed deep registry checking and + * the registry contents are valid. CM_CHECK_REGISTRY_ALLOCATE_MEM_STACK_FAIL + * is returned if the function has failed to allocate the + * stack work state buffer in memory which is necessary for + * deep checking of the registry. CM_CHECK_REGISTRY_ROOT_CELL_NOT_FOUND + * is returned if no root cell has been found of this hive. + * CM_CHECK_REGISTRY_BAD_LEXICOGRAPHICAL_ORDER is returned if the lexical + * order is not valid. CM_CHECK_REGISTRY_NODE_NOT_FOUND is returned if + * the no key node could be mapped from the key. CM_CHECK_REGISTRY_SUBKEY_NOT_FOUND + * is returned if no subkey child cell could be found. CM_CHECK_REGISTRY_TREE_TOO_MANY_LEVELS + * is returned if we have reached the maximum stack limit which means the registry that + * we have checked is too fat. + */ +static +CM_CHECK_REGISTRY_STATUS +CmpValidateRegistryInternal( + _In_ PHHIVE Hive, + _In_ ULONG Flags, + _In_ BOOLEAN SecurityDefaulted, + _In_ BOOLEAN FixHive) +{ + CM_CHECK_REGISTRY_STATUS CmStatusCode; + PCMP_REGISTRY_STACK_WORK_STATE WorkState; + HCELL_INDEX RootCell, ParentCell, CurrentCell; + HCELL_INDEX ChildSubKeyCell; + PCM_KEY_NODE KeyNode; + ULONG WorkStateLength; + LONG StackDepth; + BOOLEAN AllChildrenChecked; + + PAGED_CODE(); + + ASSERT(Hive); + + /* + * Allocate some memory blocks for the stack + * state structure. We'll be using it to walk + * down the registry hive tree in a recursive + * way without worrying that we explode the + * kernel stack in the most gruesome and gross + * ways. + */ + WorkStateLength = CMP_REGISTRY_MAX_LEVELS_TREE_DEPTH * sizeof(CMP_REGISTRY_STACK_WORK_STATE); + WorkState = CmpAllocate(WorkStateLength, + TRUE, + TAG_REGISTRY_STACK); + if (!WorkState) + { + DPRINT1("Couldn't allocate memory for registry stack work state\n"); + return CM_CHECK_REGISTRY_ALLOCATE_MEM_STACK_FAIL; + } + + /* Obtain the root cell of the hive */ + RootCell = GET_HHIVE_ROOT_CELL(Hive); + if (RootCell == HCELL_NIL) + { + DPRINT1("Couldn't get the root cell of the hive\n"); + CmpFree(WorkState, WorkStateLength); + return CM_CHECK_REGISTRY_ROOT_CELL_NOT_FOUND; + } + +RestartValidation: + /* + * Prepare the stack state and start from + * the root cell. Ensure that the root cell + * itself is OK before we go forward. + */ + StackDepth = 0; + WorkState[StackDepth].ChildCellIndex = 0; + WorkState[StackDepth].Current = RootCell; + WorkState[StackDepth].Parent = HCELL_NIL; + WorkState[StackDepth].Sibling = HCELL_NIL; + + /* + * As we start checking the root cell which + * is the top element of a registry hive, + * we'll be going to look for child keys + * in the course of walking down the tree. + */ + AllChildrenChecked = FALSE; + + while (StackDepth >= 0) + { + /* Cache the current and parent cells */ + CurrentCell = WorkState[StackDepth].Current; + ParentCell = WorkState[StackDepth].Parent; + + /* Do we have still have children to validate? */ + if (!AllChildrenChecked) + { + /* Check that the key is OK */ + CmStatusCode = CmpValidateKey(Hive, + SecurityDefaulted, + ParentCell, + CurrentCell, + Flags, + FixHive); + if (!CM_CHECK_REGISTRY_SUCCESS(CmStatusCode)) + { + /* + * The key cell is damaged. We have to pray and + * hope that this is not the root cell as any + * damage done to the root is catastrophically + * fatal. + */ + if (CurrentCell == RootCell) + { + DPRINT1("THE ROOT CELL IS BROKEN\n"); + CmpFree(WorkState, WorkStateLength); + return CmStatusCode; + } + + /* + * It is not the root, remove the faulting + * damaged cell from the parent so that we + * can heal the hive. + */ + if (!CmpRepairParentKey(Hive, CurrentCell, ParentCell, FixHive)) + { + DPRINT1("The key is corrupt (current cell %lu, parent cell %lu)\n", + CurrentCell, ParentCell); + CmpFree(WorkState, WorkStateLength); + return CmStatusCode; + } + + /* Damaged cell removed, restart the loop */ + DPRINT1("Hive repaired, restarting the validation loop...\n"); + goto RestartValidation; + } + + /* + * The key is in perfect shape. If we have advanced + * the stack depth then check the lexicographical + * order of the keys as well. + */ + if (StackDepth > 0 && + CM_CHECK_REGISTRY_SUCCESS(CmStatusCode)) + { + if (WorkState[StackDepth - CMP_PRIOR_STACK].Sibling != HCELL_NIL) + { + if (!CmpValidateLexicalOrder(Hive, + CurrentCell, + WorkState[StackDepth - CMP_PRIOR_STACK].Sibling)) + { + /* + * The lexicographical order is bad, + * attempt to heal the hive. + */ + if (!CmpRepairParentKey(Hive, CurrentCell, ParentCell, FixHive)) + { + DPRINT1("The lexicographical order is invalid (sibling %lu, current cell %lu)\n", + CurrentCell, WorkState[StackDepth - CMP_PRIOR_STACK].Sibling); + CmpFree(WorkState, WorkStateLength); + return CM_CHECK_REGISTRY_BAD_LEXICOGRAPHICAL_ORDER; + } + + /* Damaged cell removed, restart the loop */ + DPRINT1("Hive repaired, restarting the validation loop...\n"); + goto RestartValidation; + } + } + + /* Assign the prior sibling for upcoming iteration */ + WorkState[StackDepth - CMP_PRIOR_STACK].Sibling = CurrentCell; + } + } + + /* Obtain a node for this key */ + KeyNode = (PCM_KEY_NODE)HvGetCell(Hive, CurrentCell); + if (!KeyNode) + { + DPRINT1("Couldn't get the node of key (current cell %lu)\n", CurrentCell); + CmpFree(WorkState, WorkStateLength); + return CM_CHECK_REGISTRY_NODE_NOT_FOUND; + } + + /* + * If we have processed all the children from this + * node then adjust the stack depth work state by + * going back and restart the loop to lookup for + * the rest of the tree. Acknowledge the code path + * above that we checked all the children so that + * we don't have to validate the same subkey again. + */ + if (WorkState[StackDepth].ChildCellIndex < KeyNode->SubKeyCounts[Stable]) + { + /* + * We have children to process, obtain the + * child subkey in question so that we can + * cache it later for the next key validation. + */ + ChildSubKeyCell = CmpFindSubKeyByNumber(Hive, KeyNode, WorkState[StackDepth].ChildCellIndex); + if (ChildSubKeyCell == HCELL_NIL) + { + DPRINT1("Couldn't get the child subkey cell (at stack index %lu)\n", StackDepth); + CmpFree(WorkState, WorkStateLength); + return CM_CHECK_REGISTRY_SUBKEY_NOT_FOUND; + } + + /* + * As we got the subkey advance the child index as + * well as the stack depth work state for the next + * key validation. However we must ensure since + * we're advancing the stack depth that we don't + * go over the maximum tree level depth. A registry + * tree can be at maximum 512 levels deep. + * + * For more information see https://docs.microsoft.com/en-us/windows/win32/sysinfo/registry-element-siz…. + */ + WorkState[StackDepth].ChildCellIndex++; + StackDepth++; + if (StackDepth >= CMP_REGISTRY_MAX_LEVELS_TREE_DEPTH - 1) + { + /* + * This registry has so many levels it's + * so fat. We don't want to explode our + * kernel stack, so just simply bail out... + */ + DPRINT1("The registry tree has so many levels!\n"); + CmpFree(WorkState, WorkStateLength); + return CM_CHECK_REGISTRY_TREE_TOO_MANY_LEVELS; + } + + /* Prepare the work state for the next key */ + WorkState[StackDepth].ChildCellIndex = 0; + WorkState[StackDepth].Current = ChildSubKeyCell; + WorkState[StackDepth].Parent = WorkState[StackDepth - CMP_PRIOR_STACK].Current; + WorkState[StackDepth].Sibling = HCELL_NIL; + + /* + * As we prepared the work state, acknowledge the + * code path at the top of the loop that we need + * to process and validate the next child subkey. + */ + AllChildrenChecked = FALSE; + continue; + } + + /* + * We have validated all the child subkeys + * of the node. Decrease the stack depth + * and tell the above code we looked for all + * children so that we don't need to validate + * the same children again but go for the next + * node. + */ + AllChildrenChecked = TRUE; + StackDepth--; + continue; + } + + CmpFree(WorkState, WorkStateLength); + return CM_CHECK_REGISTRY_GOOD; +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +/** + * @brief + * Validates a bin from a hive. It performs checks + * against the cells from this bin, ensuring the + * bin is not corrupt and that the cells are consistent + * with each other. + * + * @param[in] Hive + * A pointer to a hive descriptor of which a hive bin + * is to be validated. + * + * @param[in] Bin + * A pointer to a bin where its cells are to be + * validated. + * + * @return + * CM_CHECK_REGISTRY_GOOD is returned if the bin is + * valid and not corrupt. CM_CHECK_REGISTRY_BIN_SIGNATURE_HEADER_CORRUPT + * is returned if this bin has a corrupt signature. CM_CHECK_REGISTRY_BAD_FREE_CELL + * is returned if the free cell has a bogus size. CM_CHECK_REGISTRY_BAD_ALLOC_CELL + * is returned for the allocated cell has a bogus size. + */ +CM_CHECK_REGISTRY_STATUS +NTAPI +HvValidateBin( + _In_ PHHIVE Hive, + _In_ PHBIN Bin) +{ + PHCELL Cell, Basket; + + PAGED_CODE(); + + ASSERT(Bin); + ASSERT(Hive); + + /* Ensure that this bin we got has valid signature header */ + if (Bin->Signature != HV_HBIN_SIGNATURE) + { + DPRINT1("The bin's signature header is corrupt\n"); + return CM_CHECK_REGISTRY_BIN_SIGNATURE_HEADER_CORRUPT; + } + + /* + * Walk over all the cells from this bin and + * validate that they're consistent with the bin. + * Namely we want that each cell from this bin doesn't + * have a bogus size. + */ + Basket = (PHCELL)((PUCHAR)Bin + Bin->Size); + for (Cell = GET_CELL_BIN(Bin); + Cell < Basket; + Cell = (PHCELL)((PUCHAR)Cell + abs(Cell->Size))) + { + if (IsFreeCell(Cell)) + { + /* + * This cell is free, check that + * the size of this cell is not bogus. + */ + if (Cell->Size > Bin->Size || + Cell->Size == 0) + { + /* + * This cell has too much free space that + * exceeds the boundary of the bin size. + * Otherwise the cell doesn't have actual + * free space (aka Size == 0) which is a + * no go for a bin. + */ + DPRINT1("The free cell exceeds the bin size or cell size equal to 0 (cell 0x%p, cell size %d, bin size %lu)\n", + Cell, Cell->Size, Bin->Size); + return CM_CHECK_REGISTRY_BAD_FREE_CELL; + } + } + else + { + /* + * This cell is allocated, make sure that + * the size of this cell is not bogus. + */ + if (abs(Cell->Size) > Bin->Size) + { + /* + * This cell allocated too much space + * that exceeds the boundary of the + * bin size. + */ + DPRINT1("The allocated cell exceeds the bin size (cell 0x%p, cell size %d, bin size %lu)\n", + Cell, abs(Cell->Size), Bin->Size); + return CM_CHECK_REGISTRY_BAD_ALLOC_CELL; + } + } + } + + return CM_CHECK_REGISTRY_GOOD; +} + +/** + * @brief + * Validates a registry hive. This function ensures + * that the storage of this hive has valid bins. + * + * @param[in] Hive + * A pointer to a hive descriptor where validation on + * its hive bins is to be performed. + * + * @return + * CM_CHECK_REGISTRY_GOOD is returned if the hive + * is valid. CM_CHECK_REGISTRY_HIVE_CORRUPT_SIGNATURE is + * returned if the hive has a corrupted signature. + * CM_CHECK_REGISTRY_BIN_SIZE_OR_OFFSET_CORRUPT is returned + * if the captured bin has a bad size. A failure CM status + * code is returned otherwise. + */ +CM_CHECK_REGISTRY_STATUS +NTAPI +HvValidateHive( + _In_ PHHIVE Hive) +{ + CM_CHECK_REGISTRY_STATUS CmStatusCode; + ULONG StorageIndex; + ULONG BlockIndex; + ULONG StorageLength; + PHBIN Bin; + + PAGED_CODE(); + + ASSERT(Hive); + + /* Is the hive signature valid? */ + if (Hive->Signature != HV_HHIVE_SIGNATURE) + { + DPRINT1("Hive's signature corrupted (signature %lu)\n", Hive->Signature); + return CM_CHECK_REGISTRY_HIVE_CORRUPT_SIGNATURE; + } + + /* + * Now loop each bin in the storage of this + * hive. + */ + for (StorageIndex = 0; StorageIndex < Hive->StorageTypeCount; StorageIndex++) + { + /* Get the storage length at this index */ + StorageLength = Hive->Storage[StorageIndex].Length; + + for (BlockIndex = 0; BlockIndex < StorageLength;) + { + /* Go to the next if this bin does not exist */ + if (Hive->Storage[StorageIndex].BlockList[BlockIndex].BinAddress == (ULONG_PTR)NULL) + { + continue; + } + + /* + * Capture this bin and ensure that such + * bin is within the offset and the size + * is not bogus. + */ + Bin = GET_HHIVE_BIN(Hive, StorageIndex, BlockIndex); + if (Bin->Size > (StorageLength * HBLOCK_SIZE) || + (Bin->FileOffset / HBLOCK_SIZE) != BlockIndex) + { + DPRINT1("Bin size or offset is corrupt (bin size %lu, file offset %lu, storage length %lu)\n", + Bin->Size, Bin->FileOffset, StorageLength); + return CM_CHECK_REGISTRY_BIN_SIZE_OR_OFFSET_CORRUPT; + } + + /* Validate the rest of the bin */ + CmStatusCode = HvValidateBin(Hive, Bin); + if (!CM_CHECK_REGISTRY_SUCCESS(CmStatusCode)) + { + DPRINT1("This bin is not valid (bin 0x%p)\n", Bin); + return CmStatusCode; + } + + /* Go to the next block */ + BlockIndex += Bin->Size / HBLOCK_SIZE; + } + } + + return CM_CHECK_REGISTRY_GOOD; +} + +/** + * @brief + * Checks the registry that is consistent and its + * contents valid and not corrupted. More specifically + * this function performs a deep check of the registry + * for the following properties: + * + * - That the security cache cell of the registry is OK + * - That bins and cells are consistent with each other + * - That the child subkey cell points to the parent + * - That the key itself has sane sizes + * - That the class, values and subkeys lists are valid + * - Much more + * + * @param[in] Hive + * A pointer to a CM hive of the registry to be checked + * in question. + * + * @param[in] Flags + * A bit mask flag used to influence the process of volatile + * keys purging. See Remarks for further information. + * + * @return + * This function returns a CM (Configuration Manager) check + * registry status code. A code of CM_CHECK_REGISTRY_GOOD of + * value 0 indicates the registry hive is valid and not corrupted. + * A non zero unsigned integer value indicates a failure. Consult + * other private routines in this file for other failure status + * codes. + * + * @remarks + * During a load operation CmCheckRegistry can purge the volatile + * data of registry (or not) depending on the submitted flag bit mask + * by the caller. The following supported flags are: + * + * CM_CHECK_REGISTRY_DONT_PURGE_VOLATILES -- Tells the function that + * volatile data purging must not be done. + * + * CM_CHECK_REGISTRY_PURGE_VOLATILES - Tells the function to purge out + * volatile information data from a registry hive, on demand. Purging + * doesn't come into action if no volatile data has been found. + * + * CM_CHECK_REGISTRY_BOOTLOADER_PURGE_VOLATILES - A special flag used + * by FreeLdr and Environ. When this flag is set the function will not + * clean up the volatile storage but it will unintialize the storage + * instead (this is the case if the given registry hive for validation + * is a XP Beta 1 hive or newer). Otherwise it will perform a normal + * cleanup of the volatile storage. + * + * CM_CHECK_REGISTRY_VALIDATE_HIVE - Tells the function to perform a + * thorough analysation of the underlying hive's bins and cells before + * doing validation of the registry tree. HvValidateHive function is called + * in this case. + * + * CM_CHECK_REGISTRY_FIX_HIVE - Tells the function to fix the target registry + * hive if it is damaged. Usually this flag comes from a registry repair tool + * where the user asked to for its damaged hive to be fixed. In this case + * a self-heal procedure against the hive is performed. + */ +CM_CHECK_REGISTRY_STATUS +NTAPI +CmCheckRegistry( + _In_ PCMHIVE RegistryHive, + _In_ ULONG Flags) +{ + CM_CHECK_REGISTRY_STATUS CmStatusCode; + PHHIVE Hive; + BOOLEAN ShouldFixHive = FALSE; + + PAGED_CODE(); + + /* Bail out if the caller did not give a hive */ + if (!RegistryHive) + { + DPRINT1("No registry hive given for check\n"); + return CM_CHECK_REGISTRY_INVALID_PARAMETER; + } + +#if !defined(CMLIB_HOST) && !defined(_BLDR_) + /* + * The master hive is the root of the registry, + * it holds all other hives together. So do not + * do any validation checks. + */ + if (RegistryHive == CmiVolatileHive) + { + DPRINT("This is master registry hive, don't do anything\n"); + return CM_CHECK_REGISTRY_GOOD; + } +#endif + + /* Bail out if no valid flag is given */ + if (Flags & ~(CM_CHECK_REGISTRY_DONT_PURGE_VOLATILES | + CM_CHECK_REGISTRY_PURGE_VOLATILES | + CM_CHECK_REGISTRY_BOOTLOADER_PURGE_VOLATILES | + CM_CHECK_REGISTRY_VALIDATE_HIVE | + CM_CHECK_REGISTRY_FIX_HIVE)) + { + DPRINT1("Invalid flag for registry check given (flag %lu)\n", Flags); + return CM_CHECK_REGISTRY_INVALID_PARAMETER; + } + + /* + * Obtain the hive and check if the caller wants + * that the hive to be validated. + */ + Hive = GET_HHIVE(RegistryHive); + if (Flags & CM_CHECK_REGISTRY_VALIDATE_HIVE) + { + CmStatusCode = HvValidateHive(Hive); + if (!CM_CHECK_REGISTRY_SUCCESS(CmStatusCode)) + { + DPRINT1("The hive is not valid (hive 0x%p, check status code %lu)\n", Hive, CmStatusCode); + return CmStatusCode; + } + } + + /* + * A registry repair tool such as the ReactOS Check Registry + * Utility wants the damaged hive to be fixed as we check the + * target hive. + */ + if (Flags & CM_CHECK_REGISTRY_FIX_HIVE) + { + ShouldFixHive = TRUE; + } + + /* + * FIXME: Currently ReactOS does not implement security + * caching algorithms so it's pretty pointless to implement + * security descriptors validation checks at this moment. + * When the time comes to implement these, we would need + * to implement security checks here as well. + */ + + /* Call the internal API to do the rest of the work bulk */ + CmStatusCode = CmpValidateRegistryInternal(Hive, Flags, FALSE, ShouldFixHive); + if (!CM_CHECK_REGISTRY_SUCCESS(CmStatusCode)) + { + DPRINT1("The hive is not valid (hive 0x%p, check status code %lu)\n", Hive, CmStatusCode); + return CmStatusCode; + } + + return CmStatusCode; +} + +/* EOF */ diff --git a/sdk/lib/cmlib/cmlib.h b/sdk/lib/cmlib/cmlib.h index 65f66f581b0..77911739ab6 100644 --- a/sdk/lib/cmlib/cmlib.h +++ b/sdk/lib/cmlib/cmlib.h @@ -205,13 +205,77 @@ #endif #endif -#define TAG_CM ' MC' -#define TAG_KCB 'bkMC' -#define TAG_CMHIVE 'vHMC' -#define TAG_CMSD 'DSMC' +#define TAG_CM ' MC' +#define TAG_KCB 'bkMC' +#define TAG_CMHIVE 'vHMC' +#define TAG_CMSD 'DSMC' +#define TAG_REGISTRY_STACK 'sRMC' #define CMAPI NTAPI +// +// Check Registry status type definition +// +typedef ULONG CM_CHECK_REGISTRY_STATUS; + +// +// Check Registry flags +// +#define CM_CHECK_REGISTRY_DONT_PURGE_VOLATILES 0x0 +#define CM_CHECK_REGISTRY_PURGE_VOLATILES 0x2 +#define CM_CHECK_REGISTRY_BOOTLOADER_PURGE_VOLATILES 0x4 +#define CM_CHECK_REGISTRY_VALIDATE_HIVE 0x8 +#define CM_CHECK_REGISTRY_FIX_HIVE 0x10 + +// +// Check Registry status codes +// +#define CM_CHECK_REGISTRY_GOOD 0 +#define CM_CHECK_REGISTRY_INVALID_PARAMETER 1 +#define CM_CHECK_REGISTRY_SD_INVALID 2 +#define CM_CHECK_REGISTRY_HIVE_CORRUPT_SIGNATURE 3 +#define CM_CHECK_REGISTRY_BIN_SIZE_OR_OFFSET_CORRUPT 4 +#define CM_CHECK_REGISTRY_BIN_SIGNATURE_HEADER_CORRUPT 5 +#define CM_CHECK_REGISTRY_BAD_FREE_CELL 6 +#define CM_CHECK_REGISTRY_BAD_ALLOC_CELL 7 +#define CM_CHECK_REGISTRY_ALLOCATE_MEM_STACK_FAIL 8 +#define CM_CHECK_REGISTRY_ROOT_CELL_NOT_FOUND 9 +#define CM_CHECK_REGISTRY_BAD_LEXICOGRAPHICAL_ORDER 10 +#define CM_CHECK_REGISTRY_NODE_NOT_FOUND 11 +#define CM_CHECK_REGISTRY_SUBKEY_NOT_FOUND 12 +#define CM_CHECK_REGISTRY_TREE_TOO_MANY_LEVELS 13 +#define CM_CHECK_REGISTRY_KEY_CELL_NOT_ALLOCATED 14 +#define CM_CHECK_REGISTRY_CELL_DATA_NOT_FOUND 15 +#define CM_CHECK_REGISTRY_CELL_SIZE_NOT_SANE 16 +#define CM_CHECK_REGISTRY_KEY_NAME_LENGTH_ZERO 17 +#define CM_CHECK_REGISTRY_KEY_TOO_BIG_THAN_CELL 18 +#define CM_CHECK_REGISTRY_BAD_KEY_NODE_PARENT 19 +#define CM_CHECK_REGISTRY_BAD_KEY_NODE_SIGNATURE 20 +#define CM_CHECK_REGISTRY_KEY_CLASS_UNALLOCATED 21 +#define CM_CHECK_REGISTRY_VALUE_LIST_UNALLOCATED 22 +#define CM_CHECK_REGISTRY_VALUE_LIST_DATA_NOT_FOUND 23 +#define CM_CHECK_REGISTRY_VALUE_LIST_SIZE_NOT_SANE 24 +#define CM_CHECK_REGISTRY_VALUE_CELL_NIL 25 +#define CM_CHECK_REGISTRY_VALUE_CELL_UNALLOCATED 26 +#define CM_CHECK_REGISTRY_VALUE_CELL_DATA_NOT_FOUND 27 +#define CM_CHECK_REGISTRY_VALUE_CELL_SIZE_NOT_SANE 28 +#define CM_CHECK_REGISTRY_CORRUPT_VALUE_DATA 29 +#define CM_CHECK_REGISTRY_DATA_CELL_NOT_ALLOCATED 30 +#define CM_CHECK_REGISTRY_BAD_KEY_VALUE_SIGNATURE 31 +#define CM_CHECK_REGISTRY_STABLE_KEYS_ON_VOLATILE 32 +#define CM_CHECK_REGISTRY_SUBKEYS_LIST_UNALLOCATED 33 +#define CM_CHECK_REGISTRY_CORRUPT_SUBKEYS_INDEX 34 +#define CM_CHECK_REGISTRY_BAD_SUBKEY_COUNT 35 +#define CM_CHECK_REGISTRY_KEY_INDEX_CELL_UNALLOCATED 36 +#define CM_CHECK_REGISTRY_CORRUPT_LEAF_ON_ROOT 37 +#define CM_CHECK_REGISTRY_CORRUPT_LEAF_SIGNATURE 38 +#define CM_CHECK_REGISTRY_CORRUPT_KEY_INDEX_SIGNATURE 39 + +// +// Check Registry success macro +// +#define CM_CHECK_REGISTRY_SUCCESS(StatusCode) ((ULONG)(StatusCode) == CM_CHECK_REGISTRY_GOOD) + #include <wine/unicode.h> #include <wchar.h> #include "hivedata.h" @@ -570,6 +634,26 @@ CmPrepareHive( /* NT-style Public Cm functions */ +// +// Check Registry Routines +// +CM_CHECK_REGISTRY_STATUS +NTAPI +HvValidateBin( + _In_ PHHIVE Hive, + _In_ PHBIN Bin); + +CM_CHECK_REGISTRY_STATUS +NTAPI +HvValidateHive( + _In_ PHHIVE Hive); + +CM_CHECK_REGISTRY_STATUS +NTAPI +CmCheckRegistry( + _In_ PCMHIVE RegistryHive, + _In_ ULONG Flags); + // // Cell Index Routines //

10 months

[reactos] 05/15: [SDK][CMLIB] Implement self-heal registry helpers

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=54c552392f62f7369c6d7… commit 54c552392f62f7369c6d7e8395a671fe593afda1 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Wed Oct 26 19:21:49 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun Nov 19 20:44:27 2023 +0100 [SDK][CMLIB] Implement self-heal registry helpers This implements cmheal.c file which provides the basic registry self-heal infrastructure needed by the public CmCheckRegistry function. The infrastructure provides a range of various self-heal helpers for the hive, such as subkey, class, values and node healing functions. --- sdk/lib/cmlib/CMakeLists.txt | 1 + sdk/lib/cmlib/cmheal.c | 912 +++++++++++++++++++++++++++++++++++++++++++ sdk/lib/cmlib/cmlib.h | 73 ++++ 3 files changed, 986 insertions(+) diff --git a/sdk/lib/cmlib/CMakeLists.txt b/sdk/lib/cmlib/CMakeLists.txt index 2ed0bc304b1..91ccbe6c3e5 100644 --- a/sdk/lib/cmlib/CMakeLists.txt +++ b/sdk/lib/cmlib/CMakeLists.txt @@ -5,6 +5,7 @@ add_definitions( list(APPEND SOURCE cminit.c + cmheal.c cmindex.c cmkeydel.c cmname.c diff --git a/sdk/lib/cmlib/cmheal.c b/sdk/lib/cmlib/cmheal.c new file mode 100644 index 00000000000..9489d621bed --- /dev/null +++ b/sdk/lib/cmlib/cmheal.c @@ -0,0 +1,912 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Configuration Manager Library - Registry Self-Heal Routines + * COPYRIGHT: Copyright 2022 George Bișoc <george.bisoc(a)reactos.org> + */ + +#include "cmlib.h" +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +#if !defined(CMLIB_HOST) && !defined(_BLDR_) +extern BOOLEAN CmpSelfHeal; +extern ULONG CmpBootType; +#endif + +/* PRIVATE FUNCTIONS **********************************************************/ + +/** + * @brief + * Removes a cell from a fast key index. + * + * @param[in,out] FastIndex + * The fast key index where a cell has to be removed. + * + * @param[in] Index + * The index which points to the location of the + * cell that is to be removed. + * + * @param[in] UpdateCount + * If set to TRUE, the function will update the fast + * index count accordingly by one value less. If set + * to FALSE, the count won't be updated. See Remarks + * for further information. + * + * @remarks + * In case where the fast index count is not updated is + * when the key index is not a root but a leaf. In such + * scenario such leaf is the actual key index itself + * so updating the fast index count is not necessary (aka + * UpdateCount is set to FALSE). + */ +static +VOID +CmpRemoveFastIndexKeyCell( + _Inout_ PCM_KEY_FAST_INDEX FastIndex, + _In_ ULONG Index, + _In_ BOOLEAN UpdateCount) +{ + ULONG MoveCount; + ASSERT(Index < FastIndex->Count); + + /* Calculate the number of trailing cells */ + MoveCount = FastIndex->Count - Index - 1; + if (MoveCount != 0) + { + /* Remove the cell now by moving one location ahead */ + RtlMoveMemory(&FastIndex->List[Index], + &FastIndex->List[Index + 1], + MoveCount * sizeof(CM_INDEX)); + } + + /* Update the fast index count if asked */ + if (UpdateCount) + FastIndex->Count--; +} + +/** + * @brief + * Removes a cell from a normal key index. + * + * @param[in,out] KeyIndex + * The key index where a cell has to be removed. + * + * @param[in] Index + * The index which points to the location of the + * cell that is to be removed. + */ +static +VOID +CmpRemoveIndexKeyCell( + _Inout_ PCM_KEY_INDEX KeyIndex, + _In_ ULONG Index) +{ + ULONG MoveCount; + ASSERT(Index < KeyIndex->Count); + + /* Calculate the number of trailing cells */ + MoveCount = KeyIndex->Count - Index - 1; + if (MoveCount != 0) + { + /* Remove the cell now by moving one location ahead */ + RtlMoveMemory(&KeyIndex->List[Index], + &KeyIndex->List[Index + 1], + MoveCount * sizeof(HCELL_INDEX)); + } + + /* Update the key index count */ + KeyIndex->Count--; +} + +/** + * @brief + * Removes a cell from a key value list node. + * + * @param[in,out] ValueListNode + * The value list node which is used by the + * function to update the value list count. + * + * @param[in,out] ValueListData + * The value list data of which a cell has to be removed. + * + * @param[in] Index + * The index which points to the location of the + * cell that is to be removed. + */ +static +VOID +CmpRemoveValueFromValueList( + _Inout_ PCM_KEY_NODE ValueListNode, + _Inout_ PCELL_DATA ValueListData, + _In_ ULONG Index) +{ + ULONG MoveCount; + ASSERT(Index < ValueListNode->ValueList.Count); + + /* Calculate the number of trailing values */ + MoveCount = ValueListNode->ValueList.Count - Index - 1; + if (MoveCount != 0) + { + /* Remove the value now by moving one location ahead */ + RtlMoveMemory(&ValueListData->u.KeyList[Index], + &ValueListData->u.KeyList[Index + 1], + MoveCount * sizeof(HCELL_INDEX)); + } + + /* Update the value list count */ + ValueListNode->ValueList.Count--; +} + +/** + * @brief + * Removes the offending subkey from a root index. + * + * @param[in] Hive + * A pointer to a hive descriptor containing faulty data. + * + * @param[in] RootIndex + * The root index where a leaf is obtained from. Such + * leaf is used to check deep down the leaf for the offending + * subkey. + * + * @param[in] TargetKey + * The offending target subkey to be removed. + * + * @return + * Returns TRUE if the function successfully removed the target + * key, FALSE otherwise. + */ +static +BOOLEAN +CmpRemoveSubkeyInRoot( + _In_ PHHIVE Hive, + _In_ PCM_KEY_INDEX RootIndex, + _In_ HCELL_INDEX TargetKey) +{ + PCM_KEY_INDEX Leaf; + PCM_KEY_FAST_INDEX FastIndex; + HCELL_INDEX LeafCell; + ULONG RootCountIndex; + ULONG LeafCountIndex; + + PAGED_CODE(); + + ASSERT(RootIndex); + + /* Loop the root index */ + for (RootCountIndex = 0; RootCountIndex < RootIndex->Count; RootCountIndex++) + { + /* + * Release the leaf cell from previous iteration + * of the loop. Make sure what we're releasing is + * valid to begin with. + */ + if (RootCountIndex) + { + ASSERT(Leaf); + ASSERT(LeafCell == RootIndex->List[RootCountIndex - 1]); + HvReleaseCell(Hive, LeafCell); + } + + /* Get the leaf cell and the leaf for this index */ + LeafCell = RootIndex->List[RootCountIndex]; + Leaf = (PCM_KEY_INDEX)HvGetCell(Hive, LeafCell); + if (!Leaf) + { + DPRINT1("Couldn't get the leaf from cell\n"); + return FALSE; + } + + /* Start looping the leaf */ + for (LeafCountIndex = 0; LeafCountIndex < Leaf->Count; LeafCountIndex++) + { + /* Is the leaf a fast leaf or a hash one? */ + if ((Leaf->Signature == CM_KEY_FAST_LEAF) || + (Leaf->Signature == CM_KEY_HASH_LEAF)) + { + /* It is one of the two, get the fast index */ + FastIndex = (PCM_KEY_FAST_INDEX)Leaf; + + /* + * Is the subkey cell from the fast + * index the one we one we're actually + * searching? + */ + if (FastIndex->List[LeafCountIndex].Cell == TargetKey) + { + HvReleaseCell(Hive, LeafCell); + HvMarkCellDirty(Hive, LeafCell, FALSE); + CmpRemoveFastIndexKeyCell(FastIndex, LeafCountIndex, TRUE); + DPRINT1("The offending key cell has BEEN FOUND in fast index (fast index 0x%p, index %lu)\n", + FastIndex, LeafCountIndex); + return TRUE; + } + } + else + { + /* + * The leaf is neither of the two. Check if + * the target offending cell is inside the leaf + * itself. + */ + if (Leaf->List[LeafCountIndex] == TargetKey) + { + HvReleaseCell(Hive, LeafCell); + HvMarkCellDirty(Hive, LeafCell, FALSE); + CmpRemoveIndexKeyCell(Leaf, LeafCountIndex); + DPRINT1("The offending key cell has BEEN FOUND in leaf (leaf 0x%p, index %lu)\n", + Leaf, LeafCountIndex); + return TRUE; + } + } + } + } + + /* + * We have searched everywhere but we couldn't + * hunt the offending target key cell. + */ + DPRINT1("No target key has been found to remove\n"); + return FALSE; +} + +/** + * @brief + * Removes the offending subkey from a leaf index. + * + * @param[in] Hive + * A pointer to a hive descriptor containing faulty data. + * + * @param[in] KeyNode + * A pointer to a key node of the parent. This node is + * used by the function to mark the whole subkeys list + * of the parent dirty. + * + * @param[in] Leaf + * A pointer to a leaf key index of which the offending + * subkey is to be removed from. + * + * @param[in] TargetKey + * The offending target subkey to remove. + * + * @return + * Returns TRUE if the function successfully removed the target + * key, FALSE otherwise. + */ +static +BOOLEAN +CmpRemoveSubKeyInLeaf( + _In_ PHHIVE Hive, + _In_ PCM_KEY_NODE KeyNode, + _In_ PCM_KEY_INDEX Leaf, + _In_ HCELL_INDEX TargetKey) +{ + PCM_KEY_FAST_INDEX FastIndex; + ULONG LeafIndex; + + /* Loop the leaf index */ + for (LeafIndex = 0; LeafIndex < Leaf->Count; LeafIndex++) + { + /* + * Check if the main leaf is a fast + * leaf or a hash one. + */ + if ((Leaf->Signature == CM_KEY_FAST_LEAF) || + (Leaf->Signature == CM_KEY_HASH_LEAF)) + { + /* It is one of the two, get the fast index */ + FastIndex = (PCM_KEY_FAST_INDEX)Leaf; + + /* + * Is the subkey cell from the fast + * index the one we're actually + * searching? + */ + if (FastIndex->List[LeafIndex].Cell == TargetKey) + { + HvMarkCellDirty(Hive, KeyNode->SubKeyLists[Stable], FALSE); + CmpRemoveFastIndexKeyCell(FastIndex, LeafIndex, FALSE); + + /* + * Since this fast index actually came from the + * actual leaf index itself, just update its count + * rather than that of the fast index. + */ + Leaf->Count--; + DPRINT1("The offending key cell has BEEN FOUND in fast index (fast index 0x%p, leaf index %lu)\n", + FastIndex, LeafIndex); + return TRUE; + } + } + else + { + /* + * The leaf is neither of the two. The offending + * cell must come directly from the normal leaf + * at this point. + */ + if (Leaf->List[LeafIndex] == TargetKey) + { + HvMarkCellDirty(Hive, KeyNode->SubKeyLists[Stable], FALSE); + CmpRemoveIndexKeyCell(Leaf, LeafIndex); + DPRINT1("The offending key cell has BEEN FOUND in leaf (leaf 0x%p, index %lu)\n", + Leaf, LeafIndex); + return TRUE; + } + } + } + + /* + * We have searched everywhere but we couldn't + * hunt the offending target key cell. + */ + DPRINT1("No target key has been found to remove\n"); + return FALSE; +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +/** + * @brief + * Checks if self healing is permitted by the kernel and/or + * bootloader. Self healing is also triggered if such a + * request was prompted by the user to fix a broken hive. + * Such a request tipically comes from a registry repair + * tool such as the ReactOS Check Registry Utility. + * + * @param[in] FixHive + * If set to TRUE, self heal is triggered and the target + * hive will be fixed. Otherwise the hive will not be fixed. + * + * @return + * Returns TRUE if self healing is possible, FALSE otherwise. + */ +BOOLEAN +CMAPI +CmIsSelfHealEnabled( + _In_ BOOLEAN FixHive) +{ + PAGED_CODE(); + + if (FixHive) + return TRUE; + +#if !defined(CMLIB_HOST) && !defined(_BLDR_) + if (CmpSelfHeal || (CmpBootType & HBOOT_TYPE_SELF_HEAL)) + return TRUE; +#endif + + return FALSE; +} + +/** + * @brief + * Repairs the parent key from damage by removing the + * offending subkey cell. + * + * @param[in,out] Hive + * A pointer to a hive descriptor containing faulty data. + * + * @param[in] TargetKey + * The offending target cell to remove from the parent. + * + * @param[in] ParentKey + * The damaged parent key cell to heal. + * + * @param[in] FixHive + * If set to TRUE, self heal is triggered and the target + * hive will be fixed. Otherwise the hive will not be fixed. + * + * @return + * Returns TRUE if the function successfully healed the parent + * key, FALSE otherwise. + */ +BOOLEAN +CMAPI +CmpRepairParentKey( + _Inout_ PHHIVE Hive, + _In_ HCELL_INDEX TargetKey, + _In_ HCELL_INDEX ParentKey, + _In_ BOOLEAN FixHive) +{ + PCM_KEY_INDEX KeyIndex; + PCM_KEY_NODE KeyNode; + BOOLEAN ParentRepaired; + + PAGED_CODE(); + + /* The target key must NEVER be NIL! */ + ASSERT(TargetKey != HCELL_NIL); + + /* Assume the parent hasn't been repaired yet */ + ParentRepaired = FALSE; + + /* Is self healing possible? */ + if (!CmIsSelfHealEnabled(FixHive)) + { + DPRINT1("Self healing not possible\n"); + return ParentRepaired; + } + + /* Obtain a node from the parent */ + KeyNode = (PCM_KEY_NODE)HvGetCell(Hive, ParentKey); + if (!KeyNode) + { + DPRINT1("Couldn't get the parent key node\n"); + return ParentRepaired; + } + + /* Obtain the index as well since we got the parent node */ + KeyIndex = (PCM_KEY_INDEX)HvGetCell(Hive, KeyNode->SubKeyLists[Stable]); + if (!KeyIndex) + { + DPRINT1("Couldn't get the key index from parent node\n"); + HvReleaseCell(Hive, ParentKey); + return ParentRepaired; + } + + /* Check if this is a root */ + if (KeyIndex->Signature == CM_KEY_INDEX_ROOT) + { + /* It is, call the specific helper to discard the damaged key down the root */ + ParentRepaired = CmpRemoveSubkeyInRoot(Hive, + KeyIndex, + TargetKey); + } + else if ((KeyIndex->Signature == CM_KEY_INDEX_LEAF) || + (KeyIndex->Signature == CM_KEY_FAST_LEAF) || + (KeyIndex->Signature == CM_KEY_HASH_LEAF)) + { + /* Otherwise call the leaf helper */ + ParentRepaired = CmpRemoveSubKeyInLeaf(Hive, + KeyNode, + KeyIndex, + TargetKey); + } + else + { + /* + * Generally CmCheckRegistry detects if a key index + * in the subkeys list is totally broken (we understand + * that if its signature is not root or leaf) and it will + * purge the whole subkeys list in such cases. With that + * being said, we should never reach this code path. But + * if for whatever reason we reach here then something + * is seriously wrong. + */ + DPRINT1("The key index signature is invalid (KeyIndex->Signature == %lu)", KeyIndex->Signature); + ASSERT(FALSE); + } + + /* + * If we successfully removed the offending key + * cell mark down the parent as dirty and punt down + * the subkey count as well. Mark the hive as in + * self heal mode as well. + */ + if (ParentRepaired) + { + HvMarkCellDirty(Hive, ParentKey, FALSE); + KeyNode->SubKeyCounts[Stable]--; + Hive->BaseBlock->BootType |= HBOOT_TYPE_SELF_HEAL; + DPRINT1("The subkey has been removed, the parent is now repaired\n"); + } + + HvReleaseCell(Hive, KeyNode->SubKeyLists[Stable]); + HvReleaseCell(Hive, ParentKey); + return ParentRepaired; +} + +/** + * @brief + * Repairs the parent of the node from damage due + * to parent cell and parent node incosistency. + * + * @param[in,out] Hive + * A pointer to a hive descriptor containing faulty data. + * + * @param[in] CurrentCell + * The current cell to be marked as dirty. + * + * @param[in] ParentCell + * The sane parent cell which is used by the + * function for new parent node assignment. + * + * @param[in,out] CellData + * The cell data of the current cell of which + * its parent node is to be repaired. + * + * @param[in] FixHive + * If set to TRUE, self heal is triggered and the target + * hive will be fixed. Otherwise the hive will not be fixed. + * + * @return + * Returns TRUE if the function successfully healed the + * parent node, FALSE otherwise. + */ +BOOLEAN +CMAPI +CmpRepairParentNode( + _Inout_ PHHIVE Hive, + _In_ HCELL_INDEX CurrentCell, + _In_ HCELL_INDEX ParentCell, + _Inout_ PCELL_DATA CellData, + _In_ BOOLEAN FixHive) +{ + PAGED_CODE(); + + /* Is self healing possible? */ + if (!CmIsSelfHealEnabled(FixHive)) + { + DPRINT1("Self healing not possible\n"); + return FALSE; + } + + /* + * Mark the cell where we got the actual + * cell data as dirty and fix the node. + */ + HvMarkCellDirty(Hive, CurrentCell, FALSE); + CellData->u.KeyNode.Parent = ParentCell; + + /* Mark the hive as in self healing mode since we repaired it */ + Hive->BaseBlock->BootType |= HBOOT_TYPE_SELF_HEAL; + return TRUE; +} + +/** + * @brief + * Repairs the key node signature from damage + * due to signature corruption. + * + * @param[in,out] Hive + * A pointer to a hive descriptor containing faulty data. + * + * @param[in] CurrentCell + * The current cell to be marked as dirty. + * + * @param[in,out] CellData + * The cell data of the current cell of which + * its signature is to be repaired. + * + * @param[in] FixHive + * If set to TRUE, self heal is triggered and the target + * hive will be fixed. Otherwise the hive will not be fixed. + * + * @return + * Returns TRUE if the function successfully healed the + * key node signature, FALSE otherwise. + */ +BOOLEAN +CMAPI +CmpRepairKeyNodeSignature( + _Inout_ PHHIVE Hive, + _In_ HCELL_INDEX CurrentCell, + _Inout_ PCELL_DATA CellData, + _In_ BOOLEAN FixHive) +{ + PAGED_CODE(); + + /* Is self healing possible? */ + if (!CmIsSelfHealEnabled(FixHive)) + { + DPRINT1("Self healing not possible\n"); + return FALSE; + } + + /* + * Mark the cell where we got the actual + * cell data as dirty and fix the key signature. + */ + HvMarkCellDirty(Hive, CurrentCell, FALSE); + CellData->u.KeyNode.Signature = CM_KEY_NODE_SIGNATURE; + + /* Mark the hive as in self healing mode since we repaired it */ + Hive->BaseBlock->BootType |= HBOOT_TYPE_SELF_HEAL; + return TRUE; +} + +/** + * @brief + * Repairs the class from damage due to class + * corruption within the node key. + * + * @param[in,out] Hive + * A pointer to a hive descriptor containing faulty data. + * + * @param[in] CurrentCell + * The current cell to be marked as dirty. + * + * @param[in,out] CellData + * The cell data of the current cell of which + * its class is to be repaired. + * + * @param[in] FixHive + * If set to TRUE, self heal is triggered and the target + * hive will be fixed. Otherwise the hive will not be fixed. + * + * @return + * Returns TRUE if the function successfully healed the + * class of node key, FALSE otherwise. + */ +BOOLEAN +CMAPI +CmpRepairClassOfNodeKey( + _Inout_ PHHIVE Hive, + _In_ HCELL_INDEX CurrentCell, + _Inout_ PCELL_DATA CellData, + _In_ BOOLEAN FixHive) +{ + PAGED_CODE(); + + /* Is self healing possible? */ + if (!CmIsSelfHealEnabled(FixHive)) + { + DPRINT1("Self healing not possible\n"); + return FALSE; + } + + /* + * Mark the cell where we got the actual + * cell data as dirty and fix the class field + * of key node. + */ + HvMarkCellDirty(Hive, CurrentCell, FALSE); + CellData->u.KeyNode.Class = HCELL_NIL; + CellData->u.KeyNode.ClassLength = 0; + + /* Mark the hive as in self healing mode since we repaired it */ + Hive->BaseBlock->BootType |= HBOOT_TYPE_SELF_HEAL; + return TRUE; +} + +/** + * @brief + * Repairs the value list count of key due to + * corruption. The process involves by removing + * one damaged value less from the list. + * + * @param[in,out] Hive + * A pointer to a hive descriptor containing faulty data. + * + * @param[in] CurrentCell + * The current cell to be marked as dirty. + * + * @param[in] ListCountIndex + * The value count index which points to the actual + * value in the list to be removed. + * + * @param[in,out] ValueListData + * The value list cell data containing the actual list + * of which the damaged is to be removed from. + * + * @param[in] FixHive + * If set to TRUE, self heal is triggered and the target + * hive will be fixed. Otherwise the hive will not be fixed. + * + * @return + * Returns TRUE if the function successfully healed the + * value list count, FALSE otherwise. + */ +BOOLEAN +CMAPI +CmpRepairValueListCount( + _Inout_ PHHIVE Hive, + _In_ HCELL_INDEX CurrentCell, + _In_ ULONG ListCountIndex, + _Inout_ PCELL_DATA ValueListData, + _In_ BOOLEAN FixHive) +{ + PCM_KEY_NODE ValueListNode; + + PAGED_CODE(); + + /* Is self healing possible? */ + if (!CmIsSelfHealEnabled(FixHive)) + { + DPRINT1("Self healing not possible\n"); + return FALSE; + } + + /* + * Obtain a node from the cell that we mark it as dirty. + * The node is that of the current cell of which its + * value list is being validated. + */ + ValueListNode = (PCM_KEY_NODE)HvGetCell(Hive, CurrentCell); + if (!ValueListNode) + { + DPRINT1("Could not get a node from the current cell\n"); + return FALSE; + } + + /* + * Mark the current cell and value list as dirty + * as we will be making changes onto them. + */ + HvMarkCellDirty(Hive, CurrentCell, FALSE); + HvMarkCellDirty(Hive, ValueListNode->ValueList.List, FALSE); + + /* + * Now remove the value from the list and mark the + * hive as in self healing mode. + */ + CmpRemoveValueFromValueList(ValueListNode, ValueListData, ListCountIndex); + Hive->BaseBlock->BootType |= HBOOT_TYPE_SELF_HEAL; + HvReleaseCell(Hive, CurrentCell); + return TRUE; +} + +/** + * @brief + * Repairs the value list due to corruption. The + * process involes by purging the whole damaged + * list. + * + * @param[in,out] Hive + * A pointer to a hive descriptor containing faulty data. + * + * @param[in] CurrentCell + * The current cell to be marked as dirty. + * + * @param[in] FixHive + * If set to TRUE, self heal is triggered and the target + * hive will be fixed. Otherwise the hive will not be fixed. + * + * @return + * Returns TRUE if the function successfully healed the + * value list, FALSE otherwise. + */ +BOOLEAN +CMAPI +CmpRepairValueList( + _Inout_ PHHIVE Hive, + _In_ HCELL_INDEX CurrentCell, + _In_ BOOLEAN FixHive) +{ + PCM_KEY_NODE ValueListNode; + + PAGED_CODE(); + + /* Is self healing possible? */ + if (!CmIsSelfHealEnabled(FixHive)) + { + DPRINT1("Self healing not possible\n"); + return FALSE; + } + + /* Obtain a node */ + ValueListNode = (PCM_KEY_NODE)HvGetCell(Hive, CurrentCell); + if (!ValueListNode) + { + DPRINT1("Could not get a node from the current cell\n"); + return FALSE; + } + + /* Purge out the whole list */ + HvMarkCellDirty(Hive, CurrentCell, FALSE); + ValueListNode->ValueList.List = HCELL_NIL; + ValueListNode->ValueList.Count = 0; + + Hive->BaseBlock->BootType |= HBOOT_TYPE_SELF_HEAL; + HvReleaseCell(Hive, CurrentCell); + return TRUE; +} + +/** + * @brief + * Repairs the subkey list count due to corruption. + * The process involves by fixing the count itself + * with a sane count. + * + * @param[in,out] Hive + * A pointer to a hive descriptor containing faulty data. + * + * @param[in] CurrentCell + * The current cell to be marked as dirty. + * + * @param[in] Count + * The healthy count which is used by the function + * to fix the subkeys list count. + * + * @param[in,out] CellData + * The cell data of the current cell of which its + * subkeys list is to be fixed. + * + * @param[in] FixHive + * If set to TRUE, self heal is triggered and the target + * hive will be fixed. Otherwise the hive will not be fixed. + * + * @return + * Returns TRUE if the function successfully healed the + * subkeys list count, FALSE otherwise. + */ +BOOLEAN +CMAPI +CmpRepairSubKeyCounts( + _Inout_ PHHIVE Hive, + _In_ HCELL_INDEX CurrentCell, + _In_ ULONG Count, + _Inout_ PCELL_DATA CellData, + _In_ BOOLEAN FixHive) +{ + PAGED_CODE(); + + /* Is self healing possible? */ + if (!CmIsSelfHealEnabled(FixHive)) + { + DPRINT1("Self healing not possible\n"); + return FALSE; + } + + /* + * Mark the cell where we got the actual + * cell data as dirty and fix the subkey + * counts. + */ + HvMarkCellDirty(Hive, CurrentCell, FALSE); + CellData->u.KeyNode.SubKeyCounts[Stable] = Count; + + /* Mark the hive as in self healing mode since we repaired it */ + Hive->BaseBlock->BootType |= HBOOT_TYPE_SELF_HEAL; + return TRUE; +} + +/** + * @brief + * Repairs the subkey list due to corruption. The process + * involves by purging the whole damaged subkeys list. + * + * @param[in,out] Hive + * A pointer to a hive descriptor containing faulty data. + * + * @param[in] CurrentCell + * The current cell to be marked as dirty. + * + * @param[in,out] CellData + * The cell data of the current cell of which its + * subkeys list is to be fixed. + * + * @param[in] FixHive + * If set to TRUE, self heal is triggered and the target + * hive will be fixed. Otherwise the hive will not be fixed. + * + * @return + * Returns TRUE if the function successfully healed the + * subkeys list, FALSE otherwise. + */ +BOOLEAN +CMAPI +CmpRepairSubKeyList( + _Inout_ PHHIVE Hive, + _In_ HCELL_INDEX CurrentCell, + _Inout_ PCELL_DATA CellData, + _In_ BOOLEAN FixHive) +{ + PAGED_CODE(); + + /* Is self healing possible? */ + if (!CmIsSelfHealEnabled(FixHive)) + { + DPRINT1("Self healing not possible\n"); + return FALSE; + } + + /* + * Mark the cell where we got the actual + * cell data as dirty and fix the subkey + * list. + */ + HvMarkCellDirty(Hive, CurrentCell, FALSE); + CellData->u.KeyNode.SubKeyLists[Stable] = HCELL_NIL; + CellData->u.KeyNode.SubKeyCounts[Stable] = 0; + + /* Mark the hive as in self healing mode since we repaired it */ + Hive->BaseBlock->BootType |= HBOOT_TYPE_SELF_HEAL; + return TRUE; +} + +/* EOF */ diff --git a/sdk/lib/cmlib/cmlib.h b/sdk/lib/cmlib/cmlib.h index 4f02daf32e5..65f66f581b0 100644 --- a/sdk/lib/cmlib/cmlib.h +++ b/sdk/lib/cmlib/cmlib.h @@ -482,6 +482,79 @@ ULONG CMAPI HvpHiveHeaderChecksum( PHBASE_BLOCK HiveHeader); +// +// Registry Self-Heal Routines +// +BOOLEAN +CMAPI +CmIsSelfHealEnabled( + _In_ BOOLEAN FixHive); + +BOOLEAN +CMAPI +CmpRepairParentKey( + _Inout_ PHHIVE Hive, + _In_ HCELL_INDEX TargetKey, + _In_ HCELL_INDEX ParentKey, + _In_ BOOLEAN FixHive); + +BOOLEAN +CMAPI +CmpRepairParentNode( + _Inout_ PHHIVE Hive, + _In_ HCELL_INDEX DirtyCell, + _In_ HCELL_INDEX ParentCell, + _Inout_ PCELL_DATA CellData, + _In_ BOOLEAN FixHive); + +BOOLEAN +CMAPI +CmpRepairKeyNodeSignature( + _Inout_ PHHIVE Hive, + _In_ HCELL_INDEX DirtyCell, + _Inout_ PCELL_DATA CellData, + _In_ BOOLEAN FixHive); + +BOOLEAN +CMAPI +CmpRepairClassOfNodeKey( + _Inout_ PHHIVE Hive, + _In_ HCELL_INDEX DirtyCell, + _Inout_ PCELL_DATA CellData, + _In_ BOOLEAN FixHive); + +BOOLEAN +CMAPI +CmpRepairValueList( + _Inout_ PHHIVE Hive, + _In_ HCELL_INDEX CurrentCell, + _In_ BOOLEAN FixHive); + +BOOLEAN +CMAPI +CmpRepairValueListCount( + _Inout_ PHHIVE Hive, + _In_ HCELL_INDEX CurrentCell, + _In_ ULONG ListCountIndex, + _Inout_ PCELL_DATA ValueListData, + _In_ BOOLEAN FixHive); + +BOOLEAN +CMAPI +CmpRepairSubKeyCounts( + _Inout_ PHHIVE Hive, + _In_ HCELL_INDEX CurrentCell, + _In_ ULONG Count, + _Inout_ PCELL_DATA CellData, + _In_ BOOLEAN FixHive); + +BOOLEAN +CMAPI +CmpRepairSubKeyList( + _Inout_ PHHIVE Hive, + _In_ HCELL_INDEX CurrentCell, + _Inout_ PCELL_DATA CellData, + _In_ BOOLEAN FixHive); /* Old-style Public "Cmlib" functions */

10 months

[reactos] 04/15: [CMLIB] Add STATUS_INVALID_PARAMETER and STATUS_REGISTRY_IO_FAILED status codes

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=586bea138eccd0c9680f9… commit 586bea138eccd0c9680f9a4a0262d2bb4071c49b Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Wed Oct 26 19:05:25 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun Nov 19 20:44:26 2023 +0100 [CMLIB] Add STATUS_INVALID_PARAMETER and STATUS_REGISTRY_IO_FAILED status codes Add these NTSTATUS codes in the CMLIB library. STATUS_INVALID_PARAMETER will be used mostly for HvInitialize function, STATUS_REGISTRY_IO_FAILED for whatever routines that deal with reading or writing into a hive file. --- sdk/lib/cmlib/cmlib.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sdk/lib/cmlib/cmlib.h b/sdk/lib/cmlib/cmlib.h index fd6de8c75db..4f02daf32e5 100644 --- a/sdk/lib/cmlib/cmlib.h +++ b/sdk/lib/cmlib/cmlib.h @@ -1,8 +1,9 @@ /* - * PROJECT: Registry manipulation library - * LICENSE: GPL - See COPYING in the top level directory - * COPYRIGHT: Copyright 2005 Filip Navara <navaraf(a)reactos.org> - * Copyright 2001 - 2005 Eric Kohl + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Configuration Manager Library - CMLIB header + * COPYRIGHT: Copyright 2001 - 2005 Eric Kohl + * Copyright 2022 George Bișoc <george.bisoc(a)reactos.org> */ #ifndef _CMLIB_H_ @@ -59,7 +60,9 @@ #define STATUS_NOT_IMPLEMENTED ((NTSTATUS)0xC0000002) #define STATUS_NO_MEMORY ((NTSTATUS)0xC0000017) #define STATUS_INSUFFICIENT_RESOURCES ((NTSTATUS)0xC000009A) + #define STATUS_INVALID_PARAMETER ((NTSTATUS)0xC000000D) #define STATUS_REGISTRY_CORRUPT ((NTSTATUS)0xC000014C) + #define STATUS_REGISTRY_IO_FAILED ((NTSTATUS)0xC000014D) #define STATUS_NOT_REGISTRY_FILE ((NTSTATUS)0xC000015C) #define STATUS_REGISTRY_RECOVERED ((NTSTATUS)0x40000009)

10 months

[reactos] 03/15: [NTOS:CM] Disable hard errors when setting up a new size for a hive file / annotate CmpFileSetSize parameters with SAL

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bfcb28787d635fd2765c7… commit bfcb28787d635fd2765c7d4b3ea8de250142f48d Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Wed Oct 26 19:00:08 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun Nov 19 20:44:26 2023 +0100 [NTOS:CM] Disable hard errors when setting up a new size for a hive file / annotate CmpFileSetSize parameters with SAL During a I/O failure of whatever kind the upper-level driver, namely a FSD, can raise a hard error and a deadlock can occur. We wouldn't want that to happen for particular files like hives or logs so in such cases we must disable hard errors before toying with hives until we're done. In addition to that, annotate the CmpFileSetSize function's parameters with SAL. --- ntoskrnl/config/cmwraprs.c | 37 ++++++++++++++++++++++++++++++------- ntoskrnl/include/internal/cm.h | 8 ++++---- 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/ntoskrnl/config/cmwraprs.c b/ntoskrnl/config/cmwraprs.c index b23092e0cd9..f75a52fbcb2 100644 --- a/ntoskrnl/config/cmwraprs.c +++ b/ntoskrnl/config/cmwraprs.c @@ -129,21 +129,32 @@ CmpFileWrite(IN PHHIVE RegistryHive, BOOLEAN NTAPI -CmpFileSetSize(IN PHHIVE RegistryHive, - IN ULONG FileType, - IN ULONG FileSize, - IN ULONG OldFileSize) +CmpFileSetSize( + _In_ PHHIVE RegistryHive, + _In_ ULONG FileType, + _In_ ULONG FileSize, + _In_ ULONG OldFileSize) { PCMHIVE CmHive = (PCMHIVE)RegistryHive; HANDLE HiveHandle = CmHive->FileHandles[FileType]; FILE_END_OF_FILE_INFORMATION EndOfFileInfo; FILE_ALLOCATION_INFORMATION FileAllocationInfo; IO_STATUS_BLOCK IoStatusBlock; + BOOLEAN HardErrors; NTSTATUS Status; /* Just return success if no file is associated with this hive */ if (HiveHandle == NULL) + { + DPRINT1("No hive handle associated with the given hive\n"); return TRUE; + } + + /* + * Disable hard errors so that we don't deadlock + * when touching with the hive files. + */ + HardErrors = IoSetThreadHardErrorMode(FALSE); EndOfFileInfo.EndOfFile.QuadPart = FileSize; Status = ZwSetInformationFile(HiveHandle, @@ -151,7 +162,12 @@ CmpFileSetSize(IN PHHIVE RegistryHive, &EndOfFileInfo, sizeof(FILE_END_OF_FILE_INFORMATION), FileEndOfFileInformation); - if (!NT_SUCCESS(Status)) return FALSE; + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwSetInformationFile failed to set new size of end of file (Status 0x%lx)\n", Status); + IoSetThreadHardErrorMode(HardErrors); + return FALSE; + } FileAllocationInfo.AllocationSize.QuadPart = FileSize; Status = ZwSetInformationFile(HiveHandle, @@ -159,8 +175,15 @@ CmpFileSetSize(IN PHHIVE RegistryHive, &FileAllocationInfo, sizeof(FILE_ALLOCATION_INFORMATION), FileAllocationInformation); - if (!NT_SUCCESS(Status)) return FALSE; - + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwSetInformationFile failed to set new of allocation file (Status 0x%lx)\n", Status); + IoSetThreadHardErrorMode(HardErrors); + return FALSE; + } + + /* Reset the hard errors back */ + IoSetThreadHardErrorMode(HardErrors); return TRUE; } diff --git a/ntoskrnl/include/internal/cm.h b/ntoskrnl/include/internal/cm.h index e8fee77faf4..5c2f352f753 100644 --- a/ntoskrnl/include/internal/cm.h +++ b/ntoskrnl/include/internal/cm.h @@ -1236,10 +1236,10 @@ CmpFileWrite( BOOLEAN NTAPI CmpFileSetSize( - IN PHHIVE RegistryHive, - IN ULONG FileType, - IN ULONG FileSize, - IN ULONG OldFileSize + _In_ PHHIVE RegistryHive, + _In_ ULONG FileType, + _In_ ULONG FileSize, + _In_ ULONG OldFileSize ); BOOLEAN

10 months

[reactos] 02/15: [NTOS:CM] Ignore syncing/flushing requests after registry shutdown

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d776beac91f215a324d0… commit 0d776beac91f215a324d069477090cb9708dfcd7 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Wed Oct 26 18:51:09 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun Nov 19 20:44:26 2023 +0100 [NTOS:CM] Ignore syncing/flushing requests after registry shutdown When shutting down the registry of the system we don't want that the registry in question gets poked again, such as flushing the hives or syncing the hives and respective logs for example. The reasoning behind this is very simple, during a complete shutdown the system does final check-ups and stuff until the computer shuts down. Any writing operations done to the registry can lead to erratic behaviors. CmShutdownSystem call already invokes a final flushing of all the hives on the backing storage which is more than enough to ensure consistency of the last session configuration. So after that final flushing, mark HvShutdownComplete as TRUE indicating that any eventual flushing or syncying (in the case where HvSyncHive gets called) request is outright ignored. --- ntoskrnl/config/cmsysini.c | 10 +++++++++- ntoskrnl/include/internal/cm.h | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/config/cmsysini.c b/ntoskrnl/config/cmsysini.c index 32450c366a6..0e3a647de66 100644 --- a/ntoskrnl/config/cmsysini.c +++ b/ntoskrnl/config/cmsysini.c @@ -21,7 +21,6 @@ LIST_ENTRY CmpSelfHealQueueListHead; KEVENT CmpLoadWorkerEvent; LONG CmpLoadWorkerIncrement; PEPROCESS CmpSystemProcess; -BOOLEAN HvShutdownComplete; PVOID CmpRegistryLockCallerCaller, CmpRegistryLockCaller; BOOLEAN CmpFlushOnLockRelease; BOOLEAN CmpSpecialBootCondition; @@ -30,6 +29,7 @@ BOOLEAN CmpWasSetupBoot; BOOLEAN CmpProfileLoaded; BOOLEAN CmpNoVolatileCreates; ULONG CmpTraceLevel = 0; +BOOLEAN HvShutdownComplete = FALSE; extern LONG CmpFlushStarveWriters; extern BOOLEAN CmFirstTime; @@ -2049,6 +2049,14 @@ CmShutdownSystem(VOID) ListEntry = ListEntry->Flink; } + /* + * As we flushed all the hives on the disk, + * tell the system we do not want any further + * registry flushing or syncing at this point + * since we are shutting down the registry anyway. + */ + HvShutdownComplete = TRUE; + CmpUnlockRegistry(); } diff --git a/ntoskrnl/include/internal/cm.h b/ntoskrnl/include/internal/cm.h index db702bd8b28..e8fee77faf4 100644 --- a/ntoskrnl/include/internal/cm.h +++ b/ntoskrnl/include/internal/cm.h @@ -1473,6 +1473,7 @@ extern BOOLEAN CmpProfileLoaded; extern PCMHIVE CmiVolatileHive; extern LIST_ENTRY CmiKeyObjectListHead; extern BOOLEAN CmpHoldLazyFlush; +extern BOOLEAN HvShutdownComplete; // // Inlined functions

10 months

[reactos] 01/15: [SDK][CMLIB] Declare some BootType and BootRecover identifiers & Miscellaneous Stuff

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=99fab7b90513392dd6ae4… commit 99fab7b90513392dd6ae442812439c334dc5c215 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Wed Oct 26 18:20:03 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun Nov 19 20:44:23 2023 +0100 [SDK][CMLIB] Declare some BootType and BootRecover identifiers & Miscellaneous Stuff === DOCUMENTATION REMARKS === HBOOT_TYPE_REGULAR and HBOOT_TYPE_SELF_HEAL are boot type values set up by the CMLIB library (for the BootType field respectively). HBOOT_TYPE_REGULAR indicates a normal system boot whereas HBOOT_TYPE_SELF_HEAL indicates the system boot is assisted within self healing mode. Whether the former or the latter value is set it's governed by both the kernel and the bootloader. The bootloader and the kernel negotiate together to determine if any of the registry properties (the hive, the base block, the registry base, etc) are so severed from corruption or not. In extreme cases where registry healing is possible, the specific base block of the damaged hive will have its flags marked with HBOOT_TYPE_SELF_HEAL. At this point the boot phase procedure is orchestrated since the boot phase no longer goes on the default path but it's assisted, as I have already said above. HBOOT_NO_BOOT_RECOVER, HBOOT_BOOT_RECOVERED_BY_HIVE_LOG and HBOOT_BOOT_RECOVERED_BY_ALTERNATE_HIVE on the other hand are identifiers for the BootRecover field of the BASE_BLOCK header structure. These are used exclusively by FreeLdr to tell the kernel if the bootloader recovered the SYSTEM hive or not. In case where the bootloader did recover the SYSTEM hive, the kernel will perform a flush request on the dirty data down to disk. The (almost) worse case FreeLdr could not repair the main hive by applying log data, it will load the alternate mirror version of the hive. In addition to that, declare other miscellaneous CMLIB identifiers for log transaction writes purposes. --- sdk/lib/cmlib/hivedata.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/sdk/lib/cmlib/hivedata.h b/sdk/lib/cmlib/hivedata.h index 39d617ccbd5..16f96de6b4f 100644 --- a/sdk/lib/cmlib/hivedata.h +++ b/sdk/lib/cmlib/hivedata.h @@ -44,6 +44,17 @@ #define HV_LOG_HEADER_SIZE FIELD_OFFSET(HBASE_BLOCK, Reserved2) +// +// Clean Block identifier +// +#define HV_CLEAN_BLOCK 0U + +// +// Hive Log identifiers +// +#define HV_LOG_DIRTY_BLOCK 0xFF +#define HV_LOG_DIRTY_SIGNATURE 0x54524944 // "DIRT" + // // Hive structure identifiers // @@ -70,6 +81,19 @@ // #define HTYPE_COUNT 2 +// +// Hive boot types +// +#define HBOOT_TYPE_REGULAR 0 +#define HBOOT_TYPE_SELF_HEAL 4 + +// +// Hive boot recover types +// +#define HBOOT_NO_BOOT_RECOVER 0 +#define HBOOT_BOOT_RECOVERED_BY_HIVE_LOG 1 +#define HBOOT_BOOT_RECOVERED_BY_ALTERNATE_HIVE 2 + /** * @name HCELL_INDEX *

10 months

[reactos] 01/01: [HALX86] Add missing \n to DPRINT() calls (#5993)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2cc7eeb9397549e3bc3d4… commit 2cc7eeb9397549e3bc3d491dc18ab333707ea875 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun Nov 19 19:44:46 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 19 19:44:46 2023 +0100 [HALX86] Add missing \n to DPRINT() calls (#5993) And promote some DPRINT() to DPRINT1(). --- hal/halx86/acpi/halacpi.c | 21 ++++++++++---------- hal/halx86/generic/x86bios.c | 9 +++++---- hal/halx86/mp/ioapic.c | 47 +++++++++++++++++++++----------------------- 3 files changed, 38 insertions(+), 39 deletions(-) diff --git a/hal/halx86/acpi/halacpi.c b/hal/halx86/acpi/halacpi.c index da46365b049..d03d57f75f4 100644 --- a/hal/halx86/acpi/halacpi.c +++ b/hal/halx86/acpi/halacpi.c @@ -779,7 +779,7 @@ HaliAcpiTimerInit(IN ULONG TimerPort, /* Get the data from the FADT */ TimerPort = HalpFixedAcpiDescTable.pm_tmr_blk_io_port; TimerValExt = HalpFixedAcpiDescTable.flags & ACPI_TMR_VAL_EXT; - DPRINT1("ACPI Timer at: %Xh (EXT: %d)\n", TimerPort, TimerValExt); + DPRINT1("ACPI Timer at: %lXh (EXT: %lu)\n", TimerPort, TimerValExt); } /* FIXME: Now proceed to the timer initialization */ @@ -888,14 +888,14 @@ HalpSetupAcpiPhase0(IN PLOADER_PARAMETER_BLOCK LoaderBlock) if ((CachedTable->Header.Signature == RSDT_SIGNATURE) || (CachedTable->Header.Signature == XSDT_SIGNATURE)) { - DPRINT1("ACPI %d.0 Detected. Tables: ", (CachedTable->Header.Revision + 1)); + DPRINT1("ACPI %u.0 Detected. Tables:", CachedTable->Header.Revision + 1); } - DbgPrint("[%c%c%c%c] ", - (CachedTable->Header.Signature & 0xFF), - (CachedTable->Header.Signature & 0xFF00) >> 8, - (CachedTable->Header.Signature & 0xFF0000) >> 16, - (CachedTable->Header.Signature & 0xFF000000) >> 24); + DbgPrint(" [%c%c%c%c]", + CachedTable->Header.Signature & 0x000000FF, + (CachedTable->Header.Signature & 0x0000FF00) >> 8, + (CachedTable->Header.Signature & 0x00FF0000) >> 16, + (CachedTable->Header.Signature & 0xFF000000) >> 24); /* Keep going */ NextEntry = NextEntry->Flink; @@ -1016,18 +1016,19 @@ NTAPI HalpQueryAcpiResourceRequirements(OUT PIO_RESOURCE_REQUIREMENTS_LIST *Requirements) { PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList; - ULONG Count = 0, ListSize; + ULONG Count, ListSize; NTSTATUS Status; + PAGED_CODE(); /* Get ACPI resources */ HalpAcpiDetectResourceListSize(&Count); - DPRINT("Resource count: %d\n", Count); + DPRINT("Resource count: %lu\n", Count); /* Compute size of the list and allocate it */ ListSize = FIELD_OFFSET(IO_RESOURCE_REQUIREMENTS_LIST, List[0].Descriptors) + (Count * sizeof(IO_RESOURCE_DESCRIPTOR)); - DPRINT("Resource list size: %d\n", ListSize); + DPRINT("Resource list size: %lu\n", ListSize); RequirementsList = ExAllocatePoolWithTag(PagedPool, ListSize, TAG_HAL); if (RequirementsList) { diff --git a/hal/halx86/generic/x86bios.c b/hal/halx86/generic/x86bios.c index 9a3c7e3bdfb..6e033e34124 100644 --- a/hal/halx86/generic/x86bios.c +++ b/hal/halx86/generic/x86bios.c @@ -138,7 +138,8 @@ HalInitializeBios( x86BiosMemoryMapping = MmGetSystemAddressForMdlSafe(Mdl, HighPagePriority); ASSERT(x86BiosMemoryMapping); - DPRINT1("memory: %p, %p\n", *(PVOID*)x86BiosMemoryMapping, *(PVOID*)(x86BiosMemoryMapping + 8)); + DPRINT1("*x86BiosMemoryMapping: %p, %p\n", + *(PVOID*)x86BiosMemoryMapping, *(PVOID*)(x86BiosMemoryMapping + 8)); //DbgDumpPage(x86BiosMemoryMapping, 0xc351); x86BiosIsInitialized = TRUE; @@ -271,7 +272,7 @@ x86MemRead( else { RtlFillMemory(Buffer, Size, 0xCC); - DPRINT1("x86MemRead: invalid read at 0x%lx (size 0x%lx)", Address, Size); + DPRINT1("x86MemRead: invalid read at 0x%lx (size 0x%lx)\n", Address, Size); } } @@ -291,7 +292,7 @@ x86MemWrite( } else { - DPRINT1("x86MemWrite: invalid write at 0x%lx (size 0x%lx)", Address, Size); + DPRINT1("x86MemWrite: invalid write at 0x%lx (size 0x%lx)\n", Address, Size); } } @@ -465,7 +466,7 @@ x86BiosCall( /* Make sure we haven't left the allowed memory range */ if (FlatIp >= 0x100000) { - DPRINT1("x86BiosCall: invalid IP (0x%lx) during BIOS execution", FlatIp); + DPRINT1("x86BiosCall: invalid IP (0x%lx) during BIOS execution\n", FlatIp); return FALSE; } diff --git a/hal/halx86/mp/ioapic.c b/hal/halx86/mp/ioapic.c index d07248013d5..933ba8cd409 100644 --- a/hal/halx86/mp/ioapic.c +++ b/hal/halx86/mp/ioapic.c @@ -70,7 +70,7 @@ static ULONG EISA_ELCR_Read(ULONG irq) PUCHAR port = (PUCHAR)(0x4d0 + (irq >> 3)); return (READ_PORT_UCHAR(port) >> (irq & 7)) & 1; } - DPRINT("Broken MPtable reports ISA irq %d\n", irq); + DPRINT1("Broken MPtable reports ISA irq %lu\n", irq); return 0; } @@ -106,7 +106,7 @@ IRQPolarity(ULONG idx) break; default: - DPRINT("Broken BIOS!!\n"); + DPRINT1("Broken BIOS\n"); polarity = 1; } } @@ -117,7 +117,7 @@ IRQPolarity(ULONG idx) break; case 2: /* reserved */ - DPRINT("Broken BIOS!!\n"); + DPRINT1("Broken BIOS\n"); polarity = 1; break; @@ -126,7 +126,7 @@ IRQPolarity(ULONG idx) break; default: /* invalid */ - DPRINT("Broken BIOS!!\n"); + DPRINT1("Broken BIOS\n"); polarity = 1; } return polarity; @@ -164,7 +164,7 @@ IRQTrigger(ULONG idx) break; default: - DPRINT("Broken BIOS!!\n"); + DPRINT1("Broken BIOS\n"); trigger = 1; } } @@ -175,7 +175,7 @@ IRQTrigger(ULONG idx) break; case 2: /* reserved */ - DPRINT("Broken BIOS!!\n"); + DPRINT1("Broken BIOS\n"); trigger = 1; break; @@ -184,7 +184,7 @@ IRQTrigger(ULONG idx) break; default: /* invalid */ - DPRINT("Broken BIOS!!\n"); + DPRINT1("Broken BIOS\n"); trigger = 0; } return trigger; @@ -203,7 +203,7 @@ Pin2Irq(ULONG idx, */ if (IRQMap[idx].DstApicInt != pin) { - DPRINT("broken BIOS or MPTABLE parser, ayiee!!\n"); + DPRINT1("Broken BIOS or MPTABLE parser\n"); } switch (BUSMap[bus]) @@ -227,7 +227,7 @@ Pin2Irq(ULONG idx, break; default: - DPRINT("Unknown bus type %d.\n",bus); + DPRINT1("Unknown bus type %lu\n", bus); irq = 0; } return irq; @@ -254,7 +254,7 @@ AssignIrqVector(ULONG irq) } else if (current_vector == FIRST_SYSTEM_VECTOR) { - DPRINT1("Ran out of interrupt sources!"); + DPRINT1("Ran out of interrupt sources\n"); ASSERT(FALSE); } @@ -322,12 +322,12 @@ IOAPICSetupIrqs(VOID) { if (first_notcon) { - DPRINT(" IO-APIC (apicid-pin) %d-%d\n", IOAPICMap[apic].ApicId, pin); + DPRINT(" IO-APIC (apicid-pin) %u-%lu\n", IOAPICMap[apic].ApicId, pin); first_notcon = 0; } else { - DPRINT(", %d-%d\n", IOAPICMap[apic].ApicId, pin); + DPRINT(", %u-%lu\n", IOAPICMap[apic].ApicId, pin); } continue; } @@ -345,7 +345,7 @@ IOAPICSetupIrqs(VOID) vector = AssignIrqVector(irq); entry.vector = vector; - DPRINT("vector 0x%.08x assigned to irq 0x%.02x\n", vector, irq); + DPRINT("Vector 0x%.08lx assigned to irq 0x%.02lx\n", vector, irq); if (irq == 0) { @@ -362,7 +362,7 @@ IOAPICSetupIrqs(VOID) IrqApicMap[irq] = apic; - DPRINT("Vector %x, Pin %x, Irq %x\n", vector, pin, irq); + DPRINT("Vector %lx, Pin %lx, Irq %lx\n", vector, pin, irq); } } } @@ -372,7 +372,7 @@ IOAPICClearPin(ULONG Apic, ULONG Pin) { IOAPIC_ROUTE_ENTRY Entry; - DPRINT("IOAPICClearPin(Apic %d, Pin %d\n", Apic, Pin); + DPRINT("IOAPICClearPin(Apic %lu, Pin %lu\n", Apic, Pin); /* * Disable it in the IO-APIC irq-routing table */ @@ -447,11 +447,9 @@ IOAPICSetupIds(VOID) if (IOAPICMap[apic].ApicId >= 0xf) { - DPRINT1("BIOS bug, IO-APIC#%d ID is %d in the MPC table!...\n", - apic, IOAPICMap[apic].ApicId); - DPRINT1("... fixing up to %d. (tell your hw vendor)\n", - GET_IOAPIC_ID(tmp)); + DPRINT1("BIOS bug, IO-APIC#%lu ID is %u in the MPC table\n", apic, IOAPICMap[apic].ApicId); IOAPICMap[apic].ApicId = GET_IOAPIC_ID(tmp); + DPRINT1(" Fixed up to %u. (Tell your hardware vendor)\n", IOAPICMap[apic].ApicId); } /* @@ -473,8 +471,7 @@ IOAPICSetupIds(VOID) * Read the right value from the MPC table and * write it into the ID register. */ - DPRINT("Changing IO-APIC physical APIC ID to %d\n", - IOAPICMap[apic].ApicId); + DPRINT("Changing IO-APIC physical APIC ID to %u\n", IOAPICMap[apic].ApicId); tmp &= ~IOAPIC_ID_MASK; tmp |= SET_IOAPIC_ID(IOAPICMap[apic].ApicId); @@ -642,10 +639,10 @@ HaliReconfigurePciInterrupts(VOID) { if (BUSMap[IRQMap[i].SrcBusId] == MP_BUS_PCI) { - DPRINT("%02x: IrqType %02x, IrqFlag %02x, SrcBusId %02x, SrcBusIrq %02x" - ", DstApicId %02x, DstApicInt %02x\n", - i, IRQMap[i].IrqType, IRQMap[i].IrqFlag, IRQMap[i].SrcBusId, - IRQMap[i].SrcBusIrq, IRQMap[i].DstApicId, IRQMap[i].DstApicInt); + DPRINT("%02lx: IrqType %02x, IrqFlag %04x, SrcBusId %02x" + ", SrcBusIrq %02x, DstApicId %02x, DstApicInt %02x\n", + i, IRQMap[i].IrqType, IRQMap[i].IrqFlag, IRQMap[i].SrcBusId, + IRQMap[i].SrcBusIrq, IRQMap[i].DstApicId, IRQMap[i].DstApicInt); HalSetBusDataByOffset(PCIConfiguration, IRQMap[i].SrcBusId,

10 months

[reactos] 01/01: [PSDK][SHELLBTRFS] Get rid of FILE_INFO_BY_HANDLE_CLASS.MaximumFileInfoByHandlesClass (#6003)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d27ec14822d9c9de07615… commit d27ec14822d9c9de076156bc56e5ef3b77ae9f51 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun Nov 19 19:42:18 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 19 19:42:18 2023 +0100 [PSDK][SHELLBTRFS] Get rid of FILE_INFO_BY_HANDLE_CLASS.MaximumFileInfoByHandlesClass (#6003) Follow-up to commit 455f330 (see PR #5802). 'MaximumFileInfoByHandlesClass' was our typo. --- dll/shellext/shellbtrfs/reactos.cpp | 4 ++-- sdk/include/psdk/winbase.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dll/shellext/shellbtrfs/reactos.cpp b/dll/shellext/shellbtrfs/reactos.cpp index e44e6125cdc..f6f81bb113e 100644 --- a/dll/shellext/shellbtrfs/reactos.cpp +++ b/dll/shellext/shellbtrfs/reactos.cpp @@ -153,7 +153,7 @@ NTSTATUS WINAPI RtlUTF8ToUnicodeN(PWSTR uni_dest, ULONG uni_bytes_max, } /* Quick and dirty table for conversion */ -FILE_INFORMATION_CLASS ConvertToFileInfo[MaximumFileInfoByHandlesClass] = +FILE_INFORMATION_CLASS ConvertToFileInfo[MaximumFileInfoByHandleClass] = { FileBasicInformation, FileStandardInformation, FileNameInformation, FileRenameInformation, FileDispositionInformation, FileAllocationInformation, FileEndOfFileInformation, FileStreamInformation, @@ -186,7 +186,7 @@ SetFileInformationByHandle(HANDLE hFile, FileInfoClass = (FILE_INFORMATION_CLASS)-1; /* Attempt to convert the class */ - if (FileInformationClass < MaximumFileInfoByHandlesClass) + if (FileInformationClass < MaximumFileInfoByHandleClass) { FileInfoClass = ConvertToFileInfo[FileInformationClass]; } diff --git a/sdk/include/psdk/winbase.h b/sdk/include/psdk/winbase.h index fa634127695..1a7be3db656 100644 --- a/sdk/include/psdk/winbase.h +++ b/sdk/include/psdk/winbase.h @@ -1018,8 +1018,7 @@ typedef enum _FILE_INFO_BY_HANDLE_CLASS { FileCaseSensitiveInfo, FileNormalizedNameInfo, #endif - MaximumFileInfoByHandleClass, - MaximumFileInfoByHandlesClass = MaximumFileInfoByHandleClass // Old name + MaximumFileInfoByHandleClass } FILE_INFO_BY_HANDLE_CLASS, *PFILE_INFO_BY_HANDLE_CLASS; #endif

10 months

[reactos] 01/01: [USETUP] Don't error out in case one tries to "delete" empty partition space.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ee1dc611301c5e51d70e… commit 5ee1dc611301c5e51d70e9d31c725ed130182027 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Nov 18 22:43:36 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 19 16:44:34 2023 +0100 [USETUP] Don't error out in case one tries to "delete" empty partition space. Just... don't delete it ¯\_(ツ)_/¯ --- base/setup/lib/errorcode.h | 1 - base/setup/usetup/lang/bg-BG.h | 7 ------- base/setup/usetup/lang/bn-BD.h | 7 ------- base/setup/usetup/lang/cs-CZ.h | 7 ------- base/setup/usetup/lang/da-DK.h | 7 ------- base/setup/usetup/lang/de-DE.h | 7 ------- base/setup/usetup/lang/el-GR.h | 7 ------- base/setup/usetup/lang/en-US.h | 7 ------- base/setup/usetup/lang/es-ES.h | 7 ------- base/setup/usetup/lang/et-EE.h | 7 ------- base/setup/usetup/lang/eu-ES.h | 7 ------- base/setup/usetup/lang/fr-FR.h | 7 ------- base/setup/usetup/lang/he-IL.h | 7 ------- base/setup/usetup/lang/hr-HR.h | 7 ------- base/setup/usetup/lang/hu-HU.h | 7 ------- base/setup/usetup/lang/id-ID.h | 7 ------- base/setup/usetup/lang/it-IT.h | 7 ------- base/setup/usetup/lang/ja-JP.h | 7 ------- base/setup/usetup/lang/lt-LT.h | 7 ------- base/setup/usetup/lang/ms-MY.h | 7 ------- base/setup/usetup/lang/nl-NL.h | 7 ------- base/setup/usetup/lang/pl-PL.h | 7 ------- base/setup/usetup/lang/pt-BR.h | 7 ------- base/setup/usetup/lang/pt-PT.h | 7 ------- base/setup/usetup/lang/ro-RO.h | 8 -------- base/setup/usetup/lang/ru-RU.h | 7 ------- base/setup/usetup/lang/sk-SK.h | 7 ------- base/setup/usetup/lang/sq-AL.h | 7 ------- base/setup/usetup/lang/sv-SE.h | 7 ------- base/setup/usetup/lang/tr-TR.h | 7 ------- base/setup/usetup/lang/uk-UA.h | 7 ------- base/setup/usetup/usetup.c | 8 ++++---- 32 files changed, 4 insertions(+), 216 deletions(-) diff --git a/base/setup/lib/errorcode.h b/base/setup/lib/errorcode.h index 48f9acb0fc4..00a5625d57d 100644 --- a/base/setup/lib/errorcode.h +++ b/base/setup/lib/errorcode.h @@ -32,7 +32,6 @@ typedef enum _ERROR_NUMBER ERROR_LOAD_KBLAYOUT, ERROR_WARN_PARTITION, ERROR_NEW_PARTITION, - ERROR_DELETE_SPACE, ERROR_INSTALL_BOOTCODE, ERROR_NO_FLOPPY, ERROR_UPDATE_KBSETTINGS, diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index 8760d607926..07c850bca31 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -1952,13 +1952,6 @@ MUI_ERROR bgBGErrorEntries[] = " * \215\240\342\250\341\255\245\342\245 \252\253\240\242\250\350, \247\240 \244\240 \257\340\256\244\352\253\246\250\342\245.", NULL }, - { - // ERROR_DELETE_SPACE, - "\215\245 \254\256\246\245\342\245 \247\240 \250\247\342\340\250\245\342\245 \255\245\247\240\244\245\253\245\255\256\342\256 \244\250\341\252\256\242\256 \254\357\341\342\256!\n" - "\n" - " * \215\240\342\250\341\255\245\342\245 \252\253\240\242\250\350, \247\240 \244\240 \257\340\256\244\352\253\246\250\342\245.", - NULL - }, { // ERROR_INSTALL_BOOTCODE, //"Setup failed to install the FAT bootcode on the system partition.", diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index cae01ab8627..6a14204684e 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -1928,13 +1928,6 @@ MUI_ERROR bnBDErrorEntries[] = " * Press any key to continue.", NULL }, - { - // ERROR_DELETE_SPACE, - "You cannot delete unpartitioned disk space!\n" - "\n" - " * Press any key to continue.", - NULL - }, { // ERROR_INSTALL_BOOTCODE, "Setup failed to install the %S bootcode on the system partition.", diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index dc39496c539..8fb06935c3f 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -1936,13 +1936,6 @@ MUI_ERROR csCZErrorEntries[] = " * Pokra\237ujte stisknut\241m libovoln\202 kl\240vesy.", NULL }, - { - // ERROR_DELETE_SPACE, - "Nelze vymazat m\241sto na disku, kter\202 nepat\375\241 \247\240dn\202mu odd\241lu!\n" - "\n" - " * Pokra\237ujte stisknut\241m libovoln\202 kl\240vesy.", - NULL - }, { // ERROR_INSTALL_BOOTCODE, "Nepoda\375ilo se nainstalovat %S zavad\330\237 na syst\202mov\354 odd\241l.", diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index b840c30ed36..d1dca3c7489 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -1937,13 +1937,6 @@ MUI_ERROR daDKErrorEntries[] = " * Tryk p\206 en vilk\206rligtast for at forts\221tte.", NULL }, - { - // ERROR_DELETE_SPACE, - "Du kan ikke slette upartitionernet diskplads!\n" - "\n" - " * Tryk p\206 en vilk\206rligtast for at forts\221tte.", - NULL - }, { // ERROR_INSTALL_BOOTCODE, "Installationen kunne ikke installere %S-startkode p\206 systempartitionen.", diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index 01915b9d493..d4bc90f004d 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -1937,13 +1937,6 @@ MUI_ERROR deDEErrorEntries[] = " * * Eine beliebige Taste zum Fortsetzen dr\201cken.", NULL }, - { - // ERROR_DELETE_SPACE, - "Sie k\224nnen unpartitionierten Speicher nicht l\224schen!\n" - "\n" - " * Eine beliebige Taste zum Fortsetzen dr\201cken.", - NULL - }, { // ERROR_INSTALL_BOOTCODE, "Der %S-Bootcode konnte nicht auf der Partition installiert werden.", diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index f8fa94c0bda..a90a275a4f5 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -1958,13 +1958,6 @@ MUI_ERROR elGRErrorEntries[] = " * \217\230\253\343\251\253\234 \246\247\246\240\246\233\343\247\246\253\234 \247\242\343\241\253\250\246 \232\240\230 \244\230 \251\254\244\234\256\345\251\234\253\234.", NULL }, - { - // ERROR_DELETE_SPACE, - "\203\234 \243\247\246\250\234\345\253\234 \244\230 \233\240\230\232\250\341\257\234\253\234 \342\244\230\244 \243\236 \233\240\230\243\246\250\255\340\243\342\244\246 \256\351\250\246 \233\345\251\241\246\254!\n" - "\n" - " * \217\230\253\343\251\253\234 \246\247\246\240\246\233\343\247\246\253\234 \247\242\343\241\253\250\246 \232\240\230 \244\230 \251\254\244\234\256\345\251\234\253\234.", - NULL - }, { // ERROR_INSTALL_BOOTCODE, "Setup failed to install the %S bootcode on the system partition.", diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index 78434f0f542..d294b0d9e2b 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -1928,13 +1928,6 @@ MUI_ERROR enUSErrorEntries[] = " * Press any key to continue.", NULL }, - { - // ERROR_DELETE_SPACE, - "You cannot delete unpartitioned disk space!\n" - "\n" - " * Press any key to continue.", - NULL - }, { // ERROR_INSTALL_BOOTCODE, "Setup failed to install the %S bootcode on the system partition.", diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index a85a8b73992..5c9c86d5190 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -1941,13 +1941,6 @@ MUI_ERROR esESErrorEntries[] = " * Pulse cualquier tecla para continuar.", NULL }, - { - // ERROR_DELETE_SPACE, - "\255No se puede eliminar un espacio de disco sin particionar!\n" - "\n" - " * Pulse cualquier tecla para continuar.", - NULL - }, { // ERROR_INSTALL_BOOTCODE, "El instalador fall\242 al instalar el c\242digo de arranque %S en la partici\242n del sistema.", diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index b851eec9780..ee54344d1aa 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -1931,13 +1931,6 @@ MUI_ERROR etEEErrorEntries[] = " * Vajuta mis tahes klahvi, et j\204tkata.", NULL }, - { - // ERROR_DELETE_SPACE, - "Partitsioneerimata kettaruumi ei saa kustutada!\n" - "\n" - " * Vajuta mis tahes klahvi, et j\204tkata.", - NULL - }, { // ERROR_INSTALL_BOOTCODE, "S\201steemikettale ei \344nnestunud paigaldada %S alglaadimiskoodi.", diff --git a/base/setup/usetup/lang/eu-ES.h b/base/setup/usetup/lang/eu-ES.h index 346356dfdbf..e6f2a7b4441 100644 --- a/base/setup/usetup/lang/eu-ES.h +++ b/base/setup/usetup/lang/eu-ES.h @@ -1936,13 +1936,6 @@ MUI_ERROR euESErrorEntries[] = " * Sakatu tekla bat jarraitzeko.", NULL }, - { - // ERROR_DELETE_SPACE, - "Ez ahal duzu diskoaren ez-partiziotatu ezpazioa ezabatzeko!\n" - "\n" - " * Sakatu tekla bat jarraitzeko.", - NULL - }, { // ERROR_INSTALL_BOOTCODE, "Instalazioa huts egin du bootcode instalatzeko %S sistemaren partizioan.", diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index 0550291c440..c72eb43a475 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -1965,13 +1965,6 @@ MUI_ERROR frFRErrorEntries[] = " * Appuyer sur une touche pour continuer.", NULL }, - { - // ERROR_DELETE_SPACE, - "Vous ne pouvez supprimer de l'espace disque non partitionn\202!\n" - "\n" - " * Appuyer sur une touche pour continuer.", - NULL - }, { // ERROR_INSTALL_BOOTCODE, "Echec de l'installation du code de d\202marrage %S sur la partition syst\212me.", diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index bc689e1d187..f852ae19eaf 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -1931,13 +1931,6 @@ MUI_ERROR heILErrorEntries[] = ".\212\211\231\216\204\214 \211\203\213 \231\227\216 \214\222 \225\207\214 * ", NULL }, - { - // ERROR_DELETE_SPACE, - "!\204\226\227\205\216 \200\214\231 \227\221\211\203 \207\210\231 \227\205\207\216\214 \217\232\211\220 \200\214\n" - "\n" - ".\212\211\231\216\204\214 \211\203\213 \231\227\216 \214\222 \225\207\214 * ", - NULL - }, { // ERROR_INSTALL_BOOTCODE, ".\232\213\230\222\216\204 \232\226\211\207\216 \214\222 %S \230\205\201\222 \214\205\207\232\200 \203\205\227 \232\220\227\232\204\201 \204\231\214\213\220 \204\220\227\232\204\204 \232\211\220\213\232", diff --git a/base/setup/usetup/lang/hr-HR.h b/base/setup/usetup/lang/hr-HR.h index d03214c678d..a1c9f7afcce 100644 --- a/base/setup/usetup/lang/hr-HR.h +++ b/base/setup/usetup/lang/hr-HR.h @@ -1959,13 +1959,6 @@ MUI_ERROR hrHRErrorEntries[] = " * Pritisnite bilo koju tipku za nastavak.", NULL }, - { - // ERROR_DELETE_SPACE, - "Ne mo\247ete obriati neparticionirani diskovni prostor!\n" - "\n" - " * Pritisnite bilo koju tipku za nastavak.", - NULL - }, { // ERROR_INSTALL_BOOTCODE, "Instalacijski program je neuspje\347no instalirao %S bootcode na sistemsku particiju.", diff --git a/base/setup/usetup/lang/hu-HU.h b/base/setup/usetup/lang/hu-HU.h index 94d08dd0d9e..6859b79c314 100644 --- a/base/setup/usetup/lang/hu-HU.h +++ b/base/setup/usetup/lang/hu-HU.h @@ -1829,13 +1829,6 @@ MUI_ERROR huHUErrorEntries[] = " * Nyomjon meg egy gombot a folytat\240shoz.", NULL }, - { - // ERROR_DELETE_SPACE, - "Nem tud t\224r\224lni particion\240latlan lemezter\201letet!\n" - "\n" - " * Nyomjon meg egy gombot a folytat\240shoz.", - NULL - }, { // ERROR_INSTALL_BOOTCODE, "Nem siker\201lt a %S bootcode telep\241t\202se a rendszerpart\241ci\242ra.", diff --git a/base/setup/usetup/lang/id-ID.h b/base/setup/usetup/lang/id-ID.h index 30e6c219288..da888302121 100644 --- a/base/setup/usetup/lang/id-ID.h +++ b/base/setup/usetup/lang/id-ID.h @@ -1935,13 +1935,6 @@ MUI_ERROR idIDErrorEntries[] = " * Tekan tombol apapun untuk lanjut.", NULL }, - { - // ERROR_DELETE_SPACE, - "Anda tidak dapat menghapus ukuran cakram yang belum dipartisi!\n" - "\n" - " * Tekan tombol apapun untuk lanjut.", - NULL - }, { // ERROR_INSTALL_BOOTCODE, "Penyetelan gagal memasang bootcode %S pada partisi sistem.", diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index 0ea6e6f42e9..49981ce393c 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -1942,13 +1942,6 @@ MUI_ERROR itITErrorEntries[] = " * Premere un tasto qualsiasi per continuare.", NULL }, - { - // ERROR_DELETE_SPACE, - "Non si pu\x95 cancellare spazio in un disco non partizionato!\n" - "\n" - " * Premere un tasto qualsiasi per continuare.", - NULL - }, { // ERROR_INSTALL_BOOTCODE, "Impossibile installare il bootcode %S nella partizione di sistema.", diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index 5723d27af75..9d97d6de47f 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -1938,13 +1938,6 @@ MUI_ERROR jaJPErrorEntries[] = " * \277\336\257\272\263 \275\331\306\312 \305\306\266 \267\260\246 \265\274\303 \270\300\336\273\262\241", NULL }, - { - // ERROR_DELETE_SPACE, - "\320\314\336\335\266\302 \311 \303\336\250\275\270 \275\315\337\260\275 \246 \273\270\274\336\256 \275\331\272\304\312 \303\336\267\317\276\335!\n" - "\n" - " * \277\336\257\272\263 \275\331\306\312 \305\306\266 \267\260\246 \265\274\303 \270\300\336\273\262\241", - NULL - }, { // ERROR_INSTALL_BOOTCODE, "\276\257\304\261\257\314\337\312 \274\275\303\321 \312\337\260\303\250\274\256\335 \274\336\256\263\315\311 %S \314\336\260\304 \332\272\260\304\336 \311 \262\335\275\304\260\331\306 \274\257\312\337\262 \274\317\274\300\241", diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index 29afade72a2..cf5e0cccce3 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -1939,13 +1939,6 @@ MUI_ERROR ltLTErrorEntries[] = " * Press any key to continue.", NULL }, - { - // ERROR_DELETE_SPACE, - "You cannot delete unpartitioned disk space!\n" - "\n" - " * Press any key to continue.", - NULL - }, { // ERROR_INSTALL_BOOTCODE, "Setup failed to install the %S bootcode on the system partition.", diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index a128c3d7352..fd63fc8c3d6 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -1934,13 +1934,6 @@ MUI_ERROR msMYErrorEntries[] = " * Tekan sebarang kunci untuk meneruskan.", NULL }, - { - // ERROR_DELETE_SPACE, - "Anda tidak boleh menghapuskan ruang cakera yang tiada partition!\n" - "\n" - " * Tekan sebarang kunci untuk meneruskan.", - NULL - }, { // ERROR_INSTALL_BOOTCODE, "Persediaan gagal memasang bootcode %S pada partition sistem.", diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index 7b2c8605af2..202d5e19e1b 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -1957,13 +1957,6 @@ MUI_ERROR nlNLErrorEntries[] = " * Druk op een willekeurige toets om door te gaan.", NULL }, - { - // ERROR_DELETE_SPACE, - "U kunt ongebruikte schijfruimte voor partities niet verwijderen!\n" - "\n" - " * Druk op een willekeurige toets om door te gaan.", - NULL - }, { // ERROR_INSTALL_BOOTCODE, "Setup kan de %S bootcode op de systeempartitie niet installeren.", diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index 1fed490bba7..a77c56a9b97 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -1947,13 +1947,6 @@ MUI_ERROR plPLErrorEntries[] = " * Naci\230nij dowolny klawisz, aby kontynuowa\206.", NULL }, - { - // ERROR_DELETE_SPACE, - "Nie mo\276na usun\245\206 nieprzydzielonego miejsca, gdzie nie ma \276adnej partycji!\n" - "\n" - " * Naci\230nij dowolny klawisz, aby kontynuowa\206.", - NULL - }, { // ERROR_INSTALL_BOOTCODE, "Instalator nie m\242g\210 zapisa\206 kodu rozruchowego %S na partycji systemowej.", diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index c0f2eef479e..04c9a820315 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -1972,13 +1972,6 @@ MUI_ERROR ptBRErrorEntries[] = " * Pressione qualquer tecla para continuar.", NULL }, - { - // ERROR_DELETE_SPACE, - "Voc\210 n\306o pode excluir um espa\207o n\306o-particionado!\n" - "\n" - " * Pressione qualquer tecla para continuar.", - NULL - }, { // ERROR_INSTALL_BOOTCODE, "Erro ao instalar o c\242digo de inicializa\207\306o %S na parti\207\306o do sistema.", diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h index 45422f564e7..9983f682c8b 100644 --- a/base/setup/usetup/lang/pt-PT.h +++ b/base/setup/usetup/lang/pt-PT.h @@ -1972,13 +1972,6 @@ MUI_ERROR ptPTErrorEntries[] = " * Pressione qualquer tecla para continuar.", NULL }, - { - // ERROR_DELETE_SPACE, - "Pode excluir um espa\207o n\306o particionado!\n" - "\n" - " * Pressione qualquer tecla para continuar.", - NULL - }, { // ERROR_INSTALL_BOOTCODE, "Erro ao instalar o c\242digo de inicializa\207\306o %S na parti\207\306o do sistema.", diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index 508a242e0d7..e4ce8ced178 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -1988,14 +1988,6 @@ MUI_ERROR roROErrorEntries[] = " * Tasta\376i pentru a continua.", NULL }, - { - // ERROR_DELETE_SPACE, - "A\376i \356ncercat \272tergerea de spa\376iu neparti\376ionat,\n" - "\356ns\343 doar spa\376iul parti\376ionat poate fi \272ters!\n" - "\n" - " * Tasta\376i pentru a continua.", - NULL - }, { // ERROR_INSTALL_BOOTCODE, "E\272ec la instalarea codului %S de ini\376ializare\n" diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index 22f673024ab..d6f51eb6a1f 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -1958,13 +1958,6 @@ MUI_ERROR ruRUErrorEntries[] = " * \215\240\246\254\250\342\245 \253\356\241\343\356 \252\253\240\242\250\350\343 \244\253\357 \257\340\256\244\256\253\246\245\255\250\357.", NULL }, - { - // ERROR_DELETE_SPACE, - "\202\353 \255\245 \254\256\246\245\342\245 \343\244\240\253\250\342\354 \255\245\340\240\247\244\245\253\245\255\255\256\245 \244\250\341\252\256\242\256\245 \257\340\256\341\342\340\240\255\341\342\242\256!\n" - "\n" - " * \215\240\246\254\250\342\245 \253\356\241\343\356 \252\253\240\242\250\350\343 \244\253\357 \257\340\256\244\256\253\246\245\255\250\357.", - NULL - }, { // ERROR_INSTALL_BOOTCODE, "\215\245 \343\244\240\253\256\341\354 \343\341\342\240\255\256\242\250\342\354 \247\240\243\340\343\247\347\250\252 %S \255\240 \341\250\341\342\245\254\255\353\251 \340\240\247\244\245\253.", diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index 95db6e8c74f..e5d80ed2b7a 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -1946,13 +1946,6 @@ MUI_ERROR skSKErrorEntries[] = " * Pokra\237ujte stla\237en\241m \226ubovo\226n\202ho kl\240vesu.", NULL }, - { - // ERROR_DELETE_SPACE, - "Nem\223\247ete odstr\240ni\234 miesto na disku, ktor\202 nie je oblas\234ou!\n" - "\n" - " * Pokra\237ujte stla\237en\241m \226ubovo\226n\202ho kl\240vesu.", - NULL - }, { // ERROR_INSTALL_BOOTCODE, "In\347tal\240toru sa nepodarilo nain\347talova\234 %S zav\240dzac\241 k\242d s\243borov\202ho\n" diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index c8a59e862d6..8a2270accb7 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -1941,13 +1941,6 @@ MUI_ERROR sqALErrorEntries[] = " * Shtypni nj\211 tast \211far\211do p\211r t\211 vazhduar.", NULL }, - { - // ERROR_DELETE_SPACE, - "Ju nuk mund t\211 fshini hap\211sir\211 n\211 disk jasht particioneve!\n" - "\n" - " * Shtypni nj\211 tast cfar\211do p\211r t\211 vazhduar.", - NULL - }, { // ERROR_INSTALL_BOOTCODE, "Instalimi d\211shtoj n\211 instalimin e %S bootcode n\211 particionin e sistemit.", diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index 74a371aaa5a..d333fb9c47e 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -1937,13 +1937,6 @@ MUI_ERROR svSEErrorEntries[] = " * Tryck valfri tangent f\224r att forts\204tta.", NULL }, - { - // ERROR_DELETE_SPACE, - "Du kan inte ta bort opartitionerrat diskutrymme!\n" - "\n" - " * Tryck valfri tangent f\224r att forts\204tta.", - NULL - }, { // ERROR_INSTALL_BOOTCODE, "Setup misslyckades att installera %S bootkoden p\206 systempartitionen.", diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index 2508f957a2e..84cfd297eff 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -1912,13 +1912,6 @@ MUI_ERROR trTRErrorEntries[] = " * Devam etmek i\207in bir tu\237a bas\215n\215z.", NULL }, - { - // ERROR_DELETE_SPACE, - "B\224l\201mlenmemi\237 disk alan\215n\215 silemezsiniz!\n" - "\n" - " * Devam etmek i\207in bir tu\237a bas\215n\215z.", - NULL - }, { // ERROR_INSTALL_BOOTCODE, "Kur, sistem b\224l\201m\201 \201zerinde %S \224ny\201kleme kodunu kurmada ba\237ar\215s\215z oldu.", diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index c615c0b2ed3..bbc1fa55aff 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -1944,13 +1944,6 @@ MUI_ERROR ukUAErrorEntries[] = " * \215\240\342\250\341\255i\342\354 \241\343\244\354-\357\252\343 \252\253\240\242i\350\343 \351\256\241 \257\340\256\244\256\242\246\250\342\250.", NULL }, - { - // ERROR_DELETE_SPACE, - "\215\245 \254\256\246\255\240 \242\250\244\240\253\250\342\250 \255\245\340\256\247\254i\347\245\255\343 \256\241\253\240\341\342\354 \255\240 \244\250\341\252\343!\n" - "\n" - " * \215\240\342\250\341\255i\342\354 \241\343\244\354-\357\252\343 \252\253\240\242i\350\343 \351\256\241 \257\340\256\244\256\242\246\250\342\250.", - NULL - }, { // ERROR_INSTALL_BOOTCODE, "\215\245 \242\244\240\253\256\341\354 \242\341\342\240\255\256\242\250\342\250 \247\240\242\240\255\342\240\246\343\242\240\253\354\255\250\251 \252\256\244 %S \255\240 \341\250\342\245\254\255\250\251 \340\256\247\244i\253.", diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 9c25a1e6fbd..90d8af468e1 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -1726,7 +1726,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) // return SELECT_PARTITION_PAGE; } - if (CurrentPartition->IsPartitioned == FALSE) + if (!CurrentPartition->IsPartitioned) { Error = PartitionCreationChecks(CurrentPartition); if (Error != NOT_AN_ERROR) @@ -1789,10 +1789,10 @@ SelectPartitionPage(PINPUT_RECORD Ir) ASSERT(CurrentPartition != NULL); - if (CurrentPartition->IsPartitioned == FALSE) + /* Ignore deletion in case this is not a partitioned entry */ + if (!CurrentPartition->IsPartitioned) { - MUIDisplayError(ERROR_DELETE_SPACE, Ir, POPUP_WAIT_ANY_KEY); - return SELECT_PARTITION_PAGE; + continue; } // TODO: Do something similar before trying to format the partition?

10 months

← Newer
1
...
7
8
9
10
11
12
13
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2023