mirror of
https://github.com/reactos/reactos.git
synced 2025-02-23 17:05:46 +00:00
[MSHTML][SHDOCVW]
- Initialize OLEINPLACEFRAMEINFO.cb for IOleInPlaceSite::GetWindowContext. Fixes explorer "Web" button assert. Already applied upstream. See issue #6011 for more details. svn path=/trunk/; revision=54304
This commit is contained in:
parent
c10be1a84f
commit
238b9ff6c3
3 changed files with 2 additions and 1 deletions
|
@ -259,6 +259,7 @@ static HRESULT activate_window(HTMLDocumentObj *This)
|
|||
return FAILED(hres) ? hres : E_FAIL;
|
||||
}
|
||||
|
||||
frameinfo.cb = sizeof(OLEINPLACEFRAMEINFO);
|
||||
hres = IOleInPlaceSite_GetWindowContext(This->ipsite, &pIPFrame, &This->ip_window,
|
||||
&posrect, &cliprect, &frameinfo);
|
||||
if(FAILED(hres)) {
|
||||
|
|
|
@ -227,7 +227,6 @@ static HRESULT WINAPI InPlaceSite_GetWindowContext(IOleInPlaceSite *iface,
|
|||
GetClientRect(This->hwnd, lprcPosRect);
|
||||
*lprcClipRect = *lprcPosRect;
|
||||
|
||||
lpFrameInfo->cb = sizeof(*lpFrameInfo);
|
||||
lpFrameInfo->fMDIApp = FALSE;
|
||||
lpFrameInfo->hwndFrame = This->frame_hwnd;
|
||||
lpFrameInfo->haccel = NULL;
|
||||
|
|
|
@ -141,6 +141,7 @@ static HRESULT activate_inplace(WebBrowser *This, IOleClientSite *active_site)
|
|||
|
||||
IOleInPlaceSite_OnInPlaceActivate(This->inplace);
|
||||
|
||||
This->frameinfo.cb = sizeof(OLEINPLACEFRAMEINFO);
|
||||
IOleInPlaceSite_GetWindowContext(This->inplace, &This->doc_host.frame, &This->uiwindow,
|
||||
&This->pos_rect, &This->clip_rect,
|
||||
&This->frameinfo);
|
||||
|
|
Loading…
Reference in a new issue