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

Alex Henrie : winhttp: Fix double free on error path in queue_task (scan-build).
by Alexandre Julliard 08 Jun '23

08 Jun '23

Module: wine Branch: master Commit: b630718149866ac7056588dc931793d54ae28eb1 URL: https://gitlab.winehq.org/wine/wine/-/commit/b630718149866ac7056588dc931793… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jun 7 22:20:46 2023 -0600 winhttp: Fix double free on error path in queue_task (scan-build). queue_task cannot free the struct because it doesn't know whether the struct contains pointers to other dynamically allocated memory that also needs to be freed (as is the case with struct send_request). --- dlls/winhttp/request.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 07d0ff19b7c..cf091244002 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -218,7 +218,6 @@ static DWORD queue_task( struct queue *queue, TASK_CALLBACK task, struct task_he if (!callback_running) { release_object( obj ); - free( task_hdr ); ERR( "Submiting threadpool callback failed, err %lu.\n", GetLastError() ); return ERROR_OUTOFMEMORY; }

1 0

Alex Henrie : msi: Fix memory leak on error path in MSI_ProcessMessage (scan-build).
by Alexandre Julliard 08 Jun '23

08 Jun '23

Module: wine Branch: master Commit: d06b3fd5274b056c720e2fb42eb189052d99404d URL: https://gitlab.winehq.org/wine/wine/-/commit/d06b3fd5274b056c720e2fb42eb189… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jun 7 23:02:56 2023 -0600 msi: Fix memory leak on error path in MSI_ProcessMessage (scan-build). --- dlls/msi/package.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 9e34b7e6351..90293a10881 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1897,7 +1897,12 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC } template = malloc((wcslen(template_rec) + wcslen(template_prefix) + 1) * sizeof(WCHAR)); - if (!template) return ERROR_OUTOFMEMORY; + if (!template) + { + free(template_prefix); + free(template_rec); + return ERROR_OUTOFMEMORY; + } lstrcpyW(template, template_prefix); lstrcatW(template, template_rec);

1 0

Alex Henrie : rpcrt4: Replace RPCRT4_strndupA with strdup.
by Alexandre Julliard 08 Jun '23

08 Jun '23

Module: wine Branch: master Commit: 3fd8c85fd19ec7498f1151e0a504a637f462221f URL: https://gitlab.winehq.org/wine/wine/-/commit/3fd8c85fd19ec7498f1151e0a504a6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jun 7 21:07:00 2023 -0600 rpcrt4: Replace RPCRT4_strndupA with strdup. --- dlls/rpcrt4/rpc_binding.c | 19 +++---------------- dlls/rpcrt4/rpc_binding.h | 1 - 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index fec9aa999aa..d4e35bdf116 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -43,19 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(rpc); -LPSTR RPCRT4_strndupA(LPCSTR src, INT slen) -{ - DWORD len; - LPSTR s; - if (!src) return NULL; - if (slen == -1) slen = strlen(src); - len = slen; - s = malloc(len + 1); - memcpy(s, src, len); - s[len] = 0; - return s; -} - LPSTR RPCRT4_strdupWtoA(LPCWSTR src) { DWORD len; @@ -992,9 +979,9 @@ RPC_STATUS RPC_ENTRY RpcBindingCopy( DestBinding->ObjectUuid = SrcBinding->ObjectUuid; DestBinding->BlockingFn = SrcBinding->BlockingFn; - DestBinding->Protseq = RPCRT4_strndupA(SrcBinding->Protseq, -1); - DestBinding->NetworkAddr = RPCRT4_strndupA(SrcBinding->NetworkAddr, -1); - DestBinding->Endpoint = RPCRT4_strndupA(SrcBinding->Endpoint, -1); + DestBinding->Protseq = strdup(SrcBinding->Protseq); + DestBinding->NetworkAddr = strdup(SrcBinding->NetworkAddr); + DestBinding->Endpoint = strdup(SrcBinding->Endpoint); DestBinding->NetworkOptions = wcsdup(SrcBinding->NetworkOptions); DestBinding->CookieAuth = wcsdup(SrcBinding->CookieAuth); if (SrcBinding->Assoc) SrcBinding->Assoc->refs++; diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index d742c68eda9..78a9dfd0a00 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -143,7 +143,6 @@ typedef struct _RpcBinding LPWSTR CookieAuth; } RpcBinding; -LPSTR RPCRT4_strndupA(LPCSTR src, INT len) DECLSPEC_HIDDEN; LPWSTR RPCRT4_strndupW(LPCWSTR src, INT len) DECLSPEC_HIDDEN; LPSTR RPCRT4_strdupWtoA(LPCWSTR src) DECLSPEC_HIDDEN; LPWSTR RPCRT4_strdupAtoW(LPCSTR src) DECLSPEC_HIDDEN;

