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

Zebediah Figura : d3dcompiler: Coerce the RHS before unwrapping swizzles.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: 1dcfb01b2944403d49a68902e582019c2f73b28a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1dcfb01b2944403d49a68902… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 3 21:06:52 2020 -0500 d3dcompiler: Coerce the RHS before unwrapping swizzles. 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 | 43 ++++++++++++------------------------------- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 767d2dee50..ec0da2d403 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1443,8 +1443,17 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign struct hlsl_ir_node *rhs) { struct hlsl_ir_assignment *assign = d3dcompiler_alloc(sizeof(*assign)); - DWORD writemask = (1 << lhs->data_type->dimx) - 1; - struct hlsl_type *type; + struct hlsl_type *lhs_type; + DWORD writemask = 0; + + lhs_type = lhs->data_type; + if (lhs_type->type <= HLSL_CLASS_LAST_NUMERIC) + { + writemask = (1 << lhs_type->dimx) - 1; + + if (!(rhs = implicit_conversion(rhs, lhs_type, &rhs->loc))) + return NULL; + } if (!assign) { @@ -1505,36 +1514,8 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign lhs = lhs_inner; } - TRACE("Creating proper assignment expression.\n"); - if (writemask == BWRITERSP_WRITEMASK_ALL) - type = lhs->data_type; - else - { - unsigned int dimx = 0; - DWORD bitmask; - enum hlsl_type_class type_class; - - bitmask = writemask & ((1 << lhs->data_type->dimx) - 1); - while (bitmask) - { - if (bitmask & 1) - dimx++; - bitmask >>= 1; - } - if (lhs->data_type->type == HLSL_CLASS_MATRIX) - FIXME("Assignments with writemasks and matrices on lhs are not supported yet.\n"); - if (dimx == 1) - type_class = HLSL_CLASS_SCALAR; - else - type_class = lhs->data_type->type; - type = new_hlsl_type(NULL, type_class, lhs->data_type->base_type, dimx, 1); - } - - init_node(&assign->node, HLSL_IR_ASSIGNMENT, type, lhs->loc); + init_node(&assign->node, HLSL_IR_ASSIGNMENT, lhs_type, lhs->loc); assign->writemask = writemask; - - rhs = implicit_conversion(rhs, type, &rhs->loc); - assign->lhs = load_from_node(lhs)->src; if (assign_op != ASSIGN_OP_ASSIGN) {

1 0

Zebediah Figura : d3dcompiler: Fix matrix dimension declaration for matrix<...> syntax.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: f114a0a8e6bd81f7f943e26d8a57e49e7424a755 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f114a0a8e6bd81f7f943e26d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 3 21:06:53 2020 -0500 d3dcompiler: Fix matrix dimension declaration for matrix<...> syntax. Addendum to 4952bcfa4cf. 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 | 2 +- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 1797996ddb..820352b046 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1866,7 +1866,7 @@ type: base_type YYABORT; } - $$ = new_hlsl_type(NULL, HLSL_CLASS_MATRIX, $3->base_type, $5, $7); + $$ = new_hlsl_type(NULL, HLSL_CLASS_MATRIX, $3->base_type, $7, $5); } base_type: diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index c8cf86d05c..059f39e4c3 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -897,9 +897,10 @@ static void test_constant_table(void) "uniform float2 g[5];\n" "uniform matrix_t i;\n" "uniform struct matrix_record j;\n" + "uniform matrix<float,3,1> k;\n" "float4 main(uniform float4 h) : COLOR\n" "{\n" - " return a + b + c._31 + d._31 + f.d._22 + g[e].x + h + i._33 + j.a._33;\n" + " return a + b + c._31 + d._31 + f.d._22 + g[e].x + h + i._33 + j.a._33 + k._31;\n" "}"; D3DXCONSTANTTABLE_DESC table_desc; @@ -923,6 +924,7 @@ static void test_constant_table(void) {"g", D3DXRS_FLOAT4, 0, 5, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 2, 5, 0, 40}, {"i", D3DXRS_FLOAT4, 0, 3, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 3, 3, 1, 0, 36}, {"j", D3DXRS_FLOAT4, 0, 3, D3DXPC_STRUCT, D3DXPT_VOID, 1, 9, 1, 1, 36}, + {"k", D3DXRS_FLOAT4, 0, 3, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 3, 1, 1, 0, 12}, }; static const D3DXCONSTANT_DESC expect_fields_f[] =

1 0

