Thomas Faber : shdocvw: Initialize OLEINPLACEFRAMEINFO. cb for IOleInPlaceSite::GetWindowContext.
Alexandre Julliard
julliard at winehq.org
Fri Mar 18 11:30:19 CDT 2011
Module: wine
Branch: master
Commit: a48ed33609f68ad6bd6c706f0fb716b4069b4eb5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a48ed33609f68ad6bd6c706f0fb716b4069b4eb5
Author: Thomas Faber <thfabba at gmx.de>
Date: Wed Mar 16 15:14:19 2011 +0100
shdocvw: Initialize OLEINPLACEFRAMEINFO.cb for IOleInPlaceSite::GetWindowContext.
---
dlls/shdocvw/client.c | 1 -
dlls/shdocvw/oleobject.c | 1 +
dlls/shdocvw/tests/webbrowser.c | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/shdocvw/client.c b/dlls/shdocvw/client.c
index 3443170..729669b 100644
--- a/dlls/shdocvw/client.c
+++ b/dlls/shdocvw/client.c
@@ -230,7 +230,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;
diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c
index 97fbfaa..df06028 100644
--- a/dlls/shdocvw/oleobject.c
+++ b/dlls/shdocvw/oleobject.c
@@ -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);
diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c
index e433b13..06d0ded 100644
--- a/dlls/shdocvw/tests/webbrowser.c
+++ b/dlls/shdocvw/tests/webbrowser.c
@@ -1275,7 +1275,7 @@ static HRESULT WINAPI InPlaceSite_GetWindowContext(IOleInPlaceSiteEx *iface,
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;
More information about the wine-cvs
mailing list