Changeset 52222 in vbox

Timestamp:

Jul 29, 2014 6:33:59 AM (10 years ago)

Author:

vboxsync

Message:

Additions/common/VBoxGuestLib: re-write vbglR3DoIOCtl() for readability and fix a potential X Server segementation fault due to a missing symbol.

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp

@@ -394 +394 @@
     return RTErrConvertFromOS2(rc);
 
-#elif defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
+#else
+# if defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
     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
+#  endif
+    pvData = &Hdr;
 
 /** @todo test status code passing! Check that the kernel doesn't do any
@@ -408 +410 @@
  *        header with an error code return field (much better alternative
  *        actually). */
-#ifdef VBOX_VBGLR3_XSERVER
-    int rc = xf86ioctl(g_File, iFunction, &Hdr);
-#else
-    if (g_File == NIL_RTFILE)
-        return VERR_INVALID_HANDLE;
-    int rc = ioctl(RTFileToNative(g_File), iFunction, &Hdr);
-#endif
-    if (rc == -1)
-    {
-        rc = errno;
-        return RTErrConvertFromErrno(rc);
-    }
-    return VINF_SUCCESS;
-
-#elif defined(RT_OS_DARWIN) || defined(RT_OS_LINUX)
-# ifdef VBOX_VBGLR3_XSERVER
+# elif defined(RT_OS_DARWIN) || defined(RT_OS_LINUX)
+    NOREF(cbData);
+# endif
+
+# if defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD) || defined(RT_OS_DARWIN) || defined(RT_OS_LINUX)
+#  ifdef VBOX_VBGLR3_XSERVER
     int rc = xf86ioctl((int)g_File, iFunction, pvData);
-# else
+#  else
     if (g_File == NIL_RTFILE)
         return VERR_INVALID_HANDLE;
     int rc = ioctl(RTFileToNative(g_File), iFunction, pvData);
+#  endif
+# elif defined(RT_OS_HAIKU)
+    /* The ioctl hook in Haiku does take the len parameter when specified,
+     * so just use it. */
+    int rc = ioctl((int)g_File, iFunction, pvData, cbData);
+# else
+#  error Port me!
 # endif
     if (RT_LIKELY(rc == 0))
@@ -442 +441 @@
         rc = RTErrConvertFromErrno(errno);
 # endif
-    NOREF(cbData);
     return rc;
 
-#elif defined(RT_OS_HAIKU)
-    /* The ioctl hook in Haiku does take the len parameter when specified,
-     * so just use it. */
-    int rc = ioctl((int)g_File, iFunction, pvData, cbData);
-    if (RT_LIKELY(rc == 0))
-        return VINF_SUCCESS;
-
-    /* Positive values are negated VBox error status codes. */
-    if (rc > 0)
-        rc = -rc;
-    else
-        rc = RTErrConvertFromErrno(errno);
-    return rc;
-
-#elif defined(VBOX_VBGLR3_XSERVER)
-    /* PORTME - This is preferred over the RTFileIOCtl variant below, just be careful with the (int). */
-/** @todo test status code passing! */
-    int rc = xf86ioctl(g_File, iFunction, pvData);
-    if (rc == -1)
-        return VERR_FILE_IO_ERROR;  /* This is purely legacy stuff, it has to work and no more. */
-    return VINF_SUCCESS;
-
-#else
-    /* Default implementation - PORTME: Do not use this without testings that passing errors works! */
-/** @todo test status code passing! */
-    int rc2 = VERR_INTERNAL_ERROR;
-    int rc = RTFileIoCtl(g_File, (int)iFunction, pvData, cbData, &rc2);
-    if (RT_SUCCESS(rc))
-        rc = rc2;
-    return rc;
 #endif
 }