Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 15:52:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CONSRV]: Continuing 3/X, a small step for a brighter future, maybe!

Browse source 
svn path=/branches/condrv_restructure/; revision=63868
This commit is contained in:
Hermès Bélusca-Maïto 2014-08-11 20:55:50 +00:00
parent afd30b0e36
commit d9e86f8a78
10 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

26
win32ss/user/winsrv/consrv/frontends/gui/conwnd.c
View file

@ -282,7 +282,7 @@ CreateSysMenu(HWND hWnd)
} }
static VOID static VOID
SendMenuEvent(PCONSOLE Console, UINT CmdId) SendMenuEvent(PCONSRV_CONSOLE Console, UINT CmdId)
{ {
INPUT_RECORD er; INPUT_RECORD er;
@ -366,7 +366,7 @@ static LRESULT
OnCommand(PGUI_CONSOLE_DATA GuiData, WPARAM wParam, LPARAM lParam) OnCommand(PGUI_CONSOLE_DATA GuiData, WPARAM wParam, LPARAM lParam)
{ {
LRESULT Ret = TRUE; LRESULT Ret = TRUE;
PCONSOLE Console = GuiData->Console; PCONSRV_CONSOLE Console = GuiData->Console;
/* /*
* In case the selected menu item belongs to the user-reserved menu id range, * In case the selected menu item belongs to the user-reserved menu id range,
@ -490,7 +490,7 @@ static BOOL
OnNcCreate(HWND hWnd, LPCREATESTRUCTW Create) OnNcCreate(HWND hWnd, LPCREATESTRUCTW Create)
{ {
PGUI_CONSOLE_DATA GuiData = (PGUI_CONSOLE_DATA)Create->lpCreateParams; PGUI_CONSOLE_DATA GuiData = (PGUI_CONSOLE_DATA)Create->lpCreateParams;
PCONSOLE Console; PCONSRV_CONSOLE Console;
HDC hDC; HDC hDC;
HFONT OldFont; HFONT OldFont;
TEXTMETRICW Metrics; TEXTMETRICW Metrics;
@ -647,7 +647,7 @@ OnActivate(PGUI_CONSOLE_DATA GuiData, WPARAM wParam)
static VOID static VOID
OnFocus(PGUI_CONSOLE_DATA GuiData, BOOL SetFocus) OnFocus(PGUI_CONSOLE_DATA GuiData, BOOL SetFocus)
{ {
PCONSOLE Console = GuiData->Console; PCONSRV_CONSOLE Console = GuiData->Console;
INPUT_RECORD er; INPUT_RECORD er;
if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return;
@ -814,7 +814,7 @@ UpdateSelection(PGUI_CONSOLE_DATA GuiData,
PCOORD SelectionAnchor OPTIONAL, PCOORD SelectionAnchor OPTIONAL,
PCOORD coord) PCOORD coord)
{ {
PCONSOLE Console = GuiData->Console; PCONSRV_CONSOLE Console = GuiData->Console;
HRGN oldRgn = CreateSelectionRgn(GuiData, GuiData->LineSelection, HRGN oldRgn = CreateSelectionRgn(GuiData, GuiData->LineSelection,
&GuiData->Selection.dwSelectionAnchor, &GuiData->Selection.dwSelectionAnchor,
&GuiData->Selection.srSelection); &GuiData->Selection.srSelection);
@ -1039,7 +1039,7 @@ IsSystemKey(WORD VirtualKeyCode)
static VOID static VOID
OnKey(PGUI_CONSOLE_DATA GuiData, UINT msg, WPARAM wParam, LPARAM lParam) OnKey(PGUI_CONSOLE_DATA GuiData, UINT msg, WPARAM wParam, LPARAM lParam)
{ {
PCONSOLE Console = GuiData->Console; PCONSRV_CONSOLE Console = GuiData->Console;
PCONSOLE_SCREEN_BUFFER ActiveBuffer; PCONSOLE_SCREEN_BUFFER ActiveBuffer;
if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return;
@ -1204,7 +1204,7 @@ InvalidateCell(PGUI_CONSOLE_DATA GuiData,
static VOID static VOID
OnTimer(PGUI_CONSOLE_DATA GuiData) OnTimer(PGUI_CONSOLE_DATA GuiData)
{ {
PCONSOLE Console = GuiData->Console; PCONSRV_CONSOLE Console = GuiData->Console;
PCONSOLE_SCREEN_BUFFER Buff; PCONSOLE_SCREEN_BUFFER Buff;
SetTimer(GuiData->hWindow, CONGUI_UPDATE_TIMER, CURSOR_BLINK_TIME, NULL); SetTimer(GuiData->hWindow, CONGUI_UPDATE_TIMER, CURSOR_BLINK_TIME, NULL);
@ -1309,7 +1309,7 @@ OnTimer(PGUI_CONSOLE_DATA GuiData)
static BOOL static BOOL
OnClose(PGUI_CONSOLE_DATA GuiData) OnClose(PGUI_CONSOLE_DATA GuiData)
{ {
PCONSOLE Console = GuiData->Console; PCONSRV_CONSOLE Console = GuiData->Console;
if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE))
return TRUE; return TRUE;
@ -1380,7 +1380,7 @@ static LRESULT
OnMouse(PGUI_CONSOLE_DATA GuiData, UINT msg, WPARAM wParam, LPARAM lParam) OnMouse(PGUI_CONSOLE_DATA GuiData, UINT msg, WPARAM wParam, LPARAM lParam)
{ {
BOOL Err = FALSE; BOOL Err = FALSE;
PCONSOLE Console = GuiData->Console; PCONSRV_CONSOLE Console = GuiData->Console;
// FIXME: It's here that we need to check whether we has focus or not // FIXME: It's here that we need to check whether we has focus or not
// and whether we are in edit mode or not, to know if we need to deal // and whether we are in edit mode or not, to know if we need to deal
@ -1735,7 +1735,7 @@ Paste(PGUI_CONSOLE_DATA GuiData)
static VOID static VOID
OnGetMinMaxInfo(PGUI_CONSOLE_DATA GuiData, PMINMAXINFO minMaxInfo) OnGetMinMaxInfo(PGUI_CONSOLE_DATA GuiData, PMINMAXINFO minMaxInfo)
{ {
PCONSOLE Console = GuiData->Console; PCONSRV_CONSOLE Console = GuiData->Console;
PCONSOLE_SCREEN_BUFFER ActiveBuffer; PCONSOLE_SCREEN_BUFFER ActiveBuffer;
DWORD windx, windy; DWORD windx, windy;
UINT WidthUnit, HeightUnit; UINT WidthUnit, HeightUnit;
@ -1767,7 +1767,7 @@ OnGetMinMaxInfo(PGUI_CONSOLE_DATA GuiData, PMINMAXINFO minMaxInfo)
static VOID static VOID
OnSize(PGUI_CONSOLE_DATA GuiData, WPARAM wParam, LPARAM lParam) OnSize(PGUI_CONSOLE_DATA GuiData, WPARAM wParam, LPARAM lParam)
{ {
PCONSOLE Console = GuiData->Console; PCONSRV_CONSOLE Console = GuiData->Console;
if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return;
@ -1872,7 +1872,7 @@ GuiConsoleHandleScrollbarMenu(VOID)
static LRESULT static LRESULT
OnScroll(PGUI_CONSOLE_DATA GuiData, UINT uMsg, WPARAM wParam) OnScroll(PGUI_CONSOLE_DATA GuiData, UINT uMsg, WPARAM wParam)
{ {
PCONSOLE Console = GuiData->Console; PCONSRV_CONSOLE Console = GuiData->Console;
PCONSOLE_SCREEN_BUFFER Buff; PCONSOLE_SCREEN_BUFFER Buff;
SCROLLINFO sInfo; SCROLLINFO sInfo;
int fnBar; int fnBar;
@ -1983,7 +1983,7 @@ ConWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{ {
LRESULT Result = 0; LRESULT Result = 0;
PGUI_CONSOLE_DATA GuiData = NULL; PGUI_CONSOLE_DATA GuiData = NULL;
PCONSOLE Console = NULL; PCONSRV_CONSOLE Console = NULL;
/* /*
* - If it's the first time we create a window for the terminal, * - If it's the first time we create a window for the terminal,

2
win32ss/user/winsrv/consrv/frontends/gui/conwnd.h
View file

@ -61,7 +61,7 @@ typedef struct _GUI_CONSOLE_DATA
UINT CharHeight; UINT CharHeight;
/*****************************************************/ /*****************************************************/
PCONSOLE Console; /* Pointer to the owned console */ PCONSRV_CONSOLE Console; /* Pointer to the owned console */
PCONSOLE_SCREEN_BUFFER ActiveBuffer; /* Pointer to the active screen buffer (then maybe the previous Console member is redundant?? Or not...) */ PCONSOLE_SCREEN_BUFFER ActiveBuffer; /* Pointer to the active screen buffer (then maybe the previous Console member is redundant?? Or not...) */
CONSOLE_SELECTION_INFO Selection; /* Contains information about the selection */ CONSOLE_SELECTION_INFO Selection; /* Contains information about the selection */
COORD dwSelectionCursor; /* Selection cursor position, most of the time different from Selection.dwSelectionAnchor */ COORD dwSelectionCursor; /* Selection cursor position, most of the time different from Selection.dwSelectionAnchor */

4
win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c
View file

@ -48,7 +48,7 @@ LeaveFullScreen(PGUI_CONSOLE_DATA GuiData)
VOID VOID
SwitchFullScreen(PGUI_CONSOLE_DATA GuiData, BOOL FullScreen) SwitchFullScreen(PGUI_CONSOLE_DATA GuiData, BOOL FullScreen)
{ {
PCONSOLE Console = GuiData->Console; PCONSRV_CONSOLE Console = GuiData->Console;
/* /*
* See: * See:
@ -174,7 +174,7 @@ SwitchFullScreen(PGUI_CONSOLE_DATA GuiData, BOOL FullScreen)
VOID VOID
GuiConsoleSwitchFullScreen(PGUI_CONSOLE_DATA GuiData) GuiConsoleSwitchFullScreen(PGUI_CONSOLE_DATA GuiData)
{ {
PCONSOLE Console = GuiData->Console; PCONSRV_CONSOLE Console = GuiData->Console;
BOOL FullScreen; BOOL FullScreen;
if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return;

4
win32ss/user/winsrv/consrv/frontends/gui/graphics.c
View file

@ -115,7 +115,7 @@ GuiPasteToGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer,
* This function supposes that the system clipboard was opened. * This function supposes that the system clipboard was opened.
*/ */
// PCONSOLE Console = Buffer->Header.Console; // PCONSRV_CONSOLE Console = Buffer->Header.Console;
UNIMPLEMENTED; UNIMPLEMENTED;
} }
@ -126,7 +126,7 @@ GuiPaintGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer,
PRECT rcView, PRECT rcView,
PRECT rcFramebuffer) PRECT rcFramebuffer)
{ {
PCONSOLE Console = Buffer->Header.Console; PCONSRV_CONSOLE Console = Buffer->Header.Console;
// ASSERT(Console == GuiData->Console); // ASSERT(Console == GuiData->Console);
if (Buffer->BitMap == NULL) return; if (Buffer->BitMap == NULL) return;

6
win32ss/user/winsrv/consrv/frontends/gui/guisettings.c
View file

@ -230,7 +230,7 @@ GuiConsoleShowConsoleProperties(PGUI_CONSOLE_DATA GuiData,
BOOL Defaults) BOOL Defaults)
{ {
NTSTATUS Status; NTSTATUS Status;
PCONSOLE Console = GuiData->Console; PCONSRV_CONSOLE Console = GuiData->Console;
PCONSOLE_SCREEN_BUFFER ActiveBuffer = GuiData->ActiveBuffer; PCONSOLE_SCREEN_BUFFER ActiveBuffer = GuiData->ActiveBuffer;
PCONSOLE_PROCESS_DATA ProcessData; PCONSOLE_PROCESS_DATA ProcessData;
HANDLE hSection = NULL, hClientSection = NULL; HANDLE hSection = NULL, hClientSection = NULL;
@ -510,7 +510,7 @@ GuiApplyUserSettings(PGUI_CONSOLE_DATA GuiData,
BOOL SaveSettings) BOOL SaveSettings)
{ {
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
PCONSOLE Console = GuiData->Console; PCONSRV_CONSOLE Console = GuiData->Console;
PCONSOLE_PROCESS_DATA ProcessData; PCONSOLE_PROCESS_DATA ProcessData;
HANDLE hSection = NULL; HANDLE hSection = NULL;
ULONG ViewSize = 0; ULONG ViewSize = 0;
@ -654,7 +654,7 @@ GuiApplyWindowsConsoleSettings(PGUI_CONSOLE_DATA GuiData,
HANDLE hClientSection) HANDLE hClientSection)
{ {
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
PCONSOLE Console = GuiData->Console; PCONSRV_CONSOLE Console = GuiData->Console;
PCONSOLE_PROCESS_DATA ProcessData; PCONSOLE_PROCESS_DATA ProcessData;
HANDLE hSection = NULL; HANDLE hSection = NULL;
ULONG ViewSize = 0; ULONG ViewSize = 0;

6
win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
View file

@ -160,7 +160,7 @@ GuiConsoleNotifyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
case PM_CREATE_CONSOLE: case PM_CREATE_CONSOLE:
{ {
PGUI_CONSOLE_DATA GuiData = (PGUI_CONSOLE_DATA)lParam; PGUI_CONSOLE_DATA GuiData = (PGUI_CONSOLE_DATA)lParam;
PCONSOLE Console = GuiData->Console; PCONSRV_CONSOLE Console = GuiData->Console;
RECT rcWnd; RECT rcWnd;
DPRINT("PM_CREATE_CONSOLE -- creating window\n"); DPRINT("PM_CREATE_CONSOLE -- creating window\n");
@ -394,9 +394,9 @@ GuiInit(VOID)
static VOID NTAPI static VOID NTAPI
GuiDeinitFrontEnd(IN OUT PFRONTEND This); GuiDeinitFrontEnd(IN OUT PFRONTEND This);
NTSTATUS NTAPI static NTSTATUS NTAPI
GuiInitFrontEnd(IN OUT PFRONTEND This, GuiInitFrontEnd(IN OUT PFRONTEND This,
IN PCONSOLE Console) IN PCONSRV_CONSOLE Console)
{ {
PGUI_INIT_INFO GuiInitInfo; PGUI_INIT_INFO GuiInitInfo;
PCONSOLE_INFO ConsoleInfo; PCONSOLE_INFO ConsoleInfo;

6
win32ss/user/winsrv/consrv/frontends/gui/text.c
View file

@ -25,7 +25,7 @@
/* FUNCTIONS ******************************************************************/ /* FUNCTIONS ******************************************************************/
static COLORREF static COLORREF
PaletteRGBFromAttrib(PCONSOLE Console, WORD Attribute) PaletteRGBFromAttrib(PCONSRV_CONSOLE Console, WORD Attribute)
{ {
HPALETTE hPalette = Console->ActiveBuffer->PaletteHandle; HPALETTE hPalette = Console->ActiveBuffer->PaletteHandle;
PALETTEENTRY pe; PALETTEENTRY pe;
@ -309,7 +309,7 @@ GuiPasteToTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer,
* This function supposes that the system clipboard was opened. * This function supposes that the system clipboard was opened.
*/ */
PCONSOLE Console = Buffer->Header.Console; PCONSRV_CONSOLE Console = Buffer->Header.Console;
HANDLE hData; HANDLE hData;
LPWSTR str; LPWSTR str;
@ -377,7 +377,7 @@ GuiPaintTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer,
PRECT rcView, PRECT rcView,
PRECT rcFramebuffer) PRECT rcFramebuffer)
{ {
PCONSOLE Console = Buffer->Header.Console; PCONSRV_CONSOLE Console = Buffer->Header.Console;
// ASSERT(Console == GuiData->Console); // ASSERT(Console == GuiData->Console);
ULONG TopLine, BottomLine, LeftChar, RightChar; ULONG TopLine, BottomLine, LeftChar, RightChar;

14
win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c
View file

@ -35,7 +35,7 @@ typedef struct _TUI_CONSOLE_DATA
HWND hWindow; /* Handle to the console's window (used for the window's procedure */ HWND hWindow; /* Handle to the console's window (used for the window's procedure */
PCONSOLE Console; /* Pointer to the owned console */ PCONSRV_CONSOLE Console; /* Pointer to the owned console */
// TUI_CONSOLE_INFO TuiInfo; /* TUI terminal settings */ // TUI_CONSOLE_INFO TuiInfo; /* TUI terminal settings */
} TUI_CONSOLE_DATA, *PTUI_CONSOLE_DATA; } TUI_CONSOLE_DATA, *PTUI_CONSOLE_DATA;
@ -261,7 +261,7 @@ TuiConsoleWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{ {
/* /*
PTUI_CONSOLE_DATA TuiData = NULL; PTUI_CONSOLE_DATA TuiData = NULL;
PCONSOLE Console = NULL; PCONSRV_CONSOLE Console = NULL;
TuiData = TuiGetGuiData(hWnd); TuiData = TuiGetGuiData(hWnd);
if (TuiData == NULL) return 0; if (TuiData == NULL) return 0;
@ -330,7 +330,7 @@ static DWORD NTAPI
TuiConsoleThread(PVOID Data) TuiConsoleThread(PVOID Data)
{ {
PTUI_CONSOLE_DATA TuiData = (PTUI_CONSOLE_DATA)Data; PTUI_CONSOLE_DATA TuiData = (PTUI_CONSOLE_DATA)Data;
PCONSOLE Console = TuiData->Console; PCONSRV_CONSOLE Console = TuiData->Console;
HWND NewWindow; HWND NewWindow;
MSG msg; MSG msg;
@ -458,11 +458,11 @@ Quit:
static VOID NTAPI static VOID NTAPI
TuiDeinitFrontEnd(IN OUT PFRONTEND This /*, TuiDeinitFrontEnd(IN OUT PFRONTEND This /*,
IN PCONSOLE Console */); IN PCONSRV_CONSOLE Console */);
NTSTATUS NTAPI static NTSTATUS NTAPI
TuiInitFrontEnd(IN OUT PFRONTEND This, TuiInitFrontEnd(IN OUT PFRONTEND This,
IN PCONSOLE Console) IN PCONSRV_CONSOLE Console)
{ {
PTUI_CONSOLE_DATA TuiData; PTUI_CONSOLE_DATA TuiData;
HANDLE ThreadHandle; HANDLE ThreadHandle;
@ -539,7 +539,7 @@ TuiInitFrontEnd(IN OUT PFRONTEND This,
static VOID NTAPI static VOID NTAPI
TuiDeinitFrontEnd(IN OUT PFRONTEND This) TuiDeinitFrontEnd(IN OUT PFRONTEND This)
{ {
// PCONSOLE Console = This->Console; // PCONSRV_CONSOLE Console = This->Console;
PTUI_CONSOLE_DATA TuiData = This->Data; // Console->FrontEndIFace.Data; PTUI_CONSOLE_DATA TuiData = This->Data; // Console->FrontEndIFace.Data;
/* Close the notification window */ /* Close the notification window */