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

Timestamp:

Jun 21, 2010 4:49:59 PM (15 years ago)

Author:

vboxsync

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

62921

Message:

Main: more events

Location:

trunk/src/VBox/Main/include

Files:

• EventImpl.h (modified) (3 diffs)
• VirtualBoxCallbackImpl.h (modified) (3 diffs)
• VirtualBoxImpl.h (modified) (2 diffs)

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

@@ -69 +69 @@
 
 class ATL_NO_VTABLE EventSource :
+    public VirtualBoxBase,
     public VirtualBoxSupportErrorInfoImpl<EventSource, IEventSource>,
     public VirtualBoxSupportTranslation<EventSource>,
-    public VirtualBoxBase,
     VBOX_SCRIPTABLE_IMPL(IEventSource)
 {
@@ -88 +88 @@
     END_COM_MAP()
 
-    EventSource() {}
-    virtual ~EventSource() {}
+    DECLARE_EMPTY_CTOR_DTOR (EventSource)
 
     HRESULT FinalConstruct();
@@ -95 +94 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init ();
+    HRESULT init (IUnknown * aParent);
     void uninit();
 
     // IEventSource methods
+    STDMETHOD(CreateListener)(IEventListener ** aListener);
     STDMETHOD(RegisterListener)(IEventListener * aListener, 
                                 ComSafeArrayIn(VBoxEventType_T, aInterested),

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

@@ -25 +25 @@
     VBOX_SCRIPTABLE_IMPL(ILocalOwner),
     VBOX_SCRIPTABLE_IMPL(IConsoleCallback),
-    VBOX_SCRIPTABLE_IMPL(IVirtualBoxCallback)
+    VBOX_SCRIPTABLE_IMPL(IVirtualBoxCallback),
+    VBOX_SCRIPTABLE_IMPL(IEventListener)
 #ifdef RT_OS_WINDOWS
     , public CComCoClass<CallbackWrapper, &CLSID_CallbackWrapper>
@@ -45 +46 @@
         COM_INTERFACE_ENTRY(IVirtualBoxCallback)
         COM_INTERFACE_ENTRY(IConsoleCallback)
+        COM_INTERFACE_ENTRY(IEventListener)
     END_COM_MAP()
 
@@ -95 +97 @@
     STDMETHOD(OnShowWindow)(ULONG64 *winId);
 
+    // IEventListener
+    STDMETHOD(HandleEvent)(IEvent *aEvent);
+
     // for VirtualBoxSupportErrorInfoImpl
     static const wchar_t *getComponentName() { return L"CallbackWrapper"; }

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

@@ -96 +96 @@
          CONNECTION_POINT_ENTRY(IID_IVirtualBoxCallback)
     END_CONNECTION_POINT_MAP()
-   
+
     typedef CComDynamicUnkArray EventListenersList;
 #endif
@@ -130 +130 @@
     STDMETHOD(COMGETTER(PerformanceCollector)) (IPerformanceCollector **aPerformanceCollector);
     STDMETHOD(COMGETTER(DHCPServers)) (ComSafeArrayOut (IDHCPServer *, aDHCPServers));
+    STDMETHOD(COMGETTER(EventSource)) (IEventSource ** aEventSource);
 
     /* IVirtualBox methods */