Changeset 21776 in vbox for trunk/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c

Timestamp:

Jul 23, 2009 2:13:41 PM (15 years ago)

Author:

vboxsync

Message:

ogl/vboxhgcm.c: adjust ioctl return code check for linux, init the HGCM call result with a failure instead of success (in case it isn't copied back to ring-3).

File:

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

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

@@ -156 +156 @@
 #ifdef IN_GUEST
 
-#ifdef RT_OS_WINDOWS
+# ifdef RT_OS_WINDOWS
     DWORD cbReturned;
 
@@ -170 +170 @@
     crDebug("vboxCall failed with %x\n", GetLastError());
     return VERR_NOT_SUPPORTED;
-#else
-# ifdef RT_OS_SOLARIS
+# else
+    int rc;
+#  ifdef RT_OS_SOLARIS
     VBGLBIGREQ Hdr;
     Hdr.u32Magic = VBGLBIGREQ_MAGIC;
     Hdr.cbData = cbData;
     Hdr.pvDataR3 = pvData;
-#  if HC_ARCH_BITS == 32
+#   if HC_ARCH_BITS == 32
     Hdr.u32Padding = 0;
+#   endif
+    rc = ioctl(g_crvboxhgcm.iGuestDrv, VBOXGUEST_IOCTL_HGCM_CALL(cbData), &Hdr);
+#  else
+    rc = ioctl(g_crvboxhgcm.iGuestDrv, VBOXGUEST_IOCTL_HGCM_CALL(cbData), pvData);
 #  endif
-    if (ioctl(g_crvboxhgcm.iGuestDrv, VBOXGUEST_IOCTL_HGCM_CALL(cbData), &Hdr) >= 0)
-# else
-    if (ioctl(g_crvboxhgcm.iGuestDrv, VBOXGUEST_IOCTL_HGCM_CALL(cbData), pvData) >= 0)
-# endif
+#  ifdef RT_OS_LINUX
+    if (rc == 0)
+#  else
+    if (rc >= 0)
+#  endif
     {
         return VINF_SUCCESS;
     }
-    crWarning("vboxCall failed with %x\n", errno);
+#  ifdef RT_OS_LINUX
+    if (rc >= 0) /* positive values are negated VBox error status codes. */
+        crWarning("vboxCall failed with VBox status code %d\n", -rc);
+    else
+#  endif
+        crWarning("vboxCall failed with %x\n", errno);
     return VERR_NOT_SUPPORTED;
-#endif /*#ifdef RT_OS_WINDOWS*/
+# endif /*#ifdef RT_OS_WINDOWS*/
 
 #else /*#ifdef IN_GUEST*/
@@ -327 +338 @@
     int rc;
 
-    parms.hdr.result      = VINF_SUCCESS;
+    parms.hdr.result      = VERR_WRONG_ORDER;
     parms.hdr.u32ClientID = conn->u32ClientID;
     parms.hdr.u32Function = SHCRGL_GUEST_FN_WRITE;
@@ -349 +360 @@
     int rc;
 
-    parms.hdr.result      = VINF_SUCCESS;
+    parms.hdr.result      = VERR_WRONG_ORDER;
     parms.hdr.u32ClientID = conn->u32ClientID;
     parms.hdr.u32Function = SHCRGL_GUEST_FN_READ;
@@ -392 +403 @@
     int rc;
 
-    parms.hdr.result      = VINF_SUCCESS;
+    parms.hdr.result      = VERR_WRONG_ORDER;
     parms.hdr.u32ClientID = conn->u32ClientID;
     parms.hdr.u32Function = SHCRGL_GUEST_FN_WRITE_READ;
@@ -511 +522 @@
     CRASSERT(!conn->pBuffer);
 
-    parms.hdr.result      = VINF_SUCCESS;
+    parms.hdr.result      = VERR_WRONG_ORDER;
     parms.hdr.u32ClientID = conn->u32ClientID;
     parms.hdr.u32Function = SHCRGL_GUEST_FN_READ;
@@ -676 +687 @@
     int rc;
 
-    parms.hdr.result      = VINF_SUCCESS;
+    parms.hdr.result      = VERR_WRONG_ORDER;
     parms.hdr.u32ClientID = conn->u32ClientID;
     parms.hdr.u32Function = SHCRGL_GUEST_FN_SET_VERSION;