wine-commits February 2018

wine-commits@winehq.org

2 participants
804 discussions

Andrey Gusev : api-ms-win-perf-legacy-l1-1-0: Add dll.
by Alexandre Julliard 08 Feb '18

08 Feb '18

Module: wine Branch: master Commit: 661d11d07161b29226becd053018626e338a73c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=661d11d07161b29226becd05… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Feb 8 15:12:44 2018 +0200 api-ms-win-perf-legacy-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-perf-legacy-l1-1-0/Makefile.in | 1 + .../api-ms-win-perf-legacy-l1-1-0.spec | 9 +++++++++ tools/make_specfiles | 1 + 5 files changed, 14 insertions(+) diff --git a/configure b/configure index 6b7f7d8..57577da 100755 --- a/configure +++ b/configure @@ -1055,6 +1055,7 @@ enable_api_ms_win_mm_mme_l1_1_0 enable_api_ms_win_mm_time_l1_1_0 enable_api_ms_win_ntuser_dc_access_l1_1_0 enable_api_ms_win_ntuser_rectangle_l1_1_0 +enable_api_ms_win_perf_legacy_l1_1_0 enable_api_ms_win_power_base_l1_1_0 enable_api_ms_win_power_setting_l1_1_0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 @@ -18487,6 +18488,7 @@ wine_fn_config_dll api-ms-win-mm-mme-l1-1-0 enable_api_ms_win_mm_mme_l1_1_0 wine_fn_config_dll api-ms-win-mm-time-l1-1-0 enable_api_ms_win_mm_time_l1_1_0 wine_fn_config_dll api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_dc_access_l1_1_0 wine_fn_config_dll api-ms-win-ntuser-rectangle-l1-1-0 enable_api_ms_win_ntuser_rectangle_l1_1_0 +wine_fn_config_dll api-ms-win-perf-legacy-l1-1-0 enable_api_ms_win_perf_legacy_l1_1_0 wine_fn_config_dll api-ms-win-power-base-l1-1-0 enable_api_ms_win_power_base_l1_1_0 wine_fn_config_dll api-ms-win-power-setting-l1-1-0 enable_api_ms_win_power_setting_l1_1_0 wine_fn_config_dll api-ms-win-rtcore-ntuser-private-l1-1-0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 diff --git a/configure.ac b/configure.ac index 016b9bf..58ce104 100644 --- a/configure.ac +++ b/configure.ac @@ -2968,6 +2968,7 @@ WINE_CONFIG_DLL(api-ms-win-mm-mme-l1-1-0) WINE_CONFIG_DLL(api-ms-win-mm-time-l1-1-0) WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) WINE_CONFIG_DLL(api-ms-win-ntuser-rectangle-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-perf-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-power-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-power-setting-l1-1-0) WINE_CONFIG_DLL(api-ms-win-rtcore-ntuser-private-l1-1-0) diff --git a/dlls/api-ms-win-perf-legacy-l1-1-0/Makefile.in b/dlls/api-ms-win-perf-legacy-l1-1-0/Makefile.in new file mode 100644 index 0000000..0328476 --- /dev/null +++ b/dlls/api-ms-win-perf-legacy-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-perf-legacy-l1-1-0.dll diff --git a/dlls/api-ms-win-perf-legacy-l1-1-0/api-ms-win-perf-legacy-l1-1-0.spec b/dlls/api-ms-win-perf-legacy-l1-1-0/api-ms-win-perf-legacy-l1-1-0.spec new file mode 100644 index 0000000..9fe91d1 --- /dev/null +++ b/dlls/api-ms-win-perf-legacy-l1-1-0/api-ms-win-perf-legacy-l1-1-0.spec @@ -0,0 +1,9 @@ +@ stub PerfAddCounters +@ stub PerfCloseQueryHandle +@ stub PerfDeleteCounters +@ stub PerfEnumerateCounterSet +@ stub PerfEnumerateCounterSetInstances +@ stub PerfOpenQueryHandle +@ stub PerfQueryCounterData +@ stub PerfQueryCounterInfo +@ stub PerfQueryCounterSetRegistrationInfo diff --git a/tools/make_specfiles b/tools/make_specfiles index e5b2617..6b59b32 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -123,6 +123,7 @@ my @dll_groups = "api-ms-win-eventing-legacy-l1-1-0", "api-ms-win-eventing-provider-l1-1-0", "api-ms-win-eventlog-legacy-l1-1-0", + "api-ms-win-perf-legacy-l1-1-0", "api-ms-win-security-audit-l1-1-1", "api-ms-win-security-base-l1-2-0", "api-ms-win-security-base-private-l1-1-1",

