Changeset 99564 in vbox

Timestamp:

May 2, 2023 1:57:51 PM (19 months ago)

Author:

vboxsync

Message:

Guest Additions/VBoxClient: Initial commit for bugref:10427. Xinerama stuff untested.

Location:

trunk/src/VBox

Files:

• Additions/x11/VBoxClient/Makefile.kmk (modified) (3 diffs)
• GuestHost/SharedClipboard/clipboard-x11.cpp (modified) (2 diffs)
• GuestHost/libX11.def (added)
• GuestHost/libXmu.def (added)
• GuestHost/libXrandr.def (added)
• GuestHost/libXt.def (added)

trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk

@@ -32 +32 @@
 # This is mostly because the GA build boxes can have a very old xrandr lib, so instead of linking we dlopen.
 VBOX_WITH_DISTRO_XRAND_XINERAMA =
+
+# We want to lazy load as much stuff as possible. See #10427.
+VBOX_WITH_VBOXCLIENT_LAZY_LOAD := 1
 
 # We don't yet have a seamless mode compilation flag, so define it here unconditionally.
@@ -90 +93 @@
 VBoxClient_LIBS.solaris = \
         dl
-VBoxClient_LIBS = \
+ifndef VBOX_WITH_VBOXCLIENT_LAZY_LOAD
+ VBoxClient_LIBS = \
         X11 Xt Xext Xmu
+endif
 ifdef VBOX_WITH_DISTRO_XRAND_XINERAMA
  VBoxClient_DEFS += WITH_DISTRO_XRAND_XINERAMA
- VBoxClient_LIBS += Xrandr
+ ifndef VBOX_WITH_VBOXCLIENT_LAZY_LOAD
+  VBoxClient_LIBS += Xrandr
+ endif
 endif
 
@@ -186 +193 @@
 endif
 
+ifdef VBOX_WITH_VBOXCLIENT_LAZY_LOAD
+ VBoxClient_DEFS    += VBOX_WITH_VBOXCLIENT_LAZY_LOAD
+ # Dynamic import no. 1: libX11.so.6
+ VBoxClient_SOURCES += \
+        $(VBoxClient_0_OUTDIR)/libX11LazyLoad.asm
+ VBoxClient_CLEAN         += $(VBoxClient_0_OUTDIR)/libX11LazyLoad.asm
+ $$(VBoxClient_0_OUTDIR)/libX11LazyLoad.asm: $(PATH_ROOT)/src/VBox/GuestHost/libX11.def $(VBOX_DEF_2_LAZY_LOAD) | $$(dir $$@)
+        $(call MSG_TOOL,VBoxDef2LazyLoad,VBoxClient,$(filter %.def, $^),$@)
+        $(QUIET)$(RM) -f -- "$@"
+        $(VBOX_DEF_2_LAZY_LOAD) --system --library libX11.so.6 --output "$@" $(filter %.def, $^)
+
+ # Dynamic import no. 2: libXt.so.6
+ VBoxClient_SOURCES += \
+        $(VBoxClient_0_OUTDIR)/libXtLazyLoad.asm
+ VBoxClient_CLEAN         += $(VBoxClient_0_OUTDIR)/libXtLazyLoad.asm
+ $$(VBoxClient_0_OUTDIR)/libXtLazyLoad.asm: $(PATH_ROOT)/src/VBox/GuestHost/libXt.def $(VBOX_DEF_2_LAZY_LOAD) | $$(dir $$@)
+        $(call MSG_TOOL,VBoxDef2LazyLoad,VBoxClient,$(filter %.def, $^),$@)
+        $(QUIET)$(RM) -f -- "$@"
+        $(VBOX_DEF_2_LAZY_LOAD) --system --library libXt.so.6 --output "$@" $(filter %.def, $^)
+
+ # Dynamic import no. 3: libXmu.so.6
+ VBoxClient_SOURCES += \
+        $(VBoxClient_0_OUTDIR)/libXmuLazyLoad.asm
+ VBoxClient_CLEAN         += $(VBoxClient_0_OUTDIR)/libXmuLazyLoad.asm
+ $$(VBoxClient_0_OUTDIR)/libXmuLazyLoad.asm: $(PATH_ROOT)/src/VBox/GuestHost/libXmu.def $(VBOX_DEF_2_LAZY_LOAD) | $$(dir $$@)
+        $(call MSG_TOOL,VBoxDef2LazyLoad,VBoxClient,$(filter %.def, $^),$@)
+        $(QUIET)$(RM) -f -- "$@"
+        $(VBOX_DEF_2_LAZY_LOAD) --system --library libXmu.so.6 --output "$@" $(filter %.def, $^)
+
+ # Dynamic import no. 4: libXrandr.so.2
+ VBoxClient_SOURCES += \
+        $(VBoxClient_0_OUTDIR)/libXrandrLazyLoad.asm
+ VBoxClient_CLEAN         += $(VBoxClient_0_OUTDIR)/libXrandrLazyLoad.asm
+ $$(VBoxClient_0_OUTDIR)/libXrandrLazyLoad.asm: $(PATH_ROOT)/src/VBox/GuestHost/libXrandr.def $(VBOX_DEF_2_LAZY_LOAD) | $$(dir $$@)
+        $(call MSG_TOOL,VBoxDef2LazyLoad,VBoxClient,$(filter %.def, $^),$@)
+        $(QUIET)$(RM) -f -- "$@"
+        $(VBOX_DEF_2_LAZY_LOAD) --system --library libXrandr.so.2 --output "$@" $(filter %.def, $^)
+endif
+
 if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_SDK)
  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp

@@ -163 +163 @@
   return 0;
 }
-# else
+# else /* !RT_OS_SOLARIS_10 */
 const char XtStrings [] = "";
 _WidgetClassRec* applicationShellWidgetClass;
 const char XtShellStrings [] = "";
 # endif /* RT_OS_SOLARIS_10 */
+#else /* !TESTCASE */
+# ifdef VBOX_WITH_VBOXCLIENT_LAZY_LOAD
+/* Defines needed for lazy loading global data from the shared objects (.so).
+ * See r157060. */
+DECLASM(WidgetClass * ) LazyGetPtr_applicationShellWidgetClass(void);
+#define applicationShellWidgetClass (*LazyGetPtr_applicationShellWidgetClass())
+DECLASM(const char *) LazyGetPtr_XtStrings(void);
+#define XtStrings (LazyGetPtr_XtStrings())
+# endif
 #endif /* TESTCASE */
 
@@ -1085 +1094 @@
         pCtx->pWidget = XtVaAppCreateShell(0, "VBoxShCl",
                                            applicationShellWidgetClass,
-                                           pDisplay, XtNwidth, 1, XtNheight,
-                                           1, NULL);
+                                           pDisplay,
+                                           XtNwidth, 1, XtNheight, 1,
+                                           NULL);
         if (pCtx->pWidget == NULL)
         {