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

Timestamp:

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

Author:

vboxsync

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

69665

Message:

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

File:

• trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp (modified) (7 diffs)

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);