- Wine-Commits - list.winehq.org

Connor McAdams : uiautomationcore: Fix maximum ID comparison for uia_{prop,pattern,control}_info_from_id().
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: bfdda1c311a9f25628e8c3a4f8de08427853f576 URL: https://gitlab.winehq.org/wine/wine/-/commit/bfdda1c311a9f25628e8c3a4f8de08… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed May 24 15:17:37 2023 -0400 uiautomationcore: Fix maximum ID comparison for uia_{prop,pattern,control}_info_from_id(). Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_ids.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/uiautomationcore/uia_ids.c b/dlls/uiautomationcore/uia_ids.c index d23ba14c333..db4bdccc24a 100644 --- a/dlls/uiautomationcore/uia_ids.c +++ b/dlls/uiautomationcore/uia_ids.c @@ -331,7 +331,7 @@ static const struct uia_prop_info *uia_prop_info_from_guid(const GUID *guid) const struct uia_prop_info *uia_prop_info_from_id(PROPERTYID prop_id) { - if ((prop_id < PROP_ID_MIN) || (prop_id > PROP_ID_MAX)) + if ((prop_id < PROP_ID_MIN) || (prop_id >= PROP_ID_MAX)) return NULL; return &default_uia_properties[prop_id_idx[prop_id - PROP_ID_MIN]]; @@ -520,7 +520,7 @@ static const struct uia_pattern_info *uia_pattern_info_from_guid(const GUID *gui const struct uia_pattern_info *uia_pattern_info_from_id(PATTERNID pattern_id) { - if ((pattern_id < PATTERN_ID_MIN) || (pattern_id > PATTERN_ID_MAX)) + if ((pattern_id < PATTERN_ID_MIN) || (pattern_id >= PATTERN_ID_MAX)) return NULL; return &default_uia_patterns[pattern_id_idx[pattern_id - PATTERN_ID_MIN]]; @@ -596,7 +596,7 @@ static const struct uia_control_type_info *uia_control_type_info_from_guid(const const struct uia_control_type_info *uia_control_type_info_from_id(CONTROLTYPEID control_type_id) { - if ((control_type_id < CONTROL_TYPE_ID_MIN) || (control_type_id > CONTROL_TYPE_ID_MAX)) + if ((control_type_id < CONTROL_TYPE_ID_MIN) || (control_type_id >= CONTROL_TYPE_ID_MAX)) return NULL; return &default_uia_control_types[control_type_id_idx[control_type_id - CONTROL_TYPE_ID_MIN]];

1 0

