Jacek Caban : shdocvw: Move UI activating to the separated function.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue May 23 15:22:43 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: dda3bea568eea9c816022bec8348fdd60e3defb4
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dda3bea568eea9c816022bec8348fdd60e3defb4
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue May 23 20:05:58 2006 +0200
shdocvw: Move UI activating to the separated function.
---
dlls/shdocvw/oleobject.c | 50 +++++++++++++++++++++++++---------------------
1 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c
index 074da8d..c6a35aa 100644
--- a/dlls/shdocvw/oleobject.c
+++ b/dlls/shdocvw/oleobject.c
@@ -152,6 +152,30 @@ static HRESULT activate_inplace(WebBrows
return S_OK;
}
+static HRESULT activate_ui(WebBrowser *This, IOleClientSite *active_site, HWND parent_hwnd)
+{
+ HRESULT hres;
+
+ static const WCHAR wszitem[] = {'i','t','e','m',0};
+
+ hres = activate_inplace(This, active_site, parent_hwnd);
+ if(FAILED(hres))
+ return hres;
+
+ IOleInPlaceSite_OnUIActivate(This->inplace);
+
+ if(This->frame)
+ IOleInPlaceFrame_SetActiveObject(This->frame, ACTIVEOBJ(This), wszitem);
+ if(This->uiwindow)
+ IOleInPlaceUIWindow_SetActiveObject(This->uiwindow, ACTIVEOBJ(This), wszitem);
+
+ /* TODO:
+ * IOleInPlaceFrmae_SetMenu
+ */
+
+ return S_OK;
+}
+
/**********************************************************************
* Implement the IOleObject interface for the WebBrowser control
*/
@@ -291,38 +315,18 @@ static HRESULT WINAPI OleObject_DoVerb(I
LPOLECLIENTSITE pActiveSite, LONG lindex, HWND hwndParent, LPCRECT lprcPosRect)
{
WebBrowser *This = OLEOBJ_THIS(iface);
- HRESULT hres;
-
- static const WCHAR wszitem[] = {'i','t','e','m',0};
TRACE("(%p)->(%ld %p %p %ld %p %p)\n", This, iVerb, lpmsg, pActiveSite, lindex, hwndParent,
lprcPosRect);
switch (iVerb)
{
+ case OLEIVERB_SHOW:
+ TRACE("OLEIVERB_SHOW\n");
+ return activate_ui(This, pActiveSite, hwndParent);
case OLEIVERB_INPLACEACTIVATE:
TRACE("OLEIVERB_INPLACEACTIVATE\n");
return activate_inplace(This, pActiveSite, hwndParent);
-
- case OLEIVERB_SHOW:
- TRACE("OLEIVERB_SHOW\n");
-
- hres = activate_inplace(This, pActiveSite, hwndParent);
- if(FAILED(hres))
- return hres;
-
- IOleInPlaceSite_OnUIActivate(This->inplace);
-
- if(This->frame)
- IOleInPlaceFrame_SetActiveObject(This->frame, ACTIVEOBJ(This), wszitem);
- if(This->uiwindow)
- IOleInPlaceUIWindow_SetActiveObject(This->uiwindow, ACTIVEOBJ(This), wszitem);
-
- /* TODO:
- * IOleInPlaceFrmae_SetMenu
- */
-
- return S_OK;
default:
FIXME("stub for %ld\n", iVerb);
break;
More information about the wine-cvs
mailing list