Module: wine Branch: master Commit: 3ed71ab58c13fbad1397170e136d14908b07203a URL: https://gitlab.winehq.org/wine/wine/-/commit/3ed71ab58c13fbad1397170e136d149...
Author: Gabriel Ivăncescu gabrielopcode@gmail.com Date: Mon Sep 18 18:00:53 2023 +0300
mshtml: Move some IFrame methods down.
Signed-off-by: Gabriel Ivăncescu gabrielopcode@gmail.com
---
dlls/mshtml/htmlframe.c | 117 ++++++++++++++++++++++++------------------------ 1 file changed, 58 insertions(+), 59 deletions(-)
diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index b66e1d91267..5229e6635a8 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -1473,27 +1473,6 @@ static inline HTMLIFrame *iframe_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLIFrame, framebase.element.node); }
-static void *HTMLIFrame_QI(HTMLDOMNode *iface, REFIID riid) -{ - HTMLIFrame *This = iframe_from_HTMLDOMNode(iface); - - if(IsEqualGUID(&IID_IHTMLIFrameElement, riid)) - return &This->IHTMLIFrameElement_iface; - if(IsEqualGUID(&IID_IHTMLIFrameElement2, riid)) - return &This->IHTMLIFrameElement2_iface; - if(IsEqualGUID(&IID_IHTMLIFrameElement3, riid)) - return &This->IHTMLIFrameElement3_iface; - - return HTMLFrameBase_QI(&This->framebase, riid); -} - -static void HTMLIFrame_destructor(HTMLDOMNode *iface) -{ - HTMLIFrame *This = iframe_from_HTMLDOMNode(iface); - - HTMLFrameBase_destructor(&This->framebase); -} - static HRESULT HTMLIFrame_get_document(HTMLDOMNode *iface, IDispatch **p) { HTMLIFrame *This = iframe_from_HTMLDOMNode(iface); @@ -1508,44 +1487,6 @@ static HRESULT HTMLIFrame_get_document(HTMLDOMNode *iface, IDispatch **p) return S_OK; }
-static HRESULT HTMLIFrame_get_dispid(HTMLDOMNode *iface, BSTR name, - DWORD grfdex, DISPID *pid) -{ - HTMLIFrame *This = iframe_from_HTMLDOMNode(iface); - - if(!This->framebase.content_window) - return DISP_E_UNKNOWNNAME; - - return search_window_props(This->framebase.content_window->base.inner_window, name, grfdex, pid); -} - -static HRESULT HTMLIFrame_get_name(HTMLDOMNode *iface, DISPID id, BSTR *name) -{ - HTMLIFrame *This = iframe_from_HTMLDOMNode(iface); - DWORD idx = id - MSHTML_DISPID_CUSTOM_MIN; - - if(!This->framebase.content_window || - idx >= This->framebase.content_window->base.inner_window->global_prop_cnt) - return DISP_E_MEMBERNOTFOUND; - - *name = SysAllocString(This->framebase.content_window->base.inner_window->global_props[idx].name); - return *name ? S_OK : E_OUTOFMEMORY; -} - -static HRESULT HTMLIFrame_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid, - WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) -{ - HTMLIFrame *This = iframe_from_HTMLDOMNode(iface); - - if(!This->framebase.content_window) { - ERR("no content window to invoke on\n"); - return E_FAIL; - } - - return IDispatchEx_InvokeEx(&This->framebase.content_window->base.IDispatchEx_iface, id, lcid, - flags, params, res, ei, caller); -} - static HRESULT HTMLIFrame_get_readystate(HTMLDOMNode *iface, BSTR *p) { HTMLIFrame *This = iframe_from_HTMLDOMNode(iface); @@ -1576,6 +1517,20 @@ static inline HTMLIFrame *iframe_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLIFrame, framebase.element.node.event_target.dispex); }
+static void *HTMLIFrame_QI(HTMLDOMNode *iface, REFIID riid) +{ + HTMLIFrame *This = iframe_from_HTMLDOMNode(iface); + + if(IsEqualGUID(&IID_IHTMLIFrameElement, riid)) + return &This->IHTMLIFrameElement_iface; + if(IsEqualGUID(&IID_IHTMLIFrameElement2, riid)) + return &This->IHTMLIFrameElement2_iface; + if(IsEqualGUID(&IID_IHTMLIFrameElement3, riid)) + return &This->IHTMLIFrameElement3_iface; + + return HTMLFrameBase_QI(&This->framebase, riid); +} + static void HTMLIFrame_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLIFrame *This = iframe_from_DispatchEx(dispex); @@ -1592,6 +1547,50 @@ static void HTMLIFrame_unlink(DispatchEx *dispex) unlink_ref(&This->framebase.nsiframe); }
+static void HTMLIFrame_destructor(HTMLDOMNode *iface) +{ + HTMLIFrame *This = iframe_from_HTMLDOMNode(iface); + + HTMLFrameBase_destructor(&This->framebase); +} + +static HRESULT HTMLIFrame_get_dispid(HTMLDOMNode *iface, BSTR name, DWORD grfdex, DISPID *dispid) +{ + HTMLIFrame *This = iframe_from_HTMLDOMNode(iface); + + if(!This->framebase.content_window) + return DISP_E_UNKNOWNNAME; + + return search_window_props(This->framebase.content_window->base.inner_window, name, grfdex, dispid); +} + +static HRESULT HTMLIFrame_get_name(HTMLDOMNode *iface, DISPID id, BSTR *name) +{ + HTMLIFrame *This = iframe_from_HTMLDOMNode(iface); + DWORD idx = id - MSHTML_DISPID_CUSTOM_MIN; + + if(!This->framebase.content_window || + idx >= This->framebase.content_window->base.inner_window->global_prop_cnt) + return DISP_E_MEMBERNOTFOUND; + + *name = SysAllocString(This->framebase.content_window->base.inner_window->global_props[idx].name); + return *name ? S_OK : E_OUTOFMEMORY; +} + +static HRESULT HTMLIFrame_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + HTMLIFrame *This = iframe_from_HTMLDOMNode(iface); + + if(!This->framebase.content_window) { + ERR("no content window to invoke on\n"); + return E_FAIL; + } + + return IDispatchEx_InvokeEx(&This->framebase.content_window->base.IDispatchEx_iface, id, lcid, + flags, params, res, ei, caller); +} + static const NodeImplVtbl HTMLIFrameImplVtbl = { .clsid = &CLSID_HTMLIFrame, .qi = HTMLIFrame_QI,