[CONSRV]

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

diff --git a/win32ss/user/consrv/consrv.h b/win32ss/user/consrv/consrv.h
index 3bf081c..ed5a18e 100644 (file)
--- a/win32ss/user/consrv/consrv.h
+++ b/win32ss/user/consrv/consrv.h
@@ -21,21 +21,25 @@
 #include <csr/csrsrv.h>
 
 /* CONSOLE Headers */
+#include <win/console.h>
 #include <win/conmsg.h>
-// #include <win/base.h>
-
-//#include "guiconsole.h"
-//#include "tuiconsole.h"
 
 #include "resource.h"
 
 /* Shared header with console.dll */
 #include "console.h"
 
+
+extern HINSTANCE ConSrvDllInstance;
 extern HANDLE ConSrvHeap;
 // extern HANDLE BaseSrvSharedHeap;
 // extern PBASE_STATIC_SERVER_DATA BaseStaticServerData;
 
+/* Object type magic numbers */
+#define CONIO_CONSOLE_MAGIC         0x00000001  // -->  Input-type handles
+#define CONIO_SCREEN_BUFFER_MAGIC   0x00000002  // --> Output-type handles
+
+/* Common things to input/output/console objects */
 typedef struct Object_tt
 {
     LONG Type;
@@ -46,6 +50,36 @@ typedef struct Object_tt
 } Object_t;
 
 
+typedef struct _CSRSS_HANDLE
+{
+    Object_t *Object;   /* The object on which the handle points to */
+    DWORD Access;
+    BOOL Inheritable;
+    DWORD ShareMode;
+} CSRSS_HANDLE, *PCSRSS_HANDLE;
+
+
+#define ConsoleGetPerProcessData(pcsrprocess)   \
+    ((PCONSOLE_PROCESS_DATA)((pcsrprocess)->ServerData[CONSRV_SERVERDLL_INDEX]))
+
+typedef struct _CONSOLE_PROCESS_DATA
+{
+    LIST_ENTRY ConsoleLink;
+    PCSR_PROCESS Process;   // Process owning this structure.
+    HANDLE ConsoleEvent;
+    /* PCSRSS_CONSOLE */ struct tagCSRSS_CONSOLE* Console;
+    /* PCSRSS_CONSOLE */ struct tagCSRSS_CONSOLE* ParentConsole;
+
+    // BOOL bInheritHandles;
+    BOOL ConsoleApp;    // TRUE if it is a CUI app, FALSE otherwise.
+
+    RTL_CRITICAL_SECTION HandleTableLock;
+    ULONG HandleTableSize;
+    PCSRSS_HANDLE HandleTable; // Length-varying table
+    LPTHREAD_START_ROUTINE CtrlDispatcher;
+} CONSOLE_PROCESS_DATA, *PCONSOLE_PROCESS_DATA;
+
+
 /* alias.c */
 CSR_API(SrvAddConsoleAlias);
 CSR_API(SrvGetConsoleAlias);
@@ -55,34 +89,31 @@ CSR_API(SrvGetConsoleAliasExes);
 CSR_API(SrvGetConsoleAliasExesLength);
 
 /* coninput.c */
+CSR_API(SrvGetConsoleInput);
+CSR_API(SrvWriteConsoleInput);
 CSR_API(SrvReadConsole);
-CSR_API(CsrReadInputEvent);
 CSR_API(SrvFlushConsoleInputBuffer);
 CSR_API(SrvGetConsoleNumberOfInputEvents);
-CSR_API(SrvGetConsoleInput);
-CSR_API(SrvWriteConsoleInput);
 
 /* conoutput.c */
+CSR_API(SrvReadConsoleOutput);
+CSR_API(SrvWriteConsoleOutput);
+CSR_API(SrvReadConsoleOutputString);
+CSR_API(SrvWriteConsoleOutputString);
+CSR_API(SrvFillConsoleOutput);
 CSR_API(SrvWriteConsole);
-CSR_API(SrvGetConsoleScreenBufferInfo);
-CSR_API(SrvSetConsoleCursor);
-CSR_API(CsrWriteConsoleOutputChar);
-CSR_API(CsrFillOutputChar);
-CSR_API(CsrWriteConsoleOutputAttrib);
-CSR_API(CsrFillOutputAttrib);
+CSR_API(SrvSetConsoleCursorPosition);
 CSR_API(SrvGetConsoleCursorInfo);
 CSR_API(SrvSetConsoleCursorInfo);
