PCH for csrss and win32csr, and remove rosrtl usage

svn path=/trunk/; revision=16361

diff --git a/reactos/subsys/csrss/api/handle.c b/reactos/subsys/csrss/api/handle.c
index 8ee6758..9e2bc31 100644 (file)
--- a/reactos/subsys/csrss/api/handle.c
+++ b/reactos/subsys/csrss/api/handle.c
@@ -9,11 +9,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <windows.h>
-#define NTOS_MODE_USER
-#include <ndk/ntndk.h>
-
-#include "api.h"
+#include "csrss.h"
 
 #define NDEBUG
 #include <debug.h>

diff --git a/reactos/subsys/csrss/api/process.c b/reactos/subsys/csrss/api/process.c
index 4aa4ce4..b8d48bf 100644 (file)
--- a/reactos/subsys/csrss/api/process.c
+++ b/reactos/subsys/csrss/api/process.c
@@ -9,12 +9,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <windows.h>
-#define NTOS_MODE_USER
-#include <ndk/ntndk.h>
-
-#include "api.h"
-#include "conio.h"
+#include "csrss.h"
 
 #define NDEBUG
 #include <debug.h>

diff --git a/reactos/subsys/csrss/api/user.c b/reactos/subsys/csrss/api/user.c
index 44abd2d..57cae12 100644 (file)
--- a/reactos/subsys/csrss/api/user.c
+++ b/reactos/subsys/csrss/api/user.c
@@ -9,16 +9,11 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <windows.h>
-#define NTOS_MODE_USER
-#include <ndk/ntndk.h>
-
-#include "api.h"
+#include "csrss.h"
 
 #define NDEBUG
 #include <debug.h>
 
-
 /* GLOBALS *******************************************************************/
 
 static BOOLEAN ServicesProcessIdValid = FALSE;

diff --git a/reactos/subsys/csrss/api/wapi.c b/reactos/subsys/csrss/api/wapi.c
index 5326472..7585925 100644 (file)
--- a/reactos/subsys/csrss/api/wapi.c
+++ b/reactos/subsys/csrss/api/wapi.c
@@ -10,12 +10,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <windows.h>
-#define NTOS_MODE_USER
-#include <ndk/ntndk.h>
-#include <rosrtl/thread.h>
-
-#include "api.h"
+#include "csrss.h"
 
 #define NDEBUG
 #include <debug.h>
@@ -170,7 +165,7 @@ ClientConnectionThread(HANDLE ServerPort)
     
     /* Close the port and exit the thread */
     NtClose(ServerPort);
-    RtlRosExitUserThread(STATUS_SUCCESS);
+    NtTerminateThread(NtCurrentThread(), STATUS_SUCCESS);
 }
 
 /**********************************************************************

diff --git a/reactos/subsys/csrss/csrss.c b/reactos/subsys/csrss/csrss.c
index 5a7b163..177a588 100644 (file)
--- a/reactos/subsys/csrss/csrss.c
+++ b/reactos/subsys/csrss/csrss.c
@@ -32,13 +32,7 @@
  *             actually does nothing but running).
  */
 
-#include <windows.h>
-#define NTOS_MODE_USER
-#include <ndk/ntndk.h>
-#include <csrss/csrss.h>
-#include <reactos/buildno.h>
-
-#include "api.h"
+#include "csrss.h"
 
 #define NDEBUG
 #include <debug.h>

diff --git a/reactos/subsys/csrss/csrss.h b/reactos/subsys/csrss/csrss.h
new file mode 100644 (file)
index 0000000..7bc5e6d
--- /dev/null
+++ b/reactos/subsys/csrss/csrss.h
@@ -0,0 +1,17 @@
+/* PSDK/NDK Headers */
+#include <windows.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
+
+/* Build Number */
+#include <reactos/buildno.h>
+
+/* Subsystem Manager Header */
+#include <sm/helper.h>
+
+/* Internal CSRSS Headers */
+#include <api.h>
+#include <conio.h>
+#include <csrplugin.h>
+
+/* EOF */

