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

Nikolay Sivov : tests: Add more tests for unused registers with a reservation.
by Alexandre Julliard 22 Jun '23

22 Jun '23

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

Zebediah Figura : vkd3d-shader/hlsl: Handle reserved vars specially in get_allocated_object().
by Alexandre Julliard 22 Jun '23

22 Jun '23

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

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

22 Jun '23

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

Nikolay Sivov : vkd3d-shader/hlsl: Don't report a register type mismatch for unused reserved variables.
by Alexandre Julliard 22 Jun '23

22 Jun '23

Module: vkd3d Branch: master Commit: c8ffe8e1a88cb58db955b12e6d44a7ed9eb935a7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c8ffe8e1a88cb58db955b12e6d44a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 21 12:28:44 2023 -0500 vkd3d-shader/hlsl: Don't report a register type mismatch for unused reserved variables. --- libs/vkd3d-shader/hlsl_codegen.c | 4 ++-- tests/register-reservations.shader_test | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 37afdc2d..765b1907 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2698,7 +2698,7 @@ static void allocate_register_reservations(struct hlsl_ctx *ctx) continue; regset = hlsl_type_get_regset(var->data_type); - if (var->reg_reservation.reg_type) + if (var->reg_reservation.reg_type && var->regs[regset].bind_count) { if (var->reg_reservation.reg_type != get_regset_name(regset)) { @@ -2710,7 +2710,7 @@ static void allocate_register_reservations(struct hlsl_ctx *ctx) type_string->buffer, get_regset_name(regset)); hlsl_release_string_buffer(ctx, type_string); } - else if (var->regs[regset].bind_count) + else { var->regs[regset].allocated = true; var->regs[regset].id = var->reg_reservation.reg_index; diff --git a/tests/register-reservations.shader_test b/tests/register-reservations.shader_test index 23d4ae5c..26f4381d 100644 --- a/tests/register-reservations.shader_test +++ b/tests/register-reservations.shader_test @@ -70,7 +70,7 @@ probe all rgba (1.0, 1.0, 1.0, 99.0) % Register reservation with incorrect register type. -[pixel shader todo] +[pixel shader] Texture2D unused : register(s0); Texture2D tex; @@ -80,12 +80,12 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (0.0, 0.0, 0.0, 99.0) % Register reservation with incorrect register type. -[pixel shader todo] +[pixel shader] sampler2D unused : register(t0); Texture2D tex; @@ -96,7 +96,7 @@ float4 main() : sv_target [test] -todo draw quad +draw quad probe all rgba (0.0, 0.0, 0.0, 99.0) [pixel shader]

1 0

Henri Verbeet : build: List tests/object-parameters.shader_test before tests/object-references.shader_test.
by Alexandre Julliard 22 Jun '23

22 Jun '23

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

Henri Verbeet : Release 1.8.
by Alexandre Julliard 22 Jun '23

22 Jun '23

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

Rémi Bernon : win32u: Split default UpdateDisplayDevices implementation to a helper.
by Alexandre Julliard 21 Jun '23

21 Jun '23

