April 2021 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Use Gecko attributes for non-HTML elements IHTMLElement::title implementation.
by Alexandre Julliard 23 Apr '21

23 Apr '21

Module: wine Branch: master Commit: 83fc6f0ee3041e39cda7aa948e9f6b85e9f9fbb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83fc6f0ee3041e39cda7aa94… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 23 19:39:58 2021 +0200 mshtml: Use Gecko attributes for non-HTML elements IHTMLElement::title implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 10 ++++++++-- dlls/mshtml/tests/documentmode.js | 1 + dlls/mshtml/tests/dom.js | 10 ++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 930568ab2c0..b71d7ed3fa5 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1318,7 +1318,7 @@ static HRESULT WINAPI HTMLElement_put_title(IHTMLElement *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - if(!This->html_element) { + if(!This->dom_element) { VARIANT *var; HRESULT hres; @@ -1332,6 +1332,9 @@ static HRESULT WINAPI HTMLElement_put_title(IHTMLElement *iface, BSTR v) return S_OK; } + if(!This->html_element) + return elem_string_attr_setter(This, L"title", v); + nsAString_InitDepend(&title_str, v); nsres = nsIDOMHTMLElement_SetTitle(This->html_element, &title_str); nsAString_Finish(&title_str); @@ -1349,7 +1352,7 @@ static HRESULT WINAPI HTMLElement_get_title(IHTMLElement *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - if(!This->html_element) { + if(!This->dom_element) { VARIANT *var; HRESULT hres; @@ -1366,6 +1369,9 @@ static HRESULT WINAPI HTMLElement_get_title(IHTMLElement *iface, BSTR *p) return S_OK; } + if(!This->html_element) + return elem_string_attr_getter(This, L"title", FALSE, p); + nsAString_Init(&title_str, NULL); nsres = nsIDOMHTMLElement_GetTitle(This->html_element, &title_str); return return_nsstr(nsres, &title_str, p); diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 7074b1f62f2..9cb9c6058a0 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -34,6 +34,7 @@ sync_test("elem_props", function() { test_exposed("doScroll", v < 11); test_exposed("readyState", v < 11); test_exposed("clientTop", true); + test_exposed("title", true); test_exposed("querySelectorAll", v >= 8); test_exposed("textContent", v >= 9); test_exposed("prefix", v >= 9); diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index b30d1a8fbed..f9d0873bb89 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -458,3 +458,13 @@ async_test("animation_frame", function() { }); ok(typeof(id) === "number", "id = " + id); }); + +sync_test("title", function() { + var elem = document.createElement("div"); + ok(elem.title === "", "div.title = " + elem.title); + todo_wine. + ok(elem.getAttribute("title") === null, "title attribute = " + elem.getAttribute("title")); + elem.title = "test"; + ok(elem.title === "test", "div.title = " + elem.title); + ok(elem.getAttribute("title") === "test", "title attribute = " + elem.getAttribute("title")); +});

1 0

Jacek Caban : mshtml: Add IHTMLElement6::hasAttribute implementation.
by Alexandre Julliard 23 Apr '21

23 Apr '21

Module: wine Branch: master Commit: 696e8faaa914e2de645de8e9c79e025471f9f62a URL: https://source.winehq.org/git/wine.git/?a=commit;h=696e8faaa914e2de645de8e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 23 19:40:03 2021 +0200 mshtml: Add IHTMLElement6::hasAttribute implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 25 ++++++++++++++++++++++--- dlls/mshtml/tests/dom.js | 20 ++++++++++++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index b71d7ed3fa5..ea6f7cd64c6 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -202,6 +202,22 @@ HRESULT elem_string_attr_setter(HTMLElement *elem, const WCHAR *name, const WCHA return S_OK; } +static VARIANT_BOOL element_has_attribute(HTMLElement *element, const WCHAR *name) +{ + nsAString name_str; + cpp_bool r; + nsresult nsres; + + if(!element->dom_element) { + WARN("no DOM element\n"); + return VARIANT_FALSE; + } + + nsAString_InitDepend(&name_str, name); + nsres = nsIDOMElement_HasAttribute(element->dom_element, &name_str, &r); + return variant_bool(NS_SUCCEEDED(nsres) && r); +} + HRESULT get_readystate_string(READYSTATE readystate, BSTR *p) { static const LPCWSTR readystate_strs[] = { @@ -4453,11 +4469,14 @@ static HRESULT WINAPI HTMLElement6_removeAttributeNode(IHTMLElement6 *iface, IHT return E_NOTIMPL; } -static HRESULT WINAPI HTMLElement6_hasAttribute(IHTMLElement6 *iface, BSTR name, VARIANT_BOOL *pfHasAttribute) +static HRESULT WINAPI HTMLElement6_hasAttribute(IHTMLElement6 *iface, BSTR name, VARIANT_BOOL *p) { HTMLElement *This = impl_from_IHTMLElement6(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(name), pfHasAttribute); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), p); + + *p = element_has_attribute(This, name); + return S_OK; } static HRESULT WINAPI HTMLElement6_getElementsByTagNameNS(IHTMLElement6 *iface, VARIANT *varNS, BSTR bstrLocalName, IHTMLElementCollection **pelColl) diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index f9d0873bb89..9edaf9befbc 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -468,3 +468,23 @@ sync_test("title", function() { ok(elem.title === "test", "div.title = " + elem.title); ok(elem.getAttribute("title") === "test", "title attribute = " + elem.getAttribute("title")); }); + +sync_test("hasAttribute", function() { + document.body.innerHTML = '<div attr="test"></div>'; + var elem = document.body.firstChild, r; + + r = elem.hasAttribute("attr"); + ok(r === true, "hasAttribute(attr) returned " + r); + r = elem.hasAttribute("attr2"); + ok(r === false, "hasAttribute(attr2) returned " + r); + + elem.setAttribute("attr2", "abc"); + r = elem.hasAttribute("attr2"); + todo_wine. + ok(r === true, "hasAttribute(attr2) returned " + r); + + elem.removeAttribute("attr"); + r = elem.hasAttribute("attr"); + todo_wine. + ok(r === false, "hasAttribute(attr) returned " + r); +});

1 0

Jacek Caban : mshtml: Reimplement IHTMLElement3::disabled property on top of Gecko attributes.
by Alexandre Julliard 23 Apr '21

23 Apr '21

Module: wine Branch: master Commit: 7eb05c759049ae71a8002e03381d16445acc7c4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7eb05c759049ae71a8002e03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 23 19:40:08 2021 +0200 mshtml: Reimplement IHTMLElement3::disabled property on top of Gecko attributes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 45 +++++++++++++++++++-------------------------- dlls/mshtml/tests/dom.js | 28 ++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index ea6f7cd64c6..011a06298c2 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -218,6 +218,22 @@ static VARIANT_BOOL element_has_attribute(HTMLElement *element, const WCHAR *nam return variant_bool(NS_SUCCEEDED(nsres) && r); } +static HRESULT element_remove_attribute(HTMLElement *element, const WCHAR *name) +{ + nsAString name_str; + nsresult nsres; + + if(!element->dom_element) { + WARN("no DOM element\n"); + return S_OK; + } + + nsAString_InitDepend(&name_str, name); + nsres = nsIDOMElement_RemoveAttribute(element->dom_element, &name_str); + nsAString_Finish(&name_str); + return map_nsresult(nsres); +} + HRESULT get_readystate_string(READYSTATE readystate, BSTR *p) { static const LPCWSTR readystate_strs[] = { @@ -3775,49 +3791,26 @@ static HRESULT WINAPI HTMLElement3_get_hideFocus(IHTMLElement3 *iface, VARIANT_B static HRESULT WINAPI HTMLElement3_put_disabled(IHTMLElement3 *iface, VARIANT_BOOL v) { HTMLElement *This = impl_from_IHTMLElement3(iface); - VARIANT *var; - HRESULT hres; TRACE("(%p)->(%x)\n", This, v); if(This->node.vtbl->put_disabled) return This->node.vtbl->put_disabled(&This->node, v); - hres = dispex_get_dprop_ref(&This->node.event_target.dispex, L"disabled", TRUE, &var); - if(FAILED(hres)) - return hres; - - VariantClear(var); - V_VT(var) = VT_BOOL; - V_BOOL(var) = v; - return S_OK; + if(!v) return element_remove_attribute(This, L"disabled"); + return elem_string_attr_setter(This, L"disabled", L""); } static HRESULT WINAPI HTMLElement3_get_disabled(IHTMLElement3 *iface, VARIANT_BOOL *p) { HTMLElement *This = impl_from_IHTMLElement3(iface); - VARIANT *var; - HRESULT hres; TRACE("(%p)->(%p)\n", This, p); if(This->node.vtbl->get_disabled) return This->node.vtbl->get_disabled(&This->node, p); - hres = dispex_get_dprop_ref(&This->node.event_target.dispex, L"disabled", FALSE, &var); - if(hres == DISP_E_UNKNOWNNAME) { - *p = VARIANT_FALSE; - return S_OK; - } - if(FAILED(hres)) - return hres; - - if(V_VT(var) != VT_BOOL) { - FIXME("value is %s\n", debugstr_variant(var)); - return E_NOTIMPL; - } - - *p = V_BOOL(var); + *p = variant_bool(element_has_attribute(This, L"disabled")); return S_OK; } diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 9edaf9befbc..6a84dd3a032 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -469,6 +469,34 @@ sync_test("title", function() { ok(elem.getAttribute("title") === "test", "title attribute = " + elem.getAttribute("title")); }); +sync_test("disabled", function() { + var elem = document.createElement("div"); + document.body.appendChild(elem); + ok(elem.disabled === false, "div.disabled = " + elem.disabled); + todo_wine. + ok(elem.getAttribute("disabled") === null, "disabled attribute = " + elem.getAttribute("disabled") + " expected null"); + + elem.disabled = true; + ok(elem.disabled === true, "div.disabled = " + elem.disabled); + todo_wine. + ok(elem.getAttribute("disabled") === "", "disabled attribute = " + elem.getAttribute("disabled") + " expected \"\""); + + elem.disabled = false; + ok(elem.disabled === false, "div.disabled = " + elem.disabled); + todo_wine. + ok(elem.getAttribute("disabled") === null, "disabled attribute = " + elem.getAttribute("disabled") + " expected null"); + + elem.setAttribute("disabled", "false"); + ok(elem.disabled === true, "div.disabled = " + elem.disabled); + todo_wine. + ok(elem.getAttribute("disabled") === "false", "disabled attribute = " + elem.getAttribute("disabled")); + + elem.removeAttribute("disabled"); + ok(elem.disabled === false, "div.disabled = " + elem.disabled); + todo_wine. + ok(elem.getAttribute("disabled") === null, "disabled attribute = " + elem.getAttribute("disabled") + " expected null"); +}); + sync_test("hasAttribute", function() { document.body.innerHTML = '<div attr="test"></div>'; var elem = document.body.firstChild, r;

1 0

Jacek Caban : mshtml: Use Gecko attributes for getAttribute, setAttribute and removeAttribute implementation in IE8+ mode.
by Alexandre Julliard 23 Apr '21

23 Apr '21

Module: wine Branch: master Commit: 10e7ead350d9bb896450fb6f6940190ca21d5b6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=10e7ead350d9bb896450fb6f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 23 19:40:14 2021 +0200 mshtml: Use Gecko attributes for getAttribute, setAttribute and removeAttribute implementation in IE8+ mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 31 +++++++++++++++++++++++++++++++ dlls/mshtml/tests/documentmode.js | 30 ++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.js | 8 -------- 3 files changed, 61 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 011a06298c2..8187cbf867e 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -871,6 +871,23 @@ static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttr TRACE("(%p)->(%s %s %08x)\n", This, debugstr_w(strAttributeName), debugstr_variant(&AttributeValue), lFlags); + if(This->dom_element && dispex_compat_mode(&This->node.event_target.dispex) >= COMPAT_MODE_IE8) { + nsAString name_str, value_str; + nsresult nsres; + + hres = variant_to_nsstr(&AttributeValue, FALSE, &value_str); + if(FAILED(hres)) + return hres; + + nsAString_InitDepend(&name_str, strAttributeName); + nsres = nsIDOMElement_SetAttribute(This->dom_element, &name_str, &value_str); + nsAString_Finish(&name_str); + nsAString_Finish(&value_str); + if(NS_FAILED(nsres)) + WARN("SetAttribute failed: %08x\n", nsres); + return map_nsresult(nsres); + } + hres = IDispatchEx_GetDispID(&This->node.event_target.dispex.IDispatchEx_iface, strAttributeName, (lFlags&ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive) | fdexNameEnsure, &dispid); if(FAILED(hres)) @@ -927,6 +944,17 @@ static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttr if(lFlags & ~(ATTRFLAG_CASESENSITIVE|ATTRFLAG_ASSTRING)) FIXME("Unsupported flags %x\n", lFlags); + if(This->dom_element && dispex_compat_mode(&This->node.event_target.dispex) >= COMPAT_MODE_IE8) { + nsAString name_str, value_str; + nsresult nsres; + + nsAString_InitDepend(&name_str, strAttributeName); + nsAString_InitDepend(&value_str, NULL); + nsres = nsIDOMElement_GetAttribute(This->dom_element, &name_str, &value_str); + nsAString_Finish(&name_str); + return return_nsstr_variant(nsres, &value_str, 0, AttributeValue); + } + hres = IDispatchEx_GetDispID(&This->node.event_target.dispex.IDispatchEx_iface, strAttributeName, lFlags&ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &dispid); if(hres == DISP_E_UNKNOWNNAME) { @@ -954,6 +982,9 @@ static HRESULT WINAPI HTMLElement_removeAttribute(IHTMLElement *iface, BSTR strA TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(strAttributeName), lFlags, pfSuccess); + if(dispex_compat_mode(&This->node.event_target.dispex) >= COMPAT_MODE_IE8) + return element_remove_attribute(This, strAttributeName); + hres = IDispatchEx_GetDispID(&This->node.event_target.dispex.IDispatchEx_iface, strAttributeName, lFlags&ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &id); if(hres == DISP_E_UNKNOWNNAME) { diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 9cb9c6058a0..d46da5d44a0 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -622,3 +622,33 @@ sync_test("set_obj", function() { r = Object.prototype.toString.call(s); ok(r === "[object Object]", "toString returned " + r); }); + +sync_test("elem_attr", function() { + var v = document.documentMode; + var elem = document.createElement("div"), r; + + r = elem.getAttribute("class"); + ok(r === null, "class attr = " + r); + r = elem.getAttribute("className"); + ok(r === (v < 8 ? "" : null), "className attr = " + r); + + elem.className = "cls"; + r = elem.getAttribute("class"); + ok(r === (v < 8 ? null : "cls"), "class attr = " + r); + r = elem.getAttribute("className"); + ok(r === (v < 8 ? "cls" : null), "className attr = " + r); + + elem.setAttribute("class", "cls2"); + ok(elem.className === (v < 8 ? "cls" : "cls2"), "elem.className = " + elem.className); + r = elem.getAttribute("class"); + ok(r === "cls2", "class attr = " + r); + r = elem.getAttribute("className"); + ok(r === (v < 8 ? "cls" : null), "className attr = " + r); + + elem.setAttribute("className", "cls3"); + ok(elem.className === (v < 8 ? "cls3" : "cls2"), "elem.className = " + elem.className); + r = elem.getAttribute("class"); + ok(r === "cls2", "class attr = " + r); + r = elem.getAttribute("className"); + ok(r === "cls3", "className attr = " + r); +}); diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 6a84dd3a032..d171b516cfd 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -462,7 +462,6 @@ async_test("animation_frame", function() { sync_test("title", function() { var elem = document.createElement("div"); ok(elem.title === "", "div.title = " + elem.title); - todo_wine. ok(elem.getAttribute("title") === null, "title attribute = " + elem.getAttribute("title")); elem.title = "test"; ok(elem.title === "test", "div.title = " + elem.title); @@ -473,27 +472,22 @@ sync_test("disabled", function() { var elem = document.createElement("div"); document.body.appendChild(elem); ok(elem.disabled === false, "div.disabled = " + elem.disabled); - todo_wine. ok(elem.getAttribute("disabled") === null, "disabled attribute = " + elem.getAttribute("disabled") + " expected null"); elem.disabled = true; ok(elem.disabled === true, "div.disabled = " + elem.disabled); - todo_wine. ok(elem.getAttribute("disabled") === "", "disabled attribute = " + elem.getAttribute("disabled") + " expected \"\""); elem.disabled = false; ok(elem.disabled === false, "div.disabled = " + elem.disabled); - todo_wine. ok(elem.getAttribute("disabled") === null, "disabled attribute = " + elem.getAttribute("disabled") + " expected null"); elem.setAttribute("disabled", "false"); ok(elem.disabled === true, "div.disabled = " + elem.disabled); - todo_wine. ok(elem.getAttribute("disabled") === "false", "disabled attribute = " + elem.getAttribute("disabled")); elem.removeAttribute("disabled"); ok(elem.disabled === false, "div.disabled = " + elem.disabled); - todo_wine. ok(elem.getAttribute("disabled") === null, "disabled attribute = " + elem.getAttribute("disabled") + " expected null"); }); @@ -508,11 +502,9 @@ sync_test("hasAttribute", function() { elem.setAttribute("attr2", "abc"); r = elem.hasAttribute("attr2"); - todo_wine. ok(r === true, "hasAttribute(attr2) returned " + r); elem.removeAttribute("attr"); r = elem.hasAttribute("attr"); - todo_wine. ok(r === false, "hasAttribute(attr) returned " + r); });

1 0

Alexandre Julliard : Release 6.7.
by Alexandre Julliard 23 Apr '21

23 Apr '21

Module: wine Branch: master Commit: c0af8b73725d2670c9b018a255c503dee6912cf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0af8b73725d2670c9b018a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 23 22:18:43 2021 +0200 Release 6.7. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 951 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 520 insertions(+), 452 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c0af8b73725d2670c9b0…

1 0

Tag wine-6.7 : Alexandre Julliard : Release 6.7
by Alexandre Julliard 23 Apr '21

23 Apr '21

Module: wine Branch: refs/tags/wine-6.7 Tag: 4f41ef6f104ffdf34c747508132f1f43b3705f9f URL: https://source.winehq.org/git/wine.git/?a=tag;h=4f41ef6f104ffdf34c747508132… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 23 22:18:43 2021 +0200 Release 6.7

1 0

Alexandre Julliard : server: Get rid of the remaining PowerPC support.
by Alexandre Julliard 23 Apr '21

23 Apr '21

Module: wine Branch: master Commit: 191fd47e386b89089d45dee1a554231c32913802 URL: https://source.winehq.org/git/wine.git/?a=commit;h=191fd47e386b89089d45dee1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 23 12:39:48 2021 +0200 server: Get rid of the remaining PowerPC support. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 3 --- dlls/ntdll/unix/process.c | 2 +- dlls/ntdll/unix/server.c | 2 +- include/wine/server_protocol.h | 8 ++------ server/mapping.c | 3 --- server/protocol.def | 6 +----- server/thread.c | 3 --- server/trace.c | 21 --------------------- 8 files changed, 5 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=191fd47e386b89089d45…

1 0

Alexandre Julliard : server: Return a list of supported machines instead of a CPU bitmask.
by Alexandre Julliard 23 Apr '21

23 Apr '21

Module: wine Branch: master Commit: 96865eb7e73fb4e5a1a566c1b15c4b6c807eaffc URL: https://source.winehq.org/git/wine.git/?a=commit;h=96865eb7e73fb4e5a1a566c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 23 11:58:32 2021 +0200 server: Return a list of supported machines instead of a CPU bitmask. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/process.c | 2 +- dlls/ntdll/unix/server.c | 51 ++++++++++++++++++++++++------------------ dlls/ntdll/unix/unix_private.h | 3 ++- include/wine/server_protocol.h | 5 +++-- server/object.h | 2 ++ server/protocol.def | 2 +- server/registry.c | 27 ++++++++++++++++++++++ server/request.h | 1 - server/thread.c | 5 ++--- server/trace.c | 17 +++++++++++++- 10 files changed, 83 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=96865eb7e73fb4e5a1a5…

1 0

Alexandre Julliard : server: Return the process machine from the main exe instead of a CPU flag.
by Alexandre Julliard 23 Apr '21

23 Apr '21

Module: wine Branch: master Commit: a51f26badfe6b3c23dd569b0540801a622e3bde5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a51f26badfe6b3c23dd569b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 23 12:14:04 2021 +0200 server: Return the process machine from the main exe instead of a CPU flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/process.c | 3 ++- include/wine/server_protocol.h | 6 +++--- server/mapping.c | 1 + server/process.c | 2 +- server/process.h | 3 ++- server/protocol.def | 2 +- server/request.h | 2 +- server/trace.c | 2 +- 8 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 6112dd74c4a..6347d9d7c27 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1259,7 +1259,8 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class { req->handle = wine_server_obj_handle( handle ); if (!(ret = wine_server_call( req ))) - val = (reply->cpu != CPU_x86_64 && reply->cpu != CPU_ARM64); + val = (reply->machine != IMAGE_FILE_MACHINE_AMD64 && + reply->machine != IMAGE_FILE_MACHINE_ARM64); } SERVER_END_REQ; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index a0300dc0d31..e9fbc2cca24 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1010,9 +1010,9 @@ struct get_process_info_reply timeout_t end_time; int exit_code; int priority; - client_cpu_t cpu; + unsigned short machine; /* VARARG(image,pe_image_info); */ - char __pad_60[4]; + char __pad_58[6]; }; @@ -6219,7 +6219,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 693 +#define SERVER_PROTOCOL_VERSION 694 /* ### protocol_version end ### */ diff --git a/server/mapping.c b/server/mapping.c index 8ac3189f9a4..3c4b707f282 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -362,6 +362,7 @@ static void add_process_view( struct thread *thread, struct memory_view *view ) else if (!(view->image.image_charact & IMAGE_FILE_DLL)) { /* main exe */ + process->machine = view->image.machine; list_add_head( &process->views, &view->entry ); if (get_view_nt_name( view, &name ) && (process->image = memdup( name.str, name.len ))) process->imagelen = name.len; diff --git a/server/process.c b/server/process.c index d819f03a615..780a2076a71 100644 --- a/server/process.c +++ b/server/process.c @@ -1317,7 +1317,7 @@ DECL_HANDLER(get_process_info) reply->peb = process->peb; reply->start_time = process->start_time; reply->end_time = process->end_time; - reply->cpu = process->cpu; + reply->machine = process->machine; if (get_reply_max_size()) { client_ptr_t base; diff --git a/server/process.h b/server/process.h index 58a211f2d0c..b49b8c9b919 100644 --- a/server/process.h +++ b/server/process.h @@ -53,6 +53,7 @@ struct process process_id_t group_id; /* group id of the process */ struct timeout_user *sigkill_timeout; /* timeout for final SIGKILL */ enum cpu_type cpu; /* client CPU type */ + unsigned short machine; /* client machine type */ int unix_pid; /* Unix pid for final SIGKILL */ int exit_code; /* process exit code */ int running_threads; /* number of threads running in this process */ @@ -66,7 +67,7 @@ struct process unsigned int is_terminating:1;/* is process terminating? */ data_size_t imagelen; /* length of image path in bytes */ WCHAR *image; /* main exe image full path */ - struct job *job; /* job object ascoicated with this process */ + struct job *job; /* job object associated with this process */ struct list job_entry; /* list entry for job object */ struct list asyncs; /* list of async object owned by the process */ struct list locks; /* list of file locks owned by the process */ diff --git a/server/protocol.def b/server/protocol.def index e9d7d1b0b5e..7c22faef794 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -963,7 +963,7 @@ typedef struct timeout_t end_time; /* process end time */ int exit_code; /* process exit code */ int priority; /* priority class */ - client_cpu_t cpu; /* CPU that this process is running on */ + unsigned short machine; /* process architecture */ VARARG(image,pe_image_info); /* image info for main exe */ @END diff --git a/server/request.h b/server/request.h index 063065a49c2..b8424b675c7 100644 --- a/server/request.h +++ b/server/request.h @@ -783,7 +783,7 @@ C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, start_time) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, end_time) == 40 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, exit_code) == 48 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, priority) == 52 ); -C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, cpu) == 56 ); +C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, machine) == 56 ); C_ASSERT( sizeof(struct get_process_info_reply) == 64 ); C_ASSERT( FIELD_OFFSET(struct get_process_debug_info_request, handle) == 12 ); C_ASSERT( sizeof(struct get_process_debug_info_request) == 16 ); diff --git a/server/trace.c b/server/trace.c index 6feacc48af1..96747333971 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1503,7 +1503,7 @@ static void dump_get_process_info_reply( const struct get_process_info_reply *re dump_timeout( ", end_time=", &req->end_time ); fprintf( stderr, ", exit_code=%d", req->exit_code ); fprintf( stderr, ", priority=%d", req->priority ); - dump_client_cpu( ", cpu=", &req->cpu ); + fprintf( stderr, ", machine=%04x", req->machine ); dump_varargs_pe_image_info( ", image=", cur_size ); }

1 0

Alexandre Julliard : ntdll: Implement NtQuerySystemInformationEx(SystemSupportedProcessorArchitectures).
by Alexandre Julliard 23 Apr '21

23 Apr '21

Module: wine Branch: master Commit: 126a14ac9ade799f9cb88fb0c509b964c5d98e76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=126a14ac9ade799f9cb88fb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 23 12:14:35 2021 +0200 ntdll: Implement NtQuerySystemInformationEx(SystemSupportedProcessorArchitectures). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/system.c | 38 ++++++++++++++++ 2 files changed, 152 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 56b6687467b..3a71a9f245c 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2884,6 +2884,119 @@ static void test_query_data_alignment(void) #endif } +static void test_process_architecture( HANDLE process, USHORT expect_machine, USHORT expect_native ) +{ + NTSTATUS status; + ULONG i, len, buffer[8]; + + len = 0xdead; + status = pNtQuerySystemInformationEx( SystemSupportedProcessorArchitectures, &process, sizeof(process), + &buffer, sizeof(buffer), &len ); + ok( !status, "failed %x\n", status ); + ok( !(len & 3), "wrong len %x\n", len ); + len /= sizeof(DWORD); + for (i = 0; i < len - 1; i++) + { + USHORT flags = HIWORD(buffer[i]); + USHORT machine = LOWORD(buffer[i]); + + if (flags & 8) + ok( machine == expect_machine, "wrong current machine %x\n", buffer[i]); + else + ok( machine != expect_machine, "wrong machine %x\n", buffer[i]); + + /* FIXME: not quite sure what the other flags mean, + * observed on amd64 Windows: (flags & 7) == 7 for MACHINE_AMD64 and 2 for MACHINE_I386 + */ + if (flags & 4) + ok( machine == expect_native, "wrong native machine %x\n", buffer[i]); + else + ok( machine != expect_native, "wrong machine %x\n", buffer[i]); + } + ok( !buffer[i], "missing terminating null\n" ); + + len = i * sizeof(DWORD); + status = pNtQuerySystemInformationEx( SystemSupportedProcessorArchitectures, &process, sizeof(process), + &buffer, len, &len ); + ok( status == STATUS_BUFFER_TOO_SMALL, "failed %x\n", status ); + ok( len == (i + 1) * sizeof(DWORD), "wrong len %u\n", len ); +} + +static void test_query_architectures(void) +{ +#ifdef __i386__ + USHORT current_machine = IMAGE_FILE_MACHINE_I386; + USHORT native_machine = is_wow64 ? IMAGE_FILE_MACHINE_AMD64 : IMAGE_FILE_MACHINE_I386; +#elif defined __x86_64__ + USHORT current_machine = IMAGE_FILE_MACHINE_AMD64; + USHORT native_machine = IMAGE_FILE_MACHINE_AMD64; +#elif defined __arm__ + USHORT current_machine = IMAGE_FILE_MACHINE_ARMNT; + USHORT native_machine = is_wow64 ? IMAGE_FILE_MACHINE_ARM64 : IMAGE_FILE_MACHINE_ARMNT; +#elif defined __aarch64__ + USHORT current_machine = IMAGE_FILE_MACHINE_ARM64; + USHORT native_machine = IMAGE_FILE_MACHINE_ARM64; +#else + USHORT current_machine = 0; + USHORT native_machine = 0; +#endif + PROCESS_INFORMATION pi; + STARTUPINFOA si = { sizeof(si) }; + NTSTATUS status; + HANDLE process; + ULONG len, buffer[8]; + + if (!pNtQuerySystemInformationEx) return; + + process = GetCurrentProcess(); + status = pNtQuerySystemInformationEx( SystemSupportedProcessorArchitectures, &process, sizeof(process), + &buffer, sizeof(buffer), &len ); + if (status == STATUS_INVALID_INFO_CLASS) + { + win_skip( "SystemSupportedProcessorArchitectures not supported\n" ); + return; + } + ok( !status, "failed %x\n", status ); + + process = (HANDLE)0xdeadbeef; + status = pNtQuerySystemInformationEx( SystemSupportedProcessorArchitectures, &process, sizeof(process), + &buffer, sizeof(buffer), &len ); + ok( status == STATUS_INVALID_HANDLE, "failed %x\n", status ); + process = (HANDLE)0xdeadbeef; + status = pNtQuerySystemInformationEx( SystemSupportedProcessorArchitectures, &process, 3, + &buffer, sizeof(buffer), &len ); + ok( status == STATUS_INVALID_PARAMETER || broken(status == STATUS_INVALID_HANDLE), + "failed %x\n", status ); + process = GetCurrentProcess(); + status = pNtQuerySystemInformationEx( SystemSupportedProcessorArchitectures, &process, 3, + &buffer, sizeof(buffer), &len ); + ok( status == STATUS_INVALID_PARAMETER || broken( status == STATUS_SUCCESS), + "failed %x\n", status ); + status = pNtQuerySystemInformationEx( SystemSupportedProcessorArchitectures, NULL, 0, + &buffer, sizeof(buffer), &len ); + ok( status == STATUS_INVALID_PARAMETER, "failed %x\n", status ); + + test_process_architecture( GetCurrentProcess(), current_machine, native_machine ); + test_process_architecture( 0, 0, native_machine ); + + if (CreateProcessA( "C:\\Program Files\\Internet Explorer\\iexplore.exe", NULL, NULL, NULL, + FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi )) + { + test_process_architecture( pi.hProcess, native_machine, native_machine ); + TerminateProcess( pi.hProcess, 0 ); + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + } + if (CreateProcessA( "C:\\Program Files (x86)\\Internet Explorer\\iexplore.exe", NULL, NULL, NULL, + FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi )) + { + test_process_architecture( pi.hProcess, IMAGE_FILE_MACHINE_I386, native_machine ); + TerminateProcess( pi.hProcess, 0 ); + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + } +} + static void test_thread_lookup(void) { OBJECT_BASIC_INFORMATION obj_info; @@ -3145,6 +3258,7 @@ START_TEST(info) test_query_cpusetinfo(); test_query_firmware(); test_query_data_alignment(); + test_query_architectures(); /* NtPowerInformation */ test_query_battery(); diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index d3e380b8c32..491cdb37b8f 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2926,6 +2926,44 @@ NTSTATUS WINAPI NtQuerySystemInformationEx( SYSTEM_INFORMATION_CLASS class, return ret; break; } + + case SystemSupportedProcessorArchitectures: + { + HANDLE process; + ULONG i; + USHORT machine = 0; + + if (!query || query_len < sizeof(HANDLE)) return STATUS_INVALID_PARAMETER; + process = *(HANDLE *)query; + if (process) + { + SERVER_START_REQ( get_process_info ) + { + req->handle = wine_server_obj_handle( process ); + if (!(ret = wine_server_call( req ))) machine = reply->machine; + } + SERVER_END_REQ; + if (ret) return ret; + } + + len = (supported_machines_count + 1) * sizeof(ULONG); + if (size < len) + { + ret = STATUS_BUFFER_TOO_SMALL; + break; + } + for (i = 0; i < supported_machines_count; i++) + { + USHORT flags = 2; /* supported (?) */ + if (!i) flags |= 5; /* native machine (?) */ + if (supported_machines[i] == machine) flags |= 8; /* current machine */ + ((DWORD *)info)[i] = MAKELONG( supported_machines[i], flags ); + } + ((DWORD *)info)[i] = 0; + ret = STATUS_SUCCESS; + break; + } + default: FIXME( "(0x%08x,%p,%u,%p,%u,%p) stub\n", class, query, query_len, info, size, ret_size ); break;

1 0