Clarify a bit the code. No logical changes.

svn path=/trunk/; revision=58236
This commit is contained in:
Hermès Bélusca-Maïto 2013-01-26 23:56:07 +00:00
parent 3f7404e73b
commit 7ef6decbcf
2 changed files with 20 additions and 18 deletions

View file

@ -463,15 +463,17 @@ SmpConfigureKnownDlls(IN PWSTR ValueName,
IN PVOID EntryContext) IN PVOID EntryContext)
{ {
/* Check which value is being set */ /* Check which value is being set */
if (_wcsicmp(ValueName, L"DllDirectory")) if (_wcsicmp(ValueName, L"DllDirectory") == 0)
{
/* This is the directory, initialize it */
DPRINT("KnownDll Path: %S\n", ValueData);
return SmpInitializeKnownDllPath(&SmpKnownDllPath, ValueData, ValueLength);
}
else
{ {
/* Add to the linked list -- this is a file */ /* Add to the linked list -- this is a file */
return SmpSaveRegistryValue(EntryContext, ValueName, ValueData, TRUE); return SmpSaveRegistryValue(EntryContext, ValueName, ValueData, TRUE);
} }
/* This is the directory, initialize it */
DPRINT("KnownDll Path: %S\n", ValueData);
return SmpInitializeKnownDllPath(&SmpKnownDllPath, ValueData, ValueLength);
} }
NTSTATUS NTSTATUS
@ -499,7 +501,7 @@ SmpConfigureEnvironment(IN PWSTR ValueName,
} }
/* Check if the path is being set, and wait for the second instantiation */ /* Check if the path is being set, and wait for the second instantiation */
if (!(_wcsicmp(ValueName, L"Path")) && (++SmpCalledConfigEnv == 2)) if ((_wcsicmp(ValueName, L"Path") == 0) && (++SmpCalledConfigEnv == 2))
{ {
/* Allocate the path buffer */ /* Allocate the path buffer */
SmpDefaultLibPathBuffer = RtlAllocateHeap(RtlGetProcessHeap(), SmpDefaultLibPathBuffer = RtlAllocateHeap(RtlGetProcessHeap(),
@ -528,12 +530,12 @@ SmpConfigureSubSystems(IN PWSTR ValueName,
PSMP_REGISTRY_VALUE RegEntry; PSMP_REGISTRY_VALUE RegEntry;
PWCHAR SubsystemName; PWCHAR SubsystemName;
/* Is this a required or optional subsystem */ /* Is this a required or optional subsystem? */
if ((_wcsicmp(ValueName, L"Required")) && if ((_wcsicmp(ValueName, L"Required") != 0) &&
(_wcsicmp(ValueName, L"Optional"))) (_wcsicmp(ValueName, L"Optional") != 0))
{ {
/* It isn't, is this the PSI flag? */ /* It isn't, is this the PSI flag? */
if ((_wcsicmp(ValueName, L"PosixSingleInstance")) || if ((_wcsicmp(ValueName, L"PosixSingleInstance") != 0) ||
(ValueType != REG_DWORD)) (ValueType != REG_DWORD))
{ {
/* It isn't, must be a subsystem entry, add it to the list */ /* It isn't, must be a subsystem entry, add it to the list */
@ -567,18 +569,18 @@ SmpConfigureSubSystems(IN PWSTR ValueName,
RemoveEntryList(&RegEntry->Entry); RemoveEntryList(&RegEntry->Entry);
/* Figure out which list to put it in */ /* Figure out which list to put it in */
if (_wcsicmp(ValueName, L"Required")) if (_wcsicmp(ValueName, L"Required") == 0)
{
/* Put it into the optional list */
DPRINT("Optional\n");
InsertTailList(&SmpSubSystemsToDefer, &RegEntry->Entry);
}
else
{ {
/* Put it into the required list */ /* Put it into the required list */
DPRINT("Required\n"); DPRINT("Required\n");
InsertTailList(&SmpSubSystemsToLoad, &RegEntry->Entry); InsertTailList(&SmpSubSystemsToLoad, &RegEntry->Entry);
} }
else
{
/* Put it into the optional list */
DPRINT("Optional\n");
InsertTailList(&SmpSubSystemsToDefer, &RegEntry->Entry);
}
} }
/* Move to the next name */ /* Move to the next name */

View file

@ -595,7 +595,7 @@ SmpLoadSubSystemsForMuSession(IN PULONG MuSessionId,
{ {
/* Get each entry and check if it's the internal debug or not */ /* Get each entry and check if it's the internal debug or not */
RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry); RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry);
if (_wcsicmp(RegEntry->Name.Buffer, L"debug") == 0) if (_wcsicmp(RegEntry->Name.Buffer, L"Debug") == 0)
{ {
/* Load the internal debug system */ /* Load the internal debug system */
Status = SmpExecuteCommand(&RegEntry->Value, Status = SmpExecuteCommand(&RegEntry->Value,