[hbelusca] 58725: [CONSRV] "Hack-fix" some headers to remove the forward declaration of typedef struct _CONSOLE *PCONSOLE; , which makes GCC 4.4.3 angry, but makes GCC 4.7.2 stay imperturbable.
8 Apr
2013
8 Apr
'13
9:03 p.m.
Author: hbelusca
Date: Mon Apr 8 21:03:24 2013
New Revision: 58725
URL: http://svn.reactos.org/svn/reactos?rev=58725&view=rev
Log:
[CONSRV]
"Hack-fix" some headers to remove the forward declaration of typedef struct
_CONSOLE *PCONSOLE;, which makes GCC 4.4.3 angry, but makes GCC 4.7.2 stay imperturbable.
Modified:
branches/ros-csrss/win32ss/user/consrv/console.h
branches/ros-csrss/win32ss/user/consrv/consrv.h
branches/ros-csrss/win32ss/user/consrv/include/conio.h
branches/ros-csrss/win32ss/user/consrv/procinit.h
Modified: branches/ros-csrss/win32ss/user/consrv/console.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/console.h [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/console.h [iso-8859-1] Mon Apr 8 21:03:24
2013
@@ -10,14 +10,14 @@
VOID WINAPI ConSrvInitConsoleSupport(VOID);
-NTSTATUS WINAPI ConSrvInitConsole(OUT PCONSOLE* NewConsole,
+NTSTATUS WINAPI ConSrvInitConsole(OUT struct _CONSOLE** /* PCONSOLE* */ NewConsole,
IN OUT PCONSOLE_START_INFO ConsoleStartInfo,
IN PCSR_PROCESS ConsoleLeaderProcess);
-VOID WINAPI ConSrvDeleteConsole(PCONSOLE Console);
+VOID WINAPI ConSrvDeleteConsole(struct _CONSOLE* /* PCONSOLE */ Console);
NTSTATUS FASTCALL ConSrvGetConsole(PCONSOLE_PROCESS_DATA ProcessData,
- PCONSOLE* Console,
+ struct _CONSOLE** /* PCONSOLE* */ Console,
BOOL LockConsole);
-VOID FASTCALL ConSrvReleaseConsole(PCONSOLE Console,
+VOID FASTCALL ConSrvReleaseConsole(struct _CONSOLE* /* PCONSOLE */ Console,
BOOL WasConsoleLocked);
/* EOF */
Modified: branches/ros-csrss/win32ss/user/consrv/consrv.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] Mon Apr 8 21:03:24 2013
@@ -49,10 +49,6 @@
extern HINSTANCE ConSrvDllInstance;
extern HANDLE ConSrvHeap;
-/* Opaque pointers */
-typedef struct _CONSOLE_IO_HANDLE *PCONSOLE_IO_HANDLE;
-typedef struct _CONSOLE *PCONSOLE;
-
#define ConsoleGetPerProcessData(Process) \
((PCONSOLE_PROCESS_DATA)((Process)->ServerData[CONSRV_SERVERDLL_INDEX]))
@@ -61,14 +57,14 @@
LIST_ENTRY ConsoleLink;
PCSR_PROCESS Process; // Process owning this structure.
HANDLE ConsoleEvent;
- PCONSOLE Console;
- PCONSOLE ParentConsole;
+ struct _CONSOLE* /* PCONSOLE */ Console;
+ struct _CONSOLE* /* PCONSOLE */ ParentConsole;
BOOL ConsoleApp; // TRUE if it is a CUI app, FALSE otherwise.
RTL_CRITICAL_SECTION HandleTableLock;
ULONG HandleTableSize;
- PCONSOLE_IO_HANDLE HandleTable; // Length-varying table
+ struct _CONSOLE_IO_HANDLE* /* PCONSOLE_IO_HANDLE */ HandleTable; // Length-varying
table
LPTHREAD_START_ROUTINE CtrlDispatcher;
LPTHREAD_START_ROUTINE PropDispatcher; // We hold the property dialog handler there,
till all the GUI thingie moves out from CSRSS.
Modified: branches/ros-csrss/win32ss/user/consrv/include/conio.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/i…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/include/conio.h [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/include/conio.h [iso-8859-1] Mon Apr 8
21:03:24 2013
@@ -25,7 +25,7 @@
typedef struct _CONSOLE_IO_OBJECT
{
CONSOLE_IO_OBJECT_TYPE Type;
- PCONSOLE Console;
+ struct _CONSOLE* /* PCONSOLE */ Console;
LONG AccessRead, AccessWrite;
LONG ExclusiveRead, ExclusiveWrite;
LONG HandleCount;
@@ -88,43 +88,43 @@
/*
* Internal interface (functions called by the console server only)
*/
- VOID (WINAPI *CleanupConsole)(PCONSOLE Console);
- VOID (WINAPI *WriteStream)(PCONSOLE Console,
+ VOID (WINAPI *CleanupConsole)(struct _CONSOLE* Console);
+ VOID (WINAPI *WriteStream)(struct _CONSOLE* Console,
SMALL_RECT* Block,
LONG CursorStartX,
LONG CursorStartY,
UINT ScrolledLines,
CHAR *Buffer,
UINT Length);
- VOID (WINAPI *DrawRegion)(PCONSOLE Console,
+ VOID (WINAPI *DrawRegion)(struct _CONSOLE* Console,
SMALL_RECT* Region);
- BOOL (WINAPI *SetCursorInfo)(PCONSOLE Console,
+ BOOL (WINAPI *SetCursorInfo)(struct _CONSOLE* Console,
PCONSOLE_SCREEN_BUFFER ScreenBuffer);
- BOOL (WINAPI *SetScreenInfo)(PCONSOLE Console,
+ BOOL (WINAPI *SetScreenInfo)(struct _CONSOLE* Console,
PCONSOLE_SCREEN_BUFFER ScreenBuffer,
UINT OldCursorX,
UINT OldCursorY);
- BOOL (WINAPI *UpdateScreenInfo)(PCONSOLE Console,
+ BOOL (WINAPI *UpdateScreenInfo)(struct _CONSOLE* Console,
PCONSOLE_SCREEN_BUFFER ScreenBuffer);
- NTSTATUS (WINAPI *ResizeBuffer)(PCONSOLE Console,
+ NTSTATUS (WINAPI *ResizeBuffer)(struct _CONSOLE* Console,
PCONSOLE_SCREEN_BUFFER ScreenBuffer,
COORD Size);
- VOID (WINAPI *ResizeTerminal)(PCONSOLE Console);
- BOOL (WINAPI *ProcessKeyCallback)(PCONSOLE Console,
+ VOID (WINAPI *ResizeTerminal)(struct _CONSOLE* Console);
+ BOOL (WINAPI *ProcessKeyCallback)(struct _CONSOLE* Console,
MSG* msg,
BYTE KeyStateMenu,
DWORD ShiftState,
UINT VirtualKeyCode,
BOOL Down);
- VOID (WINAPI *RefreshInternalInfo)(PCONSOLE Console);
+ VOID (WINAPI *RefreshInternalInfo)(struct _CONSOLE* Console);
/*
* External interface (functions corresponding to the Console API)
*/
- VOID (WINAPI *ChangeTitle)(PCONSOLE Console);
- BOOL (WINAPI *ChangeIcon)(PCONSOLE Console,
+ VOID (WINAPI *ChangeTitle)(struct _CONSOLE* Console);
+ BOOL (WINAPI *ChangeIcon)(struct _CONSOLE* Console,
HICON hWindowIcon);
- HWND (WINAPI *GetConsoleWindowHandle)(PCONSOLE Console);
+ HWND (WINAPI *GetConsoleWindowHandle)(struct _CONSOLE* Console);
} FRONTEND_VTBL, *PFRONTEND_VTBL;
Modified: branches/ros-csrss/win32ss/user/consrv/procinit.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/p…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/procinit.h [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/procinit.h [iso-8859-1] Mon Apr 8 21:03:24
2013
@@ -14,7 +14,7 @@
PHANDLE pErrorHandle,
PCONSOLE_START_INFO ConsoleStartInfo);
NTSTATUS FASTCALL ConSrvInheritConsole(PCONSOLE_PROCESS_DATA ProcessData,
- PCONSOLE Console,
+ struct _CONSOLE* /* PCONSOLE */ Console,
BOOL CreateNewHandlesTable,
PHANDLE pInputHandle,
PHANDLE pOutputHandle,
4234
days inactive
4234
days old
0 comments
1 participants
participants (1)
-
hbelusca＠svn.reactos.org