[ros-diffs] [tfaber] 54304: [MSHTML][SHDOCVW] - Initialize OLEINPLACEFRAMEINFO.cb for IOleInPlaceSite::GetWindowContext. Fixes explorer "Web" button assert. Already applied upstream. See issue #6011 for more d...

[tfaber at svn.reactos.org]

Author: tfaber
Date: Sat Nov  5 20:40:59 2011
New Revision: 54304

URL: http://svn.reactos.org/svn/reactos?rev=54304&view=rev
Log:
[MSHTML][SHDOCVW]
- Initialize OLEINPLACEFRAMEINFO.cb for IOleInPlaceSite::GetWindowContext. Fixes explorer "Web" button assert. Already applied upstream.
See issue #6011 for more details.

Modified:
    trunk/reactos/dll/win32/mshtml/view.c
    trunk/reactos/dll/win32/shdocvw/client.c
    trunk/reactos/dll/win32/shdocvw/oleobject.c

Modified: trunk/reactos/dll/win32/mshtml/view.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/view.c?rev=54304&r1=54303&r2=54304&view=diff
==============================================================================
--- trunk/reactos/dll/win32/mshtml/view.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/view.c [iso-8859-1] Sat Nov  5 20:40:59 2011
@@ -259,6 +259,7 @@
         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)) {

Modified: trunk/reactos/dll/win32/shdocvw/client.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/client.c?rev=54304&r1=54303&r2=54304&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shdocvw/client.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shdocvw/client.c [iso-8859-1] Sat Nov  5 20:40:59 2011
@@ -227,7 +227,6 @@
     GetClientRect(This->hwnd, lprcPosRect);
     *lprcClipRect = *lprcPosRect;
 
-    lpFrameInfo->cb = sizeof(*lpFrameInfo);
     lpFrameInfo->fMDIApp = FALSE;
     lpFrameInfo->hwndFrame = This->frame_hwnd;
     lpFrameInfo->haccel = NULL;

Modified: trunk/reactos/dll/win32/shdocvw/oleobject.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/oleobject.c?rev=54304&r1=54303&r2=54304&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shdocvw/oleobject.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shdocvw/oleobject.c [iso-8859-1] Sat Nov  5 20:40:59 2011
@@ -141,6 +141,7 @@
 
     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);