shdocvw: Initialize OLEINPLACEFRAMEINFO.cb for IOleInPlaceSite::GetWindowContext.
This commit is contained in:
parent
a105f22e17
commit
a48ed33609
|
@ -230,7 +230,6 @@ static HRESULT WINAPI InPlaceSite_GetWindowContext(IOleInPlaceSite *iface,
|
||||||
GetClientRect(This->hwnd, lprcPosRect);
|
GetClientRect(This->hwnd, lprcPosRect);
|
||||||
*lprcClipRect = *lprcPosRect;
|
*lprcClipRect = *lprcPosRect;
|
||||||
|
|
||||||
lpFrameInfo->cb = sizeof(*lpFrameInfo);
|
|
||||||
lpFrameInfo->fMDIApp = FALSE;
|
lpFrameInfo->fMDIApp = FALSE;
|
||||||
lpFrameInfo->hwndFrame = This->frame_hwnd;
|
lpFrameInfo->hwndFrame = This->frame_hwnd;
|
||||||
lpFrameInfo->haccel = NULL;
|
lpFrameInfo->haccel = NULL;
|
||||||
|
|
|
@ -141,6 +141,7 @@ static HRESULT activate_inplace(WebBrowser *This, IOleClientSite *active_site)
|
||||||
|
|
||||||
IOleInPlaceSite_OnInPlaceActivate(This->inplace);
|
IOleInPlaceSite_OnInPlaceActivate(This->inplace);
|
||||||
|
|
||||||
|
This->frameinfo.cb = sizeof(OLEINPLACEFRAMEINFO);
|
||||||
IOleInPlaceSite_GetWindowContext(This->inplace, &This->doc_host.frame, &This->uiwindow,
|
IOleInPlaceSite_GetWindowContext(This->inplace, &This->doc_host.frame, &This->uiwindow,
|
||||||
&This->pos_rect, &This->clip_rect,
|
&This->pos_rect, &This->clip_rect,
|
||||||
&This->frameinfo);
|
&This->frameinfo);
|
||||||
|
|
|
@ -1275,7 +1275,7 @@ static HRESULT WINAPI InPlaceSite_GetWindowContext(IOleInPlaceSiteEx *iface,
|
||||||
|
|
||||||
ok(lpFrameInfo != NULL, "lpFrameInfo = NULL\n");
|
ok(lpFrameInfo != NULL, "lpFrameInfo = NULL\n");
|
||||||
if(lpFrameInfo) {
|
if(lpFrameInfo) {
|
||||||
lpFrameInfo->cb = sizeof(*lpFrameInfo);
|
ok(lpFrameInfo->cb == sizeof(*lpFrameInfo), "lpFrameInfo->cb = %u, expected %u\n", lpFrameInfo->cb, (unsigned)sizeof(*lpFrameInfo));
|
||||||
lpFrameInfo->fMDIApp = FALSE;
|
lpFrameInfo->fMDIApp = FALSE;
|
||||||
lpFrameInfo->hwndFrame = container_hwnd;
|
lpFrameInfo->hwndFrame = container_hwnd;
|
||||||
lpFrameInfo->haccel = NULL;
|
lpFrameInfo->haccel = NULL;
|
||||||
|
|
Loading…
Reference in New Issue