Changeset 30207 in vbox for trunk/src/VBox/Main/include

Timestamp:

Jun 15, 2010 3:49:27 PM (15 years ago)

Author:

vboxsync

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

62689

Message:

Main: console COM events, cleanup, locking

Location:

trunk/src/VBox/Main/include

Files:

• ConsoleImpl.h (modified) (4 diffs)
• VirtualBoxImpl.h (modified) (1 diff)

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

@@ -43 +43 @@
 #ifdef VBOX_WITH_GUEST_PROPS
 # include <VBox/HostServices/GuestPropertySvc.h>  /* For the property notification callback */
+#endif
+
+#ifdef RT_OS_WINDOWS
+# include "win/VBoxComEvents.h"
 #endif
 
@@ -79 +83 @@
     public VirtualBoxSupportTranslation<Console>,
     VBOX_SCRIPTABLE_IMPL(IConsole)
+#ifdef RT_OS_WINDOWS
+    , public CComCoClass<Console, &CLSID_Console>
+    , public IConnectionPointContainerImpl<Console>
+    , public IConnectionPointImpl<Console, &IID_IConsoleCallback, CComDynamicUnkArray>
+#endif
 {
     Q_OBJECT
@@ -92 +101 @@
         COM_INTERFACE_ENTRY(IConsole)
         COM_INTERFACE_ENTRY(IDispatch)
+        COM_INTERFACE_ENTRY(IConnectionPointContainer)
     END_COM_MAP()
+
+#ifdef RT_OS_WINDOWS
+    BEGIN_CONNECTION_POINT_MAP(Console)
+         CONNECTION_POINT_ENTRY(IID_IConsoleCallback)
+    END_CONNECTION_POINT_MAP()
+#endif
+
 
     Console();
@@ -713 +730 @@
     mCallbackData;
 
+#ifdef RT_OS_WINDOWS
+    ComEventsHelper                     mComEvHelper;
+#endif
+    
     friend struct VMTask;
 };

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

@@ -96 +96 @@
          CONNECTION_POINT_ENTRY(IID_IVirtualBoxCallback)
     END_CONNECTION_POINT_MAP()
+   
+    typedef CComDynamicUnkArray EventListenersList;
 #endif