From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 24 Oct 2010 22:41:29 +0000 (+0000)
Subject: Don't consider lack of connection points an error in wxActiveXContainer.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/21e5aa164e50643630e2c803743498839f2ad808

Don't consider lack of connection points an error in wxActiveXContainer.

Handle CONNECT_E_NOCONNECTION return value from IConnectionPointContainer::
FindConnectionPoint() as an expected error and don't complain about it.

See #11566.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp
index 92a5a1186b..e2661bda65 100644
--- a/src/msw/ole/activex.cpp
+++ b/src/msw/ole/activex.cpp
@@ -1020,7 +1020,13 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
 
                 HRESULT hret =
                     cpContainer->FindConnectionPoint(ta->guid, cp.GetRef());
-                CHECK_HR(hret);
+
+                // Notice that the return value of CONNECT_E_NOCONNECTION is
+                // expected if the interface doesn't support connection points.
+                if ( hret != CONNECT_E_NOCONNECTION )
+                {
+                    CHECK_HR(hret);
+                }
 
                 if ( cp )
                 {