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

Alex Henrie : wininet: Fix memory leaks on error paths in INTERNET_LoadProxySettings (scan-build).
by Alexandre Julliard 07 Jun '23

07 Jun '23

Module: wine Branch: master Commit: faa68dabc3d0c6de929f13e8344da1abc32be1f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/faa68dabc3d0c6de929f13e8344da1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 6 23:25:02 2023 -0600 wininet: Fix memory leaks on error paths in INTERNET_LoadProxySettings (scan-build). --- dlls/wininet/internet.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index a2d9f00ce6f..5af3aac71ea 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -637,6 +637,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) if (!(szProxy = malloc( len ))) { RegCloseKey( key ); + FreeProxyInfo( lpwpi ); return ERROR_OUTOFMEMORY; } RegQueryValueExW( key, L"ProxyOverride", NULL, &type, (BYTE*)szProxy, &len ); @@ -661,6 +662,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) if (!(envproxyW = malloc( wcslen(envproxy) * sizeof(WCHAR) ))) { RegCloseKey( key ); + FreeProxyInfo( lpwpi ); return ERROR_OUTOFMEMORY; } lstrcpyW( envproxyW, envproxy );

1 0

Alex Henrie : vbscript: Fix memory leak on error path in alloc_vbscode (scan-build).
by Alexandre Julliard 07 Jun '23

07 Jun '23

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 : dnsapi: Fix memory leak on error path in do_query_netbios (scan-build).
by Alexandre Julliard 07 Jun '23

07 Jun '23

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 : hhctrl: Fix memory leak on error path in resolve_filename (scan-build).
by Alexandre Julliard 07 Jun '23

07 Jun '23

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 : wldap32: Fix memory leak on error path in ldap_start_tls_sW (scan-build).
by Alexandre Julliard 07 Jun '23

07 Jun '23

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 07 Jun '23

07 Jun '23

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 : kerberos: Fix memory leaks in (wow64_)query_ticket_cache (scan-build).
by Alexandre Julliard 07 Jun '23

07 Jun '23

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 : tests: Test non-constant vector indexing.
by Alexandre Julliard 07 Jun '23

07 Jun '23

Module: vkd3d Branch: master Commit: 8d7cc8c84e07d5158020efcf5f2e8b408407774d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8d7cc8c84e07d5158020efcf5f2e8… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu May 4 14:03:30 2023 -0400 tests: Test non-constant vector indexing. --- tests/array-index-expr.shader_test | 49 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/tests/array-index-expr.shader_test b/tests/array-index-expr.shader_test index 8dda0c99..716c6d04 100644 --- a/tests/array-index-expr.shader_test +++ b/tests/array-index-expr.shader_test @@ -23,3 +23,52 @@ todo probe all rgba (5.0, 6.0, 7.0, 8.0) uniform 12 float4 1 1 0 0 todo draw quad todo probe all rgba (9.0, 10.0, 11.0, 12.0) + + +[pixel shader todo] +uniform float i; + +float4 main() : SV_TARGET +{ + float4 arr = float4(11.0, 12.0, 13.0, 14.0); + return arr[i]; +} + +[test] +uniform 0 float 0 +todo draw quad +todo probe all rgba (11.0, 11.0, 11.0, 11.0) +uniform 0 float 1 +todo draw quad +todo probe all rgba (12.0, 12.0, 12.0, 12.0) +uniform 0 float 2 +todo draw quad +todo probe all rgba (13.0, 13.0, 13.0, 13.0) +uniform 0 float 3 +todo draw quad +todo probe all rgba (14.0, 14.0, 14.0, 14.0) + + +[pixel shader todo] +uniform float i; + +float4 main() : SV_TARGET +{ + int4 arr_i = int4(21, 22, 23, 24); + bool4 arr_b = bool4(true, false, true, false); + return float4(arr_i[i], arr_b[i], arr_i[3 - i], arr_b[3 - i]); +} + +[test] +uniform 0 float 0 +todo draw quad +todo probe all rgba (21.0, 1.0, 24.0, 0.0) +uniform 0 float 1 +todo draw quad +todo probe all rgba (22.0, 0.0, 23.0, 1.0) +uniform 0 float 2 +todo draw quad +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)

1 0

Francisco Casas : tests: Test indexing temps.
by Alexandre Julliard 07 Jun '23

07 Jun '23

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

Francisco Casas : vkd3d-shader/hlsl: Introduce transform_derefs().
by Alexandre Julliard 07 Jun '23

07 Jun '23

