Changeset 42228 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video

Timestamp:

Jul 19, 2012 12:55:52 PM (13 years ago)

Author:

vboxsync

Message:

wddm: more autoresize fixes, etc.

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm

Files:

• VBoxMPVidPn.cpp (modified) (6 diffs)
• VBoxMPWddm.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVidPn.cpp

@@ -1319 +1319 @@
                         {
                             Status = pNewVidPnTargetModeSetInterface->pfnAddMode(hNewVidPnTargetModeSet, pNewVidPnTargetModeInfo);
-                            Assert(Status == STATUS_SUCCESS);
                             if (NT_SUCCESS(Status))
                             {
@@ -1326 +1325 @@
                             }
                             else
-                            {
                                 WARN(("pfnAddMode failed, Status 0x%x", Status));
-                            }
                         }
                         else
-                        {
                             WARN(("vboxVidPnPopulateTargetModeInfoFromLegacy failed, Status 0x%x", Status));
-                        }
 
                         NTSTATUS tmpStatus = pNewVidPnTargetModeSetInterface->pfnReleaseModeInfo(hNewVidPnTargetModeSet, pNewVidPnTargetModeInfo);
@@ -1451 +1446 @@
                     D3DKMDT_VIDPN_SOURCE_MODE *pNewVidPnSourceModeInfo;
                     Status = pNewVidPnSourceModeSetInterface->pfnCreateNewModeInfo(hNewVidPnSourceModeSet, &pNewVidPnSourceModeInfo);
-                    Assert(Status == STATUS_SUCCESS);
                     if (NT_SUCCESS(Status))
                     {
@@ -1459 +1453 @@
                         {
                             Status = pNewVidPnSourceModeSetInterface->pfnAddMode(hNewVidPnSourceModeSet, pNewVidPnSourceModeInfo);
-                            Assert(Status == STATUS_SUCCESS);
                             if (NT_SUCCESS(Status))
                             {
@@ -1465 +1458 @@
                                 continue;
                             }
+                            else
+                                WARN(("pfnAddMode failed, Status 0x%x", Status));
                         }
 
@@ -1470 +1465 @@
                         Assert(tmpStatus == STATUS_SUCCESS);
                     }
+                    else
+                        WARN(("pfnCreateNewModeInfo failed, Status 0x%x", Status));
                     /* we're here because of an error */
                     Assert(!NT_SUCCESS(Status));
-                    break;
+                    /* ignore mode addition failure */
+                    Status = STATUS_SUCCESS;
+                    continue;
                 }
             }

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp

@@ -659 +659 @@
 }
 
-static NTSTATUS vboxWddmChildStatusCheck(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_VIDEOMODES_INFO paInfos)
+static NTSTATUS vboxWddmChildStatusCheckByMask(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_VIDEOMODES_INFO paInfos, uint8_t *pMask)
 {
     NTSTATUS Status = STATUS_SUCCESS;
@@ -665 +665 @@
     int i;
 
-    Assert(!bChanged[0]);
     for (i = 0; i < VBoxCommonFromDeviceExt(pDevExt)->cDisplays; ++i)
     {
+        if (pMask && !ASMBitTest(pMask, i))
+            continue;
+
         /* @todo: check that we actually need the current source->target */
         PVBOXWDDM_VIDEOMODES_INFO pInfo = &paInfos[i];
@@ -4150 +4152 @@
                 WARN(("VBOXESC_REINITVIDEOMODESBYMASK should be called instead"));
                 PVBOXWDDM_VIDEOMODES_INFO pInfos = VBoxWddmUpdateAllVideoModesInfos(pDevExt);
-                Status = vboxWddmChildStatusCheck(pDevExt, pInfos);
+                Status = vboxWddmChildStatusCheckByMask(pDevExt, pInfos, NULL);
                 if (!NT_SUCCESS(Status))
                 {
-                    WARN(("vboxWddmChildStatusCheck failed, Status 0x%x", Status));
+                    WARN(("vboxWddmChildStatusCheckByMask failed, Status 0x%x", Status));
                 }
                 break;
@@ -4176 +4178 @@
                 if (fCheckDisplayRecconect)
                 {
-                    Status = vboxWddmChildStatusCheck(pDevExt, pInfos);
+                    Status = vboxWddmChildStatusCheckByMask(pDevExt, pInfos, pData->ScreenMask);
                     if (!NT_SUCCESS(Status))
                     {
-                        WARN(("vboxWddmChildStatusCheck failed, Status 0x%x", Status));
+                        WARN(("vboxWddmChildStatusCheckByMask failed, Status 0x%x", Status));
                     }
                 }