diff --git a/dll/win32/kernel32/client/console/console.c b/dll/win32/kernel32/client/console/console.c
index d5f7187ae22..025c3c1de5f 100644
--- a/dll/win32/kernel32/client/console/console.c
+++ b/dll/win32/kernel32/client/console/console.c
@@ -321,20 +321,26 @@ HANDLE
 WINAPI
 GetConsoleInputWaitHandle(VOID)
 {
-    CSR_API_MESSAGE Request;
-    NTSTATUS Status;
+/// HACK !!!!!!!!!!!!!
+    ASSERT(FALSE);
+    return NULL;
 
-    Status = CsrClientCallServer(&Request,
+#if 0
+    NTSTATUS Status;
+    CONSOLE_API_MESSAGE ApiMessage;
+
+    Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
                                  NULL,
-                                 CSR_CREATE_API_NUMBER(CSR_CONSOLE, GET_INPUT_WAIT_HANDLE),
-                                 sizeof(CSR_API_MESSAGE));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status))
+                                 CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, GET_INPUT_WAIT_HANDLE),
+                                 sizeof(CSRSS_GET_INPUT_WAIT_HANDLE));
+    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
     {
         BaseSetLastNTError(Status);
         return 0;
     }
 
-    return Request.Data.GetConsoleInputWaitHandle.InputWaitHandle;
+    return ApiMessage.Data.GetConsoleInputWaitHandle.InputWaitHandle;
+#endif
 }
 
 
diff --git a/include/reactos/subsys/win/conmsg.h b/include/reactos/subsys/win/conmsg.h
index 32b1faee6f4..8fa4ddf2ff4 100644
--- a/include/reactos/subsys/win/conmsg.h
+++ b/include/reactos/subsys/win/conmsg.h
@@ -112,15 +112,21 @@ typedef enum _CONSRV_API_NUMBER
 } CONSRV_API_NUMBER, *PCONSRV_API_NUMBER;
 
 
-#define CONSOLE_INPUT_MODE_VALID  (0x0f)
-#define CONSOLE_OUTPUT_MODE_VALID (0x03)
+typedef struct _CONSOLE_CONNECTION_INFO
+{
+
+} CONSOLE_CONNECTION_INFO, *PCONSOLE_CONNECTION_INFO;
+
+
+#define CONSOLE_INPUT_MODE_VALID    0x0f
+#define CONSOLE_OUTPUT_MODE_VALID   0x03
 
 
 typedef struct
 {
     USHORT nMaxIds;
+    ULONG  nProcessIdsTotal;
     PDWORD pProcessIds;
-    ULONG nProcessIdsTotal;
 } CSRSS_GET_PROCESS_LIST, *PCSRSS_GET_PROCESS_LIST;
 
 typedef struct