Changeset 908 in vbox

Timestamp:

Feb 14, 2007 4:10:35 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

18631

Message:

In DevVGA the line width in bytes was incorrectly calculated for non 32 bit video modes.

File:

• trunk/src/VBox/Devices/Graphics/DevVGA.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -153 +153 @@
 DECLINLINE(void) vga_set_dirty(VGAState *pData, RTGCPHYS offVRAM)
 {
-    Assert(offVRAM < pData->vram_size);
+    AssertMsg(offVRAM < pData->vram_size, ("offVRAM = %p, pData->vram_size = %p\n", offVRAM, pData->vram_size));
     ASMBitSet(&pData->au32DirtyBitmap[0], offVRAM >> PAGE_SHIFT);
     pData->fHaveDirtyBits = true;
@@ -168 +168 @@
 DECLINLINE(bool) vga_is_dirty(VGAState *pData, RTGCPHYS offVRAM)
 {
-    Assert(offVRAM < pData->vram_size);
+    AssertMsg(offVRAM < pData->vram_size, ("offVRAM = %p, pData->vram_size = %p\n", offVRAM, pData->vram_size));
     return ASMBitTest(&pData->au32DirtyBitmap[0], offVRAM >> PAGE_SHIFT);
 }
@@ -182 +182 @@
 {
     Assert(offVRAMStart < pData->vram_size);
-    Assert(offVRAMEnd < pData->vram_size);
+    Assert(offVRAMEnd <= pData->vram_size);
     Assert(offVRAMStart < offVRAMEnd);
     ASMBitClearRange(&pData->au32DirtyBitmap[0], offVRAMStart >> PAGE_SHIFT, offVRAMEnd >> PAGE_SHIFT);
@@ -1888 +1888 @@
 #endif
     addr1 = (s->start_addr * 4);
+#ifndef VBOX
     bwidth = width * 4;
+#else /* VBOX */
+    /* The width of VRAM scanline. */
+    bwidth = s->line_offset;
+#endif /* VBOX */ 
     y_start = -1;
     page_min = 0x7fffffff;