Changeset 30534 in vbox

Timestamp:

Jun 30, 2010 4:16:59 PM (15 years ago)

Author:

vboxsync

Message:

Main: uninit, correct COM map for veto event

Location:

trunk/src/VBox/Main

Files:

• EventImpl.cpp (modified) (3 diffs)
• include/EventImpl.h (modified) (1 diff)

trunk/src/VBox/Main/EventImpl.cpp

@@ -99 +99 @@
 void VBoxEvent::uninit()
 {
+    AutoUninitSpan autoUninitSpan(this);
+    if (autoUninitSpan.uninitDone())
+        return;
+
     if (!m)
         return;
@@ -254 +258 @@
 void VBoxVetoEvent::uninit()
 {
+    AutoUninitSpan autoUninitSpan(this);
+    if (autoUninitSpan.uninitDone())
+        return;
+
     VBoxEvent::uninit();
     if (!m)
@@ -624 +632 @@
 void EventSource::uninit()
 {
+    AutoUninitSpan autoUninitSpan(this);
+    if (autoUninitSpan.uninitDone())
+        return;
     m->mListeners.clear();
     // m->mEvMap shall be cleared at this point too by destructors, assert?

trunk/src/VBox/Main/include/EventImpl.h

@@ -79 +79 @@
     DECLARE_PROTECT_FINAL_CONSTRUCT()
 
-    BEGIN_COM_MAP(VBoxEvent)
+    BEGIN_COM_MAP(VBoxVetoEvent)
         COM_INTERFACE_ENTRY(ISupportErrorInfo)
-        COM_INTERFACE_ENTRY(IEvent)
-            //        COM_INTERFACE_ENTRY(IVetoEvent)
-        COM_INTERFACE_ENTRY(IDispatch)
+        COM_INTERFACE_ENTRY2(IEvent, IVetoEvent)
+        COM_INTERFACE_ENTRY(IVetoEvent)
+        COM_INTERFACE_ENTRY2(IDispatch, IVetoEvent)
     END_COM_MAP()