Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 24423: - Implement CmpHwProfileDefaultSelect, CmpAddDockingInfo, CmpAddAliasEntry, CmpCreateCurrentControlSetLink. - Stub CmpCloneHwProfile, CmpSetAcpiHwProfile since there are more complex to handle and shouldn't occur while testing.
by ion＠svn.reactos.org 07 Oct '06

07 Oct '06

Author: ion Date: Fri Oct 6 18:47:19 2006 New Revision: 24423 URL: http://svn.reactos.org/svn/reactos?rev=24423&view=rev Log: - Implement CmpHwProfileDefaultSelect, CmpAddDockingInfo, CmpAddAliasEntry, CmpCreateCurrentControlSetLink. - Stub CmpCloneHwProfile, CmpSetAcpiHwProfile since there are more complex to handle and shouldn't occur while testing. Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cminit.c Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cminit.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cminit.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cminit.c Fri Oct 6 18:47:19 2006 @@ -16,6 +16,8 @@ RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\SYSTEM"); UNICODE_STRING CmpSystemFileName = RTL_CONSTANT_STRING(L"SYSTEM"); +UNICODE_STRING CmSymbolicLinkValueName = + RTL_CONSTANT_STRING(L"SymbolicLinkValue"); BOOLEAN CmpMiniNTBoot; BOOLEAN CmpShareSystemHives; @@ -354,6 +356,570 @@ return TRUE; } +NTSTATUS +NTAPI +CmpHwProfileDefaultSelect(IN PVOID ProfileList, + OUT PULONG ProfileIndexToUse, + IN PVOID Context) +{ + /* Clear the index and return success */ + *ProfileIndexToUse = 0; + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +CmpAddDockingInfo(IN HANDLE Key, + IN PPROFILE_PARAMETER_BLOCK ProfileBlock) +{ + NTSTATUS Status = STATUS_SUCCESS; + UNICODE_STRING KeyName; + ULONG Value; + PAGED_CODE (); + + /* Get the Value from the profile block, create a Name for it and set it */ + Value = ProfileBlock->DockingState; + RtlInitUnicodeString(&KeyName, L"DockingState"); + Status = NtSetValueKey(Key, + &KeyName, + 0, + REG_DWORD, + &Value, + sizeof(Value)); + if (!NT_SUCCESS(Status)) return Status; + + /* Get the Value from the profile block, create a Name for it and set it */ + Value = ProfileBlock->Capabilities; + RtlInitUnicodeString(&KeyName, L"Capabilities"); + Status = NtSetValueKey(Key, + &KeyName, + 0, + REG_DWORD, + &Value, + sizeof(Value)); + if (!NT_SUCCESS(Status)) return Status; + + /* Get the Value from the profile block, create a Name for it and set it */ + Value = ProfileBlock->DockID; + RtlInitUnicodeString(&KeyName, L"DockID"); + Status = NtSetValueKey(Key, + &KeyName, + 0, + REG_DWORD, + &Value, + sizeof(Value)); + if (!NT_SUCCESS(Status)) return Status; + + /* Get the Value from the profile block, create a Name for it and set it */ + Value = ProfileBlock->SerialNumber; + RtlInitUnicodeString(&KeyName, L"SerialNumber"); + Status = NtSetValueKey(Key, + &KeyName, + 0, + REG_DWORD, + &Value, + sizeof(Value)); + + /* Return Status */ + return Status; +} + +NTSTATUS +NTAPI +CmpAddAliasEntry(IN HANDLE IDConfigDB, + IN PPROFILE_PARAMETER_BLOCK ProfileBlock, + IN ULONG ProfileNumber) +{ + UNICODE_STRING KeyName; + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status = STATUS_SUCCESS; + CHAR Buffer[128]; + WCHAR UnicodeBuffer[128]; + ANSI_STRING TempString; + HANDLE AliasHandle = NULL, AliasIdHandle = NULL; + ULONG Value; + ULONG Disposition; + ULONG AliasId = 0; + PAGED_CODE (); + + /* Open the alias key */ + RtlInitUnicodeString(&KeyName, L"Alias"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + IDConfigDB, + NULL); + Status = NtOpenKey(&AliasHandle, KEY_READ | KEY_WRITE, &ObjectAttributes); + + /* Check if we failed to open it */ + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + { + /* Create it instead */ + Status = NtCreateKey(&AliasHandle, + KEY_READ | KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + 0, + &Disposition); + } + + /* Check if we failed */ + if (!NT_SUCCESS (Status)) + { + /* Cleanup and exit */ + AliasHandle = NULL; + goto Exit; + } + + /* Loop every alias ID */ + while (AliasId++ < 200) + { + /* Build the KeyName */ + sprintf(Buffer, "%04d", AliasId); + RtlInitAnsiString(&TempString, Buffer); + + /* Convert it to Unicode */ + KeyName.MaximumLength = sizeof(UnicodeBuffer); + KeyName.Buffer = UnicodeBuffer; + Status = RtlAnsiStringToUnicodeString(&KeyName, + &TempString, + FALSE); + ASSERT (STATUS_SUCCESS == Status); + + /* Open the key */ + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + AliasHandle, + NULL); + Status = NtOpenKey(&AliasIdHandle, + KEY_READ | KEY_WRITE, + &ObjectAttributes); + if (NT_SUCCESS (Status)) + { + /* We opened it, close and keep looping */ + NtClose(AliasIdHandle); + } + else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + { + /* We couldn't find it, change Status and break out */ + Status = STATUS_SUCCESS; + break; + } + else + { + /* Any other error, break out */ + break; + } + } + + /* Check if we failed in the alias loop */ + if (!NT_SUCCESS(Status)) + { + /* Cleanup and exit */ + AliasIdHandle = 0; + goto Exit; + } + + /* Otherwise, create the alias key */ + Status = NtCreateKey(&AliasIdHandle, + KEY_READ | KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + 0, + &Disposition); + if (!NT_SUCCESS(Status)) + { + /* Cleanup and exit */ + AliasIdHandle = 0; + goto Exit; + } + + /* Add docking information */ + CmpAddDockingInfo(AliasIdHandle, ProfileBlock); + + /* Set the profile number */ + Value = ProfileNumber; + RtlInitUnicodeString(&KeyName, L"ProfileNumber"); + Status = NtSetValueKey(AliasIdHandle, + &KeyName, + 0, + REG_DWORD, + &Value, + sizeof(Value)); + +Exit: + /* Close every opened key */ + if (AliasHandle) NtClose(AliasHandle); + if (AliasIdHandle) NtClose(AliasIdHandle); + + /* Return Status */ + return Status; +} + +NTSTATUS +NTAPI +CmSetAcpiHwProfile(IN PPROFILE_ACPI_DOCKING_STATE NewDockState, + IN PVOID Select, + IN PVOID Context, + OUT PHANDLE NewProfile, + OUT PBOOLEAN ProfileChanged) +{ + /* FIXME: TODO */ + *ProfileChanged = FALSE; + *NewProfile = NULL; + ASSERT(FALSE); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +CmpCloneHwProfile(IN HANDLE ConfigHandle, + IN HANDLE Parent, + IN HANDLE OldProfile, + IN ULONG OldProfileNumber, + IN USHORT DockingState, + OUT PHANDLE NewProfile, + OUT PULONG NewProfileNumber) +{ + /* FIXME: TODO */ + *NewProfileNumber = FALSE; + *NewProfile = NULL; + ASSERT(FALSE); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +CmpCreateCurrentControlSetLink(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + UNICODE_STRING ConfigName = RTL_CONSTANT_STRING(L"Control\\ConfigHandle"); + UNICODE_STRING SelectName = + RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\Select"); + UNICODE_STRING KeyName; + OBJECT_ATTRIBUTES ObjectAttributes; + CHAR ValueInfoBuffer[128]; + PKEY_VALUE_FULL_INFORMATION ValueInfo; + CHAR Buffer[128]; + WCHAR UnicodeBuffer[128]; + HANDLE SelectHandle, KeyHandle, ConfigHandle = NULL, ProfileHandle = NULL; + HANDLE ParentHandle = NULL, AcpiHandle; + ULONG ControlSet, HwProfile; + ANSI_STRING TempString; + NTSTATUS Status; + ULONG ResultLength, Disposition; + BOOLEAN AcpiProfile = FALSE; + PLOADER_PARAMETER_EXTENSION LoaderExtension; + PROFILE_ACPI_DOCKING_STATE AcpiDockState; + BOOLEAN Active; + PAGED_CODE(); + + /* Open the select key */ + InitializeObjectAttributes(&ObjectAttributes, + &SelectName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&SelectHandle, KEY_READ, &ObjectAttributes); + if (!NT_SUCCESS(Status))return(Status); + + /* Open the current value */ + RtlInitUnicodeString(&KeyName, L"Current"); + Status = NtQueryValueKey(SelectHandle, + &KeyName, + KeyValueFullInformation, + ValueInfoBuffer, + sizeof(ValueInfoBuffer), + &ResultLength); + NtClose(SelectHandle); + if (!NT_SUCCESS(Status)) return Status; + + /* Get the actual value pointer, and get the control set ID */ + ValueInfo = (PKEY_VALUE_FULL_INFORMATION)ValueInfoBuffer; + ControlSet = *(PULONG)((PUCHAR)ValueInfo + ValueInfo->DataOffset); + + /* Create the current control set key */ + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\System\\CurrentControlSet"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtCreateKey(&KeyHandle, + KEY_CREATE_LINK, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE | REG_OPTION_CREATE_LINK, + &Disposition); + if (!NT_SUCCESS(Status)) return Status; + + /* Sanity check */ + ASSERT(Disposition == REG_CREATED_NEW_KEY); + + /* Initialize the symbolic link name */ + sprintf(Buffer, + "\\Registry\\Machine\\System\\ControlSet%03d", + ControlSet); + RtlInitAnsiString(&TempString, Buffer); + + /* Create a Unicode string out of it */ + KeyName.MaximumLength = sizeof(UnicodeBuffer); + KeyName.Buffer = UnicodeBuffer; + Status = RtlAnsiStringToUnicodeString(&KeyName, &TempString, FALSE); + + /* Set the value */ + Status = NtSetValueKey(KeyHandle, + &CmSymbolicLinkValueName, + 0, + REG_LINK, + KeyName.Buffer, + KeyName.Length); + if (!NT_SUCCESS(Status)) return Status; + + /* Get the configuration database key */ + InitializeObjectAttributes(&ObjectAttributes, + &ConfigName, + OBJ_CASE_INSENSITIVE, + KeyHandle, + NULL); + Status = NtOpenKey(&ConfigHandle, KEY_READ, &ObjectAttributes); + NtClose(KeyHandle); + + /* Check if we don't have one */ + if (!NT_SUCCESS(Status)) + { + /* Cleanup and exit */ + ConfigHandle = 0; + goto Cleanup; + } + + /* Now get the current config */ + RtlInitUnicodeString(&KeyName, L"CurrentConfig"); + Status = NtQueryValueKey(ConfigHandle, + &KeyName, + KeyValueFullInformation, + ValueInfoBuffer, + sizeof(ValueInfoBuffer), + &ResultLength); + + /* Set pointer to buffer */ + ValueInfo = (PKEY_VALUE_FULL_INFORMATION)ValueInfoBuffer; + + /* Check if we failed or got a non DWORD-value */ + if (!(NT_SUCCESS(Status)) || (ValueInfo->Type != REG_DWORD)) goto Cleanup; + + /* Get the hadware profile */ + HwProfile = *(PULONG)((PUCHAR)ValueInfo + ValueInfo->DataOffset); + + /* Open the hardware profile key */ + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\System\\CurrentControlSet" + L"\\Hardware Profiles"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&ParentHandle, KEY_READ, &ObjectAttributes); + + /* Check if there is no hardware profile key */ + if (!NT_SUCCESS (Status)) + { + /* Exit and clean up */ + ParentHandle = 0; + goto Cleanup; + } + + /* Build the profile name */ + sprintf(Buffer, "%04d",HwProfile); + RtlInitAnsiString(&TempString, Buffer); + + /* Convert it to Unicode */ + KeyName.MaximumLength = sizeof(UnicodeBuffer); + KeyName.Buffer = UnicodeBuffer; + Status = RtlAnsiStringToUnicodeString(&KeyName, + &TempString, + FALSE); + ASSERT(Status == STATUS_SUCCESS); + + /* Open the associated key */ + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ParentHandle, + NULL); + Status = NtOpenKey(&ProfileHandle, + KEY_READ | KEY_WRITE, + &ObjectAttributes); + + /* Check if there's no such key */ + if (!NT_SUCCESS (Status)) + { + /* Cleanup and exit */ + ProfileHandle = 0; + goto Cleanup; + } + + /* Check if we have a loader block extension */ + LoaderExtension = LoaderBlock->Extension; + if (LoaderExtension) + { + /* Check the hardware profile status */ + switch (LoaderExtension->Profile.Status) + { + /* Cloned status */ + case 3: + + /* Clone it */ + Status = CmpCloneHwProfile(ConfigHandle, + ParentHandle, + ProfileHandle, + HwProfile, + LoaderExtension-> + Profile.DockingState, + &ProfileHandle, + &HwProfile); + if (!NT_SUCCESS(Status)) + { + /* Cloning failed, cleanup and exit */ + ProfileHandle = 0; + goto Cleanup; + } + + /* Set the current config key */ + RtlInitUnicodeString(&KeyName, L"CurrentConfig"); + Status = NtSetValueKey(ConfigHandle, + &KeyName, + 0, + REG_DWORD, + &HwProfile, + sizeof (HwProfile)); + if (!NT_SUCCESS (Status)) goto Cleanup; + + /* Alias status */ + case 1: + + /* Create an alias entry */ + Status = CmpAddAliasEntry(ConfigHandle, + &LoaderExtension->Profile, + HwProfile); + + /* Docking status */ + case 2: + + /* Create the current dock info key */ + RtlInitUnicodeString(&KeyName, + L"CurrentDockInfo"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ConfigHandle, + NULL); + Status = NtCreateKey(&KeyHandle, + KEY_READ | KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE, + &Disposition); + ASSERT (STATUS_SUCCESS == Status); + + /* Add the docking information */ + Status = CmpAddDockingInfo(KeyHandle, + &LoaderExtension->Profile); + break; + + /* Other cases */ + case 0: + case 0xC001: + break; + + /* Unknown status */ + default: + ASSERT(FALSE); + } + } + + /* Create the current hardware profile key */ + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\System\\CurrentControlSet\\" + L"Hardware Profiles\\Current"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtCreateKey(&KeyHandle, + KEY_CREATE_LINK, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE | REG_OPTION_CREATE_LINK, + &Disposition); + if (NT_SUCCESS(Status)) + { + /* Sanity check */ + ASSERT(Disposition == REG_CREATED_NEW_KEY); + + /* Create the profile name */ + sprintf(Buffer, + "\\Registry\\Machine\\System\\CurrentControlSet\\" + "Hardware Profiles\\%04d", + HwProfile); + RtlInitAnsiString(&TempString, Buffer); + + /* Convert it to Unicode */ + KeyName.MaximumLength = sizeof(UnicodeBuffer); + KeyName.Buffer = UnicodeBuffer; + Status = RtlAnsiStringToUnicodeString(&KeyName, + &TempString, + FALSE); + ASSERT (STATUS_SUCCESS == Status); + + /* Set it */ + Status = NtSetValueKey(KeyHandle, + &CmSymbolicLinkValueName, + 0, + REG_LINK, + KeyName.Buffer, + KeyName.Length); + NtClose(KeyHandle); + } + + /* Check if we have to set the ACPI Profile */ + if (AcpiProfile) + { + /* Setup the docking state to undocked */ + AcpiDockState.DockingState = 1; + AcpiDockState.SerialLength = 2; + AcpiDockState.SerialNumber[0] = L'\0'; + + /* Set the ACPI profile */ + Status = CmSetAcpiHwProfile(&AcpiDockState, + CmpHwProfileDefaultSelect, + NULL, + &AcpiHandle, + &Active); + ASSERT(NT_SUCCESS(Status)); + + /* Close the key */ + NtClose(AcpiHandle); + } + + /* Close every opened handle */ +Cleanup: + if (ConfigHandle) NtClose(ConfigHandle); + if (ProfileHandle) NtClose(ProfileHandle); + if (ParentHandle) NtClose(ParentHandle); + + /* Return success */ + return STATUS_SUCCESS; +} + VOID NTAPI CmInitSystem1(IN PLOADER_PARAMETER_BLOCK LoaderBlock) @@ -487,41 +1053,3 @@ CmpSetSystemBootValues(LoaderBlock); } -#if 0 -VOID -INIT_FUNCTION -STDCALL -CmInitHives(BOOLEAN SetupBoot) -{ - PCHAR BaseAddress; - - /* Load Registry Hives. This one can be missing. */ - if (CachedModules[SystemRegistry]) { - BaseAddress = (PCHAR)CachedModules[SystemRegistry]->ModStart; - CmImportSystemHive(BaseAddress, - CachedModules[SystemRegistry]->ModEnd - (ULONG_PTR)BaseAddress); - } - - BaseAddress = (PCHAR)CachedModules[HardwareRegistry]->ModStart; - CmImportHardwareHive(BaseAddress, - CachedModules[HardwareRegistry]->ModEnd - (ULONG_PTR)BaseAddress); - - - /* Create dummy keys if no hardware hive was found */ - CmImportHardwareHive (NULL, 0); - - /* Initialize volatile registry settings */ - if (SetupBoot == FALSE) CmInit2((PCHAR)KeLoaderBlock.CommandLine); -} - - /* - * Create a CurrentControlSet\Control\MiniNT key that is used - * to detect WinPE/MiniNT systems. - */ - if (MiniNT) - { - Status = RtlCreateRegistryKey(RTL_REGISTRY_CONTROL, L"MiniNT"); - if (!NT_SUCCESS(Status)) - KEBUGCHECK(CONFIG_INITIALIZATION_FAILED); - } -#endif

