Changeset 35722 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jan 26, 2011 4:37:16 PM (14 years ago)

Author:

vboxsync

Message:

Main: reworked listener objects creation, fixes Win problems with events, few cleanups

Location:

trunk/src/VBox/Frontends

Files:

• VBoxHeadless/VBoxHeadless.cpp (modified) (7 diffs)
• VBoxSDL/VBoxSDL.cpp (modified) (7 diffs)
• VirtualBox/src/globals/UIExtraDataEventHandler.cpp (modified) (1 diff)
• VirtualBox/src/globals/UIMainEventListener.cpp (modified) (3 diffs)
• VirtualBox/src/globals/UIMainEventListener.h (modified) (1 diff)
• VirtualBox/src/globals/VBoxGlobal.cpp (modified) (1 diff)
• VirtualBox/src/runtime/UIConsoleEventHandler.cpp (modified) (1 diff)
• VirtualBox/src/selector/UIVirtualBoxEventHandler.cpp (modified) (1 diff)

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

@@ -99 +99 @@
 
     virtual ~VirtualBoxClientEventListener()
+    {
+    }
+
+    HRESULT init()
+    {
+        return S_OK;
+    }
+
+    void uninit()
     {
     }
@@ -145 +154 @@
 
     virtual ~VirtualBoxEventListener()
+    {
+    }
+
+    HRESULT init()
+    {
+        return S_OK;
+    }
+
+    void uninit()
     {
     }
@@ -252 +270 @@
 
     virtual ~ConsoleEventListener()
+    {
+    }
+
+    HRESULT init()
+    {
+        return S_OK;
+    }
+
+    void uninit()
     {
     }
@@ -763 +790 @@
     ComPtr<IMachine> machine;
     bool fSessionOpened = false;
-    IEventListener *vboxClientListener = NULL;
-    IEventListener *vboxListener = NULL;
-    ConsoleEventListenerImpl *consoleListener = NULL;
+    ComPtr<IEventListener> vboxClientListener;
+    ComPtr<IEventListener> vboxListener;
+    ComObjPtr<ConsoleEventListenerImpl> consoleListener;
 
     do
@@ -1001 +1028 @@
             ComPtr<IEventSource> pES;
             CHECK_ERROR(pVirtualBoxClient, COMGETTER(EventSource)(pES.asOutParam()));
-            vboxClientListener = new VirtualBoxClientEventListenerImpl();
+            ComObjPtr<VirtualBoxClientEventListenerImpl> listener;
+            listener.createObject();
+            listener->init(new VirtualBoxClientEventListener());
+            vboxClientListener = listener;
             com::SafeArray<VBoxEventType_T> eventTypes;
             eventTypes.push_back(VBoxEventType_OnVBoxSVCAvailabilityChanged);
@@ -1011 +1041 @@
             ComPtr<IEventSource> es;
             CHECK_ERROR(console, COMGETTER(EventSource)(es.asOutParam()));
-            consoleListener = new ConsoleEventListenerImpl();
+            consoleListener.createObject(); 
+            consoleListener->init(new ConsoleEventListener());
             com::SafeArray<VBoxEventType_T> eventTypes;
             eventTypes.push_back(VBoxEventType_OnMouseCapabilityChanged);
@@ -1166 +1197 @@
             ComPtr<IEventSource> es;
             CHECK_ERROR(virtualBox, COMGETTER(EventSource)(es.asOutParam()));
-            vboxListener = new VirtualBoxEventListenerImpl();
+            ComObjPtr<VirtualBoxEventListenerImpl> listener;
+            listener.createObject();
+            listener->init(new VirtualBoxEventListener());
+            vboxListener = listener;
             com::SafeArray<VBoxEventType_T> eventTypes;
             eventTypes.push_back(VBoxEventType_OnGuestPropertyChanged);

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

@@ -245 +245 @@
     }
 