Zebediah Figura : d3dcompiler: Use hlsl_report_message() where possible.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: 3b662459223927e2c8b439a5834862408bf921e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b662459223927e2c8b439a5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 3 21:06:54 2020 -0500 d3dcompiler: Use hlsl_report_message() where possible. 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 | 111 ++++++++++++++++++++++----------------------- 1 file changed, 54 insertions(+), 57 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 820352b046..436b731fd1 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1826,48 +1826,52 @@ input_mod: KW_IN $$ = HLSL_STORAGE_IN | HLSL_STORAGE_OUT; } -type: base_type - { - $$ = $1; - } - | KW_VECTOR '<' base_type ',' C_INTEGER '>' - { - if ($3->type != HLSL_CLASS_SCALAR) - { - hlsl_message("Line %u: vectors of non-scalar types are not allowed.\n", - hlsl_ctx.line_no); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); - YYABORT; - } - if ($5 < 1 || $5 > 4) - { - hlsl_message("Line %u: vector size must be between 1 and 4.\n", - hlsl_ctx.line_no); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); - YYABORT; - } +type: - $$ = new_hlsl_type(NULL, HLSL_CLASS_VECTOR, $3->base_type, $5, 1); - } - | KW_MATRIX '<' base_type ',' C_INTEGER ',' C_INTEGER '>' - { - if ($3->type != HLSL_CLASS_SCALAR) - { - hlsl_message("Line %u: matrices of non-scalar types are not allowed.\n", - hlsl_ctx.line_no); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); - YYABORT; - } - if ($5 < 1 || $5 > 4 || $7 < 1 || $7 > 4) - { - hlsl_message("Line %u: matrix dimensions must be between 1 and 4.\n", - hlsl_ctx.line_no); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); - YYABORT; - } + base_type + { + $$ = $1; + } + | KW_VECTOR '<' base_type ',' C_INTEGER '>' + { + if ($3->type != HLSL_CLASS_SCALAR) + { + hlsl_report_message(get_location(&@3), HLSL_LEVEL_ERROR, + "vectors of non-scalar types are not allowed\n"); + YYABORT; + } + if ($5 < 1 || $5 > 4) + { + hlsl_report_message(get_location(&@5), HLSL_LEVEL_ERROR, + "vector size must be between 1 and 4\n"); + YYABORT; + } - $$ = new_hlsl_type(NULL, HLSL_CLASS_MATRIX, $3->base_type, $7, $5); - } + $$ = new_hlsl_type(NULL, HLSL_CLASS_VECTOR, $3->base_type, $5, 1); + } + | KW_MATRIX '<' base_type ',' C_INTEGER ',' C_INTEGER '>' + { + if ($3->type != HLSL_CLASS_SCALAR) + { + hlsl_report_message(get_location(&@3), HLSL_LEVEL_ERROR, + "matrices of non-scalar types are not allowed\n"); + YYABORT; + } + if ($5 < 1 || $5 > 4) + { + hlsl_report_message(get_location(&@5), HLSL_LEVEL_ERROR, + "matrix row count must be between 1 and 4\n"); + YYABORT; + } + if ($7 < 1 || $7 > 4) + { + hlsl_report_message(get_location(&@7), HLSL_LEVEL_ERROR, + "matrix column count must be between 1 and 4\n"); + YYABORT; + } + + $$ = new_hlsl_type(NULL, HLSL_CLASS_MATRIX, $3->base_type, $7, $5); + } base_type: @@ -1904,11 +1908,7 @@ base_type: { $$ = get_type(hlsl_ctx.cur_scope, $2, TRUE); if ($$->type != HLSL_CLASS_STRUCT) - { - hlsl_message("Line %u: redefining %s as a structure.\n", - hlsl_ctx.line_no, $2); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); - } + hlsl_report_message(get_location(&@1), HLSL_LEVEL_ERROR, "'%s' redefined as a structure\n", $2); d3dcompiler_free($2); } @@ -2291,9 +2291,8 @@ primary_expr: C_FLOAT if (!(var = get_variable(hlsl_ctx.cur_scope, $1))) { - hlsl_message("Line %d: variable '%s' not declared\n", - hlsl_ctx.line_no, $1); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); + hlsl_report_message(get_location(&@1), HLSL_LEVEL_ERROR, + "variable '%s' is not declared\n", $1); YYABORT; } if ((load = new_var_load(var, get_location(&@1)))) @@ -2425,23 +2424,21 @@ postfix_expr: primary_expr TRACE("%s constructor.\n", debug_hlsl_type($2)); if ($1) { - hlsl_message("Line %u: unexpected modifier in a constructor.\n", - hlsl_ctx.line_no); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); + hlsl_report_message(get_location(&@1), HLSL_LEVEL_ERROR, + "unexpected modifier on a constructor\n"); YYABORT; } if ($2->type > HLSL_CLASS_LAST_NUMERIC) { - hlsl_message("Line %u: constructors are allowed only for numeric data types.\n", - hlsl_ctx.line_no); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); + hlsl_report_message(get_location(&@2), HLSL_LEVEL_ERROR, + "constructors may only be used with numeric data types\n"); YYABORT; } if ($2->dimx * $2->dimy != initializer_size(&$4)) { - hlsl_message("Line %u: wrong number of components in constructor.\n", - hlsl_ctx.line_no); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); + hlsl_report_message(get_location(&@4), HLSL_LEVEL_ERROR, + "expected %u components in constructor, but got %u\n", + $2->dimx * $2->dimy, initializer_size(&$4)); YYABORT; } assert($4.args_count <= ARRAY_SIZE(constructor->args));

1 0

