[CONSRV]

* Remove one time inclusions from the main header and put them back where they belong.
* Improve header inclusions.
CORE-7716

svn path=/trunk/; revision=61985

reactos/win32ss/user/winsrv/consrv/alias.c

@@ -10,13 +10,10 @@
 /* INCLUDES *******************************************************************/
 
 #include "consrv.h"
-#include "console.h"
-#include "include/conio.h"
 
 #define NDEBUG
 #include <debug.h>
 
-
 /* TYPES **********************************************************************/
 
 typedef struct _ALIAS_ENTRY

reactos/win32ss/user/winsrv/consrv/alias.h

@@ -10,5 +10,3 @@
 #pragma once
 
 VOID IntDeleteAllAliases(PCONSOLE Console);
-
-/* EOF */

reactos/win32ss/user/winsrv/consrv/condrv/coninput.c

@@ -9,16 +9,11 @@
 
 /* INCLUDES *******************************************************************/
 
-#include "consrv.h"
+#include <consrv.h>
-#include "include/conio.h"
-#include "include/term.h"
-#include "handle.h"
-#include "lineinput.h"
 
 #define NDEBUG
 #include <debug.h>
 
-
 /* GLOBALS ********************************************************************/
 
 #define ConSrvGetInputBuffer(ProcessData, Handle, Ptr, Access, LockConsole)     \

reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c

@@ -9,17 +9,11 @@
 
 /* INCLUDES *******************************************************************/
 
-#include "consrv.h"
+#include <consrv.h>
-#include "console.h"
-#include "include/conio.h"
-#include "include/term.h"
-#include "conoutput.h"
-#include "handle.h"
 
 #define NDEBUG
 #include <debug.h>
 
-
 /* PRIVATE FUNCTIONS **********************************************************/
 
 NTSTATUS

reactos/win32ss/user/winsrv/consrv/condrv/console.c

@@ -10,20 +10,10 @@
 
 /* INCLUDES *******************************************************************/
 
-#include "consrv.h"
+#include <consrv.h>
-#include "include/conio.h"
-#include "include/term.h"
-#include "handle.h"
-#include "procinit.h"
-#include "alias.h"
-#include "coninput.h"
-#include "conoutput.h"
-#include "lineinput.h"
-#include "include/settings.h"
 
-#include "include/console.h"
+#include <alias.h>
-#include "console.h"
+#include <coninput.h>
-#include "resource.h"
 
 #define NDEBUG
 #include <debug.h>

reactos/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c

@@ -9,9 +9,7 @@
 
 /* INCLUDES *******************************************************************/
 
-#include "consrv.h"
+#include <consrv.h>
-#include "include/conio.h"
-
 
 /* DUMMY FRONTEND INTERFACE ***************************************************/
 

reactos/win32ss/user/winsrv/consrv/condrv/graphics.c

@@ -11,16 +11,11 @@
 
 /* INCLUDES *******************************************************************/
 
-#include "consrv.h"
+#include <consrv.h>
-#include "include/conio.h"
-#include "include/term.h"
-#include "conoutput.h"
-#include "handle.h"
 
 #define NDEBUG
 #include <debug.h>
 
-
 /* PRIVATE FUNCTIONS **********************************************************/
 
 CONSOLE_IO_OBJECT_TYPE

reactos/win32ss/user/winsrv/consrv/condrv/text.c

@@ -9,21 +9,15 @@
 
 /* INCLUDES *******************************************************************/
 
-#include "consrv.h"
+#include <consrv.h>
-#include "include/conio.h"
-#include "include/term.h"
-#include "conoutput.h"
-#include "handle.h"
 
 #define NDEBUG
 #include <debug.h>
 
-
 /* GLOBALS ********************************************************************/
 
 #define TAB_WIDTH   8
 
-
 /* PRIVATE FUNCTIONS **********************************************************/
 
 CONSOLE_IO_OBJECT_TYPE

reactos/win32ss/user/winsrv/consrv/coninput.c

@@ -10,15 +10,10 @@
 /* INCLUDES *******************************************************************/
 
 #include "consrv.h"
