Ros-diffs May 2007

ros-diffs@reactos.org

17 participants
322 discussions

[ion] 26716: - Rename CmiInitNonVolatileRegistryHive to CmiInitHiveFromFile. - Remove CmiCreateNewRegFile and the way new hives were created, saved, then re-reloded. Instead initialize a new hive only once. - Add support for calling either HINIT_FILE or HINIT_CREATE with a hive, and support log file hives now. - Make hacks/oldcm differences smoother, and copy routine to cmsysini.c, since it's now compatible with the rewrite. This is probably the last function that was easily convertible/modifiab

by ion＠svn.reactos.org

Author: ion Date: Sat May 12 12:27:28 2007 New Revision: 26716 URL: http://svn.reactos.org/svn/reactos?rev=26716&view=rev Log: - Rename CmiInitNonVolatileRegistryHive to CmiInitHiveFromFile. - Remove CmiCreateNewRegFile and the way new hives were created, saved, then re-reloded. Instead initialize a new hive only once. - Add support for calling either HINIT_FILE or HINIT_CREATE with a hive, and support log file hives now. - Make hacks/oldcm differences smoother, and copy routine to cmsysini.c, since it's now compatible with the rewrite. This is probably the last function that was easily convertible/modifiable. Modified: trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/regfile.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cminit.c trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=26716… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Sat May 12 12:27:28 2007 @@ -445,6 +445,14 @@ IN BOOLEAN NoBuffering, OUT PULONG ClusterSize OPTIONAL); +NTSTATUS +NTAPI +CmpInitHiveFromFile(IN PUNICODE_STRING HiveName, + IN ULONG HiveFlags, + OUT PEREGISTRY_HIVE *Hive, + IN OUT PBOOLEAN New, + IN ULONG CheckFlags); + #if 0 static __inline PVOID xHvGetCell(char *file, int line, PHHIVE Hive, HCELL_INDEX Cell) { Modified: trunk/reactos/ntoskrnl/cm/regfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regfile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regfile.c (original) +++ trunk/reactos/ntoskrnl/cm/regfile.c Sat May 12 12:27:28 2007 @@ -24,153 +24,44 @@ /* FUNCTIONS ****************************************************************/ NTSTATUS -NTAPI -CmpInitializeHive(OUT PEREGISTRY_HIVE *RegistryHive, - IN ULONG OperationType, - IN ULONG HiveFlags, - IN ULONG FileType, - IN PVOID HiveData OPTIONAL, - IN HANDLE Primary, - IN HANDLE Log, - IN HANDLE External, - IN PUNICODE_STRING FileName OPTIONAL, - IN ULONG CheckFlags); - -static NTSTATUS -CmiCreateNewRegFile(HANDLE FileHandle) -{ - PEREGISTRY_HIVE CmHive; - PHHIVE Hive; - NTSTATUS Status; - - CmHive = CmpAllocate(sizeof(EREGISTRY_HIVE), TRUE); - CmHive->HiveHandle = FileHandle; - Status = HvInitialize(&CmHive->Hive, HV_OPERATION_CREATE_HIVE, 0, 0, 0, 0, - CmpAllocate, CmpFree, - CmpFileRead, CmpFileWrite, CmpFileSetSize, - CmpFileFlush, NULL); - if (!NT_SUCCESS(Status)) - { - return FALSE; - } - - /* Init root key cell */ - Hive = &CmHive->Hive; - if (!CmCreateRootNode(Hive, L"")) - { - HvFree (Hive); - return FALSE; - } - - Status = HvWriteHive(Hive) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; - - HvFree (Hive); - - return(Status); -} - -static NTSTATUS -CmiInitNonVolatileRegistryHive (IN ULONG HiveFlags, - IN PUNICODE_STRING HiveName, - OUT PEREGISTRY_HIVE *Hive) -{ - ULONG CreateDisposition, LogDisposition; - HANDLE FileHandle, LogHandle; +CmiLoadHive(IN POBJECT_ATTRIBUTES KeyObjectAttributes, + IN PUNICODE_STRING FileName, + IN ULONG Flags) +{ + PEREGISTRY_HIVE Hive; NTSTATUS Status; - //ULONG Operation; - PEREGISTRY_HIVE NewHive; - - *Hive = NULL; - - Status = CmpOpenHiveFiles(HiveName, - NULL, //L".LOG", - &FileHandle, - &LogHandle, - &CreateDisposition, - &LogDisposition, - TRUE, - FALSE, - TRUE, - NULL); - if (CreateDisposition == FILE_CREATED) - { - Status = CmiCreateNewRegFile(FileHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT("CmiCreateNewRegFile() failed (Status %lx)\n", Status); - ZwClose(FileHandle); - return(Status); - } - } - - Status = CmpInitializeHive(&NewHive, - HINIT_FILE, - HiveFlags, - HFILE_TYPE_PRIMARY, - NULL, - FileHandle, - NULL, - NULL, - HiveName, - 0); + BOOLEAN Allocate = TRUE; + + DPRINT ("CmiLoadHive(Filename %wZ)\n", FileName); + + if (Flags & ~REG_NO_LAZY_FLUSH) return STATUS_INVALID_PARAMETER; + + Status = CmpInitHiveFromFile(FileName, + (Flags & REG_NO_LAZY_FLUSH) ? HIVE_NO_SYNCH : 0, + &Hive, + &Allocate, + 0); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open hive\n"); - ZwClose(FileHandle); + DPRINT1("CmpInitHiveFromFile() failed (Status %lx)\n", Status); + ExFreePool(Hive); return Status; } - CmPrepareHive(&NewHive->Hive); - NewHive->Flags = HiveFlags; - - RtlCreateUnicodeString(&NewHive->HiveFileName, HiveName->Buffer); - - /* Close the hive file */ - ZwClose(FileHandle); - - *Hive = NewHive; + Status = CmiConnectHive(KeyObjectAttributes, Hive); + if (!NT_SUCCESS(Status)) + { + DPRINT1 ("CmiConnectHive() failed (Status %lx)\n", Status); + // CmiRemoveRegistryHive (Hive); + } + + DPRINT ("CmiLoadHive() done\n"); return Status; } -NTSTATUS -CmiLoadHive(IN POBJECT_ATTRIBUTES KeyObjectAttributes, - IN PUNICODE_STRING FileName, - IN ULONG Flags) -{ - PEREGISTRY_HIVE Hive; - NTSTATUS Status; - - DPRINT ("CmiLoadHive(Filename %wZ)\n", FileName); - - if (Flags & ~REG_NO_LAZY_FLUSH) - return STATUS_INVALID_PARAMETER; - - Status = CmiInitNonVolatileRegistryHive ((Flags & REG_NO_LAZY_FLUSH) ? HIVE_NO_SYNCH : 0, - FileName, - &Hive); - if (!NT_SUCCESS (Status)) - { - DPRINT1 ("CmiInitNonVolatileRegistryHive() failed (Status %lx)\n", Status); - ExFreePool (Hive); - return Status; - } - - Status = CmiConnectHive (KeyObjectAttributes, - Hive); - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("CmiConnectHive() failed (Status %lx)\n", Status); -// CmiRemoveRegistryHive (Hive); - } - - DPRINT ("CmiLoadHive() done\n"); - - return Status; -} - - -NTSTATUS -CmiRemoveRegistryHive(PEREGISTRY_HIVE RegistryHive) + +NTSTATUS +CmiRemoveRegistaryHive(PEREGISTRY_HIVE RegistryHive) { /* Remove hive from hive list */ RemoveEntryList (&RegistryHive->HiveList); Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Sat May 12 12:27:28 2007 @@ -846,6 +846,21 @@ IN PSECURITY_DESCRIPTOR SecurityDescriptor ); +NTSTATUS +NTAPI +CmpOpenHiveFiles( + IN PUNICODE_STRING BaseName, + IN PWCHAR Extension OPTIONAL, + IN PHANDLE Primary, + IN PHANDLE Log, + IN PULONG PrimaryDisposition, + IN PULONG LogDisposition, + IN BOOLEAN CreateAllowed, + IN BOOLEAN MarkAsSystemHive, + IN BOOLEAN NoBuffering, + OUT PULONG ClusterSize OPTIONAL +); + // // Registry Utility Functions // Modified: trunk/reactos/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cminit.c (original) +++ trunk/reactos/ntoskrnl/config/cminit.c Sat May 12 12:27:28 2007 @@ -169,6 +169,7 @@ /* Set flags */ Hive->Flags = HiveFlags; Hive->HiveHandle = Primary; + Hive->LogHandle = Log; /* Check how large the file is */ ZwQueryInformationFile(Primary, Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Sat May 12 12:27:28 2007 @@ -16,8 +16,127 @@ KGUARDED_MUTEX CmpSelfHealQueueLock; LIST_ENTRY CmpSelfHealQueueListHead; PEPROCESS CmpSystemProcess; +BOOLEAN HvShutdownComplete; /* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +CmpInitHiveFromFile(IN PUNICODE_STRING HiveName, + IN ULONG HiveFlags, + OUT PCMHIVE *Hive, + IN OUT PBOOLEAN New, + IN ULONG CheckFlags) +{ + ULONG HiveDisposition, LogDisposition; + HANDLE FileHandle = NULL, LogHandle = NULL; + NTSTATUS Status; + ULONG Operation, FileType; + PEREGISTRY_HIVE NewHive; + PAGED_CODE(); + + /* Assume failure */ + *Hive = NULL; + + /* Open or create the hive files */ + Status = CmpOpenHiveFiles(HiveName, + L".LOG", + &FileHandle, + &LogHandle, + &HiveDisposition, + &LogDisposition, + *New, + FALSE, + TRUE, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Check if we have a log handle */ + FileType = (LogHandle) ? HFILE_TYPE_LOG : HFILE_TYPE_PRIMARY; + + /* Check if we created or opened the hive */ + if (HiveDisposition == FILE_CREATED) + { + /* Do a create operation */ + Operation = HINIT_CREATE; + *New = TRUE; + } + else + { + /* Open it as a file */ + Operation = HINIT_FILE; + *New = FALSE; + } + + /* Check if we're sharing hives */ + if (CmpShareSystemHives) + { + /* Then force using the primary hive */ + FileType = HFILE_TYPE_PRIMARY; + if (LogHandle) + { + /* Get rid of the log handle */ + ZwClose(LogHandle); + LogHandle = NULL; + } + } + + /* Check if we're too late */ + if (HvShutdownComplete) + { + /* Fail */ + ZwClose(FileHandle); + if (LogHandle) ZwClose(LogHandle); + return STATUS_TOO_LATE; + } + + /* Initialize the hive */ + Status = CmpInitializeHive((PCMHIVE*)&NewHive, + Operation, + HiveFlags, + FileType, + NULL, + FileHandle, + LogHandle, + NULL, + HiveName, + 0); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + ZwClose(FileHandle); + if (LogHandle) ZwClose(LogHandle); + return Status; + } + + /* Success, return hive */ + *Hive = (PCMHIVE)NewHive; + + /* ROS: Init root key cell and prepare the hive */ + if (Operation == HINIT_CREATE) CmCreateRootNode(&NewHive->Hive, L""); + CmPrepareHive(&NewHive->Hive); + + /* Duplicate the hive name */ + NewHive->HiveFileName.Buffer = ExAllocatePoolWithTag(PagedPool, + HiveName->Length, + TAG_CM); + if (NewHive->HiveFileName.Buffer) + { + /* Copy the string */ + RtlCopyMemory(NewHive->HiveFileName.Buffer, + HiveName->Buffer, + HiveName->Length); + NewHive->HiveFileName.Length = HiveName->Length; + NewHive->HiveFileName.MaximumLength = HiveName->MaximumLength; + } + + /* ROS: Close the hive files */ + ZwClose(FileHandle); + if (LogHandle) ZwClose(LogHandle); + + /* Return success */ + return STATUS_SUCCESS; +} NTSTATUS NTAPI

