Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 13:05:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SMSS] Call SmpConfigureEnvironment() twice in order to resolve forward environment variables references.

Browse source 
Example: environment variable EnvVar1 that refers to a later-defined
variable EnvVar2.
This commit is contained in:
Hermès Bélusca-Maïto 2022-11-02 15:46:08 +01:00
parent 4ac263c93a
commit 258caa85d1
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

26
base/system/smss/sminit.c
View file

@ -477,6 +477,12 @@ SmpConfigureKnownDlls(IN PWSTR ValueName,
} }
} }
/**
* @remark
* SmpConfigureEnvironment() should be called twice in order to resolve
* forward references to environment variables.
* See the two L"Environment" entries in SmpRegistryConfigurationTable[].
**/
NTSTATUS NTSTATUS
NTAPI NTAPI
SmpConfigureEnvironment(IN PWSTR ValueName, SmpConfigureEnvironment(IN PWSTR ValueName,
@ -493,7 +499,7 @@ SmpConfigureEnvironment(IN PWSTR ValueName,
RtlInitUnicodeString(&ValueString, ValueName); RtlInitUnicodeString(&ValueString, ValueName);
RtlInitUnicodeString(&DataString, ValueData); RtlInitUnicodeString(&DataString, ValueData);
DPRINT("Setting %wZ = %wZ\n", &ValueString, &DataString); DPRINT("Setting %wZ = %wZ\n", &ValueString, &DataString);
Status = RtlSetEnvironmentVariable(0, &ValueString, &DataString); Status = RtlSetEnvironmentVariable(NULL, &ValueString, &DataString);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT1("SMSS: 'SET %wZ = %wZ' failed - Status == %lx\n", DPRINT1("SMSS: 'SET %wZ = %wZ' failed - Status == %lx\n",
@ -716,6 +722,13 @@ SmpRegistryConfigurationTable[] =
0 0
}, },
/**
* @remark
* SmpConfigureEnvironment() is expected to be called twice
* (see SmpCalledConfigEnv) in order to resolve forward references
* to environment variables (e.g. EnvVar1 referring to EnvVar2,
* before EnvVar2 is defined).
**/
{ {
SmpConfigureEnvironment, SmpConfigureEnvironment,
RTL_QUERY_REGISTRY_SUBKEY, RTL_QUERY_REGISTRY_SUBKEY,
@ -726,6 +739,17 @@ SmpRegistryConfigurationTable[] =
0 0
}, },
{
SmpConfigureEnvironment,
RTL_QUERY_REGISTRY_SUBKEY,
L"Environment",
NULL,
REG_NONE,
NULL,
0
},
/****/
{ {
SmpConfigureSubSystems, SmpConfigureSubSystems,
RTL_QUERY_REGISTRY_SUBKEY, RTL_QUERY_REGISTRY_SUBKEY,