Changeset 28264 in vbox for trunk/src/VBox/Additions/WINNT/Graphics

Timestamp:

Apr 13, 2010 4:01:51 PM (15 years ago)

Author:

vboxsync

Message:

VideoModeSupported for multimonitor. (xTracker 4655)

Location:

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

Files:

• Helper.cpp (modified) (2 diffs)
• Helper.h (modified) (1 diff)
• VBoxVideo.cpp (modified) (6 diffs)

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

@@ -115 +115 @@
 }
 
-BOOLEAN vboxLikesVideoMode(uint32_t width, uint32_t height, uint32_t bpp)
+BOOLEAN vboxLikesVideoMode(uint32_t display, uint32_t width, uint32_t height, uint32_t bpp)
 {
     BOOLEAN bRC = FALSE;
 
-    VMMDevVideoModeSupportedRequest *req = NULL;
-
-    int rc = VbglGRAlloc((VMMDevRequestHeader**)&req, sizeof(VMMDevVideoModeSupportedRequest), VMMDevReq_VideoModeSupported);
+    VMMDevVideoModeSupportedRequest2 *req2 = NULL;
+
+    int rc = VbglGRAlloc((VMMDevRequestHeader**)&req2, sizeof(VMMDevVideoModeSupportedRequest2), VMMDevReq_VideoModeSupported2);
     if (RT_FAILURE(rc))
     {
@@ -132 +132 @@
     else
     {
-        req->width  = width;
-        req->height = height;
-        req->bpp    = bpp;
-        rc = VbglGRPerform(&req->header);
-        if (RT_SUCCESS(rc))
-        {
-            bRC = req->fSupported;
+        req2->display = display;
+        req2->width  = width;
+        req2->height = height;
+        req2->bpp    = bpp;
+        rc = VbglGRPerform(&req2->header);
+        if (RT_SUCCESS(rc) && RT_SUCCESS(req2->header.rc))
+        {
+            bRC = req2->fSupported;
         }
         else
         {
-            dprintf(("VBoxVideo::vboxLikesVideoMode: ERROR querying video mode supported status from VMMDev."
-                     "rc = %Rrc\n", rc));
-        }
-        VbglGRFree(&req->header);
+            /* Retry using old inteface. */
+            AssertCompile(sizeof(VMMDevVideoModeSupportedRequest2) >= sizeof(VMMDevVideoModeSupportedRequest));
+            VMMDevVideoModeSupportedRequest *req = (VMMDevVideoModeSupportedRequest *)req2;
+            req->header.size        = sizeof(VMMDevVideoModeSupportedRequest);
+            req->header.version     = VMMDEV_REQUEST_HEADER_VERSION;
+            req->header.requestType = VMMDevReq_VideoModeSupported;
+            req->header.rc          = VERR_GENERAL_FAILURE;
+            req->header.reserved1   = 0;
+            req->header.reserved2   = 0;
+            req->width  = width;
+            req->height = height;
+            req->bpp    = bpp;
+
+            rc = VbglGRPerform(&req->header);
+            if (RT_SUCCESS(rc) && RT_SUCCESS(req->header.rc))
+            {
+                bRC = req->fSupported;
+            }
+            else
+            {
+                dprintf(("VBoxVideo::vboxLikesVideoMode: ERROR querying video mode supported status from VMMDev."
+                         "rc = %Rrc\n", rc));
+            }
+        }
+        VbglGRFree(&req2->header);
     }
 

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

@@ -36 +36 @@
 {
 BOOLEAN vboxQueryDisplayRequest(uint32_t *xres, uint32_t *yres, uint32_t *bpp, uint32_t *pDisplayId);
-BOOLEAN vboxLikesVideoMode(uint32_t width, uint32_t height, uint32_t bpp);
+BOOLEAN vboxLikesVideoMode(uint32_t display, uint32_t width, uint32_t height, uint32_t bpp);
 ULONG vboxGetHeightReduction();
 BOOLEAN vboxQueryPointerPos(uint16_t *pointerXPos, uint16_t *pointerYPos);

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

@@ -483 +483 @@
 
         /* does the host like that mode? */
-        if (!vboxLikesVideoMode(resolutionMatrix[matrixIndex].xRes, resolutionMatrix[matrixIndex].yRes - yOffset, 8))
+        if (!vboxLikesVideoMode(DeviceExtension->iDevice, resolutionMatrix[matrixIndex].xRes, resolutionMatrix[matrixIndex].yRes - yOffset, 8))
         {
             ++matrixIndex;
@@ -545 +545 @@
 
         /* does the host like that mode? */
-        if (!vboxLikesVideoMode(resolutionMatrix[matrixIndex].xRes, resolutionMatrix[matrixIndex].yRes - yOffset, 16))
+        if (!vboxLikesVideoMode(DeviceExtension->iDevice, resolutionMatrix[matrixIndex].xRes, resolutionMatrix[matrixIndex].yRes - yOffset, 16))
         {
             ++matrixIndex;
@@ -605 +605 @@
 
         /* does the host like that mode? */
-        if (!vboxLikesVideoMode(resolutionMatrix[matrixIndex].xRes, resolutionMatrix[matrixIndex].yRes - yOffset, 24))
+        if (!vboxLikesVideoMode(DeviceExtension->iDevice, resolutionMatrix[matrixIndex].xRes, resolutionMatrix[matrixIndex].yRes - yOffset, 24))
         {
             ++matrixIndex;
@@ -665 +665 @@
 
         /* does the host like that mode? */
-        if (!vboxLikesVideoMode(resolutionMatrix[matrixIndex].xRes, resolutionMatrix[matrixIndex].yRes - yOffset, 32))
+        if (!vboxLikesVideoMode(DeviceExtension->iDevice, resolutionMatrix[matrixIndex].xRes, resolutionMatrix[matrixIndex].yRes - yOffset, 32))
         {
             ++matrixIndex;
@@ -749 +749 @@
 
         /* third test: does the host like the video mode? */
-        if (!vboxLikesVideoMode(xres, yres, bpp))
+        if (!vboxLikesVideoMode(DeviceExtension->iDevice, xres, yres, bpp))
             break;
 
@@ -981 +981 @@
 
         /* does the host like that mode? */
-        if (vboxLikesVideoMode(xres, yres, bpp))
+        if (vboxLikesVideoMode(DeviceExtension->iDevice, xres, yres, bpp))
         {
             /* we must have a valid video mode by now and it must fit within the VRAM */