Changeset 30627 in vbox

Timestamp:

Jul 5, 2010 5:08:55 PM (15 years ago)

Author:

vboxsync

Message:

Main, some frontends: removing callbacks

Location:

trunk

Files:

• include/VBox/com/array.h (modified) (3 diffs)
• src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp (modified) (2 diffs)
• src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp (modified) (2 diffs)
• src/VBox/Frontends/VBoxShell/vboxshell.py (modified) (1 diff)
• src/VBox/Main/ConsoleImpl.cpp (modified) (4 diffs)
• src/VBox/Main/ConsoleVRDPServer.cpp (modified) (9 diffs)
• src/VBox/Main/DisplayImpl.cpp (modified) (3 diffs)
• src/VBox/Main/idl/comimpl.xsl (modified) (6 diffs)
• src/VBox/Main/include/ConsoleVRDPServer.h (modified) (1 diff)
• src/VBox/Main/include/DisplayImpl.h (modified) (3 diffs)
• src/VBox/Main/xpcom/module.cpp (modified) (1 diff)

trunk/include/VBox/com/array.h

@@ -950 +950 @@
     }
 
+    void cloneTo (SafeArray<T>& aOther) const
+    {
+        aOther.reset(size());
+        aOther.initFrom(*this);
+    }
+
 
     /**
@@ -1005 +1011 @@
     }
 
-    inline void initFrom(com::SafeArray<T> & aRef);
+    inline void initFrom(const com::SafeArray<T> & aRef);
 
     // Public methods for internal purposes only.
@@ -1206 +1212 @@
 };
 
-/* Few fast specializations for primitive array types */ 
+/* Few fast specializations for primitive array types */
 template<>
