February 2018 - Wine-Commits

Jacek Caban : mshtml: Pass element as nsIDOMElement to create_param_prop_bag.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: 5bc2d76b8c5a441d8bc180a3c3f05b07878763f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bc2d76b8c5a441d8bc180a3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 01:28:19 2018 +0100 mshtml: Pass element as nsIDOMElement to create_param_prop_bag. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/pluginhost.c | 2 +- dlls/mshtml/pluginhost.h | 2 +- dlls/mshtml/propbag.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 338c77f..8a8b0aa 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -132,7 +132,7 @@ static void load_prop_bag(PluginHost *host, IPersistPropertyBag *persist_prop_ba IPropertyBag *prop_bag; HRESULT hres; - hres = create_param_prop_bag(host->element->element.nselem, &prop_bag); + hres = create_param_prop_bag(host->element->element.dom_element, &prop_bag); if(FAILED(hres)) return; diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index 5135c33..bea04d1 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -66,7 +66,7 @@ HRESULT create_plugin_host(HTMLDocumentNode*,HTMLPluginContainer*) DECLSPEC_HIDD void update_plugin_window(PluginHost*,HWND,const RECT*) DECLSPEC_HIDDEN; void detach_plugin_host(PluginHost*) DECLSPEC_HIDDEN; -HRESULT create_param_prop_bag(nsIDOMHTMLElement*,IPropertyBag**) DECLSPEC_HIDDEN; +HRESULT create_param_prop_bag(nsIDOMElement*,IPropertyBag**) DECLSPEC_HIDDEN; HRESULT create_ip_window(IOleInPlaceUIWindow**) DECLSPEC_HIDDEN; HRESULT create_ip_frame(IOleInPlaceFrame**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/propbag.c b/dlls/mshtml/propbag.c index 395ffca..09e3dd8 100644 --- a/dlls/mshtml/propbag.c +++ b/dlls/mshtml/propbag.c @@ -268,7 +268,7 @@ static const IPropertyBag2Vtbl PropertyBag2Vtbl = { PropertyBag2_LoadObject }; -static HRESULT fill_props(nsIDOMHTMLElement *nselem, PropertyBag *prop_bag) +static HRESULT fill_props(nsIDOMElement *nselem, PropertyBag *prop_bag) { const PRUnichar *name, *value; nsAString name_str, value_str; @@ -284,7 +284,7 @@ static HRESULT fill_props(nsIDOMHTMLElement *nselem, PropertyBag *prop_bag) static const PRUnichar valueW[] = {'v','a','l','u','e',0}; nsAString_InitDepend(&name_str, paramW); - nsres = nsIDOMHTMLElement_GetElementsByTagName(nselem, &name_str, &params); + nsres = nsIDOMElement_GetElementsByTagName(nselem, &name_str, &params); nsAString_Finish(&name_str); if(NS_FAILED(nsres)) return E_FAIL; @@ -331,7 +331,7 @@ static HRESULT fill_props(nsIDOMHTMLElement *nselem, PropertyBag *prop_bag) return hres; } -HRESULT create_param_prop_bag(nsIDOMHTMLElement *nselem, IPropertyBag **ret) +HRESULT create_param_prop_bag(nsIDOMElement *nselem, IPropertyBag **ret) { PropertyBag *prop_bag; HRESULT hres;

1 0

Jacek Caban : mshtml: Store Gecko element both as nsIDOMElement and nsIDOMHTMLElement in HTMLElement.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: 54a746f15568c811b3770ddab60d6954de9f8f12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54a746f15568c811b3770dda… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 01:27:32 2018 +0100 mshtml: Store Gecko element both as nsIDOMElement and nsIDOMHTMLElement in HTMLElement. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 4 +++- dlls/mshtml/mshtml_private.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 1bd4ec4..d843884 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5463,7 +5463,9 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMHTMLElemen /* No AddRef, share reference with HTMLDOMNode */ assert((nsIDOMNode*)nselem == This->node.nsnode); - This->nselem = nselem; + This->dom_element = (nsIDOMElement*)nselem; + This->html_element = nselem; + This->nselem = This->html_element; } ConnectionPointContainer_Init(&This->cp_container, (IUnknown*)&This->IHTMLElement_iface, This->node.vtbl->cpc_entries); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5ed6264..21871c0 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -780,6 +780,8 @@ typedef struct { IProvideMultipleClassInfo IProvideMultipleClassInfo_iface; nsIDOMHTMLElement *nselem; + nsIDOMElement *dom_element; + nsIDOMHTMLElement *html_element; HTMLStyle *style; HTMLStyle *runtime_style; HTMLAttributeCollection *attrs;

1 0

Jacek Caban : mshtml: Pass Gecko elements as nsIDOMElement to element constructors.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: 3e4565f5d7db513c6e7c2b3e58da16dd0adae0aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e4565f5d7db513c6e7c2b3e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 01:29:41 2018 +0100 mshtml: Pass Gecko elements as nsIDOMElement to element constructors. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlanchor.c | 4 +-- dlls/mshtml/htmlarea.c | 4 +-- dlls/mshtml/htmlbody.c | 4 +-- dlls/mshtml/htmlelem.c | 24 ++++++++++++------ dlls/mshtml/htmlembed.c | 2 +- dlls/mshtml/htmlform.c | 4 +-- dlls/mshtml/htmlframe.c | 2 +- dlls/mshtml/htmlframebase.c | 6 ++--- dlls/mshtml/htmlgeneric.c | 2 +- dlls/mshtml/htmlhead.c | 6 ++--- dlls/mshtml/htmliframe.c | 2 +- dlls/mshtml/htmlimg.c | 4 +-- dlls/mshtml/htmlinput.c | 10 ++++---- dlls/mshtml/htmllink.c | 4 +-- dlls/mshtml/htmlmeta.c | 2 +- dlls/mshtml/htmlobject.c | 4 +-- dlls/mshtml/htmloption.c | 4 +-- dlls/mshtml/htmlscript.c | 4 +-- dlls/mshtml/htmlselect.c | 5 ++-- dlls/mshtml/htmlstyleelem.c | 4 +-- dlls/mshtml/htmltable.c | 6 ++--- dlls/mshtml/htmltablecell.c | 4 +-- dlls/mshtml/htmltablerow.c | 6 ++--- dlls/mshtml/htmltextarea.c | 4 +-- dlls/mshtml/htmltextcont.c | 2 +- dlls/mshtml/mshtml_private.h | 58 ++++++++++++++++++++++---------------------- 26 files changed, 95 insertions(+), 86 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3e4565f5d7db513c6e7c…

1 0

Zebediah Figura : server: Fix pointer arithmetic in get_selector_entry().
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: c6dfce272309c1ad869886a0fce186c795f3e5b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6dfce272309c1ad869886a0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Feb 10 10:46:07 2018 -0600 server: Fix pointer arithmetic in get_selector_entry(). The selector table is exclusively 32-bit, so trying to get selector entries with a 64-bit wineserver will return the wrong values due to the different size of (long *). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/ptrace.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index a647df9..704b17d 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -517,13 +517,13 @@ void get_selector_entry( struct thread *thread, int entry, unsigned int *base, } if (suspend_for_ptrace( thread )) { - unsigned char flags_buf[sizeof(long)]; - long *addr = (long *)(unsigned long)thread->process->ldt_copy + entry; - if (read_thread_long( thread, addr, (long *)base ) == -1) goto done; - if (read_thread_long( thread, addr + 8192, (long *)limit ) == -1) goto done; - addr = (long *)(unsigned long)thread->process->ldt_copy + 2*8192 + (entry / sizeof(long)); - if (read_thread_long( thread, addr, (long *)flags_buf ) == -1) goto done; - *flags = flags_buf[entry % sizeof(long)]; + unsigned char flags_buf[4]; + unsigned long addr = (unsigned long)thread->process->ldt_copy + (entry * 4); + if (read_thread_long( thread, (long *)addr, (long *)base ) == -1) goto done; + if (read_thread_long( thread, (long *)(addr + (8192 * 4)), (long *)limit ) == -1) goto done; + addr = (unsigned long)thread->process->ldt_copy + (2 * 8192 * 4) + (entry & ~3); + if (read_thread_long( thread, (long *)addr, (long *)flags_buf ) == -1) goto done; + *flags = flags_buf[entry % 4]; done: resume_after_ptrace( thread ); }

1 0

Jacek Caban : mshtml: Pass element as nsIDOMElement to get_elem_attr_value.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: 3cac8d223b29756870f3ff0aad15a3750cac9061 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cac8d223b29756870f3ff0a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 01:28:00 2018 +0100 mshtml: Pass element as nsIDOMElement to get_elem_attr_value. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/editor.c | 2 +- dlls/mshtml/htmlelem.c | 6 +++--- dlls/mshtml/htmlelemcol.c | 4 ++-- dlls/mshtml/htmlform.c | 14 +++++++------- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/pluginhost.c | 4 ++-- dlls/mshtml/propbag.c | 6 +++--- dlls/mshtml/script.c | 6 +++--- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 8323a77..37cdcee 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -295,7 +295,7 @@ static void get_font_size(HTMLDocument *This, WCHAR *ret) TRACE("found font tag %p\n", elem); - get_elem_attr_value(elem, sizeW, &val_str, &val); + get_elem_attr_value((nsIDOMElement*)elem, sizeW, &val_str, &val); if(*val) { TRACE("found size %s\n", debugstr_w(val)); strcpyW(ret, val); diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index d843884..f628023 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -166,14 +166,14 @@ HRESULT replace_node_by_html(nsIDOMHTMLDocument *nsdoc, nsIDOMNode *nsnode, cons return hres; } -nsresult get_elem_attr_value(nsIDOMHTMLElement *nselem, const WCHAR *name, nsAString *val_str, const PRUnichar **val) +nsresult get_elem_attr_value(nsIDOMElement *nselem, const WCHAR *name, nsAString *val_str, const PRUnichar **val) { nsAString name_str; nsresult nsres; nsAString_InitDepend(&name_str, name); nsAString_Init(val_str, NULL); - nsres = nsIDOMHTMLElement_GetAttribute(nselem, &name_str, val_str); + nsres = nsIDOMElement_GetAttribute(nselem, &name_str, val_str); nsAString_Finish(&name_str); if(NS_FAILED(nsres)) { ERR("GetAttribute(%s) failed: %08x\n", debugstr_w(name), nsres); @@ -192,7 +192,7 @@ HRESULT elem_string_attr_getter(HTMLElement *elem, const WCHAR *name, BOOL use_n nsresult nsres; HRESULT hres = S_OK; - nsres = get_elem_attr_value(elem->nselem, name, &val_str, &val); + nsres = get_elem_attr_value(elem->dom_element, name, &val_str, &val); if(NS_FAILED(nsres)) return E_FAIL; diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index c08a876..a851220 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -381,14 +381,14 @@ static BOOL is_elem_name(HTMLElement *elem, LPCWSTR name) return FALSE; nsAString_Init(&nsstr, NULL); - nsIDOMHTMLElement_GetId(elem->nselem, &nsstr); + nsIDOMElement_GetId(elem->dom_element, &nsstr); nsAString_GetData(&nsstr, &str); if(!strcmpiW(str, name)) { nsAString_Finish(&nsstr); return TRUE; } - nsres = get_elem_attr_value(elem->nselem, nameW, &nsstr, &str); + nsres = get_elem_attr_value(elem->dom_element, nameW, &nsstr, &str); if(NS_SUCCEEDED(nsres)) { ret = !strcmpiW(str, name); nsAString_Finish(&nsstr); diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 51adc20..e969c3b 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -671,7 +671,7 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, nsAString_Init(&nsstr, NULL); for(i = 0; i < len; ++i) { nsIDOMNode *nsitem; - nsIDOMHTMLElement *nshtml_elem; + nsIDOMElement *elem; const PRUnichar *str; nsres = nsIDOMHTMLCollection_Item(elements, i, &nsitem); @@ -681,7 +681,7 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, break; } - nsres = nsIDOMNode_QueryInterface(nsitem, &IID_nsIDOMHTMLElement, (void**)&nshtml_elem); + nsres = nsIDOMNode_QueryInterface(nsitem, &IID_nsIDOMElement, (void**)&elem); nsIDOMNode_Release(nsitem); if(NS_FAILED(nsres)) { FIXME("Failed to get nsIDOMHTMLNode interface: 0x%08x\n", nsres); @@ -690,16 +690,16 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, } /* compare by id attr */ - nsres = nsIDOMHTMLElement_GetId(nshtml_elem, &nsstr); + nsres = nsIDOMElement_GetId(elem, &nsstr); if(NS_FAILED(nsres)) { FIXME("GetId failed: 0x%08x\n", nsres); - nsIDOMHTMLElement_Release(nshtml_elem); + nsIDOMElement_Release(elem); hres = E_FAIL; break; } nsAString_GetData(&nsstr, &str); if(!strcmpiW(str, name)) { - nsIDOMHTMLElement_Release(nshtml_elem); + nsIDOMElement_Release(elem); /* FIXME: using index for dispid */ *pid = MSHTML_DISPID_CUSTOM_MIN + i; hres = S_OK; @@ -707,8 +707,8 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, } /* compare by name attr */ - nsres = get_elem_attr_value(nshtml_elem, nameW, &name_str, &str); - nsIDOMHTMLElement_Release(nshtml_elem); + nsres = get_elem_attr_value(elem, nameW, &name_str, &str); + nsIDOMElement_Release(elem); if(NS_SUCCEEDED(nsres)) { if(!strcmpiW(str, name)) { nsAString_Finish(&name_str); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 21871c0..26f4e97 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1095,7 +1095,7 @@ HRESULT attr_value_to_string(VARIANT*) DECLSPEC_HIDDEN; HRESULT get_elem_attr_value_by_dispid(HTMLElement*,DISPID,VARIANT*) DECLSPEC_HIDDEN; HRESULT get_elem_source_index(HTMLElement*,LONG*) DECLSPEC_HIDDEN; -nsresult get_elem_attr_value(nsIDOMHTMLElement*,const WCHAR*,nsAString*,const PRUnichar**) DECLSPEC_HIDDEN; +nsresult get_elem_attr_value(nsIDOMElement*,const WCHAR*,nsAString*,const PRUnichar**) DECLSPEC_HIDDEN; HRESULT elem_string_attr_getter(HTMLElement*,const WCHAR*,BOOL,BSTR*) DECLSPEC_HIDDEN; HRESULT elem_string_attr_setter(HTMLElement*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 0fbbf6c..338c77f 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -1669,7 +1669,7 @@ static BOOL get_elem_clsid(nsIDOMHTMLElement *elem, CLSID *clsid) static const PRUnichar classidW[] = {'c','l','a','s','s','i','d',0}; - nsres = get_elem_attr_value(elem, classidW, &val_str, &val); + nsres = get_elem_attr_value((nsIDOMElement*)elem, classidW, &val_str, &val); if(NS_SUCCEEDED(nsres)) { if(*val) ret = parse_classid(val, clsid); @@ -1907,7 +1907,7 @@ static void check_codebase(HTMLInnerWindow *window, nsIDOMHTMLElement *nselem) static const PRUnichar codebaseW[] = {'c','o','d','e','b','a','s','e',0}; - nsres = get_elem_attr_value(nselem, codebaseW, &val_str, &val); + nsres = get_elem_attr_value((nsIDOMElement*)nselem, codebaseW, &val_str, &val); if(NS_SUCCEEDED(nsres)) { if(*val) { hres = CoInternetCombineUrlEx(window->base.outer_window->uri, val, 0, &uri, 0); diff --git a/dlls/mshtml/propbag.c b/dlls/mshtml/propbag.c index f9ae158..395ffca 100644 --- a/dlls/mshtml/propbag.c +++ b/dlls/mshtml/propbag.c @@ -273,7 +273,7 @@ static HRESULT fill_props(nsIDOMHTMLElement *nselem, PropertyBag *prop_bag) const PRUnichar *name, *value; nsAString name_str, value_str; nsIDOMHTMLCollection *params; - nsIDOMHTMLElement *param_elem; + nsIDOMElement *param_elem; UINT32 length, i; nsIDOMNode *nsnode; nsresult nsres; @@ -300,7 +300,7 @@ static HRESULT fill_props(nsIDOMHTMLElement *nselem, PropertyBag *prop_bag) break; } - nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMHTMLElement, (void**)&param_elem); + nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMElement, (void**)&param_elem); nsIDOMNode_Release(nsnode); if(NS_FAILED(nsres)) { hres = E_FAIL; @@ -318,7 +318,7 @@ static HRESULT fill_props(nsIDOMHTMLElement *nselem, PropertyBag *prop_bag) nsAString_Finish(&name_str); } - nsIDOMHTMLElement_Release(param_elem); + nsIDOMElement_Release(param_elem); if(FAILED(hres)) break; if(NS_FAILED(nsres)) { diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 025db3b..72747af 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -1205,7 +1205,7 @@ static BOOL get_guid_from_language(LPCWSTR type, GUID *guid) static BOOL get_script_guid(HTMLInnerWindow *window, nsIDOMHTMLScriptElement *nsscript, GUID *guid) { - nsIDOMHTMLElement *nselem; + nsIDOMElement *nselem; const PRUnichar *language; nsAString val_str; BOOL ret = FALSE; @@ -1229,11 +1229,11 @@ static BOOL get_script_guid(HTMLInnerWindow *window, nsIDOMHTMLScriptElement *ns ERR("GetType failed: %08x\n", nsres); } - nsres = nsIDOMHTMLScriptElement_QueryInterface(nsscript, &IID_nsIDOMHTMLElement, (void**)&nselem); + nsres = nsIDOMHTMLScriptElement_QueryInterface(nsscript, &IID_nsIDOMElement, (void**)&nselem); assert(nsres == NS_OK); nsres = get_elem_attr_value(nselem, languageW, &val_str, &language); - nsIDOMHTMLElement_Release(nselem); + nsIDOMElement_Release(nselem); if(NS_SUCCEEDED(nsres)) { if(*language) { ret = get_guid_from_language(language, guid);

1 0

Jacek Caban : mshtml: Use nsIDOMElement instead of nsIDOMHTMLElement in pluginhost.c.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: b7e50ee92e41a1f75ba72bbb34e1295f74b173cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7e50ee92e41a1f75ba72bbb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 01:28:36 2018 +0100 mshtml: Use nsIDOMElement instead of nsIDOMHTMLElement in pluginhost.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/pluginhost.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 8a8b0aa..0ed1a77 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -1660,7 +1660,7 @@ static BOOL parse_classid(const PRUnichar *classid, CLSID *clsid) return SUCCEEDED(hres); } -static BOOL get_elem_clsid(nsIDOMHTMLElement *elem, CLSID *clsid) +static BOOL get_elem_clsid(nsIDOMElement *elem, CLSID *clsid) { const PRUnichar *val; nsAString val_str; @@ -1669,7 +1669,7 @@ static BOOL get_elem_clsid(nsIDOMHTMLElement *elem, CLSID *clsid) static const PRUnichar classidW[] = {'c','l','a','s','s','i','d',0}; - nsres = get_elem_attr_value((nsIDOMElement*)elem, classidW, &val_str, &val); + nsres = get_elem_attr_value(elem, classidW, &val_str, &val); if(NS_SUCCEEDED(nsres)) { if(*val) ret = parse_classid(val, clsid); @@ -1895,7 +1895,7 @@ static void install_codebase(const WCHAR *url) WARN("FAILED: %08x\n", hres); } -static void check_codebase(HTMLInnerWindow *window, nsIDOMHTMLElement *nselem) +static void check_codebase(HTMLInnerWindow *window, nsIDOMElement *nselem) { BOOL is_on_list = FALSE; install_entry_t *iter; @@ -1907,7 +1907,7 @@ static void check_codebase(HTMLInnerWindow *window, nsIDOMHTMLElement *nselem) static const PRUnichar codebaseW[] = {'c','o','d','e','b','a','s','e',0}; - nsres = get_elem_attr_value((nsIDOMElement*)nselem, codebaseW, &val_str, &val); + nsres = get_elem_attr_value(nselem, codebaseW, &val_str, &val); if(NS_SUCCEEDED(nsres)) { if(*val) { hres = CoInternetCombineUrlEx(window->base.outer_window->uri, val, 0, &uri, 0); @@ -1958,7 +1958,7 @@ static void check_codebase(HTMLInnerWindow *window, nsIDOMHTMLElement *nselem) IUri_Release(uri); } -static IUnknown *create_activex_object(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, CLSID *clsid) +static IUnknown *create_activex_object(HTMLDocumentNode *doc, nsIDOMElement *nselem, CLSID *clsid) { IClassFactoryEx *cfex; IClassFactory *cf; @@ -2069,7 +2069,7 @@ HRESULT create_plugin_host(HTMLDocumentNode *doc, HTMLPluginContainer *container assert(!container->plugin_host); - unk = create_activex_object(doc, container->element.nselem, &clsid); + unk = create_activex_object(doc, container->element.dom_element, &clsid); if(!unk) return E_FAIL;

1 0

Jacek Caban : mshtml: Use nsIDOMElement instead of nsIDOMHTMLElement in get_font_size.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: 339a5156f75a95d71809b390db521c615a316b0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=339a5156f75a95d71809b390… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 01:28:44 2018 +0100 mshtml: Use nsIDOMElement instead of nsIDOMHTMLElement in get_font_size. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/editor.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 37cdcee..0db8821 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -262,7 +262,7 @@ static void remove_child_attr(nsIDOMElement *elem, LPCWSTR tag, nsAString *attr_ static void get_font_size(HTMLDocument *This, WCHAR *ret) { nsISelection *nsselection = get_ns_selection(This); - nsIDOMHTMLElement *elem = NULL; + nsIDOMElement *elem = NULL; nsIDOMNode *node = NULL, *tmp_node; nsAString tag_str; LPCWSTR tag; @@ -283,10 +283,10 @@ static void get_font_size(HTMLDocument *This, WCHAR *ret) break; if(node_type == ELEMENT_NODE) { - nsIDOMNode_QueryInterface(node, &IID_nsIDOMHTMLElement, (void**)&elem); + nsIDOMNode_QueryInterface(node, &IID_nsIDOMElement, (void**)&elem); nsAString_Init(&tag_str, NULL); - nsIDOMHTMLElement_GetTagName(elem, &tag_str); + nsIDOMElement_GetTagName(elem, &tag_str); nsAString_GetData(&tag_str, &tag); if(!strcmpiW(tag, fontW)) { @@ -305,7 +305,7 @@ static void get_font_size(HTMLDocument *This, WCHAR *ret) } nsAString_Finish(&tag_str); - nsIDOMHTMLElement_Release(elem); + nsIDOMElement_Release(elem); } if(*ret)

1 0

Jacek Caban : mshtml: Return element as ndIDOMElement from create_nselem.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: 300c64603fb41fc93c838e0c1c72d9be5c6465fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=300c64603fb41fc93c838e0c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 01:30:27 2018 +0100 mshtml: Return element as ndIDOMElement from create_nselem. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/editor.c | 14 +++++++------- dlls/mshtml/htmlelem.c | 16 ++++------------ dlls/mshtml/htmlimg.c | 4 ++-- dlls/mshtml/htmloption.c | 4 ++-- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/txtrange.c | 10 +++++----- 6 files changed, 21 insertions(+), 29 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 0db8821..6838433 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -324,7 +324,7 @@ static void set_font_size(HTMLDocument *This, LPCWSTR size) { nsISelection *nsselection; cpp_bool collapsed; - nsIDOMHTMLElement *elem; + nsIDOMElement *elem; nsIDOMRange *range; LONG range_cnt = 0; nsAString size_str; @@ -353,7 +353,7 @@ static void set_font_size(HTMLDocument *This, LPCWSTR size) nsAString_InitDepend(&size_str, sizeW); nsAString_InitDepend(&val_str, size); - nsIDOMHTMLElement_SetAttribute(elem, &size_str, &val_str); + nsIDOMElement_SetAttribute(elem, &size_str, &val_str); nsAString_Finish(&val_str); nsISelection_GetRangeAt(nsselection, 0, &range); @@ -372,7 +372,7 @@ static void set_font_size(HTMLDocument *This, LPCWSTR size) nsISelection_Release(nsselection); nsIDOMRange_Release(range); - nsIDOMHTMLElement_Release(elem); + nsIDOMElement_Release(elem); nsAString_Finish(&size_str); @@ -1106,7 +1106,7 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, { nsAString href_str, ns_url; nsIHTMLEditor *html_editor; - nsIDOMHTMLElement *anchor_elem; + nsIDOMElement *anchor_elem; cpp_bool insert_link_at_caret; nsISelection *nsselection; BSTR url = NULL; @@ -1148,7 +1148,7 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, nsAString_InitDepend(&href_str, hrefW); nsAString_InitDepend(&ns_url, url); - nsIDOMHTMLElement_SetAttribute(anchor_elem, &href_str, &ns_url); + nsIDOMElement_SetAttribute(anchor_elem, &href_str, &ns_url); nsAString_Finish(&href_str); nsISelection_GetIsCollapsed(nsselection, &insert_link_at_caret); @@ -1161,7 +1161,7 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, nsIDOMHTMLDocument_CreateTextNode(This->doc_node->nsdoc, &ns_url, &text_node); /* wrap the <a> tags around the text element */ - nsIDOMHTMLElement_AppendChild(anchor_elem, (nsIDOMNode*)text_node, &unused_node); + nsIDOMElement_AppendChild(anchor_elem, (nsIDOMNode*)text_node, &unused_node); nsIDOMText_Release(text_node); nsIDOMNode_Release(unused_node); } @@ -1184,7 +1184,7 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, } nsISelection_Release(nsselection); - nsIDOMHTMLElement_Release(anchor_elem); + nsIDOMElement_Release(anchor_elem); if (cmdexecopt != OLECMDEXECOPT_DONTPROMPTUSER) SysFreeString(url); diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 8be0fe5..b0545a3 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -269,9 +269,8 @@ static inline HTMLElement *impl_from_IHTMLElement(IHTMLElement *iface) return CONTAINING_RECORD(iface, HTMLElement, IHTMLElement_iface); } -HRESULT create_nselem(HTMLDocumentNode *doc, const WCHAR *tag, nsIDOMHTMLElement **ret) +HRESULT create_nselem(HTMLDocumentNode *doc, const WCHAR *tag, nsIDOMElement **ret) { - nsIDOMElement *nselem; nsAString tag_str; nsresult nsres; @@ -281,26 +280,19 @@ HRESULT create_nselem(HTMLDocumentNode *doc, const WCHAR *tag, nsIDOMHTMLElement } nsAString_InitDepend(&tag_str, tag); - nsres = nsIDOMHTMLDocument_CreateElement(doc->nsdoc, &tag_str, &nselem); + nsres = nsIDOMHTMLDocument_CreateElement(doc->nsdoc, &tag_str, ret); nsAString_Finish(&tag_str); if(NS_FAILED(nsres)) { ERR("CreateElement failed: %08x\n", nsres); return E_FAIL; } - nsres = nsIDOMElement_QueryInterface(nselem, &IID_nsIDOMHTMLElement, (void**)ret); - nsIDOMElement_Release(nselem); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMHTMLElement iface: %08x\n", nsres); - return E_FAIL; - } - return S_OK; } HRESULT create_element(HTMLDocumentNode *doc, const WCHAR *tag, HTMLElement **ret) { - nsIDOMHTMLElement *nselem; + nsIDOMElement *nselem; HRESULT hres; /* Use owner doc if called on document fragment */ @@ -312,7 +304,7 @@ HRESULT create_element(HTMLDocumentNode *doc, const WCHAR *tag, HTMLElement **re return hres; hres = HTMLElement_Create(doc, (nsIDOMNode*)nselem, TRUE, ret); - nsIDOMHTMLElement_Release(nselem); + nsIDOMElement_Release(nselem); return hres; } diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 6421440..90681e4 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -874,7 +874,7 @@ static HRESULT WINAPI HTMLImageElementFactory_create(IHTMLImageElementFactory *i HTMLDocumentNode *doc; IHTMLImgElement *img; HTMLElement *elem; - nsIDOMHTMLElement *nselem; + nsIDOMElement *nselem; LONG l; HRESULT hres; @@ -897,7 +897,7 @@ static HRESULT WINAPI HTMLImageElementFactory_create(IHTMLImageElementFactory *i return hres; hres = HTMLElement_Create(doc, (nsIDOMNode*)nselem, FALSE, &elem); - nsIDOMHTMLElement_Release(nselem); + nsIDOMElement_Release(nselem); if(FAILED(hres)) { ERR("HTMLElement_Create failed\n"); return hres; diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index b0c35e5..43661b7 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -559,7 +559,7 @@ static HRESULT WINAPI HTMLOptionElementFactory_create(IHTMLOptionElementFactory IHTMLOptionElement **optelem) { HTMLOptionElementFactory *This = impl_from_IHTMLOptionElementFactory(iface); - nsIDOMHTMLElement *nselem; + nsIDOMElement *nselem; HTMLDOMNode *node; HRESULT hres; @@ -580,7 +580,7 @@ static HRESULT WINAPI HTMLOptionElementFactory_create(IHTMLOptionElementFactory return hres; hres = get_node(This->window->doc, (nsIDOMNode*)nselem, TRUE, &node); - nsIDOMHTMLElement_Release(nselem); + nsIDOMElement_Release(nselem); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index be60375..a0d9221 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -979,7 +979,7 @@ void detach_ranges(HTMLDocumentNode*) DECLSPEC_HIDDEN; HRESULT get_node_text(HTMLDOMNode*,BSTR*) DECLSPEC_HIDDEN; HRESULT replace_node_by_html(nsIDOMHTMLDocument*,nsIDOMNode*,const WCHAR*) DECLSPEC_HIDDEN; -HRESULT create_nselem(HTMLDocumentNode*,const WCHAR*,nsIDOMHTMLElement**) DECLSPEC_HIDDEN; +HRESULT create_nselem(HTMLDocumentNode*,const WCHAR*,nsIDOMElement**) DECLSPEC_HIDDEN; HRESULT create_element(HTMLDocumentNode*,const WCHAR*,HTMLElement**) DECLSPEC_HIDDEN; HRESULT HTMLDOMTextNode_Create(HTMLDocumentNode*,nsIDOMNode*,HTMLDOMNode**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index aa40e4c..c54cbbb 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -1661,7 +1661,7 @@ static HRESULT WINAPI RangeCommandTarget_QueryStatus(IOleCommandTarget *iface, c static HRESULT exec_indent(HTMLTxtRange *This, VARIANT *in, VARIANT *out) { - nsIDOMHTMLElement *blockquote_elem, *p_elem; + nsIDOMElement *blockquote_elem, *p_elem; nsIDOMDocumentFragment *fragment; nsIDOMNode *tmp; @@ -1679,16 +1679,16 @@ static HRESULT exec_indent(HTMLTxtRange *This, VARIANT *in, VARIANT *out) create_nselem(This->doc, pW, &p_elem); nsIDOMRange_ExtractContents(This->nsrange, &fragment); - nsIDOMHTMLElement_AppendChild(p_elem, (nsIDOMNode*)fragment, &tmp); + nsIDOMElement_AppendChild(p_elem, (nsIDOMNode*)fragment, &tmp); nsIDOMDocumentFragment_Release(fragment); nsIDOMNode_Release(tmp); - nsIDOMHTMLElement_AppendChild(blockquote_elem, (nsIDOMNode*)p_elem, &tmp); - nsIDOMHTMLElement_Release(p_elem); + nsIDOMElement_AppendChild(blockquote_elem, (nsIDOMNode*)p_elem, &tmp); + nsIDOMElement_Release(p_elem); nsIDOMNode_Release(tmp); nsIDOMRange_InsertNode(This->nsrange, (nsIDOMNode*)blockquote_elem); - nsIDOMHTMLElement_Release(blockquote_elem); + nsIDOMElement_Release(blockquote_elem); return S_OK; }

1 0

Michael Müller : shell32: Use manual redirection for RunDLL_CallEntry16.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: 2723e9473cc67b723c654b1859c49a9ddd6b0539 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2723e9473cc67b723c654b18… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Feb 12 05:11:25 2018 +0000 shell32: Use manual redirection for RunDLL_CallEntry16. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/control.c | 22 ++++++++++++++++++++++ dlls/shell32/shell32.spec | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 748b2d2..88d0ae8 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -883,3 +883,25 @@ DWORD WINAPI CallCPLEntry16(HMODULE hMod, FARPROC pFunc, DWORD dw3, DWORD dw4, D FIXME("(%p, %p, %08x, %08x, %08x, %08x): stub.\n", hMod, pFunc, dw3, dw4, dw5, dw6); return 0x0deadbee; } + +/************************************************************************* + * RunDLL_CallEntry16 [SHELL32.122] + * Manually relay this function to make Tages Protection v5 happy + */ +void WINAPI RunDLL_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst, + LPCSTR cmdline, INT cmdshow ) +{ + static HMODULE shell16 = NULL; + static void (WINAPI *pRunDLL_CallEntry16)( DWORD proc, HWND hwnd, HINSTANCE inst, + LPCSTR cmdline, INT cmdshow ) = NULL; + + if (!pRunDLL_CallEntry16) + { + if (!shell16 && !(shell16 = LoadLibraryA( "shell.dll16" ))) + return; + if (!(pRunDLL_CallEntry16 = (void *)GetProcAddress( shell16, "RunDLL_CallEntry16" ))) + return; + } + + pRunDLL_CallEntry16( proc, hwnd, inst, cmdline, cmdshow ); +} diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 81fae6d..91e4f6b 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -114,7 +114,7 @@ 119 stdcall -ordinal IsLFNDrive(ptr) IsLFNDriveAW 120 stdcall -noname FileMenu_AbortInitMenu() 121 stdcall -noname SHFlushClipboard() - 122 stdcall -private @(long long ptr str long) shell.dll16.RunDLL_CallEntry16 + 122 stdcall -noname RunDLL_CallEntry16(long long ptr str long) 123 stdcall -noname SHFreeUnusedLibraries() 124 stdcall -noname FileMenu_AppendFilesForPidl(long ptr long) 125 stdcall -noname FileMenu_AddFilesForPidl(long long long ptr long long ptr)

1 0

Nikolay Sivov : comctl32/button: Merge theming logic.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: f1cc2da207d00ea989b659221f77410fcd8b966e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1cc2da207d00ea989b65922… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 11 19:19:53 2018 +0300 comctl32/button: Merge theming logic. 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/button.c | 400 ++++++++++++++++++++++++++++++++++------ dlls/comctl32/theme_button.c | 423 ------------------------------------------- dlls/comctl32/theming.c | 7 - 4 files changed, 348 insertions(+), 483 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f1cc2da207d00ea989b6…

1 0