Changeset 69201 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray

Timestamp:

Oct 24, 2017 11:50:08 AM (7 years ago)

Author:

vboxsync

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

118512

Message:

Additions/win/vboxtray: Code cleanup in VBoxDisplay service, step 2.

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• VBoxDispIf.cpp (modified) (2 diffs)
• VBoxDisplay.cpp (modified) (1 diff)

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

@@ -1472 +1472 @@
     }
 
-    VBOXWDDM_RECOMMENDVIDPN VidPnData;
-
-    memset(&VidPnData, 0, sizeof (VidPnData));
-
-    uint32_t cElements = 0;
-
-    for (uint32_t i = 0; i < cDevModes; ++i)
-    {
-        if ((i == iChangedMode) ? fEnable : (paDisplayDevices[i].StateFlags & DISPLAY_DEVICE_ACTIVE))
-        {
-            VidPnData.aSources[cElements].Size.cx = paDeviceModes[i].dmPelsWidth;
-            VidPnData.aSources[cElements].Size.cy = paDeviceModes[i].dmPelsHeight;
-            VidPnData.aTargets[cElements].iSource = cElements;
-            ++cElements;
-        }
-        else
-            VidPnData.aTargets[cElements].iSource = -1;
-    }
-
 /*  The pfnD3DKMTInvalidateActiveVidPn was deprecated since Win7 and causes deadlocks since Win10 TH2.
     Instead, the VidPn Manager can replace an old VidPn as soon as SetDisplayConfig or ChangeDisplaySettingsEx will try to set a new display mode.
@@ -1496 +1477 @@
     if (Op.pIf->enmMode < VBOXDISPIF_MODE_WDDM_W7)
     {
-        D3DKMT_INVALIDATEACTIVEVIDPN DdiData = {0};
-
-        DdiData.hAdapter = Op.Adapter.hAdapter;
-        DdiData.pPrivateDriverData = &VidPnData;
-        DdiData.PrivateDriverDataSize = sizeof (VidPnData);
+        D3DKMT_INVALIDATEACTIVEVIDPN ddiArgInvalidateVidPN;
+        VBOXWDDM_RECOMMENDVIDPN vboxRecommendVidPN;
+
+        memset(&ddiArgInvalidateVidPN, 0, sizeof(ddiArgInvalidateVidPN));
+        memset(&vboxRecommendVidPN, 0, sizeof(vboxRecommendVidPN));
+
+        uint32_t cElements = 0;
+
+        for (uint32_t i = 0; i < cDevModes; ++i)
+        {
+            if ((i == iChangedMode) ? fEnable : (paDisplayDevices[i].StateFlags & DISPLAY_DEVICE_ACTIVE))
+            {
+                vboxRecommendVidPN.aSources[cElements].Size.cx = paDeviceModes[i].dmPelsWidth;
+                vboxRecommendVidPN.aSources[cElements].Size.cy = paDeviceModes[i].dmPelsHeight;
+                vboxRecommendVidPN.aTargets[cElements].iSource = cElements;
+                ++cElements;
+            }
+            else
+                vboxRecommendVidPN.aTargets[cElements].iSource = -1;
+        }
+
+        ddiArgInvalidateVidPN.hAdapter = Op.Adapter.hAdapter;
+        ddiArgInvalidateVidPN.pPrivateDriverData = &vboxRecommendVidPN;
+        ddiArgInvalidateVidPN.PrivateDriverDataSize = sizeof (vboxRecommendVidPN);
 
         NTSTATUS Status;
-        Status = Op.pIf->modeData.wddm.KmtCallbacks.pfnD3DKMTInvalidateActiveVidPn(&DdiData);
+        Status = Op.pIf->modeData.wddm.KmtCallbacks.pfnD3DKMTInvalidateActiveVidPn(&ddiArgInvalidateVidPN);
         LogFunc(("D3DKMTInvalidateActiveVidPn returned %d)\n", Status));
     }

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

@@ -726 +726 @@
     }
 
-#ifdef VBOX_WITH_WDDM
     if (enmDriverType == VBOXDISPLAY_DRIVER_TYPE_WDDM)
     {
-        LogFlowFunc(("Request to resize the displa\n"));
         DWORD err = VBoxDispIfResizeModes(&pCtx->pEnv->dispIf, Id, fEnabled, fExtDispSup, paDisplayDevices, paDeviceModes, DevNum);
-        if (err != ERROR_RETRY)
-        {
-            if (err == NO_ERROR)
-                LogFlowFunc(("VBoxDispIfResizeModes succeeded\n"));
-            else
-               LogFlowFunc(("Failure VBoxDispIfResizeModes (%d)\n", err));
-            return FALSE;
-        }
-
-        LogFlowFunc(("ResizeDisplayDevice: RETRY requested\n"));
-        return TRUE;
-    }
-#endif
-    /* Without this, Windows will not ask the miniport for its
-     * mode table but uses an internal cache instead.
+
+        return (err == ERROR_RETRY);
+    }
+
+    /* The XPDM code path goes below.
+     * Re-requesting modes with EnumDisplaySettings forces Windows to again ask the miniport for its mode table.
      */
     for (i = 0; i < NumDevices; i++)