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

Alexandre Julliard : winegcc: Fix an uninitialized variable warning in the PE build.
by Alexandre Julliard 12 Jun '23

12 Jun '23

Module: wine Branch: master Commit: 834f7b23667e169a0a20ba732b88d8e29f6cf668 URL: https://gitlab.winehq.org/wine/wine/-/commit/834f7b23667e169a0a20ba732b88d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 13:20:18 2023 +0200 winegcc: Fix an uninitialized variable warning in the PE build. --- tools/winegcc/winegcc.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index c0f881df0a2..b6a6c42068d 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -305,24 +305,18 @@ static struct strarray build_tool_name( struct options *opts, enum tool tool ) static struct strarray get_translator(struct options *opts) { - enum tool tool; - switch(opts->processor) { case proc_cpp: - tool = TOOL_CPP; - break; + return build_tool_name( opts, TOOL_CPP ); case proc_cc: case proc_as: - tool = TOOL_CC; - break; + return build_tool_name( opts, TOOL_CC ); case proc_cxx: - tool = TOOL_CXX; - break; - default: - assert(0); + return build_tool_name( opts, TOOL_CXX ); } - return build_tool_name( opts, tool ); + assert(0); + return empty_strarray; } static int try_link( struct strarray prefix, struct strarray link_tool, const char *cflags )

1 0

Alexandre Julliard : wow64: Don't force wow64 dlls to load at low addresses.
by Alexandre Julliard 12 Jun '23

12 Jun '23

Module: wine Branch: master Commit: b5a0dd8ca3300102ef02ebae7403427261a354f0 URL: https://gitlab.winehq.org/wine/wine/-/commit/b5a0dd8ca3300102ef02ebae740342… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 11:12:02 2023 +0200 wow64: Don't force wow64 dlls to load at low addresses. --- dlls/wow64/Makefile.in | 2 +- dlls/wow64cpu/Makefile.in | 2 +- dlls/wow64win/Makefile.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wow64/Makefile.in b/dlls/wow64/Makefile.in index eebf9e8e53a..156bc8acd36 100644 --- a/dlls/wow64/Makefile.in +++ b/dlls/wow64/Makefile.in @@ -2,7 +2,7 @@ MODULE = wow64.dll IMPORTLIB = wow64 IMPORTS = ntdll winecrt0 -EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x6f000000 +EXTRADLLFLAGS = -nodefaultlibs C_SRCS = \ file.c \ diff --git a/dlls/wow64cpu/Makefile.in b/dlls/wow64cpu/Makefile.in index a4a43fc85cd..75132c90792 100644 --- a/dlls/wow64cpu/Makefile.in +++ b/dlls/wow64cpu/Makefile.in @@ -1,6 +1,6 @@ MODULE = wow64cpu.dll IMPORTS = wow64 ntdll winecrt0 -EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x6f400000 +EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x7a400000 C_SRCS = cpu.c diff --git a/dlls/wow64win/Makefile.in b/dlls/wow64win/Makefile.in index ce8c42f06f6..160fea8b1a4 100644 --- a/dlls/wow64win/Makefile.in +++ b/dlls/wow64win/Makefile.in @@ -1,7 +1,7 @@ MODULE = wow64win.dll IMPORTS = wow64 win32u ntdll winecrt0 -EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x6f200000 +EXTRADLLFLAGS = -nodefaultlibs C_SRCS = \ gdi.c \

1 0

Huw Davies : winepulse: Don't overwrite the result in the insufficient buffer case.
by Alexandre Julliard 12 Jun '23

12 Jun '23

Module: wine Branch: master Commit: 2586652e1674213208f17402f15805730f1d1c8f URL: https://gitlab.winehq.org/wine/wine/-/commit/2586652e1674213208f17402f15805… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 12 10:10:27 2023 +0100 winepulse: Don't overwrite the result in the insufficient buffer case. Fixes a regression caused by 13fa7a57df0d. --- dlls/winepulse.drv/pulse.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 5ba66a8aa1d..d259902c8b5 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -2494,8 +2494,7 @@ static NTSTATUS pulse_get_prop_value(void *args) if (strcmp(params->device, dev->pulse_name)) continue; if (IsEqualPropertyKey(*params->prop, devicepath_key)) { - if (!get_device_path(dev, params)) - break; + get_device_path(dev, params); return STATUS_SUCCESS; } else if (IsEqualGUID(&params->prop->fmtid, &PKEY_AudioEndpoint_GUID)) { switch (params->prop->pid) {

1 0

Huw Davies : winepulse: Return E_NOTIMPL when the property is not found.
by Alexandre Julliard 12 Jun '23

