Changeset 2976 in vbox

Timestamp:

Jun 1, 2007 1:47:51 PM (18 years ago)

Author:

vboxsync

Message:

Main:

• XPCOM: Implemented storing compreg.data and xpti.data in the VirtualBox home directory (defect #1947).
• Cleaned up the COM/XPCOM layer API (removed tons of duplicate definitions and several pieces of duplcate code).

Location:

trunk

Files:

• include/VBox/com/com.h (modified) (3 diffs)
• include/VBox/com/defs.h (modified) (1 diff)
• include/VBox/com/ptr.h (modified) (11 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManage.cpp (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/include/COMDefs.h (modified) (17 diffs)
• src/VBox/Frontends/VirtualBox/src/COMDefs.cpp (modified) (12 diffs)
• src/VBox/Main/VirtualBoxImpl.cpp (modified) (5 diffs)
• src/VBox/Main/glue/com.cpp (modified) (3 diffs)
• src/VBox/Main/glue/initterm.cpp (modified) (6 diffs)
• src/VBox/Main/linux/server.cpp (modified) (6 diffs)

trunk/include/VBox/com/com.h

@@ -25 +25 @@
 
 #include "VBox/com/defs.h"
+#include "VBox/com/string.h"
 
 namespace com
@@ -42 +43 @@
  *  No COM calls may be made after this method returns.
  */
-void Shutdown();
+HRESULT Shutdown();
 
 /**
@@ -55 +56 @@
 void GetInterfaceNameByIID (const GUID &aIID, BSTR *aName);
 
+/** 
+ *  Returns the VirtualBox user home directory.
+ *
+ *  On failure, this function will return a path that caused a failure (or a
+ *  null string if the faiulre is not path-related).
+ *
+ *  On success, this function will try to create the returned directory if it
+ *  doesn't exist yet. This may also fail with the corresponding status code.
+ * 
+ *  @param aDir     Where to return the directory to.
+ *  @return         VBox status code.
+ */
+int GetVBoxUserHomeDirectory (Utf8Str &aDir);
+
 }; // namespace com
 

trunk/include/VBox/com/defs.h

@@ -138 +138 @@
 #define E_ABORT             NS_ERROR_ABORT
 #define E_FAIL              NS_ERROR_FAILURE
+/* Note: a better analog for E_ACCESSDENIED would probably be
+ * NS_ERROR_NOT_AVAILABLE, but we want binary compatibility for now. */
 #define E_ACCESSDENIED      ((nsresult) 0x80070005L)
 

trunk/include/VBox/com/ptr.h

@@ -24 +24 @@
 #define __VBox_com_ptr_h__
 
-#if defined (__WIN__)
+#if !defined (VBOX_WITH_XPCOM)
 
 #include <atlbase.h>
@@ -32 +32 @@
 #endif 
 
-#else // !defined (__WIN__)
+#else /* !defined (VBOX_WITH_XPCOM) */
 
 #include <nsXPCOM.h>
@@ -46 +46 @@
     "@mozilla.org/ipc/dconnect-service;1"
 
-#endif // !defined (__WIN__)
+#endif /* !defined (VBOX_WITH_XPCOM) */
 
 #include <VBox/com/defs.h>
@@ -85 +85 @@
     class NoAddRefRelease : public I {
         private:
-#ifdef __WIN__
+#if !defined (VBOX_WITH_XPCOM)
             STDMETHOD_(ULONG, AddRef)() = 0;
             STDMETHOD_(ULONG, Release)() = 0;
-#else
+#else /* !defined (VBOX_WITH_XPCOM) */
             NS_IMETHOD_(nsrefcnt) AddRef(void) = 0;
             NS_IMETHOD_(nsrefcnt) Release(void) = 0;
-#endif
+#endif /* !defined (VBOX_WITH_XPCOM) */
     };
 
@@ -255 +255 @@
         HRESULT rc;
         I *obj = NULL;
-#if defined (__WIN__)
+#if !defined (VBOX_WITH_XPCOM)
         rc = CoCreateInstance (clsid, NULL, CLSCTX_INPROC_SERVER, _ATL_IIDOF (I),
                                (void **) &obj);
-#else
+#else /* !defined (VBOX_WITH_XPCOM) */
         nsCOMPtr <nsIComponentManager> manager;
         rc = NS_GetComponentManager (getter_AddRefs (manager));
@@ -264 +264 @@
             rc = manager->CreateInstance (clsid, nsnull, NS_GET_IID (I),
                                           (void **) &obj);
-#endif
+#endif /* !defined (VBOX_WITH_XPCOM) */
         *this = obj;
         if (SUCCEEDED (rc))
@@ -282 +282 @@
     HRESULT createLocalObject (const CLSID &clsid)
     {
-#if defined (__WIN__)
+#if !defined (VBOX_WITH_XPCOM)
         HRESULT rc;
         I *obj = NULL;
@@ -291 +291 @@
             obj->Release();
         return rc;
-#else
+#else /* !defined (VBOX_WITH_XPCOM) */
         return createInprocObject (clsid);
-#endif
+#endif /* !defined (VBOX_WITH_XPCOM) */
     }
 
@@ -410 +410 @@
     HRESULT createObject() {
         HRESULT rc;
-#if defined (__WIN__)
+#if !defined (VBOX_WITH_XPCOM)
 #   ifdef VBOX_COM_OUTOFPROC_MODULE
         CComObjectNoLock <C> *obj = new CComObjectNoLock <C>();
@@ -424 +424 @@
         rc = CComObject <C>::CreateInstance (&obj);
 #   endif
-#else
+#else /* !defined (VBOX_WITH_XPCOM) */
         CComObject <C> *obj = new CComObject <C>();
         if (obj) {
@@ -431 +431 @@
             rc = E_OUTOFMEMORY;
         }
-#endif
+#endif /* !defined (VBOX_WITH_XPCOM) */
         *this = obj;
         return rc;

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -6074 +6074 @@
     else
     {
-        // check if an alternative VBox Home directory is set
-        Utf8Str homeDir = getenv ("VBOX_USER_HOME");
-        if (!homeDir)
-        {
-            // compose the config directory (full path)
-            char home [RTPATH_MAX];
-            RTPathUserHome (home, RTPATH_MAX);
-            homeDir = Utf8StrFmt ("%s%c%s", home, RTPATH_DELIMITER, ".VirtualBox");
-        }
+        Utf8Str homeDir;
+        GetVBoxUserHomeDirectory (homeDir);
 
         RTPrintf ("Updating settings files in the following VirtualBox Home Directory:\n"

trunk/src/VBox/Frontends/VirtualBox/include/COMDefs.h

@@ -28 +28 @@
 #define __COMDefs_h__
 
+
+/* Both VBox/com/assert.h and qglobal.h contain a definition of ASSERT.
+ * Either of them can be already included here, so try to shut them up.  */
+#undef ASSERT
+
+#include <VBox/com/com.h>
+
+#undef ASSERT
+
 #include <qglobal.h>
 #include <qstring.h>
@@ -35 +44 @@
 
 /*
- * common COM / XPCOM includes and defines
+ * Additional COM / XPCOM defines and includes
  */
 
-#if defined(Q_OS_WIN32)
-
-    #include <objbase.h>
-    /* for _ATL_IIDOF */
-    #include <atldef.h>
-
-    #include <VBox/types.h>
-
-    /* these are XPCOM only */
-    #define NS_DECL_ISUPPORTS
-
-    /* makes interface getter/setter names (n must be capitalized) */
-    #define COMGETTER(n)    get_##n
-    #define COMSETTER(n)    put_##n
-
-    #define IN_BSTRPARAM    BSTR
-    #define IN_GUIDPARAM    GUID
-
-    /* const reference to IID of the interface */
-    #define COM_IIDOF(I)    _ATL_IIDOF (I)
-
-#else
-
-    #include <VBox/types.h>
-
-    #include <nsMemory.h>
-    #include <nsIComponentManager.h>
-    #include <ipcIDConnectService.h>
-
-    class nsIComponentManager;
-    class nsIEventQueue;
-    class ipcIDConnectService;
-
-    typedef nsCID   CLSID;
-    typedef nsIID   IID;
-
-    class XPCOMEventQSocketListener;
-
-    #define STDMETHOD(a) NS_IMETHOD a
-    #define STDMETHODIMP NS_IMETHODIMP
-
-    #define HRESULT     nsresult
-    #define SUCCEEDED   NS_SUCCEEDED
-    #define FAILED      NS_FAILED
-
-    /// @todo error code mappings
-    #define S_OK            NS_OK
-    #define E_UNEXPECTED    (HRESULT)0x8000FFFFL
-    #define E_NOTIMPL       (HRESULT)0x80004001L
-    #define E_OUTOFMEMORY   (HRESULT)0x8007000EL
-    #define E_INVALIDARG    (HRESULT)0x80070057L
-    #define E_NOINTERFACE   (HRESULT)0x80004002L
-    #define E_POINTER       (HRESULT)0x80004003L
-    #define E_HANDLE        (HRESULT)0x80070006L
-    #define E_ABORT         (HRESULT)0x80004004L
-    #define E_FAIL          (HRESULT)0x80004005L
-    #define E_ACCESSDENIED  (HRESULT)0x80070005L
-
-    #define IUnknown    nsISupports
-
-    #define BOOL        PRBool
-    #define BYTE        PRUint8
-    #define SHORT       PRInt16
-    #define USHORT      PRUint16
-    #define LONG        PRInt32
-    #define ULONG       PRUint32
-    #define LONG64      PRInt64
-    #define ULONG64     PRUint64
-
-    #define BSTR        PRUnichar*
-    #define LPBSTR      BSTR*
-    #define OLECHAR     wchar_t
-    #define GUID        nsID
-
-    #define IN_BSTRPARAM    const BSTR
-    #define IN_GUIDPARAM    const nsID &
-
-    /* makes interface getter/setter names (n must be capitalized) */
-    #define COMGETTER(n)    Get##n
-    #define COMSETTER(n)    Set##n
-
-    /* const reference to IID of the interface */
-    #define COM_IIDOF(I)    NS_GET_IID (I)
-
-    /* helper functions (defined in the Runtime3 library) */
-    extern "C" {
-        BSTR SysAllocString (const OLECHAR* sz);
-        BSTR SysAllocStringByteLen (char *psz, unsigned int len);
-        BSTR SysAllocStringLen (const OLECHAR *pch, unsigned int cch);
-        void SysFreeString (BSTR bstr);
-        int SysReAllocString (BSTR *pbstr, const OLECHAR *psz);
-        int SysReAllocStringLen (BSTR *pbstr, const OLECHAR *psz, unsigned int cch);
-        unsigned int SysStringByteLen (BSTR bstr);
-        unsigned int SysStringLen (BSTR bstr);
-    }
-
-#endif
+#define IN_BSTRPARAM    INPTR BSTR
+#define IN_GUIDPARAM    INPTR GUIDPARAM
+
+#if !defined (VBOX_WITH_XPCOM)
+
+#else /* !defined (VBOX_WITH_XPCOM) */
+
+#include <nsXPCOM.h>
+#include <nsMemory.h>
+#include <nsIComponentManager.h>
+
+class XPCOMEventQSocketListener;
+
+#endif /* !defined (VBOX_WITH_XPCOM) */
+
 
 /* VirtualBox interfaces declarations */
-#if defined(Q_OS_WIN32)
+#if !defined (VBOX_WITH_XPCOM)
     #include <VirtualBox.h>
-#else
+#else /* !defined (VBOX_WITH_XPCOM) */
     #include <VirtualBox_XPCOM.h>
-#endif
+#endif /* !defined (VBOX_WITH_XPCOM) */
 
 #include "VBoxDefs.h"
+
 
 /////////////////////////////////////////////////////////////////////////////
@@ -217 +145 @@
     static HRESULT cleanupCOM();
 
+#if !defined (VBOX_WITH_XPCOM)
+
     /** Converts a GUID value to QUuid */
-#if defined (Q_OS_WIN32)
-    static QUuid toQUuid (const GUID &id) {
+    static QUuid toQUuid (const GUID &id)
+    {
         return QUuid (id.Data1, id.Data2, id.Data3,
                       id.Data4[0], id.Data4[1], id.Data4[2], id.Data4[3],
                       id.Data4[4], id.Data4[5], id.Data4[6], id.Data4[7]);
     }
-#else
-    static QUuid toQUuid (const nsID &id) {
+
+#else /* !defined (VBOX_WITH_XPCOM) */
+
+    /** Converts a GUID value to QUuid */
+    static QUuid toQUuid (const nsID &id)
+    {
         return QUuid (id.m0, id.m1, id.m2,
                       id.m3[0], id.m3[1], id.m3[2], id.m3[3],
                       id.m3[4], id.m3[5], id.m3[6], id.m3[7]);
     }
-#endif
+
+#endif /* !defined (VBOX_WITH_XPCOM) */
 
     /**
@@ -251 +186 @@
     COMBase() : mRC (S_OK) {};
 
-#if !defined (Q_OS_WIN32)
-    static nsIComponentManager *gComponentManager;
-    static nsIEventQueue* gEventQ;
-    static ipcIDConnectService *gDConnectService;
-    static PRUint32 gVBoxServerID;
-
-    static XPCOMEventQSocketListener *gSocketListener;
+#if defined (VBOX_WITH_XPCOM)
+    static XPCOMEventQSocketListener *sSocketListener;
 #endif
 
@@ -264 +194 @@
     {
     public:
+
         BSTRIn (const QString &s) : bstr (SysAllocString ((const OLECHAR *) s.ucs2())) {}
-        ~BSTRIn() {
+
+        ~BSTRIn()
+        {
             if (bstr)
                 SysFreeString (bstr);
         }
+
         operator BSTR() const { return bstr; }
 
     private:
+
         BSTR bstr;
     };
@@ -279 +214 @@
     {
     public:
+
         BSTROut (QString &s) : str (s), bstr (0) {}
-        ~BSTROut() {
+
+        ~BSTROut()
+        {
             if (bstr) {
                 str = QString::fromUcs2 (bstr);
@@ -286 +224 @@
             }
         }
+
         operator BSTR *() { return &bstr; }
 
     private:
+
         QString &str;
         BSTR bstr;
@@ -298 +238 @@
     {
     public:
+
         ENUMOut (CE &e) : ce (e), ve ((VE) 0) {}
         ~ENUMOut() { ce = (CE) ve; }
@@ -303 +244 @@
 
     private:
+
         CE &ce;
         VE ve;
     };
 
-#if defined (Q_OS_WIN32)
+#if !defined (VBOX_WITH_XPCOM)
 
     /** Adapter to pass QUuid as input GUID params */
-    GUID GUIDIn (const QUuid &uuid) const { return uuid; }
+    static GUID GUIDIn (const QUuid &uuid) { return uuid; }
 
     /** Adapter to pass QUuid as output GUID params */
@@ -316 +258 @@
     {
     public:
-        GUIDOut (QUuid &id) : uuid (id) {
+
+        GUIDOut (QUuid &id) : uuid (id)
+        {
             ::memset (&guid, 0, sizeof (GUID));
         }
-        ~GUIDOut() {
+
+        ~GUIDOut()
+        {
             uuid = QUuid (
                 guid.Data1, guid.Data2, guid.Data3,
                 guid.Data4[0], guid.Data4[1], guid.Data4[2], guid.Data4[3],
-                guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]
-            );
-        }
+                guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]);
+        }
+
         operator GUID *() { return &guid; }
 
     private:
+
         QUuid &uuid;
         GUID guid;
     };
 
-#else
+#else /* !defined (VBOX_WITH_XPCOM) */
 
     /** Adapter to pass QUuid as input GUID params */
-    static const nsID &GUIDIn (const QUuid &uuid) {
+    static const nsID &GUIDIn (const QUuid &uuid)
+    {
         return *(const nsID *) &uuid;
     }
@@ -344 +292 @@
     {
     public:
+
         GUIDOut (QUuid &id) : uuid (id), nsid (0) {}
-        ~GUIDOut() {
-            if (nsid) {
+
+        ~GUIDOut()
+        {
+            if (nsid)
+            {
                 uuid = QUuid (
                     nsid->m0, nsid->m1, nsid->m2,
                     nsid->m3[0], nsid->m3[1], nsid->m3[2], nsid->m3[3],
-                    nsid->m3[4], nsid->m3[5], nsid->m3[6], nsid->m3[7]
-                );
+                    nsid->m3[4], nsid->m3[5], nsid->m3[6], nsid->m3[7]);
                 nsMemory::Free (nsid);
             }
         }
+
         operator nsID **() { return &nsid; }
 
     private:
+
         QUuid &uuid;
         nsID *nsid;
     };
 
-#endif
+#endif /* !defined (VBOX_WITH_XPCOM) */
 
     void fetchErrorInfo (IUnknown * /*callee*/, const GUID * /*calleeIID*/) const {}
@@ -394 +347 @@
     COMBaseWithEI() : COMBase () {};
 
-    void fetchErrorInfo (IUnknown *callee, const GUID *calleeIID) const {
+    void fetchErrorInfo (IUnknown *callee, const GUID *calleeIID) const
+    {
         mErrInfo.fetchFromCurrentThread (callee, calleeIID);
     }
@@ -484 +438 @@
         if (!mIface)
         {
-#if defined (Q_OS_WIN32)
+#if !defined (VBOX_WITH_XPCOM)
+
             B::mRC = CoCreateInstance (clsid, NULL, CLSCTX_ALL,
-                                       _ATL_IIDOF (I), (void**) &mIface);
-#else
-            /* first, try to create an instance within the in-proc server
-             * (for compatibility with Win32) */
-            B::mRC = B::gComponentManager->
-                CreateInstance (clsid, nsnull, NS_GET_IID (I), (void**) &mIface);
-            if (FAILED (B::mRC) && B::gDConnectService && B::gVBoxServerID)
-            {
-                /* now try the out-of-proc server if it exists */
-                B::mRC = B::gDConnectService->
-                    CreateInstance (B::gVBoxServerID, clsid,
-                                    NS_GET_IID (I), (void**) &mIface);
-            }
-#endif
+                                       _ATL_IIDOF (I), (void **) &mIface);
+
+#else /* !defined (VBOX_WITH_XPCOM) */
+
+            nsCOMPtr <nsIComponentManager> manager;
+            B::mRC = NS_GetComponentManager (getter_AddRefs (manager));
+            if (SUCCEEDED (B::mRC))
+                B::mRC = manager->CreateInstance (clsid, nsnull, NS_GET_IID (I),
+                                                  (void **) &mIface);
+
+#endif /* !defined (VBOX_WITH_XPCOM) */
+
             /* fetch error info, but don't assert if it's missing -- many other
              * reasons can lead to an error (w/o providing error info), not only
@@ -524 +477 @@
         B::mRC = S_OK;
         if (i)
-#if defined (Q_OS_WIN32)
-            B::mRC = i->QueryInterface (_ATL_IIDOF (I), (void**) &mIface);
-#else
-            B::mRC = i->QueryInterface (NS_GET_IID (I), (void**) &mIface);
-#endif
+#if !defined (VBOX_WITH_XPCOM)
+            B::mRC = i->QueryInterface (_ATL_IIDOF (I), (void **) &mIface);
+#else /* !defined (VBOX_WITH_XPCOM) */
+            B::mRC = i->QueryInterface (NS_GET_IID (I), (void **) &mIface);
+#endif /* !defined (VBOX_WITH_XPCOM) */
         release (old_iface);
     };
@@ -575 +528 @@
         mIface = NULL;
         if (that.mIface)
-#if defined (Q_OS_WIN32)
+#if !defined (VBOX_WITH_XPCOM)
             mRC = that.mIface->QueryInterface (_ATL_IIDOF (IUnknown), (void**) &mIface);
-#else
+#else /* !defined (VBOX_WITH_XPCOM) */
             mRC = that.mIface->QueryInterface (NS_GET_IID (IUnknown), (void**) &mIface);
-#endif
-        if (SUCCEEDED (mRC)) {
+#endif /* !defined (VBOX_WITH_XPCOM) */
+        if (SUCCEEDED (mRC))
+        {
             mRC = that.lastRC();
             mErrInfo = that.errorInfo();
         }
     }
+
     /* specialization for CUnknown */
-    CUnknown (const CUnknown &that) : CInterface <IUnknown, COMBaseWithEI> () {
+    CUnknown (const CUnknown &that) : CInterface <IUnknown, COMBaseWithEI> ()
+    {
         mIface = that.mIface;
         addref (mIface);
@@ -593 +549 @@
 
     template <class C>
-    CUnknown &operator= (const C &that) {
+    CUnknown &operator= (const C &that)
+    {
         /* be aware of self (from COM point of view) assignment */
         IUnknown *old_iface = mIface;
         mIface = NULL;
         mRC = S_OK;
-#if defined (Q_OS_WIN32)
+#if !defined (VBOX_WITH_XPCOM)
         if (that.mIface)
             mRC = that.mIface->QueryInterface (_ATL_IIDOF (IUnknown), (void**) &mIface);
-#else
+#else /* !defined (VBOX_WITH_XPCOM) */
         if (that.mIface)
             mRC = that.mIface->QueryInterface (NS_GET_IID (IUnknown), (void**) &mIface);
-#endif
-        if (SUCCEEDED (mRC)) {
+#endif /* !defined (VBOX_WITH_XPCOM) */
+        if (SUCCEEDED (mRC))
+        {
             mRC = that.lastRC();
             mErrInfo = that.errorInfo();
@@ -612 +570 @@
         return *this;
     }
+
     /* specialization for CUnknown */
-    CUnknown &operator= (const CUnknown &that) {
+    CUnknown &operator= (const CUnknown &that)
+    {
         attach (that.mIface);
         COMBaseWithEI::operator= (that);

trunk/src/VBox/Frontends/VirtualBox/src/COMDefs.cpp

@@ -23 +23 @@
 #include "COMDefs.h"
 
-#if defined (Q_OS_WIN32)
-
-// for CComPtr/CComQIPtr
-#include <atlcomcli.h>
-#include <VBox/com/assert.h>
-
-#else // !defined (Q_OS_WIN32)
+#if !defined (VBOX_WITH_XPCOM)
+
+#else /* !defined (VBOX_WITH_XPCOM) */
 
 #include <qobject.h>
-#include <qapplication.h>
-#include <qfile.h>
 #include <qsocketnotifier.h>
-#ifdef DEBUG
-    #include <qfileinfo.h>
-#endif
-
-#include <nsXPCOMGlue.h>
-#include <nsIServiceManager.h>
-#include <nsIComponentRegistrar.h>
-// for NS_InitXPCOM2 with bin dir parameter
-#include <nsEmbedString.h>
-#include <nsIFile.h>
-#include <nsILocalFile.h>
-// for dconnect
-#include <ipcIService.h>
-#include <ipcCID.h>
-// XPCOM headers still do not define this, so define by hand
-#define IPC_DCONNECTSERVICE_CONTRACTID \
-    "@mozilla.org/ipc/dconnect-service;1"
-// for event queue management
+
 #include <nsEventQueueUtils.h>
 #include <nsIEventQueue.h>
 
-// for IID to name resolution
-#include <nsIInterfaceInfo.h>
-#include <nsIInterfaceInfoManager.h>
-
 // for exception fetching
 #include <nsIExceptionService.h>
 
-#undef ASSERT
-#include <VBox/com/assert.h>
 #include <iprt/env.h>
 #include <iprt/path.h>
 #include <iprt/param.h>
 #include <iprt/err.h>
-
-nsIComponentManager *COMBase::gComponentManager = nsnull;
-nsIEventQueue* COMBase::gEventQ = nsnull;
-ipcIDConnectService *COMBase::gDConnectService = nsnull;
-PRUint32 COMBase::gVBoxServerID = 0;
 
 /* Mac OS X (Carbon mode) and OS/2 will notify the native queue
@@ -80 +46 @@
    very silly. */
 # if !defined (Q_OS_MAC)  && !defined (Q_OS_OS2)
-XPCOMEventQSocketListener *COMBase::gSocketListener = 0;
+XPCOMEventQSocketListener *COMBase::sSocketListener = 0;
+
 # endif
 
@@ -103 +70 @@
     }
 
+    virtual ~XPCOMEventQSocketListener()
+    {
+        delete mNotifier;
+    }
+
 public slots:
 
@@ -110 +82 @@
 
     QSocketNotifier *mNotifier;
-    nsIEventQueue *mEventQ;
+    nsCOMPtr <nsIEventQueue> mEventQ;
 };
 
-#endif // !defined (Q_OS_WIN32)
+#endif /* !defined (VBOX_WITH_XPCOM) */
 
 /**
@@ -122 +94 @@
     LogFlowFuncEnter();
 
-#if defined (Q_OS_WIN32)
+    HRESULT rc = S_OK;
+
+#if !defined (VBOX_WITH_XPCOM)
 
     /* disable this damn CoInitialize* somehow made by Qt during
@@ -128 +102 @@
      * why does it do this) */
     CoUninitialize();
-    CoInitializeEx (NULL, COINIT_MULTITHREADED |
-                          COINIT_DISABLE_OLE1DDE |
-                          COINIT_SPEED_OVER_MEMORY);
-
-    LogFlowFuncLeave();
-    return S_OK;
-
-#else
-
-    if (gComponentManager)
-    {
-        LogFlowFuncLeave();
-        return S_OK;
-    }
-
-    /*
-     * Set VBOX_XPCOM_HOME if not present like we do in the common glue code.
-     * (XPCOMGlueStartup will query this.)
-     */
-    if (!RTEnvExist ("VBOX_XPCOM_HOME"))
-    {
-        /* get the executable path */
-        char szPathProgram [RTPATH_MAX];
-        int rcVBox = RTPathProgram (szPathProgram, sizeof (szPathProgram));
-        if (RT_SUCCESS (rcVBox))
-            RTEnvSet ("VBOX_XPCOM_HOME", szPathProgram);
-    }
-
-    HRESULT rc;
-    XPCOMGlueStartup (nsnull);
-
-    nsCOMPtr <nsIServiceManager> serviceManager;
-
-    /* create a file object containing the path to the executable */
-    QCString appDir;
+
+#endif /* !defined (VBOX_WITH_XPCOM) */
+
+    rc = com::Initialize();
+
+#if defined (VBOX_WITH_XPCOM)
+
+#if !defined (__DARWIN__) && !defined (__OS2__)
+
+    if (NS_SUCCEEDED (rc))
+    {
+        nsCOMPtr <nsIEventQueue> eventQ;
+        rc = NS_GetMainEventQ (getter_AddRefs (eventQ));
+        if (NS_SUCCEEDED (rc))
+        {
 #ifdef DEBUG
-    appDir = getenv ("VIRTUALBOX_APP_HOME");
-    if (!appDir.isNull())
-        appDir = QFile::encodeName (QFileInfo (QFile::decodeName (appDir)).absFilePath());
-    else
+            BOOL isNative = FALSE;
+            eventQ->IsQueueNative (&isNative);
+            AssertMsg (isNative, ("The event queue must be native"));
 #endif
-    appDir = QFile::encodeName (qApp->applicationDirPath());
-    nsCOMPtr <nsILocalFile> lfAppDir;
-    rc = NS_NewNativeLocalFile (nsEmbedCString (appDir.data()), PR_FALSE,
-                                getter_AddRefs (lfAppDir));
-    if (SUCCEEDED (rc))
-    {
-        nsCOMPtr <nsIFile> fAppDir = do_QueryInterface (lfAppDir, &rc);
-        if (SUCCEEDED( rc ))
-        {
-            /* initialize XPCOM and get the service manager */
-            rc = NS_InitXPCOM2 (getter_AddRefs (serviceManager), fAppDir, nsnull);
-        }
-    }
-
-    if (SUCCEEDED (rc))
-    {
-        /* get the registrar */
-        nsCOMPtr <nsIComponentRegistrar> registrar =
-            do_QueryInterface (serviceManager, &rc);
-        if (SUCCEEDED (rc))
-        {
-            /* autoregister components from a component directory */
-            registrar->AutoRegister (nsnull);
-
-            /* get the component manager */
-            rc = registrar->QueryInterface (NS_GET_IID (nsIComponentManager),
-                                            (void**) &gComponentManager);
-            if (SUCCEEDED (rc))
+            BOOL isOnMainThread = FALSE;
+            rc = eventQ->IsOnCurrentThread (&isOnMainThread);
+            if (NS_SUCCEEDED (rc) && isOnMainThread)
             {
-                /* get the main thread's event queue (afaik, the
-                 * dconnect service always gets created upon XPCOM
-                 * startup, so it will use the main (this) thread's
-                 * event queue to receive IPC events) */
-                rc = NS_GetMainEventQ (&gEventQ);
-#ifdef DEBUG
-                BOOL isNative = FALSE;
-                gEventQ->IsQueueNative (&isNative);
-                AssertMsg (isNative, ("The event queue must be native"));
-#endif
-# if !defined (__DARWIN__) && !defined (__OS2__)
-                gSocketListener = new XPCOMEventQSocketListener (gEventQ);
-# endif
-
-/// @todo remove the below code and corresponding variables etc. when
-/// the server autostart feature is finished and well tested.
-///
-//                /* get the IPC service */
-//                 nsCOMPtr <ipcIService> ipcServ =
-//                     do_GetService (IPC_SERVICE_CONTRACTID, serviceManager, &rc);
-//                 if (SUCCEEDED (rc))
-//                 {
-//                     /* get the VirtualBox out-of-proc server ID */
-//                     rc = ipcServ->ResolveClientName ("VirtualBoxServer",
-//                                                      &gVBoxServerID);
-//                     if (SUCCEEDED (rc))
-//                     {
-//                         /* get the DConnect service */
-//                         rc = serviceManager->
-//                             GetServiceByContractID (IPC_DCONNECTSERVICE_CONTRACTID,
-//                                                     NS_GET_IID (ipcIDConnectService),
-//                                                     (void **) &gDConnectService);
-//                     }
-//                 }
+                sSocketListener = new XPCOMEventQSocketListener (eventQ);
             }
         }
     }
 
+#endif
+
+#endif /* defined (VBOX_WITH_XPCOM) */
+
     if (FAILED (rc))
         cleanupCOM();
+
+    AssertComRC (rc);
 
     LogFlowFunc (("rc=%08X\n", rc));
@@ -243 +144 @@
     return rc;
 
-#endif
 }
 
 /**
- *  Initializes COM/XPCOM.
+ *  Cleans up COM/XPCOM.
  */
 HRESULT COMBase::cleanupCOM()
@@ -253 +153 @@
     LogFlowFuncEnter();
 
-#if defined (Q_OS_WIN32)
-    CoUninitialize();
-#else
-    if (gComponentManager)
-    {
-        PRBool isOnCurrentThread = true;
-        if (gEventQ)
-            gEventQ->IsOnCurrentThread (&isOnCurrentThread);
-
-        if (isOnCurrentThread)
+    HRESULT rc = S_OK;
+
+#if defined (VBOX_WITH_XPCOM)
+
+    /* scope the code to make smart references are released before calling
+     * com::Shutdown() */
+    {
+        nsCOMPtr <nsIEventQueue> eventQ;
+        rc = NS_GetMainEventQ (getter_AddRefs (eventQ));
+        if (NS_SUCCEEDED (rc))
         {
-            LogFlowFunc (("Doing cleanup...\n"));
+            BOOL isOnMainThread = FALSE;
+            rc = eventQ->IsOnCurrentThread (&isOnMainThread);
+            if (NS_SUCCEEDED (rc) && isOnMainThread)
+            {
 # if !defined (__DARWIN__) && !defined (__OS2__)
-            if (gSocketListener)
-                delete gSocketListener;
+                if (sSocketListener)
+                {
+                    delete sSocketListener;
+                    sSocketListener = NULL;
+                }
 # endif
-            if (gDConnectService)
-            {
-                gDConnectService->Release();
-                gDConnectService = nsnull;
             }
-            if (gEventQ)
-            {
-                gEventQ->Release();
-                gEventQ = nsnull;
-            }
-            gComponentManager->Release();
-            gComponentManager = nsnull;
-            /* note: gComponentManager = nsnull indicates that we're
-             * cleaned up */
-            NS_ShutdownXPCOM (nsnull);
-            XPCOMGlueShutdown();
         }
     }
-#endif
-
+
+#endif /* defined (VBOX_WITH_XPCOM) */
+
+    HRESULT rc2 = com::Shutdown();
+    if (SUCCEEDED (rc))
+        rc = rc2;
+
+    AssertComRC (rc);
+
+    LogFlowFunc (("rc=%08X\n", rc));
     LogFlowFuncLeave();
-    return S_OK;
+    return rc;
 }
 
@@ -358 +257 @@
     HRESULT rc = E_FAIL;
 
-#if defined (__WIN__)
+#if !defined (VBOX_WITH_XPCOM)
 
     if (callee)
@@ -405 +304 @@
     }
 
-#else // !defined (__WIN__)
+#else /* !defined (VBOX_WITH_XPCOM) */
 
     nsCOMPtr <nsIExceptionService> es;
@@ -458 +357 @@
     AssertComRC (rc);
 
-#endif // !defined (__WIN__)
+#endif /* !defined (VBOX_WITH_XPCOM) */
 
     if (callee && calleeIID && mIsBasicAvailable)
@@ -472 +371 @@
     QString name;
 
-#if defined (__WIN__)
-
-    LONG rc;
-    LPOLESTR iidStr = NULL;
-    if (StringFromIID (id, &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
-                    BSTR bstrName = SysAllocStringLen (NULL, (sz + 1) / sizeof (TCHAR) + 1);
-                    rc = RegQueryValueExW (iidKey, NULL, NULL, NULL, (LPBYTE) bstrName, &sz);
-                    if (rc == ERROR_SUCCESS)
-                    {
-                        name = QString::fromUcs2 (bstrName);
-                    }
-                    SysFreeString (bstrName);
-                }
-                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 (&COMBase::GUIDIn (id), getter_AddRefs (iinfo));
-        if (NS_SUCCEEDED (rv))
-        {
-            const char *iname = NULL;
-            iinfo->GetNameShared (&iname);
-            name = QString::fromLocal8Bit (iname);
-        }
-    }
-
-#endif
+    com::GetInterfaceNameByIID (COMBase::GUIDIn (id), COMBase::BSTROut (name));
 
     return name;
 }
 
-#if !defined (Q_OS_WIN32)
+#if defined (VBOX_WITH_XPCOM)
 #include "COMDefs.moc"
 #endif

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -40 +40 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <VBox/err.h>
+
 #include <iprt/path.h>
 #include <iprt/dir.h>
@@ -48 +48 @@
 #include <iprt/thread.h>
 #include <iprt/process.h>
+
+#include <VBox/err.h>
 #include <VBox/param.h>
 #include <VBox/VBoxHDD.h>
@@ -54 +56 @@
 #include <VBox/version.h>
 
+#include <VBox/com/com.h>
+
 #include <algorithm>
 #include <set>
@@ -61 +65 @@
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __DARWIN__
-#define VBOXCONFIGDIR        "Library/VirtualBox"
-#else
-#define VBOXCONFIGDIR        ".VirtualBox"
-#endif 
-#define VBOXCONFIGGLOBALFILE "VirtualBox.xml"
+#define VBOX_GLOBAL_SETTINGS_FILE "VirtualBox.xml"
 
 // globals
@@ -138 +137 @@
     LogFlowThisFunc (("Version: %ls\n", sVersion.raw()));
 
-    int vrc = VINF_SUCCESS;
-    char buf [RTPATH_MAX];
-
-    /*
-     *  Detect the VirtualBox home directory. Note that the code below must
-     *  be in sync with the appropriate code in Logging.cpp
-     *  (MainReleaseLoggerInit()).
-     */
-    {
-        /* check if an alternative VBox Home directory is set */
-        const char *vboxUserHome = getenv ("VBOX_USER_HOME");
-        if (vboxUserHome)
-        {
-            /* get the full path name */
-            vrc = RTPathAbs (vboxUserHome, buf, sizeof (buf));
-            if (VBOX_FAILURE (vrc))
-                return setError (E_FAIL,
-                    tr ("Invalid home directory file path '%s' (%Vrc)"),
-                    vboxUserHome, vrc);
-            unconst (mData.mHomeDir) = buf;
-        }
-        else
-        {
-            /* compose the config directory (full path) */
-            RTPathUserHome (buf, sizeof (buf));
-            unconst (mData.mHomeDir) = Utf8StrFmt ("%s%c%s", buf,
-                                                   RTPATH_DELIMITER,
-                                                   VBOXCONFIGDIR);
-        }
-
-        /* ensure the home directory exists */
-        if (!RTDirExists (mData.mHomeDir))
-        {
-            vrc = RTDirCreateFullPath (mData.mHomeDir, 0777);
-            if (VBOX_FAILURE (vrc))
-            {
-                return setError (E_FAIL,
-                    tr ("Could not create the VirtualBox home directory '%s'"
-                        "(%Vrc)"),
-                    mData.mHomeDir.raw(), vrc);
-            }
-        }
-    }
+    /* Get the VirtualBox home directory. */
+    int vrc = com::GetVBoxUserHomeDirectory (unconst (mData.mHomeDir));
+    if (VBOX_FAILURE (vrc))
+        return setError (E_FAIL,
+            tr ("Could not create the VirtualBox home directory '%s'"
+                "(%Vrc)"),
+            mData.mHomeDir.raw(), vrc);
 
     /* compose the global config file name (always full path) */
     Utf8StrFmt vboxConfigFile ("%s%c%s", mData.mHomeDir.raw(),
-                               RTPATH_DELIMITER, VBOXCONFIGGLOBALFILE);
+                               RTPATH_DELIMITER, VBOX_GLOBAL_SETTINGS_FILE);
 
     /* store the config file name */

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

@@ -23 +23 @@
 #include <objbase.h>
 
-#else
+#else /* !defined (VBOX_WITH_XPCOM) */
 
 #include <stdlib.h>
-#include <VBox/err.h>
-#include <iprt/path.h>
 
-#include <nsXPCOMGlue.h>
-#include <nsIComponentRegistrar.h>
-#include <nsIServiceManager.h>
 #include <nsCOMPtr.h>
-#include <nsEventQueueUtils.h>
+#include <nsIServiceManagerUtils.h>
 
 #include <nsIInterfaceInfo.h>
 #include <nsIInterfaceInfoManager.h>
 
-#endif
+#endif /* !defined (VBOX_WITH_XPCOM) */
 
+#include <iprt/param.h>
+#include <iprt/path.h>
+#include <iprt/dir.h>
+#include <iprt/env.h>
 #include <iprt/string.h>
+
 #include <VBox/err.h>
 
 #include "VBox/com/com.h"
 #include "VBox/com/assert.h"
+
+
+#ifdef __DARWIN__
+#define VBOX_USER_HOME_SUFFIX   "Library/VirtualBox"
+#else
+#define VBOX_USER_HOME_SUFFIX   ".VirtualBox"
+#endif 
+
 
 namespace com
@@ -95 +103 @@
     }
 
-#else
+#else /* !defined (VBOX_WITH_XPCOM) */
 
     nsresult rv;
@@ -122 +130 @@
     }
 
-#endif
+#endif /* !defined (VBOX_WITH_XPCOM) */
+}
+
+int GetVBoxUserHomeDirectory (Utf8Str &aDir)
+{
+    /* start with null */
+    aDir.setNull();
+
+    const char *VBoxUserHome = RTEnvGet ("VBOX_USER_HOME");
+
+    char path [RTPATH_MAX];
+    int vrc = VINF_SUCCESS;
+
+    if (VBoxUserHome)
+    {
+        /* get the full path name */
+        char *VBoxUserHomeUtf8 = NULL;
+        vrc = RTStrCurrentCPToUtf8 (&VBoxUserHomeUtf8, VBoxUserHome);
+        if (RT_SUCCESS (vrc))
+        {
+            vrc = RTPathAbs (VBoxUserHomeUtf8, path, sizeof (path));
+            if (RT_SUCCESS (vrc))
+                aDir = path;
+            RTStrFree (VBoxUserHomeUtf8);
+        }
+    }
+    else
+    {
+        /* compose the config directory (full path) */
+        vrc = RTPathUserHome (path, sizeof (path));
+        aDir = Utf8StrFmt ("%s%c%s", path, RTPATH_DELIMITER,
+                           VBOX_USER_HOME_SUFFIX);
+    }
+
+    /* ensure the home directory exists */
+    if (RT_SUCCESS (vrc))
+        if (!RTDirExists (aDir))
+            vrc = RTDirCreateFullPath (aDir, 0777);
+
+    return vrc;
 }
 

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

@@ -23 +23 @@
 #include <objbase.h>
 
-#else
+#else /* !defined (VBOX_WITH_XPCOM) */
 
 #include <stdlib.h>
-#include <VBox/err.h>
-#include <iprt/path.h>
 
 #include <nsXPCOMGlue.h>
@@ -34 +32 @@
 #include <nsCOMPtr.h>
 #include <nsEventQueueUtils.h>
-
-#include <nsIInterfaceInfo.h>
-#include <nsIInterfaceInfoManager.h>
-
-#endif
-
+#include <nsEmbedString.h>
+
+#include <nsILocalFile.h>
+#include <nsIDirectoryService.h>
+#include <nsDirectoryServiceDefs.h>
+
+#endif /* !defined (VBOX_WITH_XPCOM) */
+
+#include <iprt/param.h>
+#include <iprt/path.h>
 #include <iprt/string.h>
+#include <iprt/env.h>
+
 #include <VBox/err.h>
 
@@ -46 +50 @@
 #include "VBox/com/assert.h"
 
+
 namespace com
 {
+
+#if defined (VBOX_WITH_XPCOM)
+
+class DirectoryServiceProvider : public nsIDirectoryServiceProvider
+{
+public:
+
+    NS_DECL_ISUPPORTS
+
+    DirectoryServiceProvider()
+        : mCompRegLocation (NULL), mXPTIDatLocation (NULL)
+        {}
+
+    virtual ~DirectoryServiceProvider();
+
+    HRESULT init (const char *aCompRegLocation,
+                  const char *aXPTIDatLocation);
+
+    NS_DECL_NSIDIRECTORYSERVICEPROVIDER
+
+private:
+
+    char *mCompRegLocation;
+    char *mXPTIDatLocation;
+};
+
+NS_IMPL_ISUPPORTS1 (DirectoryServiceProvider, nsIDirectoryServiceProvider)
+
+DirectoryServiceProvider::~DirectoryServiceProvider()
+{
+    if (mCompRegLocation)
+    {
+        RTStrFree (mCompRegLocation);
+        mCompRegLocation = NULL;
+    }
+    if (mXPTIDatLocation)
+    {
+        RTStrFree (mXPTIDatLocation);
+        mXPTIDatLocation = NULL;
+    }
+}
+
+/**
+ *  @param aCompRegLocation Path to compreg.dat, in Utf8.
+ *  @param aXPTIDatLocation Path to xpti.data, in Utf8.
+ */
+HRESULT
+DirectoryServiceProvider::init (const char *aCompRegLocation,
+                                const char *aXPTIDatLocation)
+{
+    AssertReturn (aCompRegLocation, NS_ERROR_INVALID_ARG);
+    AssertReturn (aXPTIDatLocation, NS_ERROR_INVALID_ARG);
+
+    int vrc = RTStrUtf8ToCurrentCP (&mCompRegLocation, aCompRegLocation);
+    if (RT_SUCCESS (vrc))
+        vrc = RTStrUtf8ToCurrentCP (&mXPTIDatLocation, aXPTIDatLocation);
+
+    return RT_SUCCESS (vrc) ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
+}
+
+NS_IMETHODIMP
+DirectoryServiceProvider::GetFile (const char *aProp,
+                                   PRBool *aPersistent,
+                                   nsIFile **aRetval)
+{
+    nsCOMPtr <nsILocalFile> localFile;
+    nsresult rv = NS_ERROR_FAILURE;
+
+    *aRetval = nsnull;
+    *aPersistent = PR_TRUE;
+
+    const char *fileLocation = NULL;
+
+    if (strcmp (aProp, NS_XPCOM_COMPONENT_REGISTRY_FILE) == 0)
+        fileLocation = mCompRegLocation;
+    else if (strcmp (aProp, NS_XPCOM_XPTI_REGISTRY_FILE) == 0)
+        fileLocation = mXPTIDatLocation;
+    else
+        return NS_ERROR_FAILURE;
+
+    rv = NS_NewNativeLocalFile (nsEmbedCString (fileLocation),
+                                PR_TRUE, getter_AddRefs (localFile));  
+    if (NS_FAILED(rv))
+        return rv;
+
+    return localFile->QueryInterface (NS_GET_IID (nsIFile),
+                                      (void **) aRetval);
+}
+
+#endif /* defined (VBOX_WITH_XPCOM) */
 
 HRESULT Initialize()
@@ -59 +154 @@
                                COINIT_SPEED_OVER_MEMORY);
 
-#else
+#else /* !defined (VBOX_WITH_XPCOM) */
 
     /* Set VBOX_XPCOM_HOME if not present */
-    if (!getenv("VBOX_XPCOM_HOME"))
+    if (!RTEnvExist ("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);
-        }
+        char pathProgram [RTPATH_MAX];
+        int vrc = RTPathProgram (pathProgram, sizeof (pathProgram));
+        if (RT_SUCCESS (vrc))
+        {
+            char *pathProgramCP = NULL;
+            vrc = RTStrUtf8ToCurrentCP (&pathProgramCP, pathProgram);
+            if (RT_SUCCESS (vrc))
+            {
+                vrc = RTEnvSet ("VBOX_XPCOM_HOME", pathProgramCP);
+                RTStrFree (pathProgramCP);
+            }
+        }
+        AssertRC (vrc);
     }
 
@@ -78 +180 @@
     {
         XPCOMGlueStartup (nsnull);
-        nsCOMPtr <nsIServiceManager> serviceManager;
-        rc = NS_InitXPCOM2 (getter_AddRefs (serviceManager), nsnull, nsnull);
+
+        nsCOMPtr <DirectoryServiceProvider> dsProv;
+
+        /* prepare paths for registry files */
+        Utf8Str homeDir;
+        int vrc = GetVBoxUserHomeDirectory (homeDir);
+        if (RT_SUCCESS (vrc))
+        {
+            Utf8Str compReg = Utf8StrFmt ("%s%c%s", homeDir.raw(),
+                                          RTPATH_DELIMITER, "compreg.dat");
+            Utf8Str xptiDat = Utf8StrFmt ("%s%c%s", homeDir.raw(),
+                                          RTPATH_DELIMITER, "xpti.dat");
+            dsProv = new DirectoryServiceProvider();
+            if (dsProv)
+                rc = dsProv->init (compReg, xptiDat);
+            else
+                rc = NS_ERROR_OUT_OF_MEMORY;
+        }
+        else
+            rc = NS_ERROR_FAILURE;
+
+        /* get the path to the executable */
+        nsCOMPtr <nsIFile> appDir;
+        {
+            char path [RTPATH_MAX];
+            char *appDirCP = NULL;
+#if defined (DEBUG)
+            const char *env = RTEnvGet ("VIRTUALBOX_APP_HOME");
+            if (env)
+            {
+                char *appDirUtf8 = NULL;
+                vrc = RTStrCurrentCPToUtf8 (&appDirUtf8, env);
+                if (RT_SUCCESS (vrc))
+                {
+                    vrc = RTPathReal (appDirUtf8, path, RTPATH_MAX);
+                    if (RT_SUCCESS (vrc))
+                        vrc = RTStrUtf8ToCurrentCP (&appDirCP, appDirUtf8);
+                    RTStrFree (appDirUtf8);
+                }
+            }
+            else
+#endif
+            {
+                vrc = RTPathProgram (path, RTPATH_MAX);
+                if (RT_SUCCESS (vrc))
+                    vrc = RTStrUtf8ToCurrentCP (&appDirCP, path);
+            }
+
+            if (RT_SUCCESS (vrc))
+            {
+                nsCOMPtr<nsILocalFile> file;
+                rc = NS_NewNativeLocalFile (nsEmbedCString (appDirCP),
+                                            PR_FALSE, getter_AddRefs (file));
+                if (NS_SUCCEEDED (rc))
+                    appDir = do_QueryInterface (file, &rc);
+            
+                RTStrFree (appDirCP);
+            }
+            else
+                rc = NS_ERROR_FAILURE;
+        }
+
+        /* Finally, initialize XPCOM */
         if (NS_SUCCEEDED (rc))
         {
-            nsCOMPtr <nsIComponentRegistrar> registrar =
-                do_QueryInterface (serviceManager, &rc);
+            nsCOMPtr <nsIServiceManager> serviceManager;
+            rc = NS_InitXPCOM2 (getter_AddRefs (serviceManager),
+                                appDir, dsProv);
+
             if (NS_SUCCEEDED (rc))
-                registrar->AutoRegister (nsnull);
-        }
-    }
-
-#endif
+            {
+                nsCOMPtr <nsIComponentRegistrar> registrar =
+                    do_QueryInterface (serviceManager, &rc);
+                if (NS_SUCCEEDED (rc))
+                    registrar->AutoRegister (nsnull);
+            }
+        }
+    }
+
+#endif /* !defined (VBOX_WITH_XPCOM) */
 
     AssertComRC (rc);
@@ -96 +266 @@
 }
 
-void Shutdown()
-{
+HRESULT Shutdown()
+{
+    HRESULT rc = S_OK;
+
 #if !defined (VBOX_WITH_XPCOM)
 
     CoUninitialize();
 
-#else
+#else /* !defined (VBOX_WITH_XPCOM) */
 
     nsCOMPtr <nsIEventQueue> eventQ;
-    nsresult rc = NS_GetMainEventQ (getter_AddRefs (eventQ));
-    if (NS_SUCCEEDED (rc))
-    {
+    rc = NS_GetMainEventQ (getter_AddRefs (eventQ));
+
+    if (NS_SUCCEEDED (rc) || rc == NS_ERROR_NOT_AVAILABLE)
+    {
+        /* NS_ERROR_NOT_AVAILABLE seems to mean that
+         * nsIEventQueue::StopAcceptingEvents() has been called (see
+         * nsEventQueueService.cpp). We hope that this error code always means
+         * just that in this case and assume that we're on the main thread
+         * (it's a kind of unexpected behavior if a non-main thread ever calls
+         * StopAcceptingEvents() on the main event queue). */
+
         BOOL isOnMainThread = FALSE;
-        eventQ->IsOnCurrentThread (&isOnMainThread);
-        eventQ = nsnull; /* early release */
-        if (isOnMainThread)
+        if (NS_SUCCEEDED (rc))
+        {
+            rc = eventQ->IsOnCurrentThread (&isOnMainThread);
+            eventQ = nsnull; /* early release */
+        }
+        else
+        {
+            isOnMainThread = TRUE;
+            rc = NS_OK;
+        }
+
+        if (NS_SUCCEEDED (rc) && isOnMainThread)
         {
             /* only the main thread needs to uninitialize XPCOM */
-            NS_ShutdownXPCOM (nsnull);
+            rc = NS_ShutdownXPCOM (nsnull);
             XPCOMGlueShutdown();
         }
     }
 
-#endif
+#endif /* !defined (VBOX_WITH_XPCOM) */
+
+    AssertComRC (rc);
+
+    return rc;
 }
 

trunk/src/VBox/Main/linux/server.cpp

@@ -23 +23 @@
 #include <ipcCID.h>
 
-#include <nsIServiceManager.h>
 #include <nsIComponentRegistrar.h>
 
@@ -29 +28 @@
 #include <nsEventQueueUtils.h>
 
-// for NS_InitXPCOM2 with bin dir parameter
-#include <nsEmbedString.h>
-#include <nsIFile.h>
-#include <nsILocalFile.h>
+// for nsMyFactory
+#include <nsIGenericFactory.h>
+#include <nsIClassInfo.h>
 
 #include "linux/server.h"
+
 #include "Logging.h"
 
@@ -45 +44 @@
 #include <VBox/version.h>
 
-// for nsMyFactory
-#include "nsIGenericFactory.h"
-#include "nsIClassInfo.h"
+#include <VBox/com/com.h>
 
 #include <stdio.h>
@@ -1073 +1070 @@
     do
     {
-        XPCOMGlueStartup (nsnull);
-
-        char path [RTPATH_MAX];
-        path [0] = '\0';
-
-        nsCOMPtr<nsIFile> nsAppPath;
-        {
-            /* get the path to the executable */
-            char *appPath = NULL;
-#if defined (DEBUG)
-            appPath = getenv ("VIRTUALBOX_APP_HOME");
-            if (appPath)
-                RTPathReal (appPath, path, RTPATH_MAX);
-            else
-#endif
-                RTPathProgram (path, RTPATH_MAX);
-            appPath = path;
-
-            nsCOMPtr<nsILocalFile> file;
-            rc = NS_NewNativeLocalFile (nsEmbedCString (appPath),
-                                        PR_FALSE, getter_AddRefs (file));
-            if (NS_SUCCEEDED (rc))
-                nsAppPath = do_QueryInterface (file, &rc);
-        }
+        rc = com::Initialize();
         if (NS_FAILED (rc))
         {
-            printf ("ERROR: Failed to create file object! (rc=%08X)\n", rc);
+            printf ("ERROR: Failed to initialize XPCOM! (rc=%08X)\n", rc);
             break;
         }
 
-        /* not really necessary at the moment */
-#if 0
-        if (!RTProcGetExecutableName (path, sizeof (path)))
-        {
-            printf ("ERROR: Failed to get executable name!\n");
-            break;
-        }
-#endif
-
-        nsCOMPtr<nsIServiceManager> servMan;
-        NS_InitXPCOM2 (getter_AddRefs (servMan), nsAppPath, nsnull);
-        if (!servMan)
-        {
-            printf ("ERROR: Failed to get service manager!\n");
-            break;
-        }
-
-        nsCOMPtr<nsIComponentRegistrar> registrar = do_QueryInterface (servMan);
-        if (!registrar)
-        {
-            printf ("ERROR: Failed to get component registrar!\n");
+        nsCOMPtr <nsIComponentRegistrar> registrar;
+        rc = NS_GetComponentRegistrar (getter_AddRefs (registrar));
+        if (NS_FAILED (rc))
+        {
+            printf ("ERROR: Failed to get component registrar! (rc=%08X)\n", rc);
             break;
         }
@@ -1229 +1187 @@
         }
 
-        gIpcServ->RemoveName (path);
-
-        // stop accepting new events
+        gIpcServ->RemoveName (VBOXSVC_IPC_NAME);
+
+        /* stop accepting new events */
         gEventQ->StopAcceptingEvents();
-        // process any remaining events
+
+        /* process any remaining events */
         gEventQ->ProcessPendingEvents();
 
         printf ("Terminated event loop.\n");
-
     }
     while (0); // this scopes the nsCOMPtrs
@@ -1244 +1202 @@
     NS_IF_RELEASE (gEventQ);
 
-    // no nsCOMPtrs are allowed to be alive when you call NS_ShutdownXPCOM
-    LogFlowFunc (("Calling NS_ShutdownXPCOM()...\n"));
-    rc = NS_ShutdownXPCOM (nsnull);
-    LogFlowFunc (("Finished NS_ShutdownXPCOM() (rc=%08X)\n", rc));
+    /* no nsCOMPtrs are allowed to be alive when you call com::Shutdown(). */
+
+    LogFlowFunc (("Calling com::Shutdown()...\n"));
+    rc = com::Shutdown();
+    LogFlowFunc (("Finished com::Shutdown() (rc=%08X)\n", rc));
 
     if (NS_FAILED (rc))
         printf ("ERROR: Failed to shutdown XPCOM! (rc=%08X)\n", rc);
 
-    XPCOMGlueShutdown();
-
     printf ("XPCOM server has shutdown.\n");