June 2020 - Wine-devel - list.winehq.org

[PATCH 6/8] mshtml: Add IHTMLCSSStyleDeclaration2::transform property implementation.
by Jacek Caban 05 Jun '20

05 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 12 ++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 33 ++++++++++++++++++++++++++++++++- 3 files changed, 41 insertions(+), 5 deletions(-)

1 0

[PATCH 5/8] mshtml: Use default white value in IHTMLDocument2::get_bgColor.
by Jacek Caban 05 Jun '20

05 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49062#c0 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 36 ++++++++++++++---------------------- dlls/mshtml/tests/dom.c | 8 ++++++++ 2 files changed, 22 insertions(+), 22 deletions(-)

1 0

[PATCH 4/8] mshtml: Use return_nsstr_variant in IHTMLBodyElement::get_bgColor.
by Jacek Caban 05 Jun '20

05 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlbody.c | 21 ++++----------------- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsembed.c | 22 +++++++++++++--------- 3 files changed, 18 insertions(+), 26 deletions(-)

1 0

[PATCH 3/8] jscript: Add Object.preventExtensions semi-stub implementation.
by Jacek Caban 05 Jun '20

05 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/object.c | 24 +++++++++++++++++++++++- dlls/mshtml/tests/es5.js | 23 ++++++++++++++++++++++- 2 files changed, 45 insertions(+), 2 deletions(-)

1 0

[PATCH 2/8] jscript: Support passing non-string flags to RegExp constructor.
by Jacek Caban 05 Jun '20

05 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jsregexp.c | 24 ++++++++++-------------- dlls/jscript/tests/regexp.js | 12 ++++++++++++ 2 files changed, 22 insertions(+), 14 deletions(-)

1 0

[PATCH 1/8] jscript: Support passing non-string pattern to RegExp constructor.
by Jacek Caban 05 Jun '20

05 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jsregexp.c | 33 +++++++++++++++------------------ dlls/jscript/tests/regexp.js | 24 ++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 18 deletions(-)

1 0

[PATCH 1/3] windowscodecs/tests: Add more tests for DdsFrameDecode_Dds_CopyBlocks().
by Ziqing Hui 05 Jun '20

05 Jun '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 46 ++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 12 deletions(-)

3 4

[PATCH] gdiplus: keep temporary dc for some need, like ali wangwang
by Yu Changping 05 Jun '20

05 Jun '20

2 1

[PATCH 1/5] d3dcompiler: Fix up the swizzle data type when unwrapping it from the assignment LHS.
by Zebediah Figura 05 Jun '20

05 Jun '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/utils.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 60bb5ff8145..7093e9eb2c0 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1403,29 +1403,29 @@ static enum hlsl_ir_expr_op op_from_assignment(enum parse_assign_op op) return ops[op]; } -static unsigned int invert_swizzle(unsigned int *swizzle, unsigned int writemask) +static BOOL invert_swizzle(unsigned int *swizzle, unsigned int *writemask, unsigned int *ret_width) { - unsigned int i, j, bit = 0, inverted = 0, components, new_writemask = 0, new_swizzle = 0; + unsigned int i, j, bit = 0, inverted = 0, width, new_writemask = 0, new_swizzle = 0; /* Apply the writemask to the swizzle to get a new writemask and swizzle. */ for (i = 0; i < 4; ++i) { - if (writemask & (1 << i)) + if (*writemask & (1 << i)) { unsigned int s = (*swizzle >> (i * 2)) & 3; new_swizzle |= s << (bit++ * 2); if (new_writemask & (1 << s)) - return 0; + return FALSE; new_writemask |= 1 << s; } } - components = bit; + width = bit; /* Invert the swizzle. */ bit = 0; for (i = 0; i < 4; ++i) { - for (j = 0; j < components; ++j) + for (j = 0; j < width; ++j) { unsigned int s = (new_swizzle >> (j * 2)) & 3; if (s == i) @@ -1434,7 +1434,9 @@ static unsigned int invert_swizzle(unsigned int *swizzle, unsigned int writemask } *swizzle = inverted; - return new_writemask; + *writemask = new_writemask; + *ret_width = width; + return TRUE; } struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign_op assign_op, @@ -1463,6 +1465,8 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign else if (lhs->type == HLSL_IR_SWIZZLE) { struct hlsl_ir_swizzle *swizzle = swizzle_from_node(lhs); + const struct hlsl_type *swizzle_type = swizzle->node.data_type; + unsigned int width; if (lhs->data_type->type == HLSL_CLASS_MATRIX) FIXME("Assignments with writemasks and matrices on lhs are not supported yet.\n"); @@ -1472,12 +1476,23 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign list_add_after(&rhs->entry, &lhs->entry); swizzle->val = rhs; - if (!(writemask = invert_swizzle(&swizzle->swizzle, writemask))) + if (!invert_swizzle(&swizzle->swizzle, &writemask, &width)) { hlsl_report_message(lhs->loc, HLSL_LEVEL_ERROR, "invalid writemask"); d3dcompiler_free(assign); return NULL; } + assert(swizzle_type->type == HLSL_CLASS_VECTOR); + if (swizzle_type->dimx != width) + { + struct hlsl_type *type; + if (!(type = new_hlsl_type(NULL, HLSL_CLASS_VECTOR, swizzle_type->base_type, width, 1))) + { + d3dcompiler_free(assign); + return NULL; + } + swizzle->node.data_type = type; + } rhs = &swizzle->node; } else -- 2.26.2

4 12

[v2 PATCH 2/2] dwrite: Use correct glyph array offset for alternate substitution table output.
by Nikolay Sivov 05 Jun '20

05 Jun '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: fixed typos in subject dlls/dwrite/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index fc46610bcba..2106fe2cf78 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4916,7 +4916,7 @@ static BOOL opentype_layout_apply_gsub_alt_substitution(struct scriptshaping_con if (alt_index > count || !alt_index) return FALSE; - glyph = table_read_be_word(gsub, subtable_offset + offset + sizeof(count) + (alt_index - 1) * sizeof(glyph)); + glyph = table_read_be_word(gsub, subtable_offset + offset + 2 + (alt_index - 1) * sizeof(glyph)); } else { -- 2.26.2

1 0