12 Jun '23

Module: wine Branch: master Commit: b012bed6ff92a7716cd61647aea63772f5351fec URL: https://gitlab.winehq.org/wine/wine/-/commit/b012bed6ff92a7716cd61647aea637… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 12 10:23:53 2023 +0100 winepulse: Return E_NOTIMPL when the property is not found. Fixes a regression caused by 13fa7a57df0d. --- dlls/winepulse.drv/pulse.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index d259902c8b5..be540a4da2c 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -2489,7 +2489,6 @@ static NTSTATUS pulse_get_prop_value(void *args) struct list *list = (params->flow == eRender) ? &g_phys_speakers : &g_phys_sources; PhysDevice *dev; - params->result = S_OK; LIST_FOR_EACH_ENTRY(dev, list, PhysDevice, entry) { if (strcmp(params->device, dev->pulse_name)) continue; @@ -2501,18 +2500,19 @@ static NTSTATUS pulse_get_prop_value(void *args) case 0: /* FormFactor */ params->value->vt = VT_UI4; params->value->ulVal = dev->form; + params->result = S_OK; return STATUS_SUCCESS; case 3: /* PhysicalSpeakers */ if (!dev->channel_mask) goto fail; params->value->vt = VT_UI4; params->value->ulVal = dev->channel_mask; + params->result = S_OK; return STATUS_SUCCESS; - default: - params->result = E_NOTIMPL; } } + params->result = E_NOTIMPL; return STATUS_SUCCESS; }

1 0

Zebediah Figura : vkd3d-shader/spirv: Retrieve input sysvals from the signature for geometry shaders as well.
by Alexandre Julliard 12 Jun '23

12 Jun '23

Module: vkd3d Branch: master Commit: df0a031ad8621d2bfbdebcfe7266bd56abfe73e6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/df0a031ad8621d2bfbdebcfe7266b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jun 9 19:59:11 2023 -0500 vkd3d-shader/spirv: Retrieve input sysvals from the signature for geometry shaders as well. This only affects clip and cull distances. The HLSL compiler emits these using dcl_input, but the previous shader (vertex or TES) will write them as a SPIRV builtin, and hence we want to read this as a SPIRV builtin as well. This fixes validation errors in Wine's test_clip_distance(). --- libs/vkd3d-shader/spirv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index cc0b63e8..a6700e66 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4479,7 +4479,8 @@ static uint32_t spirv_compiler_emit_input(struct spirv_compiler *compiler, element_idx = shader_register_get_io_indices(reg, array_sizes); signature_element = &shader_signature->elements[element_idx]; - if (compiler->shader_type == VKD3D_SHADER_TYPE_HULL && !sysval && signature_element->sysval_semantic) + if ((compiler->shader_type == VKD3D_SHADER_TYPE_HULL || compiler->shader_type == VKD3D_SHADER_TYPE_GEOMETRY) + && !sysval && signature_element->sysval_semantic) sysval = vkd3d_siv_from_sysval(signature_element->sysval_semantic); builtin = get_spirv_builtin_for_sysval(compiler, sysval);

1 0

Etaash Mathamsetty : user32: Add GetSystemDpiForProcess export.
by Alexandre Julliard 12 Jun '23

12 Jun '23

Module: wine Branch: master Commit: f2fef431d598db4af241f03d8cd617a353fe7207 URL: https://gitlab.winehq.org/wine/wine/-/commit/f2fef431d598db4af241f03d8cd617… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Fri Jun 9 20:22:35 2023 -0400 user32: Add GetSystemDpiForProcess export. --- dlls/user32/user32.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 38462607ccd..121561b1860 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -386,6 +386,7 @@ @ stdcall GetSubMenu(long long) @ stdcall GetSysColor(long) @ stdcall GetSysColorBrush(long) +@ stdcall GetSystemDpiForProcess(long) NtUserGetSystemDpiForProcess @ stdcall GetSystemMenu(long long) NtUserGetSystemMenu @ stdcall GetSystemMetrics(long) @ stdcall GetSystemMetricsForDpi(long long)

1 0

Etaash Mathamsetty : ntdll: Allow RtlAllocateHeap to crash with invalid handle.
by Alexandre Julliard 12 Jun '23

12 Jun '23