-inline void com::SafeArray<BYTE>::initFrom(com::SafeArray<BYTE> & aRef)
+inline void com::SafeArray<BYTE>::initFrom(const com::SafeArray<BYTE> & aRef)
 {
     size_t sSize = aRef.size();

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -995 +995 @@
             consoleListener = new ConsoleEventListener();
             consoleListener->AddRef();
-            com::SafeArray <VBoxEventType_T> eventTypes(5);
+            com::SafeArray <VBoxEventType_T> eventTypes;
             eventTypes.push_back(VBoxEventType_OnMouseCapabilityChange);
             eventTypes.push_back(VBoxEventType_OnStateChange);
@@ -1090 +1090 @@
             vboxListener = new VirtualBoxEventListener();
             vboxListener->AddRef();
-            com::SafeArray <VBoxEventType_T> eventTypes(1);
+            com::SafeArray <VBoxEventType_T> eventTypes;
             eventTypes.push_back(VBoxEventType_OnGuestPropertyChange);
             CHECK_ERROR(es, RegisterListener(vboxListener, ComSafeArrayAsInParam(eventTypes), true));

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -1841 +1841 @@
         vboxListener = new VBoxSDLEventListener();
         vboxListener->AddRef();
-        com::SafeArray <VBoxEventType_T> eventTypes(1);
+        com::SafeArray <VBoxEventType_T> eventTypes;
         eventTypes.push_back(VBoxEventType_OnExtraDataChange);
         CHECK_ERROR(es, RegisterListener(vboxListener, ComSafeArrayAsInParam(eventTypes), true));
@@ -1852 +1852 @@
         consoleListener = new VBoxSDLConsoleEventListener();
         consoleListener->AddRef();
-        com::SafeArray <VBoxEventType_T> eventTypes(7);
+        com::SafeArray <VBoxEventType_T> eventTypes;
         eventTypes.push_back(VBoxEventType_OnMousePointerShapeChange);
         eventTypes.push_back(VBoxEventType_OnMouseCapabilityChange);

trunk/src/VBox/Frontends/VBoxShell/vboxshell.py

@@ -310 +310 @@
              psev = ctx['global'].queryInterface(ev, 'IMousePointerShapeChangeEvent')
              if psev:
+                 print "pointer shape event: w=%d h=%d" %(psev.width, psev.height)
                  shape = ctx['global'].getArray(psev, 'shape')
-                 print "pointer shape event: w=%d h=%d shape len=%d" %(psev.width, psev.height, len(shape))
+                 if shape is None:
+                     print "pointer shape event - empty shape"
+                 else:
+                     print "pointer shape event: w=%d h=%d shape len=%d" %(psev.width, psev.height, len(shape))
 
     class EventListener:

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -559 +559 @@
     /* Create associated child COM objects */
 
+    // Event source may be needed by other children
+    unconst(mEventSource).createObject();
+    rc = mEventSource->init(static_cast<IConsole*>(this));
+    AssertComRCReturnRC(rc);
+
     unconst(mGuest).createObject();
     rc = mGuest->init(this);
@@ -600 +605 @@
     unconst(mAudioSniffer) = new AudioSniffer(this);
     AssertReturn(mAudioSniffer, E_FAIL);
-
-    unconst(mEventSource).createObject();
-    rc = mEventSource->init(static_cast<IConsole*>(this));
-    AssertComRCReturnRC(rc);
 
 #ifdef RT_OS_WINDOWS
@@ -4804 +4805 @@
     com::SafeArray <BYTE> aShape(ComSafeArrayInArg (pShape));
     if (aShape.size() != 0)
-    {
-        mCallbackData.mpsc.shape.resize(aShape.size());
-        ::memcpy( mCallbackData.mpsc.shape.raw(), aShape.raw(), aShape.size());
-    }
+        mCallbackData.mpsc.shape.initFrom(aShape);
     else
         mCallbackData.mpsc.shape.resize(0);
@@ -4818 +4816 @@
      */
 #ifdef RT_OS_WINDOWS
-    CONSOLE_DO_CALLBACKS7(OnMousePointerShapeChange, fVisible, fAlpha, xHot, yHot, width, height, pShape);
+    CONSOLE_DO_CALLBACKS7(OnMousePointerShapeChange, fVisible, fAlpha, xHot, yHot, width, height, mCallbackData.mpsc.shape.raw());
 #else
-    CONSOLE_DO_CALLBACKS8(OnMousePointerShapeChange, fVisible, fAlpha, xHot, yHot, width, height, pShapeSize, pShape);
+    CONSOLE_DO_CALLBACKS8(OnMousePointerShapeChange, fVisible, fAlpha, xHot, yHot, width, height, mCallbackData.mpsc.shape.size(), mCallbackData.mpsc.shape.raw());
 #endif
 

trunk/src/VBox/Main/ConsoleVRDPServer.cpp

@@ -36 +36 @@
 #endif /* VBOX_WITH_VRDP */
 
-class VRDPConsoleCallback :
-    VBOX_SCRIPTABLE_IMPL(IConsoleCallback)
+class VRDPConsoleListener :
+    VBOX_SCRIPTABLE_IMPL(IEventListener)
 {
 public:
-    VRDPConsoleCallback(ConsoleVRDPServer *server)
+    VRDPConsoleListener(ConsoleVRDPServer *server)
         : m_server(server)
     {
@@ -48 +48 @@
     }
 
-    virtual ~VRDPConsoleCallback() {}
+    virtual ~VRDPConsoleListener() {}
 
     NS_DECL_ISUPPORTS
@@ -66 +66 @@
     {
         if (riid == IID_IUnknown) {
-            *ppObj = this;
+            *ppObj = (IUnknown*)this;
             AddRef();
             return S_OK;
         }
-        if (riid == IID_IConsoleCallback) {
-            *ppObj = this;
+        if (riid == IID_IEventListener) {
+            *ppObj = (IEventListener*)this;
             AddRef();
             return S_OK;
@@ -81 +81 @@
 
 
+    STDMETHOD(HandleEvent)(IEvent * aEvent)
+    {
+        VBoxEventType_T aType = VBoxEventType_Invalid;
+
+        aEvent->COMGETTER(Type)(&aType);
+        switch (aType)
+        {
+            case VBoxEventType_OnMousePointerShapeChange:
+            {
+                ComPtr<IMousePointerShapeChangeEvent> mpscev = aEvent;
+                Assert(mpscev);
+                BOOL    visible,  alpha;
+                ULONG   xHot, yHot, width, height;
+                com::SafeArray <BYTE> shape;
+
+                mpscev->COMGETTER(Visible)(&visible);
+                mpscev->COMGETTER(Alpha)(&alpha);
+                mpscev->COMGETTER(Xhot)(&xHot);
+                mpscev->COMGETTER(Yhot)(&yHot);
+                mpscev->COMGETTER(Width)(&width);
+                mpscev->COMGETTER(Height)(&height);
+                mpscev->COMGETTER(Shape)(ComSafeArrayAsOutParam(shape));
+
+                OnMousePointerShapeChange(visible, alpha, xHot, yHot, width, height, ComSafeArrayAsInParam(shape));
+                break;
+            }
+            case VBoxEventType_OnMouseCapabilityChange:
+            {
+                ComPtr<IMouseCapabilityChangeEvent> mccev = aEvent;
+                Assert(mccev);
+                if (m_server)
+                {
+                    BOOL fAbsoluteMouse;
+                    mccev->COMGETTER(SupportsAbsolute)(&fAbsoluteMouse);
+                    m_server->NotifyAbsoluteMouse(!!fAbsoluteMouse);
+                }
+                break;
+            }
+            case VBoxEventType_OnKeyboardLedsChange:
+            {
+                ComPtr<IKeyboardLedsChangeEvent> klcev = aEvent;
+                Assert(klcev);
+
+                if (m_server)
+                {
+                    BOOL fNumLock, fCapsLock, fScrollLock;
+                    klcev->COMGETTER(NumLock)(&fNumLock);
+                    klcev->COMGETTER(CapsLock)(&fCapsLock);
+                    klcev->COMGETTER(ScrollLock)(&fScrollLock);
+                    m_server->NotifyKeyboardLedsChange(fNumLock, fCapsLock, fScrollLock);
+                }
+                 break;
+            }
+
+            default:
+                AssertFailed();
+        }
+
+        return S_OK;
+    }
+
+private:
     STDMETHOD(OnMousePointerShapeChange)(BOOL visible, BOOL alpha, ULONG xHot, ULONG yHot,
                                          ULONG width, ULONG height, ComSafeArrayIn(BYTE,shape));
-
-    STDMETHOD(OnMouseCapabilityChange)(BOOL supportsAbsolute, BOOL supportsRelative, BOOL needsHostCursor)
-    {
-        if (m_server)
-        {
-            m_server->NotifyAbsoluteMouse(!!supportsAbsolute);
-        }
-        return S_OK;
-    }
-
-    STDMETHOD(OnKeyboardLedsChange)(BOOL fNumLock, BOOL fCapsLock, BOOL fScrollLock)
-    {
-        if (m_server)
-        {
-            m_server->NotifyKeyboardLedsChange(fNumLock, fCapsLock, fScrollLock);
-        }
-        return S_OK;
-    }
-
-    STDMETHOD(OnStateChange)(MachineState_T machineState)
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnAdditionsStateChange)()
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnMediumChange)(IMediumAttachment *aAttachment)
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnCPUChange)(ULONG aCPU, BOOL aRemove)
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnNetworkAdapterChange)(INetworkAdapter *aNetworkAdapter)
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnSerialPortChange)(ISerialPort *aSerialPort)
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnParallelPortChange)(IParallelPort *aParallelPort)
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnStorageControllerChange)()
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnVRDPServerChange)()
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnRemoteDisplayInfoChange)()
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnUSBControllerChange)()
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnUSBDeviceStateChange)(IUSBDevice *aDevice, BOOL aAttached,
-                                      IVirtualBoxErrorInfo *aError)
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnSharedFolderChange)(Scope_T aScope)
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnRuntimeError)(BOOL fatal, IN_BSTR id, IN_BSTR message)
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnCanShowWindow)(BOOL *canShow)
-    {
-        if (!canShow)
-            return E_POINTER;
-        /* we don't manage window activation here: always agree */
-        *canShow = TRUE;
-        return S_OK;
-    }
-
-    STDMETHOD(OnShowWindow)(ULONG64 *winId)
-    {
-        if (!winId)
-            return E_POINTER;
-        /* we don't manage window activation here */
-        *winId = 0;
-        return S_OK;
-    }
-
-private:
     ConsoleVRDPServer *m_server;
 #ifndef VBOX_WITH_XPCOM
