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

Alex Henrie : vbscript: Fix memory leak on error path in alloc_vbscode (scan-build).
by Alexandre Julliard June 7, 2023

June 7, 2023

Module: wine Branch: master Commit: 50df20b9ece2c6cd8e8c43f29ce1b51121590ae2 URL: https://gitlab.winehq.org/wine/wine/-/commit/50df20b9ece2c6cd8e8c43f29ce1b5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 6 23:52:16 2023 -0600 vbscript: Fix memory leak on error path in alloc_vbscode (scan-build). release_vbscode doesn't do anything if ref is 0. --- dlls/vbscript/compile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 1012f6af469..f86ecfded91 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1951,6 +1951,7 @@ static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source, DWORD_P memcpy(ret->source, source, len * sizeof(WCHAR)); ret->source[len] = 0; + ret->ref = 1; ret->cookie = cookie; ret->start_line = start_line; @@ -1966,7 +1967,6 @@ static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source, DWORD_P ret->main_code.type = FUNC_GLOBAL; ret->main_code.code_ctx = ret; - ret->ref = 1; list_init(&ret->entry); return ret;

1 0

Alex Henrie : vbscript: Fix memory leak on error path in RegExp2_Execute (scan-build).
by Alexandre Julliard June 7, 2023

June 7, 2023

Module: wine Branch: master Commit: 100131fa7e2932120e143c686316f49583921307 URL: https://gitlab.winehq.org/wine/wine/-/commit/100131fa7e2932120e143c686316f4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 6 23:44:59 2023 -0600 vbscript: Fix memory leak on error path in RegExp2_Execute (scan-build). --- dlls/vbscript/vbregexp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 6023b25c929..641798f97dd 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -1320,9 +1320,9 @@ static HRESULT WINAPI RegExp2_Execute(IRegExp2 *iface, break; hres = add_match(match_collection, add); + IMatch2_Release(add); if(FAILED(hres)) break; - IMatch2_Release(add); if(!(This->flags & REG_GLOB)) break;

1 0

Alex Henrie : wldap32: Fix memory leak on error path in ldap_start_tls_sW (scan-build).
by Alexandre Julliard June 7, 2023

June 7, 2023

Module: wine Branch: master Commit: 35dc94bc012e1fee34a6514d1b7d0149d02db0b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/35dc94bc012e1fee34a6514d1b7d01… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jun 7 00:14:40 2023 -0600 wldap32: Fix memory leak on error path in ldap_start_tls_sW (scan-build). --- dlls/wldap32/init.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c index 519466da1ee..c5b11a4de28 100644 --- a/dlls/wldap32/init.c +++ b/dlls/wldap32/init.c @@ -450,14 +450,12 @@ ULONG CDECL ldap_start_tls_sW( LDAP *ld, ULONG *retval, LDAPMessage **result, LD } if (!ld) return ~0u; + if (CONNECTED(ld)) return WLDAP32_LDAP_LOCAL_ERROR; if (serverctrls && !(serverctrlsU = controlarrayWtoU( serverctrls ))) goto exit; if (clientctrls && !(clientctrlsU = controlarrayWtoU( clientctrls ))) goto exit; - else - { - if (CONNECTED(ld)) return WLDAP32_LDAP_LOCAL_ERROR; - ret = map_error( ldap_start_tls_s( CTX(ld), serverctrlsU, clientctrlsU ) ); - } + + ret = map_error( ldap_start_tls_s( CTX(ld), serverctrlsU, clientctrlsU ) ); exit: controlarrayfreeU( serverctrlsU );

1 0

Alex Henrie : jscript: Fix memory leak on error path in regexp_string_match (scan-build).
by Alexandre Julliard June 7, 2023

June 7, 2023

Module: wine Branch: master Commit: b9aaaacc16360180af0b77c1104d6c9f75b21c5d URL: https://gitlab.winehq.org/wine/wine/-/commit/b9aaaacc16360180af0b77c1104d6c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 6 23:35:29 2023 -0600 jscript: Fix memory leak on error path in regexp_string_match (scan-build). --- dlls/jscript/jsregexp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index 7da365f4e6c..7b97a2951df 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -766,8 +766,10 @@ HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, jsstr_t *jsstr, jsv } hres = create_array(ctx, match_cnt, &array); - if(FAILED(hres)) + if(FAILED(hres)) { + free(match_result); return hres; + } for(i=0; i < match_cnt; i++) { jsstr_t *tmp_str;

1 0

Alex Henrie : hhctrl: Fix memory leak on error path in resolve_filename (scan-build).
by Alexandre Julliard June 7, 2023

June 7, 2023

