Changeset 72352 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray

Timestamp:

May 26, 2018 12:37:50 PM (7 years ago)

Author:

vboxsync

Message:

Main, VMMDev: implemented IDisplay::SetScreenLayout, VMMDev multimonitor resize request and VBoxManage controlvm setscreenlayout. bugref:8393

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDisplay.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDisplay.cpp

@@ -769 +769 @@
 }
 
+static void doResize(PVBOXDISPLAYCONTEXT pCtx,
+                     uint32_t iDisplay,
+                     uint32_t cx,
+                     uint32_t cy,
+                     uint32_t cBits,
+                     bool     fEnabled,
+                     uint32_t cxOrigin,
+                     uint32_t cyOrigin,
+                     bool     fChangeOrigin)
+{
+    for (;;)
+    {
+        VBOXDISPLAY_DRIVER_TYPE enmDriverType = getVBoxDisplayDriverType(pCtx);
+        if (enmDriverType == VBOXDISPLAY_DRIVER_TYPE_UNKNOWN)
+        {
+            LogFlowFunc(("vboxDisplayDriver is not active\n"));
+            break;
+        }
+
+        if (pCtx->pfnChangeDisplaySettingsEx != 0)
+        {
+            LogFlowFunc(("Detected W2K or later\n"));
+            if (!ResizeDisplayDevice(pCtx,
+                                     iDisplay,
+                                     cx,
+                                     cy,
+                                     cBits,
+                                     fEnabled,
+                                     cxOrigin,
+                                     cyOrigin,
+                                     fChangeOrigin,
+                                     true /*fExtDispSup*/ ))
+            {
+                LogFlowFunc(("ResizeDipspalyDevice return 0\n"));
+                break;
+            }
+
+        }
+        else
+        {
+            LogFlowFunc(("Detected NT\n"));
+            ResizeDisplayDeviceNT4(cx, cy, cBits);
+            break;
+        }
+
+        /* Retry the change a bit later. */
+        RTThreadSleep(1000);
+    }
+}
+
 /**
  * Thread function to wait for and process display change requests.
@@ -821 +871 @@
             {
                 LogFlowFunc(("going to get display change information\n"));
+
+#if 0
+                /* Prototype code which processes the multimonitor resize request. */
+                VMMDevDisplayDef aDisplays[64];
+                uint32_t cDisplays = VBoxDisplayGetCount();
+                rc = VbglR3GetDisplayChangeRequestMulti(cDisplays, &cDisplays, &aDisplays[0], true /* fAck */);
+                if (RT_SUCCESS(rc))
+                {
+                    LogRel(("Got multi resize request %d displays\n", cDisplays));
+
+                    uint32_t i;
+                    for (i = 0; i < cDisplays; ++i)
+                    {
+                        LogRel(("[%d]: %d 0x%02X %d,%d %dx%d %d\n",
+                                 i, aDisplays[i].idDisplay,
+                                 aDisplays[i].fDisplayFlags,
+                                 aDisplays[i].xOrigin,
+                                 aDisplays[i].yOrigin,
+                                 aDisplays[i].cx,
+                                 aDisplays[i].cy,
+                                 aDisplays[i].cBitsPerPixel));
+
+                        doResize(pCtx,
+                                 aDisplays[i].idDisplay,
+                                 (aDisplays[i].fDisplayFlags & VMMDEV_DISPLAY_CX) ? aDisplays[i].cx : 0,
+                                 (aDisplays[i].fDisplayFlags & VMMDEV_DISPLAY_CY) ? aDisplays[i].cy : 0,
+                                 (aDisplays[i].fDisplayFlags & VMMDEV_DISPLAY_BPP) ? aDisplays[i].cBitsPerPixel : 0,
+                                 !RT_BOOL(aDisplays[i].fDisplayFlags & VMMDEV_DISPLAY_DISABLED),
+                                 aDisplays[i].xOrigin,
+                                 aDisplays[i].yOrigin,
+                                 RT_BOOL(aDisplays[i].fDisplayFlags & VMMDEV_DISPLAY_ORIGIN));
+                    }
+
+                    continue; /* Done */
+                }
+                /* Fall back to the single monitor resize request. */
+#endif
 
                 /*
@@ -850 +937 @@
                                  iDisplay, cx, cy, cBits, fEnabled, cxOrigin, cyOrigin, fChangeOrigin));
 
-                    for (;;)
-                    {
-                        VBOXDISPLAY_DRIVER_TYPE enmDriverType = getVBoxDisplayDriverType(pCtx);
-                        if (enmDriverType == VBOXDISPLAY_DRIVER_TYPE_UNKNOWN)
-                        {
-                            LogFlowFunc(("vboxDisplayDriver is not active\n"));
-                            break;
-                        }
-
-                        if (pCtx->pfnChangeDisplaySettingsEx != 0)
-                        {
-                            LogFlowFunc(("Detected W2K or later\n"));
-                            if (!ResizeDisplayDevice(pCtx,
-                                                     iDisplay,
-                                                     cx,
-                                                     cy,
-                                                     cBits,
-                                                     fEnabled,
-                                                     cxOrigin,
-                                                     cyOrigin,
-                                                     fChangeOrigin,
-                                                     true /*fExtDispSup*/ ))
-                            {
-                                LogFlowFunc(("ResizeDipspalyDevice return 0\n"));
-                                break;
-                            }
-
-                        }
-                        else
-                        {
-                            LogFlowFunc(("Detected NT\n"));
-                            ResizeDisplayDeviceNT4(cx, cy, cBits);
-                            break;
-                        }
-
-                        /* Retry the change a bit later. */
-                        RTThreadSleep(1000);
-                    }
+                    doResize(pCtx,
+                             iDisplay,
+                             cx,
+                             cy,
+                             cBits,
+                             fEnabled,
+                             cxOrigin,
+                             cyOrigin,
+                             fChangeOrigin);
                 }
             } // if (fDisplayChangeQueried)