Changeset 2754 in vbox for trunk/src

Timestamp:

May 22, 2007 2:19:37 AM (18 years ago)

Author:

vboxsync

Message:

Split com.cpp into generic bits and initterm bits so it won't drag in VBoxXPCOMGlue and cause havok on darwin with multiply defined symbols and whatnot.

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (6 diffs)
• glue/com.cpp (modified) (2 diffs)
• glue/initterm.cpp (copied) (copied from trunk/src/VBox/Main/glue/com.cpp ) (2 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -231 +231 @@
 VBoxSVCM_LIBS           = \
         $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL)
-VBoxSVCM_LDFLAGS.darwin = -install_name @executable_path/components/VBoxSVCM.dylib
+VBoxSVCM_LDFLAGS.darwin = \
+        -install_name @executable_path/components/VBoxSVCM.dylib \
+        -exported_symbols_list $(PATH_TARGET)/VBoxSVCM.def
+ifeq ($(BUILD_TARGET),darwin)
+VBoxSVCM_ORDERDEPS     += $(PATH_TARGET)/VBoxSVCM.def
+VBoxSVCM_CLEAN         += $(PATH_TARGET)/VBoxSVCM.def
+$(PATH_TARGET)/VBoxSVCM.def:
+        $(RM) -f $@
+        $(APPEND) $@ _NSGetModule
+endif
 
 endif # VBOX_WITH_XPCOM
@@ -270 +279 @@
 VBoxC_INCS.win     := \
         $(PATH_SUB_CURRENT)
-VBoxC_LDFLAGS.darwin = -install_name @executable_path/components/VBoxC.dylib
+VBoxC_LDFLAGS.darwin = \
+        -install_name @executable_path/components/VBoxSVCM.dylib \
+        -exported_symbols_list $(PATH_TARGET)/VBoxC.def
 ifdef VBOX_USE_VCC80
 VBoxC_LDFLAGS.win = /MANIFEST
@@ -277 +288 @@
 VBoxC_LIBS = \
         $(TARGET_VBoxXPCOM) \
-        $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL) \
-        $(PATH_LIB)/VBoxXPCOMGlue$(VBOX_SUFF_LIB)
+        $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL)
+ ifneq ($(BUILD_TARGET),darwin) # Why is a XPCOM component linking with the glue? Because of the old com.cpp?
+VBoxC_LIBS += $(PATH_LIB)/VBoxXPCOMGlue$(VBOX_SUFF_LIB)
+ endif
 else
 VBoxC_LIBS = \
@@ -328 +341 @@
 endif
 
+ifeq ($(BUILD_TARGET),darwin)
+VBoxC_ORDERDEPS += $(PATH_TARGET)/VBoxC.def
+VBoxC_CLEAN += $(PATH_TARGET)/VBoxC.def
+$(PATH_TARGET)/VBoxC.def: $(MAKEFILE_CURRENT)
+        $(RM) -f $@
+        $(APPEND) $@ _NSGetModule
+        $(APPEND) $@ _VBoxDriversRegister
+endif
 
 #
@@ -387 +408 @@
 VBoxCOM_COMMON_SOURCES = \
         glue/com.cpp \
+        glue/initterm.cpp \
         glue/string.cpp \
         glue/EventQueue.cpp \
@@ -487 +509 @@
         VBoxXPCOMIPCC$(SUFF_DLL)=>../VBoxXPCOMIPCC$(SUFF_DLL)
 endif
-
 
 # generate

trunk/src/VBox/Main/glue/com.cpp

@@ -1 +1 @@
 /** @file
- *
  * MS COM / XPCOM Abstraction Layer
  */
