Module: wine Branch: master Commit: a105f22e17c6b6e6f7af5e39dbe32a389c1b51ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=a105f22e17c6b6e6f7af5e39db...
Author: Thomas Faber thfabba@gmx.de Date: Wed Mar 16 15:14:19 2011 +0100
mshtml: Initialize OLEINPLACEFRAMEINFO.cb for IOleInPlaceSite::GetWindowContext.
---
dlls/mshtml/tests/activex.c | 2 +- dlls/mshtml/tests/events.c | 2 +- dlls/mshtml/tests/htmldoc.c | 2 +- dlls/mshtml/tests/script.c | 2 +- dlls/mshtml/view.c | 1 + 5 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 486acce..c056e8b 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -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; diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index a670532..6ed9f97 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -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; diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 11b2036..d45eefb 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -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; diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 35e6a9c..092d4a7 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -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; diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index fccbde8..3852046 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -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)) {