Changeset 90879 in vbox for trunk

Timestamp:

Aug 25, 2021 12:20:08 PM (3 years ago)

Author:

vboxsync

Message:

Main: bugref:1909: Fixed listener unregistration and race of event delivering during com::Shutdown.

Location:

trunk/src/VBox/Main

Files:

• include/VirtualBoxClientImpl.h (modified) (2 diffs)
• src-client/VirtualBoxClientImpl.cpp (modified) (6 diffs)

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

@@ -99 +99 @@
         ComPtr<IToken> m_pToken;
         const ComObjPtr<EventSource> m_pEventSource;
+        ComPtr<IEventSource> m_pVBoxEventSource;
+        ComPtr<IEventListener> m_pVBoxEventListener;
 
         RTTHREAD m_ThreadWatcher;
@@ -118 +120 @@
     HRESULT i_reloadApiLanguage();
     HRESULT i_registerEventListener();
+    void    i_unregisterEventListener();
 #endif
 };

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

@@ -59 +59 @@
 
 
-    HRESULT init(VirtualBoxClient *aClient)
-    {
-        mClient = aClient;
+    HRESULT init(void *)
+    {
+        return S_OK;
+    }
+
+    HRESULT init()
+    {
         return S_OK;
     }
@@ -80 +84 @@
             case VBoxEventType_OnLanguageChanged:
             {
-                mClient->i_reloadApiLanguage();
+                VirtualBoxTranslator *pTranslator = VirtualBoxTranslator::instance();
+                if (pTranslator)
+                {
+                    ComPtr<ILanguageChangedEvent> pEvent = aEvent;
+                    HRESULT rc = E_FAIL;
+                    Assert(pEvent);
+
+                    com::Bstr bstrLanguageId;
+                    rc = pEvent->COMGETTER(LanguageId)(bstrLanguageId.asOutParam());
+                    AssertComRC(rc);
+
+                    com::Utf8Str strLanguageId(bstrLanguageId);
+                    pTranslator->i_loadLanguage(strLanguageId.c_str());
+                    pTranslator->release();
+                }
                 break;
             }
@@ -90 +108 @@
         return S_OK;
     }
-private:
-    ComObjPtr<VirtualBoxClient>    mClient;
 };
 
-typedef ListenerImpl<VBoxEventListener, VirtualBoxClient*> VBoxEventListenerImpl;
-
-VBOX_LISTENER_DECLARE(VBoxEventListenerImpl)
+typedef ListenerImpl<VBoxEventListener> VBoxEventListenerImpl;
+
+VBOX_LISTENER_DECLARE(VBoxTrEventListenerImpl)
 
 #endif /* VBOX_WITH_MAIN_NLS */
@@ -527 +543 @@
     if (autoUninitSpan.uninitDone())
         return;
+
+#ifdef VBOX_WITH_MAIN_NLS
+    i_unregisterEventListener();
+#endif
 
     if (mData.m_ThreadWatcher != NIL_RTTHREAD)
@@ -724 +744 @@
 HRESULT VirtualBoxClient::i_registerEventListener()
 {
-    ComPtr<IEventSource> pES;
-    HRESULT rc = mData.m_pVirtualBox->COMGETTER(EventSource)(pES.asOutParam());
+    HRESULT rc = mData.m_pVirtualBox->COMGETTER(EventSource)(mData.m_pVBoxEventSource.asOutParam());
     if (SUCCEEDED(rc))
     {
-        ComObjPtr<VBoxEventListenerImpl> aVBoxListener;
-        aVBoxListener.createObject();
-        aVBoxListener->init(new VBoxEventListener(), this);
-//        mData.m_pVBoxListener = aVBoxListener;
+        ComObjPtr<VBoxEventListenerImpl> pVBoxListener;
+        pVBoxListener.createObject();
+        pVBoxListener->init(new VBoxEventListener());
+        mData.m_pVBoxEventListener = pVBoxListener;
         com::SafeArray<VBoxEventType_T> eventTypes;
         eventTypes.push_back(VBoxEventType_OnLanguageChanged);
-        rc = pES->RegisterListener(aVBoxListener, ComSafeArrayAsInParam(eventTypes), true);
+        rc = mData.m_pVBoxEventSource->RegisterListener(pVBoxListener, ComSafeArrayAsInParam(eventTypes), true);
         if (FAILED(rc))
+        {
             rc = setError(rc, tr("Failed to register listener"));
+            mData.m_pVBoxEventListener.setNull();
+            mData.m_pVBoxEventSource.setNull();
+        }
     }
     else
@@ -743 +766 @@
 }
 
+void VirtualBoxClient::i_unregisterEventListener()
+{
+    if (mData.m_pVBoxEventListener.isNotNull())
+    {
+        if (mData.m_pVBoxEventSource.isNotNull())
+            mData.m_pVBoxEventSource->UnregisterListener(mData.m_pVBoxEventListener);
+        mData.m_pVBoxEventListener.setNull();
+    }
+    mData.m_pVBoxEventSource.setNull();
+}
+
 #endif /* VBOX_WITH_MAIN_NLS */