Jacek Caban : jscript: Throw proper stack overflow exception.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: 3e9d32ca43b71be2a8e64984b81742316d21527b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e9d32ca43b71be2a8e64984… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 4 17:29:11 2020 +0200 jscript: Throw proper stack overflow exception. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 2 +- dlls/jscript/jscript.h | 1 + dlls/jscript/jscript.rc | 1 + dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 10 ++++- po/ar.po | 100 ++++++++++++++++++++++++---------------------- po/ast.po | 98 +++++++++++++++++++++++---------------------- po/bg.po | 100 ++++++++++++++++++++++++---------------------- po/ca.po | 100 ++++++++++++++++++++++++---------------------- po/cs.po | 100 ++++++++++++++++++++++++---------------------- po/da.po | 100 ++++++++++++++++++++++++---------------------- po/de.po | 100 ++++++++++++++++++++++++---------------------- po/el.po | 100 ++++++++++++++++++++++++---------------------- po/en.po | 98 +++++++++++++++++++++++---------------------- po/en_US.po | 98 +++++++++++++++++++++++---------------------- po/eo.po | 100 ++++++++++++++++++++++++---------------------- po/es.po | 100 ++++++++++++++++++++++++---------------------- po/fa.po | 98 +++++++++++++++++++++++---------------------- po/fi.po | 100 ++++++++++++++++++++++++---------------------- po/fr.po | 100 ++++++++++++++++++++++++---------------------- po/he.po | 100 ++++++++++++++++++++++++---------------------- po/hi.po | 98 +++++++++++++++++++++++---------------------- po/hr.po | 100 ++++++++++++++++++++++++---------------------- po/hu.po | 100 ++++++++++++++++++++++++---------------------- po/it.po | 100 ++++++++++++++++++++++++---------------------- po/ja.po | 100 ++++++++++++++++++++++++---------------------- po/ko.po | 100 ++++++++++++++++++++++++---------------------- po/lt.po | 100 ++++++++++++++++++++++++---------------------- po/ml.po | 98 +++++++++++++++++++++++---------------------- po/nb_NO.po | 100 ++++++++++++++++++++++++---------------------- po/nl.po | 100 ++++++++++++++++++++++++---------------------- po/or.po | 98 +++++++++++++++++++++++---------------------- po/pa.po | 98 +++++++++++++++++++++++---------------------- po/pl.po | 100 ++++++++++++++++++++++++---------------------- po/pt_BR.po | 100 ++++++++++++++++++++++++---------------------- po/pt_PT.po | 100 ++++++++++++++++++++++++---------------------- po/rm.po | 98 +++++++++++++++++++++++---------------------- po/ro.po | 100 ++++++++++++++++++++++++---------------------- po/ru.po | 100 ++++++++++++++++++++++++---------------------- po/si.po | 100 ++++++++++++++++++++++++---------------------- po/sk.po | 100 ++++++++++++++++++++++++---------------------- po/sl.po | 100 ++++++++++++++++++++++++---------------------- po/sr_RS(a)cyrillic.po | 100 ++++++++++++++++++++++++---------------------- po/sr_RS(a)latin.po | 100 ++++++++++++++++++++++++---------------------- po/sv.po | 100 ++++++++++++++++++++++++---------------------- po/ta.po | 98 +++++++++++++++++++++++---------------------- po/te.po | 98 +++++++++++++++++++++++---------------------- po/th.po | 100 ++++++++++++++++++++++++---------------------- po/tr.po | 100 ++++++++++++++++++++++++---------------------- po/uk.po | 100 ++++++++++++++++++++++++---------------------- po/wa.po | 98 +++++++++++++++++++++++---------------------- po/wine.pot | 98 +++++++++++++++++++++++---------------------- po/zh_CN.po | 100 ++++++++++++++++++++++++---------------------- po/zh_TW.po | 100 ++++++++++++++++++++++++---------------------- 54 files changed, 2583 insertions(+), 2306 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3e9d32ca43b71be2a8e6…

1 0

Jacek Caban : mshtml/tests: Improve tests exception handling.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: 78d6d41c4cb7be9a2f1f7e8c0fe5dac99e709f94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78d6d41c4cb7be9a2f1f7e8c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 4 17:29:19 2020 +0200 mshtml/tests: Improve tests exception handling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/winetest.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/winetest.js b/dlls/mshtml/tests/winetest.js index 7e8cbfc9b2..6d99adf12b 100644 --- a/dlls/mshtml/tests/winetest.js +++ b/dlls/mshtml/tests/winetest.js @@ -23,10 +23,11 @@ function guard(f) { }catch(e) { var msg = "Got exception "; if(e && typeof(e) == "object" && "message") - msg += e.msg; + msg += e.message; else msg += e; ok(false, msg); + if("tests" in window) next_test(); } }; }

1 0