1 0

Michael Stefaniuc : xmllite: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 08 Feb '18

08 Feb '18

Module: wine Branch: master Commit: c9f1ada8e5d9134dc86271423409338b0370062a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9f1ada8e5d9134dc8627142… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 7 00:20:06 2018 +0100 xmllite: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/xmllite_private.h | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/xmllite/xmllite_private.h b/dlls/xmllite/xmllite_private.h index 702fadb..7884e27 100644 --- a/dlls/xmllite/xmllite_private.h +++ b/dlls/xmllite/xmllite_private.h @@ -21,22 +21,7 @@ #ifndef __XMLLITE_PRIVATE__ #define __XMLLITE_PRIVATE__ -/* memory allocation functions */ - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} +#include "wine/heap.h" static inline void *m_alloc(IMalloc *imalloc, size_t len) {

1 0

Matteo Bruni : d3d10core/tests: Add tests for GenerateMips().
by Alexandre Julliard 08 Feb '18

08 Feb '18

Module: wine Branch: master Commit: 02e162eeea863cb8ecb057ffab1cefb8c51d01b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02e162eeea863cb8ecb057ff… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 6 19:36:13 2018 +0100 d3d10core/tests: Add tests for GenerateMips(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 463 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 463 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02e162eeea863cb8ecb0…

1 0

Jacek Caban : mshtml/tests: Run form element tests in both quirks and IE9 compat mode.
by Alexandre Julliard 08 Feb '18

08 Feb '18

Module: wine Branch: master Commit: f7b95a77c30d1915f64ece310942844459db3e02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7b95a77c30d1915f64ece31… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 8 20:54:09 2018 +0100 mshtml/tests: Run form element tests in both quirks and IE9 compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 95 ++++++++++++++++++++++++++++++------------------- 1 file changed, 59 insertions(+), 36 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 2ef7f38..f9d2690 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2752,7 +2752,10 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, V_I4(&name) = -1; disp = (void*)0xdeadbeef; hres = IHTMLElementCollection_item(col, name, index, &disp); - ok_(__FILE__,line) (hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); + if(compat_mode < COMPAT_IE9) + ok_(__FILE__,line) (hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); + else + ok_(__FILE__,line) (hres == S_OK, "item failed: %08x\n", hres); ok_(__FILE__,line) (disp == NULL, "disp != NULL\n"); IHTMLElementCollection_Release(col); @@ -4577,8 +4580,9 @@ static void _test_form_put_encoding(unsigned line, IUnknown *unk, HRESULT exp_hr _test_form_encoding(line, unk, encoding); } -#define test_form_elements(a) _test_form_elements(__LINE__,a) -static void _test_form_elements(unsigned line, IUnknown *unk) +#define test_form_elements(a,b,c) _test_form_elements(__LINE__,a,b,c) +static void _test_form_elements(unsigned line, IUnknown *unk, const elem_type_t *elem_types, + LONG elem_types_cnt) { IHTMLFormElement *form = _get_form_iface(line, unk); IDispatch *disp; @@ -4588,7 +4592,10 @@ static void _test_form_elements(unsigned line, IUnknown *unk) hres = IHTMLFormElement_get_elements(form, &disp); ok_(__FILE__,line)(hres == S_OK, "get_elements failed: %08x\n", hres); ok_(__FILE__,line)(disp != NULL, "disp = NULL\n"); - ok_(__FILE__,line)(iface_cmp((IUnknown*)form, (IUnknown*)disp), "disp != form\n"); + if(compat_mode < COMPAT_IE9) + ok_(__FILE__,line)(iface_cmp((IUnknown*)form, (IUnknown*)disp), "disp != form\n"); + else + _test_elem_collection(line, (IUnknown*)disp, elem_types, elem_types_cnt); IDispatch_Release(disp); IHTMLFormElement_Release(form); @@ -4640,7 +4647,7 @@ static void test_select_form(IUnknown *uselect, IUnknown *uform) ok(form != NULL, "form == NULL\n"); test_form_length((IUnknown*)form, 2); - test_form_elements((IUnknown*)form); + test_form_elements((IUnknown*)form, NULL, 0); test_form_name((IUnknown*)form, "form_name"); ok(iface_cmp(uform, (IUnknown*)form), "Expected %p, got %p\n", uform, form); @@ -5378,7 +5385,10 @@ static void test_form_item(IHTMLElement *elem) V_I4(&name) = -1; disp = (void*)0xdeadbeef; hres = IHTMLFormElement_item(form, name, index, &disp); - ok(hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); + if(compat_mode < COMPAT_IE9) + ok(hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); + else + ok(hres == S_OK, "item failed: %08x\n", hres); ok(!disp, "disp = %p\n", disp); V_I4(&name) = 2; @@ -8882,7 +8892,7 @@ static void test_elems(IHTMLDocument2 *doc) ok(elem != NULL, "elem == NULL\n"); if(elem) { test_form_length((IUnknown*)elem, 0); - test_form_elements((IUnknown*)elem); + test_form_elements((IUnknown*)elem, NULL, 0); IHTMLElement_Release(elem); } @@ -9262,35 +9272,6 @@ static void test_elems2(IHTMLDocument2 *doc) test_insert_adjacent_elems(doc, div); test_elem_set_innerhtml((IUnknown*)div, - "<form id=\"form\"><input type=\"button\" /><div><input type=\"text\" id=\"inputid\"/></div></textarea>"); - elem = get_elem_by_id(doc, "form", TRUE); - if(elem) { - test_form_length((IUnknown*)elem, 2); - test_form_item(elem); - test_form_action((IUnknown*)elem, NULL); - test_form_put_action((IUnknown*)elem, "about:blank"); - test_form_method((IUnknown*)elem, "get"); - test_form_put_method((IUnknown*)elem, S_OK, "post"); - test_form_put_method((IUnknown*)elem, E_INVALIDARG, "put"); - test_form_method((IUnknown*)elem, "post"); - test_form_name((IUnknown*)elem, NULL); - test_form_put_name((IUnknown*)elem, "Name"); - test_form_encoding((IUnknown*)elem, "application/x-www-form-urlencoded"); - test_form_put_encoding((IUnknown*)elem, S_OK, "text/plain"); - test_form_put_encoding((IUnknown*)elem, S_OK, "multipart/form-data"); - test_form_put_encoding((IUnknown*)elem, E_INVALIDARG, "image/png"); - test_form_encoding((IUnknown*)elem, "multipart/form-data"); - test_form_elements((IUnknown*)elem); - test_form_reset((IUnknown*)elem); - test_form_target((IUnknown*)elem); - IHTMLElement_Release(elem); - - elem = get_elem_by_id(doc, "inputid", TRUE); - test_input_get_form((IUnknown*)elem, "form"); - IHTMLElement_Release(elem); - } - - test_elem_set_innerhtml((IUnknown*)div, "<form id=\"form\" name=\"form_name\"><select id=\"sform\"><option id=\"oform\"></option></select><button id=\"btnid\"></button></form>"); elem = get_elem_by_id(doc, "sform", TRUE); elem2 = get_elem_by_id(doc, "form", TRUE); @@ -9393,6 +9374,47 @@ static void test_textarea_element(IHTMLDocument2 *doc, IHTMLElement *parent) IHTMLElement_Release(elem); } +static void test_form_element(IHTMLDocument2 *doc, IHTMLElement *parent) +{ + IHTMLElement *elem, *input_elem; + + static const elem_type_t elems_textarea_input[] = { ET_TEXTAREA, ET_INPUT }; + + test_elem_set_innerhtml((IUnknown*)parent, + "<form id=\"form\">" + "<textarea></textarea>" + "<div><input type=\"text\" id=\"inputid\" /></div>" + "</form>"); + elem = get_elem_by_id(doc, "form", TRUE); + test_elem_type((IUnknown*)elem, ET_FORM); + + test_form_length((IUnknown*)elem, 2); + test_form_item(elem); + test_form_action((IUnknown*)elem, NULL); + test_form_put_action((IUnknown*)elem, "about:blank"); + test_form_method((IUnknown*)elem, "get"); + test_form_put_method((IUnknown*)elem, S_OK, "post"); + test_form_put_method((IUnknown*)elem, E_INVALIDARG, "put"); + test_form_method((IUnknown*)elem, "post"); + test_form_name((IUnknown*)elem, NULL); + test_form_put_name((IUnknown*)elem, "Name"); + test_form_encoding((IUnknown*)elem, "application/x-www-form-urlencoded"); + test_form_put_encoding((IUnknown*)elem, S_OK, "text/plain"); + test_form_put_encoding((IUnknown*)elem, S_OK, "multipart/form-data"); + test_form_put_encoding((IUnknown*)elem, E_INVALIDARG, "image/png"); + test_form_encoding((IUnknown*)elem, "multipart/form-data"); + test_form_elements((IUnknown*)elem, elems_textarea_input, + sizeof(elems_textarea_input)/sizeof(*elems_textarea_input)); + test_form_reset((IUnknown*)elem); + test_form_target((IUnknown*)elem); + + input_elem = get_elem_by_id(doc, "inputid", TRUE); + test_input_get_form((IUnknown*)input_elem, "form"); + IHTMLElement_Release(input_elem); + + IHTMLElement_Release(elem); +} + static void test_dom_elements(IHTMLDocument2 *doc) { IHTMLElement *body, *div; @@ -9402,6 +9424,7 @@ static void test_dom_elements(IHTMLDocument2 *doc) div = get_doc_elem_by_id(doc, "parentdiv"); test_textarea_element(doc, div); + test_form_element(doc, div); IHTMLElement_Release(body); IHTMLElement_Release(div);

1 0

Jacek Caban : mshtml: Fixed error handling in IHTMLElementCollection:: item in IE9+ mode.
by Alexandre Julliard 08 Feb '18

08 Feb '18

Module: wine Branch: master Commit: 9623fcb4747f252a54041a6fec7080e0faacbc1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9623fcb4747f252a54041a6f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 8 20:53:55 2018 +0100 mshtml: Fixed error handling in IHTMLElementCollection::item in IE9+ mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelemcol.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 8407e02..c08a876 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -63,7 +63,7 @@ static inline HTMLElement *elem_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLElement, node); } -static IHTMLElementCollection *HTMLElementCollection_Create(HTMLElement **elems, DWORD len); +static IHTMLElementCollection *HTMLElementCollection_Create(HTMLElement**,DWORD,compat_mode_t); static void elem_vector_add(elem_vector_t *buf, HTMLElement *elem) { @@ -421,7 +421,7 @@ static HRESULT WINAPI HTMLElementCollection_item(IHTMLElementCollection *iface, case VT_I4: case VT_INT: if(V_I4(&name) < 0) - return E_INVALIDARG; + return dispex_compat_mode(&This->dispex) < COMPAT_MODE_IE9 ? E_INVALIDARG : S_OK; hres = get_item_idx(This, V_I4(&name), pdisp); break; @@ -462,7 +462,8 @@ static HRESULT WINAPI HTMLElementCollection_item(IHTMLElementCollection *iface, if(buf.len > 1) { elem_vector_normalize(&buf); - *pdisp = (IDispatch*)HTMLElementCollection_Create(buf.buf, buf.len); + *pdisp = (IDispatch*)HTMLElementCollection_Create(buf.buf, buf.len, + dispex_compat_mode(&This->dispex)); }else { if(buf.len == 1) { /* Already AddRef-ed */ @@ -524,7 +525,8 @@ static HRESULT WINAPI HTMLElementCollection_tags(IHTMLElementCollection *iface, TRACE("fount %d tags\n", buf.len); - *pdisp = (IDispatch*)HTMLElementCollection_Create(buf.buf, buf.len); + *pdisp = (IDispatch*)HTMLElementCollection_Create(buf.buf, buf.len, + dispex_compat_mode(&This->dispex)); return S_OK; } @@ -677,7 +679,8 @@ IHTMLElementCollection *create_all_collection(HTMLDOMNode *node, BOOL include_ro create_all_list(node->doc, node, &buf); elem_vector_normalize(&buf); - return HTMLElementCollection_Create(buf.buf, buf.len); + return HTMLElementCollection_Create(buf.buf, buf.len, + dispex_compat_mode(&node->event_target.dispex)); } IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode *doc, nsIDOMNodeList *nslist) @@ -712,7 +715,7 @@ IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode *doc, n buf.buf = NULL; } - return HTMLElementCollection_Create(buf.buf, buf.len); + return HTMLElementCollection_Create(buf.buf, buf.len, doc->document_mode); } IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode *doc, nsIDOMHTMLCollection *nscol) @@ -748,7 +751,7 @@ IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode *doc, ns return NULL; } - return HTMLElementCollection_Create(buf.buf, buf.len); + return HTMLElementCollection_Create(buf.buf, buf.len, doc->document_mode); } HRESULT get_elem_source_index(HTMLElement *elem, LONG *ret) @@ -820,7 +823,8 @@ HRESULT get_elem_source_index(HTMLElement *elem, LONG *ret) return S_OK; } -static IHTMLElementCollection *HTMLElementCollection_Create(HTMLElement **elems, DWORD len) +static IHTMLElementCollection *HTMLElementCollection_Create(HTMLElement **elems, DWORD len, + compat_mode_t compat_mode) { HTMLElementCollection *ret = heap_alloc_zero(sizeof(HTMLElementCollection)); @@ -832,8 +836,8 @@ static IHTMLElementCollection *HTMLElementCollection_Create(HTMLElement **elems, ret->elems = elems; ret->len = len; - init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLElementCollection_iface, - &HTMLElementCollection_dispex); + init_dispex_with_compat_mode(&ret->dispex, (IUnknown*)&ret->IHTMLElementCollection_iface, + &HTMLElementCollection_dispex, compat_mode); TRACE("ret=%p len=%d\n", ret, len);

1 0

Jacek Caban : mshtml: Fixed error handling in IHTMLFormElement:: item in IE9+ mode.
by Alexandre Julliard 08 Feb '18

08 Feb '18

Module: wine Branch: master Commit: 7da84dfe97147fa2eb2e9b582975eec84fa4cc16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7da84dfe97147fa2eb2e9b58… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 8 20:53:48 2018 +0100 mshtml: Fixed error handling in IHTMLFormElement::item in IE9+ mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlform.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 2957ad1..51adc20 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -540,8 +540,11 @@ static HRESULT WINAPI HTMLFormElement_item(IHTMLFormElement *iface, VARIANT name *pdisp = NULL; if(V_VT(&name) == VT_I4) { - if(V_I4(&name) < 0) - return E_INVALIDARG; + if(V_I4(&name) < 0) { + *pdisp = NULL; + return dispex_compat_mode(&This->element.node.event_target.dispex) >= COMPAT_MODE_IE9 + ? S_OK : E_INVALIDARG; + } return htmlform_item(This, V_I4(&name), pdisp); }

1 0

Jacek Caban : mshtml: Added IE9+ mode support to HTMLFormElement:: elements property.
by Alexandre Julliard 08 Feb '18

08 Feb '18

Module: wine Branch: master Commit: 86475d5bab78e243750bd40b22b375a60c5d229f URL: https://source.winehq.org/git/wine.git/?a=commit;h=86475d5bab78e243750bd40b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 8 20:53:41 2018 +0100 mshtml: Added IE9+ mode support to HTMLFormElement::elements property. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlform.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index f73970f..2957ad1 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -275,11 +275,24 @@ static HRESULT WINAPI HTMLFormElement_get_method(IHTMLFormElement *iface, BSTR * static HRESULT WINAPI HTMLFormElement_get_elements(IHTMLFormElement *iface, IDispatch **p) { HTMLFormElement *This = impl_from_IHTMLFormElement(iface); + nsIDOMHTMLCollection *elements; + nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - *p = (IDispatch*)&This->IHTMLFormElement_iface; - IDispatch_AddRef(*p); + if(dispex_compat_mode(&This->element.node.event_target.dispex) < COMPAT_MODE_IE9) { + IDispatch_AddRef(*p = (IDispatch*)&This->IHTMLFormElement_iface); + return S_OK; + } + + nsres = nsIDOMHTMLFormElement_GetElements(This->nsform, &elements); + if(NS_FAILED(nsres)) { + ERR("GetElements failed: %08x\n", nsres); + return E_FAIL; + } + + *p = (IDispatch*)create_collection_from_htmlcol(This->element.node.doc, elements); + nsIDOMHTMLCollection_Release(elements); return S_OK; }

1 0

Jacek Caban : mshtml/tests: Run textarea tests in both quirks and IE9 compat mode.
by Alexandre Julliard 08 Feb '18

08 Feb '18

Module: wine Branch: master Commit: 52c74af96b1869741aa5521e3e49f507635f8db3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52c74af96b1869741aa5521e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 8 20:53:35 2018 +0100 mshtml/tests: Run textarea tests in both quirks and IE9 compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 137 ++++++++++++++++++++++++++++++------------------ 1 file changed, 87 insertions(+), 50 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 2a4ae62..2ef7f38 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -43,7 +43,24 @@ static LANGID (WINAPI *pGetUserDefaultUILanguage)(void); static BOOL is_ie9plus; -static const char doc_blank[] = "<html></html>"; +static enum { + COMPAT_NONE, + COMPAT_IE9 +} compat_mode = COMPAT_NONE; + +static const char doc_blank[] = + "<html></html>"; + +static const char doc_blank_ie9[] = + "<!DOCTYPE html>\n" + "<html>" + " <head>" + " <meta http-equiv=\"x-ua-compatible\" content=\"IE=9\" />" + " </head>" + " <body>" + " </body>" + "</html>"; + static const char doc_str1[] = "<html><body>test</body></html>"; static const char range_test_str[] = "<html><body>test \na<font size=\"2\">bc\t123<br /> it's\r\n \t</font>text<br /></body></html>"; @@ -757,7 +774,7 @@ static void _test_disp2(unsigned line, IUnknown *unk, const IID *diid, const IID IID iid; HRESULT hres; - if(_test_get_dispid(line, unk, &iid)) + if(_test_get_dispid(line, unk, &iid) && compat_mode < COMPAT_IE9) ok_(__FILE__,line) (IsEqualGUID(&iid, diid) || broken(diid2 && IsEqualGUID(&iid, diid2)), "unexpected guid %s\n", wine_dbgstr_guid(&iid)); @@ -773,7 +790,7 @@ static void _test_disp2(unsigned line, IUnknown *unk, const IID *diid, const IID ok_(__FILE__,line)(hres == E_NOINTERFACE, "Got IManagedObject iface\n"); ok_(__FILE__,line)(!u, "u = %p\n", u); - if(val) + if(val && compat_mode < COMPAT_IE9) /* FIXME: Enable those tests in IE9+ mode */ _test_disp_value(line, unk, val); if(clsid) { @@ -9230,53 +9247,6 @@ static void test_elems2(IHTMLDocument2 *doc) test_elem_all((IUnknown*)div, outer_types, 1); IHTMLElement_Release(elem2); - test_elem_set_innerhtml((IUnknown*)div, "<textarea id=\"ta\"></textarea>"); - elem = get_elem_by_id(doc, "ta", TRUE); - if(elem) { - IHTMLFormElement *form; - - test_textarea_value((IUnknown*)elem, NULL); - test_textarea_put_value((IUnknown*)elem, "test"); - test_textarea_defaultvalue((IUnknown*)elem, NULL); - test_textarea_put_defaultvalue((IUnknown*)elem, "defval text"); - test_textarea_put_value((IUnknown*)elem, "test"); - test_textarea_readonly((IUnknown*)elem, VARIANT_FALSE); - test_textarea_put_readonly((IUnknown*)elem, VARIANT_TRUE); - test_textarea_put_readonly((IUnknown*)elem, VARIANT_FALSE); - test_textarea_type((IUnknown*)elem); - - form = get_textarea_form((IUnknown*)elem); - ok(!form, "form = %p\n", form); - - test_elem_istextedit(elem, VARIANT_TRUE); - - IHTMLElement_Release(elem); - } - - test_elem_set_innerhtml((IUnknown*)div, "<textarea id=\"ta\">default text</textarea>"); - elem = get_elem_by_id(doc, "ta", TRUE); - if(elem) { - test_textarea_defaultvalue((IUnknown*)elem, "default text"); - IHTMLElement_Release(elem); - } - - test_elem_set_innerhtml((IUnknown*)div, "<form id=\"fid\"><textarea id=\"ta\"></textarea></form>"); - elem = get_elem_by_id(doc, "ta", TRUE); - if(elem) { - IHTMLFormElement *form; - - elem2 = get_elem_by_id(doc, "fid", TRUE); - ok(elem2 != NULL, "elem2 == NULL\n"); - - form = get_textarea_form((IUnknown*)elem); - ok(form != NULL, "form = NULL\n"); - ok(iface_cmp((IUnknown*)form, (IUnknown*)elem2), "form != elem2\n"); - - IHTMLFormElement_Release(form); - IHTMLElement_Release(elem2); - IHTMLElement_Release(elem); - } - test_elem_set_innerhtml((IUnknown*)div, "<input value=\"val\" id =\"inputid\" />"); elem = get_elem_by_id(doc, "inputid", TRUE); @@ -9376,6 +9346,67 @@ static void test_elems2(IHTMLDocument2 *doc) IHTMLElement_Release(div); } +static void test_textarea_element(IHTMLDocument2 *doc, IHTMLElement *parent) +{ + IHTMLElement *form_elem, *elem; + IHTMLFormElement *form; + + test_elem_set_innerhtml((IUnknown*)parent, + "<form id=\"fid\"><textarea id=\"ta\"></textarea></form>"); + elem = get_elem_by_id(doc, "ta", TRUE); + test_elem_type((IUnknown*)elem, ET_TEXTAREA); + + form_elem = get_elem_by_id(doc, "fid", TRUE); + ok(form_elem != NULL, "form_elem == NULL\n"); + + form = get_textarea_form((IUnknown*)elem); + ok(form != NULL, "form = NULL\n"); + ok(iface_cmp((IUnknown*)form, (IUnknown*)form_elem), "form != form_elem\n"); + + IHTMLFormElement_Release(form); + IHTMLElement_Release(form_elem); + IHTMLElement_Release(elem); + + test_elem_set_innerhtml((IUnknown*)parent, "<textarea id=\"ta\"></textarea>"); + elem = get_elem_by_id(doc, "ta", TRUE); + + test_textarea_value((IUnknown*)elem, NULL); + test_textarea_put_value((IUnknown*)elem, "test"); + test_textarea_defaultvalue((IUnknown*)elem, NULL); + test_textarea_put_defaultvalue((IUnknown*)elem, "defval text"); + test_textarea_put_value((IUnknown*)elem, "test"); + test_textarea_readonly((IUnknown*)elem, VARIANT_FALSE); + test_textarea_put_readonly((IUnknown*)elem, VARIANT_TRUE); + test_textarea_put_readonly((IUnknown*)elem, VARIANT_FALSE); + test_textarea_type((IUnknown*)elem); + + form = get_textarea_form((IUnknown*)elem); + ok(!form, "form = %p\n", form); + + test_elem_istextedit(elem, VARIANT_TRUE); + + IHTMLElement_Release(elem); + + test_elem_set_innerhtml((IUnknown*)parent, "<textarea id=\"ta\">default text</textarea>"); + elem = get_elem_by_id(doc, "ta", TRUE); + test_textarea_defaultvalue((IUnknown*)elem, "default text"); + IHTMLElement_Release(elem); +} + +static void test_dom_elements(IHTMLDocument2 *doc) +{ + IHTMLElement *body, *div; + + body = doc_get_body(doc); + test_elem_set_innerhtml((IUnknown*)body, "<div id=\"parentdiv\"></div>"); + div = get_doc_elem_by_id(doc, "parentdiv"); + + test_textarea_element(doc, div); + + IHTMLElement_Release(body); + IHTMLElement_Release(div); +} + static void test_create_elems(IHTMLDocument2 *doc) { IHTMLElement *elem, *body, *elem2; @@ -10719,6 +10750,12 @@ START_TEST(dom) if (winetest_interactive || ! is_ie_hardened()) { run_domtest(elem_test_str, test_elems); run_domtest(elem_test2_str, test_elems2); + run_domtest(doc_blank, test_dom_elements); + if(is_ie9plus) { + compat_mode = COMPAT_IE9; + run_domtest(doc_blank_ie9, test_dom_elements); + compat_mode = COMPAT_NONE; + } run_domtest(noscript_str, test_noscript); }else { skip("IE running in Enhanced Security Configuration\n");

1 0

Jacek Caban : mshtml: Always set valid IEventTarget vtbl.
by Alexandre Julliard 08 Feb '18

08 Feb '18

Module: wine Branch: master Commit: a25d8c342fbe4eed4e9909cd503ac7e3073ba978 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a25d8c342fbe4eed4e9909cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 8 20:53:28 2018 +0100 mshtml: Always set valid IEventTarget vtbl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 44 +++++++++++--------------------------------- 1 file changed, 11 insertions(+), 33 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 2931318..69c9444 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -213,8 +213,6 @@ static const event_info_t event_info[] = { EVENT_FIXME} }; -static BOOL use_event_quirks(EventTarget*); - static eventid_t str_to_eid(const WCHAR *str) { int i; @@ -859,7 +857,7 @@ static ULONG WINAPI DOMEvent_Release(IDOMEvent *iface) if(This->mouse_event) nsIDOMMouseEvent_Release(This->mouse_event); if(This->target) - IDispatchEx_Release(&This->target->dispex.IDispatchEx_iface); + IEventTarget_Release(&This->target->IEventTarget_iface); nsIDOMEvent_Release(This->nsevent); release_dispex(&This->dispex); heap_free(This->type); @@ -2085,6 +2083,11 @@ static HRESULT call_cp_func(IDispatch *disp, DISPID dispid, IHTMLEventObj *event return IDispatch_Invoke(disp, dispid, &IID_NULL, 0, DISPATCH_METHOD, &dp, retv, &ei, &argerr); } +static BOOL use_event_quirks(EventTarget *event_target) +{ + return dispex_compat_mode(&event_target->dispex) < COMPAT_MODE_IE9; +} + static BOOL is_cp_event(cp_static_data_t *data, DISPID dispid) { int min, max, i; @@ -2342,7 +2345,7 @@ static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event, } iter = event_target; - IDispatchEx_AddRef(&event_target->dispex.IDispatchEx_iface); + IEventTarget_AddRef(&event_target->IEventTarget_iface); chain_cnt = 0; chain_buf_size = sizeof(target_chain_buf)/sizeof(*target_chain_buf); @@ -2382,9 +2385,9 @@ static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event, prev_event = target_vtbl->set_current_event(&event_target->dispex, event->event_obj); if(event->target) - IDispatchEx_Release(&event->target->dispex.IDispatchEx_iface); + IEventTarget_Release(&event->target->IEventTarget_iface); event->target = event_target; - IDispatchEx_AddRef(&event_target->dispex.IDispatchEx_iface); + IEventTarget_AddRef(&event_target->IEventTarget_iface); event->phase = DEP_CAPTURING_PHASE; i = chain_cnt-1; @@ -2433,7 +2436,7 @@ static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event, } for(i = 0; i < chain_cnt; i++) - IDispatchEx_Release(&target_chain[i]->dispex.IDispatchEx_iface); + IEventTarget_Release(&target_chain[i]->IEventTarget_iface); if(target_chain != target_chain_buf) heap_free(target_chain); @@ -3044,18 +3047,6 @@ static const IEventTargetVtbl EventTargetVtbl = { EventTarget_dispatchEvent }; -#define DELAY_INIT_VTBL ((const IEventTargetVtbl*)1) - -static BOOL use_event_quirks(EventTarget *event_target) -{ - if(event_target->IEventTarget_iface.lpVtbl == DELAY_INIT_VTBL) { - event_target->IEventTarget_iface.lpVtbl = - dispex_compat_mode(&event_target->dispex) >= COMPAT_MODE_IE9 - ? &EventTargetVtbl : NULL; - } - return !event_target->IEventTarget_iface.lpVtbl; -} - HRESULT EventTarget_QI(EventTarget *event_target, REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IEventTarget)) { @@ -3098,21 +3089,8 @@ void EventTarget_Init(EventTarget *event_target, IUnknown *outer, dispex_static_ compat_mode_t compat_mode) { init_dispex_with_compat_mode(&event_target->dispex, outer, dispex_data, compat_mode); + event_target->IEventTarget_iface.lpVtbl = &EventTargetVtbl; wine_rb_init(&event_target->handler_map, event_id_cmp); - - /* - * IEventTarget is supported by the object or not depending on compatibility mode. - * We use NULL vtbl for objects in compatibility mode not supporting the interface. - * For targets that don't know compatibility mode at creation time, we set vtbl - * to special DELAY_INIT_VTBL value so that vtbl will be set to proper value - * when it's needed. - */ - if(compat_mode == COMPAT_MODE_QUIRKS && dispex_data->vtbl && dispex_data->vtbl->get_compat_mode) - event_target->IEventTarget_iface.lpVtbl = DELAY_INIT_VTBL; - else if(compat_mode < COMPAT_MODE_IE9) - event_target->IEventTarget_iface.lpVtbl = NULL; - else - event_target->IEventTarget_iface.lpVtbl = &EventTargetVtbl; } void release_event_target(EventTarget *event_target)

1 0

Jacek Caban : mshtml: Store compat mode in dispex_data_t and use it in dispex_compat_mode when possible.
by Alexandre Julliard 08 Feb '18

08 Feb '18

Module: wine Branch: master Commit: 728080667267a636d68cdf8ff8d1731a6e27aa0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=728080667267a636d68cdf8f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 8 20:53:21 2018 +0100 mshtml: Store compat mode in dispex_data_t and use it in dispex_compat_mode when possible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index ea20baf..360d915 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -64,6 +64,7 @@ typedef struct { struct dispex_data_t { dispex_static_data_t *desc; + compat_mode_t compat_mode; DWORD func_cnt; DWORD func_size; @@ -411,6 +412,7 @@ static dispex_data_t *preprocess_dispex_data(dispex_static_data_t *desc, compat_ return NULL; } data->desc = desc; + data->compat_mode = compat_mode; data->func_cnt = 0; data->func_disp_cnt = 0; data->func_size = 16; @@ -1364,7 +1366,9 @@ HRESULT remove_attribute(DispatchEx *This, DISPID id, VARIANT_BOOL *success) compat_mode_t dispex_compat_mode(DispatchEx *dispex) { - return dispex->info->desc->vtbl->get_compat_mode(dispex); + return dispex->info != dispex->info->desc->delayed_init_info + ? dispex->info->compat_mode + : dispex->info->desc->vtbl->get_compat_mode(dispex); } static dispex_data_t *ensure_dispex_info(dispex_static_data_t *desc, compat_mode_t compat_mode)

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
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