Changeset 26630 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.cpp

Timestamp:

Feb 18, 2010 3:47:33 PM (15 years ago)

Author:

vboxsync

Message:

wddm: more impl

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.cpp (modified) (6 diffs)

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

@@ -760 +760 @@
         if (DeviceExtension->CurrentMode == 0)
 #else
-        if (!DeviceExtension->cSources || !DeviceExtension->aSources[0].ulFrameBufferSize)
+        if (!DeviceExtension->cSources || !DeviceExtension->aSources[0].pAllocation)
 #endif
         {
@@ -790 +790 @@
         }
 #else
-        if (DeviceExtension->cSources && DeviceExtension->aSources[0].ulFrameBufferSize)
+        if (DeviceExtension->cSources && DeviceExtension->aSources[0].pAllocation)
         {
             if (!xres)
-                xres = DeviceExtension->aSources[0].VisScreenWidth;
+                xres = DeviceExtension->aSources[0].pAllocation->u.SurfInfo.width;
             if (!yres)
-                yres = DeviceExtension->aSources[0].VisScreenHeight;
+                yres = DeviceExtension->aSources[0].pAllocation->u.SurfInfo.height;
             if (!bpp)
-                bpp  = DeviceExtension->aSources[0].BitsPerPlane;
+                bpp  = DeviceExtension->aSources[0].pAllocation->u.SurfInfo.bpp;
         }
 #endif
@@ -824 +824 @@
                 if (DeviceExtension->CurrentMode != 0)
 #else
-                if (DeviceExtension->cSources && DeviceExtension->aSources[0].ulFrameBufferSize)
+                if (DeviceExtension->cSources && DeviceExtension->aSources[0].pAllocation)
 #endif
                 {
@@ -904 +904 @@
                 if (DeviceExtension->CurrentMode == 0)
 #else
-                if (!DeviceExtension->cSources || !DeviceExtension->aSources[0].ulFrameBufferSize)
+                if (!DeviceExtension->cSources || !DeviceExtension->aSources[0].pAllocation)
 #endif
                 {
@@ -2498 +2498 @@
         return TRUE;
     }
-#else
-    Assert(!srcId);
-
-    if (srcId)
-    {
-        dprintf(("VBoxVideo::VBoxVideoSetCurrentMode: Skipping for ? non-primary ? source ? %d\n",
-                srcId));
-        return TRUE;
-    }
-#endif
 
     /* set the mode characteristics */
@@ -2527 +2517 @@
      */
     // VBoxVideoSetGraphicsCap(TRUE);
+#else
+    Assert(!srcId);
+
+    if (srcId)
+    {
+        dprintf(("VBoxVideo::VBoxVideoSetCurrentMode: Skipping for ? non-primary ? source ? %d\n",
+                srcId));
+        return TRUE;
+    }
+
+    /* set the mode characteristics */
+    VBoxVideoCmnPortWriteUshort((PUSHORT)VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_XRES);
+    VBoxVideoCmnPortWriteUshort((PUSHORT)VBE_DISPI_IOPORT_DATA, (USHORT)ModeInfo->pAllocation->u.SurfInfo.width);
+    VBoxVideoCmnPortWriteUshort((PUSHORT)VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_YRES);
+    VBoxVideoCmnPortWriteUshort((PUSHORT)VBE_DISPI_IOPORT_DATA, (USHORT)ModeInfo->pAllocation->u.SurfInfo.height);
+    VBoxVideoCmnPortWriteUshort((PUSHORT)VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_BPP);
+    VBoxVideoCmnPortWriteUshort((PUSHORT)VBE_DISPI_IOPORT_DATA, (USHORT)ModeInfo->pAllocation->u.SurfInfo.bpp);
+    /* enable the mode */
+    VBoxVideoCmnPortWriteUshort((PUSHORT)VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_ENABLE);
+    VBoxVideoCmnPortWriteUshort((PUSHORT)VBE_DISPI_IOPORT_DATA, VBE_DISPI_ENABLED | VBE_DISPI_LFB_ENABLED);
+    /** @todo read from the port to see if the mode switch was successful */
+
+    /* Tell the host that we now support graphics in the additions.
+     * @todo: Keep old behaviour, because VBoxVideoResetDevice is called on every graphics
+     *        mode switch and causes an OFF/ON sequence which is not handled by frontends
+     *        (for example Qt GUI debug build asserts when seamless is being enabled).
+     */
+    // VBoxVideoSetGraphicsCap(TRUE);
+
+#endif
     return TRUE;
 }