Changeset 60765 in vbox for trunk/include

Timestamp:

Apr 29, 2016 2:26:58 PM (9 years ago)

Author:

vboxsync

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

106960

Message:

API: stop using ATL and use a vastly smaller lookalike instead, plus a lot of cleanups

Location:

trunk/include/VBox/com

Files:

• defs.h (modified) (15 diffs)
• microatl.h (added)

trunk/include/VBox/com/defs.h

@@ -4 +4 @@
 
 /*
- * Copyright (C) 2006-2015 Oracle Corporation
+ * Copyright (C) 2006-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -82 +82 @@
 #include <objbase.h>
 #ifndef VBOX_COM_NO_ATL
-# define _ATL_FREE_THREADED
-
-# include <atlbase.h>
-#include <atlcom.h>
-#endif
+
+/* Do not use actual ATL, just provide a superficial lookalike ourselves. */
+# include <VBox/com/microatl.h>
+#endif /* VBOX_COM_NO_ATL */
 
 #define NS_DECL_ISUPPORTS
@@ -126 +125 @@
 #define IN_GUID GUID
 /** Output GUID argument of interface method declaration. */
-#define OUT_GUID GUID*
+#define OUT_GUID GUID *
 
 /** Makes the name of the getter interface function (n must be capitalized). */
@@ -250 +249 @@
  *  @param I    interface class
  */
-#define COM_IIDOF(I) _ATL_IIDOF(I)
+#define COM_IIDOF(I) __uuidof(I)
 
 /**
@@ -280 +279 @@
 
 #include <nsID.h>
+
+#ifndef VBOX_COM_NO_ATL
+
+namespace ATL
+{
 
 #define ATL_NO_VTABLE
@@ -292 +296 @@
 #define END_COM_MAP() NS_DECL_ISUPPORTS
 #define COM_INTERFACE_ENTRY_AGGREGATE(a,b)
+
+/* A few very simple ATL emulator classes to provide
+ * FinalConstruct()/FinalRelease() functionality with XPCOM. */
+
+class CComMultiThreadModel
+{
+};
+
+template <class DummyThreadModel> class CComObjectRootEx
+{
+public:
+    HRESULT FinalConstruct()
+    {
+        return S_OK;
+    }
+    void FinalRelease()
+    {
+    }
+};
+
+template <class DummyThreadModel> class CComObject
+{
+public:
+    virtual ~CComObject() { this->FinalRelease(); }
+};
+
+} /* namespace ATL */
+
+#endif /* !VBOX_COM_NO_ATL */
 
 #define HRESULT     nsresult
@@ -394 +427 @@
 #define COM_STRUCT_OR_CLASS(I) class I
 
-namespace ATL
-{
-
-/* A few very simple ATL emulator classes to provide
- * FinalConstruct()/FinalRelease() functionality on Linux. */
-
-class CComMultiThreadModel
-{
-};
-
-template <class Base> class CComObjectRootEx : public Base
-{
-public:
-    HRESULT FinalConstruct() { return S_OK; }
-    void FinalRelease() {}
-};
-
-template <class Base> class CComObject : public Base
-{
-public:
-    virtual ~CComObject() { this->FinalRelease(); }
-};
-
-} /* namespace ATL */
-
-using namespace ATL;
-
 /* helper functions */
 extern "C"
 {
-BSTR SysAllocString(const OLECHAR* sz);
+BSTR SysAllocString(const OLECHAR *sz);
 BSTR SysAllocStringByteLen(char *psz, unsigned int len);
 BSTR SysAllocStringLen(const OLECHAR *pch, unsigned int cch);
@@ -434 +440 @@
 }
 
+#ifndef VBOX_COM_NO_ATL
+
 /**
  *  'Constructor' for the component class.
@@ -455 +463 @@
     }                                                                         \
                                                                               \
-    CComObject <_InstanceClass> *inst = new CComObject <_InstanceClass>();    \
+    CComObject<_InstanceClass> *inst = new CComObject<_InstanceClass>();      \
     if (NULL == inst) {                                                       \
         rv = NS_ERROR_OUT_OF_MEMORY;                                          \
@@ -486 +494 @@
     nsresult rv;                                                              \
                                                                               \
-    _InstanceClass * inst = NULL;       /* initialized to shut up gcc */      \
+    _InstanceClass *inst = NULL;       /* initialized to shut up gcc */       \
                                                                               \
     *aResult = NULL;                                                          \
@@ -510 +518 @@
     return rv;                                                                \
 }
+
+#endif /* !VBOX_COM_NO_ATL */
 
 #endif /* !defined(VBOX_WITH_XPCOM) */
@@ -529 +539 @@
 {
 
+#ifndef VBOX_COM_NO_ATL
+
 // use this macro to implement scriptable interfaces
 #ifdef RT_OS_WINDOWS
 #define VBOX_SCRIPTABLE_IMPL(iface)                                          \
-    public IDispatchImpl<iface, &IID_##iface, &LIBID_VirtualBox,             \
-                         kTypeLibraryMajorVersion, kTypeLibraryMinorVersion>
+    public ATL::IDispatchImpl<iface, &IID_##iface, &LIBID_VirtualBox,        \
+                              kTypeLibraryMajorVersion, kTypeLibraryMinorVersion>
 
 #define VBOX_SCRIPTABLE_DISPATCH_IMPL(iface)                                 \
-    STDMETHOD(QueryInterface)(REFIID riid , void **ppObj)                    \
+    STDMETHOD(QueryInterface)(REFIID riid, void **ppObj)                     \
     {                                                                        \
         if (riid == IID_##iface)                                             \
         {                                                                    \
-            *ppObj = (iface*)this;                                           \
+            *ppObj = (iface *)this;                                          \
             AddRef();                                                        \
             return S_OK;                                                     \
@@ -546 +558 @@
         if (riid == IID_IUnknown)                                            \
         {                                                                    \
-            *ppObj = (IUnknown*)this;                                        \
+            *ppObj = (IUnknown *)this;                                       \
             AddRef();                                                        \
             return S_OK;                                                     \
@@ -552 +564 @@
         if (riid == IID_IDispatch)                                           \
         {                                                                    \
-            *ppObj = (IDispatch*)this;                                       \
+            *ppObj = (IDispatch *)this;                                      \
             AddRef();                                                        \
             return S_OK;                                                     \
@@ -559 +571 @@
         return E_NOINTERFACE;                                                \
     }
-
-
-#define VBOX_DEFAULT_INTERFACE_ENTRIES(iface)                                \
-        COM_INTERFACE_ENTRY(ISupportErrorInfo)                               \
-        COM_INTERFACE_ENTRY(iface)                                           \
-        COM_INTERFACE_ENTRY2(IDispatch,iface)                                \
-        COM_INTERFACE_ENTRY_AGGREGATE(IID_IMarshal, m_pUnkMarshaler.p)
 #else
 #define VBOX_SCRIPTABLE_IMPL(iface)                     \
     public iface
 #define VBOX_SCRIPTABLE_DISPATCH_IMPL(iface)
-#define VBOX_DEFAULT_INTERFACE_ENTRIES(iface)
 #endif
 
+#endif /* !VBOX_COM_NO_ATL */
 
 } /* namespace com */