17 years, 7 months

[greatlrd] 26715: did see a small mistake use sizeof(TCHAR) for adding NULL termeting of string for u do not known if we switch compile regedit as unicode-16 or ANSI.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat May 12 12:27:00 2007 New Revision: 26715 URL: http://svn.reactos.org/svn/reactos?rev=26715&view=rev Log: did see a small mistake use sizeof(TCHAR) for adding NULL termeting of string for u do not known if we switch compile regedit as unicode-16 or ANSI. Modified: trunk/reactos/base/applications/regedit/security.c Modified: trunk/reactos/base/applications/regedit/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/security.c (original) +++ trunk/reactos/base/applications/regedit/security.c Sat May 12 12:27:00 2007 @@ -763,7 +763,7 @@ obj = (PCRegKeySecurity)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET(CRegKeySecurity, - szRegKey[_tcslen(lpRegKey)+1])); + szRegKey[_tcslen(lpRegKey) + sizeof(TCHAR)])); if (obj != NULL) { obj->ref = 1;

17 years, 7 months

[ion] 26714: - Change CmiInitNonVolatileRegistry hive to use CmpOpenHiveFiles and CmpInitializeHive. Required a lot of hacking to get to work right, but at least it does, and uses our new code paths. - Update CmpInitializeHive with the HINIT_FILE hack required for current cmlib functionality.

