Author: ion
Date: Tue Jan 17 17:42:47 2012
New Revision: 54990
URL:
http://svn.reactos.org/svn/reactos?rev=54990&view=rev
Log:
Fix boot. The fact this fixes it should worry about the state of CSRSS...
Modified:
trunk/reactos/dll/win32/kernel32/client/proc.c
trunk/reactos/include/reactos/subsys/csrss/csrss.h
Modified: trunk/reactos/dll/win32/kernel32/client/proc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Tue Jan 17 17:42:47 2012
@@ -801,7 +801,6 @@
SIZE_T Size;
BOOLEAN HavePebLock = FALSE, Result;
PPEB Peb = NtCurrentPeb();
- DPRINT("BasePushProcessParameters\n");
/* Get the full path name */
Size = GetFullPathNameW(ApplicationPathName,
@@ -1050,7 +1049,7 @@
RTL_USER_PROCESS_PARAMETERS_PROFILE_KERNEL : 0;
ProcessParameters->Flags |= (CreationFlags & PROFILE_SERVER) ?
RTL_USER_PROCESS_PARAMETERS_PROFILE_SERVER : 0;
- ProcessParameters->Flags |= (NtCurrentPeb()->ProcessParameters->Flags &
+ ProcessParameters->Flags |= (Peb->ProcessParameters->Flags &
RTL_USER_PROCESS_PARAMETERS_DISABLE_HEAP_CHECKS);
/* Write the Parameter Block */
@@ -1068,7 +1067,7 @@
sizeof(PVOID),
NULL);
if (!NT_SUCCESS(Status)) goto FailPath;
-
+
/* Check if there's any app compat data to write */
RemoteAppCompatData = NULL;
if (AppCompatData)
@@ -1082,7 +1081,7 @@
MEM_COMMIT,
PAGE_READWRITE);
if (!NT_SUCCESS(Status)) goto FailPath;
-
+
/* Write the application compatibility data */
Status = NtWriteVirtualMemory(ProcessHandle,
RemoteAppCompatData,
@@ -1091,7 +1090,7 @@
NULL);
if (!NT_SUCCESS(Status)) goto FailPath;
}
-
+
/* Write the PEB Pointer to the app compat data (might be NULL) */
Status = NtWriteVirtualMemory(ProcessHandle,
&RemotePeb->pShimData,
@@ -1109,7 +1108,7 @@
sizeof(ImageSubsystem),
NULL);
}
-
+
/* Success path */
Result = TRUE;
Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr…
==============================================================================
--- trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] Tue Jan 17 17:42:47
2012
@@ -51,6 +51,7 @@
typedef struct
{
+#if 0
//
// NT-type structure (BASE_CREATEPROCESS_MSG)
//
@@ -65,6 +66,7 @@
PVOID PebAddressNative;
ULONG PebAddressWow64;
USHORT ProcessorArchitecture;
+#endif
//
// ReactOS Data
//