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

Author: hbelusca
Date: Sun Nov  8 02:27:41 2015
New Revision: 69844

URL: http://svn.reactos.org/svn/reactos?rev=69844&view=rev
Log:
[NTVDM]: For now, use the shared Text/GraphicsFramebuffer variables for
console+video/svga. This ambiguity will be fixed later.

Modified:
    trunk/reactos/subsystems/mvdm/ntvdm/console/video.c
    trunk/reactos/subsystems/mvdm/ntvdm/console/video.h
    trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c

Modified: trunk/reactos/subsystems/mvdm/ntvdm/console/video.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cons…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/console/video.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/console/video.c	[iso-8859-1] Sun Nov  8 02:27:41
2015
@@ -631,7 +631,7 @@
 }
 
 BOOL
-VgaConsoleCreateGraphicsScreen(OUT PBYTE* GraphicsFramebuffer,
+VgaConsoleCreateGraphicsScreen(// OUT PBYTE* GraphicsFramebuffer,
                                IN PCOORD Resolution,
                                IN HANDLE PaletteHandle)
 {
@@ -677,11 +677,13 @@
     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 @@
 }
 
 BOOL
-VgaConsoleCreateTextScreen(OUT PCHAR_CELL* TextFramebuffer,
+VgaConsoleCreateTextScreen(// OUT PCHAR_CELL* TextFramebuffer,
                            IN PCOORD Resolution,
                            IN HANDLE PaletteHandle)
 {

Modified: trunk/reactos/subsystems/mvdm/ntvdm/console/video.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cons…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/console/video.h	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/console/video.h	[iso-8859-1] Sun Nov  8 02:27:41
2015
@@ -16,14 +16,14 @@
                            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);
 

Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c	[iso-8859-1] Sun Nov  8
02:27:41 2015
@@ -619,7 +619,7 @@
     {
         /* Enter new text mode */
 
-        if (!VgaConsoleCreateTextScreen(&TextFramebuffer,
+        if (!VgaConsoleCreateTextScreen(// &TextFramebuffer,
                                         Resolution,
                                         TextPaletteHandle))
         {
@@ -640,7 +640,7 @@
     {
         /* Enter graphics mode */
 
-        if (!VgaConsoleCreateGraphicsScreen(&GraphicsFramebuffer,
+        if (!VgaConsoleCreateGraphicsScreen(// &GraphicsFramebuffer,
                                             Resolution,
                                             PaletteHandle))
         {