Module: vkd3d Branch: master Commit: 441902bb85dac81fb1d83facc7367830ce804956 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/441902bb85dac81fb1d83facc7367… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu May 4 15:06:58 2023 -0400 vkd3d-shader/hlsl: Introduce transform_derefs(). --- libs/vkd3d-shader/hlsl_codegen.c | 77 +++++++++++++++++++++++----------------- 1 file changed, 44 insertions(+), 33 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 2b6c595a..3d41524f 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -123,15 +123,14 @@ static struct hlsl_ir_node *new_offset_instr_from_deref(struct hlsl_ctx *ctx, st } /* TODO: remove when no longer needed, only used for transform_deref_paths_into_offsets() */ -static void replace_deref_path_with_offset(struct hlsl_ctx *ctx, struct hlsl_deref *deref, +static bool replace_deref_path_with_offset(struct hlsl_ctx *ctx, struct hlsl_deref *deref, struct hlsl_ir_node *instr) { const struct hlsl_type *type; struct hlsl_ir_node *offset; struct hlsl_block block; - if (!deref->var) - return; + assert(deref->var); /* register offsets shouldn't be used before this point is reached. */ assert(!deref->offset.node); @@ -143,45 +142,19 @@ static void replace_deref_path_with_offset(struct hlsl_ctx *ctx, struct hlsl_der if (type->class == HLSL_CLASS_STRUCT || type->class == HLSL_CLASS_ARRAY) { hlsl_cleanup_deref(deref); - return; + return true; } deref->offset_regset = hlsl_type_get_regset(type); if (!(offset = new_offset_instr_from_deref(ctx, &block, deref, &instr->loc))) - return; + return false; list_move_before(&instr->entry, &block.instrs); hlsl_cleanup_deref(deref); hlsl_src_from_node(&deref->offset, offset); -} - -/* TODO: remove when no longer needed. */ -static bool transform_deref_paths_into_offsets(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) -{ - switch(instr->type) - { - case HLSL_IR_LOAD: - replace_deref_path_with_offset(ctx, &hlsl_ir_load(instr)->src, instr); - return true; - case HLSL_IR_STORE: - replace_deref_path_with_offset(ctx, &hlsl_ir_store(instr)->lhs, instr); - return true; - - case HLSL_IR_RESOURCE_LOAD: - replace_deref_path_with_offset(ctx, &hlsl_ir_resource_load(instr)->resource, instr); - replace_deref_path_with_offset(ctx, &hlsl_ir_resource_load(instr)->sampler, instr); - return true; - - case HLSL_IR_RESOURCE_STORE: - replace_deref_path_with_offset(ctx, &hlsl_ir_resource_store(instr)->resource, instr); - return true; - - default: - return false; - } - return false; + return true; } /* Split uniforms into two variables representing the constant and temp @@ -600,6 +573,44 @@ bool hlsl_transform_ir(struct hlsl_ctx *ctx, bool (*func)(struct hlsl_ctx *ctx, return progress; } +static bool transform_instr_derefs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + bool res; + bool (*func)(struct hlsl_ctx *ctx, struct hlsl_deref *, struct hlsl_ir_node *) = context; + + switch(instr->type) + { + case HLSL_IR_LOAD: + res = func(ctx, &hlsl_ir_load(instr)->src, instr); + return res; + + case HLSL_IR_STORE: + res = func(ctx, &hlsl_ir_store(instr)->lhs, instr); + return res; + + case HLSL_IR_RESOURCE_LOAD: + res = func(ctx, &hlsl_ir_resource_load(instr)->resource, instr); + if (hlsl_ir_resource_load(instr)->sampler.var) + res |= func(ctx, &hlsl_ir_resource_load(instr)->sampler, instr); + return res; + + case HLSL_IR_RESOURCE_STORE: + res = func(ctx, &hlsl_ir_resource_store(instr)->resource, instr); + return res; + + default: + return false; + } + return false; +} + +static bool transform_derefs(struct hlsl_ctx *ctx, + bool (*func)(struct hlsl_ctx *ctx, struct hlsl_deref *, struct hlsl_ir_node *), + struct hlsl_block *block) +{ + return hlsl_transform_ir(ctx, transform_instr_derefs, block, func); +} + struct recursive_call_ctx { const struct hlsl_ir_function_decl **backtrace; @@ -3956,7 +3967,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry hlsl_transform_ir(ctx, track_object_components_usage, body, NULL); /* TODO: move forward, remove when no longer needed */ - hlsl_transform_ir(ctx, transform_deref_paths_into_offsets, body, NULL); + transform_derefs(ctx, replace_deref_path_with_offset, body); while (hlsl_transform_ir(ctx, hlsl_fold_constant_exprs, body, NULL)); do

1 0