@@ -200 +153 @@
 #ifdef VBOX_WITH_XPCOM
 #include <nsMemory.h>
-NS_DECL_CLASSINFO(VRDPConsoleCallback)
-NS_IMPL_THREADSAFE_ISUPPORTS1_CI(VRDPConsoleCallback, IConsoleCallback)
+NS_DECL_CLASSINFO(VRDPConsoleListener)
+NS_IMPL_THREADSAFE_ISUPPORTS1_CI(VRDPConsoleListener, IEventListener)
 #endif /* VBOX_WITH_XPCOM */
 
@@ -425 +378 @@
 }
 
-STDMETHODIMP VRDPConsoleCallback::OnMousePointerShapeChange(BOOL visible,
+STDMETHODIMP VRDPConsoleListener::OnMousePointerShapeChange(BOOL visible,
                                                             BOOL alpha,
                                                             ULONG xHot,
@@ -433 +386 @@
                                                             ComSafeArrayIn(BYTE,inShape))
 {
-    LogSunlover(("VRDPConsoleCallback::OnMousePointerShapeChange: %d, %d, %lux%lu, @%lu,%lu\n", visible, alpha, width, height, xHot, yHot));
+    LogSunlover(("VRDPConsoleListener::OnMousePointerShapeChange: %d, %d, %lux%lu, @%lu,%lu\n", visible, alpha, width, height, xHot, yHot));
 
     if (m_server)
@@ -1201 +1154 @@
     memset (maFramebuffers, 0, sizeof (maFramebuffers));
 
-    mConsoleCallback = new VRDPConsoleCallback(this);
-    mConsoleCallback->AddRef();
-    console->RegisterCallback(mConsoleCallback);
+    {
+        ComPtr<IEventSource> es;
+        console->COMGETTER(EventSource)(es.asOutParam());
+        mConsoleListener = new VRDPConsoleListener(this);
+        mConsoleListener->AddRef();
+        com::SafeArray <VBoxEventType_T> eventTypes(3);
+        eventTypes.push_back(VBoxEventType_OnMousePointerShapeChange);
+        eventTypes.push_back(VBoxEventType_OnMouseCapabilityChange);
+        eventTypes.push_back(VBoxEventType_OnKeyboardLedsChange);
+        es->RegisterListener(mConsoleListener, ComSafeArrayAsInParam(eventTypes), true);
+    }
 
     mVRDPBindPort = -1;
@@ -1216 +1177 @@
 
 #ifdef VBOX_WITH_VRDP
-    if (mConsoleCallback)
-    {
-        mConsole->UnregisterCallback(mConsoleCallback);
-        mConsoleCallback->Release();
-        mConsoleCallback = NULL;
+    if (mConsoleListener)
+    {
+        ComPtr<IEventSource> es;
+        mConsole->COMGETTER(EventSource)(es.asOutParam());
+        es->UnregisterListener(mConsoleListener);
+        mConsoleListener->Release();
+        mConsoleListener = NULL;
     }
 

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -647 +647 @@
     }
 
-    mParent->RegisterCallback (this);
+    {
+        // register listener for state change events
+        ComPtr<IEventSource> es;
+        mParent->COMGETTER(EventSource)(es.asOutParam());
+        com::SafeArray <VBoxEventType_T> eventTypes;
+        eventTypes.push_back(VBoxEventType_OnStateChange);
+        es->RegisterListener(this, ComSafeArrayAsInParam(eventTypes), true);
+    }
 
     /* Confirm a successful initialization */
@@ -673 +680 @@
 
     if (mParent)
-        mParent->UnregisterCallback (this);
+    {
+        ComPtr<IEventSource> es;
+        mParent->COMGETTER(EventSource)(es.asOutParam());
+        es->UnregisterListener(this);
+    }
 
     unconst(mParent) = NULL;
@@ -725 +736 @@
 }
 
-// IConsoleCallback method
-STDMETHODIMP Display::OnStateChange(MachineState_T machineState)
-{
-    if (   machineState == MachineState_Running
-        || machineState == MachineState_Teleporting
-        || machineState == MachineState_LiveSnapshotting
-       )
-    {
-        LogFlowFunc(("Machine is running.\n"));
-
-        mfMachineRunning = true;
-    }
-    else
-        mfMachineRunning = false;
+// IEventListener method
+STDMETHODIMP Display::HandleEvent(IEvent * aEvent)
+{
+    VBoxEventType_T aType = VBoxEventType_Invalid;
+
+    aEvent->COMGETTER(Type)(&aType);
+    switch (aType)
+    {
+        case VBoxEventType_OnStateChange:
+        {
+            ComPtr<IStateChangeEvent> scev = aEvent;
+            Assert(scev);
+            MachineState_T machineState;
+            scev->COMGETTER(State)(&machineState);
+            if (   machineState == MachineState_Running
+                   || machineState == MachineState_Teleporting
+                   || machineState == MachineState_LiveSnapshotting
+                   )
+            {
+                LogFlowFunc(("Machine is running.\n"));
+
+                mfMachineRunning = true;
+            }
+            else
+                mfMachineRunning = false;
+            break;
+        }
+        default:
+            AssertFailed();
+    }
 
     return S_OK;

trunk/src/VBox/Main/idl/comimpl.xsl

@@ -105 +105 @@
         </xsl:when>
         <xsl:when test="$param and ($dir='out')">
-          <xsl:value-of select="concat('ComSafeArrayOut(',$elemtype,',', $param,')')"/>
+          <xsl:value-of select="concat('ComSafeArrayOut(',$elemtype,', ', $param, ')')"/>
         </xsl:when>
         <xsl:otherwise>
@@ -200 +200 @@
   <xsl:choose>
     <xsl:when test="$safearray='yes'">
-      <xsl:value-of select="concat('         ', $member, '.detachTo(ComSafeArrayOutArg (', $param, '));&#10;')"/>
+      <xsl:variable name="elemtype">
+        <xsl:call-template name="typeIdl2Back">
+             <xsl:with-param name="type" select="@type" />
+             <xsl:with-param name="safearray" select="''" />
+             <xsl:with-param name="dir" select="'in'" />
+        </xsl:call-template>
+      </xsl:variable>
+      <xsl:value-of select="concat('         SafeArray&lt;', $elemtype,'&gt; result;&#10;')"/>
+      <xsl:value-of select="concat('         ', $member, '.cloneTo(result);&#10;')"/>
+      <xsl:value-of select="concat('         result.detachTo(ComSafeArrayOutArg(', $param, '));&#10;')"/>
     </xsl:when>
     <xsl:otherwise>
@@ -476 +485 @@
 ]]></xsl:text>
   <xsl:choose>
-    <xsl:when test="$isVeto">
+    <xsl:when test="$isVeto='yes'">
 <xsl:text><![CDATA[
     HRESULT init (IEventSource* aSource, VBoxEventType_T aType, BOOL aWaitable = TRUE)
@@ -496 +505 @@
     }
 private:
+    ComObjPtr<VBoxVetoEvent>      mEvent;
 ]]></xsl:text>
