Changeset 103331 in vbox for trunk/src/VBox

Timestamp:

Feb 13, 2024 10:45:22 AM (12 months ago)

Author:

vboxsync

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

161638

Message:

Config.kmk,Main,libs/xpcom,HostDrivers/Support,Installer: Make VBOX_WITH_XPCOMIPCD_IN_VBOX_SVC the default and remove the deprecated code, bugref:10594

Location:

trunk/src/VBox

Files:

• HostDrivers/Support/Makefile.kmk (modified) (2 diffs)
• HostDrivers/Support/SUPR3HardenedVerify.cpp (modified) (1 diff)
• Installer/darwin/Makefile.kmk (modified) (2 diffs)
• Installer/freebsd/Makefile.kmk (modified) (1 diff)
• Installer/linux/Makefile.kmk (modified) (1 diff)
• Installer/solaris/Makefile.kmk (modified) (2 diffs)
• Main/Makefile.kmk (modified) (2 diffs)
• Main/src-server/xpcom/server.cpp (modified) (5 diffs)

trunk/src/VBox/HostDrivers/Support/Makefile.kmk

@@ -194 +194 @@
         $(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE,) \
         $(if $(VBOX_WITH_DRIVERLESS_NEM_FALLBACK),VBOX_WITH_DRIVERLESS_NEM_FALLBACK,) \
-        $(if $(VBOX_WITH_XPCOMIPCD_IN_VBOX_SVC),VBOX_WITH_XPCOMIPCD_IN_VBOX_SVC,) \
         VBOX_PERMIT_MORE \
         VBOX_PERMIT_EVEN_MORE
@@ -242 +241 @@
         $(if $(VBOX_WITHOUT_DEBUGGER_CHECKS),VBOX_WITHOUT_DEBUGGER_CHECKS,) \
         $(if $(VBOX_PERMIT_VISUAL_STUDIO_PROFILING),VBOX_PERMIT_VISUAL_STUDIO_PROFILING,) \
-        $(if $(VBOX_WITH_XPCOMIPCD_IN_VBOX_SVC),VBOX_WITH_XPCOMIPCD_IN_VBOX_SVC,) \
         VBOX_PERMIT_MORE \
         VBOX_PERMIT_EVEN_MORE

trunk/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp

@@ -184 +184 @@
     {   kSupIFT_Dll,  kSupID_AppSharedLib,      false, "VBoxC" SUPLIB_DLL_SUFF },
  #else
-# ifdef VBOX_WITH_XPCOMIPCD_IN_VBOX_SVC
     {   kSupIFT_Dll,  kSupID_AppPrivArch,       false, "VBoxXPCOMIPCD" SUPLIB_DLL_SUFF },
-# else
-    {   kSupIFT_Exe,  kSupID_AppPrivArch,       false, "VBoxXPCOMIPCD" SUPLIB_EXE_SUFF },
-# endif
     {   kSupIFT_Dll,  kSupID_AppSharedLib,      false, "VBoxXPCOM" SUPLIB_DLL_SUFF },
     {   kSupIFT_Dll,  kSupID_AppPrivArchComp,   false, "VBoxXPCOMIPCC" SUPLIB_DLL_SUFF },

trunk/src/VBox/Installer/darwin/Makefile.kmk

@@ -411 +411 @@
         MacOS/VBoxManage \
         MacOS/VBoxSVC \
-        $(if $(VBOX_WITH_XPCOMIPCD_IN_VBOX_SVC),,MacOS/VBoxXPCOMIPCD) \
         MacOS/VBoxNetAdpCtl \
         MacOS/VBoxExtPackHelperApp \
@@ -440 +439 @@
         MacOS/VBoxXPCOM.dylib \
         MacOS/VBoxXPCOMC.dylib \
-        $(if $(VBOX_WITH_XPCOMIPCD_IN_VBOX_SVC),MacOS/VBoxXPCOMIPCD.dylib,) \
+        MacOS/VBoxXPCOMIPCD.dylib \
         MacOS/components/VBoxC.dylib \
         MacOS/components/VBoxSVCM.dylib \

trunk/src/VBox/Installer/freebsd/Makefile.kmk

@@ -108 +108 @@
                 VBoxXPCOM.so \
                 VBoxXPCOMC.so \
-                $(if $(VBOX_WITH_XPCOMIPCD_IN_VBOX_SVC),VBoxXPCOMICPD.so,VBoxXPCOMICPD) \
+                VBoxXPCOMICPD.so \
                 components/VBoxXPCOMIPCC.so \
                 components/VBoxSVCM.so \

trunk/src/VBox/Installer/linux/Makefile.kmk

@@ -181 +181 @@
                 VBoxXPCOM.so \
                 VBoxXPCOMC.so \
