Changeset 28303 in vbox

Timestamp:

Apr 14, 2010 1:17:56 PM (15 years ago)

Author:

vboxsync

Message:

Misc: made it possible to do: DEFS += RTMEM_WRAP_TO_EF_APIS RTALLOC_USE_EFENCE

Location:

trunk

Files:

• Config.kmk (modified) (3 diffs)
• include/iprt/mem.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk (modified) (3 diffs)
• src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp (modified) (3 diffs)
• src/VBox/Runtime/Makefile.kmk (modified) (5 diffs)

trunk/Config.kmk

@@ -3769 +3769 @@
 # This mostly about zapping the VBOXR3EXE linker flags and libraries.
 #
-TEMPLATE_VBOXGUESTR3XF86MOD       = VBox Guest Program with C++ library dependencies
+TEMPLATE_VBOXGUESTR3XF86MOD       = VBox XFree86 Guest Module
 TEMPLATE_VBOXGUESTR3XF86MOD_EXTENDS = VBOXGUESTR3EXE
 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(KBUILD_TYPE)      = $(NO_SUCH_VARIABLE)
@@ -3786 +3786 @@
 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS  = \
         $(VBOX_LIB_VBGL_R3_XFREE86)
-TEMPLATE_VBOXGUESTR3XF86MOD_DEFS  = $(TEMPLATE_VBOXGUESTR3DLL_DEFS) LOG_TO_BACKDOOR VBOX_GUESTR3XF86MOD
+TEMPLATE_VBOXGUESTR3XF86MOD_DEFS  = $(TEMPLATE_VBOXGUESTR3DLL_DEFS) LOG_TO_BACKDOOR VBOX_GUESTR3XF86MOD RTMEM_NO_WRAP_TO_EF_APIS
 
 
@@ -3793 +3793 @@
 # This mostly about zapping unnecessary LIBS from VBOXGUESTR3DLL and adding some flags.
 #
-TEMPLATE_VBOXGUESTR3XORGMOD       = VBox Guest Program with C++ library dependencies
+TEMPLATE_VBOXGUESTR3XORGMOD       = VBox X.org Guest Module
 TEMPLATE_VBOXGUESTR3XORGMOD_EXTENDS = VBOXGUESTR3DLL
 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TYPE)     = $(NO_SUCH_VARIABLE)
 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TARGET)   = $(NO_SUCH_VARIABLE)
 TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS                  = $(TEMPLATE_VBOXGUESTR3DLL_CFLAGS) -std=c99
-TEMPLATE_VBOXGUESTR3XORGMOD_DEFS = $(TEMPLATE_VBOXGUESTR3DLL_DEFS) LOG_TO_BACKDOOR VBOX_GUESTR3XORGMOD
+TEMPLATE_VBOXGUESTR3XORGMOD_DEFS = $(TEMPLATE_VBOXGUESTR3DLL_DEFS) LOG_TO_BACKDOOR VBOX_GUESTR3XORGMOD RTMEM_NO_WRAP_TO_EF_APIS
 ifeq ($(KBUILD_TARGET_ARCH),amd64)
  TEMPLATE_VBOXGUESTR3XORGMOD_DEFS += _XSERVER64

trunk/include/iprt/mem.h

@@ -452 +452 @@
  * Define RTMEM_WRAP_TO_EF_APIS to wrap RTMem APIs to RTMemEf APIs.
  */
-#if defined(RTMEM_WRAP_TO_EF_APIS) && defined(IN_RING3)
+#if defined(RTMEM_WRAP_TO_EF_APIS) && defined(IN_RING3) && !defined(RTMEM_NO_WRAP_TO_EF_APIS)
 # define RTMemTmpAlloc(cb)                  RTMemEfTmpAlloc((cb), RT_SRC_POS)
 # define RTMemTmpAllocZ(cb)                 RTMemEfTmpAllocZ((cb), RT_SRC_POS)

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

@@ -139 +139 @@
 # C library is not available.
 #
+## @todo We're quite probably using the wrong template here.
 VBoxGuestR3LibXFree86_TEMPLATE = VBOXGUESTR3LIB
 VBoxGuestR3LibXFree86_DEFS     = \
-        VBOX_WITH_HGCM VBOX_VBGLR3_XFREE86 \
+        VBOX_WITH_HGCM \
+        VBOX_VBGLR3_XFREE86 \
+        RTMEM_NO_WRAP_TO_EF_APIS \
         $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS,)
 VBoxGuestR3LibXFree86_SOURCES  = \
@@ -152 +155 @@
         VBoxGuestR3LibVideo.cpp \
         VBoxGuestR3LibRuntimeXF86.cpp
-VBoxGuestR3LibRuntimeXF86.cpp_CXXFLAGS = -Wno-shadow
 VBoxGuestR3LibXFree86_INCS     = \
         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/common/ \
@@ -160 +162 @@
         $(VBOX_PATH_X11_XFREE_4_3)/exports/include/X11
 
+VBoxGuestR3LibRuntimeXF86.cpp_CXXFLAGS = -Wno-shadow
 
 include $(KBUILD_PATH)/subfooter.kmk

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

@@ -2 +2 @@
 /** @file
  * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions,
- *   implements the minimum of runtime functions needed for XFree86 driver
- *   code.
+ *                  implements the minimum of runtime functions needed for
+ *                  XFree86 driver code.
  */
 
 /*
- * Copyright (C) 2007-2009 Sun Microsystems, Inc.
+ * Copyright (C) 2007-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -46 +46 @@
 }
 
+/* This is risky as it restricts call to the ANSI format type specifiers. */
 RTDECL(size_t) RTStrPrintf(char *pszBuffer, size_t cchBuffer, const char *pszFormat, ...)
 {
@@ -140 +141 @@
     xfree(pv);
 }
+

trunk/src/VBox/Runtime/Makefile.kmk

@@ -879 +879 @@
 RuntimeGuestR3Mini_INCS.$(KBUILD_HOST)      := $(RuntimeR3_INCS.$(KBUILD_HOST))
 RuntimeGuestR3Mini_SOURCES = \
+        common/alloc/alloc.cpp \
         common/err/errmsg.cpp \
         common/err/errmsgxpcom.cpp \
@@ -927 +928 @@
         common/string/utf-8-case.cpp \
         common/string/utf-16.cpp \
+        common/table/avlpv.cpp \
         generic/pathhost-generic.cpp \
         generic/RTAssertShouldPanic-generic.cpp \
         r3/alloc.cpp \
+        r3/alloc-ef.cpp \
         r3/fileio.cpp \
         r3/fs.cpp
 RuntimeGuestR3Mini_SOURCES.freebsd = \
+        r3/posix/alloc-posix.cpp \
         r3/posix/env-posix.cpp \
         r3/posix/fileio-posix.cpp \
@@ -938 +942 @@
         r3/posix/utf8-posix.cpp
 RuntimeGuestR3Mini_SOURCES.linux = \
+        r3/posix/alloc-posix.cpp \
         r3/posix/env-posix.cpp \
         r3/posix/fileio-posix.cpp \
@@ -943 +948 @@
         r3/posix/utf8-posix.cpp
 RuntimeGuestR3Mini_SOURCES.solaris = \
+        r3/posix/alloc-posix.cpp \
         r3/posix/env-posix.cpp \
         r3/posix/fileio-posix.cpp \
@@ -948 +954 @@
         r3/posix/utf8-posix.cpp
 RuntimeGuestR3Mini_SOURCES.win = \
+        r3/win/alloc-win.cpp \
         r3/win/fileio-win.cpp \
         r3/win/path-win.cpp \