-      <xsl:value-of select="       '    ComObjPtr&lt;VBoxVetoEvent&gt;      mEvent;&#10;'" />
     </xsl:when>
     <xsl:otherwise>
@@ -506 +515 @@
     }
 private:
+    ComObjPtr<VBoxEvent>      mEvent;
 ]]></xsl:text>
-      <xsl:value-of select="       '    ComObjPtr&lt;VBoxEvent&gt;      mEvent;&#10;'" />
     </xsl:otherwise>
   </xsl:choose>
@@ -607 +616 @@
       <xsl:when test="$G_kind='VBoxEvent'">
         <xsl:variable name="isVeto">
-          <xsl:value-of select="@extends='IVetoEvent'" />
+          <xsl:if test="@extends='IVetoEvent'">
+            <xsl:value-of select="'yes'" />
+          </xsl:if>
         </xsl:variable>
         <xsl:call-template name="genEventImpl">

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

@@ -178 +178 @@
     IFramebuffer *maFramebuffers[SchemaDefs::MaxGuestMonitors];
 
-    IConsoleCallback *mConsoleCallback;
+    IEventListener *mConsoleListener;
 
     VRDPInputSynch m_InputSynch;

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

@@ -93 +93 @@
 class ATL_NO_VTABLE Display :
     public VirtualBoxBase,
