Changeset 71070 in vbox for trunk/src/VBox/Additions

Timestamp:

Feb 20, 2018 10:58:41 AM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

120934

Message:

WDDM/VBoxTray: bugref:8444: Cleaning up the code which sends UPDATEMODES sscape.

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDispIf.cpp (modified) (2 diffs)

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

@@ -1512 +1512 @@
      * "the D3DKMTInvalidateActiveVidPn function always resets a multimonitor desktop to the default configuration".
      */
+
+    if (fEnable || RT_BOOL(paDisplayDevices[iChangedMode].StateFlags & DISPLAY_DEVICE_ACTIVE))
+    {
+        RTRECTSIZE Size;
+
+        Size.cx = paDeviceModes[iChangedMode].dmPelsWidth;
+        Size.cy = paDeviceModes[iChangedMode].dmPelsHeight;
+
+        LogFunc(("Calling vboxDispIfUpdateModesWDDM to change target %d mode to (%d x %d)\n", iChangedMode, Size.cx, Size.cy));
+        winEr = vboxDispIfUpdateModesWDDM(&Op, iChangedMode, &Size);
+
+        if (winEr != NO_ERROR)
+            WARN(("vboxDispIfUpdateModesWDDM failed %d\n", winEr));
+    }
+
     for (uint32_t i = 0; i < cDevModes; ++i)
     {
@@ -1521 +1536 @@
                                  RT_BOOL(paDisplayDevices[i].StateFlags & DISPLAY_DEVICE_ACTIVE);
 
-        if (i == iChangedMode && fCurrentEnable)
-        {
-            RTRECTSIZE Size;
-            Size.cx = paDeviceModes[iChangedMode].dmPelsWidth;
-            Size.cy = paDeviceModes[iChangedMode].dmPelsHeight;
-            LogFunc(("Calling vboxDispIfUpdateModesWDDM to change target %d mode to (%d x %d)\n", iChangedMode, Size.cx, Size.cy));
-            winEr = vboxDispIfUpdateModesWDDM(&Op, iChangedMode, &Size);
-            LogFunc(("vboxDispIfUpdateModesWDDM returned %d\n", winEr));
-
-            if (winEr != NO_ERROR)
-                WARN(("vboxDispIfUpdateModesWDDM failed %d\n", winEr));
-        }
-
-        if (winEr == NO_ERROR)
-        {
-            winEr = vboxDispIfResizePerform(pIf, i, fCurrentEnable, fExtDispSup, paDisplayDevices, paDeviceModes, cDevModes);
-
-            LogFunc(("vboxDispIfResizePerform returned %d\n", winEr));
-
-            if (winEr == ERROR_RETRY)
-            {
-                VBoxRrRetrySchedule(pIf, i, fCurrentEnable, fExtDispSup, paDisplayDevices, paDeviceModes, cDevModes);
-
-                winEr = NO_ERROR;
-            }
+        winEr = vboxDispIfResizePerform(pIf, i, fCurrentEnable, fExtDispSup, paDisplayDevices, paDeviceModes, cDevModes);
+
+        LogFunc(("vboxDispIfResizePerform returned %d\n", winEr));
+
+        if (winEr == ERROR_RETRY)
+        {
+            VBoxRrRetrySchedule(pIf, i, fCurrentEnable, fExtDispSup, paDisplayDevices, paDeviceModes, cDevModes);
+
+            winEr = NO_ERROR;
         }
     }