From 6e34a9e443ee70a8e243198e86d85f110a8a53cc Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 21 Sep 2012 10:26:18 +0000 Subject: [PATCH] Fix crash on wxMediaCtrl creation in wxMSW. 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 --- src/msw/ole/activex.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp index b034ab1c11..d0652d4bcc 100644 --- a/src/msw/ole/activex.cpp +++ b/src/msw/ole/activex.cpp @@ -1113,8 +1113,11 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk) if (! (dwMiscStatus & OLEMISC_INVISIBLEATRUNTIME)) { + RECT posRect; + wxCopyRectToRECT(m_realparent->GetClientSize(), posRect); + 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); if (m_oleInPlaceObject.IsOk()) @@ -1124,9 +1127,6 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk) ::SetActiveWindow(m_oleObjectHWND); } - RECT posRect; - wxCopyRectToRECT(m_realparent->GetClientSize(), posRect); - if (posRect.right > 0 && posRect.bottom > 0 && m_oleInPlaceObject.IsOk()) {