Changeset 35724 in vbox

Timestamp:

Jan 26, 2011 5:16:10 PM (14 years ago)

Author:

vboxsync

Message:

burn fix

Location:

trunk/include/VBox/com

Files:

• defs.h (modified) (1 diff)
• listeners.h (modified) (6 diffs)

trunk/include/VBox/com/defs.h

@@ -273 +273 @@
 #define COM_INTERFACE_ENTRY2(a,b)
 #define END_COM_MAP() NS_DECL_ISUPPORTS
+#define COM_INTERFACE_ENTRY_AGGREGATE(a,b)
 
 #define HRESULT     nsresult

trunk/include/VBox/com/listeners.h

@@ -47 +47 @@
 
 template <class T, class TParam = void* >
-class ListenerImpl : 
+class ListenerImpl :
      public CComObjectRootEx<CComMultiThreadModel>,
      VBOX_SCRIPTABLE_IMPL(IEventListener)
@@ -56 +56 @@
     /* FTM stuff */
     CComPtr <IUnknown>   m_pUnkMarshaler;
+#else
+    nsAutoRefCnt mRefCnt;
+    NS_DECL_OWNINGTHREAD
 #endif
 
@@ -61 +64 @@
     ListenerImpl()
     {
-    } 
+    }
 
     virtual ~ListenerImpl()
@@ -69 +72 @@
     HRESULT init(T* aListener, TParam param)
     {
-       mListener = aListener;  
+       mListener = aListener;
        return mListener->init(param);
     }
@@ -94 +97 @@
        return CoCreateFreeThreadedMarshaler(this, &m_pUnkMarshaler.p);
 #else
-       mRefCnt = 1;
        return S_OK;
 #endif
@@ -112 +114 @@
     }
 
-    /* On Windows QI implemented by COM_MAP() */
-#ifndef RT_OS_WINDOWS
-    NS_IMPL_QUERY_INTERFACE1_INLINE(IEventListener)
-#endif
- 
     DECLARE_NOT_AGGREGATABLE(ListenerImpl)
 
     DECLARE_PROTECT_FINAL_CONSTRUCT()
 
+#ifdef RT_OS_WINDOWS
     BEGIN_COM_MAP(ListenerImpl)
-        COM_INTERFACE_ENTRY(IEventListener)  
+        COM_INTERFACE_ENTRY(IEventListener)
         COM_INTERFACE_ENTRY2(IDispatch, IEventListener)
         COM_INTERFACE_ENTRY_AGGREGATE(IID_IMarshal, m_pUnkMarshaler.p)
     END_COM_MAP()
+#else
+    NS_IMETHOD_(nsrefcnt) AddRef(void)
+    {
+        NS_PRECONDITION(PRInt32(mRefCnt) >= 0, "illegal refcnt");
+        nsrefcnt count;
+        count = PR_AtomicIncrement((PRInt32*)&mRefCnt);
+        NS_LOG_ADDREF(this, count, "ListenerImpl", sizeof(*this));
+        return count;
+    }
+
+    NS_IMETHOD_(nsrefcnt) Release(void)
+    {
+        nsrefcnt count;
+        NS_PRECONDITION(0 != mRefCnt, "dup release");
+        count = PR_AtomicDecrement((PRInt32 *)&mRefCnt);
+        NS_LOG_RELEASE(this, count, "ListenerImpl");
+        if (0 == count) {
+            mRefCnt = 1; /* stabilize */
+            /* enable this to find non-threadsafe destructors: */
+            /* NS_ASSERT_OWNINGTHREAD(_class); */
+            NS_DELETEXPCOM(this);
+            return 0;
+        }
+        return count;
+    }
+
+    NS_IMPL_QUERY_INTERFACE1_INLINE(IEventListener)
+#endif