Module: wine Branch: master Commit: 7b69313bbb7727cadf5be31ccf9a77759300b43c URL: https://gitlab.winehq.org/wine/wine/-/commit/7b69313bbb7727cadf5be31ccf9a77… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jun 7 00:02:24 2023 -0600 hhctrl: Fix memory leak on error path in resolve_filename (scan-build). --- dlls/hhctrl.ocx/hhctrl.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 829c1c5305b..3de9a741422 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -148,7 +148,14 @@ static BOOL resolve_filename(const WCHAR *env_filename, WCHAR *fullname, DWORD b free(filename); - return (GetFileAttributesW(fullname) != INVALID_FILE_ATTRIBUTES); + if (GetFileAttributesW(fullname) == INVALID_FILE_ATTRIBUTES) + { + if (window) free(*window); + if (index) free(*index); + return FALSE; + } + + return TRUE; } /******************************************************************

1 0

Alex Henrie : dnsapi: Fix memory leak on error path in do_query_netbios (scan-build).
by Alexandre Julliard June 7, 2023

June 7, 2023

Module: wine Branch: master Commit: 2cabb3f79d43694f9cbc9dfde2769ea9eb24f655 URL: https://gitlab.winehq.org/wine/wine/-/commit/2cabb3f79d43694f9cbc9dfde2769e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 6 23:12:33 2023 -0600 dnsapi: Fix memory leak on error path in do_query_netbios (scan-build). --- dlls/dnsapi/query.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 90a3a3e9950..1802e93dd75 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -77,6 +77,7 @@ static DNS_STATUS do_query_netbios( PCSTR name, DNS_RECORDA **recp ) if (!record->pName) { status = ERROR_NOT_ENOUGH_MEMORY; + free( record ); goto exit; }

1 0

Alex Henrie : kerberos: Fix memory leaks in (wow64_)query_ticket_cache (scan-build).
by Alexandre Julliard June 7, 2023

June 7, 2023

Module: wine Branch: master Commit: 025e9a0183079d7d30551973d5311c0f1968451d URL: https://gitlab.winehq.org/wine/wine/-/commit/025e9a0183079d7d30551973d5311c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jun 5 23:26:24 2023 -0600 kerberos: Fix memory leaks in (wow64_)query_ticket_cache (scan-build). --- dlls/kerberos/unixlib.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index a918959dbe5..45cf494aa70 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -339,22 +339,30 @@ done: return status; } +static void free_tickets_in_list( struct ticket_list *list ) +{ + ULONG i; + + for (i = 0; i < list->count; i++) + { + free( list->tickets[i].RealmName.Buffer ); + free( list->tickets[i].ServerName.Buffer ); + } + + free( list->tickets ); +} + static NTSTATUS query_ticket_cache( void *args ) { struct query_ticket_cache_params *params = args; struct ticket_list list = { 0 }; NTSTATUS status; - ULONG i; status = kerberos_fill_ticket_list( &list ); if (status == STATUS_SUCCESS) status = copy_tickets_to_client( &list, params->resp, params->out_size ); - for (i = 0; i < list.count; i++) - { - free( list.tickets[i].RealmName.Buffer ); - free( list.tickets[i].ServerName.Buffer ); - } + free_tickets_in_list( &list ); return status; } @@ -1237,17 +1245,12 @@ static NTSTATUS wow64_query_ticket_cache( void *args ) } const *params32 = args; struct ticket_list list = { 0 }; NTSTATUS status; - ULONG i; status = kerberos_fill_ticket_list( &list ); if (status == STATUS_SUCCESS) status = copy_tickets_to_client32( &list, ULongToPtr(params32->resp), ULongToPtr(params32->out_size) ); - for (i = 0; i < list.count; i++) - { - free( list.tickets[i].RealmName.Buffer ); - free( list.tickets[i].ServerName.Buffer ); - } + free_tickets_in_list( &list ); return status; }

1 0

Francisco Casas : vkd3d-shader/hlsl: Lower dot for non-float types.
by Alexandre Julliard June 7, 2023

June 7, 2023