1 0

[gedmurphy] 24434: move the string parsing routine into it's own function so it can be used with DeviceProblemWizard_RunDLL when required.
by gedmurphy＠svn.reactos.org 07 Oct '06

07 Oct '06

Author: gedmurphy Date: Sat Oct 7 19:02:43 2006 New Revision: 24434 URL: http://svn.reactos.org/svn/reactos?rev=24434&view=rev Log: move the string parsing routine into it's own function so it can be used with DeviceProblemWizard_RunDLL when required. Modified: trunk/reactos/dll/win32/devmgr/advprop.c Modified: trunk/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr/advprop.c (original) +++ trunk/reactos/dll/win32/devmgr/advprop.c Sat Oct 7 19:02:43 2006 @@ -1502,6 +1502,64 @@ } +static BOOL +GetDeviceAndComputerName(LPWSTR lpString, + WCHAR szDeviceID[], + WCHAR szMachineName[]) +{ + BOOL ret = FALSE; + + szDeviceID[0] = L'\0'; + szMachineName[0] = L'\0'; + + while (*lpString != L'\0') + { + if (*lpString == L'/') + { + lpString++; + if(!wcsnicmp(lpString, L"DeviceID", 8)) + { + lpString += 9; + if (*lpString != L'\0') + { + int i = 0; + while ((*lpString != L' ') && + (*lpString != L'\0') && + (i <= MAX_DEVICE_ID_LEN)) + { + szDeviceID[i++] = *lpString++; + } + szDeviceID[i] = L'\0'; + ret = TRUE; + } + } + else if (!wcsnicmp(lpString, L"MachineName", 11)) + { + lpString += 12; + if (*lpString != L'\0') + { + int i = 0; + while ((*lpString != L' ') && + (*lpString != L'\0') && + (i <= MAX_COMPUTERNAME_LENGTH)) + { + szMachineName[i++] = *lpString++; + } + szMachineName[i] = L'\0'; + } + } + /* knock the pointer back one and let the next + * pointer deal with incrementing, otherwise we + * go past the end of the string */ + lpString--; + } + lpString++; + } + + return ret; +} + + /*************************************************************************** * NAME EXPORTED * DeviceAdvancedPropertiesW @@ -1908,56 +1966,13 @@ WCHAR szMachineName[MAX_COMPUTERNAME_LENGTH+1]; LPWSTR lpString = (LPWSTR)lpDeviceCmd; - szDeviceID[0] = L'\0'; - szMachineName[0] = L'\0'; - - while (*lpString != L'\0') - { - if (*lpString == L'/') - { - lpString++; - if(!wcsnicmp(lpString, L"DeviceID", 8)) - { - lpString += 9; - if (*lpString != L'\0') - { - int i = 0; - while ((*lpString != L' ') && - (*lpString != L'\0') && - (i <= MAX_DEVICE_ID_LEN)) - { - szDeviceID[i++] = *lpString++; - } - szDeviceID[i] = L'\0'; - } - } - else if (!wcsnicmp(lpString, L"MachineName", 11)) - { - lpString += 12; - if (*lpString != L'\0') - { - int i = 0; - while ((*lpString != L' ') && - (*lpString != L'\0') && - (i <= MAX_COMPUTERNAME_LENGTH)) - { - szMachineName[i++] = *lpString++; - } - szMachineName[i] = L'\0'; - } - } - /* knock the pointer back one and let the next - * pointer deal with incrementing, otherwise we - * go past the end of the string */ - lpString--; - } - lpString++; - } - - //DPRINT("DeviceID: %S, MachineName: %S\n", szDeviceID, szMachineName); - - if (szDeviceID == L'\0') + if (!GetDeviceAndComputerName(lpString, + szDeviceID, + szMachineName)) + { + DPRINT1("DeviceProperties_RunDLLW DeviceID: %S, MachineName: %S\n", szDeviceID, szMachineName); return; + } DevicePropertiesW(hWndParent, hInst,

