Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 70582: [CMLIB] - Fix HBLOCK_SIZE vs. HSECTOR_SIZE mix-ups in HvpGetHiveHeader. - Add a function to create cluster-aligned hive base blocks (HBASE_BLOCK) based on the existing code of Hvp...
by hbelusca＠svn.reactos.org 13 Jan '16

13 Jan '16

Author: hbelusca Date: Wed Jan 13 01:40:58 2016 New Revision: 70582 URL: http://svn.reactos.org/svn/reactos?rev=70582&view=rev Log: [CMLIB] - Fix HBLOCK_SIZE vs. HSECTOR_SIZE mix-ups in HvpGetHiveHeader. - Add a function to create cluster-aligned hive base blocks (HBASE_BLOCK) based on the existing code of HvpGetHiveHeader, and use it everytime we need to allocate HBASE_BLOCKs. - Keep the actual base block size in the BaseBlockAlloc member, and use this value for the "quota" parameter when we free the blocks. - Introduce & use a function to initialize the hive file name array (mainly used for debugging purposes). - "HvpInitializeMemoryInplaceHive" should read "HvpInitializeFlatHive" instead since this function is used to initialize a flat hive. Memory-in-place hives are a different thing. - Fix some memory leaks in the error paths of HvLoadHive. - Initialize some additional hive members in HvInitialize(Hive). Modified: trunk/reactos/lib/cmlib/hiveinit.c Modified: trunk/reactos/lib/cmlib/hiveinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=7… ============================================================================== --- trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] Wed Jan 13 01:40:58 2016 @@ -14,10 +14,9 @@ * * Internal function to verify that a hive header has valid format. */ - BOOLEAN CMAPI HvpVerifyHiveHeader( - PHBASE_BLOCK BaseBlock) + IN PHBASE_BLOCK BaseBlock) { if (BaseBlock->Signature != HV_SIGNATURE || BaseBlock->Major != HSYS_MAJOR || @@ -28,10 +27,10 @@ BaseBlock->Sequence1 != BaseBlock->Sequence2 || HvpHiveHeaderChecksum(BaseBlock) != BaseBlock->CheckSum) { - DPRINT1("Verify Hive Header failed: \n"); + DPRINT1("Verify Hive Header failed:\n"); DPRINT1(" Signature: 0x%x, expected 0x%x; Major: 0x%x, expected 0x%x\n", BaseBlock->Signature, HV_SIGNATURE, BaseBlock->Major, HSYS_MAJOR); - DPRINT1(" Minor: 0x%x is not >= 0x%x; Type: 0x%x, expected 0x%x\n", + DPRINT1(" Minor: 0x%x expected to be >= 0x%x; Type: 0x%x, expected 0x%x\n", BaseBlock->Minor, HSYS_MINOR, BaseBlock->Type, HFILE_TYPE_PRIMARY); DPRINT1(" Format: 0x%x, expected 0x%x; Cluster: 0x%x, expected 1\n", BaseBlock->Format, HBASE_FORMAT_MEMORY, BaseBlock->Cluster); @@ -48,10 +47,8 @@ /** * @name HvpFreeHiveBins * - * Internal function to free all bin storage associated with hive - * descriptor. - */ - + * Internal function to free all bin storage associated with a hive descriptor. + */ VOID CMAPI HvpFreeHiveBins( PHHIVE Hive) @@ -82,27 +79,98 @@ } /** + * @name HvpAllocBaseBlockAligned + * + * Internal helper function to allocate cluster-aligned hive base blocks. + */ +static __inline PHBASE_BLOCK +HvpAllocBaseBlockAligned( + IN PHHIVE Hive, + IN BOOLEAN Paged, + IN ULONG Tag) +{ + PHBASE_BLOCK BaseBlock; + ULONG Alignment; + + ASSERT(sizeof(HBASE_BLOCK) >= (HSECTOR_SIZE * Hive->Cluster)); + + /* Allocate the buffer */ + BaseBlock = Hive->Allocate(Hive->BaseBlockAlloc, Paged, Tag); + if (!BaseBlock) return NULL; + + /* Check for, and enforce, alignment */ + Alignment = Hive->Cluster * HSECTOR_SIZE -1; + if ((ULONG_PTR)BaseBlock & Alignment) + { + /* Free the old header and reallocate a new one, always paged */ + Hive->Free(BaseBlock, Hive->BaseBlockAlloc); + BaseBlock = Hive->Allocate(PAGE_SIZE, TRUE, Tag); + if (!BaseBlock) return NULL; + + Hive->BaseBlockAlloc = PAGE_SIZE; + } + + return BaseBlock; +} + +/** + * @name HvpInitFileName + * + * Internal function to initialize the UNICODE NULL-terminated hive file name + * member of a hive header by copying the last 31 characters of the file name. + * Mainly used for debugging purposes. + */ +static VOID +HvpInitFileName( + IN OUT PHBASE_BLOCK BaseBlock, + IN PCUNICODE_STRING FileName OPTIONAL) +{ + ULONG_PTR Offset; + SIZE_T Length; + + /* Always NULL-initialize */ + RtlZeroMemory(BaseBlock->FileName, (HIVE_FILENAME_MAXLEN + 1) * sizeof(WCHAR)); + + /* Copy the 31 last characters of the hive file name if any */ + if (!FileName) return; + + if (FileName->Length / sizeof(WCHAR) <= HIVE_FILENAME_MAXLEN) + { + Offset = 0; + Length = FileName->Length; + } + else + { + Offset = FileName->Length / sizeof(WCHAR) - HIVE_FILENAME_MAXLEN; + Length = HIVE_FILENAME_MAXLEN * sizeof(WCHAR); + } + + RtlCopyMemory(BaseBlock->FileName, FileName->Buffer + Offset, Length); +} + +/** * @name HvpCreateHive * - * Internal helper function to initialize hive descriptor structure for - * newly created hive. + * Internal helper function to initialize a hive descriptor structure + * for a newly created hive in memory. * * @see HvInitialize */ - NTSTATUS CMAPI HvpCreateHive( - PHHIVE RegistryHive, - PCUNICODE_STRING FileName OPTIONAL) + IN OUT PHHIVE RegistryHive, + IN PCUNICODE_STRING FileName OPTIONAL) { PHBASE_BLOCK BaseBlock; ULONG Index; - BaseBlock = RegistryHive->Allocate(sizeof(HBASE_BLOCK), FALSE, TAG_CM); + /* Allocate the base block */ + BaseBlock = HvpAllocBaseBlockAligned(RegistryHive, FALSE, TAG_CM); if (BaseBlock == NULL) return STATUS_NO_MEMORY; - RtlZeroMemory(BaseBlock, sizeof(HBASE_BLOCK)); + /* Clear it */ + RtlZeroMemory(BaseBlock, RegistryHive->BaseBlockAlloc); BaseBlock->Signature = HV_SIGNATURE; BaseBlock->Major = HSYS_MAJOR; @@ -114,37 +182,29 @@ BaseBlock->Length = 0; BaseBlock->Sequence1 = 1; BaseBlock->Sequence2 = 1; - - /* Copy the 31 last characters of the hive file name if any */ - if (FileName) - { - if (FileName->Length / sizeof(WCHAR) <= HIVE_FILENAME_MAXLEN) - { - RtlCopyMemory(BaseBlock->FileName, - FileName->Buffer, - FileName->Length); - } - else - { - RtlCopyMemory(BaseBlock->FileName, - FileName->Buffer + - FileName->Length / sizeof(WCHAR) - HIVE_FILENAME_MAXLEN, - HIVE_FILENAME_MAXLEN * sizeof(WCHAR)); - } - - /* NULL-terminate */ - BaseBlock->FileName[HIVE_FILENAME_MAXLEN] = L'\0'; - } - - BaseBlock->CheckSum = HvpHiveHeaderChecksum(BaseBlock); - + BaseBlock->TimeStamp.QuadPart = 0ULL; + + /* + * No need to compute the checksum since + * the hive resides only in memory so far. + */ + BaseBlock->CheckSum = 0; + + /* Set default boot type */ + BaseBlock->BootType = 0; + + /* Setup hive data */ RegistryHive->BaseBlock = BaseBlock; + RegistryHive->Version = BaseBlock->Minor; // == HSYS_MINOR + for (Index = 0; Index < 24; Index++) { RegistryHive->Storage[Stable].FreeDisplay[Index] = HCELL_NIL; RegistryHive->Storage[Volatile].FreeDisplay[Index] = HCELL_NIL; } + HvpInitFileName(BaseBlock, FileName); + return STATUS_SUCCESS; } @@ -152,16 +212,16 @@ * @name HvpInitializeMemoryHive * * Internal helper function to initialize hive descriptor structure for - * a hive stored in memory. The data of the hive are copied and it is - * prepared for read/write access. + * an existing hive stored in memory. The data of the hive is copied + * and it is prepared for read/write access. * * @see HvInitialize */ - NTSTATUS CMAPI HvpInitializeMemoryHive( PHHIVE Hive, - PVOID ChunkBase) + PHBASE_BLOCK ChunkBase, + IN PCUNICODE_STRING FileName OPTIONAL) { SIZE_T BlockIndex; PHBIN Bin, NewBin; @@ -170,23 +230,26 @@ PULONG BitmapBuffer; SIZE_T ChunkSize; - ChunkSize = ((PHBASE_BLOCK)ChunkBase)->Length; + ChunkSize = ChunkBase->Length; DPRINT("ChunkSize: %lx\n", ChunkSize); if (ChunkSize < sizeof(HBASE_BLOCK) || - !HvpVerifyHiveHeader((PHBASE_BLOCK)ChunkBase)) + !HvpVerifyHiveHeader(ChunkBase)) { DPRINT1("Registry is corrupt: ChunkSize %lu < sizeof(HBASE_BLOCK) %lu, " - "or HvpVerifyHiveHeader() failed\n", ChunkSize, (SIZE_T)sizeof(HBASE_BLOCK)); + "or HvpVerifyHiveHeader() failed\n", ChunkSize, sizeof(HBASE_BLOCK)); return STATUS_REGISTRY_CORRUPT; } - Hive->BaseBlock = Hive->Allocate(sizeof(HBASE_BLOCK), FALSE, TAG_CM); + /* Allocate the base block */ + Hive->BaseBlock = HvpAllocBaseBlockAligned(Hive, FALSE, TAG_CM); if (Hive->BaseBlock == NULL) - { return STATUS_NO_MEMORY; - } + RtlCopyMemory(Hive->BaseBlock, ChunkBase, sizeof(HBASE_BLOCK)); + + /* Setup hive data */ + Hive->Version = ChunkBase->Minor; /* * Build a block list from the in-memory chunk and copy the data as @@ -200,7 +263,7 @@ if (Hive->Storage[Stable].BlockList == NULL) { DPRINT1("Allocating block list failed\n"); - Hive->Free(Hive->BaseBlock, 0); + Hive->Free(Hive->BaseBlock, Hive->BaseBlockAlloc); return STATUS_NO_MEMORY; } @@ -212,16 +275,16 @@ { DPRINT1("Invalid bin at BlockIndex %lu, Signature 0x%x, Size 0x%x\n", (unsigned long)BlockIndex, (unsigned)Bin->Signature, (unsigned)Bin->Size); - Hive->Free(Hive->BaseBlock, 0); Hive->Free(Hive->Storage[Stable].BlockList, 0); + Hive->Free(Hive->BaseBlock, Hive->BaseBlockAlloc); return STATUS_REGISTRY_CORRUPT; } NewBin = Hive->Allocate(Bin->Size, TRUE, TAG_CM); if (NewBin == NULL) { - Hive->Free(Hive->BaseBlock, 0); Hive->Free(Hive->Storage[Stable].BlockList, 0); + Hive->Free(Hive->BaseBlock, Hive->BaseBlockAlloc); return STATUS_NO_MEMORY; } @@ -246,7 +309,7 @@ if (HvpCreateHiveFreeCellList(Hive)) { HvpFreeHiveBins(Hive); - Hive->Free(Hive->BaseBlock, 0); + Hive->Free(Hive->BaseBlock, Hive->BaseBlockAlloc); return STATUS_NO_MEMORY; } @@ -256,18 +319,20 @@ if (BitmapBuffer == NULL) { HvpFreeHiveBins(Hive); - Hive->Free(Hive->BaseBlock, 0); + Hive->Free(Hive->BaseBlock, Hive->BaseBlockAlloc); return STATUS_NO_MEMORY; } RtlInitializeBitMap(&Hive->DirtyVector, BitmapBuffer, BitmapSize * 8); RtlClearAllBits(&Hive->DirtyVector); + HvpInitFileName(Hive->BaseBlock, FileName); + return STATUS_SUCCESS; } /** - * @name HvpInitializeMemoryInplaceHive + * @name HvpInitializeFlatHive * * Internal helper function to initialize hive descriptor structure for * a hive stored in memory. The in-memory data of the hive are directly @@ -275,20 +340,22 @@ * * @see HvInitialize */ - NTSTATUS CMAPI -HvpInitializeMemoryInplaceHive( +HvpInitializeFlatHive( PHHIVE Hive, - PVOID ChunkBase) -{ - if (!HvpVerifyHiveHeader((PHBASE_BLOCK)ChunkBase)) - { + PHBASE_BLOCK ChunkBase) +{ + if (!HvpVerifyHiveHeader(ChunkBase)) return STATUS_REGISTRY_CORRUPT; - } - - Hive->BaseBlock = (PHBASE_BLOCK)ChunkBase; + + /* Setup hive data */ + Hive->BaseBlock = ChunkBase; + Hive->Version = ChunkBase->Minor; + Hive->Flat = TRUE; Hive->ReadOnly = TRUE; - Hive->Flat = TRUE; + + /* Set default boot type */ + ChunkBase->BootType = 0; return STATUS_SUCCESS; } @@ -310,25 +377,15 @@ IN PLARGE_INTEGER TimeStamp) { PHBASE_BLOCK BaseBlock; - ULONG Alignment; ULONG Result; ULONG Offset = 0; - ASSERT(sizeof(HBASE_BLOCK) >= (HBLOCK_SIZE * Hive->Cluster)); - - /* Assume failure and allocate the buffer */ - *HiveBaseBlock = 0; - BaseBlock = Hive->Allocate(sizeof(HBASE_BLOCK), TRUE, TAG_CM); + + ASSERT(sizeof(HBASE_BLOCK) >= (HSECTOR_SIZE * Hive->Cluster)); + + /* Assume failure and allocate the base block */ + *HiveBaseBlock = NULL; + BaseBlock = HvpAllocBaseBlockAligned(Hive, TRUE, TAG_CM); if (!BaseBlock) return NoMemory; - - /* Check for, and enforce, alignment */ - Alignment = Hive->Cluster * HBLOCK_SIZE -1; - if ((ULONG_PTR)BaseBlock & Alignment) - { - /* Free the old header */ - Hive->Free(BaseBlock, 0); - BaseBlock = Hive->Allocate(PAGE_SIZE, TRUE, TAG_CM); - if (!BaseBlock) return NoMemory; - } /* Clear it */ RtlZeroMemory(BaseBlock, sizeof(HBASE_BLOCK)); @@ -338,7 +395,7 @@ HFILE_TYPE_PRIMARY, &Offset, BaseBlock, - Hive->Cluster * HBLOCK_SIZE); + Hive->Cluster * HSECTOR_SIZE); /* Couldn't read: assume it's not a hive */ if (!Result) return NotHive; @@ -353,8 +410,10 @@ } NTSTATUS CMAPI -HvLoadHive(IN PHHIVE Hive) -{ +HvLoadHive(IN PHHIVE Hive, + IN PCUNICODE_STRING FileName OPTIONAL) +{ + NTSTATUS Status; PHBASE_BLOCK BaseBlock = NULL; ULONG Result; LARGE_INTEGER TimeStamp; @@ -391,12 +450,16 @@ /* Setup hive data */ Hive->BaseBlock = BaseBlock; - Hive->Version = Hive->BaseBlock->Minor; + Hive->Version = BaseBlock->Minor; /* Allocate a buffer large enough to hold the hive */ - FileSize = HBLOCK_SIZE + BaseBlock->Length; + FileSize = HBLOCK_SIZE + BaseBlock->Length; // == sizeof(HBASE_BLOCK) + BaseBlock->Length; HiveData = Hive->Allocate(FileSize, TRUE, TAG_CM); - if (!HiveData) return STATUS_INSUFFICIENT_RESOURCES; + if (!HiveData) + { + Hive->Free(BaseBlock, Hive->BaseBlockAlloc); + return STATUS_INSUFFICIENT_RESOURCES; + } /* Now read the whole hive */ Result = Hive->FileRead(Hive, @@ -404,14 +467,23 @@ &Offset, HiveData, FileSize); - if (!Result) return STATUS_NOT_REGISTRY_FILE; + if (!Result) + { + Hive->Free(HiveData, FileSize); + Hive->Free(BaseBlock, Hive->BaseBlockAlloc); + return STATUS_NOT_REGISTRY_FILE; + } // This is a HACK! /* Free our base block... it's usless in this implementation */ - Hive->Free(BaseBlock, 0); + Hive->Free(BaseBlock, Hive->BaseBlockAlloc); /* Initialize the hive directly from memory */ - return HvpInitializeMemoryHive(Hive, HiveData); + Status = HvpInitializeMemoryHive(Hive, HiveData, FileName); + if (!NT_SUCCESS(Status)) + Hive->Free(HiveData, FileSize); + + return Status; } /** @@ -444,7 +516,6 @@ * * @see HvFree */ - NTSTATUS CMAPI HvInitialize( PHHIVE RegistryHive, @@ -464,8 +535,6 @@ NTSTATUS Status; PHHIVE Hive = RegistryHive; - UNREFERENCED_PARAMETER(FileType); - /* * Create a new hive structure that will hold all the maintenance data. */ @@ -474,13 +543,18 @@ Hive->Allocate = Allocate; Hive->Free = Free; + Hive->FileSetSize = FileSetSize; + Hive->FileWrite = FileWrite; Hive->FileRead = FileRead; - Hive->FileWrite = FileWrite; - Hive->FileSetSize = FileSetSize; Hive->FileFlush = FileFlush; + + Hive->RefreshCount = 0; Hive->StorageTypeCount = HTYPE_COUNT; - Hive->Cluster = 1; + Hive->Cluster = Cluster; + Hive->BaseBlockAlloc = sizeof(HBASE_BLOCK); // == HBLOCK_SIZE + Hive->Version = HSYS_MINOR; + Hive->Log = (FileType == HFILE_TYPE_LOG); Hive->HiveFlags = HiveFlags & ~HIVE_NOLAZYFLUSH; switch (OperationType) @@ -490,16 +564,16 @@ break; case HINIT_MEMORY: - Status = HvpInitializeMemoryHive(Hive, HiveData); + Status = HvpInitializeMemoryHive(Hive, HiveData, FileName); break; case HINIT_FLAT: - Status = HvpInitializeMemoryInplaceHive(Hive, HiveData); + Status = HvpInitializeFlatHive(Hive, HiveData); break; case HINIT_FILE: { - Status = HvLoadHive(Hive); + Status = HvLoadHive(Hive, FileName); if ((Status != STATUS_SUCCESS) && (Status != STATUS_REGISTRY_RECOVERED)) { @@ -512,6 +586,12 @@ break; } + case HINIT_MEMORY_INPLACE: + // Status = HvpInitializeMemoryInplaceHive(Hive, HiveData); + // break; + + case HINIT_MAPFILE: + default: /* FIXME: A better return status value is needed */ Status = STATUS_NOT_IMPLEMENTED; @@ -520,6 +600,9 @@ if (!NT_SUCCESS(Status)) return Status; + /* HACK: ROS: Init root key cell and prepare the hive */ + // r31253 + // if (OperationType == HINIT_CREATE) CmCreateRootNode(Hive, L""); if (OperationType != HINIT_CREATE) CmPrepareHive(Hive); return Status; @@ -531,7 +614,6 @@ * Free all stroage and handles associated with hive descriptor. * But do not free the hive descriptor itself. */ - VOID CMAPI HvFree( PHHIVE RegistryHive) @@ -549,7 +631,7 @@ /* Free the BaseBlock */ if (RegistryHive->BaseBlock) { - RegistryHive->Free(RegistryHive->BaseBlock, 0); + RegistryHive->Free(RegistryHive->BaseBlock, RegistryHive->BaseBlockAlloc); RegistryHive->BaseBlock = NULL; } }

