mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-06 04:20:56 +00:00
mshtml: Initialize OLEINPLACEFRAMEINFO.cb for IOleInPlaceSite::GetWindowContext.
This commit is contained in:
parent
3e0053b49d
commit
a105f22e17
|
@ -889,6 +889,7 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpms
|
|||
|
||||
ip_frame = NULL;
|
||||
ip_uiwindow = NULL;
|
||||
frame_info.cb = sizeof(OLEINPLACEFRAMEINFO);
|
||||
hres = IOleInPlaceSiteEx_GetWindowContext(ip_site, &ip_frame, &ip_uiwindow, &pos_rect, &clip_rect, &frame_info);
|
||||
ok(hres == S_OK, "GetWindowContext failed: %08x\n", hres);
|
||||
ok(ip_frame != NULL, "ip_frame == NULL\n");
|
||||
|
@ -1534,7 +1535,6 @@ static HRESULT WINAPI InPlaceSite_GetWindowContext(IOleInPlaceSite *iface,
|
|||
*lprcPosRect = rect;
|
||||
*lprcClipRect = rect;
|
||||
|
||||
lpFrameInfo->cb = sizeof(*lpFrameInfo);
|
||||
lpFrameInfo->fMDIApp = FALSE;
|
||||
lpFrameInfo->hwndFrame = container_hwnd;
|
||||
lpFrameInfo->haccel = NULL;
|
||||
|
|
|
@ -1969,7 +1969,7 @@ static HRESULT WINAPI InPlaceSite_GetWindowContext(IOleInPlaceSite *iface,
|
|||
*lprcPosRect = rect;
|
||||
*lprcClipRect = rect;
|
||||
|
||||
lpFrameInfo->cb = sizeof(*lpFrameInfo);
|
||||
ok(lpFrameInfo->cb == sizeof(*lpFrameInfo), "lpFrameInfo->cb = %u, expected %u\n", lpFrameInfo->cb, (unsigned)sizeof(*lpFrameInfo));
|
||||
lpFrameInfo->fMDIApp = FALSE;
|
||||
lpFrameInfo->hwndFrame = container_hwnd;
|
||||
lpFrameInfo->haccel = NULL;
|
||||
|
|
|
@ -1701,7 +1701,7 @@ static HRESULT WINAPI InPlaceSiteWindowless_GetWindowContext(
|
|||
memcpy(lprcClipRect, &rect, sizeof(RECT));
|
||||
ok(lpFrameInfo != NULL, "lpFrameInfo = NULL\n");
|
||||
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->hwndFrame = container_hwnd;
|
||||
lpFrameInfo->haccel = NULL;
|
||||
|
|
|
@ -883,7 +883,7 @@ static HRESULT WINAPI InPlaceSite_GetWindowContext(IOleInPlaceSite *iface,
|
|||
*lprcPosRect = rect;
|
||||
*lprcClipRect = rect;
|
||||
|
||||
lpFrameInfo->cb = sizeof(*lpFrameInfo);
|
||||
ok(lpFrameInfo->cb == sizeof(*lpFrameInfo), "lpFrameInfo->cb = %u, expected %u\n", lpFrameInfo->cb, (unsigned)sizeof(*lpFrameInfo));
|
||||
lpFrameInfo->fMDIApp = FALSE;
|
||||
lpFrameInfo->hwndFrame = container_hwnd;
|
||||
lpFrameInfo->haccel = NULL;
|
||||
|
|
|
@ -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)) {
|
||||
|
|
Loading…
Reference in a new issue