[ros-diffs] [hbelusca] 58055: [KERNEL32-CONSRV] * HANDLE_TYPE --> CONSOLE_HANDLE_TYPE because it hits "previous" definition of this enumeration (a totally different one from win32ss/include/ntuser.h) * Tempora...

Author: hbelusca
Date: Sun Dec 30 13:25:50 2012
New Revision: 58055

URL: http://svn.reactos.org/svn/reactos?rev=58055&view=rev
Log:
[KERNEL32-CONSRV]
* HANDLE_TYPE --> CONSOLE_HANDLE_TYPE because it hits "previous" definition
of this enumeration (a totally different one from win32ss/include/ntuser.h)
* Temporarily add a dummy member to the CONSOLE_CONNECTION_INFO structure, to make MSVC
happy.

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] Sun Dec 30
13:25:50 2012
@@ -399,7 +399,7 @@
     NTSTATUS Status = STATUS_SUCCESS;
     CONSOLE_API_MESSAGE ApiMessage;
     PCSRSS_OPEN_CONSOLE OpenConsoleRequest = &ApiMessage.Data.OpenConsoleRequest;
-    HANDLE_TYPE HandleType;
+    CONSOLE_HANDLE_TYPE HandleType;
 
     if (wsName && 0 == _wcsicmp(wsName, L"CONIN$"))
     {

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] Sun Dec 30
13:25:50 2012
@@ -114,7 +114,7 @@
 
 typedef struct _CONSOLE_CONNECTION_INFO
 {
-
+    ULONG Dummy;
 } CONSOLE_CONNECTION_INFO, *PCONSOLE_CONNECTION_INFO;
 
 
@@ -369,16 +369,16 @@
 /*
  * Type of handles.
  */
-typedef enum _HANDLE_TYPE
+typedef enum _CONSOLE_HANDLE_TYPE
 {
     HANDLE_INPUT    = 0x01,
     HANDLE_OUTPUT   = 0x02
-} HANDLE_TYPE;
+} CONSOLE_HANDLE_TYPE;
 
 typedef struct
 {
     HANDLE Handle;
-    HANDLE_TYPE HandleType;
+    CONSOLE_HANDLE_TYPE HandleType;
     DWORD Access;
     BOOL Inheritable;
     DWORD ShareMode;