- Wine-Commits - list.winehq.org

Ziqing Hui : mf/tests: Test input type for WMA decoder DMO.
by Alexandre Julliard June 5, 2023

June 5, 2023

Module: wine Branch: master Commit: e0ea1a4f66d0013c7bce200760b2c1ace1e517ab URL: https://gitlab.winehq.org/wine/wine/-/commit/e0ea1a4f66d0013c7bce200760b2c1… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Jun 2 10:39:42 2023 +0800 mf/tests: Test input type for WMA decoder DMO. --- dlls/mf/tests/transform.c | 233 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 224 insertions(+), 9 deletions(-)

1 0

Alex Henrie : jscript: Remove unnecessary call to malloc in strbuf_ensure_size.
by Alexandre Julliard June 5, 2023

June 5, 2023

Module: wine Branch: master Commit: 01deef22114adda87f05fb8197a29435d9a9987f URL: https://gitlab.winehq.org/wine/wine/-/commit/01deef22114adda87f05fb8197a294… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 4 23:25:24 2023 -0600 jscript: Remove unnecessary call to malloc in strbuf_ensure_size. --- dlls/jscript/string.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index f7d02f1582a..4033f0a2b56 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -627,10 +627,7 @@ static BOOL strbuf_ensure_size(strbuf_t *buf, unsigned len) new_size = buf->size ? buf->size<<1 : 16; if(new_size < len) new_size = len; - if(buf->buf) - new_buf = realloc(buf->buf, new_size*sizeof(WCHAR)); - else - new_buf = malloc(new_size*sizeof(WCHAR)); + new_buf = realloc(buf->buf, new_size * sizeof(WCHAR)); if(!new_buf) return FALSE;

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Fix sampler type used for samplerCUBE.
by Alexandre Julliard June 5, 2023

June 5, 2023

