Changeset 91763 in vbox

Timestamp:

Oct 15, 2021 2:15:30 PM (3 years ago)

Author:

vboxsync

Message:

3D/VMSVGA: Fix for primary display position in VBoxTray.exe for VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST, bugref:10120

File:

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

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

@@ -1781 +1781 @@
     uint32_t i;
 
+    /* SetDisplayConfig assumes the top-left corner of a primary display at (0, 0) position */
+    const VMMDevDisplayDef* paDispDefPrimary = NULL;
+
+    for (i = 0; i < cDispDef; ++i)
+    {
+        pDispDef = &paDispDef[i];
+
+        if (RT_BOOL(pDispDef->fDisplayFlags & VMMDEV_DISPLAY_PRIMARY))
+        {
+            paDispDefPrimary = pDispDef;
+            break;
+        }
+    }
+
     VBOXDISPIF_OP Op;
     DWORD winEr = vboxDispIfOpBegin(pIf, &Op);
@@ -1876 +1890 @@
                 if (pDispDef->fDisplayFlags & VMMDEV_DISPLAY_ORIGIN)
                 {
-                    pSrcMode->position.x = pDispDef->xOrigin;
-                    pSrcMode->position.y = pDispDef->yOrigin;
+                    pSrcMode->position.x = pDispDef->xOrigin - (paDispDefPrimary ? paDispDefPrimary->xOrigin : 0);
+                    pSrcMode->position.y = pDispDef->yOrigin - (paDispDefPrimary ? paDispDefPrimary->yOrigin : 0);
                 }
 
@@ -1980 +1994 @@
                 if (pDispDef->fDisplayFlags & VMMDEV_DISPLAY_ORIGIN)
                 {
-                    pSrcModeInfo->sourceMode.position.x = pDispDef->xOrigin;
-                    pSrcModeInfo->sourceMode.position.y = pDispDef->yOrigin;
+                    pSrcModeInfo->sourceMode.position.x = pDispDef->xOrigin - (paDispDefPrimary ? paDispDefPrimary->xOrigin : 0);
+                    pSrcModeInfo->sourceMode.position.y = pDispDef->yOrigin - (paDispDefPrimary ? paDispDefPrimary->yOrigin : 0);
                 }