Fix merge artifacts

svn path=/branches/ros-amd64-bringup/; revision=45078
This commit is contained in:
Timo Kreuzer 2010-01-14 09:53:02 +00:00
parent 7af355b0e9
commit 52c5ac7be7

View file

@ -1726,7 +1726,7 @@ Phase1InitializationDiscard(IN PVOID Context)
KeyValuePartialInformation,
&KeyPartialInfo,
sizeof(KeyPartialInfo),
&Size);
&Length);
if (!NT_SUCCESS(Status)) AlternateShell = FALSE;
}
@ -1878,17 +1878,17 @@ Phase1InitializationDiscard(IN PVOID Context)
ZwClose(ProcessInfo->ProcessHandle);
/* Free the initial process environment */
Length = 0;
Size = 0;
ZwFreeVirtualMemory(NtCurrentProcess(),
(PVOID*)&Environment,
&Length,
&Size,
MEM_RELEASE);
/* Free the initial process parameters */
Length = 0;
Size = 0;
ZwFreeVirtualMemory(NtCurrentProcess(),
(PVOID*)&ProcessParameters,
&Length,
&Size,
MEM_RELEASE);
/* Increase init phase */