[hbelusca] 58120: [CONSRV] Renaming CSRSS_... structures into CONSOLE_...

Author: hbelusca
Date: Sat Jan  5 23:37:04 2013
New Revision: 58120

URL: http://svn.reactos.org/svn/reactos?rev=58120&view=rev
Log:
[CONSRV]
Renaming CSRSS_... structures into CONSOLE_...

Modified:
    branches/ros-csrss/win32ss/user/consrv/alias.c
    branches/ros-csrss/win32ss/user/consrv/coninput.c
    branches/ros-csrss/win32ss/user/consrv/conio.h
    branches/ros-csrss/win32ss/user/consrv/conoutput.c
    branches/ros-csrss/win32ss/user/consrv/console.c
    branches/ros-csrss/win32ss/user/consrv/consrv.h
    branches/ros-csrss/win32ss/user/consrv/guiconsole.c
    branches/ros-csrss/win32ss/user/consrv/guiconsole.h
    branches/ros-csrss/win32ss/user/consrv/handle.c
    branches/ros-csrss/win32ss/user/consrv/lineinput.c
    branches/ros-csrss/win32ss/user/consrv/tuiconsole.c
    branches/ros-csrss/win32ss/user/consrv/tuiconsole.h

Modified: branches/ros-csrss/win32ss/user/consrv/alias.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/al...
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/alias.c [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/alias.c [iso-8859-1] Sat Jan  5 23:37:04 2013
@@ -18,18 +18,18 @@

/* TYPES **********************************************************************/

-typedef struct tagALIAS_ENTRY
+typedef struct _ALIAS_ENTRY
 {
     LPCWSTR lpSource;
     LPCWSTR lpTarget;
-    struct tagALIAS_ENTRY* Next;
+    struct _ALIAS_ENTRY* Next;
 } ALIAS_ENTRY, *PALIAS_ENTRY;

-typedef struct tagALIAS_HEADER
+typedef struct _ALIAS_HEADER
 {
     LPCWSTR lpExeName;
     PALIAS_ENTRY Data;
-    struct tagALIAS_HEADER* Next;
+    struct _ALIAS_HEADER* Next;
 } ALIAS_HEADER, *PALIAS_HEADER;

@@ -290,7 +290,7 @@
 CSR_API(SrvAddConsoleAlias)
 {
     PCONSOLE_ADDGETALIAS ConsoleAliasRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ConsoleAliasRequest;
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     PALIAS_HEADER Header;
     PALIAS_ENTRY Entry;
     LPWSTR lpSource, lpTarget, lpExeName;
@@ -374,7 +374,7 @@
 CSR_API(SrvGetConsoleAlias)
 {
     PCONSOLE_ADDGETALIAS ConsoleAliasRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ConsoleAliasRequest;
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     PALIAS_HEADER Header;
     PALIAS_ENTRY Entry;
     UINT Length;
@@ -447,7 +447,7 @@
 CSR_API(SrvGetConsoleAliases)
 {
     PCONSOLE_GETALLALIASES GetAllAliasesRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetAllAliasesRequest;
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     ULONG BytesWritten;
     PALIAS_HEADER Header;

@@ -499,7 +499,7 @@
 CSR_API(SrvGetConsoleAliasesLength)
 {
     PCONSOLE_GETALLALIASESLENGTH GetAllAliasesLengthRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetAllAliasesLengthRequest;
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     PALIAS_HEADER Header;
     UINT Length;

@@ -538,7 +538,7 @@
 CSR_API(SrvGetConsoleAliasExes)
 {
     PCONSOLE_GETALIASESEXES GetAliasesExesRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetAliasesExesRequest;
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     UINT BytesWritten;
     UINT ExesLength;

@@ -584,7 +584,7 @@
 CSR_API(SrvGetConsoleAliasExesLength)
 {
     PCONSOLE_GETALIASESEXESLENGTH GetAliasesExesLengthRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetAliasesExesLengthRequest;
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     DPRINT("SrvGetConsoleAliasExesLength entered\n");

ApiMessage->Status = ConioConsoleFromProcessData(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console);

Modified: branches/ros-csrss/win32ss/user/consrv/coninput.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/co...
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/coninput.c [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/coninput.c [iso-8859-1] Sat Jan  5 23:37:04 2013
@@ -28,14 +28,14 @@
 typedef struct _GET_INPUT_INFO
 {
     PCONSOLE_PROCESS_DATA ProcessData;
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
 } GET_INPUT_INFO, *PGET_INPUT_INFO;

/* PRIVATE FUNCTIONS **********************************************************/

static VOID FASTCALL
-ConioInputEventToAnsi(PCSRSS_CONSOLE Console, PINPUT_RECORD InputEvent)
+ConioInputEventToAnsi(PCONSOLE Console, PINPUT_RECORD InputEvent)
 {
     if (InputEvent->EventType == KEY_EVENT)
     {
@@ -48,7 +48,7 @@
 }

static NTSTATUS FASTCALL
-ConioProcessChar(PCSRSS_CONSOLE Console,
+ConioProcessChar(PCONSOLE Console,
                  PINPUT_RECORD InputEvent)
 {
     ConsoleInput *ConInRec;
@@ -127,7 +127,7 @@
 }

VOID WINAPI
-ConioProcessKey(MSG *msg, PCSRSS_CONSOLE Console, BOOL TextMode)
+ConioProcessKey(MSG *msg, PCONSOLE Console, BOOL TextMode)
 {
     static BYTE KeyState[256] = { 0 };
     /* MSDN mentions that you should use the last virtual key code received
@@ -626,7 +626,7 @@
     NTSTATUS Status;
     PCONSOLE_GETINPUT GetInputRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetInputRequest;
     PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process);
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     GET_INPUT_INFO InputInfo;

DPRINT("SrvGetConsoleInput\n");
@@ -666,7 +666,7 @@
     PCONSOLE_WRITEINPUT WriteInputRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.WriteInputRequest;
     PINPUT_RECORD InputRecord;
     PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process);
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     DWORD Length;
     DWORD i;

@@ -712,7 +712,7 @@
     NTSTATUS Status;
     PCONSOLE_READCONSOLE ReadConsoleRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ReadConsoleRequest;
     PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process);
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     GET_INPUT_INFO InputInfo;

DPRINT("SrvReadConsole\n");
@@ -756,7 +756,7 @@
     NTSTATUS Status;
     PCONSOLE_FLUSHINPUTBUFFER FlushInputBufferRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.FlushInputBufferRequest;
     PLIST_ENTRY CurrentEntry;
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     ConsoleInput* Input;

DPRINT("SrvFlushConsoleInputBuffer\n");
@@ -786,7 +786,7 @@
 {
     NTSTATUS Status;
     PCONSOLE_GETNUMINPUTEVENTS GetNumInputEventsRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetNumInputEventsRequest;
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     PLIST_ENTRY CurrentInput;
     DWORD NumEvents;

Modified: branches/ros-csrss/win32ss/user/consrv/conio.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/co...
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] Sat Jan  5 23:37:04 2013
@@ -26,7 +26,7 @@
  * internally, I just wrap back to the top of the buffer.               *
  ************************************************************************/

-typedef struct tagCSRSS_SCREEN_BUFFER
+typedef struct _CONSOLE_SCREEN_BUFFER
 {
     Object_t Header;                 /* Object header */
     BYTE *Buffer;                    /* pointer to screen buffer */
@@ -39,16 +39,16 @@
     CONSOLE_CURSOR_INFO CursorInfo;
     USHORT Mode;
     LIST_ENTRY ListEntry;            /* entry in console's list of buffers */
-} CSRSS_SCREEN_BUFFER, *PCSRSS_SCREEN_BUFFER;
-
-typedef struct tagCSRSS_CONSOLE
+} CONSOLE_SCREEN_BUFFER, *PCONSOLE_SCREEN_BUFFER;
+
+typedef struct _CONSOLE
 {
     Object_t Header;                      /* Object header */
     LONG ReferenceCount;
     CRITICAL_SECTION Lock;

-    struct tagCSRSS_CONSOLE *Prev, *Next; /* Next and Prev consoles in console wheel */
-    struct tagCSRSS_CONSOLE_VTBL *Vtbl;   /* Using CUI or GUI consoles */
+    struct _CONSOLE *Prev, *Next; /* Next and Prev consoles in console wheel */
+    struct _CONSOLE_VTBL *Vtbl;   /* Using CUI or GUI consoles */

CLIENT_ID  ConsoleLeaderCID;          /* Contains the Console Leader Process CID */
     LIST_ENTRY ProcessList;
@@ -66,14 +66,14 @@
     BOOLEAN LineInsertToggle;             /* replace character over cursor instead of inserting */
     ULONG LineWakeupMask;                 /* bitmap of which control characters will end line input */

-    struct tagALIAS_HEADER *Aliases;
+    struct _ALIAS_HEADER *Aliases;
     LIST_ENTRY HistoryBuffers;
     UINT HistoryBufferSize;               /* size for newly created history buffers */
     UINT NumberOfHistoryBuffers;          /* maximum number of history buffers allowed */
     BOOLEAN HistoryNoDup;                 /* remove old duplicate history entries */

LIST_ENTRY BufferList;                /* List of all screen buffers for this console */
-    PCSRSS_SCREEN_BUFFER ActiveBuffer;    /* Pointer to currently active screen buffer */
+    PCONSOLE_SCREEN_BUFFER ActiveBuffer;    /* Pointer to currently active screen buffer */
     BYTE PauseFlags;
     HANDLE UnpauseEvent;
     LIST_ENTRY WriteWaitQueue;            /* List head for the queue of write wait blocks */
@@ -89,7 +89,7 @@
     UINT OutputCodePage;

CONSOLE_SELECTION_INFO Selection;
-} CSRSS_CONSOLE, *PCSRSS_CONSOLE;
+} CONSOLE, *PCONSOLE;

/**************************************************************\
 ** Define the Console Leader Process for the console window **/
@@ -104,21 +104,21 @@
 } while(0)
 /**************************************************************/

-typedef struct tagCSRSS_CONSOLE_VTBL
-{
-    VOID (WINAPI *InitScreenBuffer)(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER ScreenBuffer);
-    VOID (WINAPI *WriteStream)(PCSRSS_CONSOLE Console, SMALL_RECT *Block, LONG CursorStartX, LONG CursorStartY,
+typedef struct _CONSOLE_VTBL
+{
+    VOID (WINAPI *InitScreenBuffer)(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer);
+    VOID (WINAPI *WriteStream)(PCONSOLE Console, SMALL_RECT *Block, LONG CursorStartX, LONG CursorStartY,
                                UINT ScrolledLines, CHAR *Buffer, UINT Length);
-    VOID (WINAPI *DrawRegion)(PCSRSS_CONSOLE Console, SMALL_RECT *Region);
-    BOOL (WINAPI *SetCursorInfo)(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER ScreenBuffer);
-    BOOL (WINAPI *SetScreenInfo)(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER ScreenBuffer,
+    VOID (WINAPI *DrawRegion)(PCONSOLE Console, SMALL_RECT *Region);
+    BOOL (WINAPI *SetCursorInfo)(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer);
+    BOOL (WINAPI *SetScreenInfo)(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer,
                                  UINT OldCursorX, UINT OldCursorY);
-    BOOL (WINAPI *UpdateScreenInfo)(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER ScreenBuffer);
-    BOOL (WINAPI *ChangeTitle)(PCSRSS_CONSOLE Console);
-    VOID (WINAPI *CleanupConsole)(PCSRSS_CONSOLE Console);
-    BOOL (WINAPI *ChangeIcon)(PCSRSS_CONSOLE Console, HICON hWindowIcon);
-    NTSTATUS (WINAPI *ResizeBuffer)(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER ScreenBuffer, COORD Size);
-} CSRSS_CONSOLE_VTBL, *PCSRSS_CONSOLE_VTBL;
+    BOOL (WINAPI *UpdateScreenInfo)(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer);
+    BOOL (WINAPI *ChangeTitle)(PCONSOLE Console);
+    VOID (WINAPI *CleanupConsole)(PCONSOLE Console);
+    BOOL (WINAPI *ChangeIcon)(PCONSOLE Console, HICON hWindowIcon);
+    NTSTATUS (WINAPI *ResizeBuffer)(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer, COORD Size);
+} CONSOLE_VTBL, *PCONSOLE_VTBL;

typedef struct ConsoleInput_t
 {
@@ -157,12 +157,12 @@

/* console.c */
 NTSTATUS FASTCALL ConioConsoleFromProcessData(PCONSOLE_PROCESS_DATA ProcessData,
-                                              PCSRSS_CONSOLE *Console);
-VOID WINAPI ConioDeleteConsole(PCSRSS_CONSOLE Console);
+                                              PCONSOLE *Console);
+VOID WINAPI ConioDeleteConsole(PCONSOLE Console);
 VOID WINAPI CsrInitConsoleSupport(VOID);
-NTSTATUS WINAPI CsrInitConsole(PCSRSS_CONSOLE* NewConsole, int ShowCmd, PCSR_PROCESS ConsoleLeaderProcess);
-VOID FASTCALL ConioPause(PCSRSS_CONSOLE Console, UINT Flags);
-VOID FASTCALL ConioUnpause(PCSRSS_CONSOLE Console, UINT Flags);
+NTSTATUS WINAPI CsrInitConsole(PCONSOLE* NewConsole, int ShowCmd, PCSR_PROCESS ConsoleLeaderProcess);
+VOID FASTCALL ConioPause(PCONSOLE Console, UINT Flags);
+VOID FASTCALL ConioUnpause(PCONSOLE Console, UINT Flags);
 VOID FASTCALL ConioConsoleCtrlEvent(DWORD Event, PCONSOLE_PROCESS_DATA ProcessData);
 VOID FASTCALL ConioConsoleCtrlEventTimeout(DWORD Event,
                                            PCONSOLE_PROCESS_DATA ProcessData,
@@ -173,7 +173,7 @@
     Win32CsrLockObject((ProcessData), (Handle), (Object_t **)(Ptr), Access, CONIO_CONSOLE_MAGIC)
 #define ConioUnlockConsole(Console) \
     Win32CsrUnlockObject((Object_t *) Console)
-void WINAPI ConioProcessKey(MSG *msg, PCSRSS_CONSOLE Console, BOOL TextMode);
+void WINAPI ConioProcessKey(MSG *msg, PCONSOLE Console, BOOL TextMode);

/* conoutput.c */
 #define ConioRectHeight(Rect) \
@@ -184,20 +184,20 @@
     Win32CsrLockObject((ProcessData), (Handle), (Object_t **)(Ptr), Access, CONIO_SCREEN_BUFFER_MAGIC)
 #define ConioUnlockScreenBuffer(Buff) \
     Win32CsrUnlockObject((Object_t *) Buff)
-PBYTE FASTCALL ConioCoordToPointer(PCSRSS_SCREEN_BUFFER Buf, ULONG X, ULONG Y);
-VOID FASTCALL ConioDrawConsole(PCSRSS_CONSOLE Console);
-NTSTATUS FASTCALL ConioWriteConsole(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buff,
+PBYTE FASTCALL ConioCoordToPointer(PCONSOLE_SCREEN_BUFFER Buf, ULONG X, ULONG Y);
+VOID FASTCALL ConioDrawConsole(PCONSOLE Console);
+NTSTATUS FASTCALL ConioWriteConsole(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER Buff,
                                     CHAR *Buffer, DWORD Length, BOOL Attrib);
-NTSTATUS FASTCALL CsrInitConsoleScreenBuffer(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buffer);
-VOID WINAPI ConioDeleteScreenBuffer(PCSRSS_SCREEN_BUFFER Buffer);
-DWORD FASTCALL ConioEffectiveCursorSize(PCSRSS_CONSOLE Console, DWORD Scale);
+NTSTATUS FASTCALL CsrInitConsoleScreenBuffer(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER Buffer);
+VOID WINAPI ConioDeleteScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer);
+DWORD FASTCALL ConioEffectiveCursorSize(PCONSOLE Console, DWORD Scale);

/* alias.c */
-VOID IntDeleteAllAliases(struct tagALIAS_HEADER *RootHeader);
+VOID IntDeleteAllAliases(struct _ALIAS_HEADER *RootHeader);

/* lineinput.c */
-struct tagHISTORY_BUFFER;
-VOID FASTCALL HistoryDeleteBuffer(struct tagHISTORY_BUFFER *Hist);
-VOID FASTCALL LineInputKeyDown(PCSRSS_CONSOLE Console, KEY_EVENT_RECORD *KeyEvent);
+struct _HISTORY_BUFFER;
+VOID FASTCALL HistoryDeleteBuffer(struct _HISTORY_BUFFER *Hist);
+VOID FASTCALL LineInputKeyDown(PCONSOLE Console, KEY_EVENT_RECORD *KeyEvent);

/* EOF */

Modified: branches/ros-csrss/win32ss/user/consrv/conoutput.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/co...
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] Sat Jan  5 23:37:04 2013
@@ -38,13 +38,13 @@
 /* PRIVATE FUNCTIONS **********************************************************/

PBYTE FASTCALL
-ConioCoordToPointer(PCSRSS_SCREEN_BUFFER Buff, ULONG X, ULONG Y)
+ConioCoordToPointer(PCONSOLE_SCREEN_BUFFER Buff, ULONG X, ULONG Y)
 {
     return &Buff->Buffer[2 * (((Y + Buff->VirtualY) % Buff->MaxY) * Buff->MaxX + X)];
 }

static VOID FASTCALL
-ClearLineBuffer(PCSRSS_SCREEN_BUFFER Buff)
+ClearLineBuffer(PCONSOLE_SCREEN_BUFFER Buff)
 {
     PBYTE Ptr = ConioCoordToPointer(Buff, 0, Buff->CurrentY);
     UINT Pos;
@@ -58,8 +58,8 @@
 }

NTSTATUS FASTCALL
-CsrInitConsoleScreenBuffer(PCSRSS_CONSOLE Console,
-                           PCSRSS_SCREEN_BUFFER Buffer)
+CsrInitConsoleScreenBuffer(PCONSOLE Console,
+                           PCONSOLE_SCREEN_BUFFER Buffer)
 {
     DPRINT("CsrInitConsoleScreenBuffer Size X %d Size Y %d\n", Buffer->MaxX, Buffer->MaxY);

@@ -89,7 +89,7 @@
 }

static VOID FASTCALL
-ConioNextLine(PCSRSS_SCREEN_BUFFER Buff, SMALL_RECT *UpdateRect, UINT *ScrolledLines)
+ConioNextLine(PCONSOLE_SCREEN_BUFFER Buff, SMALL_RECT *UpdateRect, UINT *ScrolledLines)
 {
     /* If we hit bottom, slide the viewable screen */
     if (++Buff->CurrentY == Buff->MaxY)
@@ -112,7 +112,7 @@
 }

NTSTATUS FASTCALL
-ConioWriteConsole(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buff,
+ConioWriteConsole(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER Buff,
                   CHAR *Buffer, DWORD Length, BOOL Attrib)
 {
     UINT i;
@@ -303,7 +303,7 @@
  * this is done, to avoid overwriting parts of the source before they are moved.
  */
 static VOID FASTCALL
-ConioMoveRegion(PCSRSS_SCREEN_BUFFER ScreenBuffer,
+ConioMoveRegion(PCONSOLE_SCREEN_BUFFER ScreenBuffer,
                 SMALL_RECT *SrcRegion,
                 SMALL_RECT *DstRegion,
                 SMALL_RECT *ClipRegion,
@@ -363,9 +363,9 @@
 }

VOID WINAPI
-ConioDeleteScreenBuffer(PCSRSS_SCREEN_BUFFER Buffer)
-{
-    PCSRSS_CONSOLE Console = Buffer->Header.Console;
+ConioDeleteScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer)
+{
+    PCONSOLE Console = Buffer->Header.Console;

RemoveEntryList(&Buffer->ListEntry);
     if (Buffer == Console->ActiveBuffer)
@@ -374,7 +374,7 @@
         Console->ActiveBuffer = NULL;
         if (!IsListEmpty(&Console->BufferList))
         {
-            Console->ActiveBuffer = CONTAINING_RECORD(Console->BufferList.Flink, CSRSS_SCREEN_BUFFER, ListEntry);
+            Console->ActiveBuffer = CONTAINING_RECORD(Console->BufferList.Flink, CONSOLE_SCREEN_BUFFER, ListEntry);
             ConioDrawConsole(Console);
         }
     }
@@ -384,7 +384,7 @@
 }

VOID FASTCALL
-ConioDrawConsole(PCSRSS_CONSOLE Console)
+ConioDrawConsole(PCONSOLE Console)
 {
     SMALL_RECT Region;

@@ -394,7 +394,7 @@
 }

static VOID FASTCALL
-ConioComputeUpdateRect(PCSRSS_SCREEN_BUFFER Buff, SMALL_RECT *UpdateRect, COORD *Start, UINT Length)
+ConioComputeUpdateRect(PCONSOLE_SCREEN_BUFFER Buff, SMALL_RECT *UpdateRect, COORD *Start, UINT Length)
 {
     if (Buff->MaxX <= Start->X + Length)
     {
@@ -421,7 +421,7 @@
 }

DWORD FASTCALL
-ConioEffectiveCursorSize(PCSRSS_CONSOLE Console, DWORD Scale)
+ConioEffectiveCursorSize(PCONSOLE Console, DWORD Scale)
 {
     DWORD Size = (Console->ActiveBuffer->CursorInfo.dwSize * Scale + 99) / 100;
     /* If line input in progress, perhaps adjust for insert toggle */
@@ -466,8 +466,8 @@
 {
     NTSTATUS Status = STATUS_SUCCESS;
     PCONSOLE_WRITECONSOLE WriteConsoleRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.WriteConsoleRequest;
-    PCSRSS_CONSOLE Console;
-    PCSRSS_SCREEN_BUFFER Buff;
+    PCONSOLE Console;
+    PCONSOLE_SCREEN_BUFFER Buff;
     PCHAR Buffer;
     DWORD Written = 0;
     ULONG Length;
@@ -557,7 +557,7 @@
     PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process);
     PCHAR_INFO CharInfo;
     PCHAR_INFO CurCharInfo;
-    PCSRSS_SCREEN_BUFFER Buff;
+    PCONSOLE_SCREEN_BUFFER Buff;
     DWORD SizeX, SizeY;
     NTSTATUS Status;
     COORD BufferSize;
@@ -665,8 +665,8 @@
     PCONSOLE_WRITEOUTPUT WriteOutputRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.WriteOutputRequest;
     PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process);
     SHORT i, X, Y, SizeX, SizeY;
-    PCSRSS_CONSOLE Console;
-    PCSRSS_SCREEN_BUFFER Buff;
+    PCONSOLE Console;
+    PCONSOLE_SCREEN_BUFFER Buff;
     SMALL_RECT ScreenBuffer;
     CHAR_INFO* CurCharInfo;
     SMALL_RECT WriteRegion;
@@ -753,8 +753,8 @@
 {
     NTSTATUS Status;
     PCONSOLE_READOUTPUTCODE ReadOutputCodeRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ReadOutputCodeRequest;
-    PCSRSS_CONSOLE Console;
-    PCSRSS_SCREEN_BUFFER Buff;
+    PCONSOLE Console;
+    PCONSOLE_SCREEN_BUFFER Buff;
     USHORT CodeType;
     DWORD Xpos, Ypos;
     PVOID ReadBuffer;
@@ -877,8 +877,8 @@
 {
     NTSTATUS Status;
     PCONSOLE_WRITEOUTPUTCODE WriteOutputCodeRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.WriteOutputCodeRequest;
-    PCSRSS_CONSOLE Console;
-    PCSRSS_SCREEN_BUFFER Buff;
+    PCONSOLE Console;
+    PCONSOLE_SCREEN_BUFFER Buff;
     USHORT CodeType;
     PBYTE Buffer; // PUCHAR
     PCHAR String, tmpString = NULL;
@@ -1009,8 +1009,8 @@
 {
     NTSTATUS Status;
     PCONSOLE_FILLOUTPUTCODE FillOutputRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.FillOutputRequest;
-    PCSRSS_CONSOLE Console;
-    PCSRSS_SCREEN_BUFFER Buff;
+    PCONSOLE Console;
+    PCONSOLE_SCREEN_BUFFER Buff;
     DWORD X, Y, Length; // , Written = 0;
     USHORT CodeType;
     BYTE Code;
@@ -1085,7 +1085,7 @@
 {
     NTSTATUS Status;
     PCONSOLE_GETSETCURSORINFO CursorInfoRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.CursorInfoRequest;
-    PCSRSS_SCREEN_BUFFER Buff;
+    PCONSOLE_SCREEN_BUFFER Buff;

DPRINT("SrvGetConsoleCursorInfo\n");

@@ -1103,8 +1103,8 @@
 {
     NTSTATUS Status;
     PCONSOLE_GETSETCURSORINFO CursorInfoRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.CursorInfoRequest;
-    PCSRSS_CONSOLE Console;
-    PCSRSS_SCREEN_BUFFER Buff;
+    PCONSOLE Console;
+    PCONSOLE_SCREEN_BUFFER Buff;
     DWORD Size;
     BOOL Visible;

@@ -1149,8 +1149,8 @@
 {
     NTSTATUS Status;
     PCONSOLE_SETCURSORPOSITION SetCursorPositionRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetCursorPositionRequest;
-    PCSRSS_CONSOLE Console;
-    PCSRSS_SCREEN_BUFFER Buff;
+    PCONSOLE Console;
+    PCONSOLE_SCREEN_BUFFER Buff;
     LONG OldCursorX, OldCursorY;
     LONG NewCursorX, NewCursorY;

@@ -1191,8 +1191,8 @@
 {
     NTSTATUS Status;
     PCONSOLE_SETTEXTATTRIB SetTextAttribRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetTextAttribRequest;
-    PCSRSS_CONSOLE Console;
-    PCSRSS_SCREEN_BUFFER Buff;
+    PCONSOLE Console;
+    PCONSOLE_SCREEN_BUFFER Buff;

DPRINT("SrvSetConsoleTextAttribute\n");

@@ -1221,8 +1221,8 @@
     NTSTATUS Status;
     PCONSOLE_CREATESCREENBUFFER CreateScreenBufferRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.CreateScreenBufferRequest;
     PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process);
-    PCSRSS_CONSOLE Console;
-    PCSRSS_SCREEN_BUFFER Buff;
+    PCONSOLE Console;
+    PCONSOLE_SCREEN_BUFFER Buff;

DPRINT("SrvCreateConsoleScreenBuffer\n");

@@ -1235,7 +1235,7 @@
         return Status;
     }

-    Buff = HeapAlloc(ConSrvHeap, HEAP_ZERO_MEMORY, sizeof(CSRSS_SCREEN_BUFFER));
+    Buff = HeapAlloc(ConSrvHeap, HEAP_ZERO_MEMORY, sizeof(CONSOLE_SCREEN_BUFFER));
     if (Buff != NULL)
     {
         if (Console->ActiveBuffer)
@@ -1288,8 +1288,8 @@
 {
     NTSTATUS Status;
     PCONSOLE_GETSCREENBUFFERINFO ScreenBufferInfoRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ScreenBufferInfoRequest;
-    PCSRSS_CONSOLE Console;
-    PCSRSS_SCREEN_BUFFER Buff;
+    PCONSOLE Console;
+    PCONSOLE_SCREEN_BUFFER Buff;
     PCONSOLE_SCREEN_BUFFER_INFO pInfo = &ScreenBufferInfoRequest->Info;

DPRINT("SrvGetConsoleScreenBufferInfo\n");
@@ -1320,8 +1320,8 @@
 {
     NTSTATUS Status;
     PCONSOLE_SETACTIVESCREENBUFFER SetScreenBufferRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetScreenBufferRequest;
-    PCSRSS_CONSOLE Console;
-    PCSRSS_SCREEN_BUFFER Buff;
+    PCONSOLE Console;
+    PCONSOLE_SCREEN_BUFFER Buff;

DPRINT("SrvSetConsoleActiveScreenBuffer\n");

@@ -1356,8 +1356,8 @@
 CSR_API(SrvScrollConsoleScreenBuffer)
 {
     PCONSOLE_SCROLLSCREENBUFFER ScrollScreenBufferRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ScrollScreenBufferRequest;
-    PCSRSS_CONSOLE Console;
-    PCSRSS_SCREEN_BUFFER Buff;
+    PCONSOLE Console;
+    PCONSOLE_SCREEN_BUFFER Buff;
     SMALL_RECT ScreenBuffer;
     SMALL_RECT SrcRegion;
     SMALL_RECT DstRegion;
@@ -1449,7 +1449,7 @@
 {
     NTSTATUS Status;
     PCONSOLE_SETSCREENBUFFERSIZE SetScreenBufferSizeRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetScreenBufferSizeRequest;
-    PCSRSS_SCREEN_BUFFER Buff;
+    PCONSOLE_SCREEN_BUFFER Buff;

Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), SetScreenBufferSizeRequest->OutputHandle, &Buff, GENERIC_WRITE);
     if (!NT_SUCCESS(Status)) return Status;

Modified: branches/ros-csrss/win32ss/user/consrv/console.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/co...
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] Sat Jan  5 23:37:04 2013
@@ -33,9 +33,9 @@

NTSTATUS FASTCALL
 ConioConsoleFromProcessData(PCONSOLE_PROCESS_DATA ProcessData,
-                            PCSRSS_CONSOLE *Console)
-{
-    PCSRSS_CONSOLE ProcessConsole;
+                            PCONSOLE *Console)
+{
+    PCONSOLE ProcessConsole;

RtlEnterCriticalSection(&ProcessData->HandleTableLock);
     ProcessConsole = ProcessData->Console;
@@ -88,12 +88,12 @@
 }

NTSTATUS WINAPI
-CsrInitConsole(PCSRSS_CONSOLE* NewConsole, int ShowCmd, PCSR_PROCESS ConsoleLeaderProcess)
+CsrInitConsole(PCONSOLE* NewConsole, int ShowCmd, PCSR_PROCESS ConsoleLeaderProcess)
 {
     NTSTATUS Status;
     SECURITY_ATTRIBUTES SecurityAttributes;
-    PCSRSS_CONSOLE Console;
-    PCSRSS_SCREEN_BUFFER NewBuffer;
+    PCONSOLE Console;
+    PCONSOLE_SCREEN_BUFFER NewBuffer;
     BOOL GuiMode;
     WCHAR Title[255];

@@ -102,7 +102,7 @@
     *NewConsole = NULL;

/* Allocate a console structure */
-    Console = HeapAlloc(ConSrvHeap, HEAP_ZERO_MEMORY, sizeof(CSRSS_CONSOLE));
+    Console = HeapAlloc(ConSrvHeap, HEAP_ZERO_MEMORY, sizeof(CONSOLE));
     if (NULL == Console)
     {
         DPRINT1("Not enough memory for console creation.\n");
@@ -155,7 +155,7 @@
     GuiMode = DtbgIsDesktopVisible();

/* allocate console screen buffer */
-    NewBuffer = HeapAlloc(ConSrvHeap, HEAP_ZERO_MEMORY, sizeof(CSRSS_SCREEN_BUFFER));
+    NewBuffer = HeapAlloc(ConSrvHeap, HEAP_ZERO_MEMORY, sizeof(CONSOLE_SCREEN_BUFFER));
     if (NULL == NewBuffer)
     {
         RtlFreeUnicodeString(&Console->Title);
@@ -168,7 +168,7 @@
     NewBuffer->CursorInfo.bVisible = TRUE;
     NewBuffer->CursorInfo.dwSize = CSR_DEFAULT_CURSOR_SIZE;
     /* make console active, and insert into console list */
-    Console->ActiveBuffer = (PCSRSS_SCREEN_BUFFER) NewBuffer;
+    Console->ActiveBuffer = (PCONSOLE_SCREEN_BUFFER) NewBuffer;

/*
      * If we are not in GUI-mode, start the text-mode console. If we fail,
@@ -251,7 +251,7 @@
         DWORD DesiredAccess = OpenConsoleRequest->Access;
         DWORD ShareMode = OpenConsoleRequest->ShareMode;

-        PCSRSS_CONSOLE Console = ProcessData->Console;
+        PCONSOLE Console = ProcessData->Console;
         Object_t *Object;

DPRINT1("SrvOpenConsole - Checkpoint 2\n");
@@ -435,7 +435,7 @@

/* Set the Ctrl Dispatcher */
     ProcessData->CtrlDispatcher = AllocConsoleRequest->CtrlDispatcher;
-    DPRINT("CSRSS:CtrlDispatcher address: %x\n", ProcessData->CtrlDispatcher);
+    DPRINT("CONSRV: CtrlDispatcher address: %x\n", ProcessData->CtrlDispatcher);

RtlLeaveCriticalSection(&ProcessData->HandleTableLock);
     return STATUS_SUCCESS;
@@ -449,7 +449,7 @@
 }

VOID WINAPI
-ConioDeleteConsole(PCSRSS_CONSOLE Console)
+ConioDeleteConsole(PCONSOLE Console)
 {
     ConsoleInput *Event;

@@ -468,7 +468,7 @@
     if (Console->LineBuffer)
         RtlFreeHeap(ConSrvHeap, 0, Console->LineBuffer);
     while (!IsListEmpty(&Console->HistoryBuffers))
-        HistoryDeleteBuffer((struct tagHISTORY_BUFFER *)Console->HistoryBuffers.Flink);
+        HistoryDeleteBuffer((struct _HISTORY_BUFFER *)Console->HistoryBuffers.Flink);

ConioDeleteScreenBuffer(Console->ActiveBuffer);
     if (!IsListEmpty(&Console->BufferList))
@@ -493,7 +493,7 @@
 }

VOID FASTCALL
-ConioPause(PCSRSS_CONSOLE Console, UINT Flags)
+ConioPause(PCONSOLE Console, UINT Flags)
 {
     Console->PauseFlags |= Flags;
     if (!Console->UnpauseEvent)
@@ -501,7 +501,7 @@
 }

VOID FASTCALL
-ConioUnpause(PCSRSS_CONSOLE Console, UINT Flags)
+ConioUnpause(PCONSOLE Console, UINT Flags)
 {
     Console->PauseFlags &= ~Flags;

@@ -523,8 +523,8 @@
 {
     NTSTATUS Status;
     PCONSOLE_GETSETCONSOLEMODE ConsoleModeRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ConsoleModeRequest;
-    PCSRSS_CONSOLE Console;
-    PCSRSS_SCREEN_BUFFER Buff;
+    PCONSOLE Console;
+    PCONSOLE_SCREEN_BUFFER Buff;

DPRINT("SrvSetConsoleMode\n");

@@ -533,7 +533,7 @@
                                 (Object_t **) &Console, GENERIC_WRITE, 0);
     if (!NT_SUCCESS(Status)) return Status;

-    Buff = (PCSRSS_SCREEN_BUFFER)Console;
+    Buff = (PCONSOLE_SCREEN_BUFFER)Console;

if (CONIO_CONSOLE_MAGIC == Console->Header.Type)
     {
@@ -557,8 +557,8 @@
 {
     NTSTATUS Status;
     PCONSOLE_GETSETCONSOLEMODE ConsoleModeRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ConsoleModeRequest;
-    PCSRSS_CONSOLE Console;
-    PCSRSS_SCREEN_BUFFER Buff;
+    PCONSOLE Console;
+    PCONSOLE_SCREEN_BUFFER Buff;

DPRINT("SrvGetConsoleMode\n");

@@ -568,7 +568,7 @@
     if (!NT_SUCCESS(Status)) return Status;

Status = STATUS_SUCCESS;
-    Buff = (PCSRSS_SCREEN_BUFFER) Console;
+    Buff = (PCONSOLE_SCREEN_BUFFER) Console;

if (CONIO_CONSOLE_MAGIC == Console->Header.Type)
     {
@@ -592,7 +592,7 @@
     NTSTATUS Status;
     PCONSOLE_GETSETCONSOLETITLE TitleRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.TitleRequest;
     // PCSR_PROCESS Process = CsrGetClientThread()->Process;
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     PWCHAR Buffer;

DPRINT("SrvSetConsoleTitle\n");
@@ -642,7 +642,7 @@
     NTSTATUS Status;
     PCONSOLE_GETSETCONSOLETITLE TitleRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.TitleRequest;
     // PCSR_PROCESS Process = CsrGetClientThread()->Process;
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     DWORD Length;

DPRINT("SrvGetConsoleTitle\n");
@@ -684,14 +684,14 @@
  *      between direct video buffer ouput and GDI windowed
  *      output.
  *  ARGUMENTS
- *      Client hands us a CSRSS_CONSOLE_HARDWARE_STATE
- *      object. We use the same object to Request.
+ *      Client hands us a CONSOLE_GETSETHWSTATE object.
+ *      We use the same object to Request.
  *  NOTE
  *      ConsoleHwState has the correct size to be compatible
  *      with NT's, but values are not.
  */
 static NTSTATUS FASTCALL
-SetConsoleHardwareState(PCSRSS_CONSOLE Console, DWORD ConsoleHwState)
+SetConsoleHardwareState(PCONSOLE Console, DWORD ConsoleHwState)
 {
     DPRINT1("Console Hardware State: %d\n", ConsoleHwState);

@@ -715,7 +715,7 @@
 {
     NTSTATUS Status;
     PCONSOLE_GETSETHWSTATE HardwareStateRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.HardwareStateRequest;
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;

DPRINT("SrvGetConsoleHardwareState\n");

@@ -740,7 +740,7 @@
 {
     NTSTATUS Status;
     PCONSOLE_GETSETHWSTATE HardwareStateRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.HardwareStateRequest;
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;

DPRINT("SrvSetConsoleHardwareState\n");

@@ -766,7 +766,7 @@
 {
     NTSTATUS Status;
     PCONSOLE_GETWINDOW GetWindowRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetWindowRequest;
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;

DPRINT("SrvGetConsoleWindow\n");

@@ -783,7 +783,7 @@
 {
     NTSTATUS Status;
     PCONSOLE_SETICON SetIconRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetIconRequest;
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;

DPRINT("SrvSetConsoleIcon\n");

@@ -803,7 +803,7 @@
 {
     NTSTATUS Status;
     PCONSOLE_GETSETINPUTOUTPUTCP ConsoleCPRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ConsoleCPRequest;
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;

DPRINT("SrvGetConsoleCP, getting %s Code Page\n",
             ConsoleCPRequest->InputCP ? "Input" : "Output");
@@ -821,7 +821,7 @@
 {
     NTSTATUS Status;
     PCONSOLE_GETSETINPUTOUTPUTCP ConsoleCPRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ConsoleCPRequest;
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;

DPRINT("SrvSetConsoleCP, setting %s Code Page\n",
             ConsoleCPRequest->InputCP ? "Input" : "Output");
@@ -850,7 +850,7 @@
     PCONSOLE_GETPROCESSLIST GetProcessListRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetProcessListRequest;
     PDWORD Buffer;
     // PCSR_PROCESS Process = CsrGetClientThread()->Process;
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     PCONSOLE_PROCESS_DATA current;
     PLIST_ENTRY current_entry;
     ULONG nItems = 0;
@@ -891,7 +891,7 @@
 {
     NTSTATUS Status;
     PCONSOLE_GENERATECTRLEVENT GenerateCtrlEventRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GenerateCtrlEventRequest;
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     PCONSOLE_PROCESS_DATA current;
     PLIST_ENTRY current_entry;
     DWORD Group;
@@ -922,7 +922,7 @@
 {
     NTSTATUS Status;
     PCONSOLE_GETSELECTIONINFO GetSelectionInfoRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetSelectionInfoRequest;
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;

Status = ConioConsoleFromProcessData(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console);
     if (NT_SUCCESS(Status))

Modified: branches/ros-csrss/win32ss/user/consrv/consrv.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/co...
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] Sat Jan  5 23:37:04 2013
@@ -46,20 +46,20 @@
 typedef struct Object_tt
 {
     LONG Type;
-    struct tagCSRSS_CONSOLE *Console;
+    struct _CONSOLE *Console;
     LONG AccessRead, AccessWrite;
     LONG ExclusiveRead, ExclusiveWrite;
     LONG HandleCount;
 } Object_t;

-typedef struct _CSRSS_HANDLE
+typedef struct _CONSOLE_IO_HANDLE
 {
     Object_t *Object;   /* The object on which the handle points to */
     DWORD Access;
     BOOL Inheritable;
     DWORD ShareMode;
-} CSRSS_HANDLE, *PCSRSS_HANDLE;
+} CONSOLE_IO_HANDLE, *PCONSOLE_IO_HANDLE;

#define ConsoleGetPerProcessData(pcsrprocess)   \
@@ -70,15 +70,15 @@
     LIST_ENTRY ConsoleLink;
     PCSR_PROCESS Process;   // Process owning this structure.
     HANDLE ConsoleEvent;
-    /* PCSRSS_CONSOLE */ struct tagCSRSS_CONSOLE* Console;
-    /* PCSRSS_CONSOLE */ struct tagCSRSS_CONSOLE* ParentConsole;
+    /* PCONSOLE */ struct _CONSOLE* Console;
+    /* PCONSOLE */ struct _CONSOLE* ParentConsole;

// BOOL bInheritHandles;
     BOOL ConsoleApp;    // TRUE if it is a CUI app, FALSE otherwise.

RTL_CRITICAL_SECTION HandleTableLock;
     ULONG HandleTableSize;
-    PCSRSS_HANDLE HandleTable; // Length-varying table
+    PCONSOLE_IO_HANDLE HandleTable; // Length-varying table
     LPTHREAD_START_ROUTINE CtrlDispatcher;
 } CONSOLE_PROCESS_DATA, *PCONSOLE_PROCESS_DATA;

Modified: branches/ros-csrss/win32ss/user/consrv/guiconsole.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/gu...
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/guiconsole.c [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/guiconsole.c [iso-8859-1] Sat Jan  5 23:37:04 2013
@@ -180,7 +180,7 @@
 }

static VOID
-GuiConsoleCreateSysMenu(PCSRSS_CONSOLE Console)
+GuiConsoleCreateSysMenu(PCONSOLE Console)
 {
     HMENU hMenu;
     hMenu = GetSystemMenu(Console->hWindow,
@@ -194,9 +194,9 @@
 }

static VOID
-GuiConsoleGetDataPointers(HWND hWnd, PCSRSS_CONSOLE *Console, PGUI_CONSOLE_DATA *GuiData)
-{
-    *Console = (PCSRSS_CONSOLE)GetWindowLongPtrW(hWnd, GWLP_USERDATA);
+GuiConsoleGetDataPointers(HWND hWnd, PCONSOLE *Console, PGUI_CONSOLE_DATA *GuiData)
+{
+    *Console = (PCONSOLE)GetWindowLongPtrW(hWnd, GWLP_USERDATA);
     *GuiData = (NULL == *Console ? NULL : (*Console)->PrivateData);
 }

@@ -404,7 +404,7 @@
 }

static VOID
-GuiConsoleWriteUserSettings(PCSRSS_CONSOLE Console, PGUI_CONSOLE_DATA GuiData)
+GuiConsoleWriteUserSettings(PCONSOLE Console, PGUI_CONSOLE_DATA GuiData)
 {
     HKEY hKey;
     PCONSOLE_PROCESS_DATA ProcessData;
@@ -510,7 +510,7 @@
 }

static void
-GuiConsoleReadUserSettings(HKEY hKey, PCSRSS_CONSOLE Console, PGUI_CONSOLE_DATA GuiData, PCSRSS_SCREEN_BUFFER Buffer)
+GuiConsoleReadUserSettings(HKEY hKey, PCONSOLE Console, PGUI_CONSOLE_DATA GuiData, PCONSOLE_SCREEN_BUFFER Buffer)
 {
     DWORD dwNumSubKeys = 0;
     DWORD dwIndex;
@@ -612,7 +612,7 @@
     }
 }
 static VOID
-GuiConsoleUseDefaults(PCSRSS_CONSOLE Console, PGUI_CONSOLE_DATA GuiData, PCSRSS_SCREEN_BUFFER Buffer)
+GuiConsoleUseDefaults(PCONSOLE Console, PGUI_CONSOLE_DATA GuiData, PCONSOLE_SCREEN_BUFFER Buffer)
 {
     /*
      * init guidata with default properties
@@ -649,7 +649,7 @@

VOID
 FASTCALL
-GuiConsoleInitScrollbar(PCSRSS_CONSOLE Console, HWND hwnd)
+GuiConsoleInitScrollbar(PCONSOLE Console, HWND hwnd)
 {
     SCROLLINFO sInfo;
     PGUI_CONSOLE_DATA GuiData = Console->PrivateData;
@@ -697,7 +697,7 @@
 static BOOL
 GuiConsoleHandleNcCreate(HWND hWnd, LPCREATESTRUCTW Create)
 {
-    PCSRSS_CONSOLE Console = (PCSRSS_CONSOLE)Create->lpCreateParams;
+    PCONSOLE Console = (PCONSOLE)Create->lpCreateParams;
     PGUI_CONSOLE_DATA GuiData = (PGUI_CONSOLE_DATA)Console->PrivateData;
     HDC Dc;
     HFONT OldFont;
@@ -805,9 +805,9 @@
 }

static VOID
-SmallRectToRect(PCSRSS_CONSOLE Console, PRECT Rect, PSMALL_RECT SmallRect)
-{
-    PCSRSS_SCREEN_BUFFER Buffer = Console->ActiveBuffer;
+SmallRectToRect(PCONSOLE Console, PRECT Rect, PSMALL_RECT SmallRect)
+{
+    PCONSOLE_SCREEN_BUFFER Buffer = Console->ActiveBuffer;
     PGUI_CONSOLE_DATA GuiData = Console->PrivateData;
     Rect->left   = (SmallRect->Left       - Buffer->ShowX) * GuiData->CharWidth;
     Rect->top    = (SmallRect->Top        - Buffer->ShowY) * GuiData->CharHeight;
@@ -816,7 +816,7 @@
 }

static VOID
-GuiConsoleUpdateSelection(PCSRSS_CONSOLE Console, PCOORD coord)
+GuiConsoleUpdateSelection(PCONSOLE Console, PCOORD coord)
 {
     RECT oldRect, newRect;
     HWND hWnd = Console->hWindow;
@@ -878,12 +878,12 @@

static VOID
-GuiConsolePaint(PCSRSS_CONSOLE Console,
+GuiConsolePaint(PCONSOLE Console,
                 PGUI_CONSOLE_DATA GuiData,
                 HDC hDC,
                 PRECT rc)
 {
-    PCSRSS_SCREEN_BUFFER Buff;
+    PCONSOLE_SCREEN_BUFFER Buff;
     ULONG TopLine, BottomLine, LeftChar, RightChar;
     ULONG Line, Char, Start;
     PBYTE From;
@@ -1001,7 +1001,7 @@
 {
     HDC hDC;
     PAINTSTRUCT ps;
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     PGUI_CONSOLE_DATA GuiData;

hDC = BeginPaint(hWnd, &ps);
@@ -1054,7 +1054,7 @@
 static VOID
 GuiConsoleHandleKey(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     PGUI_CONSOLE_DATA GuiData;
     MSG Message;

@@ -1074,7 +1074,7 @@
 }

static VOID WINAPI
-GuiDrawRegion(PCSRSS_CONSOLE Console, SMALL_RECT *Region)
+GuiDrawRegion(PCONSOLE Console, SMALL_RECT *Region)
 {
     RECT RegionRect;
     SmallRectToRect(Console, &RegionRect, Region);
@@ -1082,18 +1082,18 @@
 }

static VOID
-GuiInvalidateCell(PCSRSS_CONSOLE Console, UINT x, UINT y)
+GuiInvalidateCell(PCONSOLE Console, UINT x, UINT y)
 {
     SMALL_RECT CellRect = { x, y, x, y };
     GuiDrawRegion(Console, &CellRect);
 }

static VOID WINAPI
-GuiWriteStream(PCSRSS_CONSOLE Console, SMALL_RECT *Region, LONG CursorStartX, LONG CursorStartY,
+GuiWriteStream(PCONSOLE Console, SMALL_RECT *Region, LONG CursorStartX, LONG CursorStartY,
                UINT ScrolledLines, CHAR *Buffer, UINT Length)
 {
     PGUI_CONSOLE_DATA GuiData = (PGUI_CONSOLE_DATA) Console->PrivateData;
-    PCSRSS_SCREEN_BUFFER Buff = Console->ActiveBuffer;
+    PCONSOLE_SCREEN_BUFFER Buff = Console->ActiveBuffer;
     LONG CursorEndX, CursorEndY;
     RECT ScrollRect;

@@ -1143,7 +1143,7 @@
 }

static BOOL WINAPI
-GuiSetCursorInfo(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buff)
+GuiSetCursorInfo(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER Buff)
 {
     if (Console->ActiveBuffer == Buff)
     {
@@ -1154,7 +1154,7 @@
 }

static BOOL WINAPI
-GuiSetScreenInfo(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buff, UINT OldCursorX, UINT OldCursorY)
+GuiSetScreenInfo(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER Buff, UINT OldCursorX, UINT OldCursorY)
 {
     if (Console->ActiveBuffer == Buff)
     {
@@ -1168,7 +1168,7 @@
 }

static BOOL WINAPI
-GuiUpdateScreenInfo(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buff)
+GuiUpdateScreenInfo(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER Buff)
 {
     PGUI_CONSOLE_DATA GuiData = (PGUI_CONSOLE_DATA) Console->PrivateData;

@@ -1184,9 +1184,9 @@
 static VOID
 GuiConsoleHandleTimer(HWND hWnd)
 {
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     PGUI_CONSOLE_DATA GuiData;
-    PCSRSS_SCREEN_BUFFER Buff;
+    PCONSOLE_SCREEN_BUFFER Buff;

SetTimer(hWnd, CONGUI_UPDATE_TIMER, CURSOR_BLINK_TIME, NULL);

@@ -1273,7 +1273,7 @@
 static VOID
 GuiConsoleHandleClose(HWND hWnd)
 {
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     PGUI_CONSOLE_DATA GuiData;
     PLIST_ENTRY current_entry;
     PCONSOLE_PROCESS_DATA current;
@@ -1300,7 +1300,7 @@
 static VOID
 GuiConsoleHandleNcDestroy(HWND hWnd)
 {
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     PGUI_CONSOLE_DATA GuiData;

@@ -1316,9 +1316,9 @@
 }

static COORD
-PointToCoord(PCSRSS_CONSOLE Console, LPARAM lParam)
-{
-    PCSRSS_SCREEN_BUFFER Buffer = Console->ActiveBuffer;
+PointToCoord(PCONSOLE Console, LPARAM lParam)
+{
+    PCONSOLE_SCREEN_BUFFER Buffer = Console->ActiveBuffer;
     PGUI_CONSOLE_DATA GuiData = Console->PrivateData;
     COORD Coord;
     Coord.X = Buffer->ShowX + ((short)LOWORD(lParam) / (int)GuiData->CharWidth);
@@ -1335,7 +1335,7 @@
 static VOID
 GuiConsoleLeftMouseDown(HWND hWnd, LPARAM lParam)
 {
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     PGUI_CONSOLE_DATA GuiData;

GuiConsoleGetDataPointers(hWnd, &Console, &GuiData);
@@ -1353,7 +1353,7 @@
 static VOID
 GuiConsoleLeftMouseUp(HWND hWnd, LPARAM lParam)
 {
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     PGUI_CONSOLE_DATA GuiData;
     COORD c;

@@ -1373,7 +1373,7 @@
 static VOID
 GuiConsoleMouseMove(HWND hWnd, WPARAM wParam, LPARAM lParam)
 {
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     PGUI_CONSOLE_DATA GuiData;
     COORD c;

@@ -1389,7 +1389,7 @@
 }

static VOID
-GuiConsoleCopy(HWND hWnd, PCSRSS_CONSOLE Console)
+GuiConsoleCopy(HWND hWnd, PCONSOLE Console)
 {
     if (OpenClipboard(hWnd) == TRUE)
     {
@@ -1460,7 +1460,7 @@
 }

static VOID
-GuiConsolePaste(HWND hWnd, PCSRSS_CONSOLE Console)
+GuiConsolePaste(HWND hWnd, PCONSOLE Console)
 {
     if (OpenClipboard(hWnd) == TRUE)
     {
@@ -1494,7 +1494,7 @@
 static VOID
 GuiConsoleRightMouseDown(HWND hWnd)
 {
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     PGUI_CONSOLE_DATA GuiData;

GuiConsoleGetDataPointers(hWnd, &Console, &GuiData);
@@ -1517,7 +1517,7 @@
 static VOID
 GuiConsoleShowConsoleProperties(HWND hWnd, BOOL Defaults, PGUI_CONSOLE_DATA GuiData)
 {
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     APPLET_PROC CPLFunc;
     TCHAR szBuffer[MAX_PATH];
     ConsoleInfo SharedInfo;
@@ -1590,7 +1590,7 @@
 GuiConsoleHandleSysMenuCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
 {
     LRESULT Ret = TRUE;
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     PGUI_CONSOLE_DATA GuiData;
     COORD bottomRight = { 0, 0 };

@@ -1642,7 +1642,7 @@
 static VOID
 GuiConsoleGetMinMaxInfo(HWND hWnd, PMINMAXINFO minMaxInfo)
 {
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     PGUI_CONSOLE_DATA GuiData;
     DWORD windx, windy;

@@ -1667,14 +1667,14 @@
 static VOID
 GuiConsoleResize(HWND hWnd, WPARAM wParam, LPARAM lParam)
 {
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     PGUI_CONSOLE_DATA GuiData;
     GuiConsoleGetDataPointers(hWnd, &Console, &GuiData);
     if((Console == NULL) || (GuiData == NULL)) return;

if ((GuiData->WindowSizeLock == FALSE) && (wParam == SIZE_RESTORED || wParam == SIZE_MAXIMIZED || wParam == SIZE_MINIMIZED))
     {
-        PCSRSS_SCREEN_BUFFER Buff = Console->ActiveBuffer;
+        PCONSOLE_SCREEN_BUFFER Buff = Console->ActiveBuffer;
         DWORD windx, windy, charx, chary;

GuiData->WindowSizeLock = TRUE;
@@ -1748,7 +1748,7 @@
 }

static NTSTATUS WINAPI
-GuiResizeBuffer(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER ScreenBuffer, COORD Size)
+GuiResizeBuffer(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer, COORD Size)
 {
     BYTE * Buffer;
     DWORD Offset = 0;
@@ -1841,10 +1841,10 @@
 }

static VOID
-GuiApplyUserSettings(PCSRSS_CONSOLE Console, PGUI_CONSOLE_DATA GuiData, PConsoleInfo pConInfo)
+GuiApplyUserSettings(PCONSOLE Console, PGUI_CONSOLE_DATA GuiData, PConsoleInfo pConInfo)
 {
     DWORD windx, windy;
-    PCSRSS_SCREEN_BUFFER ActiveBuffer = Console->ActiveBuffer;
+    PCONSOLE_SCREEN_BUFFER ActiveBuffer = Console->ActiveBuffer;
     COORD BufSize;
     BOOL SizeChanged = FALSE;

@@ -1891,8 +1891,8 @@
 LRESULT
 GuiConsoleHandleScroll(HWND hwnd, UINT uMsg, WPARAM wParam)
 {
-    PCSRSS_CONSOLE Console;
-    PCSRSS_SCREEN_BUFFER Buff;
+    PCONSOLE Console;
+    PCONSOLE_SCREEN_BUFFER Buff;
     PGUI_CONSOLE_DATA GuiData;
     SCROLLINFO sInfo;
     int fnBar;
@@ -1998,7 +1998,7 @@
 {
     LRESULT Result = 0;
     PGUI_CONSOLE_DATA GuiData = NULL;
-    PCSRSS_CONSOLE Console = NULL;
+    PCONSOLE Console = NULL;

GuiConsoleGetDataPointers(hWnd, &Console, &GuiData);

@@ -2073,7 +2073,7 @@
     LONG WindowCount;
     MSG Msg;
     PWCHAR Buffer, Title;
-    PCSRSS_CONSOLE Console = (PCSRSS_CONSOLE) lParam;
+    PCONSOLE Console = (PCONSOLE) lParam;

switch(msg)
     {
@@ -2237,13 +2237,13 @@
 }

static VOID WINAPI
-GuiInitScreenBuffer(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buffer)
+GuiInitScreenBuffer(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER Buffer)
 {
     Buffer->DefaultAttrib = DEFAULT_ATTRIB;
 }

static BOOL WINAPI
-GuiChangeTitle(PCSRSS_CONSOLE Console)
+GuiChangeTitle(PCONSOLE Console)
 {
     PWCHAR Buffer, Title;

@@ -2271,7 +2271,7 @@
 }

static BOOL WINAPI
-GuiChangeIcon(PCSRSS_CONSOLE Console, HICON hWindowIcon)
+GuiChangeIcon(PCONSOLE Console, HICON hWindowIcon)
 {
     SendMessageW(Console->hWindow, WM_SETICON, ICON_BIG, (LPARAM)hWindowIcon);
     SendMessageW(Console->hWindow, WM_SETICON, ICON_SMALL, (LPARAM)hWindowIcon);
@@ -2280,12 +2280,12 @@
 }

static VOID WINAPI
-GuiCleanupConsole(PCSRSS_CONSOLE Console)
+GuiCleanupConsole(PCONSOLE Console)
 {
     SendMessageW(NotifyWnd, PM_DESTROY_CONSOLE, 0, (LPARAM)Console);
 }

-static CSRSS_CONSOLE_VTBL GuiVtbl =
+static CONSOLE_VTBL GuiVtbl =
 {
     GuiInitScreenBuffer,
     GuiWriteStream,
@@ -2300,7 +2300,7 @@
 };

NTSTATUS FASTCALL
-GuiInitConsole(PCSRSS_CONSOLE Console, int ShowCmd)
+GuiInitConsole(PCONSOLE Console, int ShowCmd)
 {
     HANDLE GraphicsStartupEvent;
     HANDLE ThreadHandle;

Modified: branches/ros-csrss/win32ss/user/consrv/guiconsole.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/gu...
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/guiconsole.h [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/guiconsole.h [iso-8859-1] Sat Jan  5 23:37:04 2013
@@ -13,7 +13,7 @@
 #define CONGUI_UPDATE_TIME    0
 #define CONGUI_UPDATE_TIMER   1

-NTSTATUS FASTCALL GuiInitConsole(PCSRSS_CONSOLE Console, BOOL Visible);
+NTSTATUS FASTCALL GuiInitConsole(PCONSOLE Console, BOOL Visible);
 VOID FASTCALL GuiConsoleHandleScrollbarMenu(VOID);

/*EOF*/

Modified: branches/ros-csrss/win32ss/user/consrv/handle.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/ha...
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] Sat Jan  5 23:37:04 2013
@@ -18,7 +18,7 @@
 /* PRIVATE FUNCTIONS *********************************************************/

static INT
-AdjustHandleCounts(PCSRSS_HANDLE Entry, INT Change)
+AdjustHandleCounts(PCONSOLE_IO_HANDLE Entry, INT Change)
 {
     Object_t *Object = Entry->Object;

@@ -35,7 +35,7 @@
 }

static VOID
-Win32CsrCreateHandleEntry(PCSRSS_HANDLE Entry)
+Win32CsrCreateHandleEntry(PCONSOLE_IO_HANDLE Entry)
 {
     Object_t *Object = Entry->Object;
     EnterCriticalSection(&Object->Console->Lock);
@@ -44,12 +44,12 @@
 }

static VOID
-Win32CsrCloseHandleEntry(PCSRSS_HANDLE Entry)
+Win32CsrCloseHandleEntry(PCONSOLE_IO_HANDLE Entry)
 {
     Object_t *Object = Entry->Object;
     if (Object != NULL)
     {
-        PCSRSS_CONSOLE Console = Object->Console;
+        PCONSOLE Console = Object->Console;
         EnterCriticalSection(&Console->Lock);

/* If the last handle to a screen buffer is closed, delete it... */
@@ -57,7 +57,7 @@
         {
             if (Object->Type == CONIO_SCREEN_BUFFER_MAGIC)
             {
-                PCSRSS_SCREEN_BUFFER Buffer = (PCSRSS_SCREEN_BUFFER)Object;
+                PCONSOLE_SCREEN_BUFFER Buffer = (PCONSOLE_SCREEN_BUFFER)Object;
                 /* ...unless it's the only buffer left. Windows allows deletion
                  * even of the last buffer, but having to deal with a lack of
                  * any active buffer might be error-prone. */
@@ -89,7 +89,7 @@
                      DWORD ShareMode)
 {
     ULONG i;
-    PCSRSS_HANDLE Block;
+    PCONSOLE_IO_HANDLE Block;

RtlEnterCriticalSection(&ProcessData->HandleTableLock);

@@ -104,7 +104,7 @@
     {
         Block = RtlAllocateHeap(ConSrvHeap,
                                 HEAP_ZERO_MEMORY,
-                                (ProcessData->HandleTableSize + 64) * sizeof(CSRSS_HANDLE));
+                                (ProcessData->HandleTableSize + 64) * sizeof(CONSOLE_IO_HANDLE));
         if (Block == NULL)
         {
             RtlLeaveCriticalSection(&ProcessData->HandleTableLock);
@@ -112,7 +112,7 @@
         }
         RtlCopyMemory(Block,
                       ProcessData->HandleTable,
-                      ProcessData->HandleTableSize * sizeof(CSRSS_HANDLE));
+                      ProcessData->HandleTableSize * sizeof(CONSOLE_IO_HANDLE));
         RtlFreeHeap(ConSrvHeap, 0, ProcessData->HandleTable);
         ProcessData->HandleTable = Block;
         ProcessData->HandleTableSize += 64;
@@ -186,7 +186,7 @@
 }

VOID FASTCALL
-Win32CsrUnlockConsole(PCSRSS_CONSOLE Console)
+Win32CsrUnlockConsole(PCONSOLE Console)
 {
     LeaveCriticalSection(&Console->Lock);

@@ -284,7 +284,7 @@
         TargetProcessData->HandleTable = RtlAllocateHeap(ConSrvHeap,
                                                          HEAP_ZERO_MEMORY,
                                                          SourceProcessData->HandleTableSize
-                                                                 * sizeof(CSRSS_HANDLE));
+                                                                 * sizeof(CONSOLE_IO_HANDLE));
         if (TargetProcessData->HandleTable == NULL)
         {
             RtlLeaveCriticalSection(&SourceProcessData->HandleTableLock);
@@ -335,7 +335,7 @@
     PCONSOLE_CONNECTION_INFO ConnectInfo = (PCONSOLE_CONNECTION_INFO)ConnectionInfo;
     PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrProcess);
     BOOLEAN NewConsole = FALSE;
-    // PCSRSS_CONSOLE Console = NULL;
+    // PCONSOLE Console = NULL;

DPRINT1("ConsoleConnect\n");

@@ -511,7 +511,7 @@
 Win32CsrReleaseConsole(PCSR_PROCESS Process)
 {
     PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(Process);
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     ULONG i;

DPRINT1("Win32CsrReleaseConsole\n");
@@ -604,7 +604,7 @@

CSR_API(SrvDuplicateHandle)
 {
-    PCSRSS_HANDLE Entry;
+    PCONSOLE_IO_HANDLE Entry;
     DWORD DesiredAccess;
     PCONSOLE_DUPLICATEHANDLE DuplicateHandleRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.DuplicateHandleRequest;
     PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process);

Modified: branches/ros-csrss/win32ss/user/consrv/lineinput.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/li...
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/lineinput.c [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/lineinput.c [iso-8859-1] Sat Jan  5 23:37:04 2013
@@ -14,7 +14,7 @@
 #define NDEBUG
 #include <debug.h>

-typedef struct tagHISTORY_BUFFER
+typedef struct _HISTORY_BUFFER
 {
     LIST_ENTRY ListEntry;
     UINT Position;
@@ -27,7 +27,7 @@
 /* FUNCTIONS *****************************************************************/

static PHISTORY_BUFFER
-HistoryCurrentBuffer(PCSRSS_CONSOLE Console)
+HistoryCurrentBuffer(PCONSOLE Console)
 {
     /* TODO: use actual EXE name sent from process that called ReadConsole */
     UNICODE_STRING ExeName = { 14, 14, L"cmd.exe" };
@@ -61,7 +61,7 @@
 }

static VOID
-HistoryAddEntry(PCSRSS_CONSOLE Console)
+HistoryAddEntry(PCONSOLE Console)
 {
     UNICODE_STRING NewEntry;
     PHISTORY_BUFFER Hist;
@@ -113,7 +113,7 @@
 }

static VOID
-HistoryGetCurrentEntry(PCSRSS_CONSOLE Console, PUNICODE_STRING Entry)
+HistoryGetCurrentEntry(PCONSOLE Console, PUNICODE_STRING Entry)
 {
     PHISTORY_BUFFER Hist;
     if (!(Hist = HistoryCurrentBuffer(Console)) || Hist->NumEntries == 0)
@@ -123,7 +123,7 @@
 }

static PHISTORY_BUFFER
-HistoryFindBuffer(PCSRSS_CONSOLE Console, PUNICODE_STRING ExeName)
+HistoryFindBuffer(PCONSOLE Console, PUNICODE_STRING ExeName)
 {
     PLIST_ENTRY Entry = Console->HistoryBuffers.Flink;
     while (Entry != &Console->HistoryBuffers)
@@ -153,7 +153,7 @@
 {
     PCONSOLE_GETCOMMANDHISTORYLENGTH GetCommandHistoryLengthRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetCommandHistoryLengthRequest;
     PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process);
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     NTSTATUS Status;
     PHISTORY_BUFFER Hist;
     ULONG Length = 0;
@@ -186,7 +186,7 @@
 {
     PCONSOLE_GETCOMMANDHISTORY GetCommandHistoryRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetCommandHistoryRequest;
     PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process);
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     NTSTATUS Status;
     PHISTORY_BUFFER Hist;
     PBYTE Buffer = (PBYTE)GetCommandHistoryRequest->History;
@@ -234,7 +234,7 @@
 {
     PCONSOLE_EXPUNGECOMMANDHISTORY ExpungeCommandHistoryRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ExpungeCommandHistoryRequest;
     PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process);
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     PHISTORY_BUFFER Hist;
     NTSTATUS Status;

@@ -260,7 +260,7 @@
 {
     PCONSOLE_SETHISTORYNUMBERCOMMANDS SetHistoryNumberCommandsRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetHistoryNumberCommandsRequest;
     PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process);
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     PHISTORY_BUFFER Hist;
     NTSTATUS Status;
     UINT MaxEntries = SetHistoryNumberCommandsRequest->NumCommands;
@@ -310,7 +310,7 @@
 CSR_API(SrvGetConsoleHistory)
 {
     PCONSOLE_GETSETHISTORYINFO HistoryInfoRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.HistoryInfoRequest;
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     NTSTATUS Status = ConioConsoleFromProcessData(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console);
     if (NT_SUCCESS(Status))
     {
@@ -325,7 +325,7 @@
 CSR_API(SrvSetConsoleHistory)
 {
     PCONSOLE_GETSETHISTORYINFO HistoryInfoRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.HistoryInfoRequest;
-    PCSRSS_CONSOLE Console;
+    PCONSOLE Console;
     NTSTATUS Status = ConioConsoleFromProcessData(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console);
     if (NT_SUCCESS(Status))
     {
@@ -338,11 +338,11 @@
 }

static VOID
-LineInputSetPos(PCSRSS_CONSOLE Console, UINT Pos)
+LineInputSetPos(PCONSOLE Console, UINT Pos)
 {
     if (Pos != Console->LinePos && Console->Mode & ENABLE_ECHO_INPUT)
     {
-        PCSRSS_SCREEN_BUFFER Buffer = Console->ActiveBuffer;
+        PCONSOLE_SCREEN_BUFFER Buffer = Console->ActiveBuffer;
         UINT OldCursorX = Buffer->CurrentX;
         UINT OldCursorY = Buffer->CurrentY;
         INT XY = OldCursorY * Buffer->MaxX + OldCursorX;
@@ -362,7 +362,7 @@
 }

static VOID
-LineInputEdit(PCSRSS_CONSOLE Console, UINT NumToDelete, UINT NumToInsert, WCHAR *Insertion)
+LineInputEdit(PCONSOLE Console, UINT NumToDelete, UINT NumToInsert, WCHAR *Insertion)
 {
     UINT Pos = Console->LinePos;
     UINT NewSize = Console->LineSize - NumToDelete + NumToInsert;
@@ -399,7 +399,7 @@
 }

static VOID
-LineInputRecallHistory(PCSRSS_CONSOLE Console, INT Offset)
+LineInputRecallHistory(PCONSOLE Console, INT Offset)
 {
     PHISTORY_BUFFER Hist;

@@ -418,7 +418,7 @@
 }

VOID FASTCALL
-LineInputKeyDown(PCSRSS_CONSOLE Console, KEY_EVENT_RECORD *KeyEvent)
+LineInputKeyDown(PCONSOLE Console, KEY_EVENT_RECORD *KeyEvent)
 {
     UINT Pos = Console->LinePos;
     PHISTORY_BUFFER Hist;

Modified: branches/ros-csrss/win32ss/user/consrv/tuiconsole.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/tu...
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/tuiconsole.c [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/tuiconsole.c [iso-8859-1] Sat Jan  5 23:37:04 2013
@@ -21,7 +21,7 @@
 CRITICAL_SECTION ActiveConsoleLock;
 static COORD PhysicalConsoleSize;
 static HANDLE ConsoleDeviceHandle;
-static PCSRSS_CONSOLE ActiveConsole;
+static PCONSOLE ActiveConsole;

static BOOL ConsInitialized = FALSE;

@@ -134,13 +134,13 @@
 }

static VOID WINAPI
-TuiInitScreenBuffer(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buffer)
+TuiInitScreenBuffer(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER Buffer)
 {
     Buffer->DefaultAttrib = FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED;
 }

static void FASTCALL
-TuiCopyRect(char *Dest, PCSRSS_SCREEN_BUFFER Buff, SMALL_RECT *Region)
+TuiCopyRect(char *Dest, PCONSOLE_SCREEN_BUFFER Buff, SMALL_RECT *Region)
 {
     UINT SrcDelta, DestDelta;
     LONG i;
@@ -163,10 +163,10 @@
 }

static VOID WINAPI
-TuiDrawRegion(PCSRSS_CONSOLE Console, SMALL_RECT *Region)
+TuiDrawRegion(PCONSOLE Console, SMALL_RECT *Region)
 {
     DWORD BytesReturned;
-    PCSRSS_SCREEN_BUFFER Buff = Console->ActiveBuffer;
+    PCONSOLE_SCREEN_BUFFER Buff = Console->ActiveBuffer;
     PCONSOLE_DRAW ConsoleDraw;
     UINT ConsoleDrawSize;

@@ -204,11 +204,11 @@
 }

static VOID WINAPI
-TuiWriteStream(PCSRSS_CONSOLE Console, SMALL_RECT *Region, LONG CursorStartX, LONG CursorStartY,
+TuiWriteStream(PCONSOLE Console, SMALL_RECT *Region, LONG CursorStartX, LONG CursorStartY,
                UINT ScrolledLines, CHAR *Buffer, UINT Length)
 {
     DWORD BytesWritten;
-    PCSRSS_SCREEN_BUFFER Buff = Console->ActiveBuffer;
+    PCONSOLE_SCREEN_BUFFER Buff = Console->ActiveBuffer;

if (ActiveConsole->ActiveBuffer != Buff)
     {
@@ -222,7 +222,7 @@
 }

static BOOL WINAPI
-TuiSetCursorInfo(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buff)
+TuiSetCursorInfo(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER Buff)
 {
     CONSOLE_CURSOR_INFO Info;
     DWORD BytesReturned;
@@ -246,7 +246,7 @@
 }

static BOOL WINAPI
-TuiSetScreenInfo(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buff, UINT OldCursorX, UINT OldCursorY)
+TuiSetScreenInfo(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER Buff, UINT OldCursorX, UINT OldCursorY)
 {
     CONSOLE_SCREEN_BUFFER_INFO Info;
     DWORD BytesReturned;
@@ -272,19 +272,19 @@
 }

static BOOL WINAPI
-TuiUpdateScreenInfo(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buff)
+TuiUpdateScreenInfo(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER Buff)
 {
     return TRUE;
 }

static BOOL WINAPI
-TuiChangeTitle(PCSRSS_CONSOLE Console)
+TuiChangeTitle(PCONSOLE Console)
 {
     return TRUE;
 }

static VOID WINAPI
-TuiCleanupConsole(PCSRSS_CONSOLE Console)
+TuiCleanupConsole(PCONSOLE Console)
 {
     DestroyWindow(Console->hWindow);

@@ -310,13 +310,13 @@
 }

static BOOL WINAPI
-TuiChangeIcon(PCSRSS_CONSOLE Console, HICON hWindowIcon)
+TuiChangeIcon(PCONSOLE Console, HICON hWindowIcon)
 {
   return TRUE;
 }

static NTSTATUS WINAPI
-TuiResizeBuffer(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER ScreenBuffer, COORD Size)
+TuiResizeBuffer(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer, COORD Size)
 {
   UNIMPLEMENTED;
   return STATUS_NOT_IMPLEMENTED;
@@ -325,7 +325,7 @@
 DWORD WINAPI
 TuiConsoleThread(PVOID Data)
 {
-    PCSRSS_CONSOLE Console = (PCSRSS_CONSOLE) Data;
+    PCONSOLE Console = (PCONSOLE) Data;
     HWND NewWindow;
     MSG msg;

@@ -363,7 +363,7 @@
     return 0;
 }

-static CSRSS_CONSOLE_VTBL TuiVtbl =
+static CONSOLE_VTBL TuiVtbl =
 {
     TuiInitScreenBuffer,
     TuiWriteStream,
@@ -378,7 +378,7 @@
 };

NTSTATUS FASTCALL
-TuiInitConsole(PCSRSS_CONSOLE Console)
+TuiInitConsole(PCONSOLE Console)
 {
     HANDLE ThreadHandle;

@@ -430,7 +430,7 @@
     return STATUS_SUCCESS;
 }

-PCSRSS_CONSOLE FASTCALL
+PCONSOLE FASTCALL
 TuiGetFocusConsole(VOID)
 {
     return ActiveConsole;
@@ -439,7 +439,7 @@
 BOOL FASTCALL
 TuiSwapConsole(int Next)
 {
-    static PCSRSS_CONSOLE SwapConsole = NULL; /* console we are thinking about swapping with */
+    static PCONSOLE SwapConsole = NULL; /* console we are thinking about swapping with */
     DWORD BytesReturned;
     ANSI_STRING Title;
     void * Buffer;

Modified: branches/ros-csrss/win32ss/user/consrv/tuiconsole.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/tu...
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/tuiconsole.h [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/tuiconsole.h [iso-8859-1] Sat Jan  5 23:37:04 2013
@@ -8,8 +8,8 @@

#include "conio.h"

-extern NTSTATUS FASTCALL TuiInitConsole(PCSRSS_CONSOLE Console);
-extern PCSRSS_CONSOLE FASTCALL TuiGetFocusConsole(VOID);
+extern NTSTATUS FASTCALL TuiInitConsole(PCONSOLE Console);
+extern PCONSOLE FASTCALL TuiGetFocusConsole(VOID);
 extern BOOL FASTCALL TuiSwapConsole(int Next);

/* EOF */