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

Fix crash on wxMediaCtrl creation in wxMSW.

Browse Source 
A valid RECT pointer must be passed to DoVerb(OLEIVERB_INPLACEACTIVATE) but
r72027 (see #14209) broke this and passed it NULL resulting in an instant
crash.

Revert this part of the change and do pass out window client area.

Closes #14682.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-09-21 10:26:18 +00:00
parent 7cc3d0e004
commit 6e34a9e443
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1113,8 +1113,11 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
if (! (dwMiscStatus & OLEMISC_INVISIBLEATRUNTIME)) if (! (dwMiscStatus & OLEMISC_INVISIBLEATRUNTIME))
{ {
RECT posRect;
wxCopyRectToRECT(m_realparent->GetClientSize(), posRect);
hret = m_oleObject->DoVerb(OLEIVERB_INPLACEACTIVATE, NULL, hret = m_oleObject->DoVerb(OLEIVERB_INPLACEACTIVATE, NULL,
m_clientSite, 0, (HWND)m_realparent->GetHWND(), NULL); m_clientSite, 0, (HWND)m_realparent->GetHWND(), &posRect);
CHECK_HR(hret); CHECK_HR(hret);
if (m_oleInPlaceObject.IsOk()) if (m_oleInPlaceObject.IsOk())
@@ -1124,9 +1127,6 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
::SetActiveWindow(m_oleObjectHWND); ::SetActiveWindow(m_oleObjectHWND);
} }
RECT posRect;
wxCopyRectToRECT(m_realparent->GetClientSize(), posRect);
if (posRect.right > 0 && posRect.bottom > 0 && if (posRect.right > 0 && posRect.bottom > 0 &&
m_oleInPlaceObject.IsOk()) m_oleInPlaceObject.IsOk())
{ {