Changeset 27992 in vbox

Timestamp:

Apr 5, 2010 7:32:50 PM (15 years ago)

Author:

vboxsync

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

59698

Message:

wddm: bugfix

Location:

trunk/src/VBox/Additions/WINNT

Files:

• Graphics/Miniport/VBoxVideo.cpp (modified) (1 diff)
• VBoxTray/VBoxTray.h (modified) (3 diffs)

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

@@ -1284 +1284 @@
             else
                 Status = STATUS_BUFFER_TOO_SMALL;
+
+            if (i == (uint32_t)iPreferrableMode)
+                iFoundPreferrableMode = cFound;
+
             ++cFound;
-
-            if (i == (uint32_t)iPreferrableMode)
-                iFoundPreferrableMode = i;
-        }
-    }
+        }
+    }
+
+    Assert(iFoundPreferrableMode < 0 || cFound > (uint32_t)iFoundPreferrableMode);
+
     *pcModes = cFound;
     if (piPreferrableMode)
         *piPreferrableMode = iFoundPreferrableMode;
+
     return Status;
 }

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.h

@@ -67 +67 @@
 {
     VBOXDISPIF_MODE enmMode;
-#ifdef VBOXWDDM
     /* with WDDM the approach is to call into WDDM miniport driver via PFND3DKMT API provided by the GDI,
      * The PFND3DKMT is supposed to be used by the OpenGL ICD according to MSDN, so this approach is a bit hacky */
@@ -76 +75 @@
             LONG (WINAPI * pfnChangeDisplaySettingsEx)(LPCSTR lpszDeviceName, LPDEVMODE lpDevMode, HWND hwnd, DWORD dwflags, LPVOID lParam);
         } xpdm;
-
+#ifdef VBOXWDDM
         struct
         {
@@ -89 +88 @@
             PFND3DKMT_INVALIDATEACTIVEVIDPN pfnD3DKMTInvalidateActiveVidPn;
         } wddm;
+#endif
     } modeData;
-#endif
 } VBOXDISPIF, *PVBOXDISPIF;
 typedef const struct VBOXDISPIF *PCVBOXDISPIF;