projects
/
reactos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[CONSRV]: Rename context members with a more explicit name (code "style" only).
[reactos.git]
/
win32ss
/
user
/
winsrv
/
consrv
/
frontends
/
tui
/
tuiterm.c
diff --git
a/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c
b/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c
index
a14a6d6
..
1f4f8e4
100644
(file)
--- a/
win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c
+++ b/
win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c
@@
-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;
HWND NewWindow;
MSG msg;
PCONSRV_CONSOLE Console = TuiData->Console;
HWND NewWindow;
MSG msg;
@@
-482,7
+482,7
@@
TuiInitFrontEnd(IN OUT PFRONTEND This,
DPRINT1("CONSRV: Failed to create TUI_CONSOLE_DATA\n");
return STATUS_UNSUCCESSFUL;
}
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;
TuiData->Console = Console;
TuiData->hWindow = NULL;
@@
-530,8
+530,8
@@
TuiInitFrontEnd(IN OUT PFRONTEND This,
LeaveCriticalSection(&ActiveVirtConsLock);
/* Finally, initialize the frontend structure */
LeaveCriticalSection(&ActiveVirtConsLock);
/* Finally, initialize the frontend structure */
- This->
Data
= TuiData;
- This->
OldData
= NULL;
+ This->
Context
= TuiData;
+ This->
Context2
= NULL;
return STATUS_SUCCESS;
}
return STATUS_SUCCESS;
}
@@
-540,7
+540,7
@@
static VOID NTAPI
TuiDeinitFrontEnd(IN OUT PFRONTEND This)
{
// PCONSRV_CONSOLE Console = This->Console;
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);
/* Close the notification window */
DestroyWindow(TuiData->hWindow);
@@
-571,8
+571,8
@@
TuiDeinitFrontEnd(IN OUT PFRONTEND This)
/* Switch to the next console */
if (NULL != ActiveConsole) ConioDrawConsole(ActiveConsole->Console);
/* 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);
}
DeleteCriticalSection(&TuiData->Lock);
ConsoleFreeHeap(TuiData);
}
@@
-723,7
+723,7
@@
TuiChangeIcon(IN OUT PFRONTEND This,
static HWND NTAPI
TuiGetConsoleWindowHandle(IN OUT PFRONTEND This)
{
static HWND NTAPI
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;
/* Finally, initialize the frontend structure */
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;
}
return STATUS_SUCCESS;
}
@@
-856,7
+856,7
@@
NTSTATUS NTAPI
TuiUnloadFrontEnd(IN OUT PFRONTEND FrontEnd)
{
if (FrontEnd == NULL) return STATUS_INVALID_PARAMETER;
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;
}
return STATUS_SUCCESS;
}