Changeset 72366 in vbox

Timestamp:

May 28, 2018 6:05:06 PM (7 years ago)

Author:

vboxsync

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

122823

Message:

WDDM/VBoxTray: bugref:8444, VMMDevDisplayDef is used instead of VBOXDISPLAY_MODEHINT

Location:

trunk/src/VBox/Additions/WINNT

Files:

• VBoxTray/VBoxDispIf.cpp (modified) (8 diffs)
• VBoxTray/VBoxDisplay.cpp (modified) (1 diff)
• include/VBoxDisplay.h (modified) (1 diff)

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

@@ -1700 +1700 @@
 }
 
-BOOL vboxDispIfWddmResizeDisplayWin7(PCVBOXDISPIF const pIf, uint32_t cModeHints, const VBOXDISPLAY_MODEHINT* paModeHints)
-{
-    const VBOXDISPLAY_MODEHINT* pHint;
+BOOL vboxDispIfWddmResizeDisplayWin7(PCVBOXDISPIF const pIf, uint32_t cDispDef, const VMMDevDisplayDef *paDispDef)
+{
+    const VMMDevDisplayDef* pDispDef;
     VBOXDISPIF_OP Op;
     DWORD winEr = ERROR_SUCCESS;
@@ -1710 +1710 @@
     vboxDispIfOpBegin(pIf, &Op);
 
-    for (id = 0; id < cModeHints; ++id)
-    {
-        pHint = &paModeHints[id];
-
-        if (pHint->fModeHintFlags & VBOXDISPLAY_MODEHINT_ACTIVE)
+    for (id = 0; id < cDispDef; ++id)
+    {
+        pDispDef = &paDispDef[id];
+
+        if (!(pDispDef->fDisplayFlags & VMMDEV_DISPLAY_DISABLED) &&
+             (pDispDef->fDisplayFlags | VMMDEV_DISPLAY_CX) || 
+             (pDispDef->fDisplayFlags | VMMDEV_DISPLAY_CY))
         {
             RTRECTSIZE Size;
 
-            Size.cx = pHint->cx;
-            Size.cy = pHint->cy;
+            Size.cx = pDispDef->cx;
+            Size.cy = pDispDef->cy;
 
             vboxDispIfUpdateModesWDDM(&Op, id, &Size);
@@ -1731 +1733 @@
     vboxDispIfWddmDcCreate(&DispCfg, QDC_ALL_PATHS);
 
-    for (id = 0; id < cModeHints; ++id)
+    for (id = 0; id < cDispDef; ++id)
     {
         DISPLAYCONFIG_PATH_INFO *pPathInfo;
 
-        pHint = &paModeHints[id];
+        pDispDef = &paDispDef[id];
         iPath = vboxDispIfWddmDcSearchPath(&DispCfg, id, id);
 
@@ -1744 +1746 @@
         }
 
-        if (pHint->fModeHintFlags & VBOXDISPLAY_MODEHINT_ACTIVE)
+        if (!(pDispDef->fDisplayFlags & VMMDEV_DISPLAY_DISABLED))
         {
             DISPLAYCONFIG_SOURCE_MODE *pSrcMode;
@@ -1769 +1771 @@
                 pSrcMode->width =
                     pTgtMode->targetVideoSignalInfo.activeSize.cx =
-                    pTgtMode->targetVideoSignalInfo.totalSize.cx  = pHint->cx;
+                    pTgtMode->targetVideoSignalInfo.totalSize.cx  = pDispDef->cx;
 
                 pSrcMode->height =
                     pTgtMode->targetVideoSignalInfo.activeSize.cy =
-                    pTgtMode->targetVideoSignalInfo.totalSize.cy  = pHint->cy;
-
-                pSrcMode->position.x = pHint->xOrigin;
-                pSrcMode->position.y = pHint->yOrigin;
-
-                switch (pHint->cBPP)
+                    pTgtMode->targetVideoSignalInfo.totalSize.cy  = pDispDef->cy;
+
+                pSrcMode->position.x = pDispDef->xOrigin;
+                pSrcMode->position.y = pDispDef->yOrigin;
+
+                switch (pDispDef->cBitsPerPixel)
                 {
                 case 32:
@@ -1793 +1795 @@
                     break;
                 default:
-                    LogRel(("VBoxTray: (WDDM) invalid bpp %d, using 32bpp instead\n", pHint->cBPP));
+                    LogRel(("VBoxTray: (WDDM) invalid bpp %d, using 32bpp instead\n", pDispDef->cBitsPerPixel));
                     pSrcMode->pixelFormat = DISPLAYCONFIG_PIXELFORMAT_32BPP;
                     break;
@@ -1821 +1823 @@
                 pModeInfoNew->adapterId = pModeInfo[0].adapterId;
                 pSrcMode = &pModeInfoNew->sourceMode;
-                pSrcMode->width  = pHint->cx;
-                pSrcMode->height = pHint->cy;
+                pSrcMode->width  = pDispDef->cx;
+                pSrcMode->height = pDispDef->cy;
                 pSrcMode->pixelFormat = DISPLAYCONFIG_PIXELFORMAT_32BPP;
-                pSrcMode->position.x = pHint->xOrigin;
-                pSrcMode->position.y = pHint->yOrigin;
+                pSrcMode->position.x = pDispDef->xOrigin;
+                pSrcMode->position.y = pDispDef->yOrigin;
                 pPathInfo->sourceInfo.modeInfoIdx = DispCfg.cModeInfoArray;
 
@@ -1834 +1836 @@
                 pModeInfoNew->targetMode = pModeInfo[0].targetMode;
                 pTgtMode = &pModeInfoNew->targetMode;
-                pTgtMode->targetVideoSignalInfo.activeSize.cx = pHint->cx;
-                pTgtMode->targetVideoSignalInfo.totalSize.cx  = pHint->cx;
-                pTgtMode->targetVideoSignalInfo.activeSize.cy = pHint->cy;
-                pTgtMode->targetVideoSignalInfo.totalSize.cy  = pHint->cy;
+                pTgtMode->targetVideoSignalInfo.activeSize.cx = 
+                    pTgtMode->targetVideoSignalInfo.totalSize.cx = pDispDef->cx;
+                pTgtMode->targetVideoSignalInfo.activeSize.cy = 
+                    pTgtMode->targetVideoSignalInfo.totalSize.cy  = pDispDef->cy;
                 pPathInfo->targetInfo.modeInfoIdx = DispCfg.cModeInfoArray + 1;
 

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

@@ -892 +892 @@
                                  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));
                     }
+
+                    vboxDispIfWddmResizeDisplayWin7(&pCtx->pEnv->dispIf, cDisplays, &aDisplays[0]);
 
                     continue; /* Done */

trunk/src/VBox/Additions/WINNT/include/VBoxDisplay.h

@@ -20 +20 @@
 #include <iprt/types.h>
 #include <iprt/assert.h>
-
-typedef enum
-{
-    VBOXDISPLAY_MODEHINT_ACTIVE = 0x00000001,
-    VBOXDISPLAY_MODEHINT_PRIMARY = 0x00000002,
-    VBOXDISPLAY_MODEHINT_MASK = 0x00000003
-} VBOXDISPLAY_MODEHINT_FLAGS;
-
-typedef struct _VBOXDISPLAY_MODEHINT
-{
-    uint32_t idTarget;
-    int32_t xOrigin;
-    int32_t yOrigin;
-    uint32_t cx;
-    uint32_t cy;
-    uint32_t cBPP;
-    VBOXDISPLAY_MODEHINT_FLAGS fModeHintFlags;
-} VBOXDISPLAY_MODEHINT;
 
 #define VBOXESC_SETVISIBLEREGION            0xABCD9001