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

[CONSRV]: Rename context members with a more explicit name (code "style" only).

Browse source 
svn path=/branches/condrv_restructure/; revision=65653
This commit is contained in:
Hermès Bélusca-Maïto 2014-12-14 21:51:32 +00:00
parent 0187ba2a21
commit 15f101905a
6 changed files with 68 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

2
win32ss/user/winsrv/consrv/condrv/conoutput.c
View file

@ -64,8 +64,6 @@ CONSOLE_SCREEN_BUFFER_Destroy(IN OUT PCONSOLE_SCREEN_BUFFER Buffer)
} }
else if (Buffer->Header.Type == SCREEN_BUFFER) else if (Buffer->Header.Type == SCREEN_BUFFER)
{ {
// TODO: Free Buffer->Data
/* Free the palette handle */ /* Free the palette handle */
if (Buffer->PaletteHandle != NULL) DeleteObject(Buffer->PaletteHandle); if (Buffer->PaletteHandle != NULL) DeleteObject(Buffer->PaletteHandle);

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

@ -138,9 +138,9 @@ VOID
CreateSysMenu(HWND hWnd); CreateSysMenu(HWND hWnd);
static DWORD NTAPI static DWORD NTAPI
GuiConsoleInputThread(PVOID Data) GuiConsoleInputThread(PVOID Param)
{ {
PHANDLE GraphicsStartupEvent = (PHANDLE)Data; PHANDLE GraphicsStartupEvent = (PHANDLE)Param;
LONG WindowCount = 0; LONG WindowCount = 0;
MSG msg; MSG msg;
@ -348,12 +348,12 @@ GuiInitFrontEnd(IN OUT PFRONTEND This,
PGUI_CONSOLE_DATA GuiData; PGUI_CONSOLE_DATA GuiData;
GUI_CONSOLE_INFO TermInfo; GUI_CONSOLE_INFO TermInfo;
if (This == NULL || Console == NULL || This->OldData == NULL) if (This == NULL || Console == NULL || This->Context2 == NULL)
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
ASSERT(This->Console == Console); ASSERT(This->Console == Console);
GuiInitInfo = This->OldData; GuiInitInfo = This->Context2;
if (GuiInitInfo->ConsoleInfo == NULL || GuiInitInfo->ConsoleStartInfo == NULL) if (GuiInitInfo->ConsoleInfo == NULL || GuiInitInfo->ConsoleStartInfo == NULL)
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
@ -368,7 +368,7 @@ GuiInitFrontEnd(IN OUT PFRONTEND This,
DPRINT1("CONSRV: Failed to create GUI_CONSOLE_DATA\n"); DPRINT1("CONSRV: Failed to create GUI_CONSOLE_DATA\n");
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
} }
///// /* HACK */ Console->FrontEndIFace.Data = (PVOID)GuiData; /* HACK */ ///// /* HACK */ Console->FrontEndIFace.Context = (PVOID)GuiData; /* HACK */
GuiData->Console = Console; GuiData->Console = Console;
GuiData->ActiveBuffer = Console->ActiveBuffer; GuiData->ActiveBuffer = Console->ActiveBuffer;
GuiData->hWindow = NULL; GuiData->hWindow = NULL;
@ -472,9 +472,9 @@ GuiInitFrontEnd(IN OUT PFRONTEND This,
// TODO: Retrieve the selection mode via the registry. // TODO: Retrieve the selection mode via the registry.
/* Finally, finish to initialize the frontend structure */ /* Finally, finish to initialize the frontend structure */
This->Data = GuiData; This->Context = GuiData;
if (This->OldData) ConsoleFreeHeap(This->OldData); if (This->Context2) ConsoleFreeHeap(This->Context2);
This->OldData = NULL; This->Context2 = NULL;
/* /*
* We need to wait until the GUI has been fully initialized * We need to wait until the GUI has been fully initialized
@ -512,7 +512,7 @@ GuiInitFrontEnd(IN OUT PFRONTEND This,
static VOID NTAPI static VOID NTAPI
GuiDeinitFrontEnd(IN OUT PFRONTEND This) GuiDeinitFrontEnd(IN OUT PFRONTEND This)
{ {
PGUI_CONSOLE_DATA GuiData = This->Data; PGUI_CONSOLE_DATA GuiData = This->Context;
DPRINT("Send PM_DESTROY_CONSOLE message and wait on hGuiTermEvent...\n"); DPRINT("Send PM_DESTROY_CONSOLE message and wait on hGuiTermEvent...\n");
PostThreadMessageW(dwInputThreadId, PM_DESTROY_CONSOLE, 0, (LPARAM)GuiData); PostThreadMessageW(dwInputThreadId, PM_DESTROY_CONSOLE, 0, (LPARAM)GuiData);
@ -534,7 +534,7 @@ GuiDeinitFrontEnd(IN OUT PFRONTEND This)
DestroyIcon(GuiData->hIconSm); DestroyIcon(GuiData->hIconSm);
} }
This->Data = NULL; This->Context = NULL;
DeleteCriticalSection(&GuiData->Lock); DeleteCriticalSection(&GuiData->Lock);
ConsoleFreeHeap(GuiData); ConsoleFreeHeap(GuiData);
@ -545,7 +545,7 @@ static VOID NTAPI
GuiDrawRegion(IN OUT PFRONTEND This, GuiDrawRegion(IN OUT PFRONTEND This,
SMALL_RECT* Region) SMALL_RECT* Region)
{ {
PGUI_CONSOLE_DATA GuiData = This->Data; PGUI_CONSOLE_DATA GuiData = This->Context;
/* Do nothing if the window is hidden */ /* Do nothing if the window is hidden */
if (!GuiData->IsWindowVisible) return; if (!GuiData->IsWindowVisible) return;
@ -562,7 +562,7 @@ GuiWriteStream(IN OUT PFRONTEND This,
PWCHAR Buffer, PWCHAR Buffer,
UINT Length) UINT Length)
{ {
PGUI_CONSOLE_DATA GuiData = This->Data; PGUI_CONSOLE_DATA GuiData = This->Context;
PCONSOLE_SCREEN_BUFFER Buff; PCONSOLE_SCREEN_BUFFER Buff;
SHORT CursorEndX, CursorEndY; SHORT CursorEndX, CursorEndY;
RECT ScrollRect; RECT ScrollRect;
@ -619,7 +619,7 @@ GuiWriteStream(IN OUT PFRONTEND This,
/* static */ VOID NTAPI /* static */ VOID NTAPI
GuiRingBell(IN OUT PFRONTEND This) GuiRingBell(IN OUT PFRONTEND This)
{ {
PGUI_CONSOLE_DATA GuiData = This->Data; PGUI_CONSOLE_DATA GuiData = This->Context;
/* Emit an error beep sound */ /* Emit an error beep sound */
SendNotifyMessage(GuiData->hWindow, PM_CONSOLE_BEEP, 0, 0); SendNotifyMessage(GuiData->hWindow, PM_CONSOLE_BEEP, 0, 0);
@ -629,7 +629,7 @@ static BOOL NTAPI
GuiSetCursorInfo(IN OUT PFRONTEND This, GuiSetCursorInfo(IN OUT PFRONTEND This,
PCONSOLE_SCREEN_BUFFER Buff) PCONSOLE_SCREEN_BUFFER Buff)
{ {
PGUI_CONSOLE_DATA GuiData = This->Data; PGUI_CONSOLE_DATA GuiData = This->Context;
/* Do nothing if the window is hidden */ /* Do nothing if the window is hidden */
if (!GuiData->IsWindowVisible) return TRUE; if (!GuiData->IsWindowVisible) return TRUE;
@ -648,7 +648,7 @@ GuiSetScreenInfo(IN OUT PFRONTEND This,
SHORT OldCursorX, SHORT OldCursorX,
SHORT OldCursorY) SHORT OldCursorY)
{ {
PGUI_CONSOLE_DATA GuiData = This->Data; PGUI_CONSOLE_DATA GuiData = This->Context;
/* Do nothing if the window is hidden */ /* Do nothing if the window is hidden */
if (!GuiData->IsWindowVisible) return TRUE; if (!GuiData->IsWindowVisible) return TRUE;
@ -667,7 +667,7 @@ GuiSetScreenInfo(IN OUT PFRONTEND This,
static VOID NTAPI static VOID NTAPI
GuiResizeTerminal(IN OUT PFRONTEND This) GuiResizeTerminal(IN OUT PFRONTEND This)
{ {
PGUI_CONSOLE_DATA GuiData = This->Data; PGUI_CONSOLE_DATA GuiData = This->Context;
/* Resize the window to the user's values */ /* Resize the window to the user's values */
PostMessageW(GuiData->hWindow, PM_RESIZE_TERMINAL, 0, 0); PostMessageW(GuiData->hWindow, PM_RESIZE_TERMINAL, 0, 0);
@ -676,7 +676,7 @@ GuiResizeTerminal(IN OUT PFRONTEND This)
static VOID NTAPI static VOID NTAPI
GuiSetActiveScreenBuffer(IN OUT PFRONTEND This) GuiSetActiveScreenBuffer(IN OUT PFRONTEND This)
{ {
PGUI_CONSOLE_DATA GuiData = This->Data; PGUI_CONSOLE_DATA GuiData = This->Context;
PCONSOLE_SCREEN_BUFFER ActiveBuffer; PCONSOLE_SCREEN_BUFFER ActiveBuffer;
HPALETTE hPalette; HPALETTE hPalette;
@ -720,7 +720,7 @@ static VOID NTAPI
GuiReleaseScreenBuffer(IN OUT PFRONTEND This, GuiReleaseScreenBuffer(IN OUT PFRONTEND This,
IN PCONSOLE_SCREEN_BUFFER ScreenBuffer) IN PCONSOLE_SCREEN_BUFFER ScreenBuffer)
{ {
PGUI_CONSOLE_DATA GuiData = This->Data; PGUI_CONSOLE_DATA GuiData = This->Context;
/* /*
* If we were notified to release a screen buffer that is not actually * If we were notified to release a screen buffer that is not actually
@ -767,7 +767,7 @@ GuiSetMouseCursor(IN OUT PFRONTEND This,
static VOID NTAPI static VOID NTAPI
GuiRefreshInternalInfo(IN OUT PFRONTEND This) GuiRefreshInternalInfo(IN OUT PFRONTEND This)
{ {
PGUI_CONSOLE_DATA GuiData = This->Data; PGUI_CONSOLE_DATA GuiData = This->Context;
/* Update the console leader information held by the window */ /* Update the console leader information held by the window */
SetConWndConsoleLeaderCID(GuiData); SetConWndConsoleLeaderCID(GuiData);
@ -789,7 +789,7 @@ GuiRefreshInternalInfo(IN OUT PFRONTEND This)
static VOID NTAPI static VOID NTAPI
GuiChangeTitle(IN OUT PFRONTEND This) GuiChangeTitle(IN OUT PFRONTEND This)
{ {
PGUI_CONSOLE_DATA GuiData = This->Data; PGUI_CONSOLE_DATA GuiData = This->Context;
// PostMessageW(GuiData->hWindow, PM_CONSOLE_SET_TITLE, 0, 0); // PostMessageW(GuiData->hWindow, PM_CONSOLE_SET_TITLE, 0, 0);
SetWindowText(GuiData->hWindow, GuiData->Console->Title.Buffer); SetWindowText(GuiData->hWindow, GuiData->Console->Title.Buffer);
} }
@ -798,7 +798,7 @@ static BOOL NTAPI
GuiChangeIcon(IN OUT PFRONTEND This, GuiChangeIcon(IN OUT PFRONTEND This,
HICON IconHandle) HICON IconHandle)
{ {
PGUI_CONSOLE_DATA GuiData = This->Data; PGUI_CONSOLE_DATA GuiData = This->Context;
HICON hIcon, hIconSm; HICON hIcon, hIconSm;
if (IconHandle == NULL) if (IconHandle == NULL)
@ -842,7 +842,7 @@ GuiChangeIcon(IN OUT PFRONTEND This,
static HWND NTAPI static HWND NTAPI
GuiGetConsoleWindowHandle(IN OUT PFRONTEND This) GuiGetConsoleWindowHandle(IN OUT PFRONTEND This)
{ {
PGUI_CONSOLE_DATA GuiData = This->Data; PGUI_CONSOLE_DATA GuiData = This->Context;
return GuiData->hWindow; return GuiData->hWindow;
} }
@ -850,7 +850,7 @@ static VOID NTAPI
GuiGetLargestConsoleWindowSize(IN OUT PFRONTEND This, GuiGetLargestConsoleWindowSize(IN OUT PFRONTEND This,
PCOORD pSize) PCOORD pSize)
{ {
PGUI_CONSOLE_DATA GuiData = This->Data; PGUI_CONSOLE_DATA GuiData = This->Context;
PCONSOLE_SCREEN_BUFFER ActiveBuffer; PCONSOLE_SCREEN_BUFFER ActiveBuffer;
RECT WorkArea; RECT WorkArea;
LONG width, height; LONG width, height;
@ -893,7 +893,7 @@ static BOOL NTAPI
GuiGetSelectionInfo(IN OUT PFRONTEND This, GuiGetSelectionInfo(IN OUT PFRONTEND This,
PCONSOLE_SELECTION_INFO pSelectionInfo) PCONSOLE_SELECTION_INFO pSelectionInfo)
{ {
PGUI_CONSOLE_DATA GuiData = This->Data; PGUI_CONSOLE_DATA GuiData = This->Context;
if (pSelectionInfo == NULL) return FALSE; if (pSelectionInfo == NULL) return FALSE;
@ -909,7 +909,7 @@ GuiSetPalette(IN OUT PFRONTEND This,
HPALETTE PaletteHandle, HPALETTE PaletteHandle,
UINT PaletteUsage) UINT PaletteUsage)
{ {
PGUI_CONSOLE_DATA GuiData = This->Data; PGUI_CONSOLE_DATA GuiData = This->Context;
HPALETTE OldPalette; HPALETTE OldPalette;
// if (GetType(GuiData->ActiveBuffer) != GRAPHICS_BUFFER) return FALSE; // if (GetType(GuiData->ActiveBuffer) != GRAPHICS_BUFFER) return FALSE;
@ -934,7 +934,7 @@ GuiSetPalette(IN OUT PFRONTEND This,
static ULONG NTAPI static ULONG NTAPI
GuiGetDisplayMode(IN OUT PFRONTEND This) GuiGetDisplayMode(IN OUT PFRONTEND This)
{ {
PGUI_CONSOLE_DATA GuiData = This->Data; PGUI_CONSOLE_DATA GuiData = This->Context;
ULONG DisplayMode = 0; ULONG DisplayMode = 0;
if (GuiData->GuiInfo.FullScreen) if (GuiData->GuiInfo.FullScreen)
@ -949,7 +949,7 @@ static BOOL NTAPI
GuiSetDisplayMode(IN OUT PFRONTEND This, GuiSetDisplayMode(IN OUT PFRONTEND This,
ULONG NewMode) ULONG NewMode)
{ {
PGUI_CONSOLE_DATA GuiData = This->Data; PGUI_CONSOLE_DATA GuiData = This->Context;
BOOL FullScreen; BOOL FullScreen;
if (NewMode & ~(CONSOLE_FULLSCREEN_MODE | CONSOLE_WINDOWED_MODE)) if (NewMode & ~(CONSOLE_FULLSCREEN_MODE | CONSOLE_WINDOWED_MODE))
@ -972,7 +972,7 @@ static INT NTAPI
GuiShowMouseCursor(IN OUT PFRONTEND This, GuiShowMouseCursor(IN OUT PFRONTEND This,
BOOL Show) BOOL Show)
{ {
PGUI_CONSOLE_DATA GuiData = This->Data; PGUI_CONSOLE_DATA GuiData = This->Context;
if (GuiData->IsWindowVisible) if (GuiData->IsWindowVisible)
{ {
@ -991,7 +991,7 @@ static BOOL NTAPI
GuiSetMouseCursor(IN OUT PFRONTEND This, GuiSetMouseCursor(IN OUT PFRONTEND This,
HCURSOR CursorHandle) HCURSOR CursorHandle)
{ {
PGUI_CONSOLE_DATA GuiData = This->Data; PGUI_CONSOLE_DATA GuiData = This->Context;
/* Do nothing if the window is hidden */ /* Do nothing if the window is hidden */
if (!GuiData->IsWindowVisible) return TRUE; if (!GuiData->IsWindowVisible) return TRUE;
@ -1013,7 +1013,7 @@ GuiMenuControl(IN OUT PFRONTEND This,
UINT CmdIdLow, UINT CmdIdLow,
UINT CmdIdHigh) UINT CmdIdHigh)
{ {
PGUI_CONSOLE_DATA GuiData = This->Data; PGUI_CONSOLE_DATA GuiData = This->Context;
GuiData->CmdIdLow = CmdIdLow ; GuiData->CmdIdLow = CmdIdLow ;
GuiData->CmdIdHigh = CmdIdHigh; GuiData->CmdIdHigh = CmdIdHigh;
@ -1031,7 +1031,7 @@ GuiSetMenuClose(IN OUT PFRONTEND This,
* for more information. * for more information.
*/ */
PGUI_CONSOLE_DATA GuiData = This->Data; PGUI_CONSOLE_DATA GuiData = This->Context;
HMENU hSysMenu = GetSystemMenu(GuiData->hWindow, FALSE); HMENU hSysMenu = GetSystemMenu(GuiData->hWindow, FALSE);
if (hSysMenu == NULL) return FALSE; if (hSysMenu == NULL) return FALSE;
@ -1100,9 +1100,9 @@ GuiLoadFrontEnd(IN OUT PFRONTEND FrontEnd,
GuiInitInfo->IsWindowVisible = ConsoleInitInfo->IsWindowVisible; GuiInitInfo->IsWindowVisible = ConsoleInitInfo->IsWindowVisible;
/* Finally, initialize the frontend structure */ /* Finally, initialize the frontend structure */
FrontEnd->Vtbl = &GuiVtbl; FrontEnd->Vtbl = &GuiVtbl;
FrontEnd->Data = NULL; FrontEnd->Context = NULL;
FrontEnd->OldData = GuiInitInfo; FrontEnd->Context2 = GuiInitInfo;
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
@ -1112,8 +1112,8 @@ GuiUnloadFrontEnd(IN OUT PFRONTEND FrontEnd)
{ {
if (FrontEnd == NULL) return STATUS_INVALID_PARAMETER; if (FrontEnd == NULL) return STATUS_INVALID_PARAMETER;
if (FrontEnd->Data) GuiDeinitFrontEnd(FrontEnd); if (FrontEnd->Context ) GuiDeinitFrontEnd(FrontEnd);
if (FrontEnd->OldData) ConsoleFreeHeap(FrontEnd->OldData); if (FrontEnd->Context2) ConsoleFreeHeap(FrontEnd->Context2);
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }

32
win32ss/user/winsrv/consrv/frontends/terminal.c
View file

@ -230,7 +230,7 @@ ConSrvInitTerminal(IN OUT PTERMINAL Terminal,
/* Initialize the ConSrv terminal */ /* Initialize the ConSrv terminal */
Terminal->Vtbl = &ConSrvTermVtbl; Terminal->Vtbl = &ConSrvTermVtbl;
// Terminal->Console will be initialized by ConDrvRegisterTerminal // Terminal->Console will be initialized by ConDrvRegisterTerminal
Terminal->Data = FrontEnd; /* We store the frontend pointer in the terminal private data */ Terminal->Context = FrontEnd; /* We store the frontend pointer in the terminal private context */
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
@ -239,10 +239,10 @@ NTSTATUS NTAPI
ConSrvDeinitTerminal(IN OUT PTERMINAL Terminal) ConSrvDeinitTerminal(IN OUT PTERMINAL Terminal)
{ {
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
PFRONTEND FrontEnd = Terminal->Data; PFRONTEND FrontEnd = Terminal->Context;
/* Reset the ConSrv terminal */ /* Reset the ConSrv terminal */
Terminal->Data = NULL; Terminal->Context = NULL;
Terminal->Vtbl = NULL; Terminal->Vtbl = NULL;
/* Unload the frontend */ /* Unload the frontend */
@ -263,7 +263,7 @@ ConSrvTermInitTerminal(IN OUT PTERMINAL This,
IN PCONSOLE Console) IN PCONSOLE Console)
{ {
NTSTATUS Status; NTSTATUS Status;
PFRONTEND FrontEnd = This->Data; PFRONTEND FrontEnd = This->Context;
/* Initialize the console pointer for our frontend */ /* Initialize the console pointer for our frontend */
FrontEnd->Console = Console; FrontEnd->Console = Console;
@ -286,7 +286,7 @@ ConSrvTermInitTerminal(IN OUT PTERMINAL This,
static VOID NTAPI static VOID NTAPI
ConSrvTermDeinitTerminal(IN OUT PTERMINAL This) ConSrvTermDeinitTerminal(IN OUT PTERMINAL This)
{ {
PFRONTEND FrontEnd = This->Data; PFRONTEND FrontEnd = This->Context;
FrontEnd->Vtbl->DeinitFrontEnd(FrontEnd); FrontEnd->Vtbl->DeinitFrontEnd(FrontEnd);
} }
@ -304,7 +304,7 @@ ConSrvTermReadStream(IN OUT PTERMINAL This,
IN ULONG NumCharsToRead, IN ULONG NumCharsToRead,
OUT PULONG NumCharsRead OPTIONAL) OUT PULONG NumCharsRead OPTIONAL)
{ {
PFRONTEND FrontEnd = This->Data; PFRONTEND FrontEnd = This->Context;
PCONSRV_CONSOLE Console = FrontEnd->Console; PCONSRV_CONSOLE Console = FrontEnd->Console;
PCONSOLE_INPUT_BUFFER InputBuffer = &Console->InputBuffer; PCONSOLE_INPUT_BUFFER InputBuffer = &Console->InputBuffer;
PUNICODE_STRING ExeName = Parameter; PUNICODE_STRING ExeName = Parameter;
@ -637,7 +637,7 @@ ConSrvTermWriteStream(IN OUT PTERMINAL This,
DWORD Length, DWORD Length,
BOOL Attrib) BOOL Attrib)
{ {
PFRONTEND FrontEnd = This->Data; PFRONTEND FrontEnd = This->Context;
return ConioWriteConsole(FrontEnd, return ConioWriteConsole(FrontEnd,
Buff, Buff,
Buffer, Buffer,
@ -668,7 +668,7 @@ static VOID NTAPI
ConSrvTermDrawRegion(IN OUT PTERMINAL This, ConSrvTermDrawRegion(IN OUT PTERMINAL This,
SMALL_RECT* Region) SMALL_RECT* Region)
{ {
PFRONTEND FrontEnd = This->Data; PFRONTEND FrontEnd = This->Context;
FrontEnd->Vtbl->DrawRegion(FrontEnd, Region); FrontEnd->Vtbl->DrawRegion(FrontEnd, Region);
} }
@ -676,7 +676,7 @@ static BOOL NTAPI
ConSrvTermSetCursorInfo(IN OUT PTERMINAL This, ConSrvTermSetCursorInfo(IN OUT PTERMINAL This,
PCONSOLE_SCREEN_BUFFER ScreenBuffer) PCONSOLE_SCREEN_BUFFER ScreenBuffer)
{ {
PFRONTEND FrontEnd = This->Data; PFRONTEND FrontEnd = This->Context;
return FrontEnd->Vtbl->SetCursorInfo(FrontEnd, ScreenBuffer); return FrontEnd->Vtbl->SetCursorInfo(FrontEnd, ScreenBuffer);
} }
@ -686,7 +686,7 @@ ConSrvTermSetScreenInfo(IN OUT PTERMINAL This,
SHORT OldCursorX, SHORT OldCursorX,
SHORT OldCursorY) SHORT OldCursorY)
{ {
PFRONTEND FrontEnd = This->Data; PFRONTEND FrontEnd = This->Context;
return FrontEnd->Vtbl->SetScreenInfo(FrontEnd, return FrontEnd->Vtbl->SetScreenInfo(FrontEnd,
ScreenBuffer, ScreenBuffer,
OldCursorX, OldCursorX,
@ -696,14 +696,14 @@ ConSrvTermSetScreenInfo(IN OUT PTERMINAL This,
static VOID NTAPI static VOID NTAPI
ConSrvTermResizeTerminal(IN OUT PTERMINAL This) ConSrvTermResizeTerminal(IN OUT PTERMINAL This)
{ {
PFRONTEND FrontEnd = This->Data; PFRONTEND FrontEnd = This->Context;
FrontEnd->Vtbl->ResizeTerminal(FrontEnd); FrontEnd->Vtbl->ResizeTerminal(FrontEnd);
} }
static VOID NTAPI static VOID NTAPI
ConSrvTermSetActiveScreenBuffer(IN OUT PTERMINAL This) ConSrvTermSetActiveScreenBuffer(IN OUT PTERMINAL This)
{ {
PFRONTEND FrontEnd = This->Data; PFRONTEND FrontEnd = This->Context;
FrontEnd->Vtbl->SetActiveScreenBuffer(FrontEnd); FrontEnd->Vtbl->SetActiveScreenBuffer(FrontEnd);
} }
@ -711,7 +711,7 @@ static VOID NTAPI
ConSrvTermReleaseScreenBuffer(IN OUT PTERMINAL This, ConSrvTermReleaseScreenBuffer(IN OUT PTERMINAL This,
IN PCONSOLE_SCREEN_BUFFER ScreenBuffer) IN PCONSOLE_SCREEN_BUFFER ScreenBuffer)
{ {
PFRONTEND FrontEnd = This->Data; PFRONTEND FrontEnd = This->Context;
FrontEnd->Vtbl->ReleaseScreenBuffer(FrontEnd, ScreenBuffer); FrontEnd->Vtbl->ReleaseScreenBuffer(FrontEnd, ScreenBuffer);
} }
@ -719,7 +719,7 @@ static VOID NTAPI
ConSrvTermGetLargestConsoleWindowSize(IN OUT PTERMINAL This, ConSrvTermGetLargestConsoleWindowSize(IN OUT PTERMINAL This,
PCOORD pSize) PCOORD pSize)
{ {
PFRONTEND FrontEnd = This->Data; PFRONTEND FrontEnd = This->Context;
FrontEnd->Vtbl->GetLargestConsoleWindowSize(FrontEnd, pSize); FrontEnd->Vtbl->GetLargestConsoleWindowSize(FrontEnd, pSize);
} }
@ -728,7 +728,7 @@ ConSrvTermSetPalette(IN OUT PTERMINAL This,
HPALETTE PaletteHandle, HPALETTE PaletteHandle,
UINT PaletteUsage) UINT PaletteUsage)
{ {
PFRONTEND FrontEnd = This->Data; PFRONTEND FrontEnd = This->Context;
return FrontEnd->Vtbl->SetPalette(FrontEnd, PaletteHandle, PaletteUsage); return FrontEnd->Vtbl->SetPalette(FrontEnd, PaletteHandle, PaletteUsage);
} }
@ -736,7 +736,7 @@ static INT NTAPI
ConSrvTermShowMouseCursor(IN OUT PTERMINAL This, ConSrvTermShowMouseCursor(IN OUT PTERMINAL This,
BOOL Show) BOOL Show)
{ {
PFRONTEND FrontEnd = This->Data; PFRONTEND FrontEnd = This->Context;
return FrontEnd->Vtbl->ShowMouseCursor(FrontEnd, Show); return FrontEnd->Vtbl->ShowMouseCursor(FrontEnd, Show);
} }

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

@ -327,9 +327,9 @@ TuiConsoleWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
} }
static DWORD NTAPI static DWORD NTAPI
TuiConsoleThread(PVOID Data) TuiConsoleThread(PVOID Param)
{ {
PTUI_CONSOLE_DATA TuiData = (PTUI_CONSOLE_DATA)Data; PTUI_CONSOLE_DATA TuiData = (PTUI_CONSOLE_DATA)Param;
PCONSRV_CONSOLE Console = TuiData->Console; PCONSRV_CONSOLE Console = TuiData->Console;
HWND NewWindow; HWND NewWindow;
MSG msg; MSG msg;
@ -482,7 +482,7 @@ TuiInitFrontEnd(IN OUT PFRONTEND This,
DPRINT1("CONSRV: Failed to create TUI_CONSOLE_DATA\n"); DPRINT1("CONSRV: Failed to create TUI_CONSOLE_DATA\n");
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
} }
// Console->FrontEndIFace.Data = (PVOID)TuiData; // Console->FrontEndIFace.Context = (PVOID)TuiData;
TuiData->Console = Console; TuiData->Console = Console;
TuiData->hWindow = NULL; TuiData->hWindow = NULL;
@ -530,8 +530,8 @@ TuiInitFrontEnd(IN OUT PFRONTEND This,
LeaveCriticalSection(&ActiveVirtConsLock); LeaveCriticalSection(&ActiveVirtConsLock);
/* Finally, initialize the frontend structure */ /* Finally, initialize the frontend structure */
This->Data = TuiData; This->Context = TuiData;
This->OldData = NULL; This->Context2 = NULL;
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
@ -540,7 +540,7 @@ static VOID NTAPI
TuiDeinitFrontEnd(IN OUT PFRONTEND This) TuiDeinitFrontEnd(IN OUT PFRONTEND This)
{ {
// PCONSRV_CONSOLE Console = This->Console; // PCONSRV_CONSOLE Console = This->Console;
PTUI_CONSOLE_DATA TuiData = This->Data; // Console->FrontEndIFace.Data; PTUI_CONSOLE_DATA TuiData = This->Context; // Console->FrontEndIFace.Context;
/* Close the notification window */ /* Close the notification window */
DestroyWindow(TuiData->hWindow); DestroyWindow(TuiData->hWindow);
@ -571,8 +571,8 @@ TuiDeinitFrontEnd(IN OUT PFRONTEND This)
/* Switch to the next console */ /* Switch to the next console */
if (NULL != ActiveConsole) ConioDrawConsole(ActiveConsole->Console); if (NULL != ActiveConsole) ConioDrawConsole(ActiveConsole->Console);
// Console->FrontEndIFace.Data = NULL; // Console->FrontEndIFace.Context = NULL;
This->Data = NULL; This->Context = NULL;
DeleteCriticalSection(&TuiData->Lock); DeleteCriticalSection(&TuiData->Lock);
ConsoleFreeHeap(TuiData); ConsoleFreeHeap(TuiData);
} }
@ -723,7 +723,7 @@ TuiChangeIcon(IN OUT PFRONTEND This,
static HWND NTAPI static HWND NTAPI
TuiGetConsoleWindowHandle(IN OUT PFRONTEND This) TuiGetConsoleWindowHandle(IN OUT PFRONTEND This)
{ {
PTUI_CONSOLE_DATA TuiData = This->Data; PTUI_CONSOLE_DATA TuiData = This->Context;
return TuiData->hWindow; return TuiData->hWindow;
} }
@ -845,9 +845,9 @@ TuiLoadFrontEnd(IN OUT PFRONTEND FrontEnd,
if (!TuiInit(ConsoleInfo->CodePage)) return STATUS_UNSUCCESSFUL; if (!TuiInit(ConsoleInfo->CodePage)) return STATUS_UNSUCCESSFUL;
/* Finally, initialize the frontend structure */ /* Finally, initialize the frontend structure */
FrontEnd->Vtbl = &TuiVtbl; FrontEnd->Vtbl = &TuiVtbl;
FrontEnd->Data = NULL; FrontEnd->Context = NULL;
FrontEnd->OldData = NULL; FrontEnd->Context2 = NULL;
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
@ -856,7 +856,7 @@ NTSTATUS NTAPI
TuiUnloadFrontEnd(IN OUT PFRONTEND FrontEnd) TuiUnloadFrontEnd(IN OUT PFRONTEND FrontEnd)
{ {
if (FrontEnd == NULL) return STATUS_INVALID_PARAMETER; if (FrontEnd == NULL) return STATUS_INVALID_PARAMETER;
if (FrontEnd->Data) TuiDeinitFrontEnd(FrontEnd); if (FrontEnd->Context) TuiDeinitFrontEnd(FrontEnd);
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }

2
win32ss/user/winsrv/consrv/include/conio.h
View file

@ -273,7 +273,7 @@ struct _TERMINAL
{ {
PTERMINAL_VTBL Vtbl; /* Virtual table */ PTERMINAL_VTBL Vtbl; /* Virtual table */
struct _CONSOLE* Console; /* Console to which the terminal is attached to */ struct _CONSOLE* Console; /* Console to which the terminal is attached to */
PVOID Data; /* Private data */ PVOID Context; /* Private context */
}; };
/* /*

4
win32ss/user/winsrv/consrv/include/conio_winsrv.h
View file

@ -117,8 +117,8 @@ struct _FRONTEND
NTSTATUS (NTAPI *UnloadFrontEnd)(IN OUT PFRONTEND This); NTSTATUS (NTAPI *UnloadFrontEnd)(IN OUT PFRONTEND This);
struct _CONSRV_CONSOLE* Console; /* Console to which the frontend is attached to */ struct _CONSRV_CONSOLE* Console; /* Console to which the frontend is attached to */
PVOID Data; /* Private data */ PVOID Context; /* Private context */
PVOID OldData; /* Reserved */ PVOID Context2; /* Private context */
}; };
/* PauseFlags values (internal only) */ /* PauseFlags values (internal only) */