Changeset 28264 in vbox for trunk/src/VBox/Main

Timestamp:

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

Author:

vboxsync

Message:

VideoModeSupported for multimonitor. (xTracker 4655)

Location:

trunk/src/VBox/Main

Files:

• DisplayImpl.cpp (modified) (1 diff)
• VMMDevInterface.cpp (modified) (2 diffs)

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -2099 +2099 @@
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    if (aScreenId != 0 && aScreenId >= mcMonitors)
+        return E_INVALIDARG;
 
     /* @todo this should be actually done on EMT. */

trunk/src/VBox/Main/VMMDevInterface.cpp

@@ -319 +319 @@
 }
 
-DECLCALLBACK(int) vmmdevVideoModeSupported(PPDMIVMMDEVCONNECTOR pInterface, uint32_t width, uint32_t height,
+DECLCALLBACK(int) vmmdevVideoModeSupported(PPDMIVMMDEVCONNECTOR pInterface, uint32_t display, uint32_t width, uint32_t height,
                                            uint32_t bpp, bool *fSupported)
 {
@@ -326 +326 @@
     if (!fSupported)
         return VERR_INVALID_PARAMETER;
-    IFramebuffer *framebuffer = pDrv->pVMMDev->getParent()->getDisplay()->getFramebuffer();
-    if (framebuffer)
+#ifdef DEBUG_sunlover
+    Log(("vmmdevVideoModeSupported: [%d]: %dx%dx%d\n", display, width, height, bpp));
+#endif
+    IFramebuffer *framebuffer = NULL;
+    LONG xOrigin = 0;
+    LONG yOrigin = 0;
+    HRESULT hrc = pDrv->pVMMDev->getParent()->getDisplay()->GetFramebuffer(display, &framebuffer, &xOrigin, &yOrigin);
+    if (SUCCEEDED(hrc) && framebuffer)
+    {
         framebuffer->VideoModeSupported(width, height, bpp, (BOOL*)fSupported);
+        framebuffer->Release();
+    }
     else
+    {
+#ifdef DEBUG_sunlover
+        Log(("vmmdevVideoModeSupported: hrc %x, framebuffer %p!!!\n", hrc, framebuffer));
+#endif
         *fSupported = true;
+    }
     return VINF_SUCCESS;
 }