Changeset 43286 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp

Timestamp:

Sep 11, 2012 9:36:15 AM (12 years ago)

Author:

vboxsync

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

80697

Message:

wddm: fix assertions & warnings

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp (modified) (2 diffs)

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

@@ -1954 +1954 @@
 #endif
             {
-            Assert (pQueryAdapterInfo->OutputDataSize >= sizeof (VBOXWDDM_QI));
-            if (pQueryAdapterInfo->OutputDataSize >= sizeof (VBOXWDDM_QI))
-            {
-                VBOXWDDM_QI * pQi = (VBOXWDDM_QI*)pQueryAdapterInfo->pOutputData;
-                memset (pQi, 0, sizeof (VBOXWDDM_QI));
-                pQi->u32Version = VBOXVIDEOIF_VERSION;
-                pQi->cInfos = VBoxCommonFromDeviceExt(pDevExt)->cDisplays;
+                Assert (pQueryAdapterInfo->OutputDataSize >= sizeof (VBOXWDDM_QI));
+                if (pQueryAdapterInfo->OutputDataSize >= sizeof (VBOXWDDM_QI))
+                {
+                    VBOXWDDM_QI * pQi = (VBOXWDDM_QI*)pQueryAdapterInfo->pOutputData;
+                    memset (pQi, 0, sizeof (VBOXWDDM_QI));
+                    pQi->u32Version = VBOXVIDEOIF_VERSION;
+                    pQi->cInfos = VBoxCommonFromDeviceExt(pDevExt)->cDisplays;
 #ifdef VBOX_WITH_VIDEOHWACCEL
-                for (int i = 0; i < VBoxCommonFromDeviceExt(pDevExt)->cDisplays; ++i)
+                    for (int i = 0; i < VBoxCommonFromDeviceExt(pDevExt)->cDisplays; ++i)
+                    {
+                        pQi->aInfos[i] = pDevExt->aSources[i].Vhwa.Settings;
+                    }
+#endif
+                }
+                else
                 {
-                    pQi->aInfos[i] = pDevExt->aSources[i].Vhwa.Settings;
+                    LOGREL(("buffer too small"));
+                    Status = STATUS_BUFFER_TOO_SMALL;
                 }
-#endif
-            }
-            else
-            {
-                LOGREL(("buffer too small"));
-                Status = STATUS_BUFFER_TOO_SMALL;
-            }
             }
 #ifdef VBOX_WDDM_WIN8
@@ -1982 +1982 @@
 #endif
             break;
+#ifdef VBOX_WDDM_WIN8
+        case DXGKQAITYPE_QUERYSEGMENT3:
+            LOGREL(("DXGKQAITYPE_QUERYSEGMENT3 treating as unsupported!"));
+            Status = STATUS_NOT_SUPPORTED;
+            break;
+#endif
         default:
             WARN(("unsupported Type (%d)", pQueryAdapterInfo->Type));