[hbelusca] 65653: [CONSRV]: Rename context members with a more explicit name (code "style" only).
Author: hbelusca Date: Sun Dec 14 21:51:32 2014 New Revision: 65653
URL: http://svn.reactos.org/svn/reactos?rev=65653&view=rev Log: [CONSRV]: Rename context members with a more explicit name (code "style" only).
Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h
Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user/... ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] Sun Dec 14 21:51:32 2014 @@ -64,8 +64,6 @@ } else if (Buffer->Header.Type == SCREEN_BUFFER) { - // TODO: Free Buffer->Data - /* Free the palette handle */ if (Buffer->PaletteHandle != NULL) DeleteObject(Buffer->PaletteHandle);
Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user/... ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Sun Dec 14 21:51:32 2014 @@ -138,9 +138,9 @@ CreateSysMenu(HWND hWnd);
static DWORD NTAPI -GuiConsoleInputThread(PVOID Data) -{ - PHANDLE GraphicsStartupEvent = (PHANDLE)Data; +GuiConsoleInputThread(PVOID Param) +{ + PHANDLE GraphicsStartupEvent = (PHANDLE)Param; LONG WindowCount = 0; MSG msg;
@@ -348,12 +348,12 @@ PGUI_CONSOLE_DATA GuiData; GUI_CONSOLE_INFO TermInfo;
- if (This == NULL || Console == NULL || This->OldData == NULL) + if (This == NULL || Console == NULL || This->Context2 == NULL) return STATUS_INVALID_PARAMETER;
ASSERT(This->Console == Console);
- GuiInitInfo = This->OldData; + GuiInitInfo = This->Context2;
if (GuiInitInfo->ConsoleInfo == NULL || GuiInitInfo->ConsoleStartInfo == NULL) return STATUS_INVALID_PARAMETER; @@ -368,7 +368,7 @@ DPRINT1("CONSRV: Failed to create GUI_CONSOLE_DATA\n"); return STATUS_UNSUCCESSFUL; } - ///// /* HACK */ Console->FrontEndIFace.Data = (PVOID)GuiData; /* HACK */ + ///// /* HACK */ Console->FrontEndIFace.Context = (PVOID)GuiData; /* HACK */ GuiData->Console = Console; GuiData->ActiveBuffer = Console->ActiveBuffer; GuiData->hWindow = NULL; @@ -472,9 +472,9 @@ // TODO: Retrieve the selection mode via the registry.
/* Finally, finish to initialize the frontend structure */ - This->Data = GuiData; - if (This->OldData) ConsoleFreeHeap(This->OldData); - This->OldData = NULL; + This->Context = GuiData; + if (This->Context2) ConsoleFreeHeap(This->Context2); + This->Context2 = NULL;
/* * We need to wait until the GUI has been fully initialized @@ -512,7 +512,7 @@ static VOID NTAPI 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"); PostThreadMessageW(dwInputThreadId, PM_DESTROY_CONSOLE, 0, (LPARAM)GuiData); @@ -534,7 +534,7 @@ DestroyIcon(GuiData->hIconSm); }
- This->Data = NULL; + This->Context = NULL; DeleteCriticalSection(&GuiData->Lock); ConsoleFreeHeap(GuiData);
@@ -545,7 +545,7 @@ GuiDrawRegion(IN OUT PFRONTEND This, SMALL_RECT* Region) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context;
/* Do nothing if the window is hidden */ if (!GuiData->IsWindowVisible) return; @@ -562,7 +562,7 @@ PWCHAR Buffer, UINT Length) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; PCONSOLE_SCREEN_BUFFER Buff; SHORT CursorEndX, CursorEndY; RECT ScrollRect; @@ -619,7 +619,7 @@ /* static */ VOID NTAPI GuiRingBell(IN OUT PFRONTEND This) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context;
/* Emit an error beep sound */ SendNotifyMessage(GuiData->hWindow, PM_CONSOLE_BEEP, 0, 0); @@ -629,7 +629,7 @@ GuiSetCursorInfo(IN OUT PFRONTEND This, PCONSOLE_SCREEN_BUFFER Buff) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context;
/* Do nothing if the window is hidden */ if (!GuiData->IsWindowVisible) return TRUE; @@ -648,7 +648,7 @@ SHORT OldCursorX, SHORT OldCursorY) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context;
/* Do nothing if the window is hidden */ if (!GuiData->IsWindowVisible) return TRUE; @@ -667,7 +667,7 @@ static VOID NTAPI 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 */ PostMessageW(GuiData->hWindow, PM_RESIZE_TERMINAL, 0, 0); @@ -676,7 +676,7 @@ static VOID NTAPI GuiSetActiveScreenBuffer(IN OUT PFRONTEND This) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; PCONSOLE_SCREEN_BUFFER ActiveBuffer; HPALETTE hPalette;
@@ -720,7 +720,7 @@ GuiReleaseScreenBuffer(IN OUT PFRONTEND This, 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 @@ -767,7 +767,7 @@ static VOID NTAPI 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 */ SetConWndConsoleLeaderCID(GuiData); @@ -789,7 +789,7 @@ static VOID NTAPI 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); SetWindowText(GuiData->hWindow, GuiData->Console->Title.Buffer); } @@ -798,7 +798,7 @@ GuiChangeIcon(IN OUT PFRONTEND This, HICON IconHandle) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; HICON hIcon, hIconSm;
if (IconHandle == NULL) @@ -842,7 +842,7 @@ static HWND NTAPI GuiGetConsoleWindowHandle(IN OUT PFRONTEND This) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; return GuiData->hWindow; }
@@ -850,7 +850,7 @@ GuiGetLargestConsoleWindowSize(IN OUT PFRONTEND This, PCOORD pSize) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; PCONSOLE_SCREEN_BUFFER ActiveBuffer; RECT WorkArea; LONG width, height; @@ -893,7 +893,7 @@ GuiGetSelectionInfo(IN OUT PFRONTEND This, PCONSOLE_SELECTION_INFO pSelectionInfo) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context;
if (pSelectionInfo == NULL) return FALSE;
@@ -909,7 +909,7 @@ HPALETTE PaletteHandle, UINT PaletteUsage) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; HPALETTE OldPalette;
// if (GetType(GuiData->ActiveBuffer) != GRAPHICS_BUFFER) return FALSE; @@ -934,7 +934,7 @@ static ULONG NTAPI GuiGetDisplayMode(IN OUT PFRONTEND This) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; ULONG DisplayMode = 0;
if (GuiData->GuiInfo.FullScreen) @@ -949,7 +949,7 @@ GuiSetDisplayMode(IN OUT PFRONTEND This, ULONG NewMode) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; BOOL FullScreen;
if (NewMode & ~(CONSOLE_FULLSCREEN_MODE | CONSOLE_WINDOWED_MODE)) @@ -972,7 +972,7 @@ GuiShowMouseCursor(IN OUT PFRONTEND This, BOOL Show) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context;
if (GuiData->IsWindowVisible) { @@ -991,7 +991,7 @@ GuiSetMouseCursor(IN OUT PFRONTEND This, HCURSOR CursorHandle) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context;
/* Do nothing if the window is hidden */ if (!GuiData->IsWindowVisible) return TRUE; @@ -1013,7 +1013,7 @@ UINT CmdIdLow, UINT CmdIdHigh) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context;
GuiData->CmdIdLow = CmdIdLow ; GuiData->CmdIdHigh = CmdIdHigh; @@ -1031,7 +1031,7 @@ * for more information. */
- PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; HMENU hSysMenu = GetSystemMenu(GuiData->hWindow, FALSE);
if (hSysMenu == NULL) return FALSE; @@ -1100,9 +1100,9 @@ GuiInitInfo->IsWindowVisible = ConsoleInitInfo->IsWindowVisible;
/* Finally, initialize the frontend structure */ - FrontEnd->Vtbl = &GuiVtbl; - FrontEnd->Data = NULL; - FrontEnd->OldData = GuiInitInfo; + FrontEnd->Vtbl = &GuiVtbl; + FrontEnd->Context = NULL; + FrontEnd->Context2 = GuiInitInfo;
return STATUS_SUCCESS; } @@ -1112,8 +1112,8 @@ { if (FrontEnd == NULL) return STATUS_INVALID_PARAMETER;
- if (FrontEnd->Data) GuiDeinitFrontEnd(FrontEnd); - if (FrontEnd->OldData) ConsoleFreeHeap(FrontEnd->OldData); + if (FrontEnd->Context ) GuiDeinitFrontEnd(FrontEnd); + if (FrontEnd->Context2) ConsoleFreeHeap(FrontEnd->Context2);
return STATUS_SUCCESS; }
Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user/... ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c [iso-8859-1] Sun Dec 14 21:51:32 2014 @@ -230,7 +230,7 @@ /* Initialize the ConSrv terminal */ Terminal->Vtbl = &ConSrvTermVtbl; // 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; } @@ -239,10 +239,10 @@ ConSrvDeinitTerminal(IN OUT PTERMINAL Terminal) { NTSTATUS Status = STATUS_SUCCESS; - PFRONTEND FrontEnd = Terminal->Data; + PFRONTEND FrontEnd = Terminal->Context;
/* Reset the ConSrv terminal */ - Terminal->Data = NULL; + Terminal->Context = NULL; Terminal->Vtbl = NULL;
/* Unload the frontend */ @@ -263,7 +263,7 @@ IN PCONSOLE Console) { NTSTATUS Status; - PFRONTEND FrontEnd = This->Data; + PFRONTEND FrontEnd = This->Context;
/* Initialize the console pointer for our frontend */ FrontEnd->Console = Console; @@ -286,7 +286,7 @@ static VOID NTAPI ConSrvTermDeinitTerminal(IN OUT PTERMINAL This) { - PFRONTEND FrontEnd = This->Data; + PFRONTEND FrontEnd = This->Context; FrontEnd->Vtbl->DeinitFrontEnd(FrontEnd); }
@@ -304,7 +304,7 @@ IN ULONG NumCharsToRead, OUT PULONG NumCharsRead OPTIONAL) { - PFRONTEND FrontEnd = This->Data; + PFRONTEND FrontEnd = This->Context; PCONSRV_CONSOLE Console = FrontEnd->Console; PCONSOLE_INPUT_BUFFER InputBuffer = &Console->InputBuffer; PUNICODE_STRING ExeName = Parameter; @@ -637,7 +637,7 @@ DWORD Length, BOOL Attrib) { - PFRONTEND FrontEnd = This->Data; + PFRONTEND FrontEnd = This->Context; return ConioWriteConsole(FrontEnd, Buff, Buffer, @@ -668,7 +668,7 @@ ConSrvTermDrawRegion(IN OUT PTERMINAL This, SMALL_RECT* Region) { - PFRONTEND FrontEnd = This->Data; + PFRONTEND FrontEnd = This->Context; FrontEnd->Vtbl->DrawRegion(FrontEnd, Region); }
@@ -676,7 +676,7 @@ ConSrvTermSetCursorInfo(IN OUT PTERMINAL This, PCONSOLE_SCREEN_BUFFER ScreenBuffer) { - PFRONTEND FrontEnd = This->Data; + PFRONTEND FrontEnd = This->Context; return FrontEnd->Vtbl->SetCursorInfo(FrontEnd, ScreenBuffer); }
@@ -686,7 +686,7 @@ SHORT OldCursorX, SHORT OldCursorY) { - PFRONTEND FrontEnd = This->Data; + PFRONTEND FrontEnd = This->Context; return FrontEnd->Vtbl->SetScreenInfo(FrontEnd, ScreenBuffer, OldCursorX, @@ -696,14 +696,14 @@ static VOID NTAPI ConSrvTermResizeTerminal(IN OUT PTERMINAL This) { - PFRONTEND FrontEnd = This->Data; + PFRONTEND FrontEnd = This->Context; FrontEnd->Vtbl->ResizeTerminal(FrontEnd); }
static VOID NTAPI ConSrvTermSetActiveScreenBuffer(IN OUT PTERMINAL This) { - PFRONTEND FrontEnd = This->Data; + PFRONTEND FrontEnd = This->Context; FrontEnd->Vtbl->SetActiveScreenBuffer(FrontEnd); }
@@ -711,7 +711,7 @@ ConSrvTermReleaseScreenBuffer(IN OUT PTERMINAL This, IN PCONSOLE_SCREEN_BUFFER ScreenBuffer) { - PFRONTEND FrontEnd = This->Data; + PFRONTEND FrontEnd = This->Context; FrontEnd->Vtbl->ReleaseScreenBuffer(FrontEnd, ScreenBuffer); }
@@ -719,7 +719,7 @@ ConSrvTermGetLargestConsoleWindowSize(IN OUT PTERMINAL This, PCOORD pSize) { - PFRONTEND FrontEnd = This->Data; + PFRONTEND FrontEnd = This->Context; FrontEnd->Vtbl->GetLargestConsoleWindowSize(FrontEnd, pSize); }
@@ -728,7 +728,7 @@ HPALETTE PaletteHandle, UINT PaletteUsage) { - PFRONTEND FrontEnd = This->Data; + PFRONTEND FrontEnd = This->Context; return FrontEnd->Vtbl->SetPalette(FrontEnd, PaletteHandle, PaletteUsage); }
@@ -736,7 +736,7 @@ ConSrvTermShowMouseCursor(IN OUT PTERMINAL This, BOOL Show) { - PFRONTEND FrontEnd = This->Data; + PFRONTEND FrontEnd = This->Context; return FrontEnd->Vtbl->ShowMouseCursor(FrontEnd, Show); }
Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user/... ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c [iso-8859-1] Sun Dec 14 21:51:32 2014 @@ -327,9 +327,9 @@ }
static DWORD NTAPI -TuiConsoleThread(PVOID Data) -{ - PTUI_CONSOLE_DATA TuiData = (PTUI_CONSOLE_DATA)Data; +TuiConsoleThread(PVOID Param) +{ + PTUI_CONSOLE_DATA TuiData = (PTUI_CONSOLE_DATA)Param; PCONSRV_CONSOLE Console = TuiData->Console; HWND NewWindow; MSG msg; @@ -482,7 +482,7 @@ DPRINT1("CONSRV: Failed to create TUI_CONSOLE_DATA\n"); return STATUS_UNSUCCESSFUL; } - // Console->FrontEndIFace.Data = (PVOID)TuiData; + // Console->FrontEndIFace.Context = (PVOID)TuiData; TuiData->Console = Console; TuiData->hWindow = NULL;
@@ -530,8 +530,8 @@ LeaveCriticalSection(&ActiveVirtConsLock);
/* Finally, initialize the frontend structure */ - This->Data = TuiData; - This->OldData = NULL; + This->Context = TuiData; + This->Context2 = NULL;
return STATUS_SUCCESS; } @@ -540,7 +540,7 @@ TuiDeinitFrontEnd(IN OUT PFRONTEND This) { // 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 */ DestroyWindow(TuiData->hWindow); @@ -571,8 +571,8 @@ /* Switch to the next console */ if (NULL != ActiveConsole) ConioDrawConsole(ActiveConsole->Console);
- // Console->FrontEndIFace.Data = NULL; - This->Data = NULL; + // Console->FrontEndIFace.Context = NULL; + This->Context = NULL; DeleteCriticalSection(&TuiData->Lock); ConsoleFreeHeap(TuiData); } @@ -723,7 +723,7 @@ static HWND NTAPI TuiGetConsoleWindowHandle(IN OUT PFRONTEND This) { - PTUI_CONSOLE_DATA TuiData = This->Data; + PTUI_CONSOLE_DATA TuiData = This->Context; return TuiData->hWindow; }
@@ -845,9 +845,9 @@ if (!TuiInit(ConsoleInfo->CodePage)) return STATUS_UNSUCCESSFUL;
/* Finally, initialize the frontend structure */ - FrontEnd->Vtbl = &TuiVtbl; - FrontEnd->Data = NULL; - FrontEnd->OldData = NULL; + FrontEnd->Vtbl = &TuiVtbl; + FrontEnd->Context = NULL; + FrontEnd->Context2 = NULL;
return STATUS_SUCCESS; } @@ -856,7 +856,7 @@ TuiUnloadFrontEnd(IN OUT PFRONTEND FrontEnd) { if (FrontEnd == NULL) return STATUS_INVALID_PARAMETER; - if (FrontEnd->Data) TuiDeinitFrontEnd(FrontEnd); + if (FrontEnd->Context) TuiDeinitFrontEnd(FrontEnd);
return STATUS_SUCCESS; }
Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user/... ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] Sun Dec 14 21:51:32 2014 @@ -273,7 +273,7 @@ { PTERMINAL_VTBL Vtbl; /* Virtual table */ struct _CONSOLE* Console; /* Console to which the terminal is attached to */ - PVOID Data; /* Private data */ + PVOID Context; /* Private context */ };
/*
Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user/... ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h [iso-8859-1] Sun Dec 14 21:51:32 2014 @@ -117,8 +117,8 @@ NTSTATUS (NTAPI *UnloadFrontEnd)(IN OUT PFRONTEND This);
struct _CONSRV_CONSOLE* Console; /* Console to which the frontend is attached to */ - PVOID Data; /* Private data */ - PVOID OldData; /* Reserved */ + PVOID Context; /* Private context */ + PVOID Context2; /* Private context */ };
/* PauseFlags values (internal only) */
-
hbelusca＠svn.reactos.org