Changeset 8433 in vbox

Timestamp:

Apr 28, 2008 4:51:08 PM (17 years ago)

Author:

vboxsync

Message:

Save current video mode parameters to be able to know them when a new mode is being set (Windows guest).

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Miniport

Files:

• VBoxVideo.cpp (modified) (3 diffs)
• VBoxVideo.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.cpp

@@ -569 +569 @@
         {
             if (!xres)
-                xres = VideoModes[DeviceExtension->CurrentMode - 1].VisScreenWidth;
+                xres = DeviceExtension->CurrentModeWidth;
             if (!yres)
-                yres = VideoModes[DeviceExtension->CurrentMode - 1].VisScreenHeight;
+                yres = DeviceExtension->CurrentModeHeight;
             if (!bpp)
             {
-                bpp  = VideoModes[DeviceExtension->CurrentMode - 1].BitsPerPlane;
-#ifdef DEBUG_frank
-                {
-                    int i;
-                    dprintf(("VBoxVideo: using bpp=%d from CurrentMode\n", bpp));
-                    for (i=0; i<MAX_VIDEO_MODES + 2; i++)
-                    {
-                        if (   VideoModes[i].VisScreenWidth
-                            || VideoModes[i].VisScreenHeight
-                            || VideoModes[i].BitsPerPlane)
-                        {
-                            dprintf((" %2d: %4d x %4d @ %2d %s\n",
-                                    i, VideoModes[i].VisScreenWidth,
-                                    VideoModes[i].VisScreenHeight, VideoModes[i].BitsPerPlane,
-                                    i == (DeviceExtension->CurrentMode-1) ? "<==" : ""));
-                        }
-                    }
-                }
-#endif
+                bpp  = DeviceExtension->CurrentModeBPP;
             }
         }
@@ -714 +696 @@
                      xres, yres, bpp));
     }
+#ifdef DEBUG
+    {
+        int i;
+        dprintf(("VBoxVideo: VideoModes (CurrentMode = %d)\n", DeviceExtension->CurrentMode));
+        for (i=0; i<MAX_VIDEO_MODES + 2; i++)
+        {
+            if (   VideoModes[i].VisScreenWidth
+                || VideoModes[i].VisScreenHeight
+                || VideoModes[i].BitsPerPlane)
+            {
+                dprintf((" %2d: %4d x %4d @ %2d\n",
+                        i, VideoModes[i].VisScreenWidth,
+                        VideoModes[i].VisScreenHeight, VideoModes[i].BitsPerPlane));
+            }
+        }
+    }
+#endif
 }
 
@@ -1900 +1899 @@
              ModeInfo->VisScreenHeight, ModeInfo->BitsPerPlane));
 
+    DeviceExtension->CurrentModeWidth  = ModeInfo->VisScreenWidth;
+    DeviceExtension->CurrentModeHeight = ModeInfo->VisScreenHeight;
+    DeviceExtension->CurrentModeBPP    = ModeInfo->BitsPerPlane;
+
     if (DeviceExtension->iDevice > 0)
     {

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.h

@@ -66 +66 @@
 
    ULONG CurrentMode;                          /* Saved information about video modes */
+   ULONG CurrentModeWidth;
+   ULONG CurrentModeHeight;
+   ULONG CurrentModeBPP;
 
    ULONG ulFrameBufferOffset;                  /* The framebuffer position in the VRAM. */