[CONSRV]: Use string-safe functions to copy the font names into the fixed-size buffers.

[reactos.git] / reactos / win32ss / user / winsrv / consrv / consrv.h

diff --git a/reactos/win32ss/user/winsrv/consrv/consrv.h b/reactos/win32ss/user/winsrv/consrv/consrv.h
index 57a0acf..c17573e 100644 (file)
--- a/reactos/win32ss/user/winsrv/consrv/consrv.h
+++ b/reactos/win32ss/user/winsrv/consrv/consrv.h
@@ -9,31 +9,21 @@
 #ifndef __CONSRV_H__
 #define __CONSRV_H__
 
+/* Main header */
+#include "../winsrv.h"
+
+#include <strsafe.h>
+
 /* PSDK/NDK Headers */
-#include <stdarg.h>
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
-#include <windef.h>
-#include <winbase.h>
+
 #include <winnls.h>
-#include <winreg.h>
 #include <wincon.h>
-#include <winuser.h>
+
 #define NTOS_MODE_USER
-#include <ndk/exfuncs.h>
 #include <ndk/mmfuncs.h>
-#include <ndk/obfuncs.h>
-#include <ndk/rtlfuncs.h>
-
-/* Public Win32K Headers */
-#include <ntuser.h>
-
-/* PSEH for SEH Support */
-#include <pseh/pseh2.h>
-
-/* CSRSS Header */
-#include <csr/csrsrv.h>
 
 /* CONSOLE Headers */
 #include <win/conmsg.h>
@@ -51,22 +41,29 @@ typedef struct _CONSOLE_PROCESS_DATA
 {
     LIST_ENTRY ConsoleLink;
     PCSR_PROCESS Process;   // Process owning this structure.
-    HANDLE InputWaitHandle;
 
     HANDLE ConsoleHandle;
-    HANDLE ParentConsoleHandle;
-
-    BOOLEAN ConsoleApp;    // TRUE if it is a CUI app, FALSE otherwise.
+    BOOLEAN ConsoleApp;     // TRUE if it is a CUI app, FALSE otherwise.
 
     RTL_CRITICAL_SECTION HandleTableLock;
     ULONG HandleTableSize;
     struct _CONSOLE_IO_HANDLE* /* PCONSOLE_IO_HANDLE */ HandleTable; // Length-varying table
 
-    LPTHREAD_START_ROUTINE CtrlDispatcher;
-    LPTHREAD_START_ROUTINE PropDispatcher; // We hold the property dialog handler there, till all the GUI thingie moves out from CSRSS.
+    LPTHREAD_START_ROUTINE CtrlRoutine;
+    LPTHREAD_START_ROUTINE PropRoutine; // We hold the property dialog handler there, till all the GUI thingie moves out from CSRSS.
+    // LPTHREAD_START_ROUTINE ImeRoutine;
 } CONSOLE_PROCESS_DATA, *PCONSOLE_PROCESS_DATA;
 
+
+// Helper for code refactoring
+// #define USE_NEW_CONSOLE_WAY
+
+#ifndef USE_NEW_CONSOLE_WAY
 #include "include/conio.h"
+#else
+#include "include/conio_winsrv.h"
+#endif
+
 #include "include/console.h"
 #include "include/settings.h"
 #include "include/term.h"
@@ -75,4 +72,11 @@ typedef struct _CONSOLE_PROCESS_DATA
 #include "handle.h"
 #include "lineinput.h"
 
+/* shutdown.c */
+ULONG
+NTAPI
+ConsoleClientShutdown(IN PCSR_PROCESS CsrProcess,
+                      IN ULONG Flags,
+                      IN BOOLEAN FirstPhase);
+
 #endif /* __CONSRV_H__ */