PCH for csrss and win32csr, and remove rosrtl usage Modified: trunk/reactos/subsys/csrss/api/handle.c Modified: trunk/reactos/subsys/csrss/api/process.c Modified: trunk/reactos/subsys/csrss/api/user.c Modified: trunk/reactos/subsys/csrss/api/wapi.c Modified: trunk/reactos/subsys/csrss/csrss.c Added: trunk/reactos/subsys/csrss/csrss.h Modified: trunk/reactos/subsys/csrss/csrss.xml Modified: trunk/reactos/subsys/csrss/init.c Modified: trunk/reactos/subsys/csrss/print.c Modified: trunk/reactos/subsys/csrss/video.c Modified: trunk/reactos/subsys/csrss/win32csr/conio.c Modified: trunk/reactos/subsys/csrss/win32csr/desktopbg.c Modified: trunk/reactos/subsys/csrss/win32csr/dllmain.c Modified: trunk/reactos/subsys/csrss/win32csr/exitros.c Modified: trunk/reactos/subsys/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsys/csrss/win32csr/tuiconsole.c Added: trunk/reactos/subsys/csrss/win32csr/w32csr.h Modified: trunk/reactos/subsys/csrss/win32csr/win32csr.xml _____
Modified: trunk/reactos/subsys/csrss/api/handle.c --- trunk/reactos/subsys/csrss/api/handle.c 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/api/handle.c 2005-07-01 03:03:06 UTC (rev 16361) @@ -9,12 +9,8 @@
/* INCLUDES ******************************************************************/
-#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include "csrss.h"
-#include "api.h" - #define NDEBUG #include <debug.h>
_____
Modified: trunk/reactos/subsys/csrss/api/process.c --- trunk/reactos/subsys/csrss/api/process.c 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/api/process.c 2005-07-01 03:03:06 UTC (rev 16361) @@ -9,13 +9,8 @@
/* INCLUDES ******************************************************************/
-#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include "csrss.h"
-#include "api.h" -#include "conio.h" - #define NDEBUG #include <debug.h>
_____
Modified: trunk/reactos/subsys/csrss/api/user.c --- trunk/reactos/subsys/csrss/api/user.c 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/api/user.c 2005-07-01 03:03:06 UTC (rev 16361) @@ -9,16 +9,11 @@
/* INCLUDES ******************************************************************/
-#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include "csrss.h"
-#include "api.h" - #define NDEBUG #include <debug.h>
- /* GLOBALS *******************************************************************/
static BOOLEAN ServicesProcessIdValid = FALSE; _____
Modified: trunk/reactos/subsys/csrss/api/wapi.c --- trunk/reactos/subsys/csrss/api/wapi.c 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/api/wapi.c 2005-07-01 03:03:06 UTC (rev 16361) @@ -10,13 +10,8 @@
/* INCLUDES ******************************************************************/
-#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> -#include <rosrtl/thread.h> +#include "csrss.h"
-#include "api.h" - #define NDEBUG #include <debug.h>
@@ -170,7 +165,7 @@
/* Close the port and exit the thread */ NtClose(ServerPort); - RtlRosExitUserThread(STATUS_SUCCESS); + NtTerminateThread(NtCurrentThread(), STATUS_SUCCESS); }
/********************************************************************** _____
Modified: trunk/reactos/subsys/csrss/csrss.c --- trunk/reactos/subsys/csrss/csrss.c 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/csrss.c 2005-07-01 03:03:06 UTC (rev 16361) @@ -32,14 +32,8 @@
* 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 "csrss.h"
-#include "api.h" - #define NDEBUG #include <debug.h>
_____
Added: trunk/reactos/subsys/csrss/csrss.h --- trunk/reactos/subsys/csrss/csrss.h 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/csrss.h 2005-07-01 03:03:06 UTC (rev 16361) @@ -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 */ _____
Modified: trunk/reactos/subsys/csrss/csrss.xml --- trunk/reactos/subsys/csrss/csrss.xml 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/csrss.xml 2005-07-01 03:03:06 UTC (rev 16361) @@ -13,6 +13,7 @@
<file>user.c</file> <file>wapi.c</file> </directory> + <pch>csrss.h</pch> <file>csrss.c</file> <file>init.c</file> <file>print.c</file> _____
Modified: trunk/reactos/subsys/csrss/init.c --- trunk/reactos/subsys/csrss/init.c 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/init.c 2005-07-01 03:03:06 UTC (rev 16361) @@ -10,14 +10,8 @@
/* INCLUDES ******************************************************************/
-#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> -#include <sm/helper.h> +#include "csrss.h"
-#include "api.h" -#include "csrplugin.h" - #define NDEBUG #include <debug.h>
_____
Modified: trunk/reactos/subsys/csrss/print.c --- trunk/reactos/subsys/csrss/print.c 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/print.c 2005-07-01 03:03:06 UTC (rev 16361) @@ -27,11 +27,11 @@
* 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) { UNICODE_STRING us; _____
Modified: trunk/reactos/subsys/csrss/video.c --- trunk/reactos/subsys/csrss/video.c 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/video.c 2005-07-01 03:03:06 UTC (rev 16361) @@ -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 @@ /* * Open the physical memory section */ - RtlRosInitUnicodeStringFromLiteral(&PhysMemName, L"\Device\PhysicalMemory"); InitializeObjectAttributes(&ObjectAttributes, &PhysMemName, 0, _____
Modified: trunk/reactos/subsys/csrss/win32csr/conio.c --- trunk/reactos/subsys/csrss/win32csr/conio.c 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/win32csr/conio.c 2005-07-01 03:03:06 UTC (rev 16361) @@ -8,21 +8,8 @@
/* INCLUDES ******************************************************************/
-#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> -#include <ddk/ntddblue.h> -#include <rosrtl/string.h> +#include "w32csr.h"
-#include <string.h> - -#include "api.h" -#include "conio.h" -#include "desktopbg.h" -#include "guiconsole.h" -#include "tuiconsole.h" -#include "win32csr.h" - #define NDEBUG #include <debug.h>
_____
Modified: trunk/reactos/subsys/csrss/win32csr/desktopbg.c --- trunk/reactos/subsys/csrss/win32csr/desktopbg.c 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/win32csr/desktopbg.c 2005-07-01 03:03:06 UTC (rev 16361) @@ -7,13 +7,8 @@
* ReactOS Operating System */
-#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include "w32csr.h"
-#include "api.h" -#include "desktopbg.h" - #define NDEBUG #include <debug.h>
_____
Modified: trunk/reactos/subsys/csrss/win32csr/dllmain.c --- trunk/reactos/subsys/csrss/win32csr/dllmain.c 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/win32csr/dllmain.c 2005-07-01 03:03:06 UTC (rev 16361) @@ -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> _____
Modified: trunk/reactos/subsys/csrss/win32csr/exitros.c --- trunk/reactos/subsys/csrss/win32csr/exitros.c 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/win32csr/exitros.c 2005-07-01 03:03:06 UTC (rev 16361) @@ -8,14 +8,8 @@
/* INCLUDES ******************************************************************/
-#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> -#include <reactos/winlogon.h> +#include "w32csr.h"
-#include "api.h" -#include "win32csr.h" - #define NDEBUG #include <debug.h>
_____
Modified: trunk/reactos/subsys/csrss/win32csr/guiconsole.c --- trunk/reactos/subsys/csrss/win32csr/guiconsole.c 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/win32csr/guiconsole.c 2005-07-01 03:03:06 UTC (rev 16361) @@ -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> _____
Modified: trunk/reactos/subsys/csrss/win32csr/tuiconsole.c --- trunk/reactos/subsys/csrss/win32csr/tuiconsole.c 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/win32csr/tuiconsole.c 2005-07-01 03:03:06 UTC (rev 16361) @@ -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> _____
Added: trunk/reactos/subsys/csrss/win32csr/w32csr.h --- trunk/reactos/subsys/csrss/win32csr/w32csr.h 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/win32csr/w32csr.h 2005-07-01 03:03:06 UTC (rev 16361) @@ -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 */ _____
Modified: trunk/reactos/subsys/csrss/win32csr/win32csr.xml --- trunk/reactos/subsys/csrss/win32csr/win32csr.xml 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/win32csr/win32csr.xml 2005-07-01 03:03:06 UTC (rev 16361) @@ -8,6 +8,7 @@
<library>kernel32</library> <library>user32</library> <library>gdi32</library> + <pch>w32csr.h</pch> <file>conio.c</file> <file>desktopbg.c</file> <file>dllmain.c</file>