* 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
/* INCLUDES *******************************************************************/
#include "consrv.h"
-#include "console.h"
-#include "include/conio.h"
#define NDEBUG
#include <debug.h>
-
/* TYPES **********************************************************************/
typedef struct _ALIAS_ENTRY
#pragma once
VOID IntDeleteAllAliases(PCONSOLE Console);
-
-/* EOF */
/* INCLUDES *******************************************************************/
-#include "consrv.h"
-#include "include/conio.h"
-#include "include/term.h"
-#include "handle.h"
-#include "lineinput.h"
+#include <consrv.h>
#define NDEBUG
#include <debug.h>
-
/* GLOBALS ********************************************************************/
#define ConSrvGetInputBuffer(ProcessData, Handle, Ptr, Access, LockConsole) \
/* INCLUDES *******************************************************************/
-#include "consrv.h"
-#include "console.h"
-#include "include/conio.h"
-#include "include/term.h"
-#include "conoutput.h"
-#include "handle.h"
+#include <consrv.h>
#define NDEBUG
#include <debug.h>
-
/* PRIVATE FUNCTIONS **********************************************************/
NTSTATUS
/* 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 "include/console.h"
-#include "console.h"
-#include "resource.h"
+#include <consrv.h>
+
+#include <alias.h>
+#include <coninput.h>
#define NDEBUG
#include <debug.h>
/* INCLUDES *******************************************************************/
-#include "consrv.h"
-#include "include/conio.h"
-
+#include <consrv.h>
/* DUMMY FRONTEND INTERFACE ***************************************************/
/* INCLUDES *******************************************************************/
-#include "consrv.h"
-#include "include/conio.h"
-#include "include/term.h"
-#include "conoutput.h"
-#include "handle.h"
+#include <consrv.h>
#define NDEBUG
#include <debug.h>
-
/* PRIVATE FUNCTIONS **********************************************************/
CONSOLE_IO_OBJECT_TYPE
/* INCLUDES *******************************************************************/
-#include "consrv.h"
-#include "include/conio.h"
-#include "include/term.h"
-#include "conoutput.h"
-#include "handle.h"
+#include <consrv.h>
#define NDEBUG
#include <debug.h>
-
/* GLOBALS ********************************************************************/
#define TAB_WIDTH 8
-
/* PRIVATE FUNCTIONS **********************************************************/
CONSOLE_IO_OBJECT_TYPE
/* 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) \
IN WCHAR UnicodeChar,
IN ULONG ShiftState,
IN BYTE KeyStateCtrl);
-
-/* EOF */
/* 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
/* INCLUDES *******************************************************************/
#include "consrv.h"
-#include "include/conio.h"
-#include "include/term.h"
-#include "handle.h"
+
+#include <ndk/psfuncs.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"
#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 ********************************************************************/
/***************/
BOOL LockConsole);
VOID FASTCALL ConSrvReleaseConsole(struct _CONSOLE* /* PCONSOLE */ Console,
BOOL WasConsoleLocked);
-
-/* EOF */
#ifndef __CONSRV_H__
#define __CONSRV_H__
-#pragma once
-
/* PSDK/NDK Headers */
#include <stdarg.h>
#define WIN32_NO_STATUS
#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 */
#include <csr/csrsrv.h>
/* CONSOLE Headers */
-#include <win/console.h>
#include <win/conmsg.h>
-
/* Heap Helpers */
#include "heap.h"
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__
-
-/* EOF */
+#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"
+
+#endif /* __CONSRV_H__ */
/* 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 *********************************************************/
/**********************************************************************
#pragma once
-#include "include/settings.h"
-#include "guisettings.h"
+#include <include/settings.h>
-/* EOF */
+#include "guisettings.h"
/* INCLUDES *******************************************************************/
-#include "consrv.h"
-#include "include/conio.h"
-#include "include/console.h"
-#include "include/settings.h"
-#include "guisettings.h"
+#include <consrv.h>
#define NDEBUG
#include <debug.h>
-
/* FUNCTIONS ******************************************************************/
BOOL
/* INCLUDES *******************************************************************/
-#include "consrv.h"
-#include "include/conio.h"
-#include "include/settings.h"
-#include "guisettings.h"
+#include <consrv.h>
#define NDEBUG
#include <debug.h>
-
/* FUNCTIONS ******************************************************************/
VOID
/* INCLUDES *******************************************************************/
-#include "consrv.h"
-#include "include/conio.h"
-#include "include/settings.h"
-#include "guisettings.h"
+#include <consrv.h>
#define NDEBUG
#include <debug.h>
-
VOID GuiConsoleMoveWindow(PGUI_CONSOLE_DATA GuiData);
VOID SwitchFullScreen(PGUI_CONSOLE_DATA GuiData, BOOL FullScreen);
/* INCLUDES *******************************************************************/
-#define COBJMACROS
-
-#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 <consrv.h>
#include <windowsx.h>
-
-#include <shlwapi.h>
+#define COBJMACROS
#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"
DWORD ProcessId,
LPCWSTR IconPath,
INT IconIndex);
-
-/* EOF */
/* INCLUDES *******************************************************************/
-#include "consrv.h"
-#include "include/conio.h"
-#include "include/settings.h"
-#include "guisettings.h"
+#include <consrv.h>
#define NDEBUG
#include <debug.h>
-
/* FUNCTIONS ******************************************************************/
COLORREF RGBFromAttrib2(PCONSOLE Console, WORD Attribute)
/* INCLUDES *******************************************************************/
#include "consrv.h"
-#include "include/conio.h"
-#include "include/term.h"
-#include "handle.h"
-#include "include/console.h"
-#include "console.h"
-#include "conoutput.h"
+
+#include <win/console.h>
#define NDEBUG
#include <debug.h>
-
/* GLOBALS ********************************************************************/
typedef struct _CONSOLE_IO_HANDLE
CONSOLE_IO_OBJECT_TYPE Type);
VOID FASTCALL ConSrvReleaseObject(PCONSOLE_IO_OBJECT Object,
BOOL IsConsoleLocked);
-
-/* EOF */
#define ConsoleAllocHeap(Flags, Size) RtlAllocateHeap(ConSrvHeap, Flags, Size)
#define ConsoleFreeHeap(HeapBase) RtlFreeHeap(ConSrvHeap, 0, HeapBase)
-
-/* EOF */
/* 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>
/* INCLUDES *******************************************************************/
#include "consrv.h"
-#include "console.h"
-#include "include/conio.h"
-#include "include/term.h"
#define NDEBUG
#include <debug.h>
VOID FASTCALL HistoryDeleteBuffers(PCONSOLE Console);
VOID FASTCALL LineInputKeyDown(PCONSOLE Console, KEY_EVENT_RECORD *KeyEvent);
-
-/* EOF */
PHANDLE pOutputHandle,
PHANDLE pErrorHandle);
VOID FASTCALL ConSrvRemoveConsole(PCONSOLE_PROCESS_DATA ProcessData);
-
-/* EOF */
#pragma once
#define IDS_CONSOLE_TITLE 500
-
-/* EOF */
/* 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];
#define NDEBUG
#include <debug.h>
-
/* PUBLIC SERVER APIS *********************************************************/
/*