Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-06 09:24:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTVDM]: For now, use the shared Text/GraphicsFramebuffer variables for console+video/svga. This ambiguity will be fixed later.

Browse source 
svn path=/trunk/; revision=69844
This commit is contained in:
Hermès Bélusca-Maïto 2015-11-08 02:27:41 +00:00
parent 45a54c5b12
commit 02b0205229
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/subsystems/mvdm/ntvdm/console/video.c
View file

@ -631,7 +631,7 @@ VgaConsoleUpdateTextCursor(BOOL CursorVisible,
}
BOOL
VgaConsoleCreateGraphicsScreen(OUT PBYTE* GraphicsFramebuffer,
VgaConsoleCreateGraphicsScreen(// OUT PBYTE* GraphicsFramebuffer,
IN PCOORD Resolution,
IN HANDLE PaletteHandle)
{
@ -677,11 +677,13 @@ VgaConsoleCreateGraphicsScreen(OUT PBYTE* GraphicsFramebuffer,
if (GraphicsConsoleBuffer == INVALID_HANDLE_VALUE) return FALSE;
/* Save the framebuffer address and mutex */
*GraphicsFramebuffer = GraphicsBufferInfo.lpBitMap;
// *GraphicsFramebuffer = GraphicsBufferInfo.lpBitMap;
GraphicsFramebuffer = GraphicsBufferInfo.lpBitMap;
ConsoleMutex = GraphicsBufferInfo.hMutex;
/* Clear the framebuffer */
RtlZeroMemory(*GraphicsFramebuffer, BitmapInfo->bmiHeader.biSizeImage);
// RtlZeroMemory(*GraphicsFramebuffer, BitmapInfo->bmiHeader.biSizeImage);
RtlZeroMemory(GraphicsFramebuffer, BitmapInfo->bmiHeader.biSizeImage);
/* Set the graphics mode palette */
SetConsolePalette(GraphicsConsoleBuffer,
@ -717,7 +719,7 @@ VOID VgaConsoleDestroyGraphicsScreen(VOID)
}
BOOL
VgaConsoleCreateTextScreen(OUT PCHAR_CELL* TextFramebuffer,
VgaConsoleCreateTextScreen(// OUT PCHAR_CELL* TextFramebuffer,
IN PCOORD Resolution,
IN HANDLE PaletteHandle)
{

4
reactos/subsystems/mvdm/ntvdm/console/video.h
View file

@ -16,14 +16,14 @@ VgaConsoleUpdateTextCursor(BOOL CursorVisible,
WORD Location);
BOOL
VgaConsoleCreateGraphicsScreen(OUT PBYTE* GraphicsFramebuffer,
VgaConsoleCreateGraphicsScreen(// OUT PBYTE* GraphicsFramebuffer,
IN PCOORD Resolution,
IN HANDLE PaletteHandle);
VOID VgaConsoleDestroyGraphicsScreen(VOID);
BOOL
VgaConsoleCreateTextScreen(OUT PCHAR_CELL* TextFramebuffer,
VgaConsoleCreateTextScreen(// OUT PCHAR_CELL* TextFramebuffer,
IN PCOORD Resolution,
IN HANDLE PaletteHandle);

4
reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c
View file

@ -619,7 +619,7 @@ static BOOL VgaEnterNewMode(SCREEN_MODE NewScreenMode, PCOORD Resolution)
{
/* Enter new text mode */
if (!VgaConsoleCreateTextScreen(&TextFramebuffer,
if (!VgaConsoleCreateTextScreen(// &TextFramebuffer,
Resolution,
TextPaletteHandle))
{
@ -640,7 +640,7 @@ static BOOL VgaEnterNewMode(SCREEN_MODE NewScreenMode, PCOORD Resolution)
{
/* Enter graphics mode */
if (!VgaConsoleCreateGraphicsScreen(&GraphicsFramebuffer,
if (!VgaConsoleCreateGraphicsScreen(// &GraphicsFramebuffer,
Resolution,
PaletteHandle))
{