1 0

[gedmurphy] 24433: testing ros-diffs
by gedmurphy＠svn.reactos.org 07 Oct '06

07 Oct '06

Author: gedmurphy Date: Sat Oct 7 18:35:22 2006 New Revision: 24433 URL: http://svn.reactos.org/svn/reactos?rev=24433&view=rev Log: testing ros-diffs Modified: trunk/reactos/base/applications/sc/sc.rc trunk/reactos/base/applications/sc/start.c Modified: trunk/reactos/base/applications/sc/sc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.rc… ============================================================================== --- trunk/reactos/base/applications/sc/sc.rc (original) +++ trunk/reactos/base/applications/sc/sc.rc Sat Oct 7 18:35:22 2006 @@ -2,9 +2,9 @@ #include <commctrl.h> #include "resource.h" -#define REACTOS_STR_FILE_DESCRIPTION "Services control application\0" -#define REACTOS_STR_INTERNAL_NAME "sc\0" -#define REACTOS_STR_ORIGINAL_FILENAME "sc.exe\0" +#define REACTOS_STR_FILE_DESCRIPTION "Services control application\0" +#define REACTOS_STR_INTERNAL_NAME "sc\0" +#define REACTOS_STR_ORIGINAL_FILENAME "sc.exe\0" #include <reactos/version.rc> //#include "En.rc" Modified: trunk/reactos/base/applications/sc/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/start… ============================================================================== --- trunk/reactos/base/applications/sc/start.c (original) +++ trunk/reactos/base/applications/sc/start.c Sat Oct 7 18:35:22 2006 @@ -49,7 +49,7 @@ ArgCount, ServiceArgs)) { - _tprintf(_T("[SC] StartService FAILED %lu:\n\n"), GetLastError()); + _tprintf(_T("[SC] StartService FAILED %lu:\n\n"), GetLastError()); goto fail; }

1 0

[fireball] 24432: - Add structure for describing boot-loaded drivers
by fireball＠svn.reactos.org 07 Oct '06

07 Oct '06

Author: fireball Date: Sat Oct 7 17:07:25 2006 New Revision: 24432 URL: http://svn.reactos.org/svn/reactos?rev=24432&view=rev Log: - Add structure for describing boot-loaded drivers Modified: trunk/reactos/include/reactos/arc/arc.h Modified: trunk/reactos/include/reactos/arc/arc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arc/arc.h?… ============================================================================== --- trunk/reactos/include/reactos/arc/arc.h (original) +++ trunk/reactos/include/reactos/arc/arc.h Sat Oct 7 17:07:25 2006 @@ -65,6 +65,14 @@ ULONG PageCount; } MEMORY_ALLOCATION_DESCRIPTOR, *PMEMORY_ALLOCATION_DESCRIPTOR; +typedef struct _BOOT_DRIVER_LIST_ENTRY +{ + LIST_ENTRY ListEntry; + UNICODE_STRING FilePath; + UNICODE_STRING RegistryPath; + struct _LDR_DATA_TABLE_ENTRY *DataTableEntry; +} BOOT_DRIVER_LIST_ENTRY, *PBOOT_DRIVER_LIST_ENTRY; + typedef struct _CONFIGURATION_COMPONENT { CONFIGURATION_CLASS Class;

1 0

[ion] 24422: - Add internal EX_CALLBACK Object to NDK. (Callback blocks are a new NT 5.2 kernel mechanism much like RunOncs blocks in Vista user-mode). They're managed by rundown protection and fast-referencing through interlocked calls to push/pop/sychrnonize system callbacks. - Add ObOpenObjectByName to NDK, since this API is not documented in official headers.
by ion＠svn.reactos.org 06 Oct '06

06 Oct '06

Author: ion Date: Fri Oct 6 10:36:35 2006 New Revision: 24422 URL: http://svn.reactos.org/svn/reactos?rev=24422&view=rev Log: - Add internal EX_CALLBACK Object to NDK. (Callback blocks are a new NT 5.2 kernel mechanism much like RunOncs blocks in Vista user-mode). They're managed by rundown protection and fast-referencing through interlocked calls to push/pop/sychrnonize system callbacks. - Add ObOpenObjectByName to NDK, since this API is not documented in official headers. Modified: trunk/reactos/include/ndk/extypes.h trunk/reactos/include/ndk/obfuncs.h Modified: trunk/reactos/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/extypes.h (original) +++ trunk/reactos/include/ndk/extypes.h Fri Oct 6 10:36:35 2006 @@ -486,6 +486,24 @@ } CALLBACK_OBJECT , *PCALLBACK_OBJECT; // +// Internal Callback Object +// +typedef struct _EX_CALLBACK_ROUTINE_BLOCK +{ + EX_RUNDOWN_REF RundownProtect; + PVOID Function; + PVOID Context; +} EX_CALLBACK_ROUTINE_BLOCK, *PEX_CALLBACK_ROUTINE_BLOCK; + +// +// Internal Callback Handle +// +typedef struct _EX_CALLBACK +{ + EX_FAST_REF RoutineBlock; +} EX_CALLBACK, *PEX_CALLBACK; + +// // Profile Object // typedef struct _EPROFILE Modified: trunk/reactos/include/ndk/obfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/obfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/obfuncs.h (original) +++ trunk/reactos/include/ndk/obfuncs.h Fri Oct 6 10:36:35 2006 @@ -68,6 +68,18 @@ IN PVOID Object ); +NTSTATUS +NTAPI +ObOpenObjectByName( + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN POBJECT_TYPE ObjectType, + IN KPROCESSOR_MODE AccessMode, + IN PACCESS_STATE PassedAccessState, + IN ACCESS_MASK DesiredAccess, + IN OUT PVOID ParseContext, + OUT PHANDLE Handle +); + NTKERNELAPI NTSTATUS NTAPI

1 0

[ion] 24421: - Update current status of branch.
by ion＠svn.reactos.org 06 Oct '06

06 Oct '06

Author: ion Date: Fri Oct 6 10:34:31 2006 New Revision: 24421 URL: http://svn.reactos.org/svn/reactos?rev=24421&view=rev Log: - Update current status of branch. 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 Fri Oct 6 10:34:31 2006 @@ -92,6 +92,16 @@ ~90% of the KCB/NCB code is complete. Work about to resume on initialization code. +**As of 6/10/2006 + ~90% of the KCB/NCB code is complete. + ~70% of Initialization code is complete. + + 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. + -= Structure =- cmapi.c - Contains the low-level Cmp APIs that correspond to the external Nt