1 0

Francisco Casas : vkd3d-shader/hlsl: Fold redundant casts again after lower narrowing casts.
by Alexandre Julliard 08 Jun '23

08 Jun '23

Module: vkd3d Branch: master Commit: 5dee6561c2a9aeeb951cc9786a8b28eebf8adc4d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5dee6561c2a9aeeb951cc9786a8b2… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Jun 7 15:55:31 2023 -0400 vkd3d-shader/hlsl: Fold redundant casts again after lower narrowing casts. lower_narrowing_casts() currently creates a new cast calling hlsl_new_cast(). This cast may be redundant, but it is not folded, which is making SM1 emit an unnecessary fixme in some shaders: Aborting due to not yet implemented feature: SM1 "cast" expression. Other passes that call hlsl_new_cast() are lower_int_division() and lower_int_modulus(), so the new fold_redundant_casts() pass is called after these as well. --- libs/vkd3d-shader/hlsl_codegen.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 20d8f0ae..4317604b 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -4068,6 +4068,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry hlsl_transform_ir(ctx, lower_int_modulus, body, NULL); hlsl_transform_ir(ctx, lower_int_abs, body, NULL); hlsl_transform_ir(ctx, lower_float_modulus, body, NULL); + hlsl_transform_ir(ctx, fold_redundant_casts, body, NULL); do { progress = hlsl_transform_ir(ctx, hlsl_fold_constant_exprs, body, NULL);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Use the writemask to map the coords swizzle for load instructions.
by Alexandre Julliard 08 Jun '23

08 Jun '23

Module: vkd3d Branch: master Commit: 7b476573ffe0e674ef7a2390fb9d6da9c4d6fd3b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7b476573ffe0e674ef7a2390fb9d6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 5 12:30:42 2023 -0500 vkd3d-shader/hlsl: Use the writemask to map the coords swizzle for load instructions. Instead of modifying the swizzle after calling sm4_src_from_node(). This fixes the case where sm4_src_from_node() returns an immediate constant. Fixes: a471c5567acaf467292cdfb9c061e2213b348805 --- libs/vkd3d-shader/tpf.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 60948d64..b252270c 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -4012,8 +4012,8 @@ static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf bool multisampled = resource_type->base_type == HLSL_TYPE_TEXTURE && (resource_type->sampler_dim == HLSL_SAMPLER_DIM_2DMS || resource_type->sampler_dim == HLSL_SAMPLER_DIM_2DMSARRAY); bool uav = (hlsl_type_get_regset(resource_type) == HLSL_REGSET_UAVS); + unsigned int coords_writemask = VKD3DSP_WRITEMASK_ALL; struct sm4_instruction instr; - unsigned int dim_count; memset(&instr, 0, sizeof(instr)); if (uav) @@ -4034,19 +4034,20 @@ static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf sm4_dst_from_node(&instr.dsts[0], dst); instr.dst_count = 1; - sm4_src_from_node(&instr.srcs[0], coords, VKD3DSP_WRITEMASK_ALL); - if (!uav) { /* Mipmap level is in the last component in the IR, but needs to be in the W * component in the instruction. */ - dim_count = hlsl_sampler_dim_count(dim); + unsigned int dim_count = hlsl_sampler_dim_count(dim); + if (dim_count == 1) - instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, X, X, Y), 4); + coords_writemask = VKD3DSP_WRITEMASK_0 | VKD3DSP_WRITEMASK_3; if (dim_count == 2) - instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, Y, X, Z), 4); + coords_writemask = VKD3DSP_WRITEMASK_0 | VKD3DSP_WRITEMASK_1 | VKD3DSP_WRITEMASK_3; } + sm4_src_from_node(&instr.srcs[0], coords, coords_writemask); + sm4_src_from_deref(ctx, &instr.srcs[1], resource, resource_type, instr.dsts[0].writemask); instr.src_count = 2;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Only read used coordinates in encode_texel_offset_as_aoffimmi().
by Alexandre Julliard 08 Jun '23