Module: wine Branch: master Commit: 6ecca8cf6307d3866b40a64577fe47db195ae9bf URL: https://gitlab.winehq.org/wine/wine/-/commit/6ecca8cf6307d3866b40a64577fe47… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Fri Jun 9 12:52:31 2023 -0400 ntdll: Allow RtlAllocateHeap to crash with invalid handle. --- dlls/ntdll/heap.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 921a51cf8b1..aca8e7181a8 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -2052,9 +2052,8 @@ void *WINAPI DECLSPEC_HOTPATCH RtlAllocateHeap( HANDLE handle, ULONG flags, SIZE ULONG heap_flags; NTSTATUS status; - if (!(heap = unsafe_heap_from_handle( handle, flags, &heap_flags ))) - status = STATUS_INVALID_HANDLE; - else if ((block_size = heap_get_block_size( heap, heap_flags, size )) == ~0U) + heap = unsafe_heap_from_handle( handle, flags, &heap_flags ); + if ((block_size = heap_get_block_size( heap, heap_flags, size )) == ~0U) status = STATUS_NO_MEMORY; else if (block_size >= HEAP_MIN_LARGE_BLOCK_SIZE) status = heap_allocate_large( heap, heap_flags, block_size, size, &ptr );

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Store static initialization instructions in a block.
by Alexandre Julliard 12 Jun '23

12 Jun '23

Module: vkd3d Branch: master Commit: 99314b6340a5a350cc1c1595df899ca633ab9404 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/99314b6340a5a350cc1c1595df899… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 9 15:28:06 2023 +0200 vkd3d-shader/hlsl: Store static initialization instructions in a block. --- libs/vkd3d-shader/hlsl.c | 2 +- libs/vkd3d-shader/hlsl.h | 5 ++--- libs/vkd3d-shader/hlsl.y | 8 ++++---- libs/vkd3d-shader/hlsl_codegen.c | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index f439c9f3..ba5bcfbf 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -3236,7 +3236,7 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const char *source_name, rb_init(&ctx->functions, compare_function_rb); - list_init(&ctx->static_initializers); + hlsl_block_init(&ctx->static_initializers); list_init(&ctx->extern_vars); list_init(&ctx->buffers); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 7c4e74dc..3f43ab25 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -796,9 +796,8 @@ struct hlsl_ctx struct hlsl_type *Void; } builtin_types; - /* List of the instruction nodes for initializing static variables; linked by the - * hlsl_ir_node.entry fields. */ - struct list static_initializers; + /* List of the instruction nodes for initializing static variables. */ + struct hlsl_block static_initializers; /* Dynamic array of constant values that appear in the shader, associated to the 'c' registers. * Only used for SM1 profiles. */ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 209428f7..c25f5c4a 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2159,7 +2159,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t } if (modifiers & HLSL_STORAGE_STATIC) - list_move_tail(&ctx->static_initializers, v->initializer.instrs); + list_move_tail(&ctx->static_initializers.instrs, v->initializer.instrs); else list_move_tail(statements_list, v->initializer.instrs); vkd3d_free(v->initializer.args); @@ -2182,9 +2182,9 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t vkd3d_free(v); continue; } - list_add_tail(&ctx->static_initializers, &zero->entry); + hlsl_block_add_instr(&ctx->static_initializers, zero); - if (!(cast = add_cast(ctx, &ctx->static_initializers, zero, var->data_type, &var->loc))) + if (!(cast = add_cast(ctx, &ctx->static_initializers.instrs, zero, var->data_type, &var->loc))) { vkd3d_free(v); continue; @@ -2195,7 +2195,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t vkd3d_free(v); continue; } - list_add_tail(&ctx->static_initializers, &store->entry); + hlsl_block_add_instr(&ctx->static_initializers, store); } vkd3d_free(v); } diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 4317604b..7a235986 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -3977,7 +3977,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry unsigned int i; bool progress; - list_move_head(&body->instrs, &ctx->static_initializers); + list_move_head(&body->instrs, &ctx->static_initializers.instrs); memset(&recursive_call_ctx, 0, sizeof(recursive_call_ctx)); hlsl_transform_ir(ctx, find_recursive_calls, body, &recursive_call_ctx);

1 0

Nikolay Sivov : tests: Add a test for array size expressions using static constants.
by Alexandre Julliard 12 Jun '23

12 Jun '23