1 0

[ion] 24420: - Define HIVE_LIST_ENTRY, CM_PARSE_CONTEXT. - Stub CmpReportNotify. - Implement CmpHiveRootSecurityDescriptor, CmpLinkHiveToMaster, CmpInitializeSystemHive. - Rename CmInitializeRegistry to CmInitSystem1 and detect PE boot (/MININT).
by ion＠svn.reactos.org 06 Oct '06

06 Oct '06

Author: ion Date: Fri Oct 6 10:27:52 2006 New Revision: 24420 URL: http://svn.reactos.org/svn/reactos?rev=24420&view=rev Log: - Define HIVE_LIST_ENTRY, CM_PARSE_CONTEXT. - Stub CmpReportNotify. - Implement CmpHiveRootSecurityDescriptor, CmpLinkHiveToMaster, CmpInitializeSystemHive. - Rename CmInitializeRegistry to CmInitSystem1 and detect PE boot (/MININT). Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h branches/alex-cm-branch/reactos/ntoskrnl/cm/cmapi.c branches/alex-cm-branch/reactos/ntoskrnl/cm/cmhive.c branches/alex-cm-branch/reactos/ntoskrnl/cm/cminit.c Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h Fri Oct 6 10:27:52 2006 @@ -560,6 +560,40 @@ } CM_CACHED_VALUE, *PCM_CACHED_VALUE; // +// Hive List Entry +// +typedef struct _HIVE_LIST_ENTRY +{ + PWCHAR FileName; + PWCHAR BaseName; + PWCHAR RegRootName; + PCMHIVE CmHive; + ULONG HHiveFlags; + ULONG CmHiveFlags; + PCMHIVE CmHive2; + BOOLEAN ThreadFinished; + BOOLEAN ThreadStarted; + BOOLEAN Allocate; + BOOLEAN WinPERequired; +} HIVE_LIST_ENTRY, *PHIVE_LIST_ENTRY; + +// +// Parse context for Key Object +// +typedef struct _CM_PARSE_CONTEXT +{ + ULONG TitleIndex; + UNICODE_STRING Class; + ULONG CreateOptions; + ULONG Disposition; + CM_KEY_REFERENCE ChildHive; + BOOLEAN CreateLink; + BOOLEAN Flag2; + HANDLE PredefinedHandle; + ULONG PostActions; +} CM_PARSE_CONTEXT, *PCM_PARSE_CONTEXT; + +// // Registry Validation Functions // BOOLEAN @@ -567,6 +601,17 @@ CmCheckRegistry( IN PCMHIVE Hive, IN BOOLEAN CleanFlag +); + +// +// Notification Routines +// +VOID +CmpReportNotify( + IN PCM_KEY_CONTROL_BLOCK Kcb, + IN PHHIVE Hive, + IN HCELL_INDEX Cell, + IN ULONG Filter ); // @@ -666,6 +711,22 @@ IN PUNICODE_STRING FileName ); +PSECURITY_DESCRIPTOR +NTAPI +CmpHiveRootSecurityDescriptor( + VOID +); + +NTSTATUS +NTAPI +CmpLinkHiveToMaster( + IN PUNICODE_STRING LinkName, + IN HANDLE RootDirectory, + IN PCMHIVE CmHive, + IN BOOLEAN Allocate, + IN PSECURITY_DESCRIPTOR SecurityDescriptor +); + // // Registry Utility Functions // Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmapi.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmapi.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmapi.c Fri Oct 6 10:27:52 2006 @@ -43,3 +43,13 @@ ExReleasePushLock(&CmpHiveListHeadLock); return Flushed; } + +VOID +CmpReportNotify(IN PCM_KEY_CONTROL_BLOCK Kcb, + IN PHHIVE Hive, + IN HCELL_INDEX Cell, + IN ULONG Filter) +{ + /* FIXME: TODO */ + ASSERT(FALSE); +} Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmhive.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmhive.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmhive.c Fri Oct 6 10:27:52 2006 @@ -323,3 +323,243 @@ return STATUS_SUCCESS; } +PSECURITY_DESCRIPTOR +NTAPI +CmpHiveRootSecurityDescriptor(VOID) +{ + SID_IDENTIFIER_AUTHORITY WorldAuthority = SECURITY_WORLD_SID_AUTHORITY; + SID_IDENTIFIER_AUTHORITY NtAuthority = SECURITY_NT_AUTHORITY; + PSID WorldSid; + PSID RestrictedSid; + PSID SystemSid; + PSID AdminSid; + NTSTATUS Status; + ULONG AceSize, AclSize; + PACL Acl, SdAcl; + PACE_HEADER AceHeader; + PSECURITY_DESCRIPTOR HiveSd; + PAGED_CODE(); + + /* Allocate all the SIDs */ + WorldSid = ExAllocatePoolWithTag(PagedPool, + RtlLengthRequiredSid(1), + TAG_CM); + RestrictedSid = ExAllocatePoolWithTag(PagedPool, + RtlLengthRequiredSid(1), + TAG_CM); + SystemSid = ExAllocatePoolWithTag(PagedPool, + RtlLengthRequiredSid(1), + TAG_CM); + AdminSid = ExAllocatePoolWithTag(PagedPool, + RtlLengthRequiredSid(2), + TAG_CM); + + /* Make sure that all were allocated */ + if (!(WorldSid) || !(RestrictedSid) || !(SystemSid) || !(AdminSid)) + { + /* Fail */ + KeBugCheckEx(REGISTRY_ERROR, 10, 0, 0, 0); + } + + /* Now initialize all the SIDs */ + Status = RtlInitializeSid(WorldSid, &WorldAuthority, 1); + if (NT_SUCCESS(Status)) + { + Status = RtlInitializeSid(RestrictedSid, &NtAuthority, 1); + } + if (NT_SUCCESS(Status)) + { + Status = RtlInitializeSid(SystemSid, &NtAuthority, 1); + } + if (NT_SUCCESS(Status)) + { + Status = RtlInitializeSid(AdminSid, &NtAuthority, 2); + } + if (NT_SUCCESS(Status)) KeBugCheckEx(REGISTRY_ERROR, 10, 1, 0, 0); + + /* Setup the sub-authority SIDs */ + *(RtlSubAuthoritySid(WorldSid, 0)) = SECURITY_WORLD_RID; + *(RtlSubAuthoritySid(RestrictedSid, 0)) = SECURITY_RESTRICTED_CODE_RID; + *(RtlSubAuthoritySid(SystemSid, 0)) = SECURITY_LOCAL_SYSTEM_RID; + *(RtlSubAuthoritySid(AdminSid, 0)) = SECURITY_BUILTIN_DOMAIN_RID; + *(RtlSubAuthoritySid(AdminSid, 1)) = DOMAIN_ALIAS_RID_ADMINS; + + /* Sanity checks */ + ASSERT(RtlValidSid(WorldSid)); + ASSERT(RtlValidSid(RestrictedSid)); + ASSERT(RtlValidSid(SystemSid)); + ASSERT(RtlValidSid(AdminSid)); + + /* Calculate length of the ACE */ + AceSize = (SeLengthSid(WorldSid) - + sizeof(ULONG) + sizeof(ACCESS_ALLOWED_ACE)) + + (SeLengthSid(RestrictedSid) - + sizeof(ULONG) + sizeof(ACCESS_ALLOWED_ACE))+ + (SeLengthSid(SystemSid) - + sizeof(ULONG) + sizeof(ACCESS_ALLOWED_ACE)) + + (SeLengthSid(AdminSid) - + sizeof(ULONG) + sizeof(ACCESS_ALLOWED_ACE)); + + /* Calculate the ACL length and allocate it */ + AclSize = AceSize + sizeof(ACL); + Acl = ExAllocatePoolWithTag(PagedPool, AclSize, TAG_CM); + if (!Acl) KeBugCheckEx(REGISTRY_ERROR, 10, 2, 0, 0); + + /* Create it */ + Status = RtlCreateAcl(Acl, AclSize, ACL_REVISION); + if (!NT_SUCCESS(Status)) KeBugCheckEx(REGISTRY_ERROR, 10, 3, 0, 0); + + /* Add our ACEs */ + Status = RtlAddAccessAllowedAce(Acl, + ACL_REVISION, + KEY_ALL_ACCESS, + SystemSid); + if (NT_SUCCESS(Status)) + { + Status = RtlAddAccessAllowedAce(Acl, + ACL_REVISION, + KEY_ALL_ACCESS, + AdminSid); + } + if (NT_SUCCESS(Status)) + { + Status = RtlAddAccessAllowedAce(Acl, + ACL_REVISION, + KEY_READ, + WorldSid); + } + if (NT_SUCCESS(Status)) + { + Status = RtlAddAccessAllowedAce(Acl, + ACL_REVISION, + KEY_READ, + RestrictedSid); + } + if (!NT_SUCCESS(Status)) KeBugCheckEx(REGISTRY_ERROR, 10, 4, 0, 0); + + /* Get every ACE and turn on the inherit flag */ + Status = RtlGetAce(Acl,0,&AceHeader); + ASSERT(NT_SUCCESS(Status)); + AceHeader->AceFlags |= CONTAINER_INHERIT_ACE; + Status = RtlGetAce(Acl,1,&AceHeader); + ASSERT(NT_SUCCESS(Status)); + AceHeader->AceFlags |= CONTAINER_INHERIT_ACE; + Status = RtlGetAce(Acl,2,&AceHeader); + ASSERT(NT_SUCCESS(Status)); + AceHeader->AceFlags |= CONTAINER_INHERIT_ACE; + Status = RtlGetAce(Acl,3,&AceHeader); + ASSERT(NT_SUCCESS(Status)); + AceHeader->AceFlags |= CONTAINER_INHERIT_ACE; + + /* Allocate the SD */ + HiveSd = ExAllocatePoolWithTag(PagedPool, + AclSize + sizeof(SECURITY_DESCRIPTOR), + TAG_CM); + if (!HiveSd) KeBugCheckEx(REGISTRY_ERROR, 10, 5, 0, 0); + + /* Copy the ACL into it */ + SdAcl = (PACL)((PISECURITY_DESCRIPTOR)HiveSd + 1); + RtlMoveMemory(SdAcl, Acl, AclSize); + + /* Create the SD */ + Status = RtlCreateSecurityDescriptor(HiveSd, SECURITY_DESCRIPTOR_REVISION); + if (!NT_SUCCESS(Status)) + { + /* Failed, free the descriptor and bugcheck */ + ExFreePool(HiveSd); + KeBugCheckEx(REGISTRY_ERROR, 10, 6, 0, 0); + } + + /* Set the DACL */ + Status = RtlSetDaclSecurityDescriptor(HiveSd, TRUE, SdAcl, FALSE); + if (!NT_SUCCESS(Status)) + { + /* Failed, free the descriptor and bugcheck */ + ExFreePool(HiveSd); + KeBugCheckEx(REGISTRY_ERROR, 10, 7, 0, 0); + } + + /* Free all allocations */ + ExFreePool(WorldSid); + ExFreePool(RestrictedSid); + ExFreePool(SystemSid); + ExFreePool(AdminSid); + ExFreePool(Acl); + + /* Return the SD */ + return HiveSd; +} + +NTSTATUS +NTAPI +CmpLinkHiveToMaster(IN PUNICODE_STRING LinkName, + IN HANDLE RootDirectory, + IN PCMHIVE CmHive, + IN BOOLEAN Allocate, + IN PSECURITY_DESCRIPTOR SecurityDescriptor) +{ + CM_PARSE_CONTEXT ParseContext; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE KeyHandle; + NTSTATUS Status; + PCM_KEY_BODY KeyBody; + PAGED_CODE(); + + /* Fill out the parse context */ + ParseContext.TitleIndex = 0; + ParseContext.Class.Length = 0; + ParseContext.Class.MaximumLength = 0; + ParseContext.Class.Buffer = NULL; + ParseContext.CreateOptions = 0; + ParseContext.CreateLink = TRUE; + ParseContext.Flag2 = TRUE; + ParseContext.PostActions = 0; + ParseContext.ChildHive.KeyHive = &CmHive->Hive; + + /* Check if we're allocating */ + if (Allocate) + { + /* Set no child */ + ParseContext.ChildHive.KeyCell = HCELL_NIL; + } + else + { + /* Otherwise, set the root cell */ + ParseContext.ChildHive.KeyCell = CmHive->Hive.HiveHeader->RootCell; + } + + /* Open the key */ + InitializeObjectAttributes(&ObjectAttributes, + LinkName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + RootDirectory, + SecurityDescriptor); + Status = ObOpenObjectByName(&ObjectAttributes, + CmpKeyObjectType, + KernelMode, + NULL, + KEY_READ | KEY_WRITE, + &ParseContext, + &KeyHandle); + if (!NT_SUCCESS(Status)) return Status; + + /* Reference the key body */ + Status = ObReferenceObjectByHandle(KeyHandle, + 0, + CmpKeyObjectType, + KernelMode, + &KeyBody, + NULL); + ASSERT(NT_SUCCESS(Status)); + + /* Send a notification */ + CmpReportNotify(KeyBody->KeyControlBlock, + KeyBody->KeyControlBlock->KeyHive, + KeyBody->KeyControlBlock->KeyCell, + REG_NOTIFY_CHANGE_NAME); + + /* Dereference the key and close the handle */ + ObDereferenceObject((PVOID)KeyBody); + ZwClose(KeyHandle); + return STATUS_SUCCESS; +} Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cminit.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cminit.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cminit.c Fri Oct 6 10:27:52 2006 @@ -12,16 +12,29 @@ #define NDEBUG #include <debug.h> +UNICODE_STRING CmRegistryMachineSystemName = + RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\SYSTEM"); +UNICODE_STRING CmpSystemFileName = + RTL_CONSTANT_STRING(L"SYSTEM"); + +BOOLEAN CmpMiniNTBoot; +BOOLEAN CmpShareSystemHives; +ULONG CmpBootType; + PEPROCESS CmpSystemProcess; PCMHIVE CmpMasterHive; HANDLE CmpRegistryRootHandle; +BOOLEAN CmSelfHeal, CmpSelfHeal; KGUARDED_MUTEX CmpSelfHealQueueLock; LIST_ENTRY CmpSelfHealQueueListHead; +HIVE_LIST_ENTRY CmpMachineHiveList[]; + EX_PUSH_LOCK CmpLoadHiveLock; UNICODE_STRING CmpSystemStartOptions; +UNICODE_STRING CmpLoadOptions; ULONG CmpCallBackCount; @@ -237,9 +250,113 @@ NtClose(KeyHandle); } +BOOLEAN +NTAPI +CmpInitializeSystemHive(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PCMHIVE SystemHive; + PVOID HiveImageBase; + BOOLEAN Allocate = FALSE; + PSECURITY_DESCRIPTOR SecurityDescriptor; + NTSTATUS Status; + STRING TempString; + PAGED_CODE(); + + /* Create ANSI_STRING from the loader options */ + RtlInitAnsiString(&TempString, LoaderBlock->LoadOptions); + + /* Setup UNICODE_STRING */ + CmpLoadOptions.Length = 0; + CmpLoadOptions.MaximumLength = TempString.Length * sizeof(WCHAR) + + sizeof(UNICODE_NULL); + CmpLoadOptions.Buffer = ExAllocatePoolWithTag(PagedPool, + CmpLoadOptions.MaximumLength, + TAG_CM); + if (!CmpLoadOptions.Buffer) + { + /* Fail */ + KeBugCheckEx(CONFIG_INITIALIZATION_FAILED, 5, 6, 0, 0); + } + + /* Convert it to Unicode and nul-terminate it */ + RtlAnsiStringToUnicodeString(&CmpLoadOptions, &TempString, FALSE); + CmpLoadOptions.Buffer[TempString.Length] = UNICODE_NULL; + CmpLoadOptions.Length += sizeof(WCHAR); + + /* Get the image base */ + HiveImageBase = LoaderBlock->RegistryBase; + if (!HiveImageBase) + { + /* Don't have a system hive, create it */ + Status = CmpInitializeHive(&SystemHive, + HINIT_CREATE, + 0, + HFILE_TYPE_ALTERNATE, + NULL, + NULL, + NULL, + NULL, + NULL, + &CmpSystemFileName); + if (!NT_SUCCESS(Status)) return FALSE; + Allocate = TRUE; + } + else + { + /* Make a copy of the loaded hive */ + Status = CmpInitializeHive(&SystemHive, + HINIT_MEMORY, + 0, + HFILE_TYPE_ALTERNATE, + HiveImageBase, + NULL, + NULL, + NULL, + NULL, + &CmpSystemFileName); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Check if we loaded with shared hives */ + if (CmpShareSystemHives) SystemHive->Hive.HvBinHeadersUse = 0; + + /* Set the boot type */ + CmpBootType = SystemHive->Hive.HiveHeader->BootType; + + /* Check if we loaded in self-healing mode */ + if (!CmSelfHeal) + { + /* We didn't, check the boot type */ + if (CmpBootType & 4) + { + /* Invalid boot type */ + CmpSelfHeal = FALSE; + KeBugCheckEx(REGISTRY_ERROR, 3, 3, (ULONG_PTR)SystemHive, 0); + } + } + } + + /* Create security descriptor */ + SecurityDescriptor = CmpHiveRootSecurityDescriptor(); + + /* Link the hive to the master */ + Status = CmpLinkHiveToMaster(&CmRegistryMachineSystemName, + NULL, + SystemHive, + Allocate, + SecurityDescriptor); + + /* Free the descriptor and check for success */ + ExFreePool(SecurityDescriptor); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Save the hive */ + CmpMachineHiveList[3].CmHive = SystemHive; + return TRUE; +} + VOID NTAPI -CmInitializeRegistry(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +CmInitSystem1(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName; @@ -248,6 +365,14 @@ HANDLE KeyHandle; NTSTATUS Status; PAGED_CODE(); + + /* Check if this is PE-boot */ + if (ExpIsWinPEMode) + { + /* Set registry to PE mode */ + CmpMiniNTBoot = TRUE; + CmpShareSystemHives = TRUE; + } /* Initialize the hive list and lock */ InitializeListHead(&CmpHiveListHead);