Module: vkd3d Branch: master Commit: 82ddc6b417b79919f3e730ef3f2e167ab8462010 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/82ddc6b417b79919f3e730ef3f2e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 2 10:39:42 2023 +0200 vkd3d-shader/hlsl: Fix sampler type used for samplerCUBE. --- libs/vkd3d-shader/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index cf483d82..30d09751 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -5242,7 +5242,7 @@ type_no_void: } | KW_SAMPLERCUBE { - $$ = ctx->builtin_types.sampler[HLSL_SAMPLER_DIM_3D]; + $$ = ctx->builtin_types.sampler[HLSL_SAMPLER_DIM_CUBE]; } | KW_TEXTURE {

1 0

Alex Henrie : msi: Make TransformView_Create static.
by Alexandre Julliard June 5, 2023

June 5, 2023

Module: wine Branch: master Commit: 1da5618cbac1214082bfb897dc81804d14fc6e9e URL: https://gitlab.winehq.org/wine/wine/-/commit/1da5618cbac1214082bfb897dc8180… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 4 22:19:33 2023 -0600 msi: Make TransformView_Create static. --- dlls/msi/table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index e83c076ab23..77fa20502c5 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2765,7 +2765,7 @@ static const MSIVIEWOPS transform_view_ops = NULL }; -UINT TransformView_Create( MSIDATABASE *db, string_table *st, LPCWSTR name, MSIVIEW **view ) +static UINT TransformView_Create( MSIDATABASE *db, string_table *st, LPCWSTR name, MSIVIEW **view ) { static const WCHAR query_pfx[] = L"SELECT `Column`, `Data`, `Current` FROM `_TransformView` WHERE `Table`='"; static const WCHAR query_sfx[] = L"' AND `Row` IS NULL AND `Current` IS NOT NULL AND `new` = 1";

1 0

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

June 5, 2023

Module: wine Branch: master Commit: 66929987abbd8560da9835b561b38a7528388a05 URL: https://gitlab.winehq.org/wine/wine/-/commit/66929987abbd8560da9835b561b38a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 4 23:27:32 2023 -0600 jscript: Fix memory leak on error path in String_replace (scan-build). --- dlls/jscript/string.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 14bcfbdaaf3..f7d02f1582a 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -926,8 +926,10 @@ static HRESULT String_replace(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsi jsstr_t *ret_str; ret_str = jsstr_alloc_len(ret.buf, ret.len); - if(!ret_str) + if(!ret_str) { + free(ret.buf); return E_OUTOFMEMORY; + } TRACE("= %s\n", debugstr_jsstr(ret_str)); *r = jsval_string(ret_str);

1 0

Alex Henrie : wbemprox: Fix memory leak on error path in create_view (scan-build).
by Alexandre Julliard June 5, 2023

June 5, 2023

Module: wine Branch: master Commit: ea58ec849ff270feee0577d2c4ffd593f3eea25c URL: https://gitlab.winehq.org/wine/wine/-/commit/ea58ec849ff270feee0577d2c4ffd5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 4 23:19:33 2023 -0600 wbemprox: Fix memory leak on error path in create_view (scan-build). --- dlls/wbemprox/query.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 1b79523d66f..1087e271837 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -62,7 +62,11 @@ HRESULT create_view( enum view_type type, enum wbm_namespace ns, const WCHAR *pa free( view ); return hr; } - else if (!table && ns == WBEMPROX_NAMESPACE_LAST) return WBEM_E_INVALID_CLASS; + else if (!table && ns == WBEMPROX_NAMESPACE_LAST) + { + free( view ); + return WBEM_E_INVALID_CLASS; + } view->proplist = proplist; view->cond = cond; break;

1 0

Alex Henrie : msi: Fix memory leak in ready_media (scan-build).
by Alexandre Julliard June 5, 2023

June 5, 2023

Module: wine Branch: master Commit: c39f785b34692ee994b2449cc17a96815517e9bf URL: https://gitlab.winehq.org/wine/wine/-/commit/c39f785b34692ee994b2449cc17a96… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 4 23:00:19 2023 -0600 msi: Fix memory leak in ready_media (scan-build). base_url was never freed, and can simply be enlarged instead of copying it to a new buffer. --- dlls/msi/media.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 513e04b1b7e..50673f99cae 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -855,11 +855,11 @@ UINT ready_media( MSIPACKAGE *package, BOOL compressed, MSIMEDIAINFO *mi ) WCHAR temppath[MAX_PATH], *p, *url; free( cabinet_file ); - if (!(url = malloc( (wcslen( base_url ) + wcslen( mi->cabinet ) + 1) * sizeof(WCHAR) ))) + if (!(url = realloc( base_url, (wcslen( base_url ) + wcslen( mi->cabinet ) + 1) * sizeof(WCHAR) ))) { + free( base_url ); return ERROR_OUTOFMEMORY; } - lstrcpyW( url, base_url ); lstrcatW( url, mi->cabinet ); if ((rc = msi_download_file( url, temppath )) != ERROR_SUCCESS) {

1 0

Alex Henrie : mscms: Fix double free on error path in EnumColorProfilesA (scan-build).
by Alexandre Julliard June 5, 2023

June 5, 2023

Module: wine Branch: master Commit: abfc151e0b1e0a8361514a71d8d288fbd5160673 URL: https://gitlab.winehq.org/wine/wine/-/commit/abfc151e0b1e0a8361514a71d8d288… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 4 21:59:31 2023 -0600 mscms: Fix double free on error path in EnumColorProfilesA (scan-build). If fileW is not null, it is freed at the end of the function. --- dlls/mscms/profile.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 9c4b6be8342..5ecd5f83273 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -810,6 +810,7 @@ BOOL WINAPI EnumColorProfilesA( PCSTR machine, PENUMTYPEA record, PBYTE buffer, if (!(ret = header_from_file( fileW, &header ))) { free( fileW ); + fileW = NULL; continue; }

1 0

Alex Henrie : wusa: Fix double free on error path in read_update_package (scan-build).
by Alexandre Julliard June 5, 2023

June 5, 2023

Module: wine Branch: master Commit: 935626b48809b26ab4a215992bf5169af0a28153 URL: https://gitlab.winehq.org/wine/wine/-/commit/935626b48809b26ab4a215992bf516… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 4 21:57:49 2023 -0600 wusa: Fix double free on error path in read_update_package (scan-build). If read_identity returns FALSE, it has already called clear_identity. --- programs/wusa/manifest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wusa/manifest.c b/programs/wusa/manifest.c index 620da4fc63b..83d4125133f 100644 --- a/programs/wusa/manifest.c +++ b/programs/wusa/manifest.c @@ -587,7 +587,7 @@ static BOOL read_update_package(IXMLDOMElement *child, WCHAR *tagname, void *con list_add_tail(update_list, &entry->entry); return TRUE; } - free_dependency(entry); + free(entry); } return FALSE;

1 0

Alex Henrie : msi: Return ERROR_OUTOFMEMORY if calloc fails in TransformView_Create (scan-build).
by Alexandre Julliard June 5, 2023

June 5, 2023

Module: wine Branch: master Commit: daa20d9d636057d7009ff3652a8577b423d23fcf URL: https://gitlab.winehq.org/wine/wine/-/commit/daa20d9d636057d7009ff3652a8577… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 4 22:15:35 2023 -0600 msi: Return ERROR_OUTOFMEMORY if calloc fails in TransformView_Create (scan-build). Instead of ERROR_SUCCESS. --- dlls/msi/table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index f65250766a4..e83c076ab23 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2856,7 +2856,7 @@ UINT TransformView_Create( MSIDATABASE *db, string_table *st, LPCWSTR name, MSIV MSI_ViewClose( q ); msiobj_release( &q->hdr ); free( tv ); - return r; + return ERROR_OUTOFMEMORY; } while (MSI_ViewFetch( q, &rec ) == ERROR_SUCCESS)

1 0