Changeset 22475 in vbox

Timestamp:

Aug 26, 2009 3:12:21 PM (15 years ago)

Author:

vboxsync

Message:

video hw accel: make the new driver not fail with old VMs w/o HGSMI

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Display/vbox.c (modified) (5 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Display/vbox.c

@@ -924 +924 @@
     if (!pCmd)
     {
-        DISPDBG((0, "VBoxDISP::vboxVHWAQueryHostInfo1: vboxVHWACommandCreate failed\n"));
+        DISPDBG((0, "VBoxDISP::vboxVHWAQueryHostInfo2: vboxVHWACommandCreate failed\n"));
         return NULL;
     }
@@ -948 +948 @@
 int vboxVHWAInitHostInfo1(PPDEV ppdev)
 {
-    VBOXVHWACMD_QUERYINFO1* pInfo = vboxVHWAQueryHostInfo1(ppdev);
+    VBOXVHWACMD_QUERYINFO1* pInfo;
+
+    if (!ppdev->bHGSMISupported)
+        return VERR_NOT_SUPPORTED;
+
+    pInfo = vboxVHWAQueryHostInfo1(ppdev);
     if(!pInfo)
     {
@@ -969 +974 @@
 int vboxVHWAInitHostInfo2(PPDEV ppdev, DWORD *pFourCC)
 {
-    VBOXVHWACMD_QUERYINFO2* pInfo = vboxVHWAQueryHostInfo2(ppdev, ppdev->vhwaInfo.numFourCC);
+    VBOXVHWACMD_QUERYINFO2* pInfo;
     int rc = VINF_SUCCESS;
+
+    if (!ppdev->bHGSMISupported)
+        return VERR_NOT_SUPPORTED;
+
+    pInfo = vboxVHWAQueryHostInfo2(ppdev, ppdev->vhwaInfo.numFourCC);
 
     Assert(pInfo);
@@ -994 +1004 @@
 {
     int rc = VERR_GENERAL_FAILURE;
-    VBOXVHWACMD* pCmd = vboxVHWACommandCreate (ppdev, VBOXVHWACMD_TYPE_ENABLE, 0);
+    VBOXVHWACMD* pCmd;
+
+    if (!ppdev->bHGSMISupported)
+        return VERR_NOT_SUPPORTED;
+
+    pCmd = vboxVHWACommandCreate (ppdev, VBOXVHWACMD_TYPE_ENABLE, 0);
     if (!pCmd)
     {
-        DISPDBG((0, "VBoxDISP::vboxVHWAQueryHostInfo1: vboxVHWACommandCreate failed\n"));
+        DISPDBG((0, "VBoxDISP::vboxVHWAEnable: vboxVHWACommandCreate failed\n"));
         return rc;
     }
@@ -1016 +1031 @@
 {
     int rc = VERR_GENERAL_FAILURE;
-    VBOXVHWACMD* pCmd = vboxVHWACommandCreate (ppdev, VBOXVHWACMD_TYPE_DISABLE, 0);
+    VBOXVHWACMD* pCmd;
+
+    if (!ppdev->bHGSMISupported)
+        return VERR_NOT_SUPPORTED;
+
+    pCmd = vboxVHWACommandCreate (ppdev, VBOXVHWACMD_TYPE_DISABLE, 0);
     if (!pCmd)
     {
-        DISPDBG((0, "VBoxDISP::vboxVHWAQueryHostInfo1: vboxVHWACommandCreate failed\n"));
+        DISPDBG((0, "VBoxDISP::vboxVHWADisable: vboxVHWACommandCreate failed\n"));
         return rc;
     }