wine-commits February 2018

wine-commits@winehq.org

2 participants
804 discussions

Nikolay Sivov : comctl32: Introduce ComboBox control.
by Alexandre Julliard 13 Feb '18

13 Feb '18

Module: wine Branch: master Commit: c9e98034b37f44d505ba406f94031d02e226a176 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9e98034b37f44d505ba406f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 13 10:56:36 2018 +0300 comctl32: Introduce ComboBox control. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/Makefile.in | 1 + dlls/comctl32/combo.c | 2116 ++++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/comctl32.h | 1 + dlls/comctl32/commctrl.c | 2 + dlls/comctl32/tests/misc.c | 1 + dlls/user32/class.c | 1 - 6 files changed, 2121 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c9e98034b37f44d505ba…

1 0

Michael Müller : include: Add run level information enum and structure to winnt.h.
by Alexandre Julliard 13 Feb '18

13 Feb '18

Module: wine Branch: master Commit: 0a7d627ca3d4bb864a33d093edceea08ffbce05d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a7d627ca3d4bb864a33d093… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Feb 13 02:58:12 2018 +0000 include: Add run level information enum and structure to winnt.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 04f00a6..855d2a8 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5763,16 +5763,33 @@ typedef struct _ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION { } ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION, *PACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION; #endif +typedef enum { + ACTCTX_RUN_LEVEL_UNSPECIFIED = 0, + ACTCTX_RUN_LEVEL_AS_INVOKER, + ACTCTX_RUN_LEVEL_HIGHEST_AVAILABLE, + ACTCTX_RUN_LEVEL_REQUIRE_ADMIN, + ACTCTX_RUN_LEVEL_NUMBERS +} ACTCTX_REQUESTED_RUN_LEVEL; + +typedef struct _ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION { + DWORD ulFlags; + ACTCTX_REQUESTED_RUN_LEVEL RunLevel; + DWORD UiAccess; +} ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION, *PACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION; + +typedef const struct _ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION *PCACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION; + typedef enum _ACTIVATION_CONTEXT_INFO_CLASS { ActivationContextBasicInformation = 1, ActivationContextDetailedInformation = 2, AssemblyDetailedInformationInActivationContext = 3, FileInformationInAssemblyOfAssemblyInActivationContext = 4, + RunlevelInformationInActivationContext = 5, CompatibilityInformationInActivationContext = 6, + ActivationContextManifestResourceName = 7, MaxActivationContextInfoClass, - - AssemblyDetailedInformationInActivationContxt = 3, - FileInformationInAssemblyOfAssemblyInActivationContxt = 4 + AssemblyDetailedInformationInActivationContxt = AssemblyDetailedInformationInActivationContext, + FileInformationInAssemblyOfAssemblyInActivationContxt = FileInformationInAssemblyOfAssemblyInActivationContext } ACTIVATION_CONTEXT_INFO_CLASS; #define ACTIVATION_CONTEXT_PATH_TYPE_NONE 1

1 0

Jacek Caban : mshtml: Added SVG elements tests.
by Alexandre Julliard 13 Feb '18

13 Feb '18

