Paul Chitescu : mshtml: Do not try to use IDocHostUIHandler for context menu if hostui is NULL.
Alexandre Julliard
julliard at winehq.org
Thu Jul 1 11:19:32 CDT 2010
Module: wine
Branch: master
Commit: fa49b9f22604691627d2273a5fa603d8a0066df1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa49b9f22604691627d2273a5fa603d8a0066df1
Author: Paul Chitescu <paulc at voip.null.ro>
Date: Wed Jun 30 18:52:17 2010 +0300
mshtml: Do not try to use IDocHostUIHandler for context menu if hostui is NULL.
---
dlls/mshtml/olecmd.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c
index 4d5967a..851189b 100644
--- a/dlls/mshtml/olecmd.c
+++ b/dlls/mshtml/olecmd.c
@@ -898,11 +898,9 @@ void show_context_menu(HTMLDocumentObj *This, DWORD dwID, POINT *ppt, IDispatch
{
HMENU menu_res, menu;
DWORD cmdid;
- HRESULT hres;
- hres = IDocHostUIHandler_ShowContextMenu(This->hostui, dwID, ppt,
- (IUnknown*)CMDTARGET(&This->basedoc), elem);
- if(hres == S_OK)
+ if(This->hostui && S_OK == IDocHostUIHandler_ShowContextMenu(This->hostui,
+ dwID, ppt, (IUnknown*)CMDTARGET(&This->basedoc), elem))
return;
menu_res = LoadMenuW(get_shdoclc(), MAKEINTRESOURCEW(IDR_BROWSE_CONTEXT_MENU));
More information about the wine-cvs
mailing list