Changeset 52210 in vbox for trunk/src/VBox/Additions/common/VBoxGuestLib

Timestamp:

Jul 28, 2014 3:03:24 PM (11 years ago)

Author:

vboxsync

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

95273

Message:

Additions/x11: do not pull the whole (mini) run-time library into the X.Org drivers.

Location:

trunk/src/VBox/Additions/common/VBoxGuestLib

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxGuestR3Lib.cpp (modified) (13 diffs)
• VBoxGuestR3LibRuntimeXF86.cpp (modified) (2 diffs)
• VBoxGuestR3LibVideo.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk

@@ -42 +42 @@
  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
   LIBRARIES += \
-        VBoxGuestR3LibXFree86
+        VBoxGuestR3LibXFree86 \
+        VBoxGuestR3LibXOrg
  endif
 endif
@@ -196 +197 @@
         $(VBOX_PATH_X11_XFREE_4_3)/exports/include/X11
 
+#
+# VBoxGuestR3LibXOrg - a reduced version of the guest library which uses
+# the C server runtime instead of IPRT.
+#
+VBoxGuestR3LibXOrg_TEMPLATE = VBOXGUESTR3XORGLIB
+VBoxGuestR3LibXOrg_DEFS     = \
+        VBOX_WITH_HGCM \
+        VBOX_VBGLR3_XORG \
+        RTMEM_NO_WRAP_TO_EF_APIS \
+        IN_RT_STATIC \
+        $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS,) \
+        $(if $(VBOX_WITH_DRAG_AND_DROP),VBOX_WITH_DRAG_AND_DROP,) \
+        $(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,)
+VBoxGuestR3LibXOrg_SOURCES  = $(VBoxGuestR3LibXFree86_SOURCES)
+
 VBoxGuestR3LibRuntimeXF86.cpp_CXXFLAGS = -Wno-shadow
 

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

@@ -72 +72 @@
 extern "C" int xf86close(int);
 extern "C" int xf86ioctl(int, unsigned long, pointer);
+# define VBOX_VBGLR3_XSERVER
+#elif defined(VBOX_VBGLR3_XORG)
+# include <sys/stat.h>
+# include <fcntl.h>
+# include <unistd.h>
+# include <sys/ioctl.h>
+# define xf86open open
+# define xf86close close
+# define xf86ioctl ioctl
+# define XF86_O_RDWR O_RDWR
+# define VBOX_VBGLR3_XSERVER
 #endif
 
@@ -79 +90 @@
 *******************************************************************************/
 /** The VBoxGuest device handle. */
-#ifdef VBOX_VBGLR3_XFREE86
+#ifdef VBOX_VBGLR3_XSERVER
 static int g_File = -1;
 #elif defined(RT_OS_WINDOWS)
@@ -115 +126 @@
 #ifdef RT_OS_WINDOWS
         if (g_hFile == INVALID_HANDLE_VALUE)
-#elif !defined (VBOX_VBGLR3_XFREE86)
+#elif !defined (VBOX_VBGLR3_XSERVER)
         if (g_File == NIL_RTFILE)
 #else
@@ -125 +136 @@
 #if defined(RT_OS_WINDOWS)
     if (g_hFile != INVALID_HANDLE_VALUE)
-#elif !defined(VBOX_VBGLR3_XFREE86)
+#elif !defined(VBOX_VBGLR3_XSERVER)
     if (g_File != NIL_RTFILE)
 #else
@@ -234 +245 @@
     g_uConnection = uConnection;
 
-#elif defined(VBOX_VBGLR3_XFREE86)
+#elif defined(VBOX_VBGLR3_XSERVER)
     int File = xf86open(pszDeviceName, XF86_O_RDWR);
     if (File == -1)
@@ -251 +262 @@
 #endif
 
-#ifndef VBOX_VBGLR3_XFREE86
+#ifndef VBOX_VBGLR3_XSERVER
     /*
      * Create release logger
@@ -296 +307 @@
     if (cInits > 0)
         return;
-#if !defined(VBOX_VBGLR3_XFREE86)
+#if !defined(VBOX_VBGLR3_XSERVER)
     AssertReturnVoid(!cInits);
 
@@ -331 +342 @@
 # endif
 
-#else  /* VBOX_VBGLR3_XFREE86 */
+#else  /* VBOX_VBGLR3_XSERVER */
     int File = g_File;
     g_File = -1;
@@ -337 +348 @@
         return;
     xf86close(File);
-#endif /* VBOX_VBGLR3_XFREE86 */
+#endif /* VBOX_VBGLR3_XSERVER */
 }
 
@@ -397 +408 @@
  *        header with an error code return field (much better alternative
  *        actually). */
-#ifdef VBOX_VBGLR3_XFREE86
+#ifdef VBOX_VBGLR3_XSERVER
     int rc = xf86ioctl(g_File, iFunction, &Hdr);
 #else
@@ -412 +423 @@
 
 #elif defined(RT_OS_DARWIN) || defined(RT_OS_LINUX)
-# ifdef VBOX_VBGLR3_XFREE86
+# ifdef VBOX_VBGLR3_XSERVER
     int rc = xf86ioctl((int)g_File, iFunction, pvData);
 # else
@@ -426 +437 @@
         rc = -rc;
     else
-# ifdef VBOX_VBGLR3_XFREE86
+# ifdef VBOX_VBGLR3_XSERVER
         rc = VERR_FILE_IO_ERROR;
 #  else
@@ -448 +459 @@
     return rc;
 
-#elif defined(VBOX_VBGLR3_XFREE86)
+#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! */

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

@@ -35 +35 @@
 #include <iprt/mem.h>
 #include <iprt/string.h>
+#if defined(VBOX_VBGLR3_XFREE86)
 extern "C" {
 # define XFree86LOADER
@@ -41 +42 @@
 # undef size_t
 }
+#else
+# include <ctype.h>
+# include <errno.h>
+# include <stdarg.h>
+# include <stdio.h>
+# include <stdlib.h>
+# define xalloc malloc
+# define xf86vsnprintf vsnprintf
+# define xf86errno errno
+# define xf86strtoul strtoul
+# define xf86isspace isspace
+# define xfree free
+extern "C" void ErrorF(const char *f, ...);
+extern "C" void VErrorF(const char *f, va_list args);
+#endif
 
 /* This is risky as it restricts call to the ANSI format type specifiers. */

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

@@ -34 +34 @@
 #include <VBox/HostServices/GuestPropertySvc.h>  /* For Save and RetrieveVideoMode */
 #include <iprt/assert.h>
-#ifndef VBOX_VBGLR3_XFREE86
+#if !defined(VBOX_VBGLR3_XFREE86) && !defined(VBOX_VBGLR3_XORG)
 # include <iprt/mem.h>
 #endif