1 0

[hbelusca] 70581: [CMLIB]: Better fix for r70580.
by hbelusca＠svn.reactos.org 12 Jan '16

12 Jan '16

Author: hbelusca Date: Tue Jan 12 22:22:18 2016 New Revision: 70581 URL: http://svn.reactos.org/svn/reactos?rev=70581&view=rev Log: [CMLIB]: Better fix for r70580. Modified: trunk/reactos/lib/cmlib/cmlib.h Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=7058… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Tue Jan 12 22:22:18 2016 @@ -18,7 +18,14 @@ #include <stdio.h> #include <string.h> - #define NTDDI_VERSION 0x05020400 // NTDDI_WS03SP4 // This is the NT kernel version + // NTDDI_xxx versions we allude to in the library (see psdk/sdkddkver.h) + #define NTDDI_WS03SP4 0x05020400 + #define NTDDI_WIN6 0x06000000 + #define NTDDI_LONGHORN NTDDI_WIN6 + #define NTDDI_VISTA NTDDI_WIN6 + #define NTDDI_WIN7 0x06010000 + + #define NTDDI_VERSION NTDDI_WS03SP4 // This is the ReactOS NT kernel version /* C_ASSERT Definition */ #define C_ASSERT(expr) extern char (*c_assert(void)) [(expr) ? 1 : -1]