-    VBOX_SCRIPTABLE_IMPL(IConsoleCallback),
+    VBOX_SCRIPTABLE_IMPL(IEventListener),
     public VirtualBoxSupportErrorInfoImpl<Display, IDisplay>,
     public VirtualBoxSupportTranslation<Display>,
@@ -111 +111 @@
         COM_INTERFACE_ENTRY(IDisplay)
         COM_INTERFACE_ENTRY2(IDispatch,IDisplay)
-        COM_INTERFACE_ENTRY(IConsoleCallback)
+        COM_INTERFACE_ENTRY(IEventListener)
     END_COM_MAP()
 
@@ -148 +148 @@
 #endif /* VBOX_WITH_VRDP */
 
-    // IConsoleCallback methods
-    STDMETHOD(OnMousePointerShapeChange)(BOOL visible, BOOL alpha, ULONG xHot, ULONG yHot,
-                                         ULONG width, ULONG height, ComSafeArrayIn(BYTE,shape))
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnMouseCapabilityChange)(BOOL supportsAbsolute, BOOL supportsRelative, BOOL needsHostCursor)
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnKeyboardLedsChange)(BOOL fNumLock, BOOL fCapsLock, BOOL fScrollLock)
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnStateChange)(MachineState_T machineState);
-
-    STDMETHOD(OnAdditionsStateChange)()
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnNetworkAdapterChange) (INetworkAdapter *aNetworkAdapter)
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnSerialPortChange) (ISerialPort *aSerialPort)
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnParallelPortChange) (IParallelPort *aParallelPort)
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnStorageControllerChange) ()
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnMediumChange)(IMediumAttachment *aMediumAttachment)
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnCPUChange)(ULONG aCPU, BOOL aRemove)
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnVRDPServerChange)()
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnRemoteDisplayInfoChange)()
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnUSBControllerChange)()
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnUSBDeviceStateChange)(IUSBDevice *device, BOOL attached,
-                                      IVirtualBoxErrorInfo *message)
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnSharedFolderChange) (Scope_T aScope)
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnRuntimeError)(BOOL fatal, IN_BSTR id, IN_BSTR message)
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnCanShowWindow)(BOOL *canShow)
-    {
-        if (canShow)
-            *canShow = TRUE;
-        return S_OK;
-    }
-
-    STDMETHOD(OnShowWindow)(ULONG64 *winId)
-    {
-        if (winId)
-            *winId = 0;
-        return S_OK;
-    }
+    // IEventListener methods
+    STDMETHOD(HandleEvent)(IEvent * aEvent);
 
     // IDisplay methods

trunk/src/VBox/Main/xpcom/module.cpp

@@ -58 +58 @@
 NS_IMPL_THREADSAFE_ISUPPORTS1_CI(Mouse, IMouse)
 NS_DECL_CLASSINFO(Display)
-NS_IMPL_THREADSAFE_ISUPPORTS2_CI(Display, IDisplay, IConsoleCallback)
+NS_IMPL_THREADSAFE_ISUPPORTS2_CI(Display, IDisplay, IEventListener)
 NS_DECL_CLASSINFO(MachineDebugger)
 NS_IMPL_THREADSAFE_ISUPPORTS1_CI(MachineDebugger, IMachineDebugger)