Changeset 35638 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Jan 19, 2011 7:10:49 PM (14 years ago)

Author:

vboxsync

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

69546

Message:

Main. QT/FE: fix long standing COM issue

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImpl.cpp (modified) (5 diffs)
• ConsoleVRDPServer.cpp (modified) (2 diffs)
• DisplayImpl.cpp (modified) (2 diffs)
• GuestImpl.cpp (modified) (2 diffs)
• KeyboardImpl.cpp (modified) (2 diffs)
• MachineDebuggerImpl.cpp (modified) (2 diffs)
• MouseImpl.cpp (modified) (2 diffs)
• RemoteUSBDeviceImpl.cpp (modified) (2 diffs)
• SessionImpl.cpp (modified) (4 diffs)
• USBDeviceImpl.cpp (modified) (2 diffs)
• VirtualBoxClientImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -379 +379 @@
     mpVmm2UserMethods = pVmm2UserMethods;
 
-    return S_OK;
+    return BaseFinalConstruct();
 }
 
@@ -387 +387 @@
 
     uninit();
+    
+    BaseFinalRelease();
 }
 
@@ -486 +488 @@
         rc = pVirtualBox->COMGETTER(EventSource)(pES.asOutParam());
         AssertComRC(rc);
-        mVmListner = new VmEventListenerImpl(this);
+        mVmListener = new VmEventListenerImpl(this);
         com::SafeArray<VBoxEventType_T> eventTypes;
         eventTypes.push_back(VBoxEventType_OnNATRedirect);
-        rc = pES->RegisterListener(mVmListner, ComSafeArrayAsInParam(eventTypes), true);
+        rc = pES->RegisterListener(mVmListener, ComSafeArrayAsInParam(eventTypes), true);
         AssertComRC(rc);
     }
@@ -525 +527 @@
 
     LogFlowThisFunc(("initFailed()=%d\n", autoUninitSpan.initFailed()));
-    if (mVmListner)
+    if (mVmListener)
     {
         ComPtr<IEventSource> pES;
@@ -537 +539 @@
             if (!pES.isNull())
             {
-                rc = pES->UnregisterListener(mVmListner);
-                AssertComRC(rc);
+                rc = pES->UnregisterListener(mVmListener);
+                // XXX: for some reasons we're getting VBOX_E_OBJECT_NOT_FOUND
+                // here - investigate
+                //AssertComRC(rc);
             }
         }
-        mVmListner->Release();
+        mVmListener->Release();
+        mVmListener = 0;
     }
 

trunk/src/VBox/Main/src-client/ConsoleVRDPServer.cpp

@@ -2411 +2411 @@
 HRESULT VRDEServerInfo::FinalConstruct()
 {
-    return S_OK;
+    return BaseFinalConstruct();
 }
 
@@ -2417 +2417 @@
 {
     uninit();
+    BaseFinalRelease();
 }
 

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -124 +124 @@
 #endif
 
-    return S_OK;
+    return BaseFinalConstruct();
 }
 
@@ -136 +136 @@
         memset (&mVBVALock, 0, sizeof (mVBVALock));
     }
+    BaseFinalRelease();
 }
 

trunk/src/VBox/Main/src-client/GuestImpl.cpp

@@ -44 +44 @@
 HRESULT Guest::FinalConstruct()
 {
-    return S_OK;
+    return BaseFinalConstruct();
 }
 
@@ -50 +50 @@
 {
     uninit ();
+    BaseFinalRelease();
 }
 

trunk/src/VBox/Main/src-client/KeyboardImpl.cpp

@@ -82 +82 @@
     mpVMMDev = NULL;
     mfVMMDevInited = false;
-    return S_OK;
+    return BaseFinalConstruct();
 }
 
@@ -88 +88 @@
 {
     uninit();
+    BaseFinalRelease();
 }
 

trunk/src/VBox/Main/src-client/MachineDebuggerImpl.cpp

@@ -56 +56 @@
 {
     unconst(mParent) = NULL;
-    return S_OK;
+    return BaseFinalConstruct();
 }
 
@@ -62 +62 @@
 {
     uninit();
+    BaseFinalRelease();
 }
 

trunk/src/VBox/Main/src-client/MouseImpl.cpp

@@ -79 +79 @@
     mfLastButtons = 0;
     mfVMMDevGuestCaps = 0;
-    return S_OK;
+    return BaseFinalConstruct();
 }
 
@@ -85 +85 @@
 {
     uninit();
+    BaseFinalRelease();
 }
 

trunk/src/VBox/Main/src-client/RemoteUSBDeviceImpl.cpp

@@ -38 +38 @@
 HRESULT RemoteUSBDevice::FinalConstruct()
 {
-    return S_OK;
+    return BaseFinalConstruct();
 }
 
@@ -44 +44 @@
 {
     uninit();
+    BaseFinalRelease();
 }
 

trunk/src/VBox/Main/src-client/SessionImpl.cpp

@@ -57 +57 @@
     LogFlowThisFunc(("\n"));
 
-    return init();
+    HRESULT rc = init();
+    
+    BaseFinalConstruct(); 
+  
+    return rc;
 }
 
@@ -65 +69 @@
 
     uninit();
+      
+    BaseFinalRelease();
 }
 
@@ -182 +188 @@
     HRESULT rc;
     if (mConsole)
-        rc = mConsole->machine().queryInterfaceTo(aMachine);
+       rc = mConsole->machine().queryInterfaceTo(aMachine);
     else
-        rc = mRemoteMachine.queryInterfaceTo(aMachine);
+       rc = mRemoteMachine.queryInterfaceTo(aMachine);   
     if (FAILED(rc))
     {
@@ -215 +221 @@
     else
         rc = mRemoteConsole.queryInterfaceTo(aConsole);
+
     if (FAILED(rc))
     {

trunk/src/VBox/Main/src-client/USBDeviceImpl.cpp

@@ -30 +30 @@
 HRESULT OUSBDevice::FinalConstruct()
 {
-    return S_OK;
+    return BaseFinalConstruct();
 }
 
@@ -36 +36 @@
 {
     uninit ();
+    BaseFinalRelease();
 }
 

trunk/src/VBox/Main/src-client/VirtualBoxClientImpl.cpp

@@ -42 +42 @@
 HRESULT VirtualBoxClient::FinalConstruct()
 {
-    return init();
+    HRESULT rc = init();
+    BaseFinalConstruct();
+    return rc;
 }
 
@@ -48 +50 @@
 {
     uninit();
+    BaseFinalRelease();
 }