Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix problems with reference counting in wxActiveXContainer.

Browse Source 
Ensure that the IFrameSite object is created with valid (i.e. non-zero)
reference count by calling AddRef() on it immediately after creation and
remove the weird QueryInterface() call which was used to work around this bug.

Closes #11566.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-10-24 22:41:36 +00:00
parent 21e5aa164e
commit e0b5dc3d63
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/msw/ole/activex.cpp
View File

@@ -928,6 +928,7 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
// FrameSite // FrameSite
m_frameSite = new FrameSite(m_realparent, this); m_frameSite = new FrameSite(m_realparent, this);
m_frameSite->AddRef();
// oleClientSite // oleClientSite
hret = m_clientSite.QueryInterface( hret = m_clientSite.QueryInterface(
IID_IOleClientSite, (IDispatch *) m_frameSite); IID_IOleClientSite, (IDispatch *) m_frameSite);
@@ -1030,8 +1031,6 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
if ( cp ) if ( cp )
{ {
IDispatch* disp;
m_frameSite->QueryInterface(IID_IDispatch, (void**)&disp);
hret = cp->Advise(new wxActiveXEvents(this, ta->guid), hret = cp->Advise(new wxActiveXEvents(this, ta->guid),
&adviseCookie); &adviseCookie);
CHECK_HR(hret); CHECK_HR(hret);