-                $(if $(VBOX_WITH_XPCOMIPCD_IN_VBOX_SVC),VBoxXPCOMIPCD.so,VBoxXPCOMIPCD) \
+                VBoxXPCOMIPCD.so \
                 components/VBoxXPCOMIPCC.so \
                 components/VBoxSVCM.so \

trunk/src/VBox/Installer/solaris/Makefile.kmk

@@ -327 +327 @@
         $(if $(VBOX_WITH_EXTPACK),VBoxExtPackHelperApp,) \
         VBoxSVC \
-        $(if $(VBOX_WITH_XPCOMIPCD_IN_VBOX_SVC),,VBoxXPCOMIPCD) \
         $(if $(VBOX_WITH_DTRACE),VBoxDTrace,) \
         $(if $(VBOX_WITH_HOST_SHIPPING_AUDIO_TEST),VBoxAudioTest,)
@@ -348 +347 @@
         VBoxXPCOM.so \
         VBoxXPCOMC.so \
-        $(if $(VBOX_WITH_XPCOMIPCD_IN_VBOX_SVC),VBoxXPCOMIPCD.so,) \
+        VBoxXPCOMIPCD.so \
         $(if $(VBOX_WITH_SHARED_FOLDERS),VBoxSharedFolders.so,) \
         $(if $(VBOX_WITH_SHARED_CLIPBOARD),VBoxSharedClipboard.so,) \

trunk/src/VBox/Main/Makefile.kmk

@@ -547 +547 @@
         $(if $(VBOX_WITH_IEM_NATIVE_RECOMPILER),VBOX_WITH_IEM_NATIVE_RECOMPILER,) \
         $(if $(VBOX_WITH_DRIVERLESS_FORCED),VBOX_WITH_DRIVERLESS_FORCED,) \
-        $(if $(VBOX_WITH_XPCOMIPCD_IN_VBOX_SVC),VBOX_WITH_XPCOMIPCD_IN_VBOX_SVC,)
 
  ifdef VBOX_WITH_USB
@@ -581 +580 @@
         $(PATH_STAGE_LIB)/VBoxAPIWrap$(VBOX_SUFF_LIB) \
         $(PATH_STAGE_LIB)/SSMStandalone$(VBOX_SUFF_LIB) \
-        $(if $(VBOX_WITH_XPCOMIPCD_IN_VBOX_SVC),$(LIB_VBOXXPCOMIPCD),) \
+        $(LIB_VBOXXPCOMIPCD) \
         $(LIB_DDU)
 

trunk/src/VBox/Main/src-server/xpcom/server.cpp

@@ -51 +51 @@
 #include <iprt/pipe.h>
 #include <iprt/process.h>
+#include <iprt/thread.h>
 #include <iprt/timer.h>
 #include <iprt/env.h>
@@ -112 +113 @@
 NS_DECL_CI_INTERFACE_GETTER(VirtualBoxWrap)
 
+/* Living in VBoxXPCOMIPCD. */
+DECL_IMPORT_NOTHROW(int) RTCALL VBoxXpcomIpcdCreate(PRTTHREAD phThrdIpcd);
+DECL_IMPORT_NOTHROW(int) RTCALL VBoxXpcomIpcdDestroy(RTTHREAD hThrdIpcd);
+
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -664 +669 @@
 }
 
-#ifdef VBOX_WITH_XPCOMIPCD_IN_VBOX_SVC
-
-#include <iprt/thread.h>
-
-DECL_IMPORT_NOTHROW(int) RTCALL VBoxXpcomIpcdCreate(PRTTHREAD phThrdIpcd);
-DECL_IMPORT_NOTHROW(int) RTCALL VBoxXpcomIpcdDestroy(RTTHREAD hThrdIpcd);
-#endif
+
 
 int main(int argc, char **argv)
@@ -832 +831 @@
     };
 
-#ifdef VBOX_WITH_XPCOMIPCD_IN_VBOX_SVC
+    /* Spawn the IPC message I/O thread. */
     RTTHREAD hThrdIpcd = NIL_RTTHREAD;
     vrc = VBoxXpcomIpcdCreate(&hThrdIpcd);
     if (RT_FAILURE(vrc))
         return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to create IPC daemon thread -> %Rrc", vrc);
-#endif
 
     do /* goto avoidance only */
@@ -1018 +1016 @@
         RTMsgError("Failed to shutdown XPCOM! (rc=%Rhrc)", rc);
 
-#ifdef VBOX_WITH_XPCOMIPCD_IN_VBOX_SVC
     vrc = VBoxXpcomIpcdDestroy(hThrdIpcd);
     AssertRC(vrc);
-#endif
 
     RTPrintf("XPCOM server has shutdown.\n");