-CSR_API(CsrSetTextAttrib);
+CSR_API(SrvSetConsoleTextAttribute);
 CSR_API(SrvCreateConsoleScreenBuffer);
+CSR_API(SrvGetConsoleScreenBufferInfo);
 CSR_API(SrvSetConsoleActiveScreenBuffer);
-CSR_API(SrvWriteConsoleOutput);
 CSR_API(SrvScrollConsoleScreenBuffer);
-CSR_API(CsrReadConsoleOutputChar);
-CSR_API(CsrReadConsoleOutputAttrib);
-CSR_API(SrvReadConsoleOutput);
 CSR_API(SrvSetConsoleScreenBufferSize);
 
 /* console.c */
+CSR_API(SrvOpenConsole);
 CSR_API(SrvAllocConsole);
 CSR_API(SrvFreeConsole);
 CSR_API(SrvSetConsoleMode);
@@ -95,36 +126,38 @@ CSR_API(SrvGetConsoleWindow);
 CSR_API(SrvSetConsoleIcon);
 CSR_API(SrvGetConsoleCP);
 CSR_API(SrvSetConsoleCP);
-CSR_API(CsrGetConsoleOutputCodePage);
-CSR_API(CsrSetConsoleOutputCodePage);
 CSR_API(SrvGetConsoleProcessList);
 CSR_API(SrvGenerateConsoleCtrlEvent);
 CSR_API(SrvGetConsoleSelectionInfo);
 
 /* handle.c */
-CSR_API(CsrGetHandle);
 CSR_API(SrvCloseHandle);
 CSR_API(SrvVerifyConsoleIoHandle);
 CSR_API(SrvDuplicateHandle);
-CSR_API(CsrGetInputWaitHandle);
+/// CSR_API(CsrGetInputWaitHandle);
 
-NTSTATUS FASTCALL Win32CsrInsertObject(PCSR_PROCESS ProcessData,
+NTSTATUS FASTCALL Win32CsrInsertObject(PCONSOLE_PROCESS_DATA ProcessData,
                                        PHANDLE Handle,
                                        Object_t *Object,
                                        DWORD Access,
                                        BOOL Inheritable,
                                        DWORD ShareMode);
-NTSTATUS FASTCALL Win32CsrLockObject(PCSR_PROCESS ProcessData,
+NTSTATUS FASTCALL Win32CsrLockObject(PCONSOLE_PROCESS_DATA ProcessData,
                                      HANDLE Handle,
                                      Object_t **Object,
                                      DWORD Access,
-                                     long Type);
+                                     LONG Type);
 VOID FASTCALL Win32CsrUnlockObject(Object_t *Object);
-NTSTATUS FASTCALL Win32CsrReleaseObject(PCSR_PROCESS ProcessData,
-                                        HANDLE Object);
-VOID WINAPI Win32CsrReleaseConsole(PCSR_PROCESS ProcessData);
-NTSTATUS WINAPI Win32CsrDuplicateHandleTable(PCSR_PROCESS SourceProcessData,
-                                             PCSR_PROCESS TargetProcessData);
+NTSTATUS FASTCALL Win32CsrReleaseObject(PCONSOLE_PROCESS_DATA ProcessData,
+                                        HANDLE Handle);
+
+NTSTATUS NTAPI ConsoleNewProcess(PCSR_PROCESS SourceProcess,
+                                 PCSR_PROCESS TargetProcess);
+NTSTATUS NTAPI ConsoleConnect(IN PCSR_PROCESS CsrProcess,
+                              IN OUT PVOID ConnectionInfo,
+                              IN OUT PULONG ConnectionInfoLength);
+VOID NTAPI ConsoleDisconnect(PCSR_PROCESS Process);
+VOID NTAPI Win32CsrReleaseConsole(PCSR_PROCESS Process);
 
 /* lineinput.c */
 CSR_API(SrvGetConsoleCommandHistoryLength);
@@ -134,12 +167,6 @@ CSR_API(SrvSetConsoleNumberOfCommands);
 CSR_API(SrvGetConsoleHistory);
 CSR_API(SrvSetConsoleHistory);
 
-/* server.c */
-BOOL FASTCALL Win32CsrValidateBuffer(PCSR_PROCESS ProcessData,
-                                     PVOID Buffer,
-                                     SIZE_T NumElements,
-                                     SIZE_T ElementSize);
-
 #endif // __CONSRV_H__
 
 /* EOF */