Changeset 18635 in vbox

Timestamp:

Apr 2, 2009 12:51:16 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt: handle large virtual resolutions correctly in VBoxFrameBuffer

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxFrameBuffer.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFrameBuffer.cpp

@@ -386 +386 @@
     bool remind = false;
     bool fallback = false;
+    ulong bitsPerLine = re->bytesPerLine() * 8;
 
     /* check if we support the pixel format and can use the guest VRAM directly */
@@ -413 +414 @@
         if (!fallback)
         {
-            /* QImage only supports 32-bit aligned scan lines */
-            fallback = re->bytesPerLine() !=
-                ((mWdt * re->bitsPerPixel() + 31) / 32) * 4;
-            Assert (!fallback);
-            if (!fallback)
-            {
-                mImg = QImage ((uchar *) re->VRAM(), mWdt, mHgt, format);
-                mPixelFormat = FramebufferPixelFormat_FOURCC_RGB;
-                mUsesGuestVRAM = true;
-            }
+            /* QImage only supports 32-bit aligned scan lines... */
+            Assert ((re->bytesPerLine() & 3) == 0);
+            fallback = ((re->bytesPerLine() & 3) != 0);
+        }
+        if (!fallback)
+        {
+            /* ...and the scan lines ought to be a whole number of pixels. */
+            Assert ((bitsPerLine & (re->bitsPerPixel() - 1)) == 0);
+            fallback = ((bitsPerLine & (re->bitsPerPixel() - 1)) != 0);
+        }
+        if (!fallback)
+        {
+            ulong virtWdt = bitsPerLine / re->bitsPerPixel();
+            mImg = QImage ((uchar *) re->VRAM(), virtWdt, mHgt, format);
+            mPixelFormat = FramebufferPixelFormat_FOURCC_RGB;
+            mUsesGuestVRAM = true;
         }
     }