August 2019 - Wine-Commits - list.winehq.org

Richard Pospesel : widl: Change struct _var_t' s type member to a struct _decl_spec_t.
by Alexandre Julliard Aug. 13, 2019

Aug. 13, 2019

Module: wine Branch: master Commit: 1ffb6494db03217efcacf159b74bee17a4813d43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ffb6494db03217efcacf159… Author: Richard Pospesel <richard(a)torproject.org> Date: Fri Jul 5 14:49:49 2019 -0700 widl: Change struct _var_t's type member to a struct _decl_spec_t. Signed-off-by: Richard Pospesel <richard(a)torproject.org> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/client.c | 32 ++--- tools/widl/expr.c | 8 +- tools/widl/header.c | 116 ++++++++--------- tools/widl/parser.y | 113 ++++++++-------- tools/widl/proxy.c | 58 ++++----- tools/widl/server.c | 16 +-- tools/widl/typegen.c | 334 ++++++++++++++++++++++++------------------------ tools/widl/typetree.c | 8 +- tools/widl/typetree.h | 4 +- tools/widl/widltypes.h | 25 +++- tools/widl/write_msft.c | 22 ++-- 11 files changed, 372 insertions(+), 364 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1ffb6494db03217efcac…

1 0

Zebediah Figura : d3dcompiler: Introduce a new_unary_expr() helper.
by Alexandre Julliard Aug. 12, 2019

Aug. 12, 2019

