Author: hbelusca
Date: Sun Dec 14 18:05:50 2014
New Revision: 65644
URL: http://svn.reactos.org/svn/reactos?rev=65644&view=rev
Log:
[CONSRV]: Add PCONSRV_CONSOLE --> PCONSOLE casts (needed *on purpose*).
Modified:
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/graphics.c
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/text.c
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c
Modified:
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c?rev=65644&r1=65643&r2=65644&view=diff
==============================================================================
---
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c
[iso-8859-1] (original)
+++
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c
[iso-8859-1] Sun Dec 14 18:05:50 2014
@@ -288,7 +288,7 @@
DPRINT("Menu item ID: %d\n", CmdId);
- if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return;
+ if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING,
TRUE)) return;
er.EventType = MENU_EVENT;
er.Event.MenuEvent.dwCommandId = CmdId;
@@ -753,7 +753,7 @@
PCONSRV_CONSOLE Console = GuiData->Console;
INPUT_RECORD er;
- if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return;
+ if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING,
TRUE)) return;
er.EventType = FOCUS_EVENT;
er.Event.FocusEvent.bSetFocus = SetFocus;
@@ -1151,7 +1151,7 @@
PCONSRV_CONSOLE Console = GuiData->Console;
PCONSOLE_SCREEN_BUFFER ActiveBuffer;
- if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return;
+ if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING,
TRUE)) return;
ActiveBuffer = GuiData->ActiveBuffer;
@@ -1321,7 +1321,7 @@
SetTimer(GuiData->hWindow, CONGUI_UPDATE_TIMER, CURSOR_BLINK_TIME, NULL);
- if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return;
+ if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING,
TRUE)) return;
Buff = GuiData->ActiveBuffer;
@@ -1423,7 +1423,7 @@
{
PCONSRV_CONSOLE Console = GuiData->Console;
- if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE))
+ if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE))
return TRUE;
// TODO: Prompt for termination ? (Warn the user about possible apps
running in this console)
@@ -1525,7 +1525,7 @@
goto Quit;
}
- if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE))
+ if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE))
{
Err = TRUE;
goto Quit;
@@ -1856,7 +1856,7 @@
DWORD windx, windy;
UINT WidthUnit, HeightUnit;
- if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return;
+ if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING,
TRUE)) return;
ActiveBuffer = GuiData->ActiveBuffer;
@@ -1888,7 +1888,7 @@
/* Do nothing if the window is hidden */
if (!GuiData->IsWindowVisible) return;
- if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return;
+ if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING,
TRUE)) return;
if ((GuiData->WindowSizeLock == FALSE) &&
(wParam == SIZE_RESTORED || wParam == SIZE_MAXIMIZED || wParam ==
SIZE_MINIMIZED))
@@ -1998,7 +1998,7 @@
int old_pos, Maximum;
PSHORT pShowXY;
- if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return 0;
+ if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING,
TRUE)) return 0;
Buff = GuiData->ActiveBuffer;
Modified:
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c?rev=65644&r1=65643&r2=65644&view=diff
==============================================================================
---
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c
[iso-8859-1] (original)
+++
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c
[iso-8859-1] Sun Dec 14 18:05:50 2014
@@ -177,7 +177,7 @@
PCONSRV_CONSOLE Console = GuiData->Console;
BOOL FullScreen;
- if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return;
+ if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING,
TRUE)) return;
/* Switch to full-screen or to windowed mode */
FullScreen = !GuiData->GuiInfo.FullScreen;
Modified:
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/graphics.c
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/graphics.c?rev=65644&r1=65643&r2=65644&view=diff
==============================================================================
---
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/graphics.c
[iso-8859-1] (original)
+++
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/graphics.c
[iso-8859-1] Sun Dec 14 18:05:50 2014
@@ -131,7 +131,7 @@
if (Buffer->BitMap == NULL) return;
- if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return;
+ if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING,
TRUE)) return;
rcFramebuffer->left = Buffer->ViewOrigin.X * 1 + rcView->left;
rcFramebuffer->top = Buffer->ViewOrigin.Y * 1 + rcView->top;
Modified:
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c?rev=65644&r1=65643&r2=65644&view=diff
==============================================================================
---
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c
[iso-8859-1] (original)
+++
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c
[iso-8859-1] Sun Dec 14 18:05:50 2014
@@ -238,7 +238,7 @@
DPRINT("GuiConsoleShowConsoleProperties entered\n");
- if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return;
+ if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING,
TRUE)) return;
/*
* Create a memory section to share with the applet, and map it.
@@ -429,7 +429,7 @@
PTERMINAL_INFO TermInfo = NULL;
PGUI_CONSOLE_INFO GuiInfo = NULL;
- if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return;
+ if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING,
TRUE)) return;
/* Get the console leader process, our client */
ProcessData = ConSrvGetConsoleLeaderProcess(Console);
@@ -575,7 +575,7 @@
SIZE_T Length;
#endif
- if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return;
+ if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING,
TRUE)) return;
/* Get the console leader process, our client */
ProcessData = ConSrvGetConsoleLeaderProcess(Console);
Modified:
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/text.c
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/text.c?rev=65644&r1=65643&r2=65644&view=diff
==============================================================================
--- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/text.c
[iso-8859-1] (original)
+++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/text.c
[iso-8859-1] Sun Dec 14 18:05:50 2014
@@ -354,7 +354,7 @@
if (Buffer->Buffer == NULL) return;
- if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return;
+ if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING,
TRUE)) return;
rcFramebuffer->left = Buffer->ViewOrigin.X * GuiData->CharWidth +
rcView->left;
rcFramebuffer->top = Buffer->ViewOrigin.Y * GuiData->CharHeight +
rcView->top;
Modified:
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c?rev=65644&r1=65643&r2=65644&view=diff
==============================================================================
---
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 18:05:50 2014
@@ -291,7 +291,7 @@
}
#endif
- if (ConDrvValidateConsoleUnsafe(ActiveConsole->Console,
CONSOLE_RUNNING, TRUE))
+ if (ConDrvValidateConsoleUnsafe((PCONSOLE)ActiveConsole->Console,
CONSOLE_RUNNING, TRUE))
{
MSG Message;
Message.hwnd = hWnd;
@@ -307,7 +307,7 @@
case WM_ACTIVATE:
{
- if (ConDrvValidateConsoleUnsafe(ActiveConsole->Console,
CONSOLE_RUNNING, TRUE))
+ if (ConDrvValidateConsoleUnsafe((PCONSOLE)ActiveConsole->Console,
CONSOLE_RUNNING, TRUE))
{
if (LOWORD(wParam) != WA_INACTIVE)
{