by ion＠svn.reactos.org

Author: ion Date: Sat May 12 10:47:39 2007 New Revision: 26714 URL: http://svn.reactos.org/svn/reactos?rev=26714&view=rev Log: - Change CmiInitNonVolatileRegistry hive to use CmpOpenHiveFiles and CmpInitializeHive. Required a lot of hacking to get to work right, but at least it does, and uses our new code paths. - Update CmpInitializeHive with the HINIT_FILE hack required for current cmlib functionality. Modified: trunk/reactos/ntoskrnl/cm/regfile.c trunk/reactos/ntoskrnl/config/cminit.c Modified: trunk/reactos/ntoskrnl/cm/regfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regfile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regfile.c (original) +++ trunk/reactos/ntoskrnl/cm/regfile.c Sat May 12 10:47:39 2007 @@ -23,6 +23,19 @@ /* FUNCTIONS ****************************************************************/ +NTSTATUS +NTAPI +CmpInitializeHive(OUT PEREGISTRY_HIVE *RegistryHive, + IN ULONG OperationType, + IN ULONG HiveFlags, + IN ULONG FileType, + IN PVOID HiveData OPTIONAL, + IN HANDLE Primary, + IN HANDLE Log, + IN HANDLE External, + IN PUNICODE_STRING FileName OPTIONAL, + IN ULONG CheckFlags); + static NTSTATUS CmiCreateNewRegFile(HANDLE FileHandle) { @@ -57,95 +70,66 @@ } static NTSTATUS -CmiInitNonVolatileRegistryHive (PEREGISTRY_HIVE RegistryHive, - PWSTR Filename) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - ULONG CreateDisposition; - IO_STATUS_BLOCK IoSB; - HANDLE FileHandle; - NTSTATUS Status; - FILE_STANDARD_INFORMATION FileInformation; - - DPRINT("CmiInitNonVolatileRegistryHive(%p, %S) called\n", - RegistryHive, Filename); - - /* Duplicate Filename */ - Status = RtlCreateUnicodeString(&RegistryHive->HiveFileName, - Filename); - if (!NT_SUCCESS(Status)) - { - DPRINT("RtlCreateUnicodeString() failed (Status %lx)\n", Status); - return(Status); - } - - InitializeObjectAttributes(&ObjectAttributes, - &RegistryHive->HiveFileName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - CreateDisposition = FILE_OPEN_IF; - Status = ZwCreateFile(&FileHandle, - FILE_ALL_ACCESS, - &ObjectAttributes, - &IoSB, - NULL, - FILE_ATTRIBUTE_NORMAL, - 0, - CreateDisposition, - FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, - NULL, - 0); - if (!NT_SUCCESS(Status)) - { - RtlFreeUnicodeString(&RegistryHive->HiveFileName); - DPRINT("ZwCreateFile() failed (Status %lx)\n", Status); - return(Status); - } - - if (IoSB.Information != FILE_OPENED) - { - Status = CmiCreateNewRegFile(FileHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT("CmiCreateNewRegFile() failed (Status %lx)\n", Status); - ZwClose(FileHandle); - RtlFreeUnicodeString(&RegistryHive->HiveFileName); - return(Status); - } - } - - RegistryHive->HiveHandle = FileHandle; - - /* Check how large the file is */ - ZwQueryInformationFile(FileHandle, - &IoSB, - &FileInformation, - sizeof(FileInformation), - FileStandardInformation); - Status = HvInitialize(&RegistryHive->Hive, HINIT_FILE, 0, 0, - 0, FileInformation.EndOfFile.LowPart, - CmpAllocate, CmpFree, - CmpFileRead, CmpFileWrite, CmpFileSetSize, - CmpFileFlush, NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to open hive\n"); - RtlFreeUnicodeString(&RegistryHive->HiveFileName); - ZwClose(FileHandle); - return Status; - } - - CmPrepareHive(&RegistryHive->Hive); - - /* Close the hive file */ - ZwClose(FileHandle); - - DPRINT("CmiInitNonVolatileRegistryHive(%p, %S) - Finished.\n", - RegistryHive, Filename); - - return STATUS_SUCCESS; +CmiInitNonVolatileRegistryHive (IN ULONG HiveFlags, + IN PUNICODE_STRING HiveName, + OUT PEREGISTRY_HIVE *Hive) +{ + ULONG CreateDisposition, LogDisposition; + HANDLE FileHandle, LogHandle; + NTSTATUS Status; + //ULONG Operation; + PEREGISTRY_HIVE NewHive; + + *Hive = NULL; + + Status = CmpOpenHiveFiles(HiveName, + NULL, //L".LOG", + &FileHandle, + &LogHandle, + &CreateDisposition, + &LogDisposition, + TRUE, + FALSE, + TRUE, + NULL); + if (CreateDisposition == FILE_CREATED) + { + Status = CmiCreateNewRegFile(FileHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT("CmiCreateNewRegFile() failed (Status %lx)\n", Status); + ZwClose(FileHandle); + return(Status); + } + } + + Status = CmpInitializeHive(&NewHive, + HINIT_FILE, + HiveFlags, + HFILE_TYPE_PRIMARY, + NULL, + FileHandle, + NULL, + NULL, + HiveName, + 0); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open hive\n"); + ZwClose(FileHandle); + return Status; + } + + CmPrepareHive(&NewHive->Hive); + NewHive->Flags = HiveFlags; + + RtlCreateUnicodeString(&NewHive->HiveFileName, HiveName->Buffer); + + /* Close the hive file */ + ZwClose(FileHandle); + + *Hive = NewHive; + return Status; } NTSTATUS @@ -161,33 +145,15 @@ if (Flags & ~REG_NO_LAZY_FLUSH) return STATUS_INVALID_PARAMETER; - Hive = ExAllocatePool (NonPagedPool, - sizeof(EREGISTRY_HIVE)); - if (Hive == NULL) - { - DPRINT1 ("Failed to allocate hive header.\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - RtlZeroMemory (Hive, - sizeof(EREGISTRY_HIVE)); - - DPRINT ("Hive 0x%p\n", Hive); - Hive->Flags = (Flags & REG_NO_LAZY_FLUSH) ? HIVE_NO_SYNCH : 0; - - Status = CmiInitNonVolatileRegistryHive (Hive, - FileName->Buffer); + Status = CmiInitNonVolatileRegistryHive ((Flags & REG_NO_LAZY_FLUSH) ? HIVE_NO_SYNCH : 0, + FileName, + &Hive); if (!NT_SUCCESS (Status)) { DPRINT1 ("CmiInitNonVolatileRegistryHive() failed (Status %lx)\n", Status); ExFreePool (Hive); return Status; } - - /* Add the new hive to the hive list */ - InsertTailList (&CmpHiveListHead, - &Hive->HiveList); - - VERIFY_REGISTRY_HIVE(Hive); Status = CmiConnectHive (KeyObjectAttributes, Hive); Modified: trunk/reactos/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cminit.c (original) +++ trunk/reactos/ntoskrnl/config/cminit.c Sat May 12 10:47:39 2007 @@ -32,6 +32,7 @@ PCMHIVE Hive; #else PEREGISTRY_HIVE Hive; + FILE_STANDARD_INFORMATION FileInformation; #endif IO_STATUS_BLOCK IoStatusBlock; FILE_FS_SIZE_INFORMATION FileSizeInformation; @@ -167,6 +168,15 @@ /* Set flags */ Hive->Flags = HiveFlags; + Hive->HiveHandle = Primary; + + /* Check how large the file is */ + ZwQueryInformationFile(Primary, + &IoStatusBlock, + &FileInformation, + sizeof(FileInformation), + FileStandardInformation); + Cluster = FileInformation.EndOfFile.LowPart; #endif /* Initialize it */

