Changeset 55189 in vbox

Timestamp:

Apr 10, 2015 4:25:45 PM (9 years ago)

Author:

vboxsync

Message:

Main/VirtualBoxErrorInfo: Fix long-standing issue on Windows host when using this interface in the GUI process (which has to use a rather unusual apartment style, leading to marshaling issues between threads). The symptom was e.g. no detailed error information when a VM powerup failed due to inaccessible disks.

File:

• trunk/src/VBox/Main/include/VirtualBoxErrorInfoImpl.h (modified) (3 diffs)

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

@@ -4 +4 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -39 +39 @@
         COM_INTERFACE_ENTRY(IVirtualBoxErrorInfo)
         COM_INTERFACE_ENTRY(IDispatch)
+        COM_INTERFACE_ENTRY_AGGREGATE(IID_IMarshal, m_pUnkMarshaler)
     END_COM_MAP()
+
+    HRESULT FinalConstruct()
+    {
+#ifndef VBOX_WITH_XPCOM
+        return CoCreateFreeThreadedMarshaler((IUnknown *)(void *)this, &m_pUnkMarshaler);
+#else
+        return S_OK;
+#endif
+    }
+
+    void FinalRelease()
+    {
+#ifndef VBOX_WITH_XPCOM
+        if (m_pUnkMarshaler)
+        {
+            m_pUnkMarshaler->Release();
+            m_pUnkMarshaler = NULL;
+        }
+#endif
+    }
 
 #ifndef VBOX_WITH_XPCOM
@@ -128 +149 @@
     Utf8Str m_strComponent;
     ComPtr<IVirtualBoxErrorInfo> mNext;
+
+#ifndef VBOX_WITH_XPCOM
+    IUnknown *m_pUnkMarshaler;
+#endif
 };