08 Jun '23

Module: vkd3d Branch: master Commit: 974528cbe3233c1a20fe3bf3aa04c66324b9f51e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/974528cbe3233c1a20fe3bf3aa04c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 5 12:32:27 2023 -0500 vkd3d-shader/hlsl: Only read used coordinates in encode_texel_offset_as_aoffimmi(). The V and W offsets may be uninitialized, which may spuriously trigger "out of range" errors. --- libs/vkd3d-shader/tpf.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index b252270c..d066b13e 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3657,8 +3657,12 @@ static bool encode_texel_offset_as_aoffimmi(struct sm4_instruction *instr, modif.type = VKD3D_SM4_MODIFIER_AOFFIMMI; modif.u.aoffimmi.u = offset->value.u[0].i; - modif.u.aoffimmi.v = offset->value.u[1].i; - modif.u.aoffimmi.w = offset->value.u[2].i; + modif.u.aoffimmi.v = 0; + modif.u.aoffimmi.w = 0; + if (offset->node.data_type->dimx > 1) + modif.u.aoffimmi.v = offset->value.u[1].i; + if (offset->node.data_type->dimx > 2) + modif.u.aoffimmi.w = offset->value.u[2].i; if (modif.u.aoffimmi.u < -8 || modif.u.aoffimmi.u > 7 || modif.u.aoffimmi.v < -8 || modif.u.aoffimmi.v > 7 || modif.u.aoffimmi.w < -8 || modif.u.aoffimmi.w > 7)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_bit_xor().
by Alexandre Julliard 08 Jun '23

08 Jun '23

Module: vkd3d Branch: master Commit: a7a09ac5ef25bed2df44f1d19951e3e0e5d77b63 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a7a09ac5ef25bed2df44f1d19951e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 11 18:56:40 2022 -0600 vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_bit_xor(). --- libs/vkd3d-shader/hlsl_constant_ops.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 9fa2acd5..6dab6741 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -464,26 +464,26 @@ static bool fold_min(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, cons return true; } -static bool fold_bit_xor(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, - struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) +static bool fold_bit_xor(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, + const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2) { - enum hlsl_base_type type = dst->node.data_type->base_type; + enum hlsl_base_type type = dst_type->base_type; unsigned int k; assert(type == src1->node.data_type->base_type); assert(type == src2->node.data_type->base_type); - for (k = 0; k < dst->node.data_type->dimx; ++k) + for (k = 0; k < dst_type->dimx; ++k) { switch (type) { case HLSL_TYPE_INT: case HLSL_TYPE_UINT: - dst->value.u[k].u = src1->value.u[k].u ^ src2->value.u[k].u; + dst->u[k].u = src1->value.u[k].u ^ src2->value.u[k].u; break; default: - FIXME("Fold bit xor for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + FIXME("Fold bit xor for type %s.\n", debug_hlsl_type(ctx, dst_type)); return false; } } @@ -617,7 +617,7 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, break; case HLSL_OP2_BIT_XOR: - success = fold_bit_xor(ctx, res, arg1, arg2); + success = fold_bit_xor(ctx, &res->value, instr->data_type, arg1, arg2); break; case HLSL_OP2_BIT_AND:

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_bit_and().
by Alexandre Julliard 08 Jun '23

08 Jun '23

Module: vkd3d Branch: master Commit: 1049f489bb252e3551c54b88ce9181b6780b98ef URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1049f489bb252e3551c54b88ce918… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 11 18:57:25 2022 -0600 vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_bit_and(). --- libs/vkd3d-shader/hlsl_constant_ops.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 6dab6741..a00d017a 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -490,26 +490,26 @@ static bool fold_bit_xor(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, return true; } -static bool fold_bit_and(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, - struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) +static bool fold_bit_and(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, + const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2) { - enum hlsl_base_type type = dst->node.data_type->base_type; + enum hlsl_base_type type = dst_type->base_type; unsigned int k; assert(type == src1->node.data_type->base_type); assert(type == src2->node.data_type->base_type); - for (k = 0; k < dst->node.data_type->dimx; ++k) + for (k = 0; k < dst_type->dimx; ++k) { switch (type) { case HLSL_TYPE_INT: case HLSL_TYPE_UINT: - dst->value.u[k].u = src1->value.u[k].u & src2->value.u[k].u; + dst->u[k].u = src1->value.u[k].u & src2->value.u[k].u; break; default: - FIXME("Fold bit and for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + FIXME("Fold bit and for type %s.\n", debug_hlsl_type(ctx, dst_type)); return false; } } @@ -621,7 +621,7 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, break; case HLSL_OP2_BIT_AND: - success = fold_bit_and(ctx, res, arg1, arg2); + success = fold_bit_and(ctx, &res->value, instr->data_type, arg1, arg2); break; case HLSL_OP2_BIT_OR:

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_bit_or().
by Alexandre Julliard 08 Jun '23

08 Jun '23

Module: vkd3d Branch: master Commit: 79f443d131a0151da63c11c7555f243b38d6950e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/79f443d131a0151da63c11c7555f2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 11 18:58:02 2022 -0600 vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_bit_or(). --- libs/vkd3d-shader/hlsl_constant_ops.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index a00d017a..9c521215 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -516,26 +516,26 @@ static bool fold_bit_and(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, return true; } -static bool fold_bit_or(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, - struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) +static bool fold_bit_or(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, + const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2) { - enum hlsl_base_type type = dst->node.data_type->base_type; + enum hlsl_base_type type = dst_type->base_type; unsigned int k; assert(type == src1->node.data_type->base_type); assert(type == src2->node.data_type->base_type); - for (k = 0; k < dst->node.data_type->dimx; ++k) + for (k = 0; k < dst_type->dimx; ++k) { switch (type) { case HLSL_TYPE_INT: case HLSL_TYPE_UINT: - dst->value.u[k].u = src1->value.u[k].u | src2->value.u[k].u; + dst->u[k].u = src1->value.u[k].u | src2->value.u[k].u; break; default: - FIXME("Fold bit or for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + FIXME("Fold bit or for type %s.\n", debug_hlsl_type(ctx, dst_type)); return false; } } @@ -625,7 +625,7 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, break; case HLSL_OP2_BIT_OR: - success = fold_bit_or(ctx, res, arg1, arg2); + success = fold_bit_or(ctx, &res->value, instr->data_type, arg1, arg2); break; default:

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass a hlsl_constant_value pointer to hlsl_new_constant().
by Alexandre Julliard 08 Jun '23

08 Jun '23

Module: vkd3d Branch: master Commit: 740b0ad8071d7d31104e1f14e181e13ba3ce6133 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/740b0ad8071d7d31104e1f14e181e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 11 19:10:14 2022 -0600 vkd3d-shader/hlsl: Pass a hlsl_constant_value pointer to hlsl_new_constant(). --- libs/vkd3d-shader/hlsl.c | 38 +++++++++++----------- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl.y | 22 ++++++------- libs/vkd3d-shader/hlsl_codegen.c | 47 +++++++++++++++------------ libs/vkd3d-shader/hlsl_constant_ops.c | 60 +++++++++++++++++------------------ 5 files changed, 85 insertions(+), 84 deletions(-)

1 0