Module: wine Branch: master Commit: 08fd8ad0b693e7f166a5cff6cb3167cca06f3661 URL: https://gitlab.winehq.org/wine/wine/-/commit/08fd8ad0b693e7f166a5cff6cb3167… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 20 17:19:50 2023 +0200 win32u: Split default UpdateDisplayDevices implementation to a helper. --- dlls/win32u/sysparams.c | 118 +++++++++++++++++++++++++++--------------------- 1 file changed, 66 insertions(+), 52 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index b941d01e3b7..14ca306219a 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1718,11 +1718,75 @@ static BOOL is_same_devmode( const DEVMODEW *a, const DEVMODEW *b ) a->dmDisplayFrequency == b->dmDisplayFrequency; } +static BOOL default_update_display_devices( const struct gdi_device_manager *manager, BOOL force, struct device_manager_ctx *ctx ) +{ + /* default implementation: expose an adapter and a monitor with a few standard modes, + * and read / write current display settings from / to the registry. + */ + static const DEVMODEW modes[] = + { + { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, + .dmBitsPerPel = 32, .dmPelsWidth = 640, .dmPelsHeight = 480, .dmDisplayFrequency = 60, }, + { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, + .dmBitsPerPel = 32, .dmPelsWidth = 800, .dmPelsHeight = 600, .dmDisplayFrequency = 60, }, + { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, + .dmBitsPerPel = 32, .dmPelsWidth = 1024, .dmPelsHeight = 768, .dmDisplayFrequency = 60, }, + { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, + .dmBitsPerPel = 16, .dmPelsWidth = 640, .dmPelsHeight = 480, .dmDisplayFrequency = 60, }, + { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, + .dmBitsPerPel = 16, .dmPelsWidth = 800, .dmPelsHeight = 600, .dmDisplayFrequency = 60, }, + { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, + .dmBitsPerPel = 16, .dmPelsWidth = 1024, .dmPelsHeight = 768, .dmDisplayFrequency = 60, }, + }; + static const struct gdi_gpu gpu; + static const struct gdi_adapter adapter = + { + .state_flags = DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_VGA_COMPATIBLE, + }; + struct gdi_monitor monitor = + { + .state_flags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED, + }; + DEVMODEW mode = {{0}}; + UINT i; + + if (!force) return TRUE; + + manager->add_gpu( &gpu, ctx ); + manager->add_adapter( &adapter, ctx ); + + if (!read_adapter_mode( ctx->adapter_key, ENUM_CURRENT_SETTINGS, &mode )) + { + mode = modes[2]; + mode.dmFields |= DM_POSITION; + } + monitor.rc_monitor.right = mode.dmPelsWidth; + monitor.rc_monitor.bottom = mode.dmPelsHeight; + monitor.rc_work.right = mode.dmPelsWidth; + monitor.rc_work.bottom = mode.dmPelsHeight; + + manager->add_monitor( &monitor, ctx ); + for (i = 0; i < ARRAY_SIZE(modes); ++i) + { + if (is_same_devmode( modes + i, &mode )) manager->add_mode( &mode, TRUE, ctx ); + else manager->add_mode( modes + i, FALSE, ctx ); + } + + return TRUE; +} + +static BOOL update_display_devices( const struct gdi_device_manager *manager, BOOL force, struct device_manager_ctx *ctx ) +{ + if (user_driver->pUpdateDisplayDevices( manager, force, ctx )) return TRUE; + return default_update_display_devices( manager, force, ctx ); +} + static BOOL update_display_cache( BOOL force ) { HWINSTA winstation = NtUserGetProcessWindowStation(); struct device_manager_ctx ctx = {0}; USEROBJECTFLAGS flags; + BOOL ret; /* services do not have any adapters, only a virtual monitor */ if (NtUserGetObjectInformation( winstation, UOI_FLAGS, &flags, sizeof(flags), NULL ) @@ -1735,59 +1799,9 @@ static BOOL update_display_cache( BOOL force ) return TRUE; } - if (!user_driver->pUpdateDisplayDevices( &device_manager, force, &ctx ) && force) - { - /* default implementation: expose an adapter and a monitor with a few standard modes, - * and read / write current display settings from / to the registry. - */ - static const DEVMODEW modes[] = - { - { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, - .dmBitsPerPel = 32, .dmPelsWidth = 640, .dmPelsHeight = 480, .dmDisplayFrequency = 60, }, - { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, - .dmBitsPerPel = 32, .dmPelsWidth = 800, .dmPelsHeight = 600, .dmDisplayFrequency = 60, }, - { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, - .dmBitsPerPel = 32, .dmPelsWidth = 1024, .dmPelsHeight = 768, .dmDisplayFrequency = 60, }, - { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, - .dmBitsPerPel = 16, .dmPelsWidth = 640, .dmPelsHeight = 480, .dmDisplayFrequency = 60, }, - { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, - .dmBitsPerPel = 16, .dmPelsWidth = 800, .dmPelsHeight = 600, .dmDisplayFrequency = 60, }, - { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, - .dmBitsPerPel = 16, .dmPelsWidth = 1024, .dmPelsHeight = 768, .dmDisplayFrequency = 60, }, - }; - static const struct gdi_gpu gpu; - static const struct gdi_adapter adapter = - { - .state_flags = DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_VGA_COMPATIBLE, - }; - struct gdi_monitor monitor = - { - .state_flags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED, - }; - DEVMODEW mode = {{0}}; - UINT i; - - add_gpu( &gpu, &ctx ); - add_adapter( &adapter, &ctx ); - - if (!read_adapter_mode( ctx.adapter_key, ENUM_CURRENT_SETTINGS, &mode )) - { - mode = modes[2]; - mode.dmFields |= DM_POSITION; - } - monitor.rc_monitor.right = mode.dmPelsWidth; - monitor.rc_monitor.bottom = mode.dmPelsHeight; - monitor.rc_work.right = mode.dmPelsWidth; - monitor.rc_work.bottom = mode.dmPelsHeight; - - add_monitor( &monitor, &ctx ); - for (i = 0; i < ARRAY_SIZE(modes); ++i) - { - if (is_same_devmode( modes + i, &mode )) add_mode( &mode, TRUE, &ctx ); - else add_mode( modes + i, FALSE, &ctx ); - } - } + ret = update_display_devices( &device_manager, force, &ctx ); release_display_manager_ctx( &ctx ); + if (!ret) WARN( "Failed to update display devices\n" ); if (!update_display_cache_from_registry()) {

