Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 12:17:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

[KERNEL32-CONSRV]

Browse source 
* 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.

svn path=/branches/ros-csrss/; revision=58055
This commit is contained in:
Hermès Bélusca-Maïto 2012-12-30 13:25:50 +00:00
parent dba80b614b
commit d6769b4364
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -399,7 +399,7 @@ OpenConsoleW(LPCWSTR wsName,
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
CONSOLE_API_MESSAGE ApiMessage; CONSOLE_API_MESSAGE ApiMessage;
PCSRSS_OPEN_CONSOLE OpenConsoleRequest = &ApiMessage.Data.OpenConsoleRequest; PCSRSS_OPEN_CONSOLE OpenConsoleRequest = &ApiMessage.Data.OpenConsoleRequest;
HANDLE_TYPE HandleType; CONSOLE_HANDLE_TYPE HandleType;
if (wsName && 0 == _wcsicmp(wsName, L"CONIN$")) if (wsName && 0 == _wcsicmp(wsName, L"CONIN$"))
{ {

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

@ -114,7 +114,7 @@ typedef enum _CONSRV_API_NUMBER
typedef struct _CONSOLE_CONNECTION_INFO typedef struct _CONSOLE_CONNECTION_INFO
{ {
ULONG Dummy;
} CONSOLE_CONNECTION_INFO, *PCONSOLE_CONNECTION_INFO; } CONSOLE_CONNECTION_INFO, *PCONSOLE_CONNECTION_INFO;
@ -369,16 +369,16 @@ typedef struct
/* /*
* Type of handles. * Type of handles.
*/ */
typedef enum _HANDLE_TYPE typedef enum _CONSOLE_HANDLE_TYPE
{ {
HANDLE_INPUT = 0x01, HANDLE_INPUT = 0x01,
HANDLE_OUTPUT = 0x02 HANDLE_OUTPUT = 0x02
} HANDLE_TYPE; } CONSOLE_HANDLE_TYPE;
typedef struct typedef struct
{ {
HANDLE Handle; HANDLE Handle;
HANDLE_TYPE HandleType; CONSOLE_HANDLE_TYPE HandleType;
DWORD Access; DWORD Access;
BOOL Inheritable; BOOL Inheritable;
DWORD ShareMode; DWORD ShareMode;