Changeset 73724 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDispIf.cpp

Timestamp:

Aug 16, 2018 6:54:12 PM (6 years ago)

Author:

vboxsync

Message:

VMMDev: multimonitor resize for Windows guests, bugref:8444

File:

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

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

@@ -1705 +1705 @@
     VBOXDISPIF_OP Op;
     DWORD winEr = ERROR_SUCCESS;
-    uint32_t id;
+    uint32_t i;
     int iPath;
 
     vboxDispIfOpBegin(pIf, &Op);
 
-    for (id = 0; id < cDispDef; ++id)
-    {
-        pDispDef = &paDispDef[id];
+    for (i = 0; i < cDispDef; ++i)
+    {
+        pDispDef = &paDispDef[i];
 
         if (!(pDispDef->fDisplayFlags & VMMDEV_DISPLAY_DISABLED) &&
@@ -1723 +1723 @@
             Size.cy = pDispDef->cy;
 
-            vboxDispIfUpdateModesWDDM(&Op, id, &Size);
+            vboxDispIfUpdateModesWDDM(&Op, pDispDef->idDisplay, &Size);
         }
     }
@@ -1733 +1733 @@
     vboxDispIfWddmDcCreate(&DispCfg, QDC_ALL_PATHS);
 
-    for (id = 0; id < cDispDef; ++id)
+    for (i = 0; i < cDispDef; ++i)
     {
         DISPLAYCONFIG_PATH_INFO *pPathInfo;
 
-        pDispDef = &paDispDef[id];
-        iPath = vboxDispIfWddmDcSearchPath(&DispCfg, id, id);
+        pDispDef = &paDispDef[i];
+        iPath = vboxDispIfWddmDcSearchPath(&DispCfg, pDispDef->idDisplay, pDispDef->idDisplay);
 
         if (iPath < 0)
         {
-            WARN(("VBoxTray:(WDDM) Unexpected iPath(%d) between src(%d) and tgt(%d)\n", iPath, id, id));
+            WARN(("VBoxTray:(WDDM) Unexpected iPath(%d) between src(%d) and tgt(%d)\n", iPath, pDispDef->idDisplay, pDispDef->idDisplay));
             continue;
         }
@@ -1827 +1827 @@
 
                 *pPathInfo = DispCfg.pPathInfoArray[0];
-                pPathInfo->sourceInfo.id = id;
-                pPathInfo->targetInfo.id = id;
+                pPathInfo->sourceInfo.id = pDispDef->idDisplay;
+                pPathInfo->targetInfo.id = pDispDef->idDisplay;
 
                 pModeInfoNew = &pModeInfo[DispCfg.cModeInfoArray];
                 pModeInfoNew->infoType = DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE;
-                pModeInfoNew->id = id;
+                pModeInfoNew->id = pDispDef->idDisplay;
                 pModeInfoNew->adapterId = pModeInfo[0].adapterId;
                 pSrcMode = &pModeInfoNew->sourceMode;
@@ -1844 +1844 @@
                 pModeInfoNew++;
                 pModeInfoNew->infoType = DISPLAYCONFIG_MODE_INFO_TYPE_TARGET;
-                pModeInfoNew->id = id;
+                pModeInfoNew->id = pDispDef->idDisplay;
                 pModeInfoNew->adapterId = pModeInfo[0].adapterId;
                 pModeInfoNew->targetMode = pModeInfo[0].targetMode;