Module: wine Branch: master Commit: 886dfed9bae0b98edb094ce052b5fec00eccc8ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=886dfed9bae0b98edb094ce0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 23:29:16 2018 +0100 mshtml: Added SVG elements tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f9d2690..efdd856 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -152,7 +152,9 @@ typedef enum { ET_LINK, ET_LABEL, ET_BUTTON, - ET_AREA + ET_AREA, + ET_SVG, + ET_CIRCLE } elem_type_t; static const IID * const none_iids[] = { @@ -520,7 +522,9 @@ static const elem_type_info_t elem_type_infos[] = { {"LINK", link_iids, &DIID_DispHTMLLinkElement, &CLSID_HTMLLinkElement}, {"LABEL", label_iids, &DIID_DispHTMLLabelElement, &CLSID_HTMLLabelElement}, {"BUTTON", button_iids, &DIID_DispHTMLButtonElement, &CLSID_HTMLButtonElement}, - {"AREA", area_iids, &DIID_DispHTMLAreaElement, &CLSID_HTMLAreaElement} + {"AREA", area_iids, &DIID_DispHTMLAreaElement, &CLSID_HTMLAreaElement}, + {"svg", elem_iids, NULL}, + {"circle", elem_iids, NULL} }; static int strcmp_wa(LPCWSTR strw, const char *stra) @@ -9415,6 +9419,35 @@ static void test_form_element(IHTMLDocument2 *doc, IHTMLElement *parent) IHTMLElement_Release(elem); } +static void test_svg_element(IHTMLDocument2 *doc, IHTMLElement *parent) +{ + IHTMLDOMNode *svg_node, *circle_node; + + test_elem_set_innerhtml((IUnknown*)parent, + "<svg width=\"100\" height=\"100\" id=\"svgid\">" + "<circle cx=\"50\" cy=\"50\" r=\"40\" fill=\"black\" />" + "</svg>"); + svg_node = get_first_child((IUnknown*)parent); + if(compat_mode < COMPAT_IE9) { + todo_wine + ok(!svg_node, "svg_node != NULL\n"); + if(svg_node) + IHTMLDOMNode_Release(svg_node); + return; + } + ok(svg_node != NULL, "svg_node = NULL\n"); + test_elem_type((IUnknown*)svg_node, ET_SVG); + + circle_node = get_first_child((IUnknown*)svg_node); + ok(circle_node != NULL, "circle_node = NULL\n"); + if(!circle_node) + return; + test_elem_type((IUnknown*)circle_node, ET_CIRCLE); + + IHTMLDOMNode_Release(circle_node); + IHTMLDOMNode_Release(svg_node); +}; + static void test_dom_elements(IHTMLDocument2 *doc) { IHTMLElement *body, *div; @@ -9425,6 +9458,7 @@ static void test_dom_elements(IHTMLDocument2 *doc) test_textarea_element(doc, div); test_form_element(doc, div); + test_svg_element(doc, div); IHTMLElement_Release(body); IHTMLElement_Release(div);

1 0

Jacek Caban : mshtml: Added support for non-HTML elements.
by Alexandre Julliard 13 Feb '18

13 Feb '18

Module: wine Branch: master Commit: b947229fa92e53aa7fa2f6c9b57cdfdd868164cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=b947229fa92e53aa7fa2f6c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 23:29:04 2018 +0100 mshtml: Added support for non-HTML elements. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 27 ++++++++++++++------------- dlls/mshtml/mshtml_private.h | 5 ++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index cc6f542..06e91bc 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5570,7 +5570,6 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMElement *n assert((nsIDOMNode*)html_element == This->node.nsnode); nsIDOMHTMLElement_Release(html_element); } - This->nselem = This->html_element; } ConnectionPointContainer_Init(&This->cp_container, (IUnknown*)&This->IHTMLElement_iface, This->node.vtbl->cpc_entries); @@ -5578,24 +5577,26 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMElement *n HRESULT HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL use_generic, HTMLElement **ret) { - nsIDOMHTMLElement *nselem; - nsAString class_name_str; - const PRUnichar *class_name; + nsIDOMElement *nselem; + nsAString tag_name_str; + const PRUnichar *tag_name; const tag_desc_t *tag; HTMLElement *elem; nsresult nsres; HRESULT hres; - nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMHTMLElement, (void**)&nselem); - if(NS_FAILED(nsres)) + nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMElement, (void**)&nselem); + if(NS_FAILED(nsres)) { + ERR("no nsIDOMElement iface\n"); return E_FAIL; + } - nsAString_Init(&class_name_str, NULL); - nsIDOMHTMLElement_GetTagName(nselem, &class_name_str); + nsAString_Init(&tag_name_str, NULL); + nsIDOMElement_GetTagName(nselem, &tag_name_str); - nsAString_GetData(&class_name_str, &class_name); + nsAString_GetData(&tag_name_str, &tag_name); - tag = get_tag_desc(class_name); + tag = get_tag_desc(tag_name); if(tag) { hres = tag->constructor(doc, (nsIDOMElement*)nselem, &elem); }else if(use_generic) { @@ -5611,10 +5612,10 @@ HRESULT HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL use_g } } - TRACE("%s ret %p\n", debugstr_w(class_name), elem); + TRACE("%s ret %p\n", debugstr_w(tag_name), elem); - nsIDOMHTMLElement_Release(nselem); - nsAString_Finish(&class_name_str); + nsIDOMElement_Release(nselem); + nsAString_Finish(&tag_name_str); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a0d9221..de200cf 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -779,9 +779,8 @@ typedef struct { IElementTraversal IElementTraversal_iface; IProvideMultipleClassInfo IProvideMultipleClassInfo_iface; - nsIDOMHTMLElement *nselem; - nsIDOMElement *dom_element; - nsIDOMHTMLElement *html_element; + nsIDOMElement *dom_element; /* NULL for legacy comments represented as HTML elements */ + nsIDOMHTMLElement *html_element; /* NULL for non-HTML elements (like SVG elements) */ HTMLStyle *style; HTMLStyle *runtime_style; HTMLAttributeCollection *attrs;

1 0

Jacek Caban : mshtml: Handle non-HTML element in IHTMLSelectElement: add implementation.
by Alexandre Julliard 13 Feb '18

13 Feb '18

Module: wine Branch: master Commit: a4ad2cf82505c1458419103b66cfd02d41f7ccf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4ad2cf82505c1458419103b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 23:28:26 2018 +0100 mshtml: Handle non-HTML element in IHTMLSelectElement:add implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlselect.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 5a116a7..8f33941 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -425,6 +425,11 @@ static HRESULT WINAPI HTMLSelectElement_add(IHTMLSelectElement *iface, IHTMLElem return E_INVALIDARG; } + if(!element_obj->html_element) { + FIXME("Not HTML element\n"); + return E_NOTIMPL; + } + nsvariant = create_nsvariant(); if(!nsvariant) return E_FAIL; @@ -444,7 +449,7 @@ static HRESULT WINAPI HTMLSelectElement_add(IHTMLSelectElement *iface, IHTMLElem } if(NS_SUCCEEDED(nsres)) - nsres = nsIDOMHTMLSelectElement_Add(This->nsselect, element_obj->nselem, (nsIVariant*)nsvariant); + nsres = nsIDOMHTMLSelectElement_Add(This->nsselect, element_obj->html_element, (nsIVariant*)nsvariant); nsIWritableVariant_Release(nsvariant); if(NS_FAILED(nsres)) { ERR("Add failed: %08x\n", nsres);

1 0

Jacek Caban : mshtml: Use nsIDOMElement instead of nsIDOMHTMLElement where possible.
by Alexandre Julliard 13 Feb '18

13 Feb '18

Module: wine Branch: master Commit: fba6da7982c3ef21fe6c717b9f2963829c4f9f7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=fba6da7982c3ef21fe6c717b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 23:28:15 2018 +0100 mshtml: Use nsIDOMElement instead of nsIDOMHTMLElement where possible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlattr.c | 4 ++-- dlls/mshtml/htmlcurstyle.c | 2 +- dlls/mshtml/htmlelemcol.c | 6 +++--- dlls/mshtml/htmlinput.c | 2 +- dlls/mshtml/htmloption.c | 6 +++--- dlls/mshtml/htmlscript.c | 2 +- dlls/mshtml/htmlstyle.c | 6 +++--- dlls/mshtml/script.c | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index e3a16df..61c6455 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -183,7 +183,7 @@ static HRESULT WINAPI HTMLDOMAttribute_get_specified(IHTMLDOMAttribute *iface, V TRACE("(%p)->(%p)\n", This, p); - if(!This->elem || !This->elem->nselem) { + if(!This->elem || !This->elem->dom_element) { FIXME("NULL This->elem\n"); return E_UNEXPECTED; } @@ -199,7 +199,7 @@ static HRESULT WINAPI HTMLDOMAttribute_get_specified(IHTMLDOMAttribute *iface, V /* FIXME: This is not exactly right, we have some attributes that don't map directly to Gecko attributes. */ nsAString_InitDepend(&nsname, name); - nsres = nsIDOMHTMLElement_GetAttributeNode(This->elem->nselem, &nsname, &nsattr); + nsres = nsIDOMElement_GetAttributeNode(This->elem->dom_element, &nsname, &nsattr); nsAString_Finish(&nsname); SysFreeString(name); if(NS_FAILED(nsres)) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index a7daf4b..898fdd8 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -1345,7 +1345,7 @@ HRESULT HTMLCurrentStyle_Create(HTMLElement *elem, IHTMLCurrentStyle **p) assert(nsres == NS_OK); nsAString_Init(&nsempty_str, NULL); - nsres = nsIDOMWindow_GetComputedStyle(nswindow, (nsIDOMElement*)elem->nselem, &nsempty_str, &nsstyle); + nsres = nsIDOMWindow_GetComputedStyle(nswindow, elem->dom_element, &nsempty_str, &nsstyle); nsAString_Finish(&nsempty_str); nsIDOMWindow_Release(nswindow); if(NS_FAILED(nsres)) { diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index a851220..226cfe4 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -377,7 +377,7 @@ static BOOL is_elem_name(HTMLElement *elem, LPCWSTR name) static const PRUnichar nameW[] = {'n','a','m','e',0}; - if(!elem->nselem) + if(!elem->dom_element) return FALSE; nsAString_Init(&nsstr, NULL); @@ -507,10 +507,10 @@ static HRESULT WINAPI HTMLElementCollection_tags(IHTMLElementCollection *iface, nsAString_Init(&tag_str, NULL); for(i=0; i<This->len; i++) { - if(!This->elems[i]->nselem) + if(!This->elems[i]->dom_element) continue; - nsIDOMHTMLElement_GetTagName(This->elems[i]->nselem, &tag_str); + nsIDOMElement_GetTagName(This->elems[i]->dom_element, &tag_str); nsAString_GetData(&tag_str, &tag); if(CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, tag, -1, diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 03b0aae..ad8663c 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1590,7 +1590,7 @@ static HRESULT WINAPI HTMLLabelElement_put_htmlFor(IHTMLLabelElement *iface, BST nsAString_InitDepend(&for_str, forW); nsAString_InitDepend(&val_str, v); - nsres = nsIDOMHTMLElement_SetAttribute(This->element.nselem, &for_str, &val_str); + nsres = nsIDOMElement_SetAttribute(This->element.dom_element, &for_str, &val_str); nsAString_Finish(&for_str); nsAString_Finish(&val_str); if(NS_FAILED(nsres)) { diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index 43661b7..8210969 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -260,11 +260,11 @@ static HRESULT WINAPI HTMLOptionElement_put_text(IHTMLOptionElement *iface, BSTR while(1) { nsIDOMNode *child; - nsres = nsIDOMHTMLElement_GetFirstChild(This->element.nselem, &child); + nsres = nsIDOMElement_GetFirstChild(This->element.dom_element, &child); if(NS_FAILED(nsres) || !child) break; - nsres = nsIDOMHTMLElement_RemoveChild(This->element.nselem, child, &tmp); + nsres = nsIDOMElement_RemoveChild(This->element.dom_element, child, &tmp); nsIDOMNode_Release(child); if(NS_SUCCEEDED(nsres)) { nsIDOMNode_Release(tmp); @@ -282,7 +282,7 @@ static HRESULT WINAPI HTMLOptionElement_put_text(IHTMLOptionElement *iface, BSTR return E_FAIL; } - nsres = nsIDOMHTMLElement_AppendChild(This->element.nselem, (nsIDOMNode*)text_node, &tmp); + nsres = nsIDOMElement_AppendChild(This->element.dom_element, (nsIDOMNode*)text_node, &tmp); if(NS_SUCCEEDED(nsres)) nsIDOMNode_Release(tmp); else diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index c755add..c449d3f 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -200,7 +200,7 @@ static HRESULT WINAPI HTMLScriptElement_put_text(IHTMLScriptElement *iface, BSTR return E_FAIL; } - nsres = nsIDOMHTMLElement_GetParentNode(This->element.nselem, &parent); + nsres = nsIDOMElement_GetParentNode(This->element.dom_element, &parent); if(NS_FAILED(nsres) || !parent) { TRACE("No parent, not executing\n"); This->parse_on_bind = TRUE; diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index fcec264..b99ea08 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -4701,12 +4701,12 @@ static HRESULT get_style_from_elem(HTMLElement *elem, nsIDOMCSSStyleDeclaration nsIDOMElementCSSInlineStyle *nselemstyle; nsresult nsres; - if(!elem->nselem) { - FIXME("NULL nselem\n"); + if(!elem->dom_element) { + FIXME("comment element\n"); return E_NOTIMPL; } - nsres = nsIDOMHTMLElement_QueryInterface(elem->nselem, &IID_nsIDOMElementCSSInlineStyle, + nsres = nsIDOMElement_QueryInterface(elem->dom_element, &IID_nsIDOMElementCSSInlineStyle, (void**)&nselemstyle); assert(nsres == NS_OK); diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 72747af..0cd3162 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -905,7 +905,7 @@ static void script_file_available(ScriptBSC *bsc) return; } - nsres = nsIDOMHTMLElement_GetParentNode(script_elem->element.nselem, &parent); + nsres = nsIDOMElement_GetParentNode(script_elem->element.dom_element, &parent); if(NS_FAILED(nsres) || !parent) { TRACE("No parent, not executing\n"); script_elem->parse_on_bind = TRUE;

1 0

Jacek Caban : mshtml: Handle non-HTML elements in HTMLElement implementation.
by Alexandre Julliard 13 Feb '18

13 Feb '18

Module: wine Branch: master Commit: a219fd31d665b28e2472c3c0d8bcc0f55b0fcbd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a219fd31d665b28e2472c3c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 23:27:56 2018 +0100 mshtml: Handle non-HTML elements in HTMLElement implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 133 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 95 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a219fd31d665b28e2472…

1 0

Jacek Caban : mshtml: Use nsIDOMElement instead of nsIDOMHTMLElement where possible in HTMLElement implementation.
by Alexandre Julliard 13 Feb '18

13 Feb '18

Module: wine Branch: master Commit: 240fd267d9e139bbbd76781b96abc4d498ea6783 URL: https://source.winehq.org/git/wine.git/?a=commit;h=240fd267d9e139bbbd76781b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 23:27:34 2018 +0100 mshtml: Use nsIDOMElement instead of nsIDOMHTMLElement where possible in HTMLElement implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 140 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 93 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=240fd267d9e139bbbd76…

1 0

Jacek Caban : mshtml: Use get_elem helper in IHTMLDocument2:: get_body implementation.
by Alexandre Julliard 13 Feb '18

13 Feb '18

Module: wine Branch: master Commit: 06d54a6eb3fc7f7375983fbd4cc88e537abbeec9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06d54a6eb3fc7f7375983fbd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 23:27:02 2018 +0100 mshtml: Use get_elem helper in IHTMLDocument2::get_body implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 5e3ed75..174ef20 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -261,7 +261,7 @@ static HRESULT WINAPI HTMLDocument_get_body(IHTMLDocument2 *iface, IHTMLElement { HTMLDocument *This = impl_from_IHTMLDocument2(iface); nsIDOMHTMLElement *nsbody = NULL; - HTMLDOMNode *node; + HTMLElement *element; HRESULT hres; TRACE("(%p)->(%p)\n", This, p); @@ -281,14 +281,13 @@ static HRESULT WINAPI HTMLDocument_get_body(IHTMLDocument2 *iface, IHTMLElement return S_OK; } - hres = get_node(This->doc_node, (nsIDOMNode*)nsbody, TRUE, &node); + hres = get_elem(This->doc_node, (nsIDOMElement*)nsbody, &element); nsIDOMHTMLElement_Release(nsbody); if(FAILED(hres)) return hres; - hres = IHTMLDOMNode_QueryInterface(&node->IHTMLDOMNode_iface, &IID_IHTMLElement, (void**)p); - node_release(node); - return hres; + *p = &element->IHTMLElement_iface; + return S_OK; } static HRESULT WINAPI HTMLDocument_get_activeElement(IHTMLDocument2 *iface, IHTMLElement **p)

1 0

Jacek Caban : mshtml: Pass Gecko element as nsIDOMElement to check_event_attr.
by Alexandre Julliard 13 Feb '18

13 Feb '18

Module: wine Branch: master Commit: 0666c6c2fd544008171c717ca84f311f3aa12edf URL: https://source.winehq.org/git/wine.git/?a=commit;h=0666c6c2fd544008171c717c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 23:26:52 2018 +0100 mshtml: Pass Gecko element as nsIDOMElement to check_event_attr. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 6 +++--- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/mutation.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 69c9444..d91de28 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2781,7 +2781,7 @@ void update_doc_cp_events(HTMLDocumentNode *doc, cp_static_data_t *cp) } } -void check_event_attr(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem) +void check_event_attr(HTMLDocumentNode *doc, nsIDOMElement *nselem) { nsIDOMMozNamedAttrMap *attr_map; const PRUnichar *name, *value; @@ -2795,11 +2795,11 @@ void check_event_attr(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem) nsresult nsres; HRESULT hres; - nsres = nsIDOMHTMLElement_HasAttributes(nselem, &has_attrs); + nsres = nsIDOMElement_HasAttributes(nselem, &has_attrs); if(NS_FAILED(nsres) || !has_attrs) return; - nsres = nsIDOMHTMLElement_GetAttributes(nselem, &attr_map); + nsres = nsIDOMElement_GetAttributes(nselem, &attr_map); if(NS_FAILED(nsres)) return; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index ccfa5f8..e78c78c 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -85,7 +85,7 @@ typedef struct { BOOL no_event_obj; } DOMEvent; -void check_event_attr(HTMLDocumentNode*,nsIDOMHTMLElement*) DECLSPEC_HIDDEN; +void check_event_attr(HTMLDocumentNode*,nsIDOMElement*) DECLSPEC_HIDDEN; void release_event_target(EventTarget*) DECLSPEC_HIDDEN; HRESULT set_event_handler(EventTarget*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; HRESULT get_event_handler(EventTarget*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 3c2ca08..6983da6 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -742,7 +742,7 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, nsIDOMHTMLFrameElement *nsframe; nsIDOMHTMLScriptElement *nsscript; nsIDOMHTMLMetaElement *nsmeta; - nsIDOMHTMLElement *nselem; + nsIDOMElement *nselem; nsIDOMComment *nscomment; nsresult nsres; @@ -768,12 +768,12 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, } } - nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMHTMLElement, (void**)&nselem); + nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMElement, (void**)&nselem); if(NS_FAILED(nsres)) return; check_event_attr(This, nselem); - nsIDOMHTMLElement_Release(nselem); + nsIDOMElement_Release(nselem); nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMHTMLIFrameElement, (void**)&nsiframe); if(NS_SUCCEEDED(nsres)) {

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2018