@@ -49 +48 @@
 namespace com
 {
-
-HRESULT Initialize()
-{
-    HRESULT rc = E_FAIL;
-
-#if !defined (VBOX_WITH_XPCOM)
-
-    rc = CoInitializeEx (NULL, COINIT_MULTITHREADED |
-                               COINIT_DISABLE_OLE1DDE |
-                               COINIT_SPEED_OVER_MEMORY);
-
-#else
-
-    /* Set VBOX_XPCOM_HOME if not present */
-    if (!getenv("VBOX_XPCOM_HOME"))
-    {
-        /* get the executable path */
-        char szPathProgram[1024];
-        int rcVBox = RTPathProgram(szPathProgram, sizeof(szPathProgram));
-        if (VBOX_SUCCESS(rcVBox))
-        {
-            setenv("VBOX_XPCOM_HOME", szPathProgram, 1);
-        }
-    }
-
-    nsCOMPtr <nsIEventQueue> eventQ;
-    rc = NS_GetMainEventQ (getter_AddRefs (eventQ));
-    if (rc == NS_ERROR_NOT_INITIALIZED)
-    {
-        XPCOMGlueStartup (nsnull);
-        nsCOMPtr <nsIServiceManager> serviceManager;
-        rc = NS_InitXPCOM2 (getter_AddRefs (serviceManager), nsnull, nsnull);
-        if (NS_SUCCEEDED (rc))
-        {
-            nsCOMPtr <nsIComponentRegistrar> registrar =
-                do_QueryInterface (serviceManager, &rc);
-            if (NS_SUCCEEDED (rc))
-                registrar->AutoRegister (nsnull);
-        }
-    }
-
-#endif
-
-    AssertComRC (rc);
-
-    return rc;
-}
-
-void Shutdown()
-{
-#if !defined (VBOX_WITH_XPCOM)
-
-    CoUninitialize();
-
-#else
-
-    nsCOMPtr <nsIEventQueue> eventQ;
-    nsresult rc = NS_GetMainEventQ (getter_AddRefs (eventQ));
-    if (NS_SUCCEEDED (rc))
-    {
-        BOOL isOnMainThread = FALSE;
-        eventQ->IsOnCurrentThread (&isOnMainThread);
-        eventQ = nsnull; /* early release */
-        if (isOnMainThread)
-        {
-            /* only the main thread needs to uninitialize XPCOM */
-            NS_ShutdownXPCOM (nsnull);
-            XPCOMGlueShutdown();
-        }
-    }
-
-#endif
-}
 
 void GetInterfaceNameByIID (const GUID &aIID, BSTR *aName)

trunk/src/VBox/Main/glue/initterm.cpp

@@ -1 +1 @@
 /** @file
- *
- * MS COM / XPCOM Abstraction Layer
+ * MS COM / XPCOM Abstraction Layer - Initialization and Termination.
  */
 
@@ -123 +122 @@
 }
 
-void GetInterfaceNameByIID (const GUID &aIID, BSTR *aName)
-{
-    Assert (aName);
-    if (!aName)
-        return;
-
-    *aName = NULL;
-
-#if !defined (VBOX_WITH_XPCOM)
-
-    LONG rc;
-    LPOLESTR iidStr = NULL;
-    if (StringFromIID (aIID, &iidStr) == S_OK)
-    {
-        HKEY ifaceKey;
-        rc = RegOpenKeyExW (HKEY_CLASSES_ROOT, L"Interface",
-                            0, KEY_QUERY_VALUE, &ifaceKey);
-        if (rc == ERROR_SUCCESS)
-        {
-            HKEY iidKey;
-            rc = RegOpenKeyExW (ifaceKey, iidStr, 0, KEY_QUERY_VALUE, &iidKey);
-            if (rc == ERROR_SUCCESS)
-            {
-                /* determine the size and type */
-                DWORD sz, type;
-                rc = RegQueryValueExW (iidKey, NULL, NULL, &type, NULL, &sz);
-                if (rc == ERROR_SUCCESS && type == REG_SZ)
-                {
-                    /* query the value to BSTR */
-                    *aName = SysAllocStringLen (NULL, (sz + 1) /
-                                                      sizeof (TCHAR) + 1);
-                    rc = RegQueryValueExW (iidKey, NULL, NULL, NULL,
-                                           (LPBYTE) *aName, &sz);
-                    if (rc != ERROR_SUCCESS)
-                    {
-                        SysFreeString (*aName);
-                        aName = NULL;
-                    }
-                }
-                RegCloseKey (iidKey);
-            }
-            RegCloseKey (ifaceKey);
-        }
-        CoTaskMemFree (iidStr);
-    }
-
-#else
-
-    nsresult rv;
-    nsCOMPtr <nsIInterfaceInfoManager> iim =
-        do_GetService (NS_INTERFACEINFOMANAGER_SERVICE_CONTRACTID, &rv);
-    if (NS_SUCCEEDED (rv))
-    {
-        nsCOMPtr <nsIInterfaceInfo> iinfo;
-        rv = iim->GetInfoForIID (&aIID, getter_AddRefs (iinfo));
-        if (NS_SUCCEEDED (rv))
-        {
-            const char *iname = NULL;
-            iinfo->GetNameShared (&iname);
-            char *utf8IName = NULL;
-            if (VBOX_SUCCESS (RTStrCurrentCPToUtf8 (&utf8IName, iname)))
-            {
-                PRTUCS2 ucs2IName = NULL;
-                if (VBOX_SUCCESS (RTStrUtf8ToUcs2 (&ucs2IName, utf8IName)))
-                {
-                    *aName = SysAllocString ((OLECHAR *) ucs2IName);
-                    RTStrUcs2Free (ucs2IName);
-                }
-                RTStrFree (utf8IName);
-            }
-        }
-    }
-
-#endif
-}
-
 }; // namespace com