Module: wine Branch: master Commit: b89996561549644d0c0e9a1f1cc87feb525dc5b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b89996561549644d0c0e9a1f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 12 10:27:30 2019 -0500 d3dcompiler: Introduce a new_unary_expr() helper. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 6 ++++++ dlls/d3dcompiler_43/hlsl.y | 35 +++++++------------------------ dlls/d3dcompiler_43/utils.c | 11 ++++------ 3 files changed, 18 insertions(+), 34 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index b576c24..7439e4a 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -1186,6 +1186,12 @@ void free_instr(struct hlsl_ir_node *node) DECLSPEC_HIDDEN; void free_instr_list(struct list *list) DECLSPEC_HIDDEN; void free_function_rb(struct wine_rb_entry *entry, void *context) DECLSPEC_HIDDEN; +static inline struct hlsl_ir_node *new_unary_expr(enum hlsl_ir_expr_op op, + struct hlsl_ir_node *op1, struct source_location loc) +{ + struct hlsl_ir_node *operands[3] = {op1}; + return &new_expr(op, operands, &loc)->node; +} #define MAKE_TAG(ch0, ch1, ch2, ch3) \ ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index bbe8f15..5e74ec6 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -257,9 +257,8 @@ static void declare_predefined_types(struct hlsl_scope *scope) static struct hlsl_ir_if *loop_condition(struct list *cond_list) { + struct hlsl_ir_node *cond, *not_cond; struct hlsl_ir_if *out_cond; - struct hlsl_ir_expr *not_cond; - struct hlsl_ir_node *cond, *operands[3]; struct hlsl_ir_jump *jump; unsigned int count = list_count(cond_list); @@ -276,16 +275,13 @@ static struct hlsl_ir_if *loop_condition(struct list *cond_list) return NULL; } out_cond->node.type = HLSL_IR_IF; - operands[0] = cond; - operands[1] = operands[2] = NULL; - not_cond = new_expr(HLSL_IR_UNOP_LOGIC_NOT, operands, &cond->loc); - if (!not_cond) + if (!(not_cond = new_unary_expr(HLSL_IR_UNOP_LOGIC_NOT, cond, cond->loc))) { ERR("Out of memory.\n"); d3dcompiler_free(out_cond); return NULL; } - out_cond->condition = &not_cond->node; + out_cond->condition = not_cond; jump = d3dcompiler_alloc(sizeof(*jump)); if (!jump) { @@ -1931,7 +1927,6 @@ postfix_expr: primary_expr } | postfix_expr OP_INC { - struct hlsl_ir_node *operands[3]; struct source_location loc; set_location(&loc, &@2); @@ -1941,16 +1936,13 @@ postfix_expr: primary_expr "modifying a const expression"); YYABORT; } - operands[0] = $1; - operands[1] = operands[2] = NULL; - $$ = &new_expr(HLSL_IR_UNOP_POSTINC, operands, &loc)->node; + $$ = new_unary_expr(HLSL_IR_UNOP_POSTINC, $1, loc); /* Post increment/decrement expressions are considered const */ $$->data_type = clone_hlsl_type($$->data_type); $$->data_type->modifiers |= HLSL_MODIFIER_CONST; } | postfix_expr OP_DEC { - struct hlsl_ir_node *operands[3]; struct source_location loc; set_location(&loc, &@2); @@ -1960,9 +1952,7 @@ postfix_expr: primary_expr "modifying a const expression"); YYABORT; } - operands[0] = $1; - operands[1] = operands[2] = NULL; - $$ = &new_expr(HLSL_IR_UNOP_POSTDEC, operands, &loc)->node; + $$ = new_unary_expr(HLSL_IR_UNOP_POSTDEC, $1, loc); /* Post increment/decrement expressions are considered const */ $$->data_type = clone_hlsl_type($$->data_type); $$->data_type->modifiers |= HLSL_MODIFIER_CONST; @@ -2125,7 +2115,6 @@ unary_expr: postfix_expr } | OP_INC unary_expr { - struct hlsl_ir_node *operands[3]; struct source_location loc; set_location(&loc, &@1); @@ -2135,13 +2124,10 @@ unary_expr: postfix_expr "modifying a const expression"); YYABORT; } - operands[0] = $2; - operands[1] = operands[2] = NULL; - $$ = &new_expr(HLSL_IR_UNOP_PREINC, operands, &loc)->node; + $$ = new_unary_expr(HLSL_IR_UNOP_PREINC, $2, loc); } | OP_DEC unary_expr { - struct hlsl_ir_node *operands[3]; struct source_location loc; set_location(&loc, &@1); @@ -2151,15 +2137,12 @@ unary_expr: postfix_expr "modifying a const expression"); YYABORT; } - operands[0] = $2; - operands[1] = operands[2] = NULL; - $$ = &new_expr(HLSL_IR_UNOP_PREDEC, operands, &loc)->node; + $$ = new_unary_expr(HLSL_IR_UNOP_PREDEC, $2, loc); } | unary_op unary_expr { enum hlsl_ir_expr_op ops[] = {0, HLSL_IR_UNOP_NEG, HLSL_IR_UNOP_LOGIC_NOT, HLSL_IR_UNOP_BIT_NOT}; - struct hlsl_ir_node *operands[3]; struct source_location loc; if ($1 == UNARY_OP_PLUS) @@ -2168,10 +2151,8 @@ unary_expr: postfix_expr } else { - operands[0] = $2; - operands[1] = operands[2] = NULL; set_location(&loc, &@1); - $$ = &new_expr(ops[$1], operands, &loc)->node; + $$ = new_unary_expr(ops[$1], $2, loc); } } /* var_modifiers just to avoid shift/reduce conflicts */ diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 1dbb915..5104298 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1343,15 +1343,12 @@ struct hlsl_ir_expr *new_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node **ope struct hlsl_ir_expr *new_cast(struct hlsl_ir_node *node, struct hlsl_type *type, struct source_location *loc) { - struct hlsl_ir_expr *cast; - struct hlsl_ir_node *operands[3]; + struct hlsl_ir_node *cast; - operands[0] = node; - operands[1] = operands[2] = NULL; - cast = new_expr(HLSL_IR_UNOP_CAST, operands, loc); + cast = new_unary_expr(HLSL_IR_UNOP_CAST, node, *loc); if (cast) - cast->node.data_type = type; - return cast; + cast->data_type = type; + return expr_from_node(cast); } struct hlsl_ir_expr *hlsl_mul(struct hlsl_ir_node *op1, struct hlsl_ir_node *op2,

1 0

Zebediah Figura : d3dcompiler: Parse initializer lists using a variable-size array.
by Alexandre Julliard Aug. 12, 2019

Aug. 12, 2019

Module: wine Branch: master Commit: fbc9ff506cf0f41702eaf4cfaa4d0d289fc3034b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbc9ff506cf0f41702eaf4cf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 12 10:27:28 2019 -0500 d3dcompiler: Parse initializer lists using a variable-size array. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 8 ++- dlls/d3dcompiler_43/hlsl.y | 116 +++++++++++++++--------------- 2 files changed, 65 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fbc9ff506cf0f41702ea…

1 0

Zebediah Figura : d3dcompiler: Use the documented YYABORT macro.
by Alexandre Julliard Aug. 12, 2019

Aug. 12, 2019

Module: wine Branch: master Commit: cfa7f3a3f5492fcd2f00df74539fd57799f7f039 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfa7f3a3f5492fcd2f00df74… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 12 10:27:27 2019 -0500 d3dcompiler: Use the documented YYABORT macro. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 84 +++++++++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cfa7f3a3f5492fcd2f00…