-#include "include/conio.h"
-#include "include/term.h"
-#include "handle.h"
-#include "lineinput.h"
 
 #define NDEBUG
 #include <debug.h>
 
-
 /* GLOBALS ********************************************************************/
 
 #define ConSrvGetInputBuffer(ProcessData, Handle, Ptr, Access, LockConsole)     \

reactos/win32ss/user/winsrv/consrv/coninput.h

@@ -19,5 +19,3 @@ ConDrvProcessKey(IN PCONSOLE Console,
                  IN WCHAR UnicodeChar,
                  IN ULONG ShiftState,
                  IN BYTE KeyStateCtrl);
-
-/* EOF */

reactos/win32ss/user/winsrv/consrv/conoutput.c

@@ -10,19 +10,10 @@
 /* INCLUDES *******************************************************************/
 
 #include "consrv.h"
-#include "console.h"
-#include "include/conio.h"
-#include "include/term.h"
-#include "conoutput.h"
-#include "handle.h"
 
 #define NDEBUG
 #include <debug.h>
 
-
-/* PRIVATE FUNCTIONS **********************************************************/
-
-
 /* PUBLIC SERVER APIS *********************************************************/
 
 NTSTATUS NTAPI

reactos/win32ss/user/winsrv/consrv/console.c

@@ -11,29 +11,18 @@
 /* INCLUDES *******************************************************************/
 
 #include "consrv.h"
-#include "include/conio.h"
-#include "include/term.h"
-#include "handle.h"
-#include "procinit.h"
-#include "alias.h"
-#include "coninput.h"
-#include "conoutput.h"
-#include "lineinput.h"
-#include "include/settings.h"
 
-#include "frontends/gui/guiterm.h"
+#include <ndk/psfuncs.h>
+
+#include "procinit.h"
+
 #ifdef TUITERM_COMPILE
 #include "frontends/tui/tuiterm.h"
 #endif
 
-#include "include/console.h"
-#include "console.h"
-#include "resource.h"
-
 #define NDEBUG
 #include <debug.h>
 
-
 /* GLOBALS ********************************************************************/
 
 /***************/

reactos/win32ss/user/winsrv/consrv/console.h

@@ -23,5 +23,3 @@ NTSTATUS FASTCALL ConSrvGetConsole(PCONSOLE_PROCESS_DATA ProcessData,
                                    BOOL LockConsole);
 VOID FASTCALL ConSrvReleaseConsole(struct _CONSOLE* /* PCONSOLE */ Console,
                                    BOOL WasConsoleLocked);
-
-/* EOF */

reactos/win32ss/user/winsrv/consrv/consrv.h

@@ -9,8 +9,6 @@
 #ifndef __CONSRV_H__
 #define __CONSRV_H__
 
-#pragma once
-
 /* PSDK/NDK Headers */
 #include <stdarg.h>
 #define WIN32_NO_STATUS
@@ -18,18 +16,14 @@
 #define COM_NO_WINDOWS_H
 #include <windef.h>
 #include <winbase.h>
-#include <wingdi.h>
 #include <winnls.h>
 #include <winreg.h>
 #include <wincon.h>
 #include <winuser.h>
 #define NTOS_MODE_USER
 #include <ndk/exfuncs.h>
-#include <ndk/iofuncs.h>
 #include <ndk/mmfuncs.h>
 #include <ndk/obfuncs.h>
-#include <ndk/psfuncs.h>
-#include <ndk/setypes.h>
 #include <ndk/rtlfuncs.h>
 
 /* Public Win32K Headers */
@@ -42,10 +36,8 @@
 #include <csr/csrsrv.h>
 
 /* CONSOLE Headers */
-#include <win/console.h>
 #include <win/conmsg.h>
 
-
 /* Heap Helpers */
 #include "heap.h"
 
@@ -74,6 +66,14 @@ typedef struct _CONSOLE_PROCESS_DATA
     LPTHREAD_START_ROUTINE PropDispatcher; // We hold the property dialog handler there, till all the GUI thingie moves out from CSRSS.
 } CONSOLE_PROCESS_DATA, *PCONSOLE_PROCESS_DATA;
 