Module: vkd3d Branch: master Commit: 6cfa8cf85904a6c329608073823af7d7a7d99be6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6cfa8cf85904a6c329608073823af… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed May 24 01:01:38 2023 -0400 vkd3d-shader/hlsl: Lower dot for non-float types. --- libs/vkd3d-shader/hlsl_codegen.c | 50 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 3d41524f..9774ca08 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2389,6 +2389,55 @@ static bool lower_int_abs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void return true; } +static bool lower_int_dot(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_ir_node *arg1, *arg2, *mult, *comps[4] = {0}, *res; + struct hlsl_type *type = instr->data_type; + struct hlsl_ir_expr *expr; + unsigned int i, dimx; + + if (instr->type != HLSL_IR_EXPR) + return false; + expr = hlsl_ir_expr(instr); + + if (expr->op != HLSL_OP2_DOT) + return false; + + if (type->base_type == HLSL_TYPE_INT || type->base_type == HLSL_TYPE_UINT) + { + arg1 = expr->operands[0].node; + arg2 = expr->operands[1].node; + assert(arg1->data_type->dimx == arg2->data_type->dimx); + dimx = arg1->data_type->dimx; + + if (!(mult = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, arg1, arg2))) + return false; + list_add_before(&instr->entry, &mult->entry); + + for (i = 0; i < dimx; ++i) + { + unsigned int s = hlsl_swizzle_from_writemask(1 << i); + + if (!(comps[i] = hlsl_new_swizzle(ctx, s, 1, mult, &instr->loc))) + return false; + list_add_before(&instr->entry, &comps[i]->entry); + } + + res = comps[0]; + for (i = 1; i < dimx; ++i) + { + if (!(res = hlsl_new_binary_expr(ctx, HLSL_OP2_ADD, res, comps[i]))) + return false; + list_add_before(&instr->entry, &res->entry); + } + + hlsl_replace_node(instr, res); + return true; + } + + return false; +} + static bool lower_float_modulus(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_node *arg1, *arg2, *mul1, *neg1, *ge, *neg2, *div, *mul2, *frc, *cond; @@ -3936,6 +3985,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry hlsl_transform_ir(ctx, lower_narrowing_casts, body, NULL); hlsl_transform_ir(ctx, lower_casts_to_bool, body, NULL); + hlsl_transform_ir(ctx, lower_int_dot, body, NULL); hlsl_transform_ir(ctx, lower_int_division, body, NULL); hlsl_transform_ir(ctx, lower_int_modulus, body, NULL); hlsl_transform_ir(ctx, lower_int_abs, body, NULL);

1 0

Francisco Casas : vkd3d-shader/hlsl: Support non-constant vector indexing.
by Alexandre Julliard June 7, 2023

June 7, 2023

Module: vkd3d Branch: master Commit: ebf7573571d4bfcd3f38846886106f204fd7f0e8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ebf7573571d4bfcd3f38846886106… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon May 8 18:25:18 2023 -0400 vkd3d-shader/hlsl: Support non-constant vector indexing. Non-constant vector indexing is not solved with relative addressing in the register indexes because this indexation cannot be at the level of register-components. Mathematical operations must be used instead. --- libs/vkd3d-shader/hlsl.c | 13 ++++ libs/vkd3d-shader/hlsl.h | 2 + libs/vkd3d-shader/hlsl_codegen.c | 88 +++++++++++++++++++++++++- tests/array-index-expr.shader_test | 36 +++++------ tests/expr-indexing.shader_test | 22 +++---- tests/hlsl-matrix-indexing.shader_test | 6 +- tests/hlsl-vector-indexing-uniform.shader_test | 4 +- 7 files changed, 134 insertions(+), 37 deletions(-)

1 0

Francisco Casas : tests: Test indexing temps.
by Alexandre Julliard June 7, 2023

June 7, 2023

Module: vkd3d Branch: master Commit: f24598c9a09fcfa48b5321cba0299bbea160d55c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f24598c9a09fcfa48b5321cba0299… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu May 4 18:12:29 2023 -0400 tests: Test indexing temps. --- tests/array-index-expr.shader_test | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/tests/array-index-expr.shader_test b/tests/array-index-expr.shader_test index 716c6d04..0c607677 100644 --- a/tests/array-index-expr.shader_test +++ b/tests/array-index-expr.shader_test @@ -72,3 +72,28 @@ todo probe all rgba (23.0, 1.0, 22.0, 0.0) uniform 0 float 3 todo draw quad todo probe all rgba (24.0, 0.0, 21.0, 1.0) + + +[pixel shader todo] +uniform float2 i; + +float4 main() : sv_target +{ + float4 f[3] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}; + + return f[i.x + i.y]; +} + +[test] +uniform 0 float4 0 0 0 0 +todo draw quad +todo probe all rgba (1.0, 2.0, 3.0, 4.0) +uniform 0 float4 1 0 0 0 +todo draw quad +todo probe all rgba (5.0, 6.0, 7.0, 8.0) +uniform 0 float4 0 1 0 0 +todo draw quad +todo probe all rgba (5.0, 6.0, 7.0, 8.0) +uniform 0 float4 1 1 0 0 +todo draw quad +todo probe all rgba (9.0, 10.0, 11.0, 12.0)

1 0