Module: vkd3d Branch: master Commit: 38c89442ac98d13b17eb8f49051da1beff6ed184 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/38c89442ac98d13b17eb8f49051da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 9 15:33:18 2023 +0200 tests: Add a test for array size expressions using static constants. --- tests/hlsl-array-size-expr.shader_test | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tests/hlsl-array-size-expr.shader_test b/tests/hlsl-array-size-expr.shader_test index 0d64462b..7235ac73 100644 --- a/tests/hlsl-array-size-expr.shader_test +++ b/tests/hlsl-array-size-expr.shader_test @@ -38,3 +38,16 @@ float4 main() : SV_TARGET [test] draw quad probe all rgba (61, 62, 63, 64) + +[pixel shader todo] +static const int size = 8; +static const float array[size] = {1, 2, 3, 4, 5, 6, 7, 8}; + +float4 main() : sv_target +{ + return float4(array[1], array[2], array[5], array[0]); +} + +[test] +todo draw quad +todo probe all rgba (2, 3, 6, 1)

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Handle static constants in array size expressions.
by Alexandre Julliard 12 Jun '23

12 Jun '23

Module: vkd3d Branch: master Commit: d856be05196adc2dc83c5228acf2a171fe9a5899 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d856be05196adc2dc83c5228acf2a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 9 15:39:38 2023 +0200 vkd3d-shader/hlsl: Handle static constants in array size expressions. --- libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 9 +++++++-- libs/vkd3d-shader/hlsl_codegen.c | 4 ++-- tests/hlsl-array-size-expr.shader_test | 6 +++--- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 3f43ab25..a797ef6a 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -1213,6 +1213,7 @@ bool hlsl_offset_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref unsigned int hlsl_offset_from_deref_safe(struct hlsl_ctx *ctx, const struct hlsl_deref *deref); struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref); +bool hlsl_copy_propagation_execute(struct hlsl_ctx *ctx, struct hlsl_block *block); bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context); bool hlsl_fold_constant_swizzles(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context); bool hlsl_transform_ir(struct hlsl_ctx *ctx, bool (*func)(struct hlsl_ctx *ctx, struct hlsl_ir_node *, void *), diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c25f5c4a..0e07fe57 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1098,12 +1098,17 @@ static unsigned int evaluate_static_expression_as_uint(struct hlsl_ctx *ctx, str struct hlsl_ir_constant *constant; struct hlsl_ir_node *node; unsigned int ret = 0; + bool progress; if (!add_implicit_conversion(ctx, &block->instrs, node_from_list(&block->instrs), hlsl_get_scalar_type(ctx, HLSL_TYPE_UINT), loc)) return 0; - while (hlsl_transform_ir(ctx, hlsl_fold_constant_exprs, block, NULL)); + do + { + progress = hlsl_transform_ir(ctx, hlsl_fold_constant_exprs, block, NULL); + progress |= hlsl_copy_propagation_execute(ctx, block); + } while (progress); node = node_from_list(&block->instrs); if (node->type == HLSL_IR_CONSTANT) @@ -5494,7 +5499,7 @@ arrays: uint32_t *new_array; unsigned int size; - hlsl_block_init(&block); + hlsl_clone_block(ctx, &block, &ctx->static_initializers); list_move_tail(&block.instrs, $2); size = evaluate_static_expression_as_uint(ctx, &block, &@2); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 7a235986..96b4cb66 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1649,7 +1649,7 @@ static bool copy_propagation_transform_block(struct hlsl_ctx *ctx, struct hlsl_b return progress; } -static bool copy_propagation_execute(struct hlsl_ctx *ctx, struct hlsl_block *block) +bool hlsl_copy_propagation_execute(struct hlsl_ctx *ctx, struct hlsl_block *block) { struct copy_propagation_state state; bool progress; @@ -4073,7 +4073,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry { progress = hlsl_transform_ir(ctx, hlsl_fold_constant_exprs, body, NULL); progress |= hlsl_transform_ir(ctx, hlsl_fold_constant_swizzles, body, NULL); - progress |= copy_propagation_execute(ctx, body); + progress |= hlsl_copy_propagation_execute(ctx, body); progress |= hlsl_transform_ir(ctx, fold_swizzle_chains, body, NULL); progress |= hlsl_transform_ir(ctx, remove_trivial_swizzles, body, NULL); } diff --git a/tests/hlsl-array-size-expr.shader_test b/tests/hlsl-array-size-expr.shader_test index 7235ac73..ac774be1 100644 --- a/tests/hlsl-array-size-expr.shader_test +++ b/tests/hlsl-array-size-expr.shader_test @@ -39,7 +39,7 @@ float4 main() : SV_TARGET draw quad probe all rgba (61, 62, 63, 64) -[pixel shader todo] +[pixel shader] static const int size = 8; static const float array[size] = {1, 2, 3, 4, 5, 6, 7, 8}; @@ -49,5 +49,5 @@ float4 main() : sv_target } [test] -todo draw quad -todo probe all rgba (2, 3, 6, 1) +draw quad +probe all rgba (2, 3, 6, 1)

1 0