June 2023 - Wine-Commits - list.winehq.org

Henri Verbeet : Release 1.8.
by Alexandre Julliard June 22, 2023

June 22, 2023

Module: vkd3d Branch: master Commit: 771e442af16228a977eebba82224f06f6d0202fe URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/771e442af16228a977eebba82224f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 21 12:00:00 2023 +0200 Release 1.8. --- ANNOUNCE | 113 ++++++++++++++++++++++-------------- AUTHORS | 2 + Makefile.am | 6 +- configure.ac | 2 +- demos/demo_xcb.h | 2 +- include/vkd3d.h | 1 + include/vkd3d_shader.h | 1 + libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d-utils/vkd3d_utils_main.c | 4 +- libs/vkd3d/state.c | 4 +- programs/vkd3d-compiler/main.c | 2 +- 11 files changed, 83 insertions(+), 56 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Don't set "allocated" for unused reserved variables.
by Alexandre Julliard June 22, 2023

June 22, 2023

Module: vkd3d Branch: master Commit: d6ac823dd61efdff3890e89f69a4597d94e44ed0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d6ac823dd61efdff3890e89f69a45… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 21 12:21:19 2023 -0500 vkd3d-shader/hlsl: Don't set "allocated" for unused reserved variables. --- libs/vkd3d-shader/hlsl_codegen.c | 7 +++---- tests/register-reservations.shader_test | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 36b66982..37afdc2d 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2710,11 +2710,10 @@ static void allocate_register_reservations(struct hlsl_ctx *ctx) type_string->buffer, get_regset_name(regset)); hlsl_release_string_buffer(ctx, type_string); } - else + else if (var->regs[regset].bind_count) { var->regs[regset].allocated = true; var->regs[regset].id = var->reg_reservation.reg_index; - var->regs[regset].bind_count = var->data_type->reg_size[regset]; TRACE("Allocated reserved %s to %c%u-%c%u.\n", var->name, var->reg_reservation.reg_type, var->reg_reservation.reg_index, var->reg_reservation.reg_type, var->reg_reservation.reg_index + var->regs[regset].bind_count); @@ -4124,10 +4123,10 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry if (TRACE_ON()) rb_for_each_entry(&ctx->functions, dump_function, ctx); - allocate_register_reservations(ctx); - calculate_resource_register_counts(ctx); + allocate_register_reservations(ctx); + allocate_temp_registers(ctx, entry_func); if (profile->major_version < 4) { diff --git a/tests/register-reservations.shader_test b/tests/register-reservations.shader_test index f5b3da17..23d4ae5c 100644 --- a/tests/register-reservations.shader_test +++ b/tests/register-reservations.shader_test @@ -114,7 +114,7 @@ probe all rgba (4.0, 4.0, 4.0, 99.0) % Overlapping reservations, both overlapping objects are unused. -[pixel shader todo] +[pixel shader] Texture2D tex1 : register(t0); Texture2D tex2 : register(t0); Texture2D tex3; @@ -125,12 +125,12 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (1.0, 1.0, 1.0, 99.0) % Overlapping reservations -[pixel shader todo] +[pixel shader] Texture2D tex1 : register(t2); Texture2D tex2 : register(t2); @@ -140,5 +140,5 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 2.0, 2.0, 99.0)

1 0

Henri Verbeet : build: List tests/object-parameters.shader_test before tests/object-references.shader_test.
by Alexandre Julliard June 22, 2023

June 22, 2023

Module: vkd3d Branch: master Commit: e17ee34b9221bba2a91360b369ec7219f5e4259b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e17ee34b9221bba2a91360b369ec7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 21 12:00:00 2023 +0200 build: List tests/object-parameters.shader_test before tests/object-references.shader_test. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 92c6d079..db67423b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -146,8 +146,8 @@ vkd3d_shader_tests = \ tests/multiple-rt.shader_test \ tests/nointerpolation.shader_test \ tests/object-field-offsets.shader_test \ - tests/object-references.shader_test \ tests/object-parameters.shader_test \ + tests/object-references.shader_test \ tests/pow.shader_test \ tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \

1 0

Zebediah Figura : vkd3d-shader/hlsl: Handle reserved vars specially in get_allocated_object().
by Alexandre Julliard June 22, 2023

