From fc78a963d03b60830fd10976f9e710d3d0bdc93a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sat, 5 Jan 2013 23:37:04 +0000 Subject: [PATCH] [CONSRV] Renaming CSRSS_... structures into CONSOLE_... svn path=/branches/ros-csrss/; revision=58120 --- win32ss/user/consrv/alias.c | 20 +++--- win32ss/user/consrv/coninput.c | 18 +++--- win32ss/user/consrv/conio.h | 72 ++++++++++----------- win32ss/user/consrv/conoutput.c | 82 ++++++++++++------------ win32ss/user/consrv/console.c | 68 ++++++++++---------- win32ss/user/consrv/consrv.h | 12 ++-- win32ss/user/consrv/guiconsole.c | 104 +++++++++++++++---------------- win32ss/user/consrv/guiconsole.h | 2 +- win32ss/user/consrv/handle.c | 26 ++++---- win32ss/user/consrv/lineinput.c | 32 +++++----- win32ss/user/consrv/tuiconsole.c | 38 +++++------ win32ss/user/consrv/tuiconsole.h | 4 +- 12 files changed, 239 insertions(+), 239 deletions(-) diff --git a/win32ss/user/consrv/alias.c b/win32ss/user/consrv/alias.c index 22570f36273..5b15a5362a2 100644 --- a/win32ss/user/consrv/alias.c +++ b/win32ss/user/consrv/alias.c @@ -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 @@ IntDeleteAllAliases(PALIAS_HEADER RootHeader) 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(SrvAddConsoleAlias) 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(SrvGetConsoleAlias) 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(SrvGetConsoleAliases) 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(SrvGetConsoleAliasesLength) 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(SrvGetConsoleAliasExes) 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); diff --git a/win32ss/user/consrv/coninput.c b/win32ss/user/consrv/coninput.c index 290e3daf6c0..d3e9b799309 100644 --- a/win32ss/user/consrv/coninput.c +++ b/win32ss/user/consrv/coninput.c @@ -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 @@ ConioInputEventToAnsi(PCSRSS_CONSOLE Console, PINPUT_RECORD InputEvent) } static NTSTATUS FASTCALL -ConioProcessChar(PCSRSS_CONSOLE Console, +ConioProcessChar(PCONSOLE Console, PINPUT_RECORD InputEvent) { ConsoleInput *ConInRec; @@ -127,7 +127,7 @@ ConioGetShiftState(PBYTE KeyState) } 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 @@ CSR_API(SrvGetConsoleInput) 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 @@ CSR_API(SrvWriteConsoleInput) 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 @@ CSR_API(SrvReadConsole) 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 @@ CSR_API(SrvFlushConsoleInputBuffer) 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 @@ CSR_API(SrvGetConsoleNumberOfInputEvents) { NTSTATUS Status; PCONSOLE_GETNUMINPUTEVENTS GetNumInputEventsRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetNumInputEventsRequest; - PCSRSS_CONSOLE Console; + PCONSOLE Console; PLIST_ENTRY CurrentInput; DWORD NumEvents; diff --git a/win32ss/user/consrv/conio.h b/win32ss/user/consrv/conio.h index 5965a10e1e0..fdbcb271c6e 100644 --- a/win32ss/user/consrv/conio.h +++ b/win32ss/user/consrv/conio.h @@ -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 @@ typedef struct tagCSRSS_SCREEN_BUFFER CONSOLE_CURSOR_INFO CursorInfo; USHORT Mode; LIST_ENTRY ListEntry; /* entry in console's list of buffers */ -} CSRSS_SCREEN_BUFFER, *PCSRSS_SCREEN_BUFFER; +} CONSOLE_SCREEN_BUFFER, *PCONSOLE_SCREEN_BUFFER; -typedef struct tagCSRSS_CONSOLE +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 @@ typedef struct tagCSRSS_CONSOLE 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 @@ typedef struct tagCSRSS_CONSOLE 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 @@ do { \ } while(0) /**************************************************************/ -typedef struct tagCSRSS_CONSOLE_VTBL +typedef struct _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, + 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 @@ typedef struct ConsoleInput_t /* 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 @@ VOID FASTCALL ConioConsoleCtrlEventTimeout(DWORD Event, 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 @@ void WINAPI ConioProcessKey(MSG *msg, PCSRSS_CONSOLE Console, BOOL TextMode); 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 */ diff --git a/win32ss/user/consrv/conoutput.c b/win32ss/user/consrv/conoutput.c index 912d9c882eb..3b5043ec0f0 100644 --- a/win32ss/user/consrv/conoutput.c +++ b/win32ss/user/consrv/conoutput.c @@ -38,13 +38,13 @@ do { \ /* 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 @@ ClearLineBuffer(PCSRSS_SCREEN_BUFFER Buff) } 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 @@ CsrInitConsoleScreenBuffer(PCSRSS_CONSOLE Console, } 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 @@ ConioNextLine(PCSRSS_SCREEN_BUFFER Buff, SMALL_RECT *UpdateRect, UINT *ScrolledL } 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 @@ __inline BOOLEAN ConioGetUnion( * 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 @@ ConioMoveRegion(PCSRSS_SCREEN_BUFFER ScreenBuffer, } VOID WINAPI -ConioDeleteScreenBuffer(PCSRSS_SCREEN_BUFFER Buffer) +ConioDeleteScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer) { - PCSRSS_CONSOLE Console = Buffer->Header.Console; + PCONSOLE Console = Buffer->Header.Console; RemoveEntryList(&Buffer->ListEntry); if (Buffer == Console->ActiveBuffer) @@ -374,7 +374,7 @@ ConioDeleteScreenBuffer(PCSRSS_SCREEN_BUFFER Buffer) 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 @@ ConioDeleteScreenBuffer(PCSRSS_SCREEN_BUFFER Buffer) } VOID FASTCALL -ConioDrawConsole(PCSRSS_CONSOLE Console) +ConioDrawConsole(PCONSOLE Console) { SMALL_RECT Region; @@ -394,7 +394,7 @@ ConioDrawConsole(PCSRSS_CONSOLE Console) } 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 @@ ConioComputeUpdateRect(PCSRSS_SCREEN_BUFFER Buff, SMALL_RECT *UpdateRect, COORD } 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 @@ DoWriteConsole(IN PCSR_API_MESSAGE ApiMessage, { 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 @@ CSR_API(SrvReadConsoleOutput) 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 @@ CSR_API(SrvWriteConsoleOutput) 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 @@ CSR_API(SrvReadConsoleOutputString) { 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 @@ CSR_API(SrvWriteConsoleOutputString) { 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 @@ CSR_API(SrvFillConsoleOutput) { 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 @@ CSR_API(SrvGetConsoleCursorInfo) { 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 @@ CSR_API(SrvSetConsoleCursorInfo) { 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 @@ CSR_API(SrvSetConsoleCursorPosition) { 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 @@ CSR_API(SrvSetConsoleTextAttribute) { 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 @@ CSR_API(SrvCreateConsoleScreenBuffer) 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 @@ CSR_API(SrvCreateConsoleScreenBuffer) 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 @@ CSR_API(SrvGetConsoleScreenBufferInfo) { 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 @@ CSR_API(SrvSetConsoleActiveScreenBuffer) { 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(SrvSetConsoleActiveScreenBuffer) 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 @@ CSR_API(SrvSetConsoleScreenBufferSize) { 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; diff --git a/win32ss/user/consrv/console.c b/win32ss/user/consrv/console.c index 969d9518f20..4eabc9db67c 100644 --- a/win32ss/user/consrv/console.c +++ b/win32ss/user/consrv/console.c @@ -33,9 +33,9 @@ DtbgIsDesktopVisible(VOID) NTSTATUS FASTCALL ConioConsoleFromProcessData(PCONSOLE_PROCESS_DATA ProcessData, - PCSRSS_CONSOLE *Console) + PCONSOLE *Console) { - PCSRSS_CONSOLE ProcessConsole; + PCONSOLE ProcessConsole; RtlEnterCriticalSection(&ProcessData->HandleTableLock); ProcessConsole = ProcessData->Console; @@ -88,12 +88,12 @@ ConioConsoleCtrlEvent(DWORD Event, PCONSOLE_PROCESS_DATA ProcessData) } 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 @@ CsrInitConsole(PCSRSS_CONSOLE* NewConsole, int ShowCmd, PCSR_PROCESS ConsoleLead *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 @@ CsrInitConsole(PCSRSS_CONSOLE* NewConsole, int ShowCmd, PCSR_PROCESS ConsoleLead 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 @@ CsrInitConsole(PCSRSS_CONSOLE* NewConsole, int ShowCmd, PCSR_PROCESS ConsoleLead 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 @@ CSR_API(SrvOpenConsole) 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 @@ CSR_API(SrvAllocConsole) /* 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 @@ CSR_API(SrvFreeConsole) } VOID WINAPI -ConioDeleteConsole(PCSRSS_CONSOLE Console) +ConioDeleteConsole(PCONSOLE Console) { ConsoleInput *Event; @@ -468,7 +468,7 @@ ConioDeleteConsole(PCSRSS_CONSOLE Console) 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 @@ CsrInitConsoleSupport(VOID) } VOID FASTCALL -ConioPause(PCSRSS_CONSOLE Console, UINT Flags) +ConioPause(PCONSOLE Console, UINT Flags) { Console->PauseFlags |= Flags; if (!Console->UnpauseEvent) @@ -501,7 +501,7 @@ ConioPause(PCSRSS_CONSOLE Console, UINT Flags) } VOID FASTCALL -ConioUnpause(PCSRSS_CONSOLE Console, UINT Flags) +ConioUnpause(PCONSOLE Console, UINT Flags) { Console->PauseFlags &= ~Flags; @@ -523,8 +523,8 @@ CSR_API(SrvSetConsoleMode) { 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 @@ CSR_API(SrvSetConsoleMode) (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 @@ CSR_API(SrvGetConsoleMode) { 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 @@ CSR_API(SrvGetConsoleMode) 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 @@ CSR_API(SrvSetConsoleTitle) 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 @@ CSR_API(SrvGetConsoleTitle) 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 @@ CSR_API(SrvGetConsoleTitle) * 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 @@ CSR_API(SrvGetConsoleHardwareState) { NTSTATUS Status; PCONSOLE_GETSETHWSTATE HardwareStateRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.HardwareStateRequest; - PCSRSS_CONSOLE Console; + PCONSOLE Console; DPRINT("SrvGetConsoleHardwareState\n"); @@ -740,7 +740,7 @@ CSR_API(SrvSetConsoleHardwareState) { NTSTATUS Status; PCONSOLE_GETSETHWSTATE HardwareStateRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.HardwareStateRequest; - PCSRSS_CONSOLE Console; + PCONSOLE Console; DPRINT("SrvSetConsoleHardwareState\n"); @@ -766,7 +766,7 @@ CSR_API(SrvGetConsoleWindow) { NTSTATUS Status; PCONSOLE_GETWINDOW GetWindowRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetWindowRequest; - PCSRSS_CONSOLE Console; + PCONSOLE Console; DPRINT("SrvGetConsoleWindow\n"); @@ -783,7 +783,7 @@ CSR_API(SrvSetConsoleIcon) { NTSTATUS Status; PCONSOLE_SETICON SetIconRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetIconRequest; - PCSRSS_CONSOLE Console; + PCONSOLE Console; DPRINT("SrvSetConsoleIcon\n"); @@ -803,7 +803,7 @@ CSR_API(SrvGetConsoleCP) { 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 @@ CSR_API(SrvSetConsoleCP) { 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 @@ CSR_API(SrvGetConsoleProcessList) 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 @@ CSR_API(SrvGenerateConsoleCtrlEvent) { 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 @@ CSR_API(SrvGetConsoleSelectionInfo) { 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)) diff --git a/win32ss/user/consrv/consrv.h b/win32ss/user/consrv/consrv.h index 97b08a78c07..b4dbbdf441c 100644 --- a/win32ss/user/consrv/consrv.h +++ b/win32ss/user/consrv/consrv.h @@ -46,20 +46,20 @@ extern HANDLE ConSrvHeap; 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 @@ typedef struct _CONSOLE_PROCESS_DATA 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; diff --git a/win32ss/user/consrv/guiconsole.c b/win32ss/user/consrv/guiconsole.c index e64aa73cdac..925220aaf15 100644 --- a/win32ss/user/consrv/guiconsole.c +++ b/win32ss/user/consrv/guiconsole.c @@ -180,7 +180,7 @@ GuiConsoleAppendMenuItems(HMENU hMenu, } static VOID -GuiConsoleCreateSysMenu(PCSRSS_CONSOLE Console) +GuiConsoleCreateSysMenu(PCONSOLE Console) { HMENU hMenu; hMenu = GetSystemMenu(Console->hWindow, @@ -194,9 +194,9 @@ GuiConsoleCreateSysMenu(PCSRSS_CONSOLE Console) } static VOID -GuiConsoleGetDataPointers(HWND hWnd, PCSRSS_CONSOLE *Console, PGUI_CONSOLE_DATA *GuiData) +GuiConsoleGetDataPointers(HWND hWnd, PCONSOLE *Console, PGUI_CONSOLE_DATA *GuiData) { - *Console = (PCSRSS_CONSOLE)GetWindowLongPtrW(hWnd, GWLP_USERDATA); + *Console = (PCONSOLE)GetWindowLongPtrW(hWnd, GWLP_USERDATA); *GuiData = (NULL == *Console ? NULL : (*Console)->PrivateData); } @@ -404,7 +404,7 @@ GuiConsoleOpenUserSettings(PGUI_CONSOLE_DATA GuiData, DWORD ProcessId, PHKEY hSu } 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 @@ GuiConsoleWriteUserSettings(PCSRSS_CONSOLE Console, PGUI_CONSOLE_DATA GuiData) } 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 @@ GuiConsoleReadUserSettings(HKEY hKey, PCSRSS_CONSOLE Console, PGUI_CONSOLE_DATA } } 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 @@ GuiConsoleUseDefaults(PCSRSS_CONSOLE Console, PGUI_CONSOLE_DATA GuiData, PCSRSS_ 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 @@ GuiConsoleInitScrollbar(PCSRSS_CONSOLE Console, HWND hwnd) 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 @@ GuiConsoleHandleNcCreate(HWND hWnd, LPCREATESTRUCTW Create) } static VOID -SmallRectToRect(PCSRSS_CONSOLE Console, PRECT Rect, PSMALL_RECT SmallRect) +SmallRectToRect(PCONSOLE Console, PRECT Rect, PSMALL_RECT SmallRect) { - PCSRSS_SCREEN_BUFFER Buffer = Console->ActiveBuffer; + 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 @@ SmallRectToRect(PCSRSS_CONSOLE Console, PRECT Rect, PSMALL_RECT SmallRect) } static VOID -GuiConsoleUpdateSelection(PCSRSS_CONSOLE Console, PCOORD coord) +GuiConsoleUpdateSelection(PCONSOLE Console, PCOORD coord) { RECT oldRect, newRect; HWND hWnd = Console->hWindow; @@ -878,12 +878,12 @@ GuiConsoleUpdateSelection(PCSRSS_CONSOLE Console, PCOORD coord) 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 @@ GuiConsoleHandlePaint(HWND hWnd, HDC hDCPaint) { HDC hDC; PAINTSTRUCT ps; - PCSRSS_CONSOLE Console; + PCONSOLE Console; PGUI_CONSOLE_DATA GuiData; hDC = BeginPaint(hWnd, &ps); @@ -1054,7 +1054,7 @@ GuiConsoleHandlePaint(HWND hWnd, HDC hDCPaint) 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 @@ GuiConsoleHandleKey(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) } 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 @@ GuiDrawRegion(PCSRSS_CONSOLE Console, SMALL_RECT *Region) } 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 @@ GuiWriteStream(PCSRSS_CONSOLE Console, SMALL_RECT *Region, LONG CursorStartX, LO } 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 @@ GuiSetCursorInfo(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buff) } 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 @@ GuiSetScreenInfo(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buff, UINT OldCurs } 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 @@ GuiUpdateScreenInfo(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buff) 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 @@ GuiConsoleHandleTimer(HWND hWnd) 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 @@ GuiConsoleHandleClose(HWND hWnd) static VOID GuiConsoleHandleNcDestroy(HWND hWnd) { - PCSRSS_CONSOLE Console; + PCONSOLE Console; PGUI_CONSOLE_DATA GuiData; @@ -1316,9 +1316,9 @@ GuiConsoleHandleNcDestroy(HWND hWnd) } static COORD -PointToCoord(PCSRSS_CONSOLE Console, LPARAM lParam) +PointToCoord(PCONSOLE Console, LPARAM lParam) { - PCSRSS_SCREEN_BUFFER Buffer = Console->ActiveBuffer; + 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 @@ PointToCoord(PCSRSS_CONSOLE Console, LPARAM lParam) static VOID GuiConsoleLeftMouseDown(HWND hWnd, LPARAM lParam) { - PCSRSS_CONSOLE Console; + PCONSOLE Console; PGUI_CONSOLE_DATA GuiData; GuiConsoleGetDataPointers(hWnd, &Console, &GuiData); @@ -1353,7 +1353,7 @@ GuiConsoleLeftMouseDown(HWND hWnd, LPARAM lParam) static VOID GuiConsoleLeftMouseUp(HWND hWnd, LPARAM lParam) { - PCSRSS_CONSOLE Console; + PCONSOLE Console; PGUI_CONSOLE_DATA GuiData; COORD c; @@ -1373,7 +1373,7 @@ GuiConsoleLeftMouseUp(HWND hWnd, LPARAM lParam) static VOID GuiConsoleMouseMove(HWND hWnd, WPARAM wParam, LPARAM lParam) { - PCSRSS_CONSOLE Console; + PCONSOLE Console; PGUI_CONSOLE_DATA GuiData; COORD c; @@ -1389,7 +1389,7 @@ GuiConsoleMouseMove(HWND hWnd, WPARAM wParam, LPARAM lParam) } static VOID -GuiConsoleCopy(HWND hWnd, PCSRSS_CONSOLE Console) +GuiConsoleCopy(HWND hWnd, PCONSOLE Console) { if (OpenClipboard(hWnd) == TRUE) { @@ -1460,7 +1460,7 @@ GuiConsoleCopy(HWND hWnd, PCSRSS_CONSOLE Console) } static VOID -GuiConsolePaste(HWND hWnd, PCSRSS_CONSOLE Console) +GuiConsolePaste(HWND hWnd, PCONSOLE Console) { if (OpenClipboard(hWnd) == TRUE) { @@ -1494,7 +1494,7 @@ GuiConsolePaste(HWND hWnd, PCSRSS_CONSOLE Console) static VOID GuiConsoleRightMouseDown(HWND hWnd) { - PCSRSS_CONSOLE Console; + PCONSOLE Console; PGUI_CONSOLE_DATA GuiData; GuiConsoleGetDataPointers(hWnd, &Console, &GuiData); @@ -1517,7 +1517,7 @@ GuiConsoleRightMouseDown(HWND hWnd) 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 @@ static LRESULT 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 @@ GuiConsoleHandleSysMenuCommand(HWND hWnd, WPARAM wParam, LPARAM lParam) static VOID GuiConsoleGetMinMaxInfo(HWND hWnd, PMINMAXINFO minMaxInfo) { - PCSRSS_CONSOLE Console; + PCONSOLE Console; PGUI_CONSOLE_DATA GuiData; DWORD windx, windy; @@ -1667,14 +1667,14 @@ GuiConsoleGetMinMaxInfo(HWND hWnd, PMINMAXINFO minMaxInfo) 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 @@ GuiConsoleHandleScrollbarMenu(VOID) } 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 @@ GuiResizeBuffer(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER ScreenBuffer, COORD } 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 @@ static 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 @@ GuiConsoleWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { LRESULT Result = 0; PGUI_CONSOLE_DATA GuiData = NULL; - PCSRSS_CONSOLE Console = NULL; + PCONSOLE Console = NULL; GuiConsoleGetDataPointers(hWnd, &Console, &GuiData); @@ -2073,7 +2073,7 @@ GuiConsoleNotifyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) LONG WindowCount; MSG Msg; PWCHAR Buffer, Title; - PCSRSS_CONSOLE Console = (PCSRSS_CONSOLE) lParam; + PCONSOLE Console = (PCONSOLE) lParam; switch(msg) { @@ -2237,13 +2237,13 @@ GuiInit(VOID) } 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 @@ GuiChangeTitle(PCSRSS_CONSOLE Console) } 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 @@ GuiChangeIcon(PCSRSS_CONSOLE Console, HICON hWindowIcon) } 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 @@ static CSRSS_CONSOLE_VTBL GuiVtbl = }; NTSTATUS FASTCALL -GuiInitConsole(PCSRSS_CONSOLE Console, int ShowCmd) +GuiInitConsole(PCONSOLE Console, int ShowCmd) { HANDLE GraphicsStartupEvent; HANDLE ThreadHandle; diff --git a/win32ss/user/consrv/guiconsole.h b/win32ss/user/consrv/guiconsole.h index ecd94579612..801e2967f93 100644 --- a/win32ss/user/consrv/guiconsole.h +++ b/win32ss/user/consrv/guiconsole.h @@ -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*/ diff --git a/win32ss/user/consrv/handle.c b/win32ss/user/consrv/handle.c index 1f5e644f556..7381713d443 100644 --- a/win32ss/user/consrv/handle.c +++ b/win32ss/user/consrv/handle.c @@ -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 @@ AdjustHandleCounts(PCSRSS_HANDLE Entry, INT Change) } static VOID -Win32CsrCreateHandleEntry(PCSRSS_HANDLE Entry) +Win32CsrCreateHandleEntry(PCONSOLE_IO_HANDLE Entry) { Object_t *Object = Entry->Object; EnterCriticalSection(&Object->Console->Lock); @@ -44,12 +44,12 @@ Win32CsrCreateHandleEntry(PCSRSS_HANDLE Entry) } 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 @@ Win32CsrCloseHandleEntry(PCSRSS_HANDLE Entry) { 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 @@ Win32CsrInsertObject(PCONSOLE_PROCESS_DATA ProcessData, DWORD ShareMode) { ULONG i; - PCSRSS_HANDLE Block; + PCONSOLE_IO_HANDLE Block; RtlEnterCriticalSection(&ProcessData->HandleTableLock); @@ -104,7 +104,7 @@ Win32CsrInsertObject(PCONSOLE_PROCESS_DATA ProcessData, { 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 @@ Win32CsrInsertObject(PCONSOLE_PROCESS_DATA ProcessData, } 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 @@ Win32CsrLockObject(PCONSOLE_PROCESS_DATA ProcessData, } VOID FASTCALL -Win32CsrUnlockConsole(PCSRSS_CONSOLE Console) +Win32CsrUnlockConsole(PCONSOLE Console) { LeaveCriticalSection(&Console->Lock); @@ -284,7 +284,7 @@ ConsoleNewProcess(PCSR_PROCESS SourceProcess, 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 @@ ConsoleConnect(IN PCSR_PROCESS CsrProcess, 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 @@ WINAPI 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(SrvVerifyConsoleIoHandle) 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); diff --git a/win32ss/user/consrv/lineinput.c b/win32ss/user/consrv/lineinput.c index 2de216a4351..536ce773ca0 100644 --- a/win32ss/user/consrv/lineinput.c +++ b/win32ss/user/consrv/lineinput.c @@ -14,7 +14,7 @@ #define NDEBUG #include -typedef struct tagHISTORY_BUFFER +typedef struct _HISTORY_BUFFER { LIST_ENTRY ListEntry; UINT Position; @@ -27,7 +27,7 @@ typedef struct tagHISTORY_BUFFER /* 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 @@ HistoryCurrentBuffer(PCSRSS_CONSOLE Console) } static VOID -HistoryAddEntry(PCSRSS_CONSOLE Console) +HistoryAddEntry(PCONSOLE Console) { UNICODE_STRING NewEntry; PHISTORY_BUFFER Hist; @@ -113,7 +113,7 @@ HistoryAddEntry(PCSRSS_CONSOLE Console) } 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 @@ HistoryGetCurrentEntry(PCSRSS_CONSOLE Console, PUNICODE_STRING Entry) } 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 @@ CSR_API(SrvGetConsoleCommandHistoryLength) { 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 @@ CSR_API(SrvGetConsoleCommandHistory) { 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 @@ CSR_API(SrvExpungeConsoleCommandHistory) { 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 @@ CSR_API(SrvSetConsoleNumberOfCommands) { 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(SrvSetConsoleNumberOfCommands) 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(SrvGetConsoleHistory) 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 @@ CSR_API(SrvSetConsoleHistory) } 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 @@ LineInputSetPos(PCSRSS_CONSOLE Console, UINT Pos) } 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 @@ LineInputEdit(PCSRSS_CONSOLE Console, UINT NumToDelete, UINT NumToInsert, WCHAR } static VOID -LineInputRecallHistory(PCSRSS_CONSOLE Console, INT Offset) +LineInputRecallHistory(PCONSOLE Console, INT Offset) { PHISTORY_BUFFER Hist; @@ -418,7 +418,7 @@ LineInputRecallHistory(PCSRSS_CONSOLE Console, INT Offset) } VOID FASTCALL -LineInputKeyDown(PCSRSS_CONSOLE Console, KEY_EVENT_RECORD *KeyEvent) +LineInputKeyDown(PCONSOLE Console, KEY_EVENT_RECORD *KeyEvent) { UINT Pos = Console->LinePos; PHISTORY_BUFFER Hist; diff --git a/win32ss/user/consrv/tuiconsole.c b/win32ss/user/consrv/tuiconsole.c index 79f1c0bcde3..db1a6c0f8cd 100644 --- a/win32ss/user/consrv/tuiconsole.c +++ b/win32ss/user/consrv/tuiconsole.c @@ -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 @@ TuiInit(DWORD OemCP) } 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 @@ TuiCopyRect(char *Dest, PCSRSS_SCREEN_BUFFER Buff, SMALL_RECT *Region) } 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 @@ TuiDrawRegion(PCSRSS_CONSOLE Console, SMALL_RECT *Region) } 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 @@ TuiWriteStream(PCSRSS_CONSOLE Console, SMALL_RECT *Region, LONG CursorStartX, LO } 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 @@ TuiSetCursorInfo(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buff) } 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 @@ TuiSetScreenInfo(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buff, UINT OldCurs } 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 @@ TuiCleanupConsole(PCSRSS_CONSOLE Console) } 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 @@ TuiResizeBuffer(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER ScreenBuffer, COORD DWORD WINAPI TuiConsoleThread(PVOID Data) { - PCSRSS_CONSOLE Console = (PCSRSS_CONSOLE) Data; + PCONSOLE Console = (PCONSOLE) Data; HWND NewWindow; MSG msg; @@ -363,7 +363,7 @@ TuiConsoleThread(PVOID Data) return 0; } -static CSRSS_CONSOLE_VTBL TuiVtbl = +static CONSOLE_VTBL TuiVtbl = { TuiInitScreenBuffer, TuiWriteStream, @@ -378,7 +378,7 @@ static CSRSS_CONSOLE_VTBL TuiVtbl = }; NTSTATUS FASTCALL -TuiInitConsole(PCSRSS_CONSOLE Console) +TuiInitConsole(PCONSOLE Console) { HANDLE ThreadHandle; @@ -430,7 +430,7 @@ TuiInitConsole(PCSRSS_CONSOLE Console) return STATUS_SUCCESS; } -PCSRSS_CONSOLE FASTCALL +PCONSOLE FASTCALL TuiGetFocusConsole(VOID) { return ActiveConsole; @@ -439,7 +439,7 @@ TuiGetFocusConsole(VOID) 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; diff --git a/win32ss/user/consrv/tuiconsole.h b/win32ss/user/consrv/tuiconsole.h index b333779213e..3647ea6d34f 100644 --- a/win32ss/user/consrv/tuiconsole.h +++ b/win32ss/user/consrv/tuiconsole.h @@ -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 */