[ros-diffs] [hbelusca] 59436: [KERNEL32] Forgot to add those files in the previous commit r59435: We now store only console handles and not console pointers themselves.

Author: hbelusca
Date: Sat Jul  6 19:57:38 2013
New Revision: 59436

URL: http://svn.reactos.org/svn/reactos?rev=59436&view=rev
Log:
[KERNEL32]
Forgot to add those files in the previous commit r59435:
We now store only console handles and not console pointers themselves.

Modified:
    trunk/reactos/dll/win32/kernel32/client/console/console.c
    trunk/reactos/dll/win32/kernel32/client/console/init.c
    trunk/reactos/include/reactos/subsys/win/conmsg.h

Modified: trunk/reactos/dll/win32/kernel32/client/console/console.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/client/console/console.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/client/console/console.c	[iso-8859-1] Sat Jul  6
19:57:38 2013
@@ -960,7 +960,7 @@
     InitConsoleInfo(AllocConsoleRequest->ConsoleStartInfo,
                     &Parameters->ImagePathName);
 
-    AllocConsoleRequest->Console = NULL;
+    AllocConsoleRequest->ConsoleHandle  = NULL;
     AllocConsoleRequest->CtrlDispatcher = ConsoleControlDispatcher;
     AllocConsoleRequest->PropDispatcher = PropDialogHandler;
 
@@ -977,7 +977,7 @@
         return FALSE;
     }
 
-    Parameters->ConsoleHandle = AllocConsoleRequest->Console;
+    Parameters->ConsoleHandle = AllocConsoleRequest->ConsoleHandle;
     SetStdHandle(STD_INPUT_HANDLE , AllocConsoleRequest->InputHandle );
     SetStdHandle(STD_OUTPUT_HANDLE, AllocConsoleRequest->OutputHandle);
     SetStdHandle(STD_ERROR_HANDLE , AllocConsoleRequest->ErrorHandle );
@@ -2174,7 +2174,7 @@
         return FALSE;
     }
 
-    Parameters->ConsoleHandle = AttachConsoleRequest->Console;
+    Parameters->ConsoleHandle = AttachConsoleRequest->ConsoleHandle;
     SetStdHandle(STD_INPUT_HANDLE , AttachConsoleRequest->InputHandle );
     SetStdHandle(STD_OUTPUT_HANDLE, AttachConsoleRequest->OutputHandle);
     SetStdHandle(STD_ERROR_HANDLE , AttachConsoleRequest->ErrorHandle );

Modified: trunk/reactos/dll/win32/kernel32/client/console/init.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/client/console/init.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/client/console/init.c	[iso-8859-1] Sat Jul  6
19:57:38 2013
@@ -245,7 +245,7 @@
     }
 
     /* Now use the proper console handle */
-    ConnectInfo.Console = Parameters->ConsoleHandle;
+    ConnectInfo.ConsoleHandle = Parameters->ConsoleHandle;
 
     /* Initialize the Console Ctrl Handler */
     InitConsoleCtrlHandling();
@@ -290,7 +290,7 @@
     if (!ConnectInfo.ConsoleNeeded) return TRUE;
 
     /* 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 (!Parameters->StandardInput)

Modified: trunk/reactos/include/reactos/subsys/win/conmsg.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win…
==============================================================================
--- trunk/reactos/include/reactos/subsys/win/conmsg.h	[iso-8859-1] (original)
+++ trunk/reactos/include/reactos/subsys/win/conmsg.h	[iso-8859-1] Sat Jul  6 19:57:38
2013
@@ -133,7 +133,7 @@
     /* Adapted from CONSOLE_ALLOCCONSOLE */
     CONSOLE_START_INFO ConsoleStartInfo;
 
-    HANDLE Console; // ConsoleHandle // On ReactOS, it is a PCONSOLE
+    HANDLE ConsoleHandle;
     HANDLE InputHandle;
     HANDLE OutputHandle;
     HANDLE ErrorHandle;
@@ -182,7 +182,7 @@
 {
     PCONSOLE_START_INFO ConsoleStartInfo;
 
-    HANDLE Console; // ConsoleHandle // On ReactOS, it is a PCONSOLE
+    HANDLE ConsoleHandle;
     HANDLE InputHandle;
     HANDLE OutputHandle;
     HANDLE ErrorHandle;
@@ -194,7 +194,7 @@
 typedef struct
 {
     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 OutputHandle;
     HANDLE ErrorHandle;