-#endif // __CONSRV_H__
+#include "include/conio.h"
+#include "console.h"
+#include "conoutput.h"
+#include "handle.h"
+#include "lineinput.h"
+#include "frontends/gui/guisettings.h"
+#include "include/console.h"
+#include "include/settings.h"
+#include "include/term.h"
 
-/* EOF */
+#endif /* __CONSRV_H__ */

reactos/win32ss/user/winsrv/consrv/frontendctl.c

@@ -9,19 +9,10 @@
 /* INCLUDES *******************************************************************/
 
 #include "consrv.h"
-#include "include/conio.h"
-#include "include/term.h"
-#include "conoutput.h"
-#include "console.h"
-#include "handle.h"
 
 #define NDEBUG
 #include <debug.h>
 
-
-/* PRIVATE FUNCTIONS **********************************************************/
-
-
 /* PUBLIC SERVER APIS *********************************************************/
 
 /**********************************************************************

reactos/win32ss/user/winsrv/consrv/frontends/gui/consolecpl.h

@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include "include/settings.h"
+#include <include/settings.h>
-#include "guisettings.h"
 
-/* EOF */
+#include "guisettings.h"

reactos/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c

@@ -8,16 +8,11 @@
 
 /* INCLUDES *******************************************************************/
 
-#include "consrv.h"
+#include <consrv.h>
-#include "include/conio.h"
-#include "include/console.h"
-#include "include/settings.h"
-#include "guisettings.h"
 
 #define NDEBUG
 #include <debug.h>
 
-
 /* FUNCTIONS ******************************************************************/
 
 BOOL

reactos/win32ss/user/winsrv/consrv/frontends/gui/graphics.c

@@ -8,15 +8,11 @@
 
 /* INCLUDES *******************************************************************/
 
-#include "consrv.h"
+#include <consrv.h>
-#include "include/conio.h"
-#include "include/settings.h"
-#include "guisettings.h"
 
 #define NDEBUG
 #include <debug.h>
 
-
 /* FUNCTIONS ******************************************************************/
 
 VOID

reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c

@@ -9,15 +9,11 @@
 
 /* INCLUDES *******************************************************************/
 
-#include "consrv.h"
+#include <consrv.h>
-#include "include/conio.h"
-#include "include/settings.h"
-#include "guisettings.h"
 
 #define NDEBUG
 #include <debug.h>
 
-
 VOID GuiConsoleMoveWindow(PGUI_CONSOLE_DATA GuiData);
 VOID SwitchFullScreen(PGUI_CONSOLE_DATA GuiData, BOOL FullScreen);
 

reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c

@@ -11,25 +11,18 @@
 
 /* INCLUDES *******************************************************************/
 
-#define COBJMACROS
+#include <consrv.h>
-
-#include "consrv.h"
-#include "include/conio.h"
-#include "include/console.h"
-#include "include/settings.h"
-#include "conoutput.h"
-#include "guiterm.h"
-#include "guisettings.h"
-#include "resource.h"
 
 #include <windowsx.h>
-
+#define COBJMACROS
-#include <shlwapi.h>
 #include <shlobj.h>
 
 #define NDEBUG
 #include <debug.h>
 
+#include "guiterm.h"
+#include "resource.h"
+
 /* GUI Console Window Class name */
 #define GUI_CONSOLE_WINDOW_CLASS L"ConsoleWindowClass"
 

reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h

@@ -24,5 +24,3 @@ NTSTATUS FASTCALL GuiInitConsole(PCONSOLE Console,
                                  DWORD ProcessId,
                                  LPCWSTR IconPath,
                                  INT IconIndex);
-
-/* EOF */

reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c

@@ -11,15 +11,11 @@
 
 /* INCLUDES *******************************************************************/
 
-#include "consrv.h"
+#include <consrv.h>
-#include "include/conio.h"
-#include "include/settings.h"
-#include "guisettings.h"
 
 #define NDEBUG
 #include <debug.h>
 
