Changeset 73698 in vbox

Timestamp:

Aug 15, 2018 5:12:09 PM (7 years ago)

Author:

vboxsync

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

124375

Message:

VMMDev: Reporting only updated mode hints in multimonitor display change request, bugref:8444

File:

• trunk/src/VBox/Devices/VMMDev/VMMDev.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -1554 +1554 @@
     if (pReq->eventAck == VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST)
     {
+        uint32_t cDisplaysOut = 0;
         /* Remember which resolution the client has queried, subsequent reads
          * will return the same values. */
@@ -1561 +1562 @@
 
             pDCR->lastReadDisplayChangeRequest = pDCR->displayChangeRequest;
-            pDCR->fPending = false;
-        }
-
+
+            if (pDCR->fPending)
+            {
+                if (cDisplaysOut < cDisplays)
+                    pReq->aDisplays[cDisplaysOut] = pDCR->lastReadDisplayChangeRequest;
+
+                cDisplaysOut++;
+                pDCR->fPending = false;
+            }
+        }
+
+        pReq->cDisplays = cDisplaysOut;
         pThis->displayChangeData.fGuestSentChangeEventAck = true;
     }
-
-    /* Fill the guest request with monitor layout data. */
-    for (i = 0; i < cDisplays; ++i)
-    {
-        /* If not a response to a VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST, just
-         * read the last valid video mode hint. This happens when the guest X server
-         * determines the initial mode. */
-        DISPLAYCHANGEREQUEST const *pDCR = &pThis->displayChangeData.aRequests[i];
-        VMMDevDisplayDef const *pDisplayDef = pThis->displayChangeData.fGuestSentChangeEventAck ?
-                                                  &pDCR->lastReadDisplayChangeRequest :
-                                                  &pDCR->displayChangeRequest;
-        pReq->aDisplays[i] = *pDisplayDef;
+    else
+    {
+        /* Fill the guest request with monitor layout data. */
+        for (i = 0; i < cDisplays; ++i)
+        {
+            /* If not a response to a VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST, just
+             * read the last valid video mode hint. This happens when the guest X server
+             * determines the initial mode. */
+            DISPLAYCHANGEREQUEST const *pDCR = &pThis->displayChangeData.aRequests[i];
+            VMMDevDisplayDef const *pDisplayDef = pThis->displayChangeData.fGuestSentChangeEventAck ?
+                &pDCR->lastReadDisplayChangeRequest :
+                &pDCR->displayChangeRequest;
+            pReq->aDisplays[i] = *pDisplayDef;
+        }
     }