From: Hermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Date: Tue, 13 Nov 2012 23:45:02 +0000 (+0000)
Subject: [CSRSRV]
X-Git-Tag: backups/ros-csrss@60644~154
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=6716529b846423f8e1bd61031208c800d03d7388

[CSRSRV]
- Comments formatting.
- Correct a nasty initialization bug which unveiled itself as, eg., critical sections being already initialized in consoles, whereas we were creating new ones. It was because we didn't copy correctly per-process server data from parent process to child process. Now consoles initialize finely.

Now, only modifications to the console subsystem remain to make it totally conform to the new messaging structures of csrss (I mean, using the capture buffers).

svn path=/branches/ros-csrss/; revision=57703
---

diff --git a/subsystems/win32/csrsrv/init.c b/subsystems/win32/csrsrv/init.c
index 71f1e6cb2bc..6bda6ba3a99 100644
--- a/subsystems/win32/csrsrv/init.c
+++ b/subsystems/win32/csrsrv/init.c
@@ -763,9 +763,11 @@ CsrInitCsrRootProcess(VOID)
     }
 
     /*
-     * Our Root Process was never officially initalized, so write the data
-     * for each Server DLL manually.
+     * Our Root Process was never officially initalized,
+     * so write the data for each Server DLL manually.
      */
+
+    /* Loop every DLL */
     for (i = 0; i < CSR_SERVER_DLL_MAX; i++)
     {
         /* Get the current Server */
diff --git a/subsystems/win32/csrsrv/procsup.c b/subsystems/win32/csrsrv/procsup.c
index 8fb76e10ac6..052b79c3cf1 100644
--- a/subsystems/win32/csrsrv/procsup.c
+++ b/subsystems/win32/csrsrv/procsup.c
@@ -562,7 +562,7 @@ CsrCreateProcess(IN HANDLE hProcess,
 
     /* Inherit the Process Data */
     CurrentProcess = CurrentThread->Process;
-    ProcessData = &CurrentProcess->ServerData[CSR_SERVER_DLL_MAX];
+    ProcessData = &CsrProcess->ServerData[CSR_SERVER_DLL_MAX];
     for (i = 0; i < CSR_SERVER_DLL_MAX; i++)
     {
         /* Get the current Server */