Changeset 3064 in vbox for trunk/src

Timestamp:

Jun 6, 2007 12:09:15 PM (18 years ago)

Author:

vboxsync

Message:

Fixed screen corruption when switching DOS window to fullscreen.

File:

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

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

@@ -892 +892 @@
         ret = s->vram_ptr[((addr & ~1) << 1) | plane];
 #else /* VBOX */
-        ret = s->CTXSUFF(vram_ptr)[((addr & ~1) << 1) | plane];
+        /* See the comment for a similar line in vga_mem_writeb. */
+        ret = s->CTXSUFF(vram_ptr)[((addr & ~1) << 2) | plane];
 #endif /* VBOX */
     } else {
@@ -1022 +1023 @@
         mask = (1 << plane);
         if (s->sr[2] & mask) {
+#ifndef VBOX
             addr = ((addr & ~1) << 1) | plane;
+#else
+            /* 'addr' is offset in a plane, bit 0 select the plane. 
+             * Mask the bit 0, convert plane index to vram offset,
+             * that is multiply by the number of planes,
+             * and select the plane byte in the vram offset.
+             */
+            addr = ((addr & ~1) << 2) | plane;
+#endif /* VBOX */
 #ifndef VBOX
             s->vram_ptr[addr] = val;
@@ -1316 +1326 @@
         line_offset = s->cr[0x13];
         line_offset <<= 3;
+#ifdef VBOX
+        if ((s->gr[0x06] & 1) == 0)
+        {
+            /* Text mode. Every second byte of a plane is used. */
+            line_offset *= 2;
+        }
+#endif /* VBOX */
 
         /* starting address */
@@ -1546 +1563 @@
     depth_index = get_depth_index(s->ds->depth);
 #else /* VBOX */
-    cursor_ptr = s->CTXSUFF(vram_ptr) + (s->start_addr + cursor_offset) * 4;
+    cursor_ptr = s->CTXSUFF(vram_ptr) + (s->start_addr + cursor_offset) * 8;
     depth_index = get_depth_index(s->pDrv->cBits);
 #endif /* VBOX */
@@ -1621 +1638 @@
             }
             d1 += x_incr;
+#ifndef VBOX
             src += 4;
+#else
+            src += 8; /* Every second byte of a plane is used in text mode. */
+#endif
+
             ch_attr_ptr++;
         }