1 0

[ion] 24419: - Implement CmpNameSize, CmpCopyName. - Fix some bugs in cminit.c
by ion＠svn.reactos.org 06 Oct '06

06 Oct '06

Author: ion Date: Fri Oct 6 08:34:46 2006 New Revision: 24419 URL: http://svn.reactos.org/svn/reactos?rev=24419&view=rev Log: - Implement CmpNameSize, CmpCopyName. - Fix some bugs in cminit.c Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h branches/alex-cm-branch/reactos/ntoskrnl/cm/cminit.c branches/alex-cm-branch/reactos/ntoskrnl/cm/cmname.c Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h Fri Oct 6 08:34:46 2006 @@ -731,6 +731,21 @@ IN ULONG NameLength ); +USHORT +NTAPI +CmpNameSize( + IN PHHIVE Hive, + IN PUNICODE_STRING Name +); + +USHORT +NTAPI +CmpCopyName( + IN PHHIVE Hive, + IN PWCHAR Destination, + IN PUNICODE_STRING Source +); + // // Flush Routines // Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cminit.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cminit.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cminit.c Fri Oct 6 08:34:46 2006 @@ -25,6 +25,16 @@ ULONG CmpCallBackCount; +GENERIC_MAPPING CmpKeyMapping = +{ + KEY_READ, + KEY_WRITE, + KEY_EXECUTE, + KEY_ALL_ACCESS +}; + +EX_CALLBACK CmpCallBackVector[CMP_MAX_CALLBACKS]; + /* FUNCTIONS *****************************************************************/ NTSTATUS @@ -51,7 +61,7 @@ Cell = HvGetCell(Hive, *Index); /* Fill out the cell */ - Cell->u.KeyNode.Signature = CM_KEY_NODE_SIGNATURE; + Cell->u.KeyNode.Signature = (USHORT)CM_KEY_NODE_SIGNATURE; Cell->u.KeyNode.Flags = KEY_HIVE_ENTRY | KEY_NO_DELETE; KeQuerySystemTime(&SystemTime); Cell->u.KeyNode.LastWriteTime = SystemTime; @@ -93,7 +103,6 @@ HCELL_INDEX RootCell; PCM_KEY_BODY Key; PVOID KeyBody; - HANDLE KeyHandle; PCM_KEY_CONTROL_BLOCK RootKcb; UNICODE_STRING RootName = RTL_CONSTANT_STRING(L"\\REGISTRY"); OBJECT_ATTRIBUTES ObjectAttributes; @@ -148,7 +157,7 @@ if (!NT_SUCCESS(Status)) return Status; /* Now reference it as a keep alive and return the status */ - Status = ObReferenceObjectByHandle(KeyHandle, + Status = ObReferenceObjectByHandle(CmpRegistryRootHandle, KEY_READ, NULL, KernelMode, @@ -183,8 +192,6 @@ UNICODE_STRING KeyName, ValueName; HANDLE KeyHandle; NTSTATUS Status; - PCHAR CommandLine; - PCHAR SystemBootDevice; ULONG i = 0; ASSERT(LoaderBlock != NULL); @@ -225,7 +232,6 @@ /* Free the buffers */ RtlFreeUnicodeString(&ValueName); - ExFreePool(SystemBootDevice); /* Close the key and return */ NtClose(KeyHandle); @@ -274,7 +280,7 @@ RtlInitUnicodeString(&Name, L"Key"); ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); ObjectTypeInitializer.DefaultPagedPoolCharge = sizeof(CM_KEY_BODY); - ObjectTypeInitializer.GenericMapping = NULL; + ObjectTypeInitializer.GenericMapping = CmpKeyMapping; ObjectTypeInitializer.PoolType = PagedPool; ObjectTypeInitializer.SecurityRequired = TRUE; ObjectTypeInitializer.ValidAccessMask = KEY_ALL_ACCESS; Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmname.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmname.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmname.c Fri Oct 6 08:34:46 2006 @@ -13,6 +13,62 @@ #include <debug.h> /* FUNCTIONS *****************************************************************/ + +USHORT +NTAPI +CmpCopyName(IN PHHIVE Hive, + IN PWCHAR Destination, + IN PUNICODE_STRING Source) +{ + ULONG i; + + /* Check for old hives */ + if (Hive->Version == 1) + { + /* Just copy the source directly */ + RtlCopyMemory(Destination, Source->Buffer, Source->Length); + return Source->Length; + } + + /* For new versions, check for compressed name */ + for (i = 0; i < (Source->Length / sizeof(WCHAR)); i++) + { + /* Check if the name is non compressed */ + if ((Source->Buffer[i]) > -1) + { + /* Do the copy */ + RtlCopyMemory(Destination, Source->Buffer, Source->Length); + return Source->Length; + } + + /* Copy this character */ + Destination[i] = Source->Buffer[i]; + } + + /* Compressed name, return length */ + return Source->Length / sizeof(WCHAR); +} + +USHORT +NTAPI +CmpNameSize(IN PHHIVE Hive, + IN PUNICODE_STRING Name) +{ + ULONG i; + + /* For old hives, just retun the length */ + if (Hive->Version == 1) return Name->Length; + + /* For new versions, check for compressed name */ + for (i = 0; i < (Name->Length / sizeof(WCHAR)); i++) + { + /* Check if the name is non compressed */ + if ((Name->Buffer[i]) > -1) return Name->Length; + } + + /* Compressed name, return length */ + return Name->Length / sizeof(WCHAR); +} LONG NTAPI

