Author: hbelusca
Date: Sun Dec 14 19:01:52 2014
New Revision: 65649
URL: http://svn.reactos.org/svn/reactos?rev=65649&view=rev
Log:
[CONSRV]: Move ConioDrawConsole to where it should belong.
Modified:
branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c
branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c
branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/input.c
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.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/winsrv/consrv/condrv/conoutput.c?rev=65649&r1=65648&r2=65649&view=diff
==============================================================================
--- 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 19:01:52 2014
@@ -159,20 +159,6 @@
CONSOLE_SCREEN_BUFFER_Destroy(Buffer);
}
-VOID
-ConioDrawConsole(PCONSOLE Console)
-{
- SMALL_RECT Region;
- PCONSOLE_SCREEN_BUFFER ActiveBuffer = Console->ActiveBuffer;
-
- if (ActiveBuffer)
- {
- ConioInitRect(&Region, 0, 0,
- ActiveBuffer->ViewSize.Y - 1, ActiveBuffer->ViewSize.X -
1);
- TermDrawRegion(Console, &Region);
- }
-}
-
static VOID
ConioSetActiveScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer)
{
Modified:
branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c?rev=65649&r1=65648&r2=65649&view=diff
==============================================================================
--- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c
[iso-8859-1] (original)
+++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c
[iso-8859-1] Sun Dec 14 19:01:52 2014
@@ -297,7 +297,6 @@
/* Copy buffer contents to screen */
// Terminal.Draw();
- // ConioDrawConsole(Console);
DPRINT("Terminal initialization done\n");
return STATUS_SUCCESS;
Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c?rev=65649&r1=65648&r2=65649&view=diff
==============================================================================
--- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c
[iso-8859-1] (original)
+++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c
[iso-8859-1] Sun Dec 14 19:01:52 2014
@@ -494,7 +494,8 @@
/* Make sure ReadRegion is inside the screen buffer */
ConioInitRect(&ScreenBuffer, 0, 0,
- Buffer->ScreenBufferSize.Y - 1, Buffer->ScreenBufferSize.X -
1);
+ Buffer->ScreenBufferSize.Y - 1,
+ Buffer->ScreenBufferSize.X - 1);
if (!ConioGetIntersection(&CapturedReadRegion, &ScreenBuffer,
&CapturedReadRegion))
{
/*
@@ -557,7 +558,8 @@
/* Make sure WriteRegion is inside the screen buffer */
ConioInitRect(&ScreenBuffer, 0, 0,
- Buffer->ScreenBufferSize.Y - 1, Buffer->ScreenBufferSize.X -
1);
+ Buffer->ScreenBufferSize.Y - 1,
+ Buffer->ScreenBufferSize.X - 1);
if (!ConioGetIntersection(&CapturedWriteRegion, &ScreenBuffer,
&CapturedWriteRegion))
{
/*
@@ -625,7 +627,8 @@
/* Make sure WriteRegion is inside the screen buffer */
ConioInitRect(&ScreenBuffer, 0, 0,
- Buffer->ScreenBufferSize.Y - 1, Buffer->ScreenBufferSize.X -
1);
+ Buffer->ScreenBufferSize.Y - 1,
+ Buffer->ScreenBufferSize.X - 1);
if (!ConioGetIntersection(&CapturedWriteRegion, &ScreenBuffer,
&CapturedWriteRegion))
{
/*
@@ -1154,7 +1157,8 @@
/* Make sure the source rectangle is inside the screen buffer */
ConioInitRect(&ScreenBuffer, 0, 0,
- Buffer->ScreenBufferSize.Y - 1, Buffer->ScreenBufferSize.X -
1);
+ Buffer->ScreenBufferSize.Y - 1,
+ Buffer->ScreenBufferSize.X - 1);
if (!ConioGetIntersection(&SrcRegion, &ScreenBuffer, ScrollRectangle))
{
return STATUS_SUCCESS;
Modified:
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/input.c
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/input.c?rev=65649&r1=65648&r2=65649&view=diff
==============================================================================
--- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/input.c
[iso-8859-1] (original)
+++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/input.c
[iso-8859-1] Sun Dec 14 19:01:52 2014
@@ -71,7 +71,7 @@
INPUT_RECORD er;
- if (NULL == Console)
+ if (Console == NULL)
{
DPRINT1("No Active Console!\n");
return;
@@ -169,7 +169,7 @@
}
}
- ConioDrawConsole((PCONSOLE)Console);
+ ConioDrawConsole(Console);
return;
}
Modified:
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c?rev=65649&r1=65648&r2=65649&view=diff
==============================================================================
--- 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 19:01:52 2014
@@ -649,6 +649,21 @@
+VOID
+ConioDrawConsole(PCONSRV_CONSOLE Console)
+{
+ SMALL_RECT Region;
+ PCONSOLE_SCREEN_BUFFER ActiveBuffer = Console->ActiveBuffer;
+
+ if (!ActiveBuffer) return;
+
+ ConioInitRect(&Region, 0, 0,
+ ActiveBuffer->ViewSize.Y - 1,
+ ActiveBuffer->ViewSize.X - 1);
+ TermDrawRegion(Console, &Region);
+ // Console->FrontEndIFace.Vtbl->DrawRegion(&Console->FrontEndIFace,
&Region);
+}
+
static VOID NTAPI
ConSrvTermDrawRegion(IN OUT PTERMINAL This,
SMALL_RECT* Region)
Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h?rev=65649&r1=65648&r2=65649&view=diff
==============================================================================
--- 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 19:01:52 2014
@@ -347,7 +347,6 @@
/* conoutput.c */
PCHAR_INFO ConioCoordToPointer(PTEXTMODE_SCREEN_BUFFER Buff, ULONG X, ULONG Y);
-VOID ConioDrawConsole(PCONSOLE /*PCONSRV_CONSOLE*/ Console);
NTSTATUS ConioResizeBuffer(PCONSOLE /*PCONSRV_CONSOLE*/ Console,
PTEXTMODE_SCREEN_BUFFER ScreenBuffer,
COORD Size);
Modified:
branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h?rev=65649&r1=65648&r2=65649&view=diff
==============================================================================
---
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 19:01:52 2014
@@ -2,7 +2,8 @@
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS Console Server DLL
* FILE: consrv/include/conio_winsrv.h
- * PURPOSE: Public Console I/O Interface
+ * PURPOSE: Public Console I/O Interface - Offers wrap-up structures
+ * over the console objects exposed by the console driver.
* PROGRAMMERS: Gé van Geldorp
* Jeffrey Morlan
* Hermes Belusca-Maito ([email protected])
@@ -217,9 +218,11 @@
/* conoutput.c */
PCHAR_INFO ConioCoordToPointer(PTEXTMODE_SCREEN_BUFFER Buff, ULONG X, ULONG Y);
-VOID ConioDrawConsole(PCONSOLE /*PCONSRV_CONSOLE*/ Console);
NTSTATUS ConioResizeBuffer(PCONSOLE /*PCONSRV_CONSOLE*/ Console,
PTEXTMODE_SCREEN_BUFFER ScreenBuffer,
COORD Size);
+/* terminal.c */
+VOID ConioDrawConsole(PCONSRV_CONSOLE Console);
+
/* EOF */