1 0

Jacek Caban : mshtml/tests: Fix XHR tests on some IE versions.
by Alexandre Julliard Aug. 12, 2019

Aug. 12, 2019

Module: wine Branch: master Commit: 0992aaab9ce17ac337adaf3c2b35960a581d0e1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0992aaab9ce17ac337adaf3c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 12 14:16:59 2019 +0200 mshtml/tests: Fix XHR tests on some IE versions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/xmlhttprequest.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index 2be8179..00e12aa 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -141,17 +141,14 @@ static void _test_event_args(unsigned line, const IID *dispiid, const IID *broke static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) { - *ppv = NULL; - - if(IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDispatch) - || IsEqualGUID(riid, &IID_IDispatchEx)) - *ppv = iface; - else { - ok(0, "unexpected riid %s\n", wine_dbgstr_guid(riid)); + if(!IsEqualGUID(riid, &IID_IUnknown) + && !IsEqualGUID(riid, &IID_IDispatch) + && !IsEqualGUID(riid, &IID_IDispatchEx)) { + *ppv = NULL; return E_NOINTERFACE; } + *ppv = iface; return S_OK; }

1 0

Zebediah Figura : d3dcompiler: Use new_cast() in implicit_conversion().
by Alexandre Julliard Aug. 12, 2019

Aug. 12, 2019

