Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-31 13:21:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SETUPLIB][USETUP] Move the registry-update procedure into setuplib.

Browse source 
- It can therefore be also used by the 1st-stage GUI setup.
- Rename some function parameters to clarify what they should be.

Based on:
svn path=/branches/setup_improvements/; revision=75750
This commit is contained in:
Hermès Bélusca-Maïto 2017-09-03 16:17:27 +00:00
parent dae658088a
commit 6c2d3dee04
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
7 changed files with 332 additions and 236 deletions
Download patch file Download diff file Expand all files Collapse all files

16
base/setup/lib/registry.c
View file

@ -611,7 +611,7 @@ C_ASSERT(_countof(SecurityRegistryHives) == NUMBER_OF_SECURITY_REGISTRY_HIVES);
NTSTATUS
VerifyRegistryHives(
IN PUNICODE_STRING InstallPath,
IN PUNICODE_STRING NtSystemRoot,
OUT PBOOLEAN ShouldRepairRegistry)
{
NTSTATUS Status;
@ -642,7 +642,7 @@ VerifyRegistryHives(
for (i = 0; i < ARRAYSIZE(RegistryHives); ++i)
{
Status = VerifyRegistryHive(InstallPath, RegistryHives[i].HiveName);
Status = VerifyRegistryHive(NtSystemRoot, RegistryHives[i].HiveName);
if (!NT_SUCCESS(Status))
{
DPRINT1("Registry hive '%S' needs repair!\n", RegistryHives[i].HiveName);
@ -658,7 +658,7 @@ VerifyRegistryHives(
/** These hives are created by LSASS during 2nd stage setup */
for (i = 0; i < ARRAYSIZE(SecurityRegistryHives); ++i)
{
Status = VerifyRegistryHive(InstallPath, SecurityRegistryHives[i].HiveName);
Status = VerifyRegistryHive(NtSystemRoot, SecurityRegistryHives[i].HiveName);
if (!NT_SUCCESS(Status))
{
DPRINT1("Registry hive '%S' needs repair!\n", SecurityRegistryHives[i].HiveName);
@ -687,7 +687,7 @@ VerifyRegistryHives(
NTSTATUS
RegInitializeRegistry(
IN PUNICODE_STRING InstallPath)
IN PUNICODE_STRING NtSystemRoot)
{
NTSTATUS Status;
HANDLE KeyHandle;
@ -750,7 +750,7 @@ RegInitializeRegistry(
if (RegistryHives[i].State != Create && RegistryHives[i].State != Repair)
continue;
Status = CreateRegistryFile(InstallPath,
Status = CreateRegistryFile(NtSystemRoot,
RegistryHives[i].HiveName,
RegistryHives[i].State != Repair, // RegistryHives[i].State == Create,
KeyHandle);
@ -833,7 +833,7 @@ RegInitializeRegistry(
{
Status = ConnectRegistry(NULL,
RegistryHives[i].HiveRegistryPath,
InstallPath,
NtSystemRoot,
RegistryHives[i].HiveName
/* SystemSecurity, sizeof(SystemSecurity) */);
if (!NT_SUCCESS(Status))
@ -995,7 +995,7 @@ Quit:
VOID
RegCleanupRegistry(
IN PUNICODE_STRING InstallPath)
IN PUNICODE_STRING NtSystemRoot)
{
NTSTATUS Status;
HANDLE KeyHandle;
@ -1094,7 +1094,7 @@ RegCleanupRegistry(
continue;
CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 3,
InstallPath->Buffer, L"System32\\config", RegistryHives[i].HiveName);
NtSystemRoot->Buffer, L"System32\\config", RegistryHives[i].HiveName);
RtlStringCchCopyW(DstPath, ARRAYSIZE(DstPath), SrcPath);
RtlStringCchCatW(DstPath, ARRAYSIZE(DstPath), L".sav");