November 2021 - Wine-Commits

Gabriel Ivăncescu : mshtml: Implement inline attributes parsing for createElement.
by Alexandre Julliard Nov. 10, 2021

Nov. 10, 2021

Module: wine Branch: master Commit: a5be97d6342d02659cc86795ae2634b048e2803a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5be97d6342d02659cc86795… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 9 23:00:38 2021 +0200 mshtml: Implement inline attributes parsing for createElement. We let gecko parse a dummy unknown tag (after validation) using a contextual fragment, and then copy its attributes to the proper element with correct tag. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 134 +++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/documentmode.js | 63 ++++++++++++++++++ 2 files changed, 196 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index de69e2f26d8..91ccfb97abc 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -355,6 +355,134 @@ static inline HTMLElement *impl_from_IHTMLElement(IHTMLElement *iface) return CONTAINING_RECORD(iface, HTMLElement, IHTMLElement_iface); } +static HRESULT copy_nselem_attrs(nsIDOMElement *nselem_with_attrs, nsIDOMElement *nselem) +{ + nsIDOMMozNamedAttrMap *attrs; + nsAString name_str, val_str; + nsresult nsres, nsres2; + nsIDOMAttr *attr; + UINT32 i, length; + + nsres = nsIDOMElement_GetAttributes(nselem_with_attrs, &attrs); + if(NS_FAILED(nsres)) + return E_FAIL; + + nsres = nsIDOMMozNamedAttrMap_GetLength(attrs, &length); + if(NS_FAILED(nsres)) { + nsIDOMMozNamedAttrMap_Release(attrs); + return E_FAIL; + } + + nsAString_Init(&name_str, NULL); + nsAString_Init(&val_str, NULL); + for(i = 0; i < length; i++) { + nsres = nsIDOMMozNamedAttrMap_Item(attrs, i, &attr); + if(NS_FAILED(nsres)) + continue; + + nsres = nsIDOMAttr_GetNodeName(attr, &name_str); + nsres2 = nsIDOMAttr_GetNodeValue(attr, &val_str); + nsIDOMAttr_Release(attr); + if(NS_FAILED(nsres) || NS_FAILED(nsres2)) + continue; + + nsIDOMElement_SetAttribute(nselem, &name_str, &val_str); + } + nsAString_Finish(&name_str); + nsAString_Finish(&val_str); + + nsIDOMMozNamedAttrMap_Release(attrs); + return S_OK; +} + +static HRESULT create_nselem_parse(HTMLDocumentNode *doc, const WCHAR *tag, nsIDOMElement **ret) +{ + static const WCHAR prefix[4] = L"<FOO"; + nsIDOMDocumentFragment *nsfragment; + WCHAR *p = wcschr(tag + 1, '>'); + UINT32 i, name_len, size; + nsIDOMElement *nselem; + nsIDOMRange *nsrange; + nsIDOMNode *nsnode; + nsresult nsres; + nsAString str; + HRESULT hres; + + if(!p || p[1] || wcschr(tag + 1, '<')) + return E_FAIL; + if(!doc->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; + } + + /* Ignore the starting token and > or /> end token */ + name_len = p - tag - 1 - (p[-1] == '/'); + + /* Get the tag name using HTML whitespace rules */ + for(i = 1; i <= name_len; i++) { + if((tag[i] >= 0x09 && tag[i] <= 0x0d) || tag[i] == ' ') { + name_len = i - 1; + break; + } + } + if(!name_len) + return E_FAIL; + size = (p + 2 - (tag + 1 + name_len)) * sizeof(WCHAR); + + /* Parse the input via a contextual fragment, using a dummy unknown tag */ + nsres = nsIDOMHTMLDocument_CreateRange(doc->nsdoc, &nsrange); + if(NS_FAILED(nsres)) + return map_nsresult(nsres); + + if(!(p = heap_alloc(sizeof(prefix) + size))) { + nsIDOMRange_Release(nsrange); + return E_OUTOFMEMORY; + } + memcpy(p, prefix, sizeof(prefix)); + memcpy(p + ARRAY_SIZE(prefix), tag + 1 + name_len, size); + + nsAString_InitDepend(&str, p); + nsIDOMRange_CreateContextualFragment(nsrange, &str, &nsfragment); + nsIDOMRange_Release(nsrange); + nsAString_Finish(&str); + heap_free(p); + if(NS_FAILED(nsres)) + return map_nsresult(nsres); + + /* Grab the parsed element and copy its attributes into the proper element */ + nsres = nsIDOMDocumentFragment_GetFirstChild(nsfragment, &nsnode); + nsIDOMDocumentFragment_Release(nsfragment); + if(NS_FAILED(nsres) || !nsnode) + return E_FAIL; + + nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMElement, (void**)&nselem); + nsIDOMNode_Release(nsnode); + if(NS_FAILED(nsres)) + return E_FAIL; + + if(!(p = heap_alloc((name_len + 1) * sizeof(WCHAR)))) + hres = E_OUTOFMEMORY; + else { + memcpy(p, tag + 1, name_len * sizeof(WCHAR)); + p[name_len] = '\0'; + + nsAString_InitDepend(&str, p); + nsres = nsIDOMHTMLDocument_CreateElement(doc->nsdoc, &str, ret); + nsAString_Finish(&str); + heap_free(p); + + if(NS_FAILED(nsres)) + hres = map_nsresult(nsres); + else { + hres = copy_nselem_attrs(nselem, *ret); + if(FAILED(hres)) + nsIDOMElement_Release(*ret); + } + } + nsIDOMElement_Release(nselem); + return hres; +} + HRESULT create_nselem(HTMLDocumentNode *doc, const WCHAR *tag, nsIDOMElement **ret) { nsAString tag_str; @@ -385,7 +513,11 @@ HRESULT create_element(HTMLDocumentNode *doc, const WCHAR *tag, HTMLElement **re if(!doc->nsdoc) doc = doc->node.doc; - hres = create_nselem(doc, tag, &nselem); + /* IE8 and below allow creating elements with attributes, such as <div class="a"> */ + if(tag[0] == '<' && dispex_compat_mode(&doc->node.event_target.dispex) <= COMPAT_MODE_IE8) + hres = create_nselem_parse(doc, tag, &nselem); + else + hres = create_nselem(doc, tag, &nselem); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 02a5f5f3f75..d5662239bfa 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -488,6 +488,69 @@ sync_test("style_props", function() { } }); +sync_test("createElement_inline_attr", function() { + var v = document.documentMode, e, s; + + if(v < 9) { + s = document.createElement("<div>").tagName; + ok(s === "DIV", "<div>.tagName returned " + s); + s = document.createElement("<div >").tagName; + ok(s === "DIV", "<div >.tagName returned " + s); + s = document.createElement("<div/>").tagName; + ok(s === "DIV", "<div/>.tagName returned " + s); + e = 0; + try { + document.createElement("<div"); + }catch(ex) { + e = ex.number; + } + ok(e === 0x4005 - 0x80000000, "<div e = " + e); + e = 0; + try { + document.createElement("<div test=1"); + }catch(ex) { + e = ex.number; + } + ok(e === 0x4005 - 0x80000000, "<div test=1 e = " + e); + + var tags = [ "div", "head", "body", "title", "html" ]; + + for(var i = 0; i < tags.length; i++) { + e = document.createElement("<" + tags[i] + " test='a\"' abcd=\""b"\">"); + ok(e.tagName === tags[i].toUpperCase(), "<" + tags[i] + " test=\"a\" abcd=\"b\">.tagName returned " + e.tagName); + todo_wine_if(v == 8). + ok(e.test === "a\"", "<" + tags[i] + " test='a\"' abcd=\""b"\">.test returned " + e.test); + todo_wine_if(v == 8). + ok(e.abcd === "\"b\"", "<" + tags[i] + " test='a\"' abcd=\""b"\">.abcd returned " + e.abcd); + } + }else { + s = ""; + e = 0; + try { + document.createElement("<div>"); + }catch(ex) { + s = ex.toString(); + e = ex.number; + } + todo_wine. + ok(e === undefined, "<div> e = " + e); + todo_wine. + ok(s === "InvalidCharacterError", "<div> s = " + s); + s = ""; + e = 0; + try { + document.createElement("<div test=\"a\">"); + }catch(ex) { + s = ex.toString(); + e = ex.number; + } + todo_wine. + ok(e === undefined, "<div test=\"a\"> e = " + e); + todo_wine. + ok(s === "InvalidCharacterError", "<div test=\"a\"> s = " + s); + } +}); + sync_test("JS objs", function() { var g = window;

1 0

Bernhard Kölbl : xml2: Use MSVC constants for NaN and infinity.
by Alexandre Julliard Nov. 10, 2021

Nov. 10, 2021

Module: wine Branch: master Commit: 8923be8f6871bfd32e42a51eae9932532ee038ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=8923be8f6871bfd32e42a51e… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Nov 9 22:05:05 2021 +0100 xml2: Use MSVC constants for NaN and infinity. Prevent division by zero exceptions from being thrown, if they are enabled and calls to xmlXPathInit() are being made. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52003 Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/xml2/xpath.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libs/xml2/xpath.c b/libs/xml2/xpath.c index 7497ba07d6f..5fa3c72eb6c 100644 --- a/libs/xml2/xpath.c +++ b/libs/xml2/xpath.c @@ -497,14 +497,12 @@ double xmlXPathNINF; * * Initialize the XPath environment */ -ATTRIBUTE_NO_SANITIZE("float-divide-by-zero") void xmlXPathInit(void) { - /* MSVC doesn't allow division by zero in constant expressions. */ - double zero = 0.0; - xmlXPathNAN = 0.0 / zero; - xmlXPathPINF = 1.0 / zero; - xmlXPathNINF = -xmlXPathPINF; + /* Use MSVC definitions */ + xmlXPathNAN = NAN; + xmlXPathPINF = INFINITY; + xmlXPathNINF = -INFINITY; } /**

1 0

Alexandre Julliard : makefiles: Substitute all defined variables in the main makefile.
by Alexandre Julliard Nov. 10, 2021

Nov. 10, 2021

Module: wine Branch: master Commit: 37c0f5c6908bae3e14e791fbc9a87e0a61ceee00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37c0f5c6908bae3e14e791fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 10 11:38:10 2021 +0100 makefiles: Substitute all defined variables in the main makefile. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 69 +--------- configure | 380 +++++++++++++++++++++++++++++++++++++---------------- configure.ac | 44 ++++--- server/Makefile.in | 2 +- tools/makedep.c | 4 +- 5 files changed, 296 insertions(+), 203 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=37c0f5c6908bae3e14e7…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Nov. 10, 2021

Nov. 10, 2021

Module: wine Branch: master Commit: 1aa16d05ce9e90135ea6e70ef8108c720866e7f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1aa16d05ce9e90135ea6e70e… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Nov 10 08:49:33 2021 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/lt.po b/po/lt.po index f8d119a0c19..d0532e095f1 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-09-25 10:47+0300\n" +"PO-Revision-Date: 2021-11-10 08:49+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -14383,7 +14383,7 @@ msgstr "IPv6 adresas" #: programs/ipconfig/ipconfig.rc:38 msgid "Primary DNS suffix" -msgstr "" +msgstr "Pirminis DNS sufiksas" #: programs/msinfo32/msinfo32.rc:28 msgid "System Information"

1 0

Alexandre Julliard : makefiles: Generate the top makefile entirely from configure.
by Alexandre Julliard Nov. 10, 2021

Nov. 10, 2021

Module: wine Branch: master Commit: c6b5f4a406351e7faef33de23d64db4445ef9aea URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6b5f4a406351e7faef33de2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 10 12:48:59 2021 +0100 makefiles: Generate the top makefile entirely from configure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 77 ------ aclocal.m4 | 5 +- configure | 812 ++++++++++++++++++++++------------------------------------- configure.ac | 120 ++++++--- 4 files changed, 398 insertions(+), 616 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c6b5f4a406351e7faef3…

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard Nov. 10, 2021

Nov. 10, 2021

Module: wine Branch: master Commit: 7becaadeddb0c02ddef44ee7629b0ecca436f69d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7becaadeddb0c02ddef44ee7… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Wed Nov 10 00:14:16 2021 +0100 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/nl.po b/po/nl.po index cfc51dc296f..c9be849321c 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-09-25 22:40+0200\n" +"PO-Revision-Date: 2021-11-10 00:03+0100\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -14442,7 +14442,7 @@ msgstr "IPv6-adres" #: programs/ipconfig/ipconfig.rc:38 msgid "Primary DNS suffix" -msgstr "" +msgstr "Primair DNS-achtervoegsel" #: programs/msinfo32/msinfo32.rc:28 msgid "System Information"

1 0

Joshua Ashton : vkd3d-shader/hlsl: Avoid hard-coding array sizes in hlsl_type_to_string().
by Alexandre Julliard Nov. 10, 2021

Nov. 10, 2021

Module: vkd3d Branch: master Commit: a55c51a2b7a82e1d019ee834180ea7edd50d9356 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a55c51a2b7a82e1d019ee83… Author: Joshua Ashton <joshua(a)froggi.es> Date: Mon Nov 8 21:39:27 2021 -0600 vkd3d-shader/hlsl: Avoid hard-coding array sizes in hlsl_type_to_string(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index c71eac3..1eee427 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -854,14 +854,14 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru { struct vkd3d_string_buffer *string; - static const char base_types[HLSL_TYPE_LAST_SCALAR + 1][7] = - { - "float", - "half", - "double", - "int", - "uint", - "bool", + static const char *const base_types[] = + { + [HLSL_TYPE_FLOAT] = "float", + [HLSL_TYPE_HALF] = "half", + [HLSL_TYPE_DOUBLE] = "double", + [HLSL_TYPE_INT] = "int", + [HLSL_TYPE_UINT] = "uint", + [HLSL_TYPE_BOOL] = "bool", }; if (!(string = hlsl_get_string_buffer(ctx))) @@ -915,7 +915,7 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru case HLSL_CLASS_OBJECT: { - static const char dimensions[5][HLSL_SAMPLER_DIM_MAX + 1] = + static const char *const dimensions[] = { [HLSL_SAMPLER_DIM_1D] = "1D", [HLSL_SAMPLER_DIM_2D] = "2D",

1 0

Zebediah Figura : vkd3d-shader/hlsl: Handle samplers in write_sm1_uniform().
by Alexandre Julliard Nov. 10, 2021

Nov. 10, 2021

Module: vkd3d Branch: master Commit: eca2d90a6e843fc29fd4728bccb0d58c492ce2e9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=eca2d90a6e843fc29fd4728… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 8 21:39:29 2021 -0600 vkd3d-shader/hlsl: Handle samplers in write_sm1_uniform(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm1.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index c3d27ee..875f521 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -352,8 +352,18 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe if (!var->semantic.name && var->reg.allocated) { put_u32(buffer, 0); /* name */ - put_u32(buffer, vkd3d_make_u32(D3DXRS_FLOAT4, var->reg.id)); - put_u32(buffer, var->data_type->reg_size / 4); + if (var->data_type->type == HLSL_CLASS_OBJECT + && (var->data_type->base_type == HLSL_TYPE_SAMPLER + || var->data_type->base_type == HLSL_TYPE_TEXTURE)) + { + put_u32(buffer, vkd3d_make_u32(D3DXRS_SAMPLER, var->reg.id)); + put_u32(buffer, 1); + } + else + { + put_u32(buffer, vkd3d_make_u32(D3DXRS_FLOAT4, var->reg.id)); + put_u32(buffer, var->data_type->reg_size / 4); + } put_u32(buffer, 0); /* type */ put_u32(buffer, 0); /* FIXME: default value */ }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 sampler declarations.
by Alexandre Julliard Nov. 10, 2021

Nov. 10, 2021

Module: vkd3d Branch: master Commit: ae4ff17b18d1ac20048af711d7b4afc26852efda URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ae4ff17b18d1ac20048af71… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 8 21:39:30 2021 -0600 vkd3d-shader/hlsl: Write SM4 sampler declarations. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index d48a41d..e597425 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -974,6 +974,20 @@ static void write_sm4_dcl_constant_buffer(struct vkd3d_bytecode_buffer *buffer, write_sm4_instruction(buffer, &instr); } +static void write_sm4_dcl_sampler(struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_var *var) +{ + const struct sm4_instruction instr = + { + .opcode = VKD3D_SM4_OP_DCL_SAMPLER, + + .dsts[0].reg.type = VKD3D_SM4_RT_SAMPLER, + .dsts[0].reg.idx = {var->reg.id}, + .dsts[0].reg.idx_count = 1, + .dst_count = 1, + }; + write_sm4_instruction(buffer, &instr); +} + static void write_sm4_dcl_texture(struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_var *var) { const struct sm4_instruction instr = @@ -1647,7 +1661,9 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, if (!var->reg.allocated || var->data_type->type != HLSL_CLASS_OBJECT) continue; - if (var->data_type->base_type == HLSL_TYPE_TEXTURE) + if (var->data_type->base_type == HLSL_TYPE_SAMPLER) + write_sm4_dcl_sampler(&buffer, var); + else if (var->data_type->base_type == HLSL_TYPE_TEXTURE) write_sm4_dcl_texture(&buffer, var); }

1 0

Martin Storsjö : msvcrt: Don't set frame to 0 in arm and arm64 setjmp.
by Alexandre Julliard Nov. 9, 2021

Nov. 9, 2021

Module: wine Branch: master Commit: 6a072b98c100f38a61fad00b6c96c86b3445efac URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a072b98c100f38a61fad00b… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Nov 9 16:05:55 2021 +0200 msvcrt: Don't set frame to 0 in arm and arm64 setjmp. This matches what was done for x86_64 in 882980c17a9a033fa8e49a4c116af9583698d218. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_arm.c | 1 - dlls/msvcrt/except_arm64.c | 1 - 2 files changed, 2 deletions(-) diff --git a/dlls/msvcrt/except_arm.c b/dlls/msvcrt/except_arm.c index 8e5c552b552..fecbfe65929 100644 --- a/dlls/msvcrt/except_arm.c +++ b/dlls/msvcrt/except_arm.c @@ -109,7 +109,6 @@ unsigned int CDECL __CxxQueryExceptionSize(void) * _setjmp (MSVCRT.@) */ __ASM_GLOBAL_FUNC(MSVCRT__setjmp, - "mov r1, #0\n\t" /* frame */ "b " __ASM_NAME("__wine_setjmpex")); /******************************************************************* diff --git a/dlls/msvcrt/except_arm64.c b/dlls/msvcrt/except_arm64.c index 242ef8bdb09..574e77485f9 100644 --- a/dlls/msvcrt/except_arm64.c +++ b/dlls/msvcrt/except_arm64.c @@ -110,7 +110,6 @@ unsigned int CDECL __CxxQueryExceptionSize(void) * _setjmp (MSVCRT.@) */ __ASM_GLOBAL_FUNC(MSVCRT__setjmp, - "mov x1, #0\n\t" /* frame */ "b " __ASM_NAME("__wine_setjmpex")); /*******************************************************************

1 0