1 0

[ion] 24418: - Stub CmpDelayCloseWorker, CmpDelayDerefKCBWorker. - Implement CmpInitializeKcbDelayedDeref, CmpDelayDerefKCBRoutine, CmpInitializeCmAllocations, CmpInitializeCache, CmpDelayCloseDpcRoutine - Stub CmpCloseKeyObject, CmpDeleteKeyObject, CmpQueryKeyName, CmpSecurityMethod, CmpParseKey. - Add cminit.c containing CmpCreateRootNode, CmpCreateRootKey, CmpSetSystemBootValues, CmpInitializeCallbacks, CmInitializeRegistry.
by ion＠svn.reactos.org 06 Oct '06

06 Oct '06

Author: ion Date: Fri Oct 6 05:23:49 2006 New Revision: 24418 URL: http://svn.reactos.org/svn/reactos?rev=24418&view=rev Log: - Stub CmpDelayCloseWorker, CmpDelayDerefKCBWorker. - Implement CmpInitializeKcbDelayedDeref, CmpDelayDerefKCBRoutine, CmpInitializeCmAllocations, CmpInitializeCache, CmpDelayCloseDpcRoutine - Stub CmpCloseKeyObject, CmpDeleteKeyObject, CmpQueryKeyName, CmpSecurityMethod, CmpParseKey. - Add cminit.c containing CmpCreateRootNode, CmpCreateRootKey, CmpSetSystemBootValues, CmpInitializeCallbacks, CmInitializeRegistry. Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cminit.c Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c branches/alex-cm-branch/reactos/ntoskrnl/cm/cmobject.c Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h Fri Oct 6 05:23:49 2006 @@ -112,6 +112,7 @@ // Number of various lists and hashes // #define CMP_SECURITY_HASH_LISTS 64 +#define CMP_MAX_CALLBACKS 100 // // Hashing Constants @@ -569,6 +570,103 @@ ); // +// KCB Cache/Delay Routines +// +VOID +NTAPI +CmpInitializeCache( + VOID +); + +VOID +NTAPI +CmpInitializeCmAllocations( + VOID +); + +VOID +NTAPI +CmpInitializeKcbDelayedDeref( + VOID +); + +// +// Key Object Routines +// +VOID +NTAPI +CmpCloseKeyObject( + IN PEPROCESS Process OPTIONAL, + IN PVOID Object, + IN ACCESS_MASK GrantedAccess, + IN ULONG ProcessHandleCount, + IN ULONG SystemHandleCount +); + +VOID +NTAPI +CmpDeleteKeyObject( + IN PVOID Object +); + +NTSTATUS +NTAPI +CmpParseKey( + IN PVOID ParseObject, + IN PVOID ObjectType, + IN OUT PACCESS_STATE AccessState, + IN KPROCESSOR_MODE AccessMode, + IN ULONG Attributes, + IN OUT PUNICODE_STRING CompleteName, + IN OUT PUNICODE_STRING RemainingName, + IN OUT PVOID Context OPTIONAL, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, + OUT PVOID *Object +); + +NTSTATUS +NTAPI +CmpSecurityMethod( + IN PVOID Object, + IN SECURITY_OPERATION_CODE OperationType, + IN SECURITY_INFORMATION SecurityInformation, // FIXME: <= should be a pointer + IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN OUT PULONG CapturedLength, + IN OUT PSECURITY_DESCRIPTOR *ObjectSecurityDescriptor, + IN POOL_TYPE PoolType, + IN PGENERIC_MAPPING GenericMapping +); + +NTSTATUS +NTAPI +CmpQueryKeyName( + IN PVOID Object, + IN BOOLEAN HasObjectName, + OUT POBJECT_NAME_INFORMATION ObjectNameInfo, + IN ULONG Length, + OUT PULONG ReturnLength, + IN KPROCESSOR_MODE AccessMode +); + +// +// Hive Routines +// +NTSTATUS +NTAPI +CmpInitializeHive( + OUT PCMHIVE *CmHive, + IN ULONG Operation, + IN ULONG Flags, + IN ULONG FileType, + IN PVOID HiveData, + IN HANDLE Primary, + IN HANDLE Alternate, + IN HANDLE Log, + IN HANDLE External, + IN PUNICODE_STRING FileName +); + +// // Registry Utility Functions // BOOLEAN @@ -577,6 +675,18 @@ VOID ); +VOID +NTAPI +CmpLockRegistryExclusive( + VOID +); + +VOID +NTAPI +CmpUnlockRegistry( + VOID +); + PVOID NTAPI CmpAllocateDelayItem( @@ -592,6 +702,17 @@ // // KCB Functions // +PCM_KEY_CONTROL_BLOCK +NTAPI +CmpCreateKcb( + IN PHHIVE Hive, + IN HCELL_INDEX Index, + IN PCM_KEY_NODE Node, + IN PCM_KEY_CONTROL_BLOCK Parent, + IN ULONG Flags, + IN PUNICODE_STRING KeyName +); + VOID NTAPI CmpDereferenceKcbWithLock( @@ -626,6 +747,11 @@ extern BOOLEAN CmpFlushOnLockRelease; extern EX_PUSH_LOCK CmpHiveListHeadLock; extern LIST_ENTRY CmpHiveListHead; +extern POBJECT_TYPE CmpKeyObjectType; +extern ERESOURCE CmpRegistryLock; +extern PCM_KEY_HASH_TABLE_ENTRY *CmpCacheTable; +extern PCM_NAME_HASH_TABLE_ENTRY *CmpNameCacheTable; +extern KGUARDED_MUTEX CmpDelayedCloseTableLock; // // Inlined functions Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cminit.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cminit.c (added) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cminit.c Fri Oct 6 05:23:49 2006 @@ -1,0 +1,396 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/cm/cminit.c + * PURPOSE: Initialization and generic utility routines + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +PEPROCESS CmpSystemProcess; +PCMHIVE CmpMasterHive; +HANDLE CmpRegistryRootHandle; + +KGUARDED_MUTEX CmpSelfHealQueueLock; +LIST_ENTRY CmpSelfHealQueueListHead; + +EX_PUSH_LOCK CmpLoadHiveLock; + +UNICODE_STRING CmpSystemStartOptions; + +ULONG CmpCallBackCount; + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +CmpCreateRootNode(IN PHHIVE Hive, + IN PWCHAR Name, + OUT HCELL_INDEX *Index) +{ + UNICODE_STRING KeyName; + PCELL_DATA Cell; + LARGE_INTEGER SystemTime; + PAGED_CODE(); + + /* Initialize the node name and allocate it */ + RtlInitUnicodeString(&KeyName, Name); + *Index = HvAllocateCell(Hive, + FIELD_OFFSET(CM_KEY_NODE, Name) + + CmpNameSize(Hive, &KeyName), + HvStable); // FIXME: , -1); + if (*Index == HCELL_NIL) return STATUS_UNSUCCESSFUL; + + /* Set the cell index and get the data */ + Hive->HiveHeader->RootCell = *Index; + Cell = HvGetCell(Hive, *Index); + + /* Fill out the cell */ + Cell->u.KeyNode.Signature = CM_KEY_NODE_SIGNATURE; + Cell->u.KeyNode.Flags = KEY_HIVE_ENTRY | KEY_NO_DELETE; + KeQuerySystemTime(&SystemTime); + Cell->u.KeyNode.LastWriteTime = SystemTime; + Cell->u.KeyNode.Parent = HCELL_NIL; + Cell->u.KeyNode.SubKeyCounts[HvStable] = 0; + Cell->u.KeyNode.SubKeyCounts[HvVolatile] = 0; + Cell->u.KeyNode.SubKeyLists[HvStable] = 0; + Cell->u.KeyNode.SubKeyLists[HvVolatile] = 0; + Cell->u.KeyNode.ValueList.Count = 0; + Cell->u.KeyNode.ValueList.List = HCELL_NIL; + Cell->u.KeyNode.Class = HCELL_NIL; + Cell->u.KeyNode.MaxValueDataLen = 0; + Cell->u.KeyNode.MaxNameLen = 0; + Cell->u.KeyNode.MaxValueNameLen = 0; + Cell->u.KeyNode.MaxClassLen = 0; + + /* Copy the name (this will also set the length) */ + Cell->u.KeyNode.NameLength = CmpCopyName(Hive, + Cell->u.KeyNode.Name, + &KeyName); + + /* Check if the name was compressed */ + if (Cell->u.KeyNode.NameLength < KeyName.Length) + { + /* Set the flag */ + Cell->u.KeyNode.Flags |= KEY_COMP_NAME; + } + + /* Return success */ + HvReleaseCell(Hive, *Index); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +CmpCreateRootKey(VOID) +{ + NTSTATUS Status; + HCELL_INDEX RootCell; + PCM_KEY_BODY Key; + PVOID KeyBody; + HANDLE KeyHandle; + PCM_KEY_CONTROL_BLOCK RootKcb; + UNICODE_STRING RootName = RTL_CONSTANT_STRING(L"\\REGISTRY"); + OBJECT_ATTRIBUTES ObjectAttributes; + PAGED_CODE(); + + /* Create the root node */ + Status = CmpCreateRootNode(&CmpMasterHive->Hive, L"REGISTRY", &RootCell); + if (!NT_SUCCESS(Status)) return Status; + + /* Create the object */ + InitializeObjectAttributes(&ObjectAttributes, + &RootName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ObCreateObject(KernelMode, + CmpKeyObjectType, + &ObjectAttributes, + UserMode, + NULL, + sizeof(CM_KEY_BODY), + 0, + 0, + (PVOID*)&Key); + if (!NT_SUCCESS(Status)) return Status; + + /* Create the KCB */ + RootKcb = CmpCreateKcb(&CmpMasterHive->Hive, + RootCell, + HvGetCell(&CmpMasterHive->Hive, RootCell), + NULL, + FALSE, + &RootName); + if (!RootKcb) return STATUS_UNSUCCESSFUL; + + /* Setup the key */ + Key->Type = TAG('k', 'y', '0', '2'); + Key->KeyControlBlock = RootKcb; + Key->NotifyBlock = NULL; + Key->ProcessID = PsGetCurrentProcess(); + + /* Enlist it */ + CmpEnlistKeyWithKcb(Key, RootKcb); + + /* Insert the key */ + Status = ObInsertObject(Key, + NULL, + 0, + 0, + NULL, + &CmpRegistryRootHandle); + if (!NT_SUCCESS(Status)) return Status; + + /* Now reference it as a keep alive and return the status */ + Status = ObReferenceObjectByHandle(KeyHandle, + KEY_READ, + NULL, + KernelMode, + &KeyBody, + NULL); + return Status; +} + +VOID +NTAPI +CmpInitializeCallbacks(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]); + } +} + +VOID +NTAPI +CmpSetSystemBootValues(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName, ValueName; + HANDLE KeyHandle; + NTSTATUS Status; + PCHAR CommandLine; + PCHAR SystemBootDevice; + ULONG i = 0; + ASSERT(LoaderBlock != NULL); + + /* Setup attributes for loader options */ + RtlInitUnicodeString(&KeyName, + L"\\REGISTRY\\MACHINE\\SYSTEM\\CurrentControlSet\\" + L"Control"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&KeyHandle, KEY_WRITE, &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + /* Key opened, now write to the key */ + RtlInitUnicodeString(&KeyName, L"SystemStartOptions"); + NtSetValueKey(KeyHandle, + &KeyName, + 0, + REG_SZ, + CmpSystemStartOptions.Buffer, + CmpSystemStartOptions.Length); + } + + /* Free the options now */ + ExFreePool(CmpSystemStartOptions.Buffer); + + /* Setup value name for system boot device */ + RtlInitUnicodeString(&KeyName, L"SystemBootDevice"); + RtlCreateUnicodeStringFromAsciiz(&ValueName, LoaderBlock->NtBootPathName); + NtSetValueKey(KeyHandle, + &KeyName, + 0, + REG_SZ, + ValueName.Buffer, + ValueName.Length); + + /* Free the buffers */ + RtlFreeUnicodeString(&ValueName); + ExFreePool(SystemBootDevice); + + /* Close the key and return */ + NtClose(KeyHandle); +} + +VOID +NTAPI +CmInitializeRegistry(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; + UNICODE_STRING Name; + HANDLE KeyHandle; + NTSTATUS Status; + PAGED_CODE(); + + /* Initialize the hive list and lock */ + InitializeListHead(&CmpHiveListHead); + ExInitializePushLock(&CmpHiveListHeadLock); + ExInitializePushLock(&CmpLoadHiveLock); + + /* Initialize registry lock */ + ExInitializeResourceLite(&CmpRegistryLock); + + /* Initialize the cache */ + CmpInitializeCache(); + + /* Initialize allocation and delayed dereferencing */ + CmpInitializeCmAllocations(); + CmpInitializeKcbDelayedDeref(); + + /* Initialize callbacks */ + CmpInitializeCallbacks(); + + /* Initialize self healing */ + KeInitializeGuardedMutex(&CmpSelfHealQueueLock); + InitializeListHead(&CmpSelfHealQueueListHead); + + /* Save the current process and lock the registry */ + CmpSystemProcess = PsGetCurrentProcess(); + CmpLockRegistryExclusive(); + + /* Initialize the Key object type */ + RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); + RtlInitUnicodeString(&Name, L"Key"); + ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); + ObjectTypeInitializer.DefaultPagedPoolCharge = sizeof(CM_KEY_BODY); + ObjectTypeInitializer.GenericMapping = NULL; + ObjectTypeInitializer.PoolType = PagedPool; + ObjectTypeInitializer.SecurityRequired = TRUE; + ObjectTypeInitializer.ValidAccessMask = KEY_ALL_ACCESS; + ObjectTypeInitializer.UseDefaultObject = TRUE; + ObjectTypeInitializer.DeleteProcedure = CmpDeleteKeyObject; + ObjectTypeInitializer.ParseProcedure = CmpParseKey; + ObjectTypeInitializer.SecurityProcedure = CmpSecurityMethod; + ObjectTypeInitializer.QueryNameProcedure = CmpQueryKeyName; + ObjectTypeInitializer.CloseProcedure = CmpCloseKeyObject; + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &CmpKeyObjectType); + + /* Create master hive */ + Status = CmpInitializeHive(&CmpMasterHive, + HINIT_CREATE, + HIVE_VOLATILE, + HFILE_TYPE_PRIMARY, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL); + if (!NT_SUCCESS(Status)) KeBugCheck(0); + + /* Create the \REGISTRY key */ + Status = CmpCreateRootKey(); + if (!NT_SUCCESS(Status)) KeBugCheck(0); + + /* Create '\Registry\Machine' key. */ + RtlInitUnicodeString(&KeyName, L"\\REGISTRY\\MACHINE"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtCreateKey(&KeyHandle, + KEY_READ | KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + if (!NT_SUCCESS(Status)) KeBugCheck(0); + NtClose(KeyHandle); + + /* Create '\Registry\User' key. */ + RtlInitUnicodeString(&KeyName, L"\\REGISTRY\\USER"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtCreateKey(&KeyHandle, + KEY_READ | KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + if (!NT_SUCCESS(Status)) KeBugCheck(0); + NtClose(KeyHandle); + + /* Initialize and load the system hive */ + Status = CmpInitializeSystemHive(LoaderBlock); + if (!NT_SUCCESS(Status)) KeBugCheck(0); + + /* Create the CCS symbolic link */ + Status = CmpCreateCurrentControlSetLink(LoaderBlock); + if (!NT_SUCCESS(Status)) KeBugCheck(0); + + /* Load the hardware hive */ + Status = CmpInitializeHardwareHive(LoaderBlock); + if (!NT_SUCCESS(Status)) KeBugCheck(0); + + /* Unlock the registry now */ + CmpUnlockRegistry(); + + /* Set system boot values */ + CmpSetSystemBootValues(LoaderBlock); +} + +#if 0 +VOID +INIT_FUNCTION +STDCALL +CmInitHives(BOOLEAN SetupBoot) +{ + PCHAR BaseAddress; + + /* Load Registry Hives. This one can be missing. */ + if (CachedModules[SystemRegistry]) { + BaseAddress = (PCHAR)CachedModules[SystemRegistry]->ModStart; + CmImportSystemHive(BaseAddress, + CachedModules[SystemRegistry]->ModEnd - (ULONG_PTR)BaseAddress); + } + + BaseAddress = (PCHAR)CachedModules[HardwareRegistry]->ModStart; + CmImportHardwareHive(BaseAddress, + CachedModules[HardwareRegistry]->ModEnd - (ULONG_PTR)BaseAddress); + + + /* Create dummy keys if no hardware hive was found */ + CmImportHardwareHive (NULL, 0); + + /* Initialize volatile registry settings */ + if (SetupBoot == FALSE) CmInit2((PCHAR)KeLoaderBlock.CommandLine); +} + + /* + * Create a CurrentControlSet\Control\MiniNT key that is used + * to detect WinPE/MiniNT systems. + */ + if (MiniNT) + { + Status = RtlCreateRegistryKey(RTL_REGISTRY_CONTROL, L"MiniNT"); + if (!NT_SUCCESS(Status)) + KEBUGCHECK(CONFIG_INITIALIZATION_FAILED); + } +#endif Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c Fri Oct 6 05:23:49 2006 @@ -17,13 +17,19 @@ ULONG CmpHashTableSize; PCM_KEY_HASH_TABLE_ENTRY *CmpCacheTable; PCM_NAME_HASH_TABLE_ENTRY *CmpNameCacheTable; + LIST_ENTRY CmpFreeKCBListHead; + BOOLEAN CmpAllocInited; -KGUARDED_MUTEX CmpAllocBucketLock; +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; @@ -39,6 +45,127 @@ 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 +CmpInitializeCmAllocations(VOID) +{ + /* Make sure we didn't already do this */ + if (!CmpAllocInited) + { + /* Setup the lock and list */ + KeInitializeGuardedMutex(&CmpAllocBucketLock); + InitializeListHead(&CmpFreeKCBListHead); + CmpAllocInited = TRUE; + } + + /* Initialize the delay one too */ + KeInitializeGuardedMutex(&CmpDelayAllocBucketLock); + InitializeListHead(&CmpFreeDelayItemsListHead); +} + +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 */ +} + +VOID +NTAPI +CmpInitializeKcbDelayedDeref(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); +} VOID NTAPI Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmobject.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmobject.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmobject.c Fri Oct 6 05:23:49 2006 @@ -12,5 +12,77 @@ #define NDEBUG #include <debug.h> +/* GLOBALS *******************************************************************/ + +POBJECT_TYPE CmpKeyObjectType; + /* FUNCTIONS *****************************************************************/ +VOID +NTAPI +CmpCloseKeyObject(IN PEPROCESS Process OPTIONAL, + IN PVOID Object, + IN ACCESS_MASK GrantedAccess, + IN ULONG ProcessHandleCount, + IN ULONG SystemHandleCount) +{ + /* FIXME: TODO */ + ASSERT(FALSE); +} + +VOID +NTAPI +CmpDeleteKeyObject(IN PVOID Object) +{ + /* FIXME: TODO */ + ASSERT(FALSE); +} + +NTSTATUS +NTAPI +CmpParseKey(IN PVOID ParseObject, + IN PVOID ObjectType, + IN OUT PACCESS_STATE AccessState, + IN KPROCESSOR_MODE AccessMode, + IN ULONG Attributes, + IN OUT PUNICODE_STRING CompleteName, + IN OUT PUNICODE_STRING RemainingName, + IN OUT PVOID Context OPTIONAL, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, + OUT PVOID *Object) +{ + /* FIXME: TODO */ + ASSERT(FALSE); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +CmpSecurityMethod(IN PVOID Object, + IN SECURITY_OPERATION_CODE OperationType, + IN SECURITY_INFORMATION SecurityInformation, // FIXME: <= should be a pointer + IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN OUT PULONG CapturedLength, + IN OUT PSECURITY_DESCRIPTOR *ObjectSecurityDescriptor, + IN POOL_TYPE PoolType, + IN PGENERIC_MAPPING GenericMapping) +{ + /* FIXME: TODO */ + ASSERT(FALSE); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +CmpQueryKeyName(IN PVOID Object, + IN BOOLEAN HasObjectName, + OUT POBJECT_NAME_INFORMATION ObjectNameInfo, + IN ULONG Length, + OUT PULONG ReturnLength, + IN KPROCESSOR_MODE AccessMode) +{ + /* FIXME: TODO */ + ASSERT(FALSE); + return STATUS_SUCCESS; +} +