diff --git a/reactos/subsys/csrss/csrss.xml b/reactos/subsys/csrss/csrss.xml
index 40aa5fb..dceffa3 100644 (file)
--- a/reactos/subsys/csrss/csrss.xml
+++ b/reactos/subsys/csrss/csrss.xml
@@ -13,6 +13,7 @@
                <file>user.c</file>\r
                <file>wapi.c</file>\r
        </directory>\r
+    <pch>csrss.h</pch>\r
        <file>csrss.c</file>\r
        <file>init.c</file>\r
        <file>print.c</file>\r

diff --git a/reactos/subsys/csrss/init.c b/reactos/subsys/csrss/init.c
index 5dc1468..7e931de 100644 (file)
--- a/reactos/subsys/csrss/init.c
+++ b/reactos/subsys/csrss/init.c
@@ -10,13 +10,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <windows.h>
-#define NTOS_MODE_USER
-#include <ndk/ntndk.h>
-#include <sm/helper.h>
-
-#include "api.h"
-#include "csrplugin.h"
+#include "csrss.h"
 
 #define NDEBUG
 #include <debug.h>

diff --git a/reactos/subsys/csrss/print.c b/reactos/subsys/csrss/print.c
index 87862af..a0edc3d 100644 (file)
--- a/reactos/subsys/csrss/print.c
+++ b/reactos/subsys/csrss/print.c
@@ -27,10 +27,10 @@
  *             Compiled successfully with egcs 1.1.2
  */
 
