Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 05:42:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[KERNEL32]

Browse source 
Forgot to add those files in the previous commit r59435:
We now store only console handles and not console pointers themselves.

svn path=/trunk/; revision=59436
This commit is contained in:
Hermès Bélusca-Maïto 2013-07-06 19:57:38 +00:00
parent b16b88d434
commit 006c1387b2
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
reactos/dll/win32/kernel32/client/console/console.c
View file

@ -960,7 +960,7 @@ AllocConsole(VOID)
InitConsoleInfo(AllocConsoleRequest->ConsoleStartInfo, InitConsoleInfo(AllocConsoleRequest->ConsoleStartInfo,
&Parameters->ImagePathName); &Parameters->ImagePathName);
AllocConsoleRequest->Console = NULL; AllocConsoleRequest->ConsoleHandle = NULL;
AllocConsoleRequest->CtrlDispatcher = ConsoleControlDispatcher; AllocConsoleRequest->CtrlDispatcher = ConsoleControlDispatcher;
AllocConsoleRequest->PropDispatcher = PropDialogHandler; AllocConsoleRequest->PropDispatcher = PropDialogHandler;
@ -977,7 +977,7 @@ AllocConsole(VOID)
return FALSE; return FALSE;
} }
Parameters->ConsoleHandle = AllocConsoleRequest->Console; Parameters->ConsoleHandle = AllocConsoleRequest->ConsoleHandle;
SetStdHandle(STD_INPUT_HANDLE , AllocConsoleRequest->InputHandle ); SetStdHandle(STD_INPUT_HANDLE , AllocConsoleRequest->InputHandle );
SetStdHandle(STD_OUTPUT_HANDLE, AllocConsoleRequest->OutputHandle); SetStdHandle(STD_OUTPUT_HANDLE, AllocConsoleRequest->OutputHandle);
SetStdHandle(STD_ERROR_HANDLE , AllocConsoleRequest->ErrorHandle ); SetStdHandle(STD_ERROR_HANDLE , AllocConsoleRequest->ErrorHandle );
@ -2174,7 +2174,7 @@ AttachConsole(DWORD dwProcessId)
return FALSE; return FALSE;
} }
Parameters->ConsoleHandle = AttachConsoleRequest->Console; Parameters->ConsoleHandle = AttachConsoleRequest->ConsoleHandle;
SetStdHandle(STD_INPUT_HANDLE , AttachConsoleRequest->InputHandle ); SetStdHandle(STD_INPUT_HANDLE , AttachConsoleRequest->InputHandle );
SetStdHandle(STD_OUTPUT_HANDLE, AttachConsoleRequest->OutputHandle); SetStdHandle(STD_OUTPUT_HANDLE, AttachConsoleRequest->OutputHandle);
SetStdHandle(STD_ERROR_HANDLE , AttachConsoleRequest->ErrorHandle ); SetStdHandle(STD_ERROR_HANDLE , AttachConsoleRequest->ErrorHandle );

4
reactos/dll/win32/kernel32/client/console/init.c
View file

@ -245,7 +245,7 @@ BasepInitConsole(VOID)
} }
/* Now use the proper console handle */ /* Now use the proper console handle */
ConnectInfo.Console = Parameters->ConsoleHandle; ConnectInfo.ConsoleHandle = Parameters->ConsoleHandle;
/* Initialize the Console Ctrl Handler */ /* Initialize the Console Ctrl Handler */
InitConsoleCtrlHandling(); InitConsoleCtrlHandling();
@ -290,7 +290,7 @@ BasepInitConsole(VOID)
if (!ConnectInfo.ConsoleNeeded) return TRUE; if (!ConnectInfo.ConsoleNeeded) return TRUE;
/* We got the handles, let's set them */ /* We got the handles, let's set them */
if ((Parameters->ConsoleHandle = ConnectInfo.Console)) if ((Parameters->ConsoleHandle = ConnectInfo.ConsoleHandle))
{ {
/* If we already had some, don't use the new ones */ /* If we already had some, don't use the new ones */
if (!Parameters->StandardInput) if (!Parameters->StandardInput)

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

@ -133,7 +133,7 @@ typedef struct _CONSOLE_CONNECTION_INFO
/* Adapted from CONSOLE_ALLOCCONSOLE */ /* Adapted from CONSOLE_ALLOCCONSOLE */
CONSOLE_START_INFO ConsoleStartInfo; CONSOLE_START_INFO ConsoleStartInfo;
HANDLE Console; // ConsoleHandle // On ReactOS, it is a PCONSOLE HANDLE ConsoleHandle;
HANDLE InputHandle; HANDLE InputHandle;
HANDLE OutputHandle; HANDLE OutputHandle;
HANDLE ErrorHandle; HANDLE ErrorHandle;
@ -182,7 +182,7 @@ typedef struct
{ {
PCONSOLE_START_INFO ConsoleStartInfo; PCONSOLE_START_INFO ConsoleStartInfo;
HANDLE Console; // ConsoleHandle // On ReactOS, it is a PCONSOLE HANDLE ConsoleHandle;
HANDLE InputHandle; HANDLE InputHandle;
HANDLE OutputHandle; HANDLE OutputHandle;
HANDLE ErrorHandle; HANDLE ErrorHandle;
@ -194,7 +194,7 @@ typedef struct
typedef struct typedef struct
{ {
DWORD ProcessId; // If ProcessId == ATTACH_PARENT_PROCESS == -1, then attach the current process to its parent process console. DWORD ProcessId; // If ProcessId == ATTACH_PARENT_PROCESS == -1, then attach the current process to its parent process console.
HANDLE Console; // ConsoleHandle // On ReactOS, it is a PCONSOLE HANDLE ConsoleHandle;
HANDLE InputHandle; HANDLE InputHandle;
HANDLE OutputHandle; HANDLE OutputHandle;
HANDLE ErrorHandle; HANDLE ErrorHandle;