Changeset 33929 in vbox for trunk/src/VBox/GuestHost/OpenGL

Timestamp:

Nov 10, 2010 9:31:48 AM (14 years ago)

Author:

vboxsync

Message:

wddm: fix guest misbehave on driver update, bugfixing

File:

• trunk/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c (modified) (9 diffs)

trunk/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c

@@ -1237 +1237 @@
     if (RT_FAILURE(rc) || RT_FAILURE(parms.hdr.result))
     {
+        Assert(0);
+
         crWarning("Host doesn't accept our version %d.%d. Make sure you have appropriate additions installed!",
                   parms.vMajor.u.value32, parms.vMinor.u.value32);
@@ -1278 +1280 @@
         if (g_crvboxhgcm.hGuestDrv == INVALID_HANDLE_VALUE)
         {
+            Assert(0);
             crDebug("could not open VBox Guest Additions driver! rc = %d\n", GetLastError());
             VBOXCRHGSMIPROFILE_FUNC_EPILOGUE();
@@ -1292 +1295 @@
             crDebug("could not open Guest Additions kernel module! rc = %d\n", errno);
             VBOXCRHGSMIPROFILE_FUNC_EPILOGUE();
+            Assert(0);
             return FALSE;
         }
@@ -1333 +1337 @@
         {
             crDebug("HGCM connect failed with rc=0x%x\n", info.result);
+            Assert(0);
 
             VBOXCRHGSMIPROFILE_FUNC_EPILOGUE();
@@ -1341 +1346 @@
     {
 #ifdef RT_OS_WINDOWS
-        crDebug("IOCTL for HGCM connect failed with rc=0x%x\n", GetLastError());
+        DWORD winEr = GetLastError();
+        Assert(0);
+        crDebug("IOCTL for HGCM connect failed with rc=0x%x\n", winEr);
 #else
         crDebug("IOCTL for HGCM connect failed with rc=0x%x\n", errno);
@@ -1627 +1634 @@
     if (RT_FAILURE(rc))
     {
-        crWarning("pfnBufferSubmitAsynch failed with %d \n", rc);
+        crError("pfnBufferSubmitAsynch failed with %d \n", rc);
         return;
     }
@@ -1761 +1768 @@
         if (RT_FAILURE(rc))
         {
-            crWarning("pfnBufferSubmitAsynch failed with %d \n", rc);
+            crError("pfnBufferSubmitAsynch failed with %d \n", rc);
             break;
         }
@@ -1881 +1888 @@
             callRes = _crVBoxHGSMICmdBufferGetRc(pClient);
         }
+        else
+        {
+            /* we can not recover at this point, report error & exit */
+            crError("pfnBufferSubmitAsynch failed with %d \n", rc);
+        }
     }
     else
@@ -1914 +1926 @@
 
             callRes = _crVBoxHGSMICmdBufferGetRc(pClient);
+        }
+        else
+        {
+            /* we can not recover at this point, report error & exit */
+            crError("Failed to submit CrHhgsmi buffer");
         }
     }