Changeset 37165 in vbox for trunk/src/VBox

Timestamp:

May 20, 2011 1:22:01 PM (14 years ago)

Author:

vboxsync

Message:

wddm: fix autoresize

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPVidModes.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPVidModes.cpp

@@ -869 +869 @@
         {
             VBoxFillVidModeInfo(&g_CustomVideoModes[VidPnTargetId], xres, yres, bpp, 1/*index*/, 0);
+            Assert(g_CustomVideoModes[VidPnTargetId].ModeIndex == 1);
         }
     }
@@ -875 +876 @@
     if (g_CustomVideoModes[VidPnTargetId].ModeIndex)
     {
-        if (RT_ELEMENTS(pModes->aModes) == pModes->cModes)
+        if (RT_ELEMENTS(pModes->aModes) > pModes->cModes)
         {
             g_CustomVideoModes[VidPnTargetId].ModeIndex = pModes->cModes;
@@ -903 +904 @@
                 {
                     WARN(("table full, can't add other bpp for specail mode!"));
+#ifdef DEBUG_misha
+                    /* this is definitely something we do not expect */
+                    AssertFailed();
+#endif
                     break;
                 }
+
+                AssertRelease(RT_ELEMENTS(pModes->aModes) > pModes->cModes); /* if not - the driver state is screwed up, @todo: better do KeBugCheckEx here */
 
                 if (pModes->aModes[pModes->iPreferredMode].BitsPerPlane != bpp)
@@ -912 +919 @@
                                         pModes->aModes[pModes->iPreferredMode].VisScreenHeight,
                                         bpp, pModes->cModes, 0);
-                    if (!VBoxMPFindVideoMode(pModes->aModes, pModes->cModes, &pModes->aModes[pModes->cModes]))
+                    if (VBoxMPFindVideoMode(pModes->aModes, pModes->cModes, &pModes->aModes[pModes->cModes]) < 0)
                     {
                         ++pModes->cModes;
@@ -921 +928 @@
         else
         {
+            AssertRelease(RT_ELEMENTS(pModes->aModes) == pModes->cModes); /* if not - the driver state is screwed up, @todo: better do KeBugCheckEx here */
             WARN(("table full, can't add video mode for a host request!"));
+#ifdef DEBUG_misha
+            /* this is definitely something we do not expect */
+            AssertFailed();
+#endif
         }
     }
@@ -931 +943 @@
         {
            WARN(("table full, can't add addl modes!"));
+#ifdef DEBUG_misha
+            /* this is definitely something we do not expect */
+            AssertFailed();
+#endif
            break;
         }
+
+        AssertRelease(RT_ELEMENTS(pModes->aModes) > pModes->cModes); /* if not - the driver state is screwed up, @todo: better do KeBugCheckEx here */
 
         if (!pExt->fAnyX)