-
 /* FUNCTIONS ******************************************************************/
 
 COLORREF RGBFromAttrib2(PCONSOLE Console, WORD Attribute)

reactos/win32ss/user/winsrv/consrv/handle.c

@@ -11,17 +11,12 @@
 /* INCLUDES *******************************************************************/
 
 #include "consrv.h"
-#include "include/conio.h"
+
-#include "include/term.h"
+#include <win/console.h>
-#include "handle.h"
-#include "include/console.h"
-#include "console.h"
-#include "conoutput.h"
 
 #define NDEBUG
 #include <debug.h>
 
-
 /* GLOBALS ********************************************************************/
 
 typedef struct _CONSOLE_IO_HANDLE

reactos/win32ss/user/winsrv/consrv/handle.h

@@ -30,5 +30,3 @@ NTSTATUS FASTCALL ConSrvGetObject(PCONSOLE_PROCESS_DATA ProcessData,
                                   CONSOLE_IO_OBJECT_TYPE Type);
 VOID FASTCALL ConSrvReleaseObject(PCONSOLE_IO_OBJECT Object,
                                   BOOL IsConsoleLocked);
-
-/* EOF */

reactos/win32ss/user/winsrv/consrv/heap.h

@@ -13,5 +13,3 @@ extern HANDLE ConSrvHeap;
 
 #define ConsoleAllocHeap(Flags, Size)   RtlAllocateHeap(ConSrvHeap, Flags, Size)
 #define ConsoleFreeHeap(HeapBase)       RtlFreeHeap(ConSrvHeap, 0, HeapBase)
-
-/* EOF */

reactos/win32ss/user/winsrv/consrv/init.c

@@ -9,11 +9,9 @@
 /* INCLUDES *******************************************************************/
 
 #include "consrv.h"
+
 #include "api.h"
 #include "procinit.h"
-#include "include/conio.h"
-#include "include/console.h"
-#include "console.h"
 
 #define NDEBUG
 #include <debug.h>

reactos/win32ss/user/winsrv/consrv/lineinput.c

@@ -11,9 +11,6 @@
 /* INCLUDES *******************************************************************/
 
 #include "consrv.h"
-#include "console.h"
-#include "include/conio.h"
-#include "include/term.h"
 
 #define NDEBUG
 #include <debug.h>

reactos/win32ss/user/winsrv/consrv/lineinput.h

@@ -10,5 +10,3 @@
 
 VOID FASTCALL HistoryDeleteBuffers(PCONSOLE Console);
 VOID FASTCALL LineInputKeyDown(PCONSOLE Console, KEY_EVENT_RECORD *KeyEvent);
-
-/* EOF */

reactos/win32ss/user/winsrv/consrv/procinit.h

@@ -20,5 +20,3 @@ NTSTATUS FASTCALL ConSrvInheritConsole(PCONSOLE_PROCESS_DATA ProcessData,
                                        PHANDLE pOutputHandle,
                                        PHANDLE pErrorHandle);
 VOID FASTCALL ConSrvRemoveConsole(PCONSOLE_PROCESS_DATA ProcessData);
-
-/* EOF */

reactos/win32ss/user/winsrv/consrv/resource.h

@@ -8,5 +8,3 @@
 #pragma once
 
 #define IDS_CONSOLE_TITLE 500
-
-/* EOF */

reactos/win32ss/user/winsrv/consrv/settings.c

@@ -10,16 +10,12 @@
 /* INCLUDES *******************************************************************/
 
 #include "consrv.h"
-#include "include/conio.h"
-#include "include/term.h"
-#include "include/settings.h"
 
 #include <stdio.h> // for swprintf
 
 #define NDEBUG
 #include <debug.h>
 
-
 /* GLOBALS ********************************************************************/
 
 extern const COLORREF s_Colors[16];

reactos/win32ss/user/winsrv/consrv/subsysreg.c

@@ -13,7 +13,6 @@
 #define NDEBUG
 #include <debug.h>
 
-
 /* PUBLIC SERVER APIS *********************************************************/
 
 /*