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

Always create new OLE objects with reference count of 1, not 0.

Browse Source 
There are no real changes but ensure that the new objects of classes using
DECLARE_OLE_UNKNOWN() macro are created with valid reference count of 1
instead of being created in phantom state with reference count of 0.

Remove the now unnecessary AddRef() and add the now required DecRef() calls.

See #11566.

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

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

@@ -54,7 +54,7 @@ wxDEFINE_EVENT( wxEVT_ACTIVEX, wxActiveXEvent );
{\ {\
public:\ public:\
LONG l;\ LONG l;\
TAutoInitInt() : l(0) {}\ TAutoInitInt() : l(1) {}\
};\ };\
TAutoInitInt refCount, lockCount;\ TAutoInitInt refCount, lockCount;\
static void _GetInterface(cls *self, REFIID iid, void **_interface, const char *&desc);\ static void _GetInterface(cls *self, REFIID iid, void **_interface, const char *&desc);\
@@ -928,7 +928,6 @@ 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);
@@ -1031,8 +1030,15 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
if ( cp ) if ( cp )
{ {
hret = cp->Advise(new wxActiveXEvents(this, ta->guid), wxActiveXEvents * const
&adviseCookie); events = new wxActiveXEvents(this, ta->guid);
hret = cp->Advise(events, &adviseCookie);
// We don't need this object any more and cp will keep a
// reference to it if it needs it, i.e. if Advise()
// succeeded.
events->Release();
CHECK_HR(hret); CHECK_HR(hret);
} }
} }