Gabriel Ivăncescu : mshtml: Implement indexed props for classList.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: 13e94072dd02c85e193f3abe89ff316b5b0d9a07 URL: https://gitlab.winehq.org/wine/wine/-/commit/13e94072dd02c85e193f3abe89ff31… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri May 26 17:04:39 2023 +0300 mshtml: Implement indexed props for classList. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 61 +++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.js | 33 ++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 6f3d6c37aa4..21a1ad69254 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7710,6 +7710,9 @@ static const IWineDOMTokenListVtbl WineDOMTokenListVtbl = { token_list_toString }; +/* idx can be negative, so offset it halfway through custom dispids */ +#define DISPID_TOKENLIST_0 (MSHTML_DISPID_CUSTOM_MIN + (MSHTML_DISPID_CUSTOM_MAX+1 - MSHTML_DISPID_CUSTOM_MIN) / 2) + static inline struct token_list *token_list_from_DispatchEx(DispatchEx *iface) { return CONTAINING_RECORD(iface, struct token_list, dispex); @@ -7736,8 +7739,64 @@ static HRESULT token_list_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPP return S_OK; } +static HRESULT token_list_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, DISPID *dispid) +{ + WCHAR *end; + LONG idx; + ULONG i; + + idx = wcstol(name, &end, 10); + if(*end) + return DISP_E_UNKNOWNNAME; + + i = idx + DISPID_TOKENLIST_0 - MSHTML_DISPID_CUSTOM_MIN; + if(i > MSHTML_CUSTOM_DISPID_CNT) + return DISP_E_UNKNOWNNAME; + + *dispid = MSHTML_DISPID_CUSTOM_MIN + i; + return S_OK; +} + +static HRESULT token_list_get_name(DispatchEx *dispex, DISPID id, BSTR *name) +{ + LONG idx = id - MSHTML_DISPID_CUSTOM_MIN; + WCHAR buf[12]; + UINT len; + + len = swprintf(buf, ARRAY_SIZE(buf), L"%d", idx); + return (*name = SysAllocStringLen(buf, len)) ? S_OK : E_OUTOFMEMORY; +} + +static HRESULT token_list_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + struct token_list *token_list = token_list_from_DispatchEx(dispex); + + TRACE("(%p)->(%lx %lx %x %p %p %p %p)\n", token_list, id, lcid, flags, params, res, ei, caller); + + switch(flags) { + case DISPATCH_PROPERTYGET: + return token_list_item(&token_list->IWineDOMTokenList_iface, id - DISPID_TOKENLIST_0, res); + case DISPATCH_PROPERTYPUTREF|DISPATCH_PROPERTYPUT: + case DISPATCH_PROPERTYPUTREF: + case DISPATCH_PROPERTYPUT: + /* Ignored by IE */ + return S_OK; + case DISPATCH_METHOD|DISPATCH_PROPERTYGET: + case DISPATCH_METHOD: + return MSHTML_E_NOT_FUNC; + default: + break; + } + + return MSHTML_E_INVALID_ACTION; +} + static const dispex_static_data_vtbl_t token_list_dispex_vtbl = { - token_list_value + token_list_value, + token_list_get_dispid, + token_list_get_name, + token_list_invoke }; static const tid_t token_list_iface_tids[] = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 8a14d2ee47f..4bc492f7532 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -75,6 +75,7 @@ #define MSHTML_E_INVALID_PROPERTY 0x800a01b6 #define MSHTML_E_INVALID_ACTION 0x800a01bd #define MSHTML_E_NODOC 0x800a025c +#define MSHTML_E_NOT_FUNC 0x800a138a typedef struct DOMEvent DOMEvent; typedef struct HTMLDOMNode HTMLDOMNode; diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 8a60cb2e1e4..4f2d1a5edc5 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -840,6 +840,39 @@ sync_test("classList", function() { ok(classList.length === 2, "Expected length 2 for className ' testclass foobar ', got " + classList.length); ok(("" + classList) === " testclass foobar ", "Expected classList value ' testclass foobar ', got " + classList); ok(classList.toString() === " testclass foobar ", "Expected classList toString ' testclass foobar ', got " + classList.toString()); + + r = classList[-1]; + ok(r === null, "classList[-1] = " + r); + r = classList[0]; + ok(r === "testclass", "classList[0] = " + r); + r = classList[1]; + ok(r === "foobar", "classList[1] = " + r); + r = classList[2]; + ok(r === null, "classList[2] = " + r); + + classList[0] = "barfoo"; + classList[2] = "added"; + ok(classList.toString() === " testclass foobar ", "Expected classList toString to not be changed after setting indexed props, got " + classList.toString()); + + try + { + classList[0](); + ok(false, "Expected exception calling classList[0]"); + } + catch(e) + { + ok(e.number === 0xa138a - 0x80000000, "Calling classList[0] threw " + e.number); + } + + try + { + new classList[0](); + ok(false, "Expected exception calling classList[0] as constructor"); + } + catch(e) + { + ok(e.number === 0xa01bd - 0x80000000, "Calling classList[0] as constructor threw " + e.number); + } }); sync_test("importNode", function() {

1 0