1 0

[hbelusca] 70580: [CMLIB]: Fix host-tool compilation (+ add a comment).
by hbelusca＠svn.reactos.org 12 Jan '16

12 Jan '16

Author: hbelusca Date: Tue Jan 12 22:17:39 2016 New Revision: 70580 URL: http://svn.reactos.org/svn/reactos?rev=70580&view=rev Log: [CMLIB]: Fix host-tool compilation (+ add a comment). Modified: trunk/reactos/lib/cmlib/cmlib.h Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=7058… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Tue Jan 12 22:17:39 2016 @@ -17,6 +17,8 @@ #include <typedefs.h> #include <stdio.h> #include <string.h> + + #define NTDDI_VERSION 0x05020400 // NTDDI_WS03SP4 // This is the NT kernel version /* C_ASSERT Definition */ #define C_ASSERT(expr) extern char (*c_assert(void)) [(expr) ? 1 : -1] @@ -100,6 +102,9 @@ #define PKEVENT PVOID #define PWORK_QUEUE_ITEM PVOID #define EX_PUSH_LOCK PULONG_PTR + + // Definitions copied from <ntifs.h> + // We only want to include host headers, so we define them manually typedef USHORT SECURITY_DESCRIPTOR_CONTROL, *PSECURITY_DESCRIPTOR_CONTROL;

1 0

