[akhaldi] 61518: [CSRSRV] * Remove one time inclusions from the main header and put them back where they belong. * Remove inclusions and definitions that already exist in the main header. * Cleanup...

Author: akhaldi
Date: Sat Jan  4 10:27:29 2014
New Revision: 61518

URL: http://svn.reactos.org/svn/reactos?rev=61518&view=rev
Log:
[CSRSRV]
* Remove one time inclusions from the main header and put them back where they belong.
* Remove inclusions and definitions that already exist in the main header.
* Cleanup the main header.
CORE-7716

Modified:
    trunk/reactos/subsystems/win32/csrsrv/api.c
    trunk/reactos/subsystems/win32/csrsrv/api.h
    trunk/reactos/subsystems/win32/csrsrv/init.c
    trunk/reactos/subsystems/win32/csrsrv/procsup.c
    trunk/reactos/subsystems/win32/csrsrv/server.c
    trunk/reactos/subsystems/win32/csrsrv/srv.h

Modified: trunk/reactos/subsystems/win32/csrsrv/api.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/api...
==============================================================================
--- trunk/reactos/subsystems/win32/csrsrv/api.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrsrv/api.c	[iso-8859-1] Sat Jan  4 10:27:29 2014
@@ -10,6 +10,8 @@
 /* INCLUDES *******************************************************************/

#include "srv.h"
+
+#include <ndk/kefuncs.h>

#define NDEBUG
 #include <debug.h>

Modified: trunk/reactos/subsystems/win32/csrsrv/api.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/api...
==============================================================================
--- trunk/reactos/subsystems/win32/csrsrv/api.h	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrsrv/api.h	[iso-8859-1] Sat Jan  4 10:27:29 2014
@@ -6,13 +6,6 @@
  */

#pragma once
-
-#define NTOS_MODE_USER
-#include <ndk/psfuncs.h>
-#include <ndk/rtlfuncs.h>
-
-#include <csr/csrsrv.h>
-

extern RTL_CRITICAL_SECTION CsrProcessLock, CsrWaitListsLock;

Modified: trunk/reactos/subsystems/win32/csrsrv/init.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/ini...
==============================================================================
--- trunk/reactos/subsystems/win32/csrsrv/init.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrsrv/init.c	[iso-8859-1] Sat Jan  4 10:27:29 2014
@@ -10,6 +10,9 @@
 /* INCLUDES *******************************************************************/

#include "srv.h"
+
+#include <winreg.h>
+#include <ndk/cmfuncs.h>

#define NDEBUG
 #include <debug.h>

Modified: trunk/reactos/subsystems/win32/csrsrv/procsup.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/pro...
==============================================================================
--- trunk/reactos/subsystems/win32/csrsrv/procsup.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrsrv/procsup.c	[iso-8859-1] Sat Jan  4 10:27:29 2014
@@ -10,6 +10,8 @@
 /* INCLUDES *******************************************************************/

#include <srv.h>
+
+#include <winuser.h>

#define NDEBUG
 #include <debug.h>

Modified: trunk/reactos/subsystems/win32/csrsrv/server.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/ser...
==============================================================================
--- trunk/reactos/subsystems/win32/csrsrv/server.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrsrv/server.c	[iso-8859-1] Sat Jan  4 10:27:29 2014
@@ -9,6 +9,8 @@
 /* INCLUDES *******************************************************************/

#include "srv.h"
+
+#include <ndk/mmfuncs.h>

#define NDEBUG
 #include <debug.h>

Modified: trunk/reactos/subsystems/win32/csrsrv/srv.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/srv...
==============================================================================
--- trunk/reactos/subsystems/win32/csrsrv/srv.h	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrsrv/srv.h	[iso-8859-1] Sat Jan  4 10:27:29 2014
@@ -15,19 +15,15 @@
 #define WIN32_NO_STATUS
 #include <windef.h>
 #include <winbase.h>
-#include <winreg.h>
-#include <winuser.h>    // For EWX_FORCE
 #define NTOS_MODE_USER
 #include <ndk/setypes.h>
 #include <ndk/sefuncs.h>
 #include <ndk/exfuncs.h>
-#include <ndk/cmfuncs.h>
 #include <ndk/obfuncs.h>
 #include <ndk/lpcfuncs.h>
-#include <ndk/kefuncs.h>
-//#include <ndk/dbgktypes.h>
-#include <ndk/mmfuncs.h>
 #include <ndk/umfuncs.h>
+#include <ndk/psfuncs.h>
+#include <ndk/rtlfuncs.h>

/* CSR Header */
 #include <csr/csrsrv.h>
@@ -36,7 +32,6 @@
 #include <pseh/pseh2.h>

/* Subsystem Manager Header */
-#include <sm/helper.h>
 #include <sm/smmsg.h>

/* Internal CSRSS Header */
@@ -58,6 +53,4 @@
 #define InterlockedIncrementUL(Value) _InterlockedIncrement((PLONG)Value)
 #define InterlockedDecrementUL(Value) _InterlockedDecrement((PLONG)Value)

-#endif // _SRV_H
-
-/* EOF */
+#endif /* _SRV_H */