17 years, 7 months

[jimtabor] 26713: Moving FLOATOBJ code in preparations of implementation of basic float storage emulation and float code processing.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat May 12 08:48:40 2007 New Revision: 26713 URL: http://svn.reactos.org/svn/reactos?rev=26713&view=rev Log: Moving FLOATOBJ code in preparations of implementation of basic float storage emulation and float code processing. Modified: trunk/reactos/subsystems/win32/win32k/eng/float.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Modified: trunk/reactos/subsystems/win32/win32k/eng/float.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/float.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/float.c Sat May 12 08:48:40 2007 @@ -74,4 +74,254 @@ return TRUE; } - +VOID +STDCALL +FLOATOBJ_Add ( + IN OUT PFLOATOBJ pf, + IN PFLOATOBJ pf1 + ) +{ + // www.osr.com/ddk/graphics/gdifncs_2i3r.htm + UNIMPLEMENTED; +} + +VOID +STDCALL +FLOATOBJ_AddFloat( + IN OUT PFLOATOBJ pf, + IN FLOATL f + ) +{ + // www.osr.com/ddk/graphics/gdifncs_0ip3.htm + UNIMPLEMENTED; +} + +VOID +STDCALL +FLOATOBJ_AddLong( + IN OUT PFLOATOBJ pf, + IN LONG l + ) +{ + // www.osr.com/ddk/graphics/gdifncs_12jr.htm + UNIMPLEMENTED; +} + +VOID +STDCALL +FLOATOBJ_Div( + IN OUT PFLOATOBJ pf, + IN PFLOATOBJ pf1 + ) +{ + // www.osr.com/ddk/graphics/gdifncs_3ndz.htm + UNIMPLEMENTED; +} + +VOID +STDCALL +FLOATOBJ_DivFloat( + IN OUT PFLOATOBJ pf, + IN FLOATL f + ) +{ + // www.osr.com/ddk/graphics/gdifncs_0gfb.htm + UNIMPLEMENTED; +} + +VOID +STDCALL +FLOATOBJ_DivLong( + IN OUT PFLOATOBJ pf, + IN LONG l + ) +{ + // www.osr.com/ddk/graphics/gdifncs_6jdz.htm + UNIMPLEMENTED; +} + +BOOL +STDCALL +FLOATOBJ_Equal( + IN PFLOATOBJ pf, + IN PFLOATOBJ pf1 + ) +{ + // www.osr.com/ddk/graphics/gdifncs_6ysn.htm + UNIMPLEMENTED; + return FALSE; +} + +BOOL +STDCALL +FLOATOBJ_EqualLong( + IN PFLOATOBJ pf, + IN LONG l + ) +{ + // www.osr.com/ddk/graphics/gdifncs_1pgn.htm + UNIMPLEMENTED; + return FALSE; +} + +LONG +STDCALL +FLOATOBJ_GetFloat ( IN PFLOATOBJ pf ) +{ + // www.osr.com/ddk/graphics/gdifncs_4d5z.htm + UNIMPLEMENTED; + return 0; +} + +LONG +STDCALL +FLOATOBJ_GetLong ( IN PFLOATOBJ pf ) +{ + // www.osr.com/ddk/graphics/gdifncs_0tgn.htm + UNIMPLEMENTED; + return 0; +} + +BOOL +STDCALL +FLOATOBJ_GreaterThan( + IN PFLOATOBJ pf, + IN PFLOATOBJ pf1 + ) +{ + // www.osr.com/ddk/graphics/gdifncs_8n53.htm + UNIMPLEMENTED; + return FALSE; +} + +BOOL +STDCALL +FLOATOBJ_GreaterThanLong( + IN PFLOATOBJ pf, + IN LONG l + ) +{ + // www.osr.com/ddk/graphics/gdifncs_6gx3.htm + UNIMPLEMENTED; + return FALSE; +} + +BOOL +STDCALL +FLOATOBJ_LessThan( + IN PFLOATOBJ pf, + IN PFLOATOBJ pf1 + ) +{ + // www.osr.com/ddk/graphics/gdifncs_1ynb.htm + UNIMPLEMENTED; + return FALSE; +} + +BOOL +STDCALL +FLOATOBJ_LessThanLong( + IN PFLOATOBJ pf, + IN LONG l + ) +{ + // www.osr.com/ddk/graphics/gdifncs_9nzb.htm + UNIMPLEMENTED; + return FALSE; +} + +VOID +STDCALL +FLOATOBJ_Mul( + IN OUT PFLOATOBJ pf, + IN PFLOATOBJ pf1 + ) +{ + // www.osr.com/ddk/graphics/gdifncs_8ppj.htm + UNIMPLEMENTED; +} + +VOID +STDCALL +FLOATOBJ_MulFloat( + IN OUT PFLOATOBJ pf, + IN FLOATL f + ) +{ + // www.osr.com/ddk/graphics/gdifncs_3puv.htm + UNIMPLEMENTED; +} + +VOID +STDCALL +FLOATOBJ_MulLong( + IN OUT PFLOATOBJ pf, + IN LONG l + ) +{ + // www.osr.com/ddk/graphics/gdifncs_56lj.htm + UNIMPLEMENTED; +} + +VOID +STDCALL +FLOATOBJ_Neg ( IN OUT PFLOATOBJ pf ) +{ + // www.osr.com/ddk/graphics/gdifncs_14pz.htm + UNIMPLEMENTED; +} + +VOID +STDCALL +FLOATOBJ_SetFloat( + OUT PFLOATOBJ pf, + IN FLOATL f + ) +{ + // www.osr.com/ddk/graphics/gdifncs_1prb.htm + UNIMPLEMENTED; +} + +VOID +STDCALL +FLOATOBJ_SetLong( + OUT PFLOATOBJ pf, + IN LONG l + ) +{ + // www.osr.com/ddk/graphics/gdifncs_0gpz.htm + UNIMPLEMENTED; +} + +VOID +STDCALL +FLOATOBJ_Sub( + IN OUT PFLOATOBJ pf, + IN PFLOATOBJ pf1 + ) +{ + // www.osr.com/ddk/graphics/gdifncs_6lyf.htm + UNIMPLEMENTED; +} + +VOID +STDCALL +FLOATOBJ_SubFloat( + IN OUT PFLOATOBJ pf, + IN FLOATL f + ) +{ + // www.osr.com/ddk/graphics/gdifncs_2zvr.htm + UNIMPLEMENTED; +} + +VOID +STDCALL +FLOATOBJ_SubLong( + IN OUT PFLOATOBJ pf, + IN LONG l + ) +{ + // www.osr.com/ddk/graphics/gdifncs_852f.htm + UNIMPLEMENTED; +} Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Sat May 12 08:48:40 2007 @@ -519,258 +519,6 @@ // www.osr.com/ddk/graphics/gdifncs_9v6v.htm UNIMPLEMENTED; return FALSE; -} - -VOID -STDCALL -FLOATOBJ_Add ( - IN OUT PFLOATOBJ pf, - IN PFLOATOBJ pf1 - ) -{ - // www.osr.com/ddk/graphics/gdifncs_2i3r.htm - UNIMPLEMENTED; -} - -VOID -STDCALL -FLOATOBJ_AddFloat( - IN OUT PFLOATOBJ pf, - IN FLOATL f - ) -{ - // www.osr.com/ddk/graphics/gdifncs_0ip3.htm - UNIMPLEMENTED; -} - -VOID -STDCALL -FLOATOBJ_AddLong( - IN OUT PFLOATOBJ pf, - IN LONG l - ) -{ - // www.osr.com/ddk/graphics/gdifncs_12jr.htm - UNIMPLEMENTED; -} - -VOID -STDCALL -FLOATOBJ_Div( - IN OUT PFLOATOBJ pf, - IN PFLOATOBJ pf1 - ) -{ - // www.osr.com/ddk/graphics/gdifncs_3ndz.htm - UNIMPLEMENTED; -} - -VOID -STDCALL -FLOATOBJ_DivFloat( - IN OUT PFLOATOBJ pf, - IN FLOATL f - ) -{ - // www.osr.com/ddk/graphics/gdifncs_0gfb.htm - UNIMPLEMENTED; -} - -VOID -STDCALL -FLOATOBJ_DivLong( - IN OUT PFLOATOBJ pf, - IN LONG l - ) -{ - // www.osr.com/ddk/graphics/gdifncs_6jdz.htm - UNIMPLEMENTED; -} - -BOOL -STDCALL -FLOATOBJ_Equal( - IN PFLOATOBJ pf, - IN PFLOATOBJ pf1 - ) -{ - // www.osr.com/ddk/graphics/gdifncs_6ysn.htm - UNIMPLEMENTED; - return FALSE; -} - -BOOL -STDCALL -FLOATOBJ_EqualLong( - IN PFLOATOBJ pf, - IN LONG l - ) -{ - // www.osr.com/ddk/graphics/gdifncs_1pgn.htm - UNIMPLEMENTED; - return FALSE; -} - -LONG -STDCALL -FLOATOBJ_GetFloat ( IN PFLOATOBJ pf ) -{ - // www.osr.com/ddk/graphics/gdifncs_4d5z.htm - UNIMPLEMENTED; - return 0; -} - -LONG -STDCALL -FLOATOBJ_GetLong ( IN PFLOATOBJ pf ) -{ - // www.osr.com/ddk/graphics/gdifncs_0tgn.htm - UNIMPLEMENTED; - return 0; -} - -BOOL -STDCALL -FLOATOBJ_GreaterThan( - IN PFLOATOBJ pf, - IN PFLOATOBJ pf1 - ) -{ - // www.osr.com/ddk/graphics/gdifncs_8n53.htm - UNIMPLEMENTED; - return FALSE; -} - -BOOL -STDCALL -FLOATOBJ_GreaterThanLong( - IN PFLOATOBJ pf, - IN LONG l - ) -{ - // www.osr.com/ddk/graphics/gdifncs_6gx3.htm - UNIMPLEMENTED; - return FALSE; -} - -BOOL -STDCALL -FLOATOBJ_LessThan( - IN PFLOATOBJ pf, - IN PFLOATOBJ pf1 - ) -{ - // www.osr.com/ddk/graphics/gdifncs_1ynb.htm - UNIMPLEMENTED; - return FALSE; -} - -BOOL -STDCALL -FLOATOBJ_LessThanLong( - IN PFLOATOBJ pf, - IN LONG l - ) -{ - // www.osr.com/ddk/graphics/gdifncs_9nzb.htm - UNIMPLEMENTED; - return FALSE; -} - -VOID -STDCALL -FLOATOBJ_Mul( - IN OUT PFLOATOBJ pf, - IN PFLOATOBJ pf1 - ) -{ - // www.osr.com/ddk/graphics/gdifncs_8ppj.htm - UNIMPLEMENTED; -} - -VOID -STDCALL -FLOATOBJ_MulFloat( - IN OUT PFLOATOBJ pf, - IN FLOATL f - ) -{ - // www.osr.com/ddk/graphics/gdifncs_3puv.htm - UNIMPLEMENTED; -} - -VOID -STDCALL -FLOATOBJ_MulLong( - IN OUT PFLOATOBJ pf, - IN LONG l - ) -{ - // www.osr.com/ddk/graphics/gdifncs_56lj.htm - UNIMPLEMENTED; -} - -VOID -STDCALL -FLOATOBJ_Neg ( IN OUT PFLOATOBJ pf ) -{ - // www.osr.com/ddk/graphics/gdifncs_14pz.htm - UNIMPLEMENTED; -} - -VOID -STDCALL -FLOATOBJ_SetFloat( - OUT PFLOATOBJ pf, - IN FLOATL f - ) -{ - // www.osr.com/ddk/graphics/gdifncs_1prb.htm - UNIMPLEMENTED; -} - -VOID -STDCALL -FLOATOBJ_SetLong( - OUT PFLOATOBJ pf, - IN LONG l - ) -{ - // www.osr.com/ddk/graphics/gdifncs_0gpz.htm - UNIMPLEMENTED; -} - -VOID -STDCALL -FLOATOBJ_Sub( - IN OUT PFLOATOBJ pf, - IN PFLOATOBJ pf1 - ) -{ - // www.osr.com/ddk/graphics/gdifncs_6lyf.htm - UNIMPLEMENTED; -} - -VOID -STDCALL -FLOATOBJ_SubFloat( - IN OUT PFLOATOBJ pf, - IN FLOATL f - ) -{ - // www.osr.com/ddk/graphics/gdifncs_2zvr.htm - UNIMPLEMENTED; -} - -VOID -STDCALL -FLOATOBJ_SubLong( - IN OUT PFLOATOBJ pf, - IN LONG l - ) -{ - // www.osr.com/ddk/graphics/gdifncs_852f.htm - UNIMPLEMENTED; } /*

17 years, 7 months

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

by ion＠svn.reactos.org

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

17 years, 7 months

[ion] 26711: - Update Cm Rewrite branch status with work that was done on Trunk.

by ion＠svn.reactos.org

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

17 years, 7 months

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

by ion＠svn.reactos.org

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

17 years, 7 months

[dgorbachev] 26709: Do not write beyond the buffer.

by dgorbachev＠svn.reactos.org

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

17 years, 7 months

[dgorbachev] 26708: Do not write beyond the buffer.

by dgorbachev＠svn.reactos.org

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

17 years, 7 months

[dgorbachev] 26707: Do not fail with less then two arguments.

by dgorbachev＠svn.reactos.org

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

17 years, 7 months

← Newer
1
...
19
20
21
22
23
24
25
...
33
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 May 2007