From: Hermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Date: Sun, 8 Nov 2015 02:27:41 +0000 (+0000)
Subject: [NTVDM]: For now, use the shared Text/GraphicsFramebuffer variables for console+video... 
X-Git-Tag: ReactOS-0.4.0~214
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=02b0205229e4e262a9c820ca5da343e99d8a8139

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

svn path=/trunk/; revision=69844
---

diff --git a/reactos/subsystems/mvdm/ntvdm/console/video.c b/reactos/subsystems/mvdm/ntvdm/console/video.c
index 18e7960bece..be2164763a1 100644
--- a/reactos/subsystems/mvdm/ntvdm/console/video.c
+++ b/reactos/subsystems/mvdm/ntvdm/console/video.c
@@ -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)
 {
diff --git a/reactos/subsystems/mvdm/ntvdm/console/video.h b/reactos/subsystems/mvdm/ntvdm/console/video.h
index ceee02b7e8b..c2fdcc8e481 100644
--- a/reactos/subsystems/mvdm/ntvdm/console/video.h
+++ b/reactos/subsystems/mvdm/ntvdm/console/video.h
@@ -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);
 
diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c b/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c
index 78176aa96ba..2cc5572ab90 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c
@@ -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))
         {