mshtml: Pass the IDispatch interface of the element right-clicked on to…

mshtml: Pass the IDispatch interface of the element right-clicked on to IDocHostUIHandler_ShowContextMenu if applicable instead of always the document's one. Found by Rob Shearman.

mshtml: Pass the IDispatch interface of the element right-clicked on to…
f5ef66a3 · Jacek Caban · Alexandre Julliard · 42349000 · f5ef66a3 · f5ef66a3
Commit f5ef66a3 authored Oct 02, 2007 by Jacek Caban Committed by Alexandre Julliard Oct 03, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

mshtml_private.h dlls/mshtml/mshtml_private.h +1 -1

nsembed.c dlls/mshtml/nsembed.c +1 -1

olecmd.c dlls/mshtml/olecmd.c +2 -2

No files found.
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -362,7 +362,7 @@ NSContainer *NSContainer_Create(HTMLDocument*,NSContainer*);
 void NSContainer_Release(NSContainer*);

 void HTMLDocument_LockContainer(HTMLDocument*,BOOL);
-void show_context_menu(HTMLDocument*,DWORD,POINT*);
+void show_context_menu(HTMLDocument*,DWORD,POINT*,IDispatch*);
 void notif_focus(HTMLDocument*);

 void show_tooltip(HTMLDocument*,DWORD,DWORD,LPCWSTR);

--- a/dlls/mshtml/nsembed.c
+++ b/dlls/mshtml/nsembed.c
@@ -997,7 +997,7 @@ static nsresult NSAPI nsContextMenuListener_OnShowContextMenu(nsIContextMenuList
        FIXME("aContextFlags=%08x\n", aContextFlags);
    };

-    show_context_menu(This->doc, dwID, &pt);
+    show_context_menu(This->doc, dwID, &pt, (IDispatch*)HTMLDOMNODE(get_node(This->doc, aNode)));

    return NS_OK;
 }

--- a/dlls/mshtml/olecmd.c
+++ b/dlls/mshtml/olecmd.c
@@ -852,14 +852,14 @@ static const IOleCommandTargetVtbl OleCommandTargetVtbl = {
    OleCommandTarget_Exec
 };

-void show_context_menu(HTMLDocument *This, DWORD dwID, POINT *ppt)
+void show_context_menu(HTMLDocument *This, DWORD dwID, POINT *ppt, IDispatch *elem)
 {
    HMENU menu_res, menu;
    DWORD cmdid;
    HRESULT hres;

    hres = IDocHostUIHandler_ShowContextMenu(This->hostui, dwID, ppt,
-            (IUnknown*)CMDTARGET(This), (IDispatch*)HTMLDOC(This));
+            (IUnknown*)CMDTARGET(This), elem);
    if(hres == S_OK)
        return;