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

Timestamp:

Jun 7, 2016 5:01:38 PM (9 years ago)

Author:

vboxsync

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

107887

Message:

3D: Get rid of deprecated gdi32!D3DKMTInvalidateActiveVidPn for Win7 and up (bugref:8244).

File:

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

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

@@ -1341 +1341 @@
     }
 
+/*  The code below was commented out because VBOXESC_UPDATEMODES should not cause (un)plugging virtual displays.
     winEr =  vboxDispIfWaitDisplayDataInited(pOp);
     if (winEr != NO_ERROR)
         WARN(("VBoxTray: (WDDM) Failed vboxDispIfWaitDisplayDataInited winEr %d\n", winEr));
-
+*/
     return winEr;
 }
@@ -1379 +1380 @@
 static DWORD vboxDispIfResizePerform(PCVBOXDISPIF const pIf, UINT iChangedMode, BOOL fEnable, BOOL fExtDispSup, DISPLAY_DEVICE *paDisplayDevices, DEVMODE *paDeviceModes, UINT cDevModes)
 {
+    LogFunc((" ENTER"));
     DWORD winEr;
+
     if (pIf->enmMode > VBOXDISPIF_MODE_WDDM)
     {
@@ -1392 +1395 @@
             WARN(("VBoxTray: (WDDM) Failed vboxDispIfWddmResizeDisplayVista winEr %d\n", winEr));
     }
+
+    LogFunc((" LEAVE"));
     return winEr;
 }
@@ -1399 +1404 @@
     DWORD winEr = NO_ERROR;
 
-    Log(("VBoxTray: vboxDispIfResizeModesWDDM iChanged %d cDevModes %d\n", iChangedMode, cDevModes));
+    Log(("VBoxTray: vboxDispIfResizeModesWDDM iChanged %d cDevModes %d fEnable %d fExtDispSup %d\n", iChangedMode, cDevModes, fEnable, fExtDispSup));
     VBoxRrRetryStop();
 
@@ -1430 +1435 @@
     }
 
-    D3DKMT_INVALIDATEACTIVEVIDPN DdiData = {0};
-
-    DdiData.hAdapter = Op.Adapter.hAdapter;
-    DdiData.pPrivateDriverData = &VidPnData;
-    DdiData.PrivateDriverDataSize = sizeof (VidPnData);
-
-    NTSTATUS Status = Op.pIf->modeData.wddm.KmtCallbacks.pfnD3DKMTInvalidateActiveVidPn(&DdiData);
-    LogFunc(("InvalidateActiveVidPn 0x%08x\n", Status));
+/*  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.
+    On Vista D3DKMTInvalidateActiveVidPn is still required. TBD: Get rid of it. */  
+    if (Op.pIf->enmMode < VBOXDISPIF_MODE_WDDM_W7)
+    {
+        D3DKMT_INVALIDATEACTIVEVIDPN DdiData = {0};
+
+        DdiData.hAdapter = Op.Adapter.hAdapter;
+        DdiData.pPrivateDriverData = &VidPnData;
+        DdiData.PrivateDriverDataSize = sizeof (VidPnData);
+
+        NTSTATUS Status;
+        Status = Op.pIf->modeData.wddm.KmtCallbacks.pfnD3DKMTInvalidateActiveVidPn(&DdiData);
+        LogFunc(("D3DKMTInvalidateActiveVidPn returned %d)\n", Status));
+    }
 
     /* Resize displays always to keep the display layout because
@@ -1451 +1463 @@
             Size.cx = paDeviceModes[iChangedMode].dmPelsWidth;
             Size.cy = paDeviceModes[iChangedMode].dmPelsHeight;
+            LogFunc(("Calling vboxDispIfUpdateModesWDDM to change target %d mode to (%d x %d)\n", iChangedMode, Size.cx, Size.cy));
             winEr = vboxDispIfUpdateModesWDDM(&Op, iChangedMode, &Size);
+            LogFunc(("vboxDispIfUpdateModesWDDM returned %d\n", winEr));
+
             if (winEr != NO_ERROR)
                 WARN(("vboxDispIfUpdateModesWDDM failed %d\n", winEr));
@@ -1460 +1475 @@
             winEr = vboxDispIfResizePerform(pIf, i, fEnable, fExtDispSup, paDisplayDevices, paDeviceModes, cDevModes);
 
+            LogFunc(("vboxDispIfResizePerform returned %d\n", winEr));
+
             if (winEr == ERROR_RETRY)
             {
                 VBoxRrRetrySchedule(pIf, i, fEnable, fExtDispSup, paDisplayDevices, paDeviceModes, cDevModes);
-                /* just pretend everything is fine so far */
+
                 winEr = NO_ERROR;
             }