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

Billy Laws : configure: Stash host LDFLAGS when configuring cross-compilers.
by Alexandre Julliard June 5, 2023

June 5, 2023

Module: wine Branch: master Commit: c29336fa781a7cf34379c1e38dea7a7cd04f92af URL: https://gitlab.winehq.org/wine/wine/-/commit/c29336fa781a7cf34379c1e38dea7a… Author: Billy Laws <blaws05(a)gmail.com> Date: Sat Jun 3 21:35:45 2023 +0100 configure: Stash host LDFLAGS when configuring cross-compilers. --- configure | 6 +++++- configure.ac | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 4cab5e67e43..000776267b1 100755 --- a/configure +++ b/configure @@ -10591,11 +10591,13 @@ fi saved_CC=$CC saved_CFLAGS=$CFLAGS + saved_LDFLAGS=$LDFLAGS CFLAGS=${CROSSCFLAGS:-"-g -O2"} + LDFLAGS=$CROSSLDFLAGS eval CC=\$${wine_arch}_CC eval ${wine_arch}_CFLAGS=\$CFLAGS - eval ${wine_arch}_LDFLAGS=\$CROSSLDFLAGS + eval ${wine_arch}_LDFLAGS=\$LDFLAGS eval "${wine_arch}_EXTRACFLAGS=\"-D__WINE_PE_BUILD -Wall\"" target="" @@ -10699,6 +10701,7 @@ fi then CC=$saved_CC CFLAGS=$saved_CFLAGS + LDFLAGS=$saved_LDFLAGS continue fi as_fn_append PE_ARCHS " $wine_arch" @@ -11672,6 +11675,7 @@ fi } CC=$saved_CC CFLAGS=$saved_CFLAGS + LDFLAGS=$saved_LDFLAGS done if test $HOST_ARCH = aarch64 -a "x$PE_ARCHS" = x diff --git a/configure.ac b/configure.ac index 3af0aa5fa98..2b4c09069ac 100644 --- a/configure.ac +++ b/configure.ac @@ -842,11 +842,13 @@ do saved_CC=$CC saved_CFLAGS=$CFLAGS + saved_LDFLAGS=$LDFLAGS CFLAGS=${CROSSCFLAGS:-"-g -O2"} + LDFLAGS=$CROSSLDFLAGS AS_VAR_COPY([CC],[${wine_arch}_CC]) AS_VAR_COPY([${wine_arch}_CFLAGS],[CFLAGS]) - AS_VAR_COPY([${wine_arch}_LDFLAGS],[CROSSLDFLAGS]) + AS_VAR_COPY([${wine_arch}_LDFLAGS],[LDFLAGS]) AS_VAR_SET([${wine_arch}_EXTRACFLAGS],["-D__WINE_PE_BUILD -Wall"]) target="" @@ -892,6 +894,7 @@ do then CC=$saved_CC CFLAGS=$saved_CFLAGS + LDFLAGS=$saved_LDFLAGS continue fi AS_VAR_APPEND([PE_ARCHS],[" $wine_arch"]) @@ -982,6 +985,7 @@ do CC=$saved_CC CFLAGS=$saved_CFLAGS + LDFLAGS=$saved_LDFLAGS done if test $HOST_ARCH = aarch64 -a "x$PE_ARCHS" = x

1 0

Zhiyi Zhang : winegstreamer: Fix check for non-zero padding in mf_media_type_from_wg_format_video().
by Alexandre Julliard June 5, 2023

June 5, 2023

Module: wine Branch: master Commit: 7770f3173cd4ac034a7a3b3c1d9ce77bf0d2f1c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/7770f3173cd4ac034a7a3b3c1d9ce7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jun 2 17:30:13 2023 +0800 winegstreamer: Fix check for non-zero padding in mf_media_type_from_wg_format_video(). Similar to 35f9091, IsRectEmpty() is the wrong way to check if padding is empty. --- dlls/winegstreamer/mfplat.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 9cf98ec9dc4..e740807101e 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -531,7 +531,8 @@ static IMFMediaType *mf_media_type_from_wg_format_video(const struct wg_format * stride = -stride; IMFMediaType_SetUINT32(type, &MF_MT_DEFAULT_STRIDE, stride); - if (!IsRectEmpty(&format->u.video.padding)) + if (format->u.video.padding.left || format->u.video.padding.right + || format->u.video.padding.top || format->u.video.padding.bottom) { MFVideoArea aperture = {

1 0

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

June 5, 2023

Module: wine Branch: master Commit: 7acaf2511df2ee6c373e6923750aa8d39f130a64 URL: https://gitlab.winehq.org/wine/wine/-/commit/7acaf2511df2ee6c373e6923750aa8… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Jun 2 12:19:40 2023 +0800 mf/tests: Test output type for WMA decoder DMO. --- dlls/mf/tests/transform.c | 335 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 277 insertions(+), 58 deletions(-)

1 0

Shaun Ren : sapi: Add SpMMAudioOut stub.
by Alexandre Julliard June 5, 2023

June 5, 2023

Module: wine Branch: master Commit: 33c8d7b8a5b140241ca42da539a5c353f0cd0d09 URL: https://gitlab.winehq.org/wine/wine/-/commit/33c8d7b8a5b140241ca42da539a5c3… Author: Shaun Ren <sren(a)codeweavers.com> Date: Tue May 16 18:55:31 2023 -0400 sapi: Add SpMMAudioOut stub. --- dlls/sapi/Makefile.in | 1 + dlls/sapi/main.c | 3 + dlls/sapi/mmaudio.c | 633 ++++++++++++++++++++++++++++++++++++++++++++ dlls/sapi/sapi_classes.idl | 15 ++ dlls/sapi/sapi_private.h | 1 + dlls/sapi/tests/Makefile.in | 1 + dlls/sapi/tests/mmaudio.c | 68 +++++ 7 files changed, 722 insertions(+)

1 0

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

June 5, 2023

Module: wine Branch: master Commit: 8b54c2e35d304ecb692ae6c407550a034ed7cc54 URL: https://gitlab.winehq.org/wine/wine/-/commit/8b54c2e35d304ecb692ae6c407550a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 4 22:44:31 2023 -0600 conhost: Fix memory leak on error path in edit_line_move_to_history (scan-build). --- programs/conhost/conhost.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 04a294fc31f..c2d48d082c6 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -715,6 +715,7 @@ static void edit_line_move_to_history( struct console *console, int index ) } else { + free( line ); ctx->status = STATUS_NO_MEMORY; return; }

1 0

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