+    HRESULT init()
+    {
+        return S_OK;
+    }
+
+    void uninit()
+    {
+    }
+
     STDMETHOD(HandleEvent)(VBoxEventType_T aType, IEvent * aEvent)
     {
@@ -287 +296 @@
 
     virtual ~VBoxSDLEventListener()
+    {
+    }
+
+    HRESULT init()
+    {
+        return S_OK;
+    }
+
+    void uninit()
     {
     }
@@ -347 +365 @@
 
     virtual ~VBoxSDLConsoleEventListener()
+    {
+    }
+
+    HRESULT init()
+    {
+        return S_OK;
+    }
+
+    void uninit()
     {
     }
@@ -772 +799 @@
     uint32_t memorySize = 0;
     uint32_t vramSize = 0;
-    IEventListener *pVBoxClientListener = NULL;
-    IEventListener *pVBoxListener = NULL;
-    VBoxSDLConsoleEventListenerImpl *pConsoleListener = NULL;
+    ComPtr<IEventListener> pVBoxClientListener;
+    ComPtr<IEventListener> pVBoxListener;
+    ComObjPtr<VBoxSDLConsoleEventListenerImpl> pConsoleListener;
 
     bool fFullscreen = false;
@@ -1834 +1861 @@
         ComPtr<IEventSource> pES;
         CHECK_ERROR(pVirtualBoxClient, COMGETTER(EventSource)(pES.asOutParam()));
-        pVBoxClientListener = new VBoxSDLClientEventListenerImpl();
+        ComObjPtr<VBoxSDLClientEventListenerImpl> listener;
+        listener.createObject();
+        listener->init(new VBoxSDLClientEventListener());
+        pVBoxClientListener = listener;
         com::SafeArray<VBoxEventType_T> eventTypes;
         eventTypes.push_back(VBoxEventType_OnVBoxSVCAvailabilityChanged);
@@ -1844 +1874 @@
         ComPtr<IEventSource> pES;
         CHECK_ERROR(pVirtualBox, COMGETTER(EventSource)(pES.asOutParam()));
-        pVBoxListener = new VBoxSDLEventListenerImpl();
+        ComObjPtr<VBoxSDLEventListenerImpl> listener;
+        listener.createObject();
+        listener->init(new VBoxSDLEventListener());
+        pVBoxListener = listener;
         com::SafeArray<VBoxEventType_T> eventTypes;
         eventTypes.push_back(VBoxEventType_OnExtraDataChanged);
@@ -1854 +1887 @@
         ComPtr<IEventSource> pES;
         CHECK_ERROR(gpConsole, COMGETTER(EventSource)(pES.asOutParam()));
-        pConsoleListener = new VBoxSDLConsoleEventListenerImpl();
+        pConsoleListener.createObject();
+        pConsoleListener->init(new VBoxSDLConsoleEventListener());
         com::SafeArray<VBoxEventType_T> eventTypes;
         eventTypes.push_back(VBoxEventType_OnMousePointerShapeChanged);

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIExtraDataEventHandler.cpp

@@ -252 +252 @@
 //    RTPrintf("Self add: %RTthrd\n", RTThreadSelf());
     const CVirtualBox &vbox = vboxGlobal().virtualBox();
-    UIMainEventListenerImpl *pListener = new UIMainEventListenerImpl(this);
+    ComObjPtr<UIMainEventListenerImpl> pListener;
+    pListener.createObject();
+    pListener->init(new UIMainEventListener(), this);
     m_mainEventListener = CEventListener(pListener);
     QVector<KVBoxEventType> events;

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.cpp

@@ -25 +25 @@
 //#include <iprt/stream.h>
 
-UIMainEventListener::UIMainEventListener(QObject * /* pParent */)
-//  : QObject(pParent) /* Todo: Not sure if pParent should delete this. Especially on Win there is ref counting implemented. */
+UIMainEventListener::UIMainEventListener()
   : QObject()
 {
@@ -42 +41 @@
 }
 
+HRESULT UIMainEventListener::init(QObject * /* pParent */)
+{
+    return S_OK;
+}
+
+void    UIMainEventListener::uninit()
+{
+}
 
 /**
@@ -50 +57 @@
 {
     CEvent event(pEvent);
-//    RTPrintf("Event received: %d (%RTthrd)\n", event.GetType(), RTThreadSelf());
+    // printf("Event received: %d\n", event.GetType());
     switch(event.GetType())
     {

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.h

@@ -43 +43 @@
 
 public:
-    UIMainEventListener(QObject *pParent);
+    UIMainEventListener();
+
+
+    HRESULT init(QObject *pParent);
+    void    uninit();
 
     STDMETHOD(HandleEvent)(VBoxEventType_T aType, IEvent *pEvent);

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -5249 +5249 @@
     QApplication::removePostedEvents (this);
 
-#ifdef Q_WS_WIN
-    /* COM for the main thread is shutdown in main() */
-#else
     COMBase::CleanupCOM();
-#endif
 
     mValid = false;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp

@@ -59 +59 @@
 
 //    RTPrintf("Self add: %RTthrd\n", RTThreadSelf());
-    UIMainEventListenerImpl *pListener = new UIMainEventListenerImpl(this);
+    ComObjPtr<UIMainEventListenerImpl> pListener;
+    pListener.createObject();
+    pListener->init(new UIMainEventListener(), this);
     m_mainEventListener = CEventListener(pListener);
     QVector<KVBoxEventType> events;

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVirtualBoxEventHandler.cpp

@@ -52 +52 @@
 //    RTPrintf("Self add: %RTthrd\n", RTThreadSelf());
     const CVirtualBox &vbox = vboxGlobal().virtualBox();
-    UIMainEventListenerImpl *pListener = new UIMainEventListenerImpl(this);
+    ComObjPtr<UIMainEventListenerImpl> pListener;
+    pListener.createObject();
+    pListener->init(new UIMainEventListener(), this);
     m_mainEventListener = CEventListener(pListener);
     QVector<KVBoxEventType> events;