Changeset 2976 in vbox for trunk/include/VBox/com

Timestamp:

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

Author:

vboxsync

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

21692

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/include/VBox/com

Files:

• com.h (modified) (3 diffs)
• defs.h (modified) (1 diff)
• ptr.h (modified) (11 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;