Jacek Caban : jscript: Add Object.keys implementation.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: 102fe73e66859127794cca9bd884a71a78175220 URL: https://source.winehq.org/git/wine.git/?a=commit;h=102fe73e66859127794cca9b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 4 17:29:51 2020 +0200 jscript: Add Object.keys implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 11 +++++++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/object.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/es5.js | 16 +++++++++++++++ 4 files changed, 77 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index e986de6ef2..d9097c47dd 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2572,3 +2572,14 @@ HRESULT jsdisp_define_data_property(jsdisp_t *obj, const WCHAR *name, unsigned f prop_desc.value = value; return jsdisp_define_property(obj, name, &prop_desc); } + +HRESULT jsdisp_get_prop_name(jsdisp_t *obj, DISPID id, jsstr_t **r) +{ + dispex_prop_t *prop = get_prop(obj, id); + + if(!prop || !prop->name || prop->type == PROP_DELETED) + return DISP_E_MEMBERNOTFOUND; + + *r = jsstr_alloc(prop->name); + return *r ? S_OK : E_OUTOFMEMORY; +} diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index b84f62ff33..e1ab5e5824 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -314,6 +314,7 @@ HRESULT jsdisp_get_own_property(jsdisp_t*,const WCHAR*,BOOL,property_desc_t*) DE HRESULT jsdisp_define_property(jsdisp_t*,const WCHAR*,property_desc_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_define_data_property(jsdisp_t*,const WCHAR*,unsigned,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_next_prop(jsdisp_t*,DISPID,BOOL,DISPID*) DECLSPEC_HIDDEN; +HRESULT jsdisp_get_prop_name(jsdisp_t*,DISPID,jsstr_t**); HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index ef249e91a9..bac79ebde2 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -610,7 +610,7 @@ static HRESULT Object_getPrototypeOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl return E_NOTIMPL; } - TRACE("(%s)\n", debugstr_jsval(argv[1])); + TRACE("(%s)\n", debugstr_jsval(argv[0])); obj = to_jsdisp(get_object(argv[0])); if(!obj) { @@ -625,12 +625,59 @@ static HRESULT Object_getPrototypeOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl return S_OK; } +static HRESULT Object_keys(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, + unsigned argc, jsval_t *argv, jsval_t *r) +{ + DISPID id = DISPID_STARTENUM; + jsdisp_t *obj, *array; + unsigned i = 0; + jsstr_t *key; + HRESULT hres; + + if(!argc || !is_object_instance(argv[0])) { + FIXME("invalid arguments %s\n", debugstr_jsval(argv[0])); + return E_NOTIMPL; + } + + TRACE("(%s)\n", debugstr_jsval(argv[0])); + + obj = to_jsdisp(get_object(argv[0])); + if(!obj) { + FIXME("Non-JS object\n"); + return E_NOTIMPL; + } + + hres = create_array(ctx, 0, &array); + if(FAILED(hres)) + return hres; + + do { + hres = jsdisp_next_prop(obj, id, TRUE, &id); + if(hres != S_OK) + break; + + hres = jsdisp_get_prop_name(obj, id, &key); + if(FAILED(hres)) + break; + + hres = jsdisp_propput_idx(array, i++, jsval_string(key)); + jsstr_release(key); + } while(hres == S_OK); + + if(SUCCEEDED(hres) && r) + *r = jsval_obj(array); + else + jsdisp_release(array); + return hres; +} + static const builtin_prop_t ObjectConstr_props[] = { {L"create", Object_create, PROPF_ES5|PROPF_METHOD|2}, {L"defineProperties", Object_defineProperties, PROPF_ES5|PROPF_METHOD|2}, {L"defineProperty", Object_defineProperty, PROPF_ES5|PROPF_METHOD|2}, {L"getOwnPropertyDescriptor", Object_getOwnPropertyDescriptor, PROPF_ES5|PROPF_METHOD|2}, - {L"getPrototypeOf", Object_getPrototypeOf, PROPF_ES5|PROPF_METHOD|1} + {L"getPrototypeOf", Object_getPrototypeOf, PROPF_ES5|PROPF_METHOD|1}, + {L"keys", Object_keys, PROPF_ES5|PROPF_METHOD|1} }; static const builtin_info_t ObjectConstr_info = { diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index dca5821c0c..c179ca143f 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -865,3 +865,19 @@ sync_test("bind", function() { ok(Function.prototype.bind.length === 1, "Function.prototype.bind.length = " + Function.prototype.bind.length); }); + +sync_test("keys", function() { + var o = { a: 1, b: 2, c: 3 }; + var keys = Object.keys(o).sort().join(); + ok(keys === "a,b,c", "keys = " + keys); + + o = Object.create(o); + keys = Object.keys(o).sort().join(); + ok(keys === "", "keys = " + keys); + + o.test = 1; + keys = Object.keys(o).sort().join(); + ok(keys === "test", "keys = " + keys); + + ok(Object.keys.length === 1, "Object.keys.length = " + Object.keys.length); +});

1 0

