mirror of
https://github.com/reactos/reactos.git
synced 2024-08-28 14:18:41 +00:00
[CONSRV]: Continuing 3/X, a small step for a brighter future, maybe!
svn path=/branches/condrv_restructure/; revision=63868
This commit is contained in:
parent
afd30b0e36
commit
d9e86f8a78
|
@ -282,7 +282,7 @@ CreateSysMenu(HWND hWnd)
|
|||
}
|
||||
|
||||
static VOID
|
||||
SendMenuEvent(PCONSOLE Console, UINT CmdId)
|
||||
SendMenuEvent(PCONSRV_CONSOLE Console, UINT CmdId)
|
||||
{
|
||||
INPUT_RECORD er;
|
||||
|
||||
|
@ -366,7 +366,7 @@ static LRESULT
|
|||
OnCommand(PGUI_CONSOLE_DATA GuiData, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
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,
|
||||
|
@ -490,7 +490,7 @@ static BOOL
|
|||
OnNcCreate(HWND hWnd, LPCREATESTRUCTW Create)
|
||||
{
|
||||
PGUI_CONSOLE_DATA GuiData = (PGUI_CONSOLE_DATA)Create->lpCreateParams;
|
||||
PCONSOLE Console;
|
||||
PCONSRV_CONSOLE Console;
|
||||
HDC hDC;
|
||||
HFONT OldFont;
|
||||
TEXTMETRICW Metrics;
|
||||
|
@ -647,7 +647,7 @@ OnActivate(PGUI_CONSOLE_DATA GuiData, WPARAM wParam)
|
|||
static VOID
|
||||
OnFocus(PGUI_CONSOLE_DATA GuiData, BOOL SetFocus)
|
||||
{
|
||||
PCONSOLE Console = GuiData->Console;
|
||||
PCONSRV_CONSOLE Console = GuiData->Console;
|
||||
INPUT_RECORD er;
|
||||
|
||||
if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return;
|
||||
|
@ -814,7 +814,7 @@ UpdateSelection(PGUI_CONSOLE_DATA GuiData,
|
|||
PCOORD SelectionAnchor OPTIONAL,
|
||||
PCOORD coord)
|
||||
{
|
||||
PCONSOLE Console = GuiData->Console;
|
||||
PCONSRV_CONSOLE Console = GuiData->Console;
|
||||
HRGN oldRgn = CreateSelectionRgn(GuiData, GuiData->LineSelection,
|
||||
&GuiData->Selection.dwSelectionAnchor,
|
||||
&GuiData->Selection.srSelection);
|
||||
|
@ -1039,7 +1039,7 @@ IsSystemKey(WORD VirtualKeyCode)
|
|||
static VOID
|
||||
OnKey(PGUI_CONSOLE_DATA GuiData, UINT msg, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
PCONSOLE Console = GuiData->Console;
|
||||
PCONSRV_CONSOLE Console = GuiData->Console;
|
||||
PCONSOLE_SCREEN_BUFFER ActiveBuffer;
|
||||
|
||||
if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return;
|
||||
|
@ -1204,7 +1204,7 @@ InvalidateCell(PGUI_CONSOLE_DATA GuiData,
|
|||
static VOID
|
||||
OnTimer(PGUI_CONSOLE_DATA GuiData)
|
||||
{
|
||||
PCONSOLE Console = GuiData->Console;
|
||||
PCONSRV_CONSOLE Console = GuiData->Console;
|
||||
PCONSOLE_SCREEN_BUFFER Buff;
|
||||
|
||||
SetTimer(GuiData->hWindow, CONGUI_UPDATE_TIMER, CURSOR_BLINK_TIME, NULL);
|
||||
|
@ -1309,7 +1309,7 @@ OnTimer(PGUI_CONSOLE_DATA GuiData)
|
|||
static BOOL
|
||||
OnClose(PGUI_CONSOLE_DATA GuiData)
|
||||
{
|
||||
PCONSOLE Console = GuiData->Console;
|
||||
PCONSRV_CONSOLE Console = GuiData->Console;
|
||||
|
||||
if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE))
|
||||
return TRUE;
|
||||
|
@ -1380,7 +1380,7 @@ static LRESULT
|
|||
OnMouse(PGUI_CONSOLE_DATA GuiData, UINT msg, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
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
|
||||
// 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
|
||||
OnGetMinMaxInfo(PGUI_CONSOLE_DATA GuiData, PMINMAXINFO minMaxInfo)
|
||||
{
|
||||
PCONSOLE Console = GuiData->Console;
|
||||
PCONSRV_CONSOLE Console = GuiData->Console;
|
||||
PCONSOLE_SCREEN_BUFFER ActiveBuffer;
|
||||
DWORD windx, windy;
|
||||
UINT WidthUnit, HeightUnit;
|
||||
|
@ -1767,7 +1767,7 @@ OnGetMinMaxInfo(PGUI_CONSOLE_DATA GuiData, PMINMAXINFO minMaxInfo)
|
|||
static VOID
|
||||
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;
|
||||
|
||||
|
@ -1872,7 +1872,7 @@ GuiConsoleHandleScrollbarMenu(VOID)
|
|||
static LRESULT
|
||||
OnScroll(PGUI_CONSOLE_DATA GuiData, UINT uMsg, WPARAM wParam)
|
||||
{
|
||||
PCONSOLE Console = GuiData->Console;
|
||||
PCONSRV_CONSOLE Console = GuiData->Console;
|
||||
PCONSOLE_SCREEN_BUFFER Buff;
|
||||
SCROLLINFO sInfo;
|
||||
int fnBar;
|
||||
|
@ -1983,7 +1983,7 @@ ConWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
|
|||
{
|
||||
LRESULT Result = 0;
|
||||
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,
|
||||
|
|
|
@ -61,7 +61,7 @@ typedef struct _GUI_CONSOLE_DATA
|
|||
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...) */
|
||||
CONSOLE_SELECTION_INFO Selection; /* Contains information about the selection */
|
||||
COORD dwSelectionCursor; /* Selection cursor position, most of the time different from Selection.dwSelectionAnchor */
|
||||
|
|
|
@ -48,7 +48,7 @@ LeaveFullScreen(PGUI_CONSOLE_DATA GuiData)
|
|||
VOID
|
||||
SwitchFullScreen(PGUI_CONSOLE_DATA GuiData, BOOL FullScreen)
|
||||
{
|
||||
PCONSOLE Console = GuiData->Console;
|
||||
PCONSRV_CONSOLE Console = GuiData->Console;
|
||||
|
||||
/*
|
||||
* See:
|
||||
|
@ -174,7 +174,7 @@ SwitchFullScreen(PGUI_CONSOLE_DATA GuiData, BOOL FullScreen)
|
|||
VOID
|
||||
GuiConsoleSwitchFullScreen(PGUI_CONSOLE_DATA GuiData)
|
||||
{
|
||||
PCONSOLE Console = GuiData->Console;
|
||||
PCONSRV_CONSOLE Console = GuiData->Console;
|
||||
BOOL FullScreen;
|
||||
|
||||
if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return;
|
||||
|
|
|
@ -115,7 +115,7 @@ GuiPasteToGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer,
|
|||
* This function supposes that the system clipboard was opened.
|
||||
*/
|
||||
|
||||
// PCONSOLE Console = Buffer->Header.Console;
|
||||
// PCONSRV_CONSOLE Console = Buffer->Header.Console;
|
||||
|
||||
UNIMPLEMENTED;
|
||||
}
|
||||
|
@ -126,7 +126,7 @@ GuiPaintGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer,
|
|||
PRECT rcView,
|
||||
PRECT rcFramebuffer)
|
||||
{
|
||||
PCONSOLE Console = Buffer->Header.Console;
|
||||
PCONSRV_CONSOLE Console = Buffer->Header.Console;
|
||||
// ASSERT(Console == GuiData->Console);
|
||||
|
||||
if (Buffer->BitMap == NULL) return;
|
||||
|
|
|
@ -230,7 +230,7 @@ GuiConsoleShowConsoleProperties(PGUI_CONSOLE_DATA GuiData,
|
|||
BOOL Defaults)
|
||||
{
|
||||
NTSTATUS Status;
|
||||
PCONSOLE Console = GuiData->Console;
|
||||
PCONSRV_CONSOLE Console = GuiData->Console;
|
||||
PCONSOLE_SCREEN_BUFFER ActiveBuffer = GuiData->ActiveBuffer;
|
||||
PCONSOLE_PROCESS_DATA ProcessData;
|
||||
HANDLE hSection = NULL, hClientSection = NULL;
|
||||
|
@ -510,7 +510,7 @@ GuiApplyUserSettings(PGUI_CONSOLE_DATA GuiData,
|
|||
BOOL SaveSettings)
|
||||
{
|
||||
NTSTATUS Status = STATUS_SUCCESS;
|
||||
PCONSOLE Console = GuiData->Console;
|
||||
PCONSRV_CONSOLE Console = GuiData->Console;
|
||||
PCONSOLE_PROCESS_DATA ProcessData;
|
||||
HANDLE hSection = NULL;
|
||||
ULONG ViewSize = 0;
|
||||
|
@ -654,7 +654,7 @@ GuiApplyWindowsConsoleSettings(PGUI_CONSOLE_DATA GuiData,
|
|||
HANDLE hClientSection)
|
||||
{
|
||||
NTSTATUS Status = STATUS_SUCCESS;
|
||||
PCONSOLE Console = GuiData->Console;
|
||||
PCONSRV_CONSOLE Console = GuiData->Console;
|
||||
PCONSOLE_PROCESS_DATA ProcessData;
|
||||
HANDLE hSection = NULL;
|
||||
ULONG ViewSize = 0;
|
||||
|
|
|
@ -160,7 +160,7 @@ GuiConsoleNotifyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
|
|||
case PM_CREATE_CONSOLE:
|
||||
{
|
||||
PGUI_CONSOLE_DATA GuiData = (PGUI_CONSOLE_DATA)lParam;
|
||||
PCONSOLE Console = GuiData->Console;
|
||||
PCONSRV_CONSOLE Console = GuiData->Console;
|
||||
RECT rcWnd;
|
||||
|
||||
DPRINT("PM_CREATE_CONSOLE -- creating window\n");
|
||||
|
@ -394,9 +394,9 @@ GuiInit(VOID)
|
|||
static VOID NTAPI
|
||||
GuiDeinitFrontEnd(IN OUT PFRONTEND This);
|
||||
|
||||
NTSTATUS NTAPI
|
||||
static NTSTATUS NTAPI
|
||||
GuiInitFrontEnd(IN OUT PFRONTEND This,
|
||||
IN PCONSOLE Console)
|
||||
IN PCONSRV_CONSOLE Console)
|
||||
{
|
||||
PGUI_INIT_INFO GuiInitInfo;
|
||||
PCONSOLE_INFO ConsoleInfo;
|
||||
|
|
|
@ -15,8 +15,8 @@
|
|||
#include "conwnd.h"
|
||||
|
||||
NTSTATUS GuiInitConsole(PCONSOLE Console,
|
||||
/*IN*/ PCONSOLE_START_INFO ConsoleStartInfo,
|
||||
PCONSOLE_INFO ConsoleInfo,
|
||||
DWORD ProcessId,
|
||||
LPCWSTR IconPath,
|
||||
INT IconIndex);
|
||||
/*IN*/ PCONSOLE_START_INFO ConsoleStartInfo,
|
||||
PCONSOLE_INFO ConsoleInfo,
|
||||
DWORD ProcessId,
|
||||
LPCWSTR IconPath,
|
||||
INT IconIndex);
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
/* FUNCTIONS ******************************************************************/
|
||||
|
||||
static COLORREF
|
||||
PaletteRGBFromAttrib(PCONSOLE Console, WORD Attribute)
|
||||
PaletteRGBFromAttrib(PCONSRV_CONSOLE Console, WORD Attribute)
|
||||
{
|
||||
HPALETTE hPalette = Console->ActiveBuffer->PaletteHandle;
|
||||
PALETTEENTRY pe;
|
||||
|
@ -309,7 +309,7 @@ GuiPasteToTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer,
|
|||
* This function supposes that the system clipboard was opened.
|
||||
*/
|
||||
|
||||
PCONSOLE Console = Buffer->Header.Console;
|
||||
PCONSRV_CONSOLE Console = Buffer->Header.Console;
|
||||
|
||||
HANDLE hData;
|
||||
LPWSTR str;
|
||||
|
@ -377,7 +377,7 @@ GuiPaintTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer,
|
|||
PRECT rcView,
|
||||
PRECT rcFramebuffer)
|
||||
{
|
||||
PCONSOLE Console = Buffer->Header.Console;
|
||||
PCONSRV_CONSOLE Console = Buffer->Header.Console;
|
||||
// ASSERT(Console == GuiData->Console);
|
||||
|
||||
ULONG TopLine, BottomLine, LeftChar, RightChar;
|
||||
|
|
|
@ -35,7 +35,7 @@ typedef struct _TUI_CONSOLE_DATA
|
|||
|
||||
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_DATA, *PTUI_CONSOLE_DATA;
|
||||
|
||||
|
@ -261,7 +261,7 @@ TuiConsoleWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
|
|||
{
|
||||
/*
|
||||
PTUI_CONSOLE_DATA TuiData = NULL;
|
||||
PCONSOLE Console = NULL;
|
||||
PCONSRV_CONSOLE Console = NULL;
|
||||
|
||||
TuiData = TuiGetGuiData(hWnd);
|
||||
if (TuiData == NULL) return 0;
|
||||
|
@ -330,7 +330,7 @@ static DWORD NTAPI
|
|||
TuiConsoleThread(PVOID Data)
|
||||
{
|
||||
PTUI_CONSOLE_DATA TuiData = (PTUI_CONSOLE_DATA)Data;
|
||||
PCONSOLE Console = TuiData->Console;
|
||||
PCONSRV_CONSOLE Console = TuiData->Console;
|
||||
HWND NewWindow;
|
||||
MSG msg;
|
||||
|
||||
|
@ -458,11 +458,11 @@ Quit:
|
|||
|
||||
static VOID NTAPI
|
||||
TuiDeinitFrontEnd(IN OUT PFRONTEND This /*,
|
||||
IN PCONSOLE Console */);
|
||||
IN PCONSRV_CONSOLE Console */);
|
||||
|
||||
NTSTATUS NTAPI
|
||||
static NTSTATUS NTAPI
|
||||
TuiInitFrontEnd(IN OUT PFRONTEND This,
|
||||
IN PCONSOLE Console)
|
||||
IN PCONSRV_CONSOLE Console)
|
||||
{
|
||||
PTUI_CONSOLE_DATA TuiData;
|
||||
HANDLE ThreadHandle;
|
||||
|
@ -539,7 +539,7 @@ TuiInitFrontEnd(IN OUT PFRONTEND This,
|
|||
static VOID NTAPI
|
||||
TuiDeinitFrontEnd(IN OUT PFRONTEND This)
|
||||
{
|
||||
// PCONSOLE Console = This->Console;
|
||||
// PCONSRV_CONSOLE Console = This->Console;
|
||||
PTUI_CONSOLE_DATA TuiData = This->Data; // Console->FrontEndIFace.Data;
|
||||
|
||||
/* Close the notification window */
|
||||
|
|
|
@ -12,8 +12,8 @@
|
|||
#pragma once
|
||||
|
||||
NTSTATUS TuiInitConsole(PCONSOLE Console,
|
||||
/*IN*/ PCONSOLE_START_INFO ConsoleStartInfo,
|
||||
PCONSOLE_INFO ConsoleInfo,
|
||||
DWORD ProcessId);
|
||||
/*IN*/ PCONSOLE_START_INFO ConsoleStartInfo,
|
||||
PCONSOLE_INFO ConsoleInfo,
|
||||
DWORD ProcessId);
|
||||
|
||||
/* EOF */
|
||||
|
|
Loading…
Reference in a new issue