- Wine-Commits - list.winehq.org

Gabriel Ivăncescu : mshtml: Move some IFrame methods down.
by Alexandre Julliard Sept. 18, 2023

Sept. 18, 2023

Module: wine Branch: master Commit: 3ed71ab58c13fbad1397170e136d14908b07203a URL: https://gitlab.winehq.org/wine/wine/-/commit/3ed71ab58c13fbad1397170e136d14… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 18 18:00:53 2023 +0300 mshtml: Move some IFrame methods down. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)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,

1 0

Gabriel Ivăncescu : mshtml: Move some FormElement methods up.
by Alexandre Julliard Sept. 18, 2023

Sept. 18, 2023

Module: wine Branch: master Commit: 3ae610ad3220b8e2336e7518b2034b46de8f7a11 URL: https://gitlab.winehq.org/wine/wine/-/commit/3ae610ad3220b8e2336e7518b2034b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 18 18:00:53 2023 +0300 mshtml: Move some FormElement methods up. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlform.c | 58 ++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 39270de11ca..e4cab195954 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -773,6 +773,11 @@ static inline HTMLFormElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLFormElement, element.node); } +static inline HTMLFormElement *impl_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLFormElement, element.node.event_target.dispex); +} + static void *HTMLFormElement_QI(HTMLDOMNode *iface, REFIID riid) { HTMLFormElement *This = impl_from_HTMLDOMNode(iface); @@ -789,8 +794,23 @@ static void *HTMLFormElement_QI(HTMLDOMNode *iface, REFIID riid) return HTMLElement_QI(&This->element.node, riid); } -static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, - BSTR name, DWORD grfdex, DISPID *pid) +static void HTMLFormElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLFormElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); + + if(This->nsform) + note_cc_edge((nsISupports*)This->nsform, "nsform", cb); +} + +static void HTMLFormElement_unlink(DispatchEx *dispex) +{ + HTMLFormElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_unlink(dispex); + unlink_ref(&This->nsform); +} + +static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, BSTR name, DWORD grfdex, DISPID *dispid) { HTMLFormElement *This = impl_from_HTMLDOMNode(iface); nsIDOMHTMLCollection *elements; @@ -799,7 +819,7 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, nsresult nsres; HRESULT hres = DISP_E_UNKNOWNNAME; - TRACE("(%p)->(%s %lx %p)\n", This, wine_dbgstr_w(name), grfdex, pid); + TRACE("(%p)->(%s %lx %p)\n", This, wine_dbgstr_w(name), grfdex, dispid); nsres = nsIDOMHTMLFormElement_GetElements(This->nsform, &elements); if(NS_FAILED(nsres)) { @@ -823,7 +843,7 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, i = wcstoul(name, &end_ptr, 10); if(!*end_ptr && i < len) { - *pid = MSHTML_DISPID_CUSTOM_MIN + i; + *dispid = MSHTML_DISPID_CUSTOM_MIN + i; return S_OK; } } @@ -861,7 +881,7 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, if(!wcsicmp(str, name)) { nsIDOMElement_Release(elem); /* FIXME: using index for dispid */ - *pid = MSHTML_DISPID_CUSTOM_MIN + i; + *dispid = MSHTML_DISPID_CUSTOM_MIN + i; hres = S_OK; break; } @@ -873,7 +893,7 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, if(!wcsicmp(str, name)) { nsAString_Finish(&name_str); /* FIXME: using index for dispid */ - *pid = MSHTML_DISPID_CUSTOM_MIN + i; + *dispid = MSHTML_DISPID_CUSTOM_MIN + i; hres = S_OK; break; } @@ -911,9 +931,8 @@ static HRESULT HTMLFormElement_dispex_get_name(HTMLDOMNode *iface, DISPID id, BS return (*name = SysAllocStringLen(buf, len)) ? S_OK : E_OUTOFMEMORY; } -static HRESULT HTMLFormElement_invoke(HTMLDOMNode *iface, - DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *res, - EXCEPINFO *ei, IServiceProvider *caller) +static HRESULT HTMLFormElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { HTMLFormElement *This = impl_from_HTMLDOMNode(iface); IDispatch *ret; @@ -946,27 +965,6 @@ static HRESULT HTMLFormElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDO return HTMLElement_handle_event(&This->element.node, eid, event, prevent_default); } -static inline HTMLFormElement *impl_from_DispatchEx(DispatchEx *iface) -{ - return CONTAINING_RECORD(iface, HTMLFormElement, element.node.event_target.dispex); -} - -static void HTMLFormElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) -{ - HTMLFormElement *This = impl_from_DispatchEx(dispex); - HTMLDOMNode_traverse(dispex, cb); - - if(This->nsform) - note_cc_edge((nsISupports*)This->nsform, "nsform", cb); -} - -static void HTMLFormElement_unlink(DispatchEx *dispex) -{ - HTMLFormElement *This = impl_from_DispatchEx(dispex); - HTMLDOMNode_unlink(dispex); - unlink_ref(&This->nsform); -} - static const NodeImplVtbl HTMLFormElementImplVtbl = { .clsid = &CLSID_HTMLFormElement, .qi = HTMLFormElement_QI,