[hbelusca] 70579: [CMLIB] - Fix some structure definitions to match Win2k3 symbols (define also _SECURITY_DESCRIPTOR_RELATIVE for the host-tools so that the CM_KEY_SECURITY structure is always corr...
by hbelusca＠svn.reactos.org 12 Jan '16

12 Jan '16

Author: hbelusca Date: Tue Jan 12 21:37:36 2016 New Revision: 70579 URL: http://svn.reactos.org/svn/reactos?rev=70579&view=rev Log: [CMLIB] - Fix some structure definitions to match Win2k3 symbols (define also _SECURITY_DESCRIPTOR_RELATIVE for the host-tools so that the CM_KEY_SECURITY structure is always correctly defined). - Complete other structure definitions with respect to the NT version defined at compile time; http://msdn.mirt.net/ was used as the source of information. - Add the definition of CM_BIG_DATA for supporting big valued keys (see also http://www.msuiche.net/2009/06/07/windows-vista-and-later-registry-secrets/ for what they are). [NTOS] - Move CM functions defined in the CMLIB out of the internal ntoskrnl headers. Modified: trunk/reactos/lib/cmlib/cmdata.h trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/lib/cmlib/hivedata.h trunk/reactos/ntoskrnl/include/internal/cm.h Modified: trunk/reactos/lib/cmlib/cmdata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmdata.h?rev=705… ============================================================================== --- trunk/reactos/lib/cmlib/cmdata.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmdata.h [iso-8859-1] Tue Jan 12 21:37:36 2016 @@ -18,16 +18,18 @@ // Key Types // #define CM_KEY_INDEX_ROOT 0x6972 // "ri" -#define CM_KEY_INDEX_LEAF 0x696c // "li" -#define CM_KEY_FAST_LEAF 0x666c // "lf" -#define CM_KEY_HASH_LEAF 0x686c // "lh" +#define CM_KEY_INDEX_LEAF 0x696C // "li" +#define CM_KEY_FAST_LEAF 0x666C // "lf" +#define CM_KEY_HASH_LEAF 0x686C // "lh" // // Key Signatures // #define CM_KEY_NODE_SIGNATURE 0x6B6E // "nk" #define CM_LINK_NODE_SIGNATURE 0x6B6C // "lk" +#define CM_KEY_SECURITY_SIGNATURE 0x6B73 // "sk" #define CM_KEY_VALUE_SIGNATURE 0x6B76 // "vk" +#define CM_BIG_DATA_SIGNATURE 0x6264 // "db" // // CM_KEY_NODE Flags @@ -140,7 +142,7 @@ HCELL_INDEX Data; ULONG Type; USHORT Flags; - USHORT Unused1; + USHORT Spare; WCHAR Name[ANYSIZE_ARRAY]; } CM_KEY_VALUE, *PCM_KEY_VALUE; @@ -155,9 +157,18 @@ HCELL_INDEX Blink; ULONG ReferenceCount; ULONG DescriptorLength; - //SECURITY_DESCRIPTOR_RELATIVE Descriptor; - UCHAR Data[ANYSIZE_ARRAY]; + SECURITY_DESCRIPTOR_RELATIVE Descriptor; } CM_KEY_SECURITY, *PCM_KEY_SECURITY; + +// +// Big Value Key +// +typedef struct _CM_BIG_DATA +{ + USHORT Signature; + USHORT Count; + HCELL_INDEX List; +} CM_BIG_DATA, *PCM_BIG_DATA; #include <poppack.h> @@ -205,6 +216,7 @@ CM_KEY_VALUE KeyValue; CM_KEY_SECURITY KeySecurity; CM_KEY_INDEX KeyIndex; + CM_BIG_DATA ValueData; HCELL_INDEX KeyList[ANYSIZE_ARRAY]; WCHAR KeyString[ANYSIZE_ARRAY]; } u; Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=7057… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Tue Jan 12 21:37:36 2016 @@ -17,6 +17,9 @@ #include <typedefs.h> #include <stdio.h> #include <string.h> + + /* C_ASSERT Definition */ + #define C_ASSERT(expr) extern char (*c_assert(void)) [(expr) ? 1 : -1] #ifdef _WIN32 #define strncasecmp _strnicmp @@ -97,6 +100,19 @@ #define PKEVENT PVOID #define PWORK_QUEUE_ITEM PVOID #define EX_PUSH_LOCK PULONG_PTR + + typedef USHORT SECURITY_DESCRIPTOR_CONTROL, *PSECURITY_DESCRIPTOR_CONTROL; + + typedef struct _SECURITY_DESCRIPTOR_RELATIVE + { + UCHAR Revision; + UCHAR Sbz1; + SECURITY_DESCRIPTOR_CONTROL Control; + ULONG Owner; + ULONG Group; + ULONG Sacl; + ULONG Dacl; + } SECURITY_DESCRIPTOR_RELATIVE, *PISECURITY_DESCRIPTOR_RELATIVE; #define CMLTRACE(x, ...) #undef PAGED_CODE @@ -118,7 +134,7 @@ #endif #include <ntdef.h> - #include <ntddk.h> + #include <ntifs.h> #include <bugcodes.h> #undef PAGED_CODE #define PAGED_CODE() @@ -482,46 +498,104 @@ _Out_ PWCHAR ValueNameBuffer, _Inout_ ULONG BufferLength); + + /* NT-style Public Cm functions */ + +// +// Cell Index Routines +// +HCELL_INDEX +NTAPI +CmpFindSubKeyByName( + IN PHHIVE Hive, + IN PCM_KEY_NODE Parent, + IN PCUNICODE_STRING SearchName +); + +HCELL_INDEX +NTAPI +CmpFindSubKeyByNumber( + IN PHHIVE Hive, + IN PCM_KEY_NODE Node, + IN ULONG Number +); + +ULONG +NTAPI +CmpComputeHashKey( + IN ULONG Hash, + IN PCUNICODE_STRING Name, + IN BOOLEAN AllowSeparators +); + +BOOLEAN +NTAPI +CmpAddSubKey( + IN PHHIVE Hive, + IN HCELL_INDEX Parent, + IN HCELL_INDEX Child +); + +BOOLEAN +NTAPI +CmpRemoveSubKey( + IN PHHIVE Hive, + IN HCELL_INDEX ParentKey, + IN HCELL_INDEX TargetKey +); + +BOOLEAN +NTAPI +CmpMarkIndexDirty( + IN PHHIVE Hive, + HCELL_INDEX ParentKey, + HCELL_INDEX TargetKey +); + + +// +// Name Functions +// LONG NTAPI CmpCompareCompressedName( IN PCUNICODE_STRING SearchName, IN PWCHAR CompressedName, IN ULONG NameLength - ); +); + +USHORT +NTAPI +CmpNameSize( + IN PHHIVE Hive, + IN PUNICODE_STRING Name +); USHORT NTAPI CmpCompressedNameSize( IN PWCHAR Name, IN ULONG Length - ); - -HCELL_INDEX -NTAPI -CmpFindSubKeyByName( - IN PHHIVE Hive, - IN PCM_KEY_NODE Parent, - IN PCUNICODE_STRING SearchName - ); - -HCELL_INDEX -NTAPI -CmpFindSubKeyByNumber( - IN PHHIVE Hive, - IN PCM_KEY_NODE Node, - IN ULONG Number - ); - -PCELL_DATA -NTAPI -CmpValueToData( - IN PHHIVE Hive, - IN PCM_KEY_VALUE Value, - OUT PULONG Length - ); +); + +USHORT +NTAPI +CmpCopyName( + IN PHHIVE Hive, + IN PWCHAR Destination, + IN PUNICODE_STRING Source +); + +VOID +NTAPI +CmpCopyCompressedName( + IN PWCHAR Destination, + IN ULONG DestinationLength, + IN PWCHAR Source, + IN ULONG SourceLength +); BOOLEAN NTAPI @@ -531,7 +605,102 @@ IN PUNICODE_STRING Name, IN PULONG ChildIndex, IN PHCELL_INDEX CellIndex - ); +); + + +// +// Cell Value Routines +// +HCELL_INDEX +NTAPI +CmpFindValueByName( + IN PHHIVE Hive, + IN PCM_KEY_NODE KeyNode, + IN PUNICODE_STRING Name +); + +PCELL_DATA +NTAPI +CmpValueToData( + IN PHHIVE Hive, + IN PCM_KEY_VALUE Value, + OUT PULONG Length +); + +NTSTATUS +NTAPI +CmpSetValueDataNew( + IN PHHIVE Hive, + IN PVOID Data, + IN ULONG DataSize, + IN ULONG StorageType, + IN HCELL_INDEX ValueCell, + OUT PHCELL_INDEX DataCell +); + +NTSTATUS +NTAPI +CmpAddValueToList( + IN PHHIVE Hive, + IN HCELL_INDEX ValueCell, + IN ULONG Index, + IN ULONG Type, + IN OUT PCHILD_LIST ChildList +); + +BOOLEAN +NTAPI +CmpFreeValue( + IN PHHIVE Hive, + IN HCELL_INDEX Cell +); + +BOOLEAN +NTAPI +CmpMarkValueDataDirty( + IN PHHIVE Hive, + IN PCM_KEY_VALUE Value +); + +BOOLEAN +NTAPI +CmpFreeValueData( + IN PHHIVE Hive, + IN HCELL_INDEX DataCell, + IN ULONG DataLength +); + +NTSTATUS +NTAPI +CmpRemoveValueFromList( + IN PHHIVE Hive, + IN ULONG Index, + IN OUT PCHILD_LIST ChildList +); + +BOOLEAN +NTAPI +CmpGetValueData( + IN PHHIVE Hive, + IN PCM_KEY_VALUE Value, + IN PULONG Length, + OUT PVOID *Buffer, + OUT PBOOLEAN BufferAllocated, + OUT PHCELL_INDEX CellToRelease +); + +NTSTATUS +NTAPI +CmpCopyKeyValueList( + IN PHHIVE SourceHive, + IN PCHILD_LIST SrcValueList, + IN PHHIVE DestinationHive, + IN OUT PCHILD_LIST DestValueList, + IN HSTORAGE_TYPE StorageType +); + + +/******************************************************************************/ /* To be implemented by the user of this library */ PVOID @@ -549,13 +718,4 @@ IN ULONG Quota ); -VOID -NTAPI -CmpCopyCompressedName( - IN PWCHAR Destination, - IN ULONG DestinationLength, - IN PWCHAR Source, - IN ULONG SourceLength - ); - #endif /* _CMLIB_H_ */ Modified: trunk/reactos/lib/cmlib/hivedata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivedata.h?rev=7… ============================================================================== --- trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] Tue Jan 12 21:37:36 2016 @@ -137,7 +137,7 @@ If the hive is volatile, this is the actual pointer to the CM_KEY_NODE */ HCELL_INDEX RootCell; - /* Size in bytes of the full hive, minus the header */ + /* Size in bytes of the full hive, minus the header, multiple of the block size (4KB) */ ULONG Length; /* (1?) */ @@ -157,6 +157,8 @@ ULONG BootRecover; } HBASE_BLOCK, *PHBASE_BLOCK; +C_ASSERT(sizeof(HBASE_BLOCK) == HBLOCK_SIZE); + typedef struct _HBIN { /* Bin identifier "hbin" (0x6E696268) */ @@ -165,7 +167,7 @@ /* Block offset of this bin */ HCELL_INDEX FileOffset; - /* Size in bytes, multiple of the block size (4KB) */ + /* Size in bytes of this bin, multiple of the block size (4KB) */ ULONG Size; ULONG Reserved1[2]; @@ -282,10 +284,13 @@ PRELEASE_CELL_ROUTINE ReleaseCellRoutine; PALLOCATE_ROUTINE Allocate; PFREE_ROUTINE Free; + PFILE_SET_SIZE_ROUTINE FileSetSize; + PFILE_WRITE_ROUTINE FileWrite; PFILE_READ_ROUTINE FileRead; - PFILE_WRITE_ROUTINE FileWrite; - PFILE_SET_SIZE_ROUTINE FileSetSize; PFILE_FLUSH_ROUTINE FileFlush; +#if (NTDDI_VERSION >= NTDDI_WIN7) + PVOID HiveLoadFailure; // PHIVE_LOAD_FAILURE +#endif PHBASE_BLOCK BaseBlock; RTL_BITMAP DirtyVector; ULONG DirtyCount; @@ -294,14 +299,23 @@ ULONG Cluster; BOOLEAN Flat; BOOLEAN ReadOnly; +#if (NTDDI_VERSION < NTDDI_VISTA) // NTDDI_LONGHORN BOOLEAN Log; +#endif BOOLEAN DirtyFlag; +#if (NTDDI_VERSION >= NTDDI_VISTA) // NTDDI_LONGHORN ULONG HvBinHeadersUse; ULONG HvFreeCellsUse; - ULONG HvUsedcellsUse; + ULONG HvUsedCellsUse; ULONG CmUsedCellsUse; +#endif ULONG HiveFlags; +#if (NTDDI_VERSION < NTDDI_VISTA) // NTDDI_LONGHORN ULONG LogSize; +#else + ULONG CurrentLog; + ULONG LogSize[2]; +#endif ULONG RefreshCount; ULONG StorageTypeCount; ULONG Version; Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Tue Jan 12 21:37:36 2016 @@ -1089,58 +1089,6 @@ ); // -// Name Functions -// -LONG -NTAPI -CmpCompareCompressedName( - IN PCUNICODE_STRING SearchName, - IN PWCHAR CompressedName, - IN ULONG NameLength -); - -USHORT -NTAPI -CmpNameSize( - IN PHHIVE Hive, - IN PUNICODE_STRING Name -); - -USHORT -NTAPI -CmpCompressedNameSize( - IN PWCHAR Name, - IN ULONG Length -); - -VOID -NTAPI -CmpCopyCompressedName( - IN PWCHAR Destination, - IN ULONG DestinationLength, - IN PWCHAR Source, - IN ULONG SourceLength -); - -USHORT -NTAPI -CmpCopyName( - IN PHHIVE Hive, - IN PWCHAR Destination, - IN PUNICODE_STRING Source -); - -BOOLEAN -NTAPI -CmpFindNameInList( - IN PHHIVE Hive, - IN PCHILD_LIST ChildList, - IN PUNICODE_STRING Name, - IN PULONG ChildIndex, - IN PHCELL_INDEX CellIndex -); - -// // Parse Routines // BOOLEAN @@ -1219,149 +1167,6 @@ ); // -// Cell Index Routines -// - -HCELL_INDEX -NTAPI -CmpFindSubKeyByName( - IN PHHIVE Hive, - IN PCM_KEY_NODE Parent, - IN PCUNICODE_STRING SearchName -); - -HCELL_INDEX -NTAPI -CmpFindSubKeyByNumber( - IN PHHIVE Hive, - IN PCM_KEY_NODE Node, - IN ULONG Number -); - -ULONG -NTAPI -CmpComputeHashKey( - IN ULONG Hash, - IN PCUNICODE_STRING Name, - IN BOOLEAN AllowSeparators -); - -BOOLEAN -NTAPI -CmpAddSubKey( - IN PHHIVE Hive, - IN HCELL_INDEX Parent, - IN HCELL_INDEX Child -); - -BOOLEAN -NTAPI -CmpRemoveSubKey( - IN PHHIVE Hive, - IN HCELL_INDEX ParentKey, - IN HCELL_INDEX TargetKey -); - -BOOLEAN -NTAPI -CmpMarkIndexDirty( - IN PHHIVE Hive, - HCELL_INDEX ParentKey, - HCELL_INDEX TargetKey -); - -// -// Cell Value Routines -// -HCELL_INDEX -NTAPI -CmpFindValueByName( - IN PHHIVE Hive, - IN PCM_KEY_NODE KeyNode, - IN PUNICODE_STRING Name -); - -PCELL_DATA -NTAPI -CmpValueToData( - IN PHHIVE Hive, - IN PCM_KEY_VALUE Value, - OUT PULONG Length -); - -NTSTATUS -NTAPI -CmpSetValueDataNew( - IN PHHIVE Hive, - IN PVOID Data, - IN ULONG DataSize, - IN ULONG StorageType, - IN HCELL_INDEX ValueCell, - OUT PHCELL_INDEX DataCell -); - -NTSTATUS -NTAPI -CmpAddValueToList( - IN PHHIVE Hive, - IN HCELL_INDEX ValueCell, - IN ULONG Index, - IN ULONG Type, - IN OUT PCHILD_LIST ChildList -); - -BOOLEAN -NTAPI -CmpFreeValue( - IN PHHIVE Hive, - IN HCELL_INDEX Cell -); - -BOOLEAN -NTAPI -CmpMarkValueDataDirty( - IN PHHIVE Hive, - IN PCM_KEY_VALUE Value -); - -BOOLEAN -NTAPI -CmpFreeValueData( - IN PHHIVE Hive, - IN HCELL_INDEX DataCell, - IN ULONG DataLength -); - -NTSTATUS -NTAPI -CmpRemoveValueFromList( - IN PHHIVE Hive, - IN ULONG Index, - IN OUT PCHILD_LIST ChildList -); - -BOOLEAN -NTAPI -CmpGetValueData( - IN PHHIVE Hive, - IN PCM_KEY_VALUE Value, - IN PULONG Length, - OUT PVOID *Buffer, - OUT PBOOLEAN BufferAllocated, - OUT PHCELL_INDEX CellToRelease -); - -NTSTATUS -NTAPI -CmpCopyKeyValueList( - IN PHHIVE SourceHive, - IN PCHILD_LIST SrcValueList, - IN PHHIVE DestinationHive, - IN OUT PCHILD_LIST DestValueList, - IN HSTORAGE_TYPE StorageType -); - -// // Boot Routines // HCELL_INDEX @@ -1379,7 +1184,6 @@ IN PVOID SystemHiveData, IN PCM_SYSTEM_CONTROL_VECTOR ControlVector ); - // // Hardware Configuration Routines

1 0

[pschweitzer] 70578: [ROSVBOXMGMT] Let's add hacks to glue hacks together: In case rosvboxmgmt is started with its current directory not being the directory where it is along with hackssign_client....
by pschweitzer＠svn.reactos.org 11 Jan '16

11 Jan '16

Author: pschweitzer Date: Mon Jan 11 22:41:32 2016 New Revision: 70578 URL: http://svn.reactos.org/svn/reactos?rev=70578&view=rev Log: [ROSVBOXMGMT] Let's add hacks to glue hacks together: In case rosvboxmgmt is started with its current directory not being the directory where it is along with hackssign_client.exe, then autoassign fails finding the hackssign client executable and thus, fails assigning drive letter. This is what happens when you starts rosvboxmgmt on boot with shell. So, when using autoassign, first look for the location of rosvboxmgmt and set our current directory there. This fixes rosvboxmgmt autoassign not working on boot. CORE-10032 ROSAPPS-303 Modified: trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c Modified: trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/rosv… ============================================================================== --- trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c [iso-8859-1] Mon Jan 11 22:41:32 2016 @@ -297,6 +297,14 @@ if (assign) { + wchar_t path[MAX_PATH]; + if (GetModuleFileName(NULL, path, ARRAYSIZE(path)) != 0) + { + *(wcsrchr(path, '\\')) = 0; + wprintf(L"Switching to %s\n", path); + SetCurrentDirectory(path); + } + if (OpenFile("hackssign_client.exe", &ofs, OF_EXIST) != 1) { wprintf(L"hackssign_client.exe not found, falling back to links\n");

1 0

[hbelusca] 70577: [DESK.CPL] Resolution selection improvement patch by Mark Jansen: - Fix a bug that allowed only a subset of resolutions to be visible. - Update the preview on the fly when draggin...
by hbelusca＠svn.reactos.org 11 Jan '16

11 Jan '16

Author: hbelusca Date: Mon Jan 11 20:52:44 2016 New Revision: 70577 URL: http://svn.reactos.org/svn/reactos?rev=70577&view=rev Log: [DESK.CPL] Resolution selection improvement patch by Mark Jansen: - Fix a bug that allowed only a subset of resolutions to be visible. - Update the preview on the fly when dragging the resolution slider. - Fix a bug that prevented the monitor preview from properly invalidating the preview, leaving the old preview partially visible. Needs to be included in 0.4 branch. CORE-10786 Modified: trunk/reactos/dll/cpl/desk/monslctl.c trunk/reactos/dll/cpl/desk/settings.c Modified: trunk/reactos/dll/cpl/desk/monslctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/monslctl.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/monslctl.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/monslctl.c [iso-8859-1] Mon Jan 11 20:52:44 2016 @@ -39,6 +39,7 @@ PMONSL_MON Monitors; RECT rcExtent; RECT rcMonitors; + RECT rcOldMonitors; POINT ScrollPos; SIZE Margin; SIZE SelectionFrame; @@ -261,6 +262,14 @@ InvalidateRect(infoPtr->hSelf, &rc, TRUE); + + if (!EqualRect(&infoPtr->rcMonitors, &infoPtr->rcOldMonitors) && + infoPtr->rcOldMonitors.right != infoPtr->rcOldMonitors.left) + { + MonSelRectToScreen(infoPtr, &infoPtr->rcOldMonitors, &rc); + InvalidateRect(infoPtr->hSelf, &rc, TRUE); + infoPtr->rcOldMonitors = infoPtr->rcMonitors; + } } static VOID @@ -355,6 +364,7 @@ ScaleRectSizeFit(&rcExtSurface, &rcExtDisplay); + infoPtr->rcOldMonitors = infoPtr->rcMonitors; infoPtr->rcMonitors = rcExtDisplay; /* Now that we know in which area all monitors are located, Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/settings.c [iso-8859-1] Mon Jan 11 20:52:44 2016 @@ -26,6 +26,8 @@ TCHAR Buffer[64]; TCHAR Pixel[64]; DWORD index; + HWND hwndMonSel; + MONSL_MONINFO info; LoadString(hApplet, IDS_PIXEL, Pixel, sizeof(Pixel) / sizeof(TCHAR)); _stprintf(Buffer, Pixel, pData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth, pData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight, Pixel); @@ -43,6 +45,15 @@ } if (LoadString(hApplet, (2900 + pData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel), Buffer, sizeof(Buffer) / sizeof(TCHAR))) SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_SELECTSTRING, (WPARAM)-1, (LPARAM)Buffer); + + hwndMonSel = GetDlgItem(hwndDlg, IDC_SETTINGS_MONSEL); + index = (INT)SendMessage(hwndMonSel, MSLM_GETCURSEL, 0, 0); + if (index != (DWORD)-1 && SendMessage(hwndMonSel, MSLM_GETMONITORINFO, index, (LPARAM)&info)) + { + info.Size.cx = pData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth; + info.Size.cy = pData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight; + SendMessage(hwndMonSel, MSLM_SETMONITORINFO, index, (LPARAM)&info); + } } static PSETTINGS_ENTRY @@ -165,8 +176,8 @@ for (Current = newEntry->Settings; Current != NULL; Current = Current->Flink) { if (Current->Flink != NULL && - ((Current->dmPelsWidth != Current->Flink->dmPelsWidth) && - (Current->dmPelsHeight != Current->Flink->dmPelsHeight))) + ((Current->dmPelsWidth != Current->Flink->dmPelsWidth) || + (Current->dmPelsHeight != Current->Flink->dmPelsHeight))) { ResolutionsCount++; } @@ -182,8 +193,8 @@ { if (Current->Flink == NULL || (Current->Flink != NULL && - ((Current->dmPelsWidth != Current->Flink->dmPelsWidth) && - (Current->dmPelsHeight != Current->Flink->dmPelsHeight)))) + ((Current->dmPelsWidth != Current->Flink->dmPelsWidth) || + (Current->dmPelsHeight != Current->Flink->dmPelsHeight)))) { newEntry->Resolutions[i].dmPelsWidth = Current->dmPelsWidth; newEntry->Resolutions[i].dmPelsHeight = Current->dmPelsHeight;

1 0

[ekohl] 70576: [vfatlib] - Use a single wipe function (FatWipeSectors) for FAT12, FAT16 and FAT32. - Code has been reviewed by Hermès and me. Ready for merge into 0.4.
by ekohl＠svn.reactos.org 11 Jan '16

11 Jan '16

Author: ekohl Date: Mon Jan 11 20:44:06 2016 New Revision: 70576 URL: http://svn.reactos.org/svn/reactos?rev=70576&view=rev Log: [vfatlib] - Use a single wipe function (FatWipeSectors) for FAT12, FAT16 and FAT32. - Code has been reviewed by Hermès and me. Ready for merge into 0.4. Modified: trunk/reactos/lib/fslib/vfatlib/common.c trunk/reactos/lib/fslib/vfatlib/common.h trunk/reactos/lib/fslib/vfatlib/fat12.c trunk/reactos/lib/fslib/vfatlib/fat16.c trunk/reactos/lib/fslib/vfatlib/fat32.c Modified: trunk/reactos/lib/fslib/vfatlib/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/common.c… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/common.c [iso-8859-1] Mon Jan 11 20:44:06 2016 @@ -50,36 +50,36 @@ return Serial; } -/***** Wipe function for FAT12 and FAT16 formats, adapted from FAT32 code *****/ +/***** Wipe function for FAT12, FAT16 and FAT32 formats, adapted from FAT32 code *****/ NTSTATUS -Fat1216WipeSectors( +FatWipeSectors( IN HANDLE FileHandle, - IN PFAT16_BOOT_SECTOR BootSector, + IN ULONG TotalSectors, + IN ULONG SectorsPerCluster, + IN ULONG BytesPerSector, IN OUT PFORMAT_CONTEXT Context) { IO_STATUS_BLOCK IoStatusBlock; PUCHAR Buffer; LARGE_INTEGER FileOffset; ULONGLONG Sector; - ULONG SectorsHuge; ULONG Length; NTSTATUS Status; + + Length = SectorsPerCluster * BytesPerSector; /* Allocate buffer for the cluster */ Buffer = (PUCHAR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, - BootSector->SectorsPerCluster * BootSector->BytesPerSector); + Length); if (Buffer == NULL) return STATUS_INSUFFICIENT_RESOURCES; + /* Wipe all clusters */ Sector = 0; - Length = BootSector->SectorsPerCluster * BootSector->BytesPerSector; - - SectorsHuge = (BootSector->SectorsHuge != 0 ? BootSector->SectorsHuge : BootSector->Sectors); - - while (Sector + BootSector->SectorsPerCluster < SectorsHuge) + while (Sector + SectorsPerCluster < TotalSectors) { - FileOffset.QuadPart = Sector * BootSector->BytesPerSector; + FileOffset.QuadPart = Sector * BytesPerSector; Status = NtWriteFile(FileHandle, NULL, @@ -96,17 +96,18 @@ goto done; } - UpdateProgress(Context, (ULONG)BootSector->SectorsPerCluster); + UpdateProgress(Context, SectorsPerCluster); - Sector += BootSector->SectorsPerCluster; + Sector += SectorsPerCluster; } - if (Sector + BootSector->SectorsPerCluster > SectorsHuge) + /* Wipe the trailing space behind the last cluster */ + if (Sector < TotalSectors) { - DPRINT("Remaining sectors %lu\n", SectorsHuge - Sector); + DPRINT("Remaining sectors %lu\n", TotalSectors - Sector); - FileOffset.QuadPart = Sector * BootSector->BytesPerSector; - Length = (SectorsHuge - Sector) * BootSector->BytesPerSector; + FileOffset.QuadPart = Sector * BytesPerSector; + Length = (TotalSectors - Sector) * BytesPerSector; Status = NtWriteFile(FileHandle, NULL, @@ -123,7 +124,7 @@ goto done; } - UpdateProgress(Context, SectorsHuge - Sector); + UpdateProgress(Context, TotalSectors - Sector); } done: Modified: trunk/reactos/lib/fslib/vfatlib/common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/common.h… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/common.h [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/common.h [iso-8859-1] Mon Jan 11 20:44:06 2016 @@ -14,9 +14,11 @@ ULONG CalcVolumeSerialNumber(VOID); NTSTATUS -Fat1216WipeSectors( +FatWipeSectors( IN HANDLE FileHandle, - IN PFAT16_BOOT_SECTOR BootSector, + IN ULONG TotalSectors, + IN ULONG SectorsPerCluster, + IN ULONG BytesPerSector, IN OUT PFORMAT_CONTEXT Context); #endif /* _VFATCOMMON_H_ */ Modified: trunk/reactos/lib/fslib/vfatlib/fat12.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat12.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat12.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat12.c [iso-8859-1] Mon Jan 11 20:44:06 2016 @@ -326,9 +326,11 @@ { Context->TotalSectorCount += SectorCount; - Status = Fat1216WipeSectors(FileHandle, - &BootSector, - Context); + Status = FatWipeSectors(FileHandle, + SectorCount, + (ULONG)BootSector.SectorsPerCluster, + (ULONG)BootSector.BytesPerSector, + Context); if (!NT_SUCCESS(Status)) { DPRINT("Fat12WipeSectors() failed with status 0x%.08x\n", Status); Modified: trunk/reactos/lib/fslib/vfatlib/fat16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat16.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat16.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat16.c [iso-8859-1] Mon Jan 11 20:44:06 2016 @@ -334,9 +334,11 @@ { Context->TotalSectorCount += SectorCount; - Status = Fat1216WipeSectors(FileHandle, - &BootSector, - Context); + Status = FatWipeSectors(FileHandle, + SectorCount, + (ULONG)BootSector.SectorsPerCluster, + (ULONG)BootSector.BytesPerSector, + Context); if (!NT_SUCCESS(Status)) { DPRINT("Fat16WipeSectors() failed with status 0x%.08x\n", Status); Modified: trunk/reactos/lib/fslib/vfatlib/fat32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat32.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat32.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat32.c [iso-8859-1] Mon Jan 11 20:44:06 2016 @@ -375,86 +375,6 @@ } UpdateProgress(Context, (ULONG)BootSector->SectorsPerCluster); - -done: - /* Free the buffer */ - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; -} - - -static -NTSTATUS -Fat32WipeSectors( - IN HANDLE FileHandle, - IN PFAT32_BOOT_SECTOR BootSector, - IN OUT PFORMAT_CONTEXT Context) -{ - IO_STATUS_BLOCK IoStatusBlock; - PUCHAR Buffer; - LARGE_INTEGER FileOffset; - ULONGLONG Sector; - ULONG Length; - NTSTATUS Status; - - /* Allocate buffer for the cluster */ - Buffer = (PUCHAR)RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - BootSector->SectorsPerCluster * BootSector->BytesPerSector); - if (Buffer == NULL) - return STATUS_INSUFFICIENT_RESOURCES; - - Sector = 0; - Length = BootSector->SectorsPerCluster * BootSector->BytesPerSector; - - while (Sector + BootSector->SectorsPerCluster < BootSector->SectorsHuge) - { - FileOffset.QuadPart = Sector * BootSector->BytesPerSector; - - Status = NtWriteFile(FileHandle, - NULL, - NULL, - NULL, - &IoStatusBlock, - Buffer, - Length, - &FileOffset, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - goto done; - } - - UpdateProgress(Context, (ULONG)BootSector->SectorsPerCluster); - - Sector += BootSector->SectorsPerCluster; - } - - if (Sector + BootSector->SectorsPerCluster > BootSector->SectorsHuge) - { - DPRINT("Remaining sectors %lu\n", BootSector->SectorsHuge - Sector); - - FileOffset.QuadPart = Sector * BootSector->BytesPerSector; - Length = (BootSector->SectorsHuge - Sector) * BootSector->BytesPerSector; - - Status = NtWriteFile(FileHandle, - NULL, - NULL, - NULL, - &IoStatusBlock, - Buffer, - Length, - &FileOffset, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - goto done; - } - - UpdateProgress(Context, BootSector->SectorsHuge - Sector); - } done: /* Free the buffer */ @@ -557,9 +477,11 @@ { Context->TotalSectorCount += BootSector.SectorsHuge; - Status = Fat32WipeSectors(FileHandle, - &BootSector, - Context); + Status = FatWipeSectors(FileHandle, + BootSector.SectorsHuge, + (ULONG)BootSector.SectorsPerCluster, + (ULONG)BootSector.BytesPerSector, + Context); if (!NT_SUCCESS(Status)) { DPRINT("Fat32WipeSectors() failed with status 0x%.08x\n", Status);

1 0

[hbelusca] 70575: [NTOS:CONFIG] Remove a very old hack (that dated back from the Configuration Manager rewrite): now the hives are already correctly loaded in memory, therefore there is no need to ...
by hbelusca＠svn.reactos.org 11 Jan '16

11 Jan '16

Author: hbelusca Date: Mon Jan 11 00:37:44 2016 New Revision: 70575 URL: http://svn.reactos.org/svn/reactos?rev=70575&view=rev Log: [NTOS:CONFIG] Remove a very old hack (that dated back from the Configuration Manager rewrite): now the hives are already correctly loaded in memory, therefore there is no need to call CmCreateRootNode after creating a hive, because the root node is subsequently initialized with calls to CmpCreateLinkNode. The comment saying that calls to CmCreateRootNode can be removed when CmpCreateLinkNode is used, is now in order. This means we correctly parse & mount the hives. The CmCreateRootNode function is now only used in the 'mkhive' tool in order to create file hives, since this tool needs to create new hives from nowhere (that's why also our bootloaders do not need this function: they only load & parse existing hive files). The fact that this hack remained caused us hidden troubles: some hives (SAM, SOFTWARE) had "two" root keys: a first one that was unused (which was created by this hackish call), and the second one which was the one used (and was created by CmpCreateLinkNode as expected). Modified: trunk/reactos/ntoskrnl/config/cmparse.c trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] Mon Jan 11 00:37:44 2016 @@ -715,7 +715,6 @@ return Status; } -/* Remove calls to CmCreateRootNode once this is used! */ NTSTATUS NTAPI CmpCreateLinkNode(IN PHHIVE Hive, Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Mon Jan 11 00:37:44 2016 @@ -370,9 +370,6 @@ /* Success, return hive */ *Hive = NewHive; - - /* HACK: ROS: Init root key cell and prepare the hive */ - if (Operation == HINIT_CREATE) CmCreateRootNode(&NewHive->Hive, L""); /* Duplicate the hive name */ NewHive->FileFullPath.Buffer = ExAllocatePoolWithTag(PagedPool,

1 0

[ekohl] 70574: [SCSIPORT] Fix indentation! No code changes!
by ekohl＠svn.reactos.org 10 Jan '16

10 Jan '16

Author: ekohl Date: Sun Jan 10 22:39:25 2016 New Revision: 70574 URL: http://svn.reactos.org/svn/reactos?rev=70574&view=rev Log: [SCSIPORT] Fix indentation! No code changes! Modified: trunk/reactos/drivers/storage/scsiport/scsiport_int.h Modified: trunk/reactos/drivers/storage/scsiport/scsiport_int.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport_int.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport_int.h [iso-8859-1] Sun Jan 10 22:39:25 2016 @@ -51,10 +51,10 @@ typedef enum _SCSI_PORT_TIMER_STATES { - IDETimerIdle, - IDETimerCmdWait, - IDETimerResetWaitForBusyNegate, - IDETimerResetWaitForDrdyAssert + IDETimerIdle, + IDETimerCmdWait, + IDETimerResetWaitForBusyNegate, + IDETimerResetWaitForDrdyAssert } SCSI_PORT_TIMER_STATES; typedef struct _CONFIGURATION_INFO @@ -80,12 +80,12 @@ typedef struct _SCSI_PORT_DEVICE_BASE { - LIST_ENTRY List; - - PVOID MappedAddress; - ULONG NumberOfBytes; - SCSI_PHYSICAL_ADDRESS IoAddress; - ULONG SystemIoBusNumber; + LIST_ENTRY List; + + PVOID MappedAddress; + ULONG NumberOfBytes; + SCSI_PHYSICAL_ADDRESS IoAddress; + ULONG SystemIoBusNumber; } SCSI_PORT_DEVICE_BASE, *PSCSI_PORT_DEVICE_BASE; typedef struct _SCSI_SG_ADDRESS @@ -116,38 +116,38 @@ typedef struct _SCSI_PORT_LUN_EXTENSION { - UCHAR PathId; - UCHAR TargetId; - UCHAR Lun; - - ULONG Flags; - - struct _SCSI_PORT_LUN_EXTENSION *Next; - - BOOLEAN DeviceClaimed; - PDEVICE_OBJECT DeviceObject; - - INQUIRYDATA InquiryData; - - KDEVICE_QUEUE DeviceQueue; - ULONG SortKey; - ULONG QueueCount; - ULONG MaxQueueCount; - - ULONG AttemptCount; - LONG RequestTimeout; - - PIRP BusyRequest; - PIRP PendingRequest; - - struct _SCSI_PORT_LUN_EXTENSION *ReadyLun; - struct _SCSI_PORT_LUN_EXTENSION *CompletedAbortRequests; - - SCSI_REQUEST_BLOCK_INFO SrbInfo; - - /* More data? */ - - UCHAR MiniportLunExtension[1]; /* must be the last entry */ + UCHAR PathId; + UCHAR TargetId; + UCHAR Lun; + + ULONG Flags; + + struct _SCSI_PORT_LUN_EXTENSION *Next; + + BOOLEAN DeviceClaimed; + PDEVICE_OBJECT DeviceObject; + + INQUIRYDATA InquiryData; + + KDEVICE_QUEUE DeviceQueue; + ULONG SortKey; + ULONG QueueCount; + ULONG MaxQueueCount; + + ULONG AttemptCount; + LONG RequestTimeout; + + PIRP BusyRequest; + PIRP PendingRequest; + + struct _SCSI_PORT_LUN_EXTENSION *ReadyLun; + struct _SCSI_PORT_LUN_EXTENSION *CompletedAbortRequests; + + SCSI_REQUEST_BLOCK_INFO SrbInfo; + + /* More data? */ + + UCHAR MiniportLunExtension[1]; /* must be the last entry */ } SCSI_PORT_LUN_EXTENSION, *PSCSI_PORT_LUN_EXTENSION; /* Structures for inquiries support */ @@ -206,94 +206,94 @@ typedef struct _SCSI_PORT_DEVICE_EXTENSION { - ULONG Length; - ULONG MiniPortExtensionSize; - PPORT_CONFIGURATION_INFORMATION PortConfig; - PBUSES_CONFIGURATION_INFORMATION BusesConfig; - PVOID NonCachedExtension; - ULONG PortNumber; - - LONG ActiveRequestCounter; - ULONG SrbFlags; - ULONG Flags; - - ULONG BusNum; - ULONG MaxTargedIds; - ULONG MaxLunCount; - - KSPIN_LOCK IrqLock; /* Used when there are 2 irqs */ - ULONG SequenceNumber; /* Global sequence number for packets */ - KSPIN_LOCK SpinLock; - PKINTERRUPT Interrupt[2]; - PIRP CurrentIrp; - ULONG IrpFlags; - - SCSI_PORT_TIMER_STATES TimerState; - LONG TimerCount; - - KTIMER MiniportTimer; - KDPC MiniportTimerDpc; - - PMAPPED_ADDRESS MappedAddressList; - - ULONG LunExtensionSize; - PSCSI_PORT_LUN_EXTENSION LunExtensionList[LUS_NUMBER]; - - SCSI_PORT_INTERRUPT_DATA InterruptData; - - /* SRB extension stuff*/ - ULONG SrbExtensionSize; - PVOID SrbExtensionBuffer; - PVOID FreeSrbExtensions; - - /* SRB information */ - PSCSI_REQUEST_BLOCK_INFO SrbInfo; - PSCSI_REQUEST_BLOCK_INFO FreeSrbInfo; - ULONG SrbDataCount; - - IO_SCSI_CAPABILITIES PortCapabilities; - - PDEVICE_OBJECT DeviceObject; - PCONTROLLER_OBJECT ControllerObject; - - PHW_INITIALIZE HwInitialize; - PHW_STARTIO HwStartIo; - PHW_INTERRUPT HwInterrupt; - PHW_RESET_BUS HwResetBus; - PHW_DMA_STARTED HwDmaStarted; - PHW_TIMER HwScsiTimer; - - PSCSI_REQUEST_BLOCK OriginalSrb; - SCSI_REQUEST_BLOCK InternalSrb; - SENSE_DATA InternalSenseData; - - /* DMA related stuff */ - PADAPTER_OBJECT AdapterObject; - ULONG MapRegisterCount; - BOOLEAN MapBuffers; - BOOLEAN MapRegisters; - PVOID MapRegisterBase; - - /* Features */ - BOOLEAN CachesData; - BOOLEAN SupportsTaggedQueuing; - BOOLEAN SupportsAutoSense; - BOOLEAN MultipleReqsPerLun; - BOOLEAN ReceiveEvent; - - PHYSICAL_ADDRESS PhysicalAddress; - ULONG CommonBufferLength; - ULONG InterruptLevel[2]; - ULONG IoAddress; - - BOOLEAN NeedSrbExtensionAlloc; - BOOLEAN NeedSrbDataAlloc; - - ULONG RequestsNumber; - - ULONG InterruptCount; - - UCHAR MiniPortDeviceExtension[1]; /* must be the last entry */ + ULONG Length; + ULONG MiniPortExtensionSize; + PPORT_CONFIGURATION_INFORMATION PortConfig; + PBUSES_CONFIGURATION_INFORMATION BusesConfig; + PVOID NonCachedExtension; + ULONG PortNumber; + + LONG ActiveRequestCounter; + ULONG SrbFlags; + ULONG Flags; + + ULONG BusNum; + ULONG MaxTargedIds; + ULONG MaxLunCount; + + KSPIN_LOCK IrqLock; /* Used when there are 2 irqs */ + ULONG SequenceNumber; /* Global sequence number for packets */ + KSPIN_LOCK SpinLock; + PKINTERRUPT Interrupt[2]; + PIRP CurrentIrp; + ULONG IrpFlags; + + SCSI_PORT_TIMER_STATES TimerState; + LONG TimerCount; + + KTIMER MiniportTimer; + KDPC MiniportTimerDpc; + + PMAPPED_ADDRESS MappedAddressList; + + ULONG LunExtensionSize; + PSCSI_PORT_LUN_EXTENSION LunExtensionList[LUS_NUMBER]; + + SCSI_PORT_INTERRUPT_DATA InterruptData; + + /* SRB extension stuff*/ + ULONG SrbExtensionSize; + PVOID SrbExtensionBuffer; + PVOID FreeSrbExtensions; + + /* SRB information */ + PSCSI_REQUEST_BLOCK_INFO SrbInfo; + PSCSI_REQUEST_BLOCK_INFO FreeSrbInfo; + ULONG SrbDataCount; + + IO_SCSI_CAPABILITIES PortCapabilities; + + PDEVICE_OBJECT DeviceObject; + PCONTROLLER_OBJECT ControllerObject; + + PHW_INITIALIZE HwInitialize; + PHW_STARTIO HwStartIo; + PHW_INTERRUPT HwInterrupt; + PHW_RESET_BUS HwResetBus; + PHW_DMA_STARTED HwDmaStarted; + PHW_TIMER HwScsiTimer; + + PSCSI_REQUEST_BLOCK OriginalSrb; + SCSI_REQUEST_BLOCK InternalSrb; + SENSE_DATA InternalSenseData; + + /* DMA related stuff */ + PADAPTER_OBJECT AdapterObject; + ULONG MapRegisterCount; + BOOLEAN MapBuffers; + BOOLEAN MapRegisters; + PVOID MapRegisterBase; + + /* Features */ + BOOLEAN CachesData; + BOOLEAN SupportsTaggedQueuing; + BOOLEAN SupportsAutoSense; + BOOLEAN MultipleReqsPerLun; + BOOLEAN ReceiveEvent; + + PHYSICAL_ADDRESS PhysicalAddress; + ULONG CommonBufferLength; + ULONG InterruptLevel[2]; + ULONG IoAddress; + + BOOLEAN NeedSrbExtensionAlloc; + BOOLEAN NeedSrbDataAlloc; + + ULONG RequestsNumber; + + ULONG InterruptCount; + + UCHAR MiniPortDeviceExtension[1]; /* must be the last entry */ } SCSI_PORT_DEVICE_EXTENSION, *PSCSI_PORT_DEVICE_EXTENSION; typedef struct _RESETBUS_PARAMS

1 0

[hbelusca] 70573: [NTOS:CONFIG] - Remove useless casts. - Fix a REG_OPTION_* hack.
by hbelusca＠svn.reactos.org 10 Jan '16

10 Jan '16

Author: hbelusca Date: Sun Jan 10 22:35:09 2016 New Revision: 70573 URL: http://svn.reactos.org/svn/reactos?rev=70573&view=rev Log: [NTOS:CONFIG] - Remove useless casts. - Fix a REG_OPTION_* hack. Modified: trunk/reactos/ntoskrnl/config/cmparse.c trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] Sun Jan 10 22:35:09 2016 @@ -225,7 +225,7 @@ /* Get the storage type */ StorageType = Stable; - if (Flags & REG_OPTION_VOLATILE) StorageType = Volatile; + if (ParseContext->CreateOptions & REG_OPTION_VOLATILE) StorageType = Volatile; /* Allocate the child */ *KeyCell = HvAllocateCell(Hive, @@ -311,7 +311,7 @@ /* Fill out the key node */ KeyNode->Signature = CM_KEY_NODE_SIGNATURE; - KeyNode->Flags = Flags &~ REG_OPTION_CREATE_LINK; + KeyNode->Flags = Flags; KeQuerySystemTime(&SystemTime); KeyNode->LastWriteTime = SystemTime; KeyNode->Spare = 0; @@ -474,7 +474,7 @@ AccessMode, ParseContext, ParentKcb, - ParseContext->CreateOptions, // WRONG! + 0, &KeyCell, Object); if (NT_SUCCESS(Status)) Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Sun Jan 10 22:35:09 2016 @@ -350,7 +350,7 @@ } /* Initialize the hive */ - Status = CmpInitializeHive((PCMHIVE*)&NewHive, + Status = CmpInitializeHive(&NewHive, Operation, HiveFlags, FileType, @@ -904,7 +904,7 @@ if (HiveBase) { /* Import it */ - Status = CmpInitializeHive((PCMHIVE*)&SystemHive, + Status = CmpInitializeHive(&SystemHive, HINIT_MEMORY, HIVE_NOLAZYFLUSH, HFILE_TYPE_LOG, @@ -975,7 +975,7 @@ RtlInitUnicodeString(&KeyName, L"\\Registry\\Machine\\SYSTEM"); Status = CmpLinkHiveToMaster(&KeyName, NULL, - (PCMHIVE)SystemHive, + SystemHive, Allocate, SecurityDescriptor); @@ -984,7 +984,7 @@ if (!NT_SUCCESS(Status)) return FALSE; /* Add the hive to the hive list */ - CmpMachineHiveList[3].CmHive = (PCMHIVE)SystemHive; + CmpMachineHiveList[3].CmHive = SystemHive; /* Success! */ return TRUE; @@ -1711,7 +1711,7 @@ } /* Create the hardware hive */ - Status = CmpInitializeHive((PCMHIVE*)&HardwareHive, + Status = CmpInitializeHive(&HardwareHive, HINIT_CREATE, HIVE_VOLATILE, HFILE_TYPE_PRIMARY, @@ -1728,13 +1728,13 @@ } /* Add the hive to the hive list */ - CmpMachineHiveList[0].CmHive = (PCMHIVE)HardwareHive; + CmpMachineHiveList[0].CmHive = HardwareHive; /* Attach it to the machine key */ RtlInitUnicodeString(&KeyName, L"\\Registry\\Machine\\HARDWARE"); Status = CmpLinkHiveToMaster(&KeyName, NULL, - (PCMHIVE)HardwareHive, + HardwareHive, TRUE, SecurityDescriptor); if (!NT_SUCCESS(Status))

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs