Changeset 27205 in vbox for trunk/src/VBox/Additions

Timestamp:

Mar 9, 2010 11:11:37 AM (15 years ago)

Author:

vboxsync

Message:

wddm: bugfix

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Miniport

Files:

• Helper.h (modified) (1 diff)
• VBoxVideo.cpp (modified) (1 diff)
• wddm/VBoxVideoWddm.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Helper.h

@@ -88 +88 @@
 extern bool g_bVBoxVDbgBreakFv;
 #define vboxVDbgBreakF() do { if (g_bVBoxVDbgBreakF) AssertBreakpoint(); } while (0)
-#define vboxVDbgBreakFv() do { if (g_bVBoxVDbgBreakF) AssertBreakpoint(); } while (0)
+#define vboxVDbgBreakFv() do { if (g_bVBoxVDbgBreakFv) AssertBreakpoint(); } while (0)
 #else
 #define vboxVDbgBreakF() do { } while (0)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.cpp

@@ -286 +286 @@
         if (!bFound)
         {
+            Assert(g_VBoxWddmNumResolutions < RT_ELEMENTS(g_VBoxWddmVideoResolutions));
             g_VBoxWddmVideoResolutions[g_VBoxWddmNumResolutions].cx = pMode->VisScreenWidth;
             g_VBoxWddmVideoResolutions[g_VBoxWddmNumResolutions].cy = pMode->VisScreenHeight;
+            ++g_VBoxWddmNumResolutions;
         }
     }

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.cpp

@@ -1060 +1060 @@
     dfprintf(("==> "__FUNCTION__ ", MiniportDeviceContext(0x%x)\n", MiniportDeviceContext));
 
-    vboxVDbgBreakF();
+    vboxVDbgBreakFv();
 
     dfprintf(("<== "__FUNCTION__ ", MiniportDeviceContext(0x%x)\n", MiniportDeviceContext));
@@ -1142 +1142 @@
             {
                 /* we are requested to provide the number of segments we support */
-                pQsOut->NbSegment = 1;
-            }
-            else if (pQsOut->NbSegment != 1)
+                pQsOut->NbSegment = 2;
+            }
+            else if (pQsOut->NbSegment != 2)
             {
                 AssertBreakpoint();
@@ -2863 +2863 @@
     dfprintf(("==> "__FUNCTION__ ", hDevice(0x%x)\n", hDevice));
 
-    AssertBreakpoint();
+    vboxVDbgBreakF();
 
     NTSTATUS Status = STATUS_SUCCESS;