June 22, 2023

Module: vkd3d Branch: master Commit: 1c1f1094a5a1a748eebc5fcb456ff8404981a00e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1c1f1094a5a1a748eebc5fcb456ff… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 21 12:00:39 2023 -0500 vkd3d-shader/hlsl: Handle reserved vars specially in get_allocated_object(). --- libs/vkd3d-shader/hlsl_codegen.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 96b4cb66..36b66982 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -3626,11 +3626,23 @@ static const struct hlsl_ir_var *get_allocated_object(struct hlsl_ctx *ctx, enum LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, const struct hlsl_ir_var, extern_entry) { - if (!var->regs[regset].allocated) + if (var->reg_reservation.reg_type == get_regset_name(regset) + && var->data_type->reg_size[regset]) + { + /* Vars with a reservation prevent non-reserved vars from being + * bound there even if the reserved vars aren't used. */ + start = var->reg_reservation.reg_index; + count = var->data_type->reg_size[regset]; + } + else if (var->regs[regset].allocated) + { + start = var->regs[regset].id; + count = var->regs[regset].bind_count; + } + else + { continue; - - start = var->regs[regset].id; - count = var->regs[regset].bind_count; + } if (start <= index && index < start + count) return var;

1 0

Nikolay Sivov : tests: Add more tests for unused registers with a reservation.
by Alexandre Julliard June 22, 2023

June 22, 2023

Module: vkd3d Branch: master Commit: 883ab880e39365a917baf4f9f0c608803bf92059 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/883ab880e39365a917baf4f9f0c60… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 18 12:06:55 2023 +0200 tests: Add more tests for unused registers with a reservation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tests/register-reservations.shader_test | 61 +++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/tests/register-reservations.shader_test b/tests/register-reservations.shader_test index 72f68c1e..f5b3da17 100644 --- a/tests/register-reservations.shader_test +++ b/tests/register-reservations.shader_test @@ -69,6 +69,36 @@ draw quad probe all rgba (1.0, 1.0, 1.0, 99.0) +% Register reservation with incorrect register type. +[pixel shader todo] +Texture2D unused : register(s0); +Texture2D tex; + +float4 main() : sv_target +{ + return tex.Load(int3(0, 0, 0)); +} + +[test] +todo draw quad +probe all rgba (0.0, 0.0, 0.0, 99.0) + + +% Register reservation with incorrect register type. +[pixel shader todo] +sampler2D unused : register(t0); +Texture2D tex; + +float4 main() : sv_target +{ + return tex.Load(int3(0, 0, 0)); +} + + +[test] +todo draw quad +probe all rgba (0.0, 0.0, 0.0, 99.0) + [pixel shader] Texture2D unused[2][2] : register(t0); Texture2D tex; @@ -81,3 +111,34 @@ float4 main() : sv_target [test] draw quad probe all rgba (4.0, 4.0, 4.0, 99.0) + + +% Overlapping reservations, both overlapping objects are unused. +[pixel shader todo] +Texture2D tex1 : register(t0); +Texture2D tex2 : register(t0); +Texture2D tex3; + +float4 main() : sv_target +{ + return tex3.Load(int3(0, 0, 0)); +} + +[test] +todo draw quad +probe all rgba (1.0, 1.0, 1.0, 99.0) + + +% Overlapping reservations +[pixel shader todo] +Texture2D tex1 : register(t2); +Texture2D tex2 : register(t2); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + +[test] +todo draw quad +probe all rgba (2.0, 2.0, 2.0, 99.0)

1 0

Francisco Casas : vkd3d-shader/d3dbc: Avoid hlsl_type_get_regset() in d3dbc.c.
by Alexandre Julliard June 22, 2023

June 22, 2023

Module: vkd3d Branch: master Commit: c1ca0dafe843b0ca7381876e1101fac1cdc7c747 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c1ca0dafe843b0ca7381876e1101f… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Jun 9 12:23:25 2023 -0400 vkd3d-shader/d3dbc: Avoid hlsl_type_get_regset() in d3dbc.c. In SM1 we can expect all variables to always belong to a single regset. structs in particular, should always be allocated to HLSL_REGSET_NUM, since they are only allowed if all their components are numeric. We are not covering the structs case because of the use of hlsl_type_get_regset(), which is currently not defined for structs. So the current shader struct { float4 a; float4 b; } apple; float4 main() : sv_target { return apple.a + apple.b; } fails with vkd3d/libs/vkd3d-shader/hlsl.c:224: Aborting, reached unreachable code. The solution is to iterate over all regsets to find the one where the variable is allocated (if any), and ignore all others. --- libs/vkd3d-shader/d3dbc.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index c35f8ca0..712613ac 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1281,10 +1281,13 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { - enum hlsl_regset regset = hlsl_type_get_regset(var->data_type); + unsigned int r; - if (!var->semantic.name && var->regs[regset].allocated) + for (r = 0; r <= HLSL_REGSET_LAST; ++r) { + if (var->semantic.name || !var->regs[r].allocated) + continue; + ++uniform_count; if (var->is_param && var->is_uniform) @@ -1321,20 +1324,23 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { - enum hlsl_regset regset = hlsl_type_get_regset(var->data_type); + unsigned int r; - if (!var->semantic.name && var->regs[regset].allocated) + for (r = 0; r <= HLSL_REGSET_LAST; ++r) { + if (var->semantic.name || !var->regs[r].allocated) + continue; + put_u32(buffer, 0); /* name */ - if (regset == HLSL_REGSET_NUMERIC) + if (r == HLSL_REGSET_NUMERIC) { - put_u32(buffer, vkd3d_make_u32(D3DXRS_FLOAT4, var->regs[regset].id)); - put_u32(buffer, var->data_type->reg_size[regset] / 4); + put_u32(buffer, vkd3d_make_u32(D3DXRS_FLOAT4, var->regs[r].id)); + put_u32(buffer, var->data_type->reg_size[r] / 4); } else { - put_u32(buffer, vkd3d_make_u32(D3DXRS_SAMPLER, var->regs[regset].id)); - put_u32(buffer, var->regs[regset].bind_count); + put_u32(buffer, vkd3d_make_u32(D3DXRS_SAMPLER, var->regs[r].id)); + put_u32(buffer, var->regs[r].bind_count); } put_u32(buffer, 0); /* type */ put_u32(buffer, 0); /* FIXME: default value */ @@ -1345,12 +1351,16 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { - enum hlsl_regset regset = hlsl_type_get_regset(var->data_type); + unsigned int r; - if (!var->semantic.name && var->regs[regset].allocated) + for (r = 0; r <= HLSL_REGSET_LAST; ++r) { - size_t var_offset = vars_start + (uniform_count * 5 * sizeof(uint32_t)); - size_t name_offset; + size_t var_offset, name_offset; + + if (var->semantic.name || !var->regs[r].allocated) + continue; + + var_offset = vars_start + (uniform_count * 5 * sizeof(uint32_t)); name_offset = put_string(buffer, var->name); set_u32(buffer, var_offset, name_offset - ctab_start);

1 0

Gabriel Ivăncescu : jscript: Don't use iface_to_jsdisp where it's not necessary to grab it.
by Alexandre Julliard June 21, 2023

June 21, 2023

Module: wine Branch: master Commit: e72e8f3ab498440ce09f6aeee7e49547aa6707be URL: https://gitlab.winehq.org/wine/wine/-/commit/e72e8f3ab498440ce09f6aeee7e495… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 21 17:58:01 2023 +0300 jscript: Don't use iface_to_jsdisp where it's not necessary to grab it. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/array.c | 3 +-- dlls/jscript/dispex.c | 3 +-- dlls/jscript/engine.c | 20 ++++++-------------- dlls/jscript/json.c | 3 +-- dlls/jscript/jsregexp.c | 16 ++++------------ 5 files changed, 13 insertions(+), 32 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 341505a335c..4e1af864a8e 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -1663,9 +1663,8 @@ static HRESULT ArrayConstr_isArray(script_ctx_t *ctx, jsval_t vthis, WORD flags, return S_OK; } - obj = iface_to_jsdisp(get_object(argv[0])); + obj = to_jsdisp(get_object(argv[0])); if(r) *r = jsval_bool(obj && is_class(obj, JSCLASS_ARRAY)); - if(obj) jsdisp_release(obj); return S_OK; } diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index c3cc41ce782..e8f7d599463 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -101,10 +101,9 @@ static inline BOOL is_function_prop(dispex_prop_t *prop) if (is_object_instance(prop->u.val)) { - jsdisp_t *jsdisp = iface_to_jsdisp(get_object(prop->u.val)); + jsdisp_t *jsdisp = to_jsdisp(get_object(prop->u.val)); if (jsdisp) ret = is_class(jsdisp, JSCLASS_FUNCTION); - jsdisp_release(jsdisp); } return ret; } diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index d5075e13500..ceaa01b0648 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -514,12 +514,9 @@ static HRESULT disp_get_id(script_ctx_t *ctx, IDispatch *disp, const WCHAR *name BSTR bstr; HRESULT hres; - jsdisp = iface_to_jsdisp(disp); - if(jsdisp) { - hres = jsdisp_get_id(jsdisp, name, flags, id); - jsdisp_release(jsdisp); - return hres; - } + jsdisp = to_jsdisp(disp); + if(jsdisp) + return jsdisp_get_id(jsdisp, name, flags, id); if(name_bstr) { bstr = name_bstr; @@ -1771,7 +1768,7 @@ static HRESULT interp_obj_prop(script_ctx_t *ctx) jsdisp_t *func; assert(is_object_instance(val)); - func = iface_to_jsdisp(get_object(val)); + func = to_jsdisp(get_object(val)); desc.mask = desc.flags; if(type == PROPERTY_DEFINITION_GETTER) { @@ -1783,7 +1780,6 @@ static HRESULT interp_obj_prop(script_ctx_t *ctx) } hres = jsdisp_define_property(obj, name, &desc); - jsdisp_release(func); } jsval_release(val); @@ -1927,15 +1923,12 @@ static HRESULT interp_instanceof(script_ctx_t *ctx) hres = JS_E_OBJECT_EXPECTED; else if(is_object_instance(prot)) { if(is_object_instance(v)) - tmp = iface_to_jsdisp(get_object(v)); + tmp = to_jsdisp(get_object(v)); for(iter = tmp; !ret && iter; iter = iter->prototype) { hres = disp_cmp(get_object(prot), to_disp(iter), &ret); if(FAILED(hres)) break; } - - if(tmp) - jsdisp_release(tmp); }else { FIXME("prototype is not an object\n"); hres = E_FAIL; @@ -2221,9 +2214,8 @@ static HRESULT typeof_string(jsval_t v, const WCHAR **ret) case JSV_OBJECT: { jsdisp_t *dispex; - if((dispex = iface_to_jsdisp(get_object(v)))) { + if((dispex = to_jsdisp(get_object(v)))) { *ret = is_class(dispex, JSCLASS_FUNCTION) ? L"function" : L"object"; - jsdisp_release(dispex); }else { *ret = L"object"; } diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index e36c4973ef2..7826000f87d 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -754,14 +754,13 @@ static HRESULT stringify(stringify_ctx_t *ctx, jsdisp_t *object, const WCHAR *na jsdisp_t *obj; DISPID id; - obj = iface_to_jsdisp(get_object(value)); + obj = to_jsdisp(get_object(value)); if(!obj) { jsval_release(value); return S_FALSE; } hres = jsdisp_get_id(obj, L"toJSON", 0, &id); - jsdisp_release(obj); if(hres == S_OK) FIXME("Use toJSON.\n"); } diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index 7b97a2951df..378dee9bc53 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -666,17 +666,14 @@ HRESULT create_regexp_var(script_ctx_t *ctx, jsval_t src_arg, jsval_t *flags_arg if(is_object_instance(src_arg)) { jsdisp_t *obj; - obj = iface_to_jsdisp(get_object(src_arg)); + obj = to_jsdisp(get_object(src_arg)); if(obj) { if(is_class(obj, JSCLASS_REGEXP)) { RegExpInstance *regexp = regexp_from_jsdisp(obj); hres = create_regexp(ctx, regexp->str, regexp->jsregexp->flags, ret); - jsdisp_release(obj); return hres; } - - jsdisp_release(obj); } } @@ -913,21 +910,16 @@ static HRESULT RegExpConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, case DISPATCH_METHOD: if(argc) { if(is_object_instance(argv[0])) { - jsdisp_t *jsdisp = iface_to_jsdisp(get_object(argv[0])); + jsdisp_t *jsdisp = to_jsdisp(get_object(argv[0])); if(jsdisp) { if(is_class(jsdisp, JSCLASS_REGEXP)) { - if(argc > 1 && !is_undefined(argv[1])) { - jsdisp_release(jsdisp); + if(argc > 1 && !is_undefined(argv[1])) return JS_E_REGEXP_SYNTAX; - } if(r) - *r = jsval_obj(jsdisp); - else - jsdisp_release(jsdisp); + *r = jsval_obj(jsdisp_addref(jsdisp)); return S_OK; } - jsdisp_release(jsdisp); } } }

1 0

Gabriel Ivăncescu : jscript: Start from the last argument when adding them to named locals.
by Alexandre Julliard June 21, 2023

June 21, 2023

Module: wine Branch: master Commit: 59372aa98c981959299105a4eec32ea3595afab4 URL: https://gitlab.winehq.org/wine/wine/-/commit/59372aa98c981959299105a4eec32e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 21 17:58:01 2023 +0300 jscript: Start from the last argument when adding them to named locals. This is needed for duplicated argument names, as the last arg will shadow all the prior ones when it comes to name lookup. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/compile.c | 2 +- dlls/jscript/tests/lang.js | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index e2690935212..2d2c2c9f40a 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -2567,7 +2567,7 @@ static HRESULT compile_function(compiler_ctx_t *ctx, statement_t *source, functi } } - for(i = 0; i < func->param_cnt; i++) { + for(i = func->param_cnt; i--;) { if(!find_local(ctx, func->params[i], 0) && !alloc_local(ctx, func->params[i], -i-1, 0)) return E_OUTOFMEMORY; } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 5c201d5bf26..30d8a338fd3 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -306,6 +306,38 @@ argumentsTest(); ok(arguments === 1, "arguments = " + arguments); })(); +// duplicated argument names are shadowed by the last argument with the same name +(function() { + var args, get_a, set_a; + + (function(a, a, b, c) { + get_a = function() { return a; } + set_a = function(v) { a = v; } + ok(get_a() === 2, "function(a, a, b, c) get_a() = " + get_a()); + ok(a === 2, "function(a, a, b, c) a = " + a); + ok(b === 3, "function(a, a, b, c) b = " + b); + ok(c === 4, "function(a, a, b, c) c = " + c); + a = 42; + ok(arguments[0] === 1, "function(a, a, b, c) arguments[0] = " + arguments[0]); + ok(arguments[1] === 42, "function(a, a, b, c) arguments[1] = " + arguments[1]); + ok(get_a() === 42, "function(a, a, b, c) get_a() = " + get_a() + " expected 42"); + args = arguments; + })(1, 2, 3, 4); + + ok(get_a() === 42, "function(a, a, b, c) get_a() after detach = " + get_a()); + set_a(100); + ok(get_a() === 100, "function(a, a, b, c) get_a() = " + get_a() + " expected 100"); + ok(args[0] === 1, "function(a, a, b, c) detached args[0] = " + args[0]); + ok(args[1] === 42, "function(a, a, b, c) detached args[1] = " + args[1]); + + (function(a, a) { + eval("var a = 7;"); + ok(a === 7, "function(a, a) a = " + a); + ok(arguments[0] === 5, "function(a, a) arguments[0] = " + arguments[0]); + ok(arguments[1] === 7, "function(a, a) arguments[1] = " + arguments[1]); + })(5, 6); +})(); + (function callAsExprTest() { ok(callAsExprTest.arguments === null, "callAsExprTest.arguments = " + callAsExprTest.arguments); })(1,2);

1 0

Gabriel Ivăncescu : jscript: Get rid of the function instance in arguments obj.
by Alexandre Julliard June 21, 2023

June 21, 2023

Module: wine Branch: master Commit: 88903fa674f8c62064c558e6ad74519450720e1a URL: https://gitlab.winehq.org/wine/wine/-/commit/88903fa674f8c62064c558e6ad7451… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 21 17:58:01 2023 +0300 jscript: Get rid of the function instance in arguments obj. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/function.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index f049e08be94..83dbfed6054 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -65,7 +65,6 @@ typedef struct { typedef struct { jsdisp_t jsdisp; - InterpretedFunction *function; jsval_t *buf; call_frame_t *frame; unsigned argc; @@ -114,8 +113,6 @@ static void Arguments_destructor(jsdisp_t *jsdisp) free(arguments->buf); } - if(arguments->function) - jsdisp_release(&arguments->function->function.dispex); free(arguments); } @@ -175,7 +172,7 @@ static HRESULT Arguments_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op } } - return gc_process_linked_obj(gc_ctx, op, jsdisp, &arguments->function->function.dispex, (void**)&arguments->function); + return S_OK; } static const builtin_info_t Arguments_info = { @@ -205,7 +202,6 @@ HRESULT setup_arguments_object(script_ctx_t *ctx, call_frame_t *frame) return hres; } - args->function = (InterpretedFunction*)function_from_jsdisp(jsdisp_addref(frame->function_instance)); args->argc = frame->argc; args->frame = frame; @@ -213,7 +209,7 @@ HRESULT setup_arguments_object(script_ctx_t *ctx, call_frame_t *frame) jsval_number(args->argc)); if(SUCCEEDED(hres)) hres = jsdisp_define_data_property(&args->jsdisp, L"callee", PROPF_WRITABLE | PROPF_CONFIGURABLE, - jsval_obj(&args->function->function.dispex)); + jsval_obj(frame->function_instance)); if(SUCCEEDED(hres)) hres = jsdisp_propput(as_jsdisp(frame->base_scope->obj), L"arguments", PROPF_WRITABLE, TRUE, jsval_obj(&args->jsdisp)); if(FAILED(hres)) {

1 0

Rémi Bernon : configure: Build x86_64 PE code with mcmodel=small.
by Alexandre Julliard June 21, 2023

June 21, 2023

Module: wine Branch: master Commit: 81859c9af70aa5ed6da3060488d1815a3607c291 URL: https://gitlab.winehq.org/wine/wine/-/commit/81859c9af70aa5ed6da3060488d181… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 21 07:11:09 2023 +0200 configure: Build x86_64 PE code with mcmodel=small. Saving a huge number of .refptr indirections for all extern symbols. --- configure | 33 +++++++++++++++++++++++++++++++++ configure.ac | 3 ++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/configure b/configure index f41b9cd687f..f73bc827150 100755 --- a/configure +++ b/configure @@ -11527,6 +11527,39 @@ printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_var"\" = x"yes" then : as_fn_append ${wine_arch}_EXTRACFLAGS " -mcx16" +fi } + { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-mcmodel=small" | $as_tr_sh` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -mcmodel=small" >&5 +printf %s "checking whether $CC supports -mcmodel=small... " >&6; } +if eval test \${$as_ac_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_try_cflags_saved=$CFLAGS +ac_wine_try_cflags_saved_exeext=$ac_exeext +CFLAGS="$CFLAGS -nostdlib -nodefaultlibs -mcmodel=small" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int __cdecl mainCRTStartup(void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + eval "$as_ac_var=yes" +else $as_nop + eval "$as_ac_var=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +ac_exeext=$ac_wine_try_cflags_saved_exeext +fi +eval ac_res=\$$as_ac_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_var"\" = x"yes" +then : + as_fn_append ${wine_arch}_EXTRACFLAGS " -mcmodel=small" fi } ;; esac diff --git a/configure.ac b/configure.ac index bed7b2dec28..606be62632e 100644 --- a/configure.ac +++ b/configure.ac @@ -960,7 +960,8 @@ do [AS_VAR_APPEND([${wine_arch}_LDFLAGS],[" -Wl,--disable-stdcall-fixup"])]) ;; x86_64) WINE_TRY_PE_CFLAGS([-Wformat-overflow]) WINE_TRY_PE_CFLAGS([-Wnonnull]) - WINE_TRY_PE_CFLAGS([-mcx16]) ;; + WINE_TRY_PE_CFLAGS([-mcx16]) + WINE_TRY_PE_CFLAGS([-mcmodel=small]) ;; esac dnl Determine debug info format

1 0