From 3735acec50e5eacc42d5019a256d826187a9ddca Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Tue, 17 Jan 2012 17:42:47 +0000
Subject: [PATCH] Fix boot. The fact this fixes it should worry about the state
 of CSRSS...

svn path=/trunk/; revision=54990
---
 reactos/dll/win32/kernel32/client/proc.c     | 11 +++++------
 reactos/include/reactos/subsys/csrss/csrss.h |  2 ++
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/reactos/dll/win32/kernel32/client/proc.c b/reactos/dll/win32/kernel32/client/proc.c
index 06881f405b6..1a542b03dc4 100644
--- a/reactos/dll/win32/kernel32/client/proc.c
+++ b/reactos/dll/win32/kernel32/client/proc.c
@@ -801,7 +801,6 @@ BasePushProcessParameters(IN ULONG ParameterFlags,
     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 @@ BasePushProcessParameters(IN ULONG ParameterFlags,
                                  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 @@ BasePushProcessParameters(IN ULONG ParameterFlags,
                                   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 @@ BasePushProcessParameters(IN ULONG ParameterFlags,
                                          MEM_COMMIT,
                                          PAGE_READWRITE);
         if (!NT_SUCCESS(Status)) goto FailPath;
-        
+
         /* Write the application compatibility data */
         Status = NtWriteVirtualMemory(ProcessHandle,
                                       RemoteAppCompatData,
@@ -1091,7 +1090,7 @@ BasePushProcessParameters(IN ULONG ParameterFlags,
                                       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 @@ BasePushProcessParameters(IN ULONG ParameterFlags,
                              sizeof(ImageSubsystem),
                              NULL);
     }
-    
+
     /* Success path */
     Result = TRUE;
 
diff --git a/reactos/include/reactos/subsys/csrss/csrss.h b/reactos/include/reactos/subsys/csrss/csrss.h
index 17642f63453..5f086010f71 100644
--- a/reactos/include/reactos/subsys/csrss/csrss.h
+++ b/reactos/include/reactos/subsys/csrss/csrss.h
@@ -51,6 +51,7 @@ typedef struct _BASE_SXS_CREATEPROCESS_MSG
 
 typedef struct
 {
+#if 0
     //
     // NT-type structure (BASE_CREATEPROCESS_MSG)
     //
@@ -65,6 +66,7 @@ typedef struct
     PVOID PebAddressNative;
     ULONG PebAddressWow64;
     USHORT ProcessorArchitecture;
+#endif
     //
     // ReactOS Data
     //