1 0

Gabriel Ivăncescu : mshtml: Move some AreaElement methods up.
by Alexandre Julliard Sept. 18, 2023

Sept. 18, 2023

Module: wine Branch: master Commit: 0593b1d27935df77435ffa6be6eaaaa260f86cca URL: https://gitlab.winehq.org/wine/wine/-/commit/0593b1d27935df77435ffa6be6eaaa… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 18 18:00:53 2023 +0300 mshtml: Move some AreaElement methods up. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlarea.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/htmlarea.c b/dlls/mshtml/htmlarea.c index fd810a0baa1..3a3f8c7c57b 100644 --- a/dlls/mshtml/htmlarea.c +++ b/dlls/mshtml/htmlarea.c @@ -413,6 +413,11 @@ static inline HTMLAreaElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLAreaElement, element.node); } +static inline HTMLAreaElement *impl_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLAreaElement, element.node.event_target.dispex); +} + static void *HTMLAreaElement_QI(HTMLDOMNode *iface, REFIID riid) { HTMLAreaElement *This = impl_from_HTMLDOMNode(iface); @@ -423,6 +428,22 @@ static void *HTMLAreaElement_QI(HTMLDOMNode *iface, REFIID riid) return HTMLElement_QI(&This->element.node, riid); } +static void HTMLAreaElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLAreaElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); + + if(This->nsarea) + note_cc_edge((nsISupports*)This->nsarea, "nsarea", cb); +} + +static void HTMLAreaElement_unlink(DispatchEx *dispex) +{ + HTMLAreaElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_unlink(dispex); + unlink_ref(&This->nsarea); +} + static HRESULT HTMLAreaElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *event, BOOL *prevent_default) { HTMLAreaElement *This = impl_from_HTMLDOMNode(iface); @@ -454,27 +475,6 @@ fallback: return HTMLElement_handle_event(&This->element.node, eid, event, prevent_default); } -static inline HTMLAreaElement *impl_from_DispatchEx(DispatchEx *iface) -{ - return CONTAINING_RECORD(iface, HTMLAreaElement, element.node.event_target.dispex); -} - -static void HTMLAreaElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) -{ - HTMLAreaElement *This = impl_from_DispatchEx(dispex); - HTMLDOMNode_traverse(dispex, cb); - - if(This->nsarea) - note_cc_edge((nsISupports*)This->nsarea, "nsarea", cb); -} - -static void HTMLAreaElement_unlink(DispatchEx *dispex) -{ - HTMLAreaElement *This = impl_from_DispatchEx(dispex); - HTMLDOMNode_unlink(dispex); - unlink_ref(&This->nsarea); -} - static const NodeImplVtbl HTMLAreaElementImplVtbl = { .clsid = &CLSID_HTMLAreaElement, .qi = HTMLAreaElement_QI,

1 0

Gabriel Ivăncescu : mshtml: Move some FrameElement methods down.
by Alexandre Julliard Sept. 18, 2023

Sept. 18, 2023

