Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 16:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[KERNEL32]

Browse source 
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.c?r1=16826&r2=16825&pathrev=16826), instead of calling AllocConsole. Not used at this time.

Now the branch compiles.

svn path=/branches/ros-csrss/; revision=57749
This commit is contained in:
Hermès Bélusca-Maïto 2012-11-23 19:37:20 +00:00
parent b942b837af
commit 60e03ccee8
2 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
dll/win32/kernel32/client/console/console.c
View file

@ -321,20 +321,26 @@ HANDLE
WINAPI WINAPI
GetConsoleInputWaitHandle(VOID) GetConsoleInputWaitHandle(VOID)
{ {
CSR_API_MESSAGE Request; /// HACK !!!!!!!!!!!!!
NTSTATUS Status; ASSERT(FALSE);
return NULL;
Status = CsrClientCallServer(&Request, #if 0
NTSTATUS Status;
CONSOLE_API_MESSAGE ApiMessage;
Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
NULL, NULL,
CSR_CREATE_API_NUMBER(CSR_CONSOLE, GET_INPUT_WAIT_HANDLE), CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, GET_INPUT_WAIT_HANDLE),
sizeof(CSR_API_MESSAGE)); sizeof(CSRSS_GET_INPUT_WAIT_HANDLE));
if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
{ {
BaseSetLastNTError(Status); BaseSetLastNTError(Status);
return 0; return 0;
} }
return Request.Data.GetConsoleInputWaitHandle.InputWaitHandle; return ApiMessage.Data.GetConsoleInputWaitHandle.InputWaitHandle;
#endif
} }

12
include/reactos/subsys/win/conmsg.h
View file

@ -112,15 +112,21 @@ typedef enum _CONSRV_API_NUMBER
} CONSRV_API_NUMBER, *PCONSRV_API_NUMBER; } CONSRV_API_NUMBER, *PCONSRV_API_NUMBER;
#define CONSOLE_INPUT_MODE_VALID (0x0f) typedef struct _CONSOLE_CONNECTION_INFO
#define CONSOLE_OUTPUT_MODE_VALID (0x03) {
} CONSOLE_CONNECTION_INFO, *PCONSOLE_CONNECTION_INFO;
#define CONSOLE_INPUT_MODE_VALID 0x0f
#define CONSOLE_OUTPUT_MODE_VALID 0x03
typedef struct typedef struct
{ {
USHORT nMaxIds; USHORT nMaxIds;
PDWORD pProcessIds;
ULONG nProcessIdsTotal; ULONG nProcessIdsTotal;
PDWORD pProcessIds;
} CSRSS_GET_PROCESS_LIST, *PCSRSS_GET_PROCESS_LIST; } CSRSS_GET_PROCESS_LIST, *PCSRSS_GET_PROCESS_LIST;
typedef struct typedef struct