1 0

Rémi Bernon : win32u: Move virtual desktop display settings logic from winex11.
by Alexandre Julliard 21 Jun '23

21 Jun '23

Module: wine Branch: master Commit: 9b7669592d6f8b40976b571b70f8543777d35167 URL: https://gitlab.winehq.org/wine/wine/-/commit/9b7669592d6f8b40976b571b70f854… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 20 17:23:28 2023 +0200 win32u: Move virtual desktop display settings logic from winex11. --- dlls/win32u/sysparams.c | 253 ++++++++++++++++++++++++++++++++++-- dlls/win32u/win32u_private.h | 1 + dlls/win32u/winstation.c | 2 + dlls/winex11.drv/desktop.c | 300 +------------------------------------------ dlls/winex11.drv/display.c | 45 ++----- dlls/winex11.drv/x11drv.h | 1 - 6 files changed, 258 insertions(+), 344 deletions(-)

1 0

Gabriel Ivăncescu : jscript: Correctly implement context for indirect eval calls in ES5+ modes.
by Alexandre Julliard 21 Jun '23

21 Jun '23

Module: wine Branch: master Commit: a184ace43d1064537e0cf3073e4ee5cc2ed503aa URL: https://gitlab.winehq.org/wine/wine/-/commit/a184ace43d1064537e0cf3073e4ee5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 21 17:58:00 2023 +0300 jscript: Correctly implement context for indirect eval calls in ES5+ modes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/compile.c | 14 +++++++---- dlls/jscript/engine.c | 34 ++++++++++++++++++++++++++ dlls/jscript/engine.h | 1 + dlls/jscript/function.c | 6 +++++ dlls/jscript/global.c | 9 +++++-- dlls/jscript/jscript.h | 2 ++ dlls/jscript/tests/api.js | 43 +++++++++++++++++++++++++++++++++ dlls/mshtml/tests/documentmode.js | 51 +++++++++++++++++++++++++++++++++++++++ 8 files changed, 153 insertions(+), 7 deletions(-)

1 0

Gabriel Ivăncescu : jscript: Fix addressing invalid memory if ref is an argument.
by Alexandre Julliard 21 Jun '23

21 Jun '23

Module: wine Branch: master Commit: 2173cac68e668eea3d28c30e9fc11ea8ee13fa51 URL: https://gitlab.winehq.org/wine/wine/-/commit/2173cac68e668eea3d28c30e9fc11e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 21 17:58:00 2023 +0300 jscript: Fix addressing invalid memory if ref is an argument. `ref` can be negative in case it refers to an argument. Even though scope != frame->base_scope would rule this out (because only base scopes have args), it was checked *after* the memory access, which would read out of bounds memory first. This didn't appear as an issue in practice since it's using the heap pool, so there's probably valid memory before it, but it's still wrong. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/engine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 9e375294cb5..a4b416ba8ed 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -657,7 +657,7 @@ static HRESULT detach_scope(script_ctx_t *ctx, call_frame_t *frame, scope_chain_ if (FAILED(hres = jsdisp_propput_name(scope->jsobj, name, ctx->stack[local_off(frame, ref)]))) return hres; - if (frame->function->variables[ref].func_id != -1 && scope != frame->base_scope + if (scope != frame->base_scope && frame->function->variables[ref].func_id != -1 && FAILED(hres = jsdisp_propput_name(frame->variable_obj, name, ctx->stack[local_off(frame, ref)]))) return hres; }

1 0