-#include <windows.h>
-#define NTOS_MODE_USER
-#include <ndk/ntndk.h>
-#include <csrss/csrss.h>
+#include "csrss.h"
+
+#define NDEBUG
+#include <debug.h>
 
 VOID STDCALL DisplayString(LPCWSTR lpwString)
 {

diff --git a/reactos/subsys/csrss/video.c b/reactos/subsys/csrss/video.c
index 3964add..4b7642b 100644 (file)
--- a/reactos/subsys/csrss/video.c
+++ b/reactos/subsys/csrss/video.c
@@ -3,16 +3,16 @@
  * ReactOS Project
  */
 
-#include <windows.h>
-#define NTOS_MODE_USER
-#include <ndk/ntndk.h>
-#include <rosrtl/string.h>
+#include "csrss.h"
+
+#define NDEBUG
+#include <debug.h>
 
 ULONG
 InitializeVideoAddressSpace(VOID)
 {
    OBJECT_ATTRIBUTES ObjectAttributes;
-   UNICODE_STRING PhysMemName;
+   UNICODE_STRING PhysMemName = RTL_CONSTANT_STRING(L"\\Device\\PhysicalMemory");
    NTSTATUS Status;
    HANDLE PhysMemHandle;
    PVOID BaseAddress;
@@ -25,7 +25,6 @@ InitializeVideoAddressSpace(VOID)
    /*
     * Open the physical memory section
     */
-   RtlRosInitUnicodeStringFromLiteral(&PhysMemName, L"\\Device\\PhysicalMemory");
    InitializeObjectAttributes(&ObjectAttributes,
                              &PhysMemName,
                              0,

diff --git a/reactos/subsys/csrss/win32csr/conio.c b/reactos/subsys/csrss/win32csr/conio.c
index b676da8..7c127ba 100644 (file)
--- a/reactos/subsys/csrss/win32csr/conio.c
+++ b/reactos/subsys/csrss/win32csr/conio.c
@@ -8,20 +8,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <windows.h>
-#define NTOS_MODE_USER
-#include <ndk/ntndk.h>
-#include <ddk/ntddblue.h>
-#include <rosrtl/string.h>
-
-#include <string.h>
-
-#include "api.h"
-#include "conio.h"
-#include "desktopbg.h"
-#include "guiconsole.h"
-#include "tuiconsole.h"
-#include "win32csr.h"
+#include "w32csr.h"
 
 #define NDEBUG
 #include <debug.h>

diff --git a/reactos/subsys/csrss/win32csr/desktopbg.c b/reactos/subsys/csrss/win32csr/desktopbg.c
index 1f183de..c21beeb 100644 (file)
--- a/reactos/subsys/csrss/win32csr/desktopbg.c
+++ b/reactos/subsys/csrss/win32csr/desktopbg.c
@@ -7,12 +7,7 @@
  * ReactOS Operating System
  */
 
-#include <windows.h>
-#define NTOS_MODE_USER
-#include <ndk/ntndk.h>
-
-#include "api.h"
-#include "desktopbg.h"
+#include "w32csr.h"
 
 #define NDEBUG
 #include <debug.h>

diff --git a/reactos/subsys/csrss/win32csr/dllmain.c b/reactos/subsys/csrss/win32csr/dllmain.c
index d65e8a9..b4fb3f7 100644 (file)
--- a/reactos/subsys/csrss/win32csr/dllmain.c
+++ b/reactos/subsys/csrss/win32csr/dllmain.c
@@ -8,11 +8,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <windows.h>
-#include "csrplugin.h"
-#include "conio.h"
-#include "desktopbg.h"
-#include "guiconsole.h"
+#include "w32csr.h"
 
 #define NDEBUG
 #include <debug.h>

diff --git a/reactos/subsys/csrss/win32csr/exitros.c b/reactos/subsys/csrss/win32csr/exitros.c
index f94ab4c..b94066d 100644 (file)
--- a/reactos/subsys/csrss/win32csr/exitros.c
+++ b/reactos/subsys/csrss/win32csr/exitros.c
@@ -8,13 +8,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <windows.h>
-#define NTOS_MODE_USER
-#include <ndk/ntndk.h>
-#include <reactos/winlogon.h>
-
-#include "api.h"
-#include "win32csr.h"
+#include "w32csr.h"
 
 #define NDEBUG
 #include <debug.h>

diff --git a/reactos/subsys/csrss/win32csr/guiconsole.c b/reactos/subsys/csrss/win32csr/guiconsole.c
index 325aa8d..54dfd43 100644 (file)
--- a/reactos/subsys/csrss/win32csr/guiconsole.c
+++ b/reactos/subsys/csrss/win32csr/guiconsole.c
@@ -8,10 +8,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <windows.h>
-#include "conio.h"
-#include "guiconsole.h"
-#include "win32csr.h"
+#include "w32csr.h"
 
 #define NDEBUG
 #include <debug.h>

diff --git a/reactos/subsys/csrss/win32csr/tuiconsole.c b/reactos/subsys/csrss/win32csr/tuiconsole.c
index 9a86234..5aebf16 100644 (file)
--- a/reactos/subsys/csrss/win32csr/tuiconsole.c
+++ b/reactos/subsys/csrss/win32csr/tuiconsole.c
@@ -6,13 +6,7 @@
  * PURPOSE:         Implementation of text-mode consoles
  */
 
-#include <windows.h>
-#include <ddk/ntddblue.h>
-#include <string.h>
-#include "api.h"
-#include "conio.h"
-#include "tuiconsole.h"
-#include "win32csr.h"
+#include "w32csr.h"
 
 #define NDEBUG
 #include <debug.h>

diff --git a/reactos/subsys/csrss/win32csr/w32csr.h b/reactos/subsys/csrss/win32csr/w32csr.h
new file mode 100644 (file)
index 0000000..a2488a7
--- /dev/null
+++ b/reactos/subsys/csrss/win32csr/w32csr.h
@@ -0,0 +1,21 @@
+/* PSDK/NDK Headers */
+#include <windows.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
+
+/* Our own BLUE.SYS Driver for Console Output */
+#include <ddk/ntddblue.h>
+
+/* External Winlogon Header */
+#include <winlogon.h>
+
+/* Internal CSRSS Headers */
+#include <api.h>
+#include <conio.h>
+#include <csrplugin.h>
+#include <desktopbg.h>
+#include "guiconsole.h"
+#include "tuiconsole.h"
+#include <win32csr.h>
+
+/* EOF */

diff --git a/reactos/subsys/csrss/win32csr/win32csr.xml b/reactos/subsys/csrss/win32csr/win32csr.xml
index b6f8463..eab0d1f 100644 (file)
--- a/reactos/subsys/csrss/win32csr/win32csr.xml
+++ b/reactos/subsys/csrss/win32csr/win32csr.xml
@@ -8,6 +8,7 @@
        <library>kernel32</library>\r
        <library>user32</library>\r
        <library>gdi32</library>\r
+    <pch>w32csr.h</pch>\r
        <file>conio.c</file>\r
        <file>desktopbg.c</file>\r
        <file>dllmain.c</file>\r