Module: wine Branch: master Commit: e5dbfad54cc1a57470bea7d1264f4f4f836f13e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5dbfad54cc1a57470bea7d1264f4f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 18 18:00:53 2023 +0300 mshtml: Move some FrameElement methods down. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlframe.c | 109 ++++++++++++++++++++++++------------------------ 1 file changed, 54 insertions(+), 55 deletions(-) diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index 991e2ea8ff8..b66e1d91267 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -887,23 +887,6 @@ static inline HTMLFrameElement *frame_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLFrameElement, framebase.element.node); } -static void *HTMLFrameElement_QI(HTMLDOMNode *iface, REFIID riid) -{ - HTMLFrameElement *This = frame_from_HTMLDOMNode(iface); - - if(IsEqualGUID(&IID_IHTMLFrameElement3, riid)) - return &This->IHTMLFrameElement3_iface; - - return HTMLFrameBase_QI(&This->framebase, riid); -} - -static void HTMLFrameElement_destructor(HTMLDOMNode *iface) -{ - HTMLFrameElement *This = frame_from_HTMLDOMNode(iface); - - HTMLFrameBase_destructor(&This->framebase); -} - static HRESULT HTMLFrameElement_get_document(HTMLDOMNode *iface, IDispatch **p) { HTMLFrameElement *This = frame_from_HTMLDOMNode(iface); @@ -925,44 +908,6 @@ static HRESULT HTMLFrameElement_get_readystate(HTMLDOMNode *iface, BSTR *p) return IHTMLFrameBase2_get_readyState(&This->framebase.IHTMLFrameBase2_iface, p); } -static HRESULT HTMLFrameElement_get_dispid(HTMLDOMNode *iface, BSTR name, - DWORD grfdex, DISPID *pid) -{ - HTMLFrameElement *This = frame_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 HTMLFrameElement_get_name(HTMLDOMNode *iface, DISPID id, BSTR *name) -{ - HTMLFrameElement *This = frame_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 HTMLFrameElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid, - WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) -{ - HTMLFrameElement *This = frame_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 HTMLFrameElement_bind_to_tree(HTMLDOMNode *iface) { HTMLFrameElement *This = frame_from_HTMLDOMNode(iface); @@ -986,6 +931,16 @@ static inline HTMLFrameElement *frame_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLFrameElement, framebase.element.node.event_target.dispex); } +static void *HTMLFrameElement_QI(HTMLDOMNode *iface, REFIID riid) +{ + HTMLFrameElement *This = frame_from_HTMLDOMNode(iface); + + if(IsEqualGUID(&IID_IHTMLFrameElement3, riid)) + return &This->IHTMLFrameElement3_iface; + + return HTMLFrameBase_QI(&This->framebase, riid); +} + static void HTMLFrameElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLFrameElement *This = frame_from_DispatchEx(dispex); @@ -1002,6 +957,50 @@ static void HTMLFrameElement_unlink(DispatchEx *dispex) unlink_ref(&This->framebase.nsframe); } +static void HTMLFrameElement_destructor(HTMLDOMNode *iface) +{ + HTMLFrameElement *This = frame_from_HTMLDOMNode(iface); + + HTMLFrameBase_destructor(&This->framebase); +} + +static HRESULT HTMLFrameElement_get_dispid(HTMLDOMNode *iface, BSTR name, DWORD grfdex, DISPID *dispid) +{ + HTMLFrameElement *This = frame_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 HTMLFrameElement_get_name(HTMLDOMNode *iface, DISPID id, BSTR *name) +{ + HTMLFrameElement *This = frame_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 HTMLFrameElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + HTMLFrameElement *This = frame_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 HTMLFrameElementImplVtbl = { .clsid = &CLSID_HTMLFrameElement, .qi = HTMLFrameElement_QI,

1 0

Gabriel Ivăncescu : mshtml: Move some Element methods around.
by Alexandre Julliard Sept. 18, 2023

Sept. 18, 2023

Module: wine Branch: master Commit: 66fd80baf9eb03837fcf9eff7d0c563f09b316e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/66fd80baf9eb03837fcf9eff7d0c56… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 18 18:00:52 2023 +0300 mshtml: Move some Element methods around. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 162 ++++++++++++++++++++++++------------------------- 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 06966954626..314b85b8a72 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6780,6 +6780,50 @@ static inline HTMLElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLElement, node); } +HRESULT HTMLElement_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) +{ + HTMLElement *This = impl_from_HTMLDOMNode(iface); + HTMLElement *new_elem; + HRESULT hres; + + hres = HTMLElement_Create(This->node.doc, nsnode, FALSE, &new_elem); + if(FAILED(hres)) + return hres; + + if(This->filter) { + new_elem->filter = wcsdup(This->filter); + if(!new_elem->filter) { + IHTMLElement_Release(&This->IHTMLElement_iface); + return E_OUTOFMEMORY; + } + } + + *ret = &new_elem->node; + return S_OK; +} + +cp_static_data_t HTMLElementEvents2_data = { HTMLElementEvents2_tid, NULL /* FIXME */, TRUE }; + +const cpc_entry_t HTMLElement_cpc[] = { + HTMLELEMENT_CPC, + {NULL} +}; + +static const NodeImplVtbl HTMLElementImplVtbl = { + .clsid = &CLSID_HTMLUnknownElement, + .qi = HTMLElement_QI, + .destructor = HTMLElement_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .handle_event = HTMLElement_handle_event, + .get_attr_col = HTMLElement_get_attr_col +}; + +static inline HTMLElement *impl_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLElement, node.event_target.dispex); +} + void *HTMLElement_QI(HTMLDOMNode *iface, REFIID riid) { HTMLElement *This = impl_from_HTMLDOMNode(iface); @@ -6847,87 +6891,6 @@ void HTMLElement_destructor(HTMLDOMNode *iface) free(This->filter); } -HRESULT HTMLElement_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) -{ - HTMLElement *This = impl_from_HTMLDOMNode(iface); - HTMLElement *new_elem; - HRESULT hres; - - hres = HTMLElement_Create(This->node.doc, nsnode, FALSE, &new_elem); - if(FAILED(hres)) - return hres; - - if(This->filter) { - new_elem->filter = wcsdup(This->filter); - if(!new_elem->filter) { - IHTMLElement_Release(&This->IHTMLElement_iface); - return E_OUTOFMEMORY; - } - } - - *ret = &new_elem->node; - return S_OK; -} - -HRESULT HTMLElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *event, BOOL *prevent_default) -{ - HTMLElement *This = impl_from_HTMLDOMNode(iface); - - switch(eid) { - case EVENTID_KEYDOWN: { - nsIDOMKeyEvent *key_event; - nsresult nsres; - - nsres = nsIDOMEvent_QueryInterface(event, &IID_nsIDOMKeyEvent, (void**)&key_event); - if(NS_SUCCEEDED(nsres)) { - UINT32 code = 0; - - nsIDOMKeyEvent_GetKeyCode(key_event, &code); - - if(code == VK_F1 /* DOM_VK_F1 */) { - DOMEvent *help_event; - HRESULT hres; - - TRACE("F1 pressed\n"); - - hres = create_document_event(This->node.doc, EVENTID_HELP, &help_event); - if(SUCCEEDED(hres)) { - dispatch_event(&This->node.event_target, help_event); - IDOMEvent_Release(&help_event->IDOMEvent_iface); - } - *prevent_default = TRUE; - } - - nsIDOMKeyEvent_Release(key_event); - } - } - } - - return S_OK; -} - -cp_static_data_t HTMLElementEvents2_data = { HTMLElementEvents2_tid, NULL /* FIXME */, TRUE }; - -const cpc_entry_t HTMLElement_cpc[] = { - HTMLELEMENT_CPC, - {NULL} -}; - -static const NodeImplVtbl HTMLElementImplVtbl = { - .clsid = &CLSID_HTMLUnknownElement, - .qi = HTMLElement_QI, - .destructor = HTMLElement_destructor, - .cpc_entries = HTMLElement_cpc, - .clone = HTMLElement_clone, - .handle_event = HTMLElement_handle_event, - .get_attr_col = HTMLElement_get_attr_col -}; - -static inline HTMLElement *impl_from_DispatchEx(DispatchEx *iface) -{ - return CONTAINING_RECORD(iface, HTMLElement, node.event_target.dispex); -} - HRESULT HTMLElement_get_dispid(DispatchEx *dispex, BSTR name, DWORD grfdex, DISPID *pid) { HTMLElement *This = impl_from_DispatchEx(dispex); @@ -7068,6 +7031,43 @@ HRESULT HTMLElement_handle_event_default(DispatchEx *dispex, eventid_t eid, nsID return This->node.vtbl->handle_event(&This->node, eid, nsevent, prevent_default); } +HRESULT HTMLElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *event, BOOL *prevent_default) +{ + HTMLElement *This = impl_from_HTMLDOMNode(iface); + + switch(eid) { + case EVENTID_KEYDOWN: { + nsIDOMKeyEvent *key_event; + nsresult nsres; + + nsres = nsIDOMEvent_QueryInterface(event, &IID_nsIDOMKeyEvent, (void**)&key_event); + if(NS_SUCCEEDED(nsres)) { + UINT32 code = 0; + + nsIDOMKeyEvent_GetKeyCode(key_event, &code); + + if(code == VK_F1 /* DOM_VK_F1 */) { + DOMEvent *help_event; + HRESULT hres; + + TRACE("F1 pressed\n"); + + hres = create_document_event(This->node.doc, EVENTID_HELP, &help_event); + if(SUCCEEDED(hres)) { + dispatch_event(&This->node.event_target, help_event); + IDOMEvent_Release(&help_event->IDOMEvent_iface); + } + *prevent_default = TRUE; + } + + nsIDOMKeyEvent_Release(key_event); + } + } + } + + return S_OK; +} + EventTarget *HTMLElement_get_parent_event_target(DispatchEx *dispex) { HTMLElement *This = impl_from_DispatchEx(dispex);

1 0

Gabriel Ivăncescu : mshtml: Move some AnchorElement methods up.
by Alexandre Julliard Sept. 18, 2023

Sept. 18, 2023

Module: wine Branch: master Commit: 65287103e91d88a7ab0c44565b6708f68fde9f0e URL: https://gitlab.winehq.org/wine/wine/-/commit/65287103e91d88a7ab0c44565b6708… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 18 18:00:53 2023 +0300 mshtml: Move some AnchorElement methods up. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlanchor.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 8986e617492..441934c892f 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -797,6 +797,11 @@ static inline HTMLAnchorElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLAnchorElement, element.node); } +static inline HTMLAnchorElement *impl_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLAnchorElement, element.node.event_target.dispex); +} + static void *HTMLAnchorElement_QI(HTMLDOMNode *iface, REFIID riid) { HTMLAnchorElement *This = impl_from_HTMLDOMNode(iface); @@ -811,6 +816,22 @@ static void *HTMLAnchorElement_QI(HTMLDOMNode *iface, REFIID riid) return HTMLElement_QI(&This->element.node, riid); } +static void HTMLAnchorElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLAnchorElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); + + if(This->nsanchor) + note_cc_edge((nsISupports*)This->nsanchor, "nsanchor", cb); +} + +static void HTMLAnchorElement_unlink(DispatchEx *dispex) +{ + HTMLAnchorElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_unlink(dispex); + unlink_ref(&This->nsanchor); +} + static HRESULT HTMLAnchorElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *event, BOOL *prevent_default) { HTMLAnchorElement *This = impl_from_HTMLDOMNode(iface); @@ -842,27 +863,6 @@ fallback: return HTMLElement_handle_event(&This->element.node, eid, event, prevent_default); } -static inline HTMLAnchorElement *impl_from_DispatchEx(DispatchEx *iface) -{ - return CONTAINING_RECORD(iface, HTMLAnchorElement, element.node.event_target.dispex); -} - -static void HTMLAnchorElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) -{ - HTMLAnchorElement *This = impl_from_DispatchEx(dispex); - HTMLDOMNode_traverse(dispex, cb); - - if(This->nsanchor) - note_cc_edge((nsISupports*)This->nsanchor, "nsanchor", cb); -} - -static void HTMLAnchorElement_unlink(DispatchEx *dispex) -{ - HTMLAnchorElement *This = impl_from_DispatchEx(dispex); - HTMLDOMNode_unlink(dispex); - unlink_ref(&This->nsanchor); -} - static const NodeImplVtbl HTMLAnchorElementImplVtbl = { .clsid = &CLSID_HTMLAnchorElement, .qi = HTMLAnchorElement_QI,

1 0

Rémi Bernon : dmime: Pass the DMUS_PMSG through the performance graph.
by Alexandre Julliard Sept. 18, 2023

Sept. 18, 2023

Module: wine Branch: master Commit: 5f0474009ea7dd57b289685471228d6b53d07ec2 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f0474009ea7dd57b289685471228d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 13 09:05:37 2023 +0200 dmime: Pass the DMUS_PMSG through the performance graph. --- dlls/dmime/performance.c | 203 ++++++++++++++++++++++++++--------------------- dlls/dmime/tests/dmime.c | 42 +++++----- 2 files changed, 133 insertions(+), 112 deletions(-)

1 0

Rémi Bernon : dmime: Rename DMUS_PMSGToItem to message_from_DMUS_PMSG.
by Alexandre Julliard Sept. 18, 2023

Sept. 18, 2023

Module: wine Branch: master Commit: 0a93c69b13f4c6a16f5a5bac40b5844d40504070 URL: https://gitlab.winehq.org/wine/wine/-/commit/0a93c69b13f4c6a16f5a5bac40b584… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 5 18:27:38 2023 +0200 dmime: Rename DMUS_PMSGToItem to message_from_DMUS_PMSG. --- dlls/dmime/performance.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 77089d51709..4c79a22091c 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -72,10 +72,13 @@ struct performance struct message { struct list entry; - DMUS_PMSG pMsg; + DMUS_PMSG msg; }; -#define DMUS_PMSGToItem(pMSG) ((struct message *)(((unsigned char *)pMSG) - offsetof(struct message, pMsg))) +static inline struct message *message_from_DMUS_PMSG(DMUS_PMSG *msg) +{ + return msg ? CONTAINING_RECORD(msg, struct message, msg) : NULL; +} #define PROCESSMSG_START (WM_APP + 0) #define PROCESSMSG_EXIT (WM_APP + 1) @@ -85,17 +88,17 @@ struct message static struct message *ProceedMsg(struct performance *This, struct message *cur) { - if (cur->pMsg.dwType == DMUS_PMSGT_NOTIFICATION) { + if (cur->msg.dwType == DMUS_PMSGT_NOTIFICATION) { SetEvent(This->hNotification); } list_remove(&cur->entry); list_init(&cur->entry); - switch (cur->pMsg.dwType) { + switch (cur->msg.dwType) { case DMUS_PMSGT_WAVE: case DMUS_PMSGT_TEMPO: case DMUS_PMSGT_STOP: default: - FIXME("Unhandled PMsg Type: %#lx\n", cur->pMsg.dwType); + FIXME("Unhandled PMsg Type: %#lx\n", cur->msg.dwType); break; } return cur; @@ -130,8 +133,8 @@ static DWORD WINAPI ProcessMsgThread(LPVOID lpParam) { LIST_FOR_EACH_ENTRY_SAFE(message, next, &This->queued_messages, struct message, entry) { - timeOut = (message->pMsg.rtTime - rtCurTime) + This->rtLatencyTime; - if (message->pMsg.rtTime >= rtCurTime + dwDec) break; + timeOut = (message->msg.rtTime - rtCurTime) + This->rtLatencyTime; + if (message->msg.rtTime >= rtCurTime + dwDec) break; cur = ProceedMsg(This, message); free(cur); } @@ -393,15 +396,13 @@ static HRESULT WINAPI performance_SendPMsg(IDirectMusicPerformance8 *iface, DMUS FIXME("(%p, %p): semi-stub\n", This, msg); - if (!msg) return E_POINTER; + if (!(message = message_from_DMUS_PMSG(msg))) return E_POINTER; if (!This->dmusic) return DMUS_E_NO_MASTER_CLOCK; if (!(msg->dwFlags & (DMUS_PMSGF_MUSICTIME | DMUS_PMSGF_REFTIME))) return E_INVALIDARG; if (msg->dwFlags & DMUS_PMSGF_TOOL_IMMEDIATE) queue = &This->immediate_messages; else queue = &This->queued_messages; - message = DMUS_PMSGToItem(msg); - EnterCriticalSection(&This->safe); if (!list_empty(&message->entry)) @@ -424,7 +425,7 @@ static HRESULT WINAPI performance_SendPMsg(IDirectMusicPerformance8 *iface, DMUS } LIST_FOR_EACH_ENTRY(next, queue, struct message, entry) - if (next->pMsg.rtTime >= message->pMsg.rtTime) break; + if (next->msg.rtTime >= message->msg.rtTime) break; list_add_before(&next->entry, &message->entry); hr = S_OK; @@ -511,9 +512,9 @@ static HRESULT WINAPI performance_AllocPMsg(IDirectMusicPerformance8 *iface, ULO if (size < sizeof(DMUS_PMSG)) return E_INVALIDARG; if (!(message = calloc(1, size - sizeof(DMUS_PMSG) + sizeof(struct message)))) return E_OUTOFMEMORY; - message->pMsg.dwSize = size; + message->msg.dwSize = size; list_init(&message->entry); - *msg = &message->pMsg; + *msg = &message->msg; return S_OK; } @@ -526,8 +527,7 @@ static HRESULT WINAPI performance_FreePMsg(IDirectMusicPerformance8 *iface, DMUS TRACE("(%p, %p)\n", This, msg); - if (!msg) return E_POINTER; - message = DMUS_PMSGToItem(msg); + if (!(message = message_from_DMUS_PMSG(msg))) return E_POINTER; EnterCriticalSection(&This->safe); hr = !list_empty(&message->entry) ? DMUS_E_CANNOT_FREE : S_OK;

1 0

Rémi Bernon : dmime: Remove unnecessary struct message members.
by Alexandre Julliard Sept. 18, 2023

Sept. 18, 2023

Module: wine Branch: master Commit: 61ebdbcbbdf997b0971527f68571500245d687c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/61ebdbcbbdf997b0971527f6857150… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 5 18:27:10 2023 +0200 dmime: Remove unnecessary struct message members. --- dlls/dmime/performance.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index b3d821d90bc..77089d51709 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -72,8 +72,6 @@ struct performance struct message { struct list entry; - BOOL bInUse; - DWORD cb; DMUS_PMSG pMsg; }; @@ -91,7 +89,7 @@ static struct message *ProceedMsg(struct performance *This, struct message *cur) SetEvent(This->hNotification); } list_remove(&cur->entry); - cur->bInUse = FALSE; + list_init(&cur->entry); switch (cur->pMsg.dwType) { case DMUS_PMSGT_WAVE: case DMUS_PMSGT_TEMPO: @@ -406,7 +404,7 @@ static HRESULT WINAPI performance_SendPMsg(IDirectMusicPerformance8 *iface, DMUS EnterCriticalSection(&This->safe); - if (message->bInUse) + if (!list_empty(&message->entry)) hr = DMUS_E_ALREADY_SENT; else { @@ -429,7 +427,6 @@ static HRESULT WINAPI performance_SendPMsg(IDirectMusicPerformance8 *iface, DMUS if (next->pMsg.rtTime >= message->pMsg.rtTime) break; list_add_before(&next->entry, &message->entry); - message->bInUse = TRUE; hr = S_OK; } @@ -515,6 +512,7 @@ static HRESULT WINAPI performance_AllocPMsg(IDirectMusicPerformance8 *iface, ULO if (!(message = calloc(1, size - sizeof(DMUS_PMSG) + sizeof(struct message)))) return E_OUTOFMEMORY; message->pMsg.dwSize = size; + list_init(&message->entry); *msg = &message->pMsg; return S_OK; @@ -532,7 +530,7 @@ static HRESULT WINAPI performance_FreePMsg(IDirectMusicPerformance8 *iface, DMUS message = DMUS_PMSGToItem(msg); EnterCriticalSection(&This->safe); - hr = message->bInUse ? DMUS_E_CANNOT_FREE : S_OK; + hr = !list_empty(&message->entry) ? DMUS_E_CANNOT_FREE : S_OK; LeaveCriticalSection(&This->safe); if (SUCCEEDED(hr))

1 0

Rémi Bernon : dmime: Get rid of the DMUS_PMSGItem typedef.
by Alexandre Julliard Sept. 18, 2023

Sept. 18, 2023

Module: wine Branch: master Commit: 419ab9284ab10627a0d068a0846b7c79e2fb1b3c URL: https://gitlab.winehq.org/wine/wine/-/commit/419ab9284ab10627a0d068a0846b7c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 5 10:55:52 2023 +0200 dmime: Get rid of the DMUS_PMSGItem typedef. --- dlls/dmime/performance.c | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index c2681c4b150..786ad817cd4 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -62,24 +62,24 @@ struct performance DWORD procThreadId; BOOL procThreadTicStarted; CRITICAL_SECTION safe; - struct DMUS_PMSGItem *head; - struct DMUS_PMSGItem *imm_head; + struct message *head; + struct message *imm_head; IReferenceClock *master_clock; REFERENCE_TIME init_time; }; -typedef struct DMUS_PMSGItem DMUS_PMSGItem; -struct DMUS_PMSGItem { - DMUS_PMSGItem* next; - DMUS_PMSGItem* prev; +struct message +{ + struct message *next; + struct message *prev; - BOOL bInUse; - DWORD cb; - DMUS_PMSG pMsg; + BOOL bInUse; + DWORD cb; + DMUS_PMSG pMsg; }; -#define DMUS_PMSGToItem(pMSG) ((DMUS_PMSGItem *)(((unsigned char *)pMSG) - offsetof(DMUS_PMSGItem, pMsg))) +#define DMUS_PMSGToItem(pMSG) ((struct message *)(((unsigned char *)pMSG) - offsetof(struct message, pMsg))) #define DMUS_ItemRemoveFromQueue(This,pItem) \ {\ if (pItem->prev) pItem->prev->next = pItem->next;\ @@ -95,7 +95,8 @@ struct DMUS_PMSGItem { #define PROCESSMSG_ADD (WM_APP + 4) -static DMUS_PMSGItem* ProceedMsg(struct performance *This, DMUS_PMSGItem* cur) { +static struct message *ProceedMsg(struct performance *This, struct message *cur) +{ if (cur->pMsg.dwType == DMUS_PMSGT_NOTIFICATION) { SetEvent(This->hNotification); } @@ -117,9 +118,9 @@ static DWORD WINAPI ProcessMsgThread(LPVOID lpParam) { MSG msg; HRESULT hr; REFERENCE_TIME rtCurTime; - DMUS_PMSGItem* it = NULL; - DMUS_PMSGItem* cur = NULL; - DMUS_PMSGItem* it_next = NULL; + struct message *it = NULL; + struct message *cur = NULL; + struct message *it_next = NULL; while (TRUE) { DWORD dwDec = This->rtLatencyTime + This->dwBumperLength; @@ -401,10 +402,10 @@ static HRESULT WINAPI performance_GetBumperLength(IDirectMusicPerformance8 *ifac static HRESULT WINAPI performance_SendPMsg(IDirectMusicPerformance8 *iface, DMUS_PMSG *msg) { struct performance *This = impl_from_IDirectMusicPerformance8(iface); - DMUS_PMSGItem *message; - DMUS_PMSGItem *it = NULL; - DMUS_PMSGItem *prev_it = NULL; - DMUS_PMSGItem **queue; + struct message *message; + struct message *it = NULL; + struct message *prev_it = NULL; + struct message **queue; HRESULT hr; FIXME("(%p, %p): semi-stub\n", This, msg); @@ -535,14 +536,14 @@ static HRESULT WINAPI performance_GetTime(IDirectMusicPerformance8 *iface, REFER static HRESULT WINAPI performance_AllocPMsg(IDirectMusicPerformance8 *iface, ULONG size, DMUS_PMSG **msg) { struct performance *This = impl_from_IDirectMusicPerformance8(iface); - DMUS_PMSGItem *message; + struct message *message; TRACE("(%p, %ld, %p)\n", This, size, msg); if (!msg) return E_POINTER; if (size < sizeof(DMUS_PMSG)) return E_INVALIDARG; - if (!(message = calloc(1, size - sizeof(DMUS_PMSG) + sizeof(DMUS_PMSGItem)))) return E_OUTOFMEMORY; + if (!(message = calloc(1, size - sizeof(DMUS_PMSG) + sizeof(struct message)))) return E_OUTOFMEMORY; message->pMsg.dwSize = size; *msg = &message->pMsg; @@ -552,7 +553,7 @@ static HRESULT WINAPI performance_AllocPMsg(IDirectMusicPerformance8 *iface, ULO static HRESULT WINAPI performance_FreePMsg(IDirectMusicPerformance8 *iface, DMUS_PMSG *msg) { struct performance *This = impl_from_IDirectMusicPerformance8(iface); - DMUS_PMSGItem *message; + struct message *message; HRESULT hr; TRACE("(%p, %p)\n", This, msg);

1 0