Jacek Caban : jscript: Use wide string literals in array.c.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: 7bb9e5a13bfccd23d52b8658255fb6a7e4542e33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bb9e5a13bfccd23d52b8658… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 4 17:30:06 2020 +0200 jscript: Use wide string literals in array.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/array.c | 77 ++++++++++++++++++---------------------------------- 1 file changed, 26 insertions(+), 51 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index f8ae12a7d8..5d50b9249e 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -32,25 +32,6 @@ typedef struct { DWORD length; } ArrayInstance; -static const WCHAR lengthW[] = {'l','e','n','g','t','h',0}; -static const WCHAR concatW[] = {'c','o','n','c','a','t',0}; -static const WCHAR forEachW[] = {'f','o','r','E','a','c','h',0}; -static const WCHAR joinW[] = {'j','o','i','n',0}; -static const WCHAR popW[] = {'p','o','p',0}; -static const WCHAR pushW[] = {'p','u','s','h',0}; -static const WCHAR reverseW[] = {'r','e','v','e','r','s','e',0}; -static const WCHAR shiftW[] = {'s','h','i','f','t',0}; -static const WCHAR sliceW[] = {'s','l','i','c','e',0}; -static const WCHAR sortW[] = {'s','o','r','t',0}; -static const WCHAR spliceW[] = {'s','p','l','i','c','e',0}; -static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; -static const WCHAR toLocaleStringW[] = {'t','o','L','o','c','a','l','e','S','t','r','i','n','g',0}; -static const WCHAR unshiftW[] = {'u','n','s','h','i','f','t',0}; -static const WCHAR indexOfW[] = {'i','n','d','e','x','O','f',0}; -static const WCHAR mapW[] = {'m','a','p',0}; - -static const WCHAR default_separatorW[] = {',',0}; - static inline ArrayInstance *array_from_jsdisp(jsdisp_t *jsdisp) { return CONTAINING_RECORD(jsdisp, ArrayInstance, dispex); @@ -88,7 +69,7 @@ static HRESULT get_length(script_ctx_t *ctx, vdisp_t *vdisp, jsdisp_t **jsthis, if(!is_jsdisp(vdisp)) return JS_E_JSCRIPT_EXPECTED; - hres = jsdisp_propget_name(vdisp->u.jsdisp, lengthW, &val); + hres = jsdisp_propget_name(vdisp->u.jsdisp, L"length", &val); if(FAILED(hres)) return hres; @@ -108,7 +89,7 @@ static HRESULT set_length(jsdisp_t *obj, DWORD length) return S_OK; } - return jsdisp_propput_name(obj, lengthW, jsval_number(length)); + return jsdisp_propput_name(obj, L"length", jsval_number(length)); } static WCHAR *idx_to_str(DWORD idx, WCHAR *ptr) @@ -354,7 +335,7 @@ static HRESULT Array_join(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne jsstr_release(sep_str); }else { - hres = array_join(ctx, jsthis, length, default_separatorW, lstrlenW(default_separatorW), r); + hres = array_join(ctx, jsthis, length, L",", 1, r); } return hres; @@ -878,7 +859,7 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsig } if(SUCCEEDED(hres)) - hres = jsdisp_propput_name(ret_array, lengthW, jsval_number(delete_cnt)); + hres = jsdisp_propput_name(ret_array, L"length", jsval_number(delete_cnt)); } if(add_args < delete_cnt) { @@ -910,7 +891,7 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsig hres = jsdisp_propput_idx(jsthis, start+i, argv[i+2]); if(SUCCEEDED(hres)) - hres = jsdisp_propput_name(jsthis, lengthW, jsval_number(length-delete_cnt+add_args)); + hres = jsdisp_propput_name(jsthis, L"length", jsval_number(length-delete_cnt+add_args)); if(FAILED(hres)) { if(ret_array) @@ -935,8 +916,7 @@ static HRESULT Array_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un if(!array) return JS_E_ARRAY_EXPECTED; - return array_join(ctx, &array->dispex, array->length, default_separatorW, - lstrlenW(default_separatorW), r); + return array_join(ctx, &array->dispex, array->length, L",", 1, r); } static HRESULT Array_toLocaleString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, @@ -1180,8 +1160,7 @@ static HRESULT Array_get_value(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) TRACE("\n"); - return array_join(ctx, &array->dispex, array->length, default_separatorW, - lstrlenW(default_separatorW), r); + return array_join(ctx, &array->dispex, array->length, L",", 1, r); } static void Array_destructor(jsdisp_t *dispex) @@ -1211,22 +1190,22 @@ static void Array_on_put(jsdisp_t *dispex, const WCHAR *name) } static const builtin_prop_t Array_props[] = { - {concatW, Array_concat, PROPF_METHOD|1}, - {forEachW, Array_forEach, PROPF_METHOD|PROPF_ES5|1}, - {indexOfW, Array_indexOf, PROPF_METHOD|PROPF_ES5|1}, - {joinW, Array_join, PROPF_METHOD|1}, - {lengthW, NULL,0, Array_get_length, Array_set_length}, - {mapW, Array_map, PROPF_METHOD|PROPF_ES5|1}, - {popW, Array_pop, PROPF_METHOD}, - {pushW, Array_push, PROPF_METHOD|1}, - {reverseW, Array_reverse, PROPF_METHOD}, - {shiftW, Array_shift, PROPF_METHOD}, - {sliceW, Array_slice, PROPF_METHOD|2}, - {sortW, Array_sort, PROPF_METHOD|1}, - {spliceW, Array_splice, PROPF_METHOD|2}, - {toLocaleStringW, Array_toLocaleString, PROPF_METHOD}, - {toStringW, Array_toString, PROPF_METHOD}, - {unshiftW, Array_unshift, PROPF_METHOD|1}, + {L"concat", Array_concat, PROPF_METHOD|1}, + {L"forEach", Array_forEach, PROPF_METHOD|PROPF_ES5|1}, + {L"indexOf", Array_indexOf, PROPF_METHOD|PROPF_ES5|1}, + {L"join", Array_join, PROPF_METHOD|1}, + {L"length", NULL,0, Array_get_length, Array_set_length}, + {L"map", Array_map, PROPF_METHOD|PROPF_ES5|1}, + {L"pop", Array_pop, PROPF_METHOD}, + {L"push", Array_push, PROPF_METHOD|1}, + {L"reverse", Array_reverse, PROPF_METHOD}, + {L"shift", Array_shift, PROPF_METHOD}, + {L"slice", Array_slice, PROPF_METHOD|2}, + {L"sort", Array_sort, PROPF_METHOD|1}, + {L"splice", Array_splice, PROPF_METHOD|2}, + {L"toLocaleString", Array_toLocaleString, PROPF_METHOD}, + {L"toString", Array_toString, PROPF_METHOD}, + {L"unshift", Array_unshift, PROPF_METHOD|1}, }; static const builtin_info_t Array_info = { @@ -1239,7 +1218,7 @@ static const builtin_info_t Array_info = { }; static const builtin_prop_t ArrayInst_props[] = { - {lengthW, NULL,0, Array_get_length, Array_set_length} + {L"length", NULL,0, Array_get_length, Array_set_length} }; static const builtin_info_t ArrayInst_info = { @@ -1343,10 +1322,8 @@ static HRESULT alloc_array(script_ctx_t *ctx, jsdisp_t *object_prototype, ArrayI return S_OK; } -static const WCHAR isArrayW[] = {'i','s','A','r','r','a','y',0}; - static const builtin_prop_t ArrayConstr_props[] = { - {isArrayW, ArrayConstr_isArray, PROPF_ES5|PROPF_METHOD|1} + {L"isArray", ArrayConstr_isArray, PROPF_ES5|PROPF_METHOD|1} }; static const builtin_info_t ArrayConstr_info = { @@ -1363,13 +1340,11 @@ HRESULT create_array_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdis ArrayInstance *array; HRESULT hres; - static const WCHAR ArrayW[] = {'A','r','r','a','y',0}; - hres = alloc_array(ctx, object_prototype, &array); if(FAILED(hres)) return hres; - hres = create_builtin_constructor(ctx, ArrayConstr_value, ArrayW, &ArrayConstr_info, PROPF_CONSTR|1, &array->dispex, ret); + hres = create_builtin_constructor(ctx, ArrayConstr_value, L"Array", &ArrayConstr_info, PROPF_CONSTR|1, &array->dispex, ret); jsdisp_release(&array->dispex); return hres;

1 0

Jacek Caban : jscript: Add Array.prototype.reduce implementation.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: 3c72034b72014a087eae8d181252c67cb0782e28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c72034b72014a087eae8d18… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 4 17:30:22 2020 +0200 jscript: Add Array.prototype.reduce implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/array.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/es5.js | 47 ++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 5d50b9249e..7941031e49 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -1048,7 +1048,7 @@ static HRESULT Array_map(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned return hres; } - /* Fixme check IsCallable */ + /* FIXME: check IsCallable */ if(!argc || !is_object_instance(argv[0]) || !get_object(argv[0])) { FIXME("Invalid arg %s\n", debugstr_jsval(argc ? argv[0] : jsval_undefined())); return E_INVALIDARG; @@ -1094,6 +1094,74 @@ static HRESULT Array_map(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned return hres; } +static HRESULT Array_reduce(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +{ + IDispatch *context_this = NULL, *callback; + jsval_t callback_args[4], acc, new_acc; + BOOL have_value = FALSE; + jsdisp_t *jsthis; + DWORD length, k; + HRESULT hres; + + TRACE("\n"); + + hres = get_length(ctx, vthis, &jsthis, &length); + if(FAILED(hres)) { + FIXME("Could not get length\n"); + return hres; + } + + /* Fixme check IsCallable */ + if(!argc || !is_object_instance(argv[0]) || !get_object(argv[0])) { + FIXME("Invalid arg %s\n", debugstr_jsval(argc ? argv[0] : jsval_undefined())); + return E_INVALIDARG; + } + callback = get_object(argv[0]); + + if(argc > 1) { + have_value = TRUE; + hres = jsval_copy(argv[1], &acc); + if(FAILED(hres)) + return hres; + } + + for(k = 0; k < length; k++) { + hres = jsdisp_get_idx(jsthis, k, &callback_args[1]); + if(hres == DISP_E_UNKNOWNNAME) + continue; + if(FAILED(hres)) + break; + + if(!have_value) { + have_value = TRUE; + acc = callback_args[1]; + continue; + } + + callback_args[0] = acc; + callback_args[2] = jsval_number(k); + callback_args[3] = jsval_obj(jsthis); + hres = disp_call_value(ctx, callback, context_this, DISPATCH_METHOD, ARRAY_SIZE(callback_args), callback_args, &new_acc); + jsval_release(callback_args[1]); + if(FAILED(hres)) + break; + + jsval_release(acc); + acc = new_acc; + } + + if(SUCCEEDED(hres) && !have_value) { + WARN("No array element\n"); + hres = JS_E_INVALID_ACTION; + } + + if(SUCCEEDED(hres) && r) + *r = acc; + else if(have_value) + jsval_release(acc); + return hres; +} + /* ECMA-262 3rd Edition 15.4.4.13 */ static HRESULT Array_unshift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) @@ -1198,6 +1266,7 @@ static const builtin_prop_t Array_props[] = { {L"map", Array_map, PROPF_METHOD|PROPF_ES5|1}, {L"pop", Array_pop, PROPF_METHOD}, {L"push", Array_push, PROPF_METHOD|1}, + {L"reduce", Array_reduce, PROPF_METHOD|PROPF_ES5|1}, {L"reverse", Array_reverse, PROPF_METHOD}, {L"shift", Array_shift, PROPF_METHOD}, {L"slice", Array_slice, PROPF_METHOD|2}, diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index c179ca143f..f268eba24c 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -881,3 +881,50 @@ sync_test("keys", function() { ok(Object.keys.length === 1, "Object.keys.length = " + Object.keys.length); }); + +sync_test("reduce", function() { + var r, array; + + r = [1,2,3].reduce(function(a, value) { return a + value + 10; }); + ok(r === 26, "reduce() returned " + r); + + r = [1,2,3].reduce(function(a, value) { return a + value + 10; }, 1); + ok(r === 37, "reduce() returned " + r); + + r = [1,2,3].reduce(function(a, value) { return a + value; }, "str"); + ok(r === "str123", "reduce() returned " + r); + + array = [1,2,3]; + r = array.reduce(function(a, value, index, src) { + ok(src === array, "src != array"); + return a + "(" + index + "," + value + ")"; + }, "str"); + ok(r === "str(0,1)(1,2)(2,3)", "reduce() returned " + r); + + r = [1,2,3].reduce(function(a, value, index, src) { + src[0] = false; + delete src[1]; + src[2] = "test"; + return a + value; + }, ""); + ok(r === "1test", "reduce() returned " + r); + + r = [1].reduce(function(a) { return 0; }); + ok(r === 1, "[1].reduce() returned " + r); + + r = [1].reduce(function(a) { return 0; }, 2); + ok(r === 0, "[1].reduce(2) returned " + r); + + r = [].reduce(function(a) { return 0; }, 2); + ok(r === 2, "[].reduce(2) returned " + r); + + r = [].reduce(function(a) { return 0; }, undefined); + ok(r === undefined, "[].reduce(undefined) returned " + r); + + try { + [].reduce(function(a) { return 0; }); + ok(false, "expected exception"); + }catch(e) {trace(e.message);} + + ok(Array.prototype.reduce.length === 1, "Array.prototype.reduce.length = " + Array.prototype.reduce.length); +});

1 0

Alexandre Julliard : ntdll: Move the section object functions to the Unix library.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: cdfc45859c299aa629482ee06614c9819346b444 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdfc45859c299aa629482ee0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 4 21:34:28 2020 +0200 ntdll: Move the section object functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 + dlls/ntdll/unix/sync.c | 77 +++++++++++++++++++++++++++++++++ dlls/ntdll/unixlib.h | 7 ++- dlls/ntdll/virtual.c | 108 +---------------------------------------------- 4 files changed, 87 insertions(+), 107 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 0e93978993..767cae92b4 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -991,6 +991,7 @@ static struct unix_funcs unix_funcs = NtCreateEvent, NtCreateKeyedEvent, NtCreateMutant, + NtCreateSection, NtCreateSemaphore, NtCreateTimer, NtCurrentTeb, @@ -1005,6 +1006,7 @@ static struct unix_funcs unix_funcs = NtOpenEvent, NtOpenKeyedEvent, NtOpenMutant, + NtOpenSection, NtOpenSemaphore, NtOpenTimer, NtProtectVirtualMemory, diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index cea005fefb..c67eb70697 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -871,3 +871,80 @@ NTSTATUS WINAPI NtReleaseKeyedEvent( HANDLE handle, const void *key, select_op.keyed_event.key = wine_server_client_ptr( key ); return server_wait( &select_op, sizeof(select_op.keyed_event), flags, timeout ); } + + +/*********************************************************************** + * NtCreateSection (NTDLL.@) + */ +NTSTATUS WINAPI NtCreateSection( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, + const LARGE_INTEGER *size, ULONG protect, + ULONG sec_flags, HANDLE file ) +{ + NTSTATUS ret; + unsigned int file_access; + data_size_t len; + struct object_attributes *objattr; + + switch (protect & 0xff) + { + case PAGE_READONLY: + case PAGE_EXECUTE_READ: + case PAGE_WRITECOPY: + case PAGE_EXECUTE_WRITECOPY: + file_access = FILE_READ_DATA; + break; + case PAGE_READWRITE: + case PAGE_EXECUTE_READWRITE: + if (sec_flags & SEC_IMAGE) file_access = FILE_READ_DATA; + else file_access = FILE_READ_DATA | FILE_WRITE_DATA; + break; + case PAGE_EXECUTE: + case PAGE_NOACCESS: + file_access = 0; + break; + default: + return STATUS_INVALID_PAGE_PROTECTION; + } + + if ((ret = alloc_object_attributes( attr, &objattr, &len ))) return ret; + + SERVER_START_REQ( create_mapping ) + { + req->access = access; + req->flags = sec_flags; + req->file_handle = wine_server_obj_handle( file ); + req->file_access = file_access; + req->size = size ? size->QuadPart : 0; + wine_server_add_data( req, objattr, len ); + ret = wine_server_call( req ); + *handle = wine_server_ptr_handle( reply->handle ); + } + SERVER_END_REQ; + + RtlFreeHeap( GetProcessHeap(), 0, objattr ); + return ret; +} + + +/*********************************************************************** + * NtOpenSection (NTDLL.@) + */ +NTSTATUS WINAPI NtOpenSection( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) +{ + NTSTATUS ret; + + if ((ret = validate_open_object_attributes( attr ))) return ret; + + SERVER_START_REQ( open_mapping ) + { + req->access = access; + req->attributes = attr->Attributes; + req->rootdir = wine_server_obj_handle( attr->RootDirectory ); + if (attr->ObjectName) + wine_server_add_data( req, attr->ObjectName->Buffer, attr->ObjectName->Length ); + ret = wine_server_call( req ); + *handle = wine_server_ptr_handle( reply->handle ); + } + SERVER_END_REQ; + return ret; +} diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index df8f271383..4e5cec6637 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -28,7 +28,7 @@ struct ldt_copy; struct msghdr; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 26 +#define NTDLL_UNIXLIB_VERSION 27 struct unix_funcs { @@ -45,6 +45,9 @@ struct unix_funcs const OBJECT_ATTRIBUTES *attr, ULONG flags ); NTSTATUS (WINAPI *NtCreateMutant)( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, BOOLEAN owned ); + NTSTATUS (WINAPI *NtCreateSection)( HANDLE *handle, ACCESS_MASK access, + const OBJECT_ATTRIBUTES *attr, const LARGE_INTEGER *size, + ULONG protect, ULONG sec_flags, HANDLE file ); NTSTATUS (WINAPI *NtCreateSemaphore)( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, LONG initial, LONG max ); NTSTATUS (WINAPI *NtCreateTimer)( HANDLE *handle, ACCESS_MASK access, @@ -72,6 +75,8 @@ struct unix_funcs const OBJECT_ATTRIBUTES *attr ); NTSTATUS (WINAPI *NtOpenMutant)( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ); + NTSTATUS (WINAPI *NtOpenSection)( HANDLE *handle, ACCESS_MASK access, + const OBJECT_ATTRIBUTES *attr ); NTSTATUS (WINAPI *NtOpenSemaphore)( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ); NTSTATUS (WINAPI *NtOpenTimer)( HANDLE *handle, ACCESS_MASK access, diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index e277de16fe..6d5c98b58e 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -63,17 +63,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(virtual); -/* per-page protection flags */ -#define VPROT_READ 0x01 -#define VPROT_WRITE 0x02 -#define VPROT_EXEC 0x04 -#define VPROT_WRITECOPY 0x08 -#define VPROT_GUARD 0x10 -#define VPROT_COMMITTED 0x20 -#define VPROT_WRITEWATCH 0x40 -/* per-mapping protection flags */ -#define VPROT_SYSTEM 0x0200 /* system view (underlying mmap not under our control) */ - static const UINT page_shift = 12; static const UINT_PTR page_mask = 0xfff; @@ -84,59 +73,6 @@ static SIZE_T signal_stack_align; #define ROUND_SIZE(addr,size) \ (((SIZE_T)(size) + ((UINT_PTR)(addr) & page_mask) + page_mask) & ~page_mask) -/*********************************************************************** - * get_vprot_flags - * - * Build page protections from Win32 flags. - * - * PARAMS - * protect [I] Win32 protection flags - * - * RETURNS - * Value of page protection flags - */ -static NTSTATUS get_vprot_flags( DWORD protect, unsigned int *vprot, BOOL image ) -{ - switch(protect & 0xff) - { - case PAGE_READONLY: - *vprot = VPROT_READ; - break; - case PAGE_READWRITE: - if (image) - *vprot = VPROT_READ | VPROT_WRITECOPY; - else - *vprot = VPROT_READ | VPROT_WRITE; - break; - case PAGE_WRITECOPY: - *vprot = VPROT_READ | VPROT_WRITECOPY; - break; - case PAGE_EXECUTE: - *vprot = VPROT_EXEC; - break; - case PAGE_EXECUTE_READ: - *vprot = VPROT_EXEC | VPROT_READ; - break; - case PAGE_EXECUTE_READWRITE: - if (image) - *vprot = VPROT_EXEC | VPROT_READ | VPROT_WRITECOPY; - else - *vprot = VPROT_EXEC | VPROT_READ | VPROT_WRITE; - break; - case PAGE_EXECUTE_WRITECOPY: - *vprot = VPROT_EXEC | VPROT_READ | VPROT_WRITECOPY; - break; - case PAGE_NOACCESS: - *vprot = 0; - break; - default: - return STATUS_INVALID_PAGE_PROTECTION; - } - if (protect & PAGE_GUARD) *vprot |= VPROT_GUARD; - return STATUS_SUCCESS; -} - - /********************************************************************** * RtlCreateUserStack (NTDLL.@) */ @@ -270,32 +206,7 @@ NTSTATUS WINAPI NtCreateSection( HANDLE *handle, ACCESS_MASK access, const OBJEC const LARGE_INTEGER *size, ULONG protect, ULONG sec_flags, HANDLE file ) { - NTSTATUS ret; - unsigned int vprot, file_access = 0; - data_size_t len; - struct object_attributes *objattr; - - if ((ret = get_vprot_flags( protect, &vprot, sec_flags & SEC_IMAGE ))) return ret; - if ((ret = alloc_object_attributes( attr, &objattr, &len ))) return ret; - - if (vprot & VPROT_READ) file_access |= FILE_READ_DATA; - if (vprot & VPROT_WRITE) file_access |= FILE_WRITE_DATA; - - SERVER_START_REQ( create_mapping ) - { - req->access = access; - req->flags = sec_flags; - req->file_handle = wine_server_obj_handle( file ); - req->file_access = file_access; - req->size = size ? size->QuadPart : 0; - wine_server_add_data( req, objattr, len ); - ret = wine_server_call( req ); - *handle = wine_server_ptr_handle( reply->handle ); - } - SERVER_END_REQ; - - RtlFreeHeap( GetProcessHeap(), 0, objattr ); - return ret; + return unix_funcs->NtCreateSection( handle, access, attr, size, protect, sec_flags, file ); } @@ -305,22 +216,7 @@ NTSTATUS WINAPI NtCreateSection( HANDLE *handle, ACCESS_MASK access, const OBJEC */ NTSTATUS WINAPI NtOpenSection( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) { - NTSTATUS ret; - - if ((ret = validate_open_object_attributes( attr ))) return ret; - - SERVER_START_REQ( open_mapping ) - { - req->access = access; - req->attributes = attr->Attributes; - req->rootdir = wine_server_obj_handle( attr->RootDirectory ); - if (attr->ObjectName) - wine_server_add_data( req, attr->ObjectName->Buffer, attr->ObjectName->Length ); - ret = wine_server_call( req ); - *handle = wine_server_ptr_handle( reply->handle ); - } - SERVER_END_REQ; - return ret; + return unix_funcs->NtOpenSection( handle, access, attr ); }

1 0

Alex Henrie : quartz/tests: Fix overflow in 32-bit time calculation.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: 56e72e071dfa0fd9954f765fabf8e2a9ccb01af1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56e72e071dfa0fd9954f765f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jun 3 22:38:39 2020 -0600 quartz/tests: Fix overflow in 32-bit time calculation. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/systemclock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/tests/systemclock.c b/dlls/quartz/tests/systemclock.c index 71a7ac26d8..f13e89abed 100644 --- a/dlls/quartz/tests/systemclock.c +++ b/dlls/quartz/tests/systemclock.c @@ -183,7 +183,7 @@ static void test_get_time(void) if (pGetTickCount64) time2 = pGetTickCount64() * 10000; else - time2 = GetTickCount() * 10000; + time2 = (REFERENCE_TIME)GetTickCount() * 10000; ok(hr == S_OK, "Got hr %#x.\n", hr); ok(time1 % 10000 == 0, "Expected no less than 1ms coarseness, but got time %s.\n", wine_dbgstr_longlong(time1));

1 0