Module: wine Branch: master Commit: b89f027bc148f6449647dd2a0518ccb2a3d6ed0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b89f027bc148f6449647dd2a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 12 10:27:29 2019 -0500 d3dcompiler: Use new_cast() in implicit_conversion(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/utils.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 742b262..1dbb915 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1277,19 +1277,10 @@ static struct hlsl_type *expr_common_type(struct hlsl_type *t1, struct hlsl_type static struct hlsl_ir_node *implicit_conversion(struct hlsl_ir_node *node, struct hlsl_type *type, struct source_location *loc) { - struct hlsl_ir_expr *cast; - struct hlsl_ir_node *operands[3]; - if (compare_hlsl_types(node->data_type, type)) return node; TRACE("Implicit conversion of expression to %s\n", debug_hlsl_type(type)); - operands[0] = node; - operands[1] = operands[2] = NULL; - cast = new_expr(HLSL_IR_UNOP_CAST, operands, loc); - if (!cast) - return NULL; - cast->node.data_type = type; - return &cast->node; + return &new_cast(node, type, loc)->node; } struct hlsl_ir_expr *new_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node **operands,

1 0

Zebediah Figura : d3dcompiler: Introduce a new_binary_expr() helper.
by Alexandre Julliard Aug. 12, 2019

Aug. 12, 2019

Module: wine Branch: master Commit: cf5ccf29a9ae341cebe03634b3c4220c0c59ea53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf5ccf29a9ae341cebe03634… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 12 10:27:31 2019 -0500 d3dcompiler: Introduce a new_binary_expr() helper. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 29 ++---- dlls/d3dcompiler_43/hlsl.y | 22 ++--- dlls/d3dcompiler_43/utils.c | 153 +----------------------------- 3 files changed, 21 insertions(+), 183 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cf5ccf29a9ae341cebe0…

1 0

Jacek Caban : mshtml: Support semicolon in UA compatible string.
by Alexandre Julliard Aug. 12, 2019

Aug. 12, 2019

Module: wine Branch: master Commit: d2f5eaf9165bc8eaa5205daabee9c6c997cd4e54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2f5eaf9165bc8eaa5205daa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 12 14:02:21 2019 +0200 mshtml: Support semicolon in UA compatible string. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mutation.c | 9 ++++++--- dlls/mshtml/tests/script.c | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index ab748c7..6903fe8 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -405,7 +405,7 @@ BOOL parse_compat_version(const WCHAR *version_string, compat_mode_t *r) for(p = version_string; '0' <= *p && *p <= '9'; p++) version = version * 10 + *p-'0'; - if(*p || p == version_string) + if((*p && *p != ';') || p == version_string) return FALSE; switch(version){ @@ -434,7 +434,7 @@ BOOL parse_compat_version(const WCHAR *version_string, compat_mode_t *r) static BOOL parse_ua_compatible(const WCHAR *p, compat_mode_t *r) { static const WCHAR ie_eqW[] = {'I','E','='}; - static const WCHAR edgeW[] = {'e','d','g','e',0}; + static const WCHAR edgeW[] = {'e','d','g','e'}; TRACE("%s\n", debugstr_w(p)); @@ -442,7 +442,10 @@ static BOOL parse_ua_compatible(const WCHAR *p, compat_mode_t *r) return FALSE; p += 3; - if(!wcsicmp(p, edgeW)) { + if(!wcsnicmp(p, edgeW, ARRAY_SIZE(edgeW))) { + p += ARRAY_SIZE(edgeW); + if(*p && *p != ';') + return FALSE; *r = COMPAT_MODE_IE11; return TRUE; } diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index d4c53cd..e62b83d 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -3493,9 +3493,9 @@ static void run_js_tests(void) run_script_as_http_with_mode("documentmode.js", "7", "7"); run_script_as_http_with_mode("documentmode.js", "8", "8"); run_script_as_http_with_mode("documentmode.js", "9", "9"); - run_script_as_http_with_mode("documentmode.js", "10", "10"); + run_script_as_http_with_mode("documentmode.js", "10", "10;abc"); run_script_as_http_with_mode("documentmode.js", "11", "11"); - run_script_as_http_with_mode("documentmode.js", "11", "edge"); + run_script_as_http_with_mode("documentmode.js", "11", "edge;123"); run_script_as_http_with_mode("asyncscriptload.js", NULL, "9"); }

1 0

Jacek Caban : mshtml/tests: Fix events.html on some win10 versions.
by Alexandre Julliard Aug. 12, 2019

Aug. 12, 2019

Module: wine Branch: master Commit: 1d9d2dc36a8c0b7ad2491099033a3b0370921596 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d9d2dc36a8c0b7ad2491099… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 12 14:01:52 2019 +0200 mshtml/tests: Fix events.html on some win10 versions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index 8bf2c50..a58b0e3 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -288,8 +288,8 @@ window.onload = function() { ok(inlscr_complete_called, "onreadystatechange not fired"); ok(extern_res_script_rs === "eval,complete1," || extern_res_script_rs == "loaded0,eval,complete1,", "extern_res_script_rs = " + extern_res_script_rs + " expected (loaded0)?,eval,complete1,"); - ok(extern_http_script_rs === "loading,loaded,complete,", - "extern_http_script_rs = " + extern_http_script_rs + " expected loading,loaded,complete,"); + ok(extern_http_script_rs === "loading,loaded,complete," || extern_http_script_rs === "complete,", + "extern_http_script_rs = " + extern_http_script_rs + " expected loading,loaded,complete, or complete,"); ok(cnt == 1, "cnt=" + cnt + " exception during loading?"); ok(this === window, "this !== window");

1 0

Andrew Eikum : winebus.sys: Report device revision number for hidraw, too.
by Alexandre Julliard Aug. 12, 2019

Aug. 12, 2019

Module: wine Branch: master Commit: d5fb7383d0066c2c3f6abfd738619414ad8f1786 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5fb7383d0066c2c3f6abfd7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 9 13:45:22 2019 -0500 winebus.sys: Report device revision number for hidraw, too. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 08ad876..d9311a9 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1124,10 +1124,23 @@ next_line: return (found_id && found_serial); } +static DWORD a_to_bcd(const char *s) +{ + DWORD r = 0; + const char *c; + int shift = strlen(s) - 1; + for (c = s; *c; ++c) + { + r |= (*c - '0') << (shift * 4); + --shift; + } + return r; +} + static void try_add_device(struct udev_device *dev) { DWORD vid = 0, pid = 0, version = 0; - struct udev_device *hiddev = NULL; + struct udev_device *hiddev = NULL, *walk_device; DEVICE_OBJECT *device = NULL; const char *subsystem; const char *devnode; @@ -1150,6 +1163,7 @@ static void try_add_device(struct udev_device *dev) hiddev = udev_device_get_parent_with_subsystem_devtype(dev, "hid", NULL); if (hiddev) { + const char *bcdDevice = NULL; #ifdef HAS_PROPER_INPUT_HEADER const platform_vtbl *other_vtbl = NULL; DEVICE_OBJECT *dup = NULL; @@ -1171,6 +1185,17 @@ static void try_add_device(struct udev_device *dev) &vid, &pid, &input, &serial); if (serial == NULL) serial = strdupAtoW(base_serial); + + walk_device = dev; + while (walk_device && !bcdDevice) + { + bcdDevice = udev_device_get_sysattr_value(walk_device, "bcdDevice"); + walk_device = udev_device_get_parent(walk_device); + } + if (bcdDevice) + { + version = a_to_bcd(bcdDevice); + } } #ifdef HAS_PROPER_INPUT_HEADER else

1 0