[ros-diffs] [hbelusca] 57749: [KERNEL32] Deactivate the code of GetConsoleInputWaitHandle, because it calls a function that doesn't seem to appear in the console server apis listed in http://j00ru.vexillium.or...

Author: hbelusca
Date: Fri Nov 23 19:37:20 2012
New Revision: 57749

URL: http://svn.reactos.org/svn/reactos?rev=57749&view=rev
Log:
[KERNEL32]
Deactivate the code of GetConsoleInputWaitHandle, because it calls a function that
doesn't seem to appear in the console server apis listed in
http://j00ru.vexillium.org/csrss_list/api_list.html (and that I haven't included in
the console server apis list), until I find a better solution. It fixes compilation.

[CONSRV]
- Code reorganization
- Introduce the CONSOLE_CONNECTION_INFO structure needed for initializing consoles when
launching a program (see
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/kernel32/misc/dllmain.…)v=16826),
instead of calling AllocConsole. Not used at this time.

Now the branch compiles.

Modified:
    branches/ros-csrss/dll/win32/kernel32/client/console/console.c
    branches/ros-csrss/include/reactos/subsys/win/conmsg.h

Modified: branches/ros-csrss/dll/win32/kernel32/client/console/console.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl…
==============================================================================
--- branches/ros-csrss/dll/win32/kernel32/client/console/console.c [iso-8859-1]
(original)
+++ branches/ros-csrss/dll/win32/kernel32/client/console/console.c [iso-8859-1] Fri Nov 23
19:37:20 2012
@@ -321,20 +321,26 @@
 WINAPI
 GetConsoleInputWaitHandle(VOID)
 {
-    CSR_API_MESSAGE Request;
-    NTSTATUS Status;
-
-    Status = CsrClientCallServer(&Request,
-                                 NULL,
-                                 CSR_CREATE_API_NUMBER(CSR_CONSOLE,
GET_INPUT_WAIT_HANDLE),
-                                 sizeof(CSR_API_MESSAGE));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status))
+/// HACK !!!!!!!!!!!!!
+    ASSERT(FALSE);
+    return NULL;
+
+#if 0
+    NTSTATUS Status;
+    CONSOLE_API_MESSAGE ApiMessage;
+
+    Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
+                                 NULL,
+                                 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
 }
 
 

Modified: branches/ros-csrss/include/reactos/subsys/win/conmsg.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy…
==============================================================================
--- branches/ros-csrss/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original)
+++ branches/ros-csrss/include/reactos/subsys/win/conmsg.h [iso-8859-1] Fri Nov 23
19:37:20 2012
@@ -112,15 +112,21 @@
 } 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