Gabriel Ivăncescu : mshtml: Implement classList's item() method.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: e807da918ba6014e15000cd6ae364514dca5e88c URL: https://gitlab.winehq.org/wine/wine/-/commit/e807da918ba6014e15000cd6ae3645… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri May 26 17:04:39 2023 +0300 mshtml: Implement classList's item() method. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.js | 13 +++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index fd3cf149619..6f3d6c37aa4 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7635,10 +7635,53 @@ static HRESULT WINAPI token_list_get_length(IWineDOMTokenList *iface, LONG *p) static HRESULT WINAPI token_list_item(IWineDOMTokenList *iface, LONG index, VARIANT *p) { struct token_list *token_list = impl_from_IWineDOMTokenList(iface); + BSTR list, token = NULL; + unsigned i = 0; + HRESULT hres; + WCHAR *ptr; - FIXME("(%p)->(%ld %p)\n", token_list, index, p); + TRACE("(%p)->(%ld %p)\n", token_list, index, p); - return E_NOTIMPL; + hres = IHTMLElement_get_className(token_list->element, &list); + if(FAILED(hres)) + return hres; + + if(!list) { + V_VT(p) = VT_NULL; + return S_OK; + } + + ptr = list; + do { + while(iswspace(*ptr)) + ptr++; + if(!*ptr) + break; + if(i == index) { + token = ptr++; + while(*ptr && !iswspace(*ptr)) + ptr++; + token = SysAllocStringLen(token, ptr - token); + if(!token) { + SysFreeString(list); + return E_OUTOFMEMORY; + } + break; + } + i++; + ptr++; + while(*ptr && !iswspace(*ptr)) + ptr++; + } while(*ptr++); + + SysFreeString(list); + if(!token) + V_VT(p) = VT_NULL; + else { + V_VT(p) = VT_BSTR; + V_BSTR(p) = token; + } + return S_OK; } static HRESULT WINAPI token_list_toString(IWineDOMTokenList *iface, BSTR *String) diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 67eb702452d..8a60cb2e1e4 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -726,6 +726,19 @@ sync_test("classList", function() { ok(classList.contains("b") === true, "contains: expected 'b' to return true"); ok(classList.contains("d") === false, "contains: expected 'd' to return false"); + r = classList.item(-1); + ok(r === null, "item(-1) = " + r); + r = classList.item(0); + ok(r === "a", "item(0) = " + r); + r = classList.item(1); + ok(r === "b", "item(1) = " + r); + r = classList.item(2); + ok(r === "c", "item(2) = " + r); + r = classList.item(3); + ok(r === "4", "item(3) = " + r); + r = classList.item(4); + ok(r === null, "item(4) = " + r); + classList.remove("e"); ok(elem.className === "a b c 4", "remove: expected className 'a b c 4', got " + elem.className);

1 0

Gabriel Ivăncescu : mshtml: Implement classList's length prop.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: 808fcf23c78c30997fc4e44d4b201cf5a3c2ba71 URL: https://gitlab.winehq.org/wine/wine/-/commit/808fcf23c78c30997fc4e44d4b201c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri May 26 17:04:39 2023 +0300 mshtml: Implement classList's length prop. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 31 +++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.js | 5 +++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 807457b087b..fd3cf149619 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7599,10 +7599,37 @@ static HRESULT WINAPI token_list_contains(IWineDOMTokenList *iface, BSTR token, static HRESULT WINAPI token_list_get_length(IWineDOMTokenList *iface, LONG *p) { struct token_list *token_list = impl_from_IWineDOMTokenList(iface); + unsigned length = 0; + const WCHAR *ptr; + HRESULT hres; + BSTR list; - FIXME("(%p)->(%p)\n", token_list, p); + TRACE("(%p)->(%p)\n", token_list, p); - return E_NOTIMPL; + hres = IHTMLElement_get_className(token_list->element, &list); + if(FAILED(hres)) + return hres; + + if(!list) { + *p = 0; + return S_OK; + } + + ptr = list; + do { + while(iswspace(*ptr)) + ptr++; + if(!*ptr) + break; + length++; + ptr++; + while(*ptr && !iswspace(*ptr)) + ptr++; + } while(*ptr++); + + SysFreeString(list); + *p = length; + return S_OK; } static HRESULT WINAPI token_list_item(IWineDOMTokenList *iface, LONG index, VARIANT *p) diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index f373cfb11ea..67eb702452d 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -635,15 +635,19 @@ sync_test("classList", function() { classList.add("a"); ok(elem.className === "a", "Expected className 'a', got " + elem.className); + ok(classList.length === 1, "Expected length 1 for className 'a', got " + classList.length); classList.add("b"); ok(elem.className === "a b", "Expected className 'a b', got " + elem.className); + ok(classList.length === 2, "Expected length 2 for className 'a b', got " + classList.length); classList.add("c"); ok(elem.className === "a b c", "Expected className 'a b c', got " + elem.className); + ok(classList.length === 3, "Expected length 3 for className 'a b c', got " + classList.length); classList.add(4); ok(elem.className === "a b c 4", "Expected className 'a b c 4', got " + elem.className); + ok(classList.length === 4, "Expected length 4 for className 'a b c 4', got " + classList.length); classList.add("c"); ok(elem.className === "a b c 4", "(2) Expected className 'a b c 4', got " + elem.className); @@ -820,6 +824,7 @@ sync_test("classList", function() { ok(elem.className === "abc", "toggle('123', null): got className " + elem.className); elem.className = " testclass foobar "; + ok(classList.length === 2, "Expected length 2 for className ' testclass foobar ', got " + classList.length); ok(("" + classList) === " testclass foobar ", "Expected classList value ' testclass foobar ', got " + classList); ok(classList.toString() === " testclass foobar ", "Expected classList toString ' testclass foobar ', got " + classList.toString()); });

1 0

Gabriel Ivăncescu : mshtml: Implement classList's toggle() method.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: fcaa9bbedcddac34747359a290e470cace11660c URL: https://gitlab.winehq.org/wine/wine/-/commit/fcaa9bbedcddac34747359a290e470… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri May 26 17:04:39 2023 +0300 mshtml: Implement classList's toggle() method. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 23 ++++++++++---------- dlls/mshtml/tests/dom.js | 56 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 67 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 13941e98ee8..807457b087b 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7464,7 +7464,7 @@ static const WCHAR *find_token(const WCHAR *list, const WCHAR *token, unsigned i return NULL; } -static HRESULT token_list_add_remove(IWineDOMTokenList *iface, BSTR token, BOOL remove) +static HRESULT token_list_add_remove(IWineDOMTokenList *iface, BSTR token, BOOL remove, VARIANT_BOOL *toggle_ret) { struct token_list *token_list = impl_from_IWineDOMTokenList(iface); unsigned int i, len, old_len, new_len; @@ -7472,7 +7472,7 @@ static HRESULT token_list_add_remove(IWineDOMTokenList *iface, BSTR token, BOOL BSTR new, old; HRESULT hr; - TRACE("iface %p, token %s, remove %#x.\n", iface, debugstr_w(token), remove); + TRACE("token_list %p, token %s, remove %#x, toggle_ret %p.\n", token_list, debugstr_w(token), remove, toggle_ret); len = token ? lstrlenW(token) : 0; if (!len) @@ -7493,8 +7493,13 @@ static HRESULT token_list_add_remove(IWineDOMTokenList *iface, BSTR token, BOOL TRACE("old %s.\n", debugstr_w(old)); - if (((old_pos = find_token(old, token, len)) && !remove) - || (!old_pos && remove)) + old_pos = find_token(old, token, len); + if (toggle_ret) + { + remove = !!old_pos; + *toggle_ret = !remove; + } + else if (!!old_pos != remove) { SysFreeString(old); return S_OK; @@ -7553,21 +7558,17 @@ static HRESULT token_list_add_remove(IWineDOMTokenList *iface, BSTR token, BOOL static HRESULT WINAPI token_list_add(IWineDOMTokenList *iface, BSTR token) { - return token_list_add_remove(iface, token, FALSE); + return token_list_add_remove(iface, token, FALSE, NULL); } static HRESULT WINAPI token_list_remove(IWineDOMTokenList *iface, BSTR token) { - return token_list_add_remove(iface, token, TRUE); + return token_list_add_remove(iface, token, TRUE, NULL); } static HRESULT WINAPI token_list_toggle(IWineDOMTokenList *iface, BSTR token, VARIANT_BOOL *p) { - struct token_list *token_list = impl_from_IWineDOMTokenList(iface); - - FIXME("(%p)->(%s %p)\n", token_list, debugstr_w(token), p); - - return E_NOTIMPL; + return token_list_add_remove(iface, token, FALSE, p); } static HRESULT WINAPI token_list_contains(IWineDOMTokenList *iface, BSTR token, VARIANT_BOOL *p) diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 8f43b924a88..f373cfb11ea 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -623,7 +623,7 @@ sync_test("hasAttribute", function() { sync_test("classList", function() { var elem = document.createElement("div"); - var classList = elem.classList, i; + var classList = elem.classList, i, r; var props = [ "add", "contains", "item", "length", "remove", "toggle" ]; for(i = 0; i < props.length; i++) @@ -765,6 +765,60 @@ sync_test("classList", function() { classList.remove("b"); ok(elem.className === "", "remove: expected className '', got " + elem.className); + exception = false; + try + { + classList.toggle(); + } + catch(e) + { + exception = true; + } + ok(exception, "Expected exception for classList.toggle()"); + + exception = false; + try + { + classList.toggle(""); + } + catch(e) + { + exception = true; + } + ok(exception, "Expected exception for classList.toggle(\"\")"); + + exception = false; + try + { + classList.toggle("a b"); + } + catch(e) + { + exception = true; + } + ok(exception, "Expected exception for classList.toggle(\"a b\")"); + + // toggle's second arg is not implemented by IE, and ignored + r = classList.toggle("abc"); + ok(r === true, "toggle('abc') returned " + r); + ok(elem.className === "abc", "toggle('abc'): got className " + elem.className); + + r = classList.toggle("def", false); + ok(r === true, "toggle('def', false) returned " + r); + ok(elem.className === "abc def", "toggle('def', false): got className " + elem.className); + + r = classList.toggle("123", 1234); + ok(r === true, "toggle('123', 1234) returned " + r); + ok(elem.className === "abc def 123", "toggle('123', 1234): got className " + elem.className); + + r = classList.toggle("def", true); + ok(r === false, "toggle('def', true) returned " + r); + ok(elem.className === "abc 123", "toggle('def', true): got className " + elem.className); + + r = classList.toggle("123", null); + ok(r === false, "toggle('123', null) returned " + r); + ok(elem.className === "abc", "toggle('123', null): got className " + elem.className); + elem.className = " testclass foobar "; ok(("" + classList) === " testclass foobar ", "Expected classList value ' testclass foobar ', got " + classList); ok(classList.toString() === " testclass foobar ", "Expected classList toString ' testclass foobar ', got " + classList.toString());

1 0

Gabriel Ivăncescu : mshtml: Expose the other remaining props for element.classList.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: ced75455807b9d7ea8b693770db6eb3fb08e1d1d URL: https://gitlab.winehq.org/wine/wine/-/commit/ced75455807b9d7ea8b693770db6eb… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri May 26 17:04:38 2023 +0300 mshtml: Expose the other remaining props for element.classList. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 40 ++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private_iface.idl | 8 ++++++++ dlls/mshtml/tests/dom.js | 10 ++++++++- 3 files changed, 57 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 5cdb74c2051..42572637238 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7561,6 +7561,42 @@ static HRESULT WINAPI token_list_remove(IWineDOMTokenList *iface, BSTR token) return token_list_add_remove(iface, token, TRUE); } +static HRESULT WINAPI token_list_toggle(IWineDOMTokenList *iface, BSTR token, VARIANT_BOOL *p) +{ + struct token_list *token_list = impl_from_IWineDOMTokenList(iface); + + FIXME("(%p)->(%s %p)\n", token_list, debugstr_w(token), p); + + return E_NOTIMPL; +} + +static HRESULT WINAPI token_list_contains(IWineDOMTokenList *iface, BSTR token, VARIANT_BOOL *p) +{ + struct token_list *token_list = impl_from_IWineDOMTokenList(iface); + + FIXME("(%p)->(%s %p)\n", token_list, debugstr_w(token), p); + + return E_NOTIMPL; +} + +static HRESULT WINAPI token_list_get_length(IWineDOMTokenList *iface, LONG *p) +{ + struct token_list *token_list = impl_from_IWineDOMTokenList(iface); + + FIXME("(%p)->(%p)\n", token_list, p); + + return E_NOTIMPL; +} + +static HRESULT WINAPI token_list_item(IWineDOMTokenList *iface, LONG index, VARIANT *p) +{ + struct token_list *token_list = impl_from_IWineDOMTokenList(iface); + + FIXME("(%p)->(%ld %p)\n", token_list, index, p); + + return E_NOTIMPL; +} + static HRESULT WINAPI token_list_toString(IWineDOMTokenList *iface, BSTR *String) { struct token_list *token_list = impl_from_IWineDOMTokenList(iface); @@ -7580,6 +7616,10 @@ static const IWineDOMTokenListVtbl WineDOMTokenListVtbl = { token_list_Invoke, token_list_add, token_list_remove, + token_list_toggle, + token_list_contains, + token_list_get_length, + token_list_item, token_list_toString }; diff --git a/dlls/mshtml/mshtml_private_iface.idl b/dlls/mshtml/mshtml_private_iface.idl index 8e4a64bda39..c0bb30fbbc8 100644 --- a/dlls/mshtml/mshtml_private_iface.idl +++ b/dlls/mshtml/mshtml_private_iface.idl @@ -159,6 +159,14 @@ interface IWineDOMTokenList : IDispatch [id(2)] HRESULT remove([in] BSTR token); [id(3)] + HRESULT toggle([in] BSTR token, [retval, out] VARIANT_BOOL *p); + [id(4)] + HRESULT contains([in] BSTR token, [retval, out] VARIANT_BOOL *p); + [propget, id(5)] + HRESULT length([retval, out] LONG *p); + [id(6)] + HRESULT item([in] LONG index, [retval, out] VARIANT *p); + [id(7)] HRESULT toString([retval, out] BSTR *String); } diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index e5a07027f7c..85890074431 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -623,7 +623,15 @@ sync_test("hasAttribute", function() { sync_test("classList", function() { var elem = document.createElement("div"); - var classList = elem.classList; + var classList = elem.classList, i; + + var props = [ "add", "contains", "item", "length", "remove", "toggle" ]; + for(i = 0; i < props.length; i++) + ok(props[i] in classList, props[i] + " not found in classList."); + + props = [ "entries", "forEach", "keys", "replace", "supports", "value", "values"]; + for(i = 0; i < props.length; i++) + ok(!(props[i] in classList), props[i] + " found in classList."); classList.add("a"); ok(elem.className === "a", "Expected className 'a', got " + elem.className);

1 0

Gabriel Ivăncescu : mshtml: Implement classList's contains() method.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: 59f7fbeeb01ac75ad723ffedf6e071f60baf3738 URL: https://gitlab.winehq.org/wine/wine/-/commit/59f7fbeeb01ac75ad723ffedf6e071… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri May 26 17:04:38 2023 +0300 mshtml: Implement classList's contains() method. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 20 ++++++++++++++++++-- dlls/mshtml/tests/dom.js | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 42572637238..13941e98ee8 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7573,10 +7573,26 @@ static HRESULT WINAPI token_list_toggle(IWineDOMTokenList *iface, BSTR token, VA static HRESULT WINAPI token_list_contains(IWineDOMTokenList *iface, BSTR token, VARIANT_BOOL *p) { struct token_list *token_list = impl_from_IWineDOMTokenList(iface); + unsigned len; + HRESULT hres; + BSTR list; - FIXME("(%p)->(%s %p)\n", token_list, debugstr_w(token), p); + TRACE("(%p)->(%s %p)\n", token_list, debugstr_w(token), p); - return E_NOTIMPL; + if(!token || !*token) + return E_INVALIDARG; + + for(len = 0; token[len]; len++) + if(iswspace(token[len])) + return E_INVALIDARG; + + hres = IHTMLElement_get_className(token_list->element, &list); + if(FAILED(hres)) + return hres; + + *p = find_token(list, token, len) ? VARIANT_TRUE : VARIANT_FALSE; + SysFreeString(list); + return S_OK; } static HRESULT WINAPI token_list_get_length(IWineDOMTokenList *iface, LONG *p) diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 85890074431..8f43b924a88 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -685,6 +685,43 @@ sync_test("classList", function() { } ok(exception, "Expected exception for classList.add(\"e f\")"); + exception = false; + try + { + classList.contains(); + } + catch(e) + { + exception = true; + } + ok(exception, "Expected exception for classList.contains()"); + + exception = false; + try + { + classList.contains(""); + } + catch(e) + { + exception = true; + } + ok(exception, "Expected exception for classList.contains(\"\")"); + + exception = false; + try + { + classList.contains("a b"); + } + catch(e) + { + exception = true; + } + ok(exception, "Expected exception for classList.contains(\"a b\")"); + + ok(classList.contains("4") === true, "contains: expected '4' to return true"); + ok(classList.contains("b") === true, "contains: expected 'b' to return true"); + ok(classList.contains("d") === false, "contains: expected 'd' to return false"); + classList.remove("e"); ok(elem.className === "a b c 4", "remove: expected className 'a b c 4', got " + elem.className);

1 0

Alexandre Julliard : ntdll: Allocate the ARM64EC code map when the first ARM64X binary is loaded.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: 71d9f327f02156a9dff72f02faf494f452a9995f URL: https://gitlab.winehq.org/wine/wine/-/commit/71d9f327f02156a9dff72f02faf494… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 17:15:18 2023 +0200 ntdll: Allocate the ARM64EC code map when the first ARM64X binary is loaded. --- dlls/ntdll/unix/env.c | 1 - dlls/ntdll/unix/unix_private.h | 1 - dlls/ntdll/unix/virtual.c | 39 +++++++++++++++++++-------------------- 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 30782a70eb0..fd505a7d2c2 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1869,7 +1869,6 @@ static void init_peb( RTL_USER_PROCESS_PARAMETERS *params, void *module ) break; case IMAGE_FILE_MACHINE_AMD64: if (main_image_info.Machine == current_machine) break; - peb->EcCodeBitMap = virtual_alloc_arm64ec_map(); ERR( "starting %s in experimental ARM64EC mode\n", debugstr_us(&params->ImagePathName) ); break; } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 2b19b8af3d2..9b69c71209a 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -233,7 +233,6 @@ extern void virtual_free_teb( TEB *teb ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_clear_tls_index( ULONG index ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, ULONG_PTR limit, SIZE_T reserve_size, SIZE_T commit_size, BOOL guard_page ) DECLSPEC_HIDDEN; -extern void *virtual_alloc_arm64ec_map(void) DECLSPEC_HIDDEN; extern void virtual_map_user_shared_data(void) DECLSPEC_HIDDEN; extern NTSTATUS virtual_handle_fault( void *addr, DWORD err, void *stack ) DECLSPEC_HIDDEN; extern unsigned int virtual_locked_server_call( void *req_ptr ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 92ee61e6353..2d0dda64249 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2383,6 +2383,23 @@ static NTSTATUS map_pe_header( void *ptr, size_t size, int fd, BOOL *removable ) #ifdef __aarch64__ +/*********************************************************************** + * alloc_arm64ec_map + */ +static void alloc_arm64ec_map(void) +{ + SIZE_T size = ((ULONG_PTR)user_space_limit + page_size) >> (page_shift + 3); /* one bit per page */ + unsigned int status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&arm64ec_map, 0, &size, + MEM_COMMIT, PAGE_READWRITE ); + if (status) + { + ERR( "failed to allocate ARM64EC map: %08x\n", status ); + exit(1); + } + peb->EcCodeBitMap = arm64ec_map; +} + + /*********************************************************************** * apply_arm64x_relocations */ @@ -2449,8 +2466,9 @@ static void update_arm64x_mapping( char *base, IMAGE_NT_HEADERS *nt, IMAGE_SECTI if (size <= offsetof( IMAGE_LOAD_CONFIG_DIRECTORY, CHPEMetadataPointer )) return; if (!cfg->CHPEMetadataPointer) return; + if (!arm64ec_map) alloc_arm64ec_map(); metadata = (void *)(base + (cfg->CHPEMetadataPointer - nt->OptionalHeader.ImageBase)); - if (metadata->CodeMap && arm64ec_map) + if (metadata->CodeMap) { const IMAGE_CHPE_RANGE_ENTRY *map = (void *)(base + metadata->CodeMap); @@ -3523,25 +3541,6 @@ done: } -/*********************************************************************** - * virtual_alloc_arm64ec_map - */ -void *virtual_alloc_arm64ec_map(void) -{ -#ifdef __aarch64__ - SIZE_T size = ((ULONG_PTR)user_space_limit + page_size) >> (page_shift + 3); /* one bit per page */ - unsigned int status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&arm64ec_map, 0, &size, - MEM_COMMIT, PAGE_READWRITE ); - if (status) - { - ERR( "failed to allocate ARM64EC map: %08x\n", status ); - exit(1); - } -#endif - return arm64ec_map; -} - - /*********************************************************************** * virtual_map_user_shared_data */

1 0

Alexandre Julliard : ntdll: Also update the entry point address when loading an ARM64X binary.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: 30040cc9d7d87338fe00150fec85adf4e01e65d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/30040cc9d7d87338fe00150fec85ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 16:52:23 2023 +0200 ntdll: Also update the entry point address when loading an ARM64X binary. --- dlls/ntdll/unix/virtual.c | 5 ++++- include/wine/server_protocol.h | 5 +++-- server/mapping.c | 3 ++- server/protocol.def | 1 + server/request.h | 3 ++- server/trace.c | 1 + 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 6835f9cd645..92ee61e6353 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2677,7 +2677,9 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena (!machine && main_image_info.Machine == IMAGE_FILE_MACHINE_AMD64)) { update_arm64x_mapping( ptr, nt, sections ); - image_info->machine = nt->FileHeader.Machine; /* reload changed machine from NT header */ + /* reload changed data from NT header */ + image_info->machine = nt->FileHeader.Machine; + image_info->entry_point = nt->OptionalHeader.AddressOfEntryPoint; } #endif if (machine && machine != nt->FileHeader.Machine) return STATUS_NOT_SUPPORTED; @@ -2810,6 +2812,7 @@ static NTSTATUS virtual_map_image( HANDLE mapping, void **addr_ptr, SIZE_T *size req->mapping = wine_server_obj_handle( mapping ); req->base = wine_server_client_ptr( view->base ); req->size = size; + req->entry = image_info->entry_point; req->machine = image_info->machine; status = wine_server_call( req ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 45a50106408..87626aaf051 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1998,8 +1998,9 @@ struct map_image_view_request obj_handle_t mapping; client_ptr_t base; mem_size_t size; + unsigned int entry; unsigned short machine; - char __pad_34[6]; + char __pad_38[2]; }; struct map_image_view_reply { @@ -6414,7 +6415,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 769 +#define SERVER_PROTOCOL_VERSION 770 /* ### protocol_version end ### */ diff --git a/server/mapping.c b/server/mapping.c index bcb05ec8f8f..e730486ac77 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -1270,7 +1270,8 @@ DECL_HANDLER(map_image_view) view->committed = NULL; view->shared = mapping->shared ? (struct shared_map *)grab_object( mapping->shared ) : NULL; view->image = mapping->image; - view->image.machine = req->machine; + view->image.machine = req->machine; + view->image.entry_point = req->entry; add_process_view( current, view ); if (view->base != mapping->image.base) set_error( STATUS_IMAGE_NOT_AT_BASE ); diff --git a/server/protocol.def b/server/protocol.def index 95ddb1d5011..1c492ea5cc2 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1612,6 +1612,7 @@ enum server_fd_type obj_handle_t mapping; /* file mapping handle */ client_ptr_t base; /* view base address (page-aligned) */ mem_size_t size; /* view size */ + unsigned int entry; /* entry point in mapped view */ unsigned short machine; /* machine in the mapped view */ @END diff --git a/server/request.h b/server/request.h index bb1863b2b85..c7288255aa3 100644 --- a/server/request.h +++ b/server/request.h @@ -1126,7 +1126,8 @@ C_ASSERT( sizeof(struct map_view_request) == 48 ); C_ASSERT( FIELD_OFFSET(struct map_image_view_request, mapping) == 12 ); C_ASSERT( FIELD_OFFSET(struct map_image_view_request, base) == 16 ); C_ASSERT( FIELD_OFFSET(struct map_image_view_request, size) == 24 ); -C_ASSERT( FIELD_OFFSET(struct map_image_view_request, machine) == 32 ); +C_ASSERT( FIELD_OFFSET(struct map_image_view_request, entry) == 32 ); +C_ASSERT( FIELD_OFFSET(struct map_image_view_request, machine) == 36 ); C_ASSERT( sizeof(struct map_image_view_request) == 40 ); C_ASSERT( sizeof(struct map_builtin_view_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct unmap_view_request, base) == 16 ); diff --git a/server/trace.c b/server/trace.c index 93c98b85590..007c0b578f5 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2185,6 +2185,7 @@ static void dump_map_image_view_request( const struct map_image_view_request *re fprintf( stderr, " mapping=%04x", req->mapping ); dump_uint64( ", base=", &req->base ); dump_uint64( ", size=", &req->size ); + fprintf( stderr, ", entry=%08x", req->entry ); fprintf( stderr, ", machine=%04x", req->machine ); }

1 0

Jacek Caban : win32u: Use syscall interface for all ntgdi functions.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: c73684e533824217a0e37d66af2a4dfcee5c1c02 URL: https://gitlab.winehq.org/wine/wine/-/commit/c73684e533824217a0e37d66af2a4d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 1 01:07:48 2022 +0200 win32u: Use syscall interface for all ntgdi functions. --- dlls/win32u/gdiobj.c | 11 ---- dlls/win32u/syscall.c | 11 ++++ dlls/win32u/win32u.spec | 22 ++++---- dlls/win32u/win32u_private.h | 13 ----- dlls/win32u/wrappers.c | 69 ------------------------- dlls/wow64win/gdi.c | 119 +++++++++++++++++++++++++++++++++++++++---- dlls/wow64win/syscall.h | 11 ++++ 7 files changed, 143 insertions(+), 113 deletions(-)

1 0