1 0

[ion] 24417: - Fix some Cm callback definitions and fix call to HvInitializeHive.
by ion＠svn.reactos.org 05 Oct '06

05 Oct '06

Author: ion Date: Fri Oct 6 03:07:17 2006 New Revision: 24417 URL: http://svn.reactos.org/svn/reactos?rev=24417&view=rev Log: - Fix some Cm callback definitions and fix call to HvInitializeHive. Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmhive.c Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmhive.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmhive.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmhive.c Fri Oct 6 03:07:17 2006 @@ -21,7 +21,7 @@ PVOID NTAPI -CmpAllocate(IN ULONG Size, +CmpAllocate(IN SIZE_T Size, IN BOOLEAN Paged) { /* FIXME: TODO */ @@ -41,9 +41,9 @@ NTAPI CmpFileRead(IN PHHIVE Hive, IN ULONG FileType, - IN ULONG FileOffset, + IN ULONGLONG FileOffset, IN PVOID Buffer, - IN ULONG BufferLength) + IN SIZE_T BufferLength) { /* FIXME: TODO */ DbgBreakPoint(); @@ -54,9 +54,9 @@ NTAPI CmpFileWrite(IN PHHIVE Hive, IN ULONG FileType, - IN ULONG FileOffset, + IN ULONGLONG FileOffset, IN PVOID Buffer, - IN ULONG BufferLength) + IN SIZE_T BufferLength) { /* FIXME: TODO */ DbgBreakPoint(); @@ -67,7 +67,7 @@ NTAPI CmpFileSetSize(IN PHHIVE Hive, IN ULONG FileType, - IN ULONG FileSize) + IN ULONGLONG FileSize) { /* FIXME: TODO */ DbgBreakPoint(); @@ -272,20 +272,20 @@ /* Initialize the hive */ Status = HvInitialize(&Hive->Hive, Operation, + (ULONG_PTR)HiveData, + Cluster, Flags, FileType, - (ULONG_PTR)HiveData, CmpAllocate, CmpFree, CmpFileRead, CmpFileWrite, CmpFileSetSize, CmpFileFlush, - Cluster, FileName); if (NT_SUCCESS(Status)) { - /* Free all alocations */ + /* Free all allocations */ ExFreePool(Hive->ViewLock); ExFreePool(Hive->FlusherLock); ExFreePool(Hive);

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