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

Zhiyi Zhang : winegstreamer: Fix check for non-zero padding in mf_media_type_from_wg_format_video().
by Alexandre Julliard 05 Jun '23

05 Jun '23

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

Bernhard Übelacker : comdlg32: Avoid crash in RemoveControlItem.
by Alexandre Julliard 05 Jun '23

05 Jun '23

Module: wine Branch: master Commit: 345ca7e061061e5511af85a45931350acb3764d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/345ca7e061061e5511af85a4593135… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Fri Dec 10 00:50:46 2021 +0100 comdlg32: Avoid crash in RemoveControlItem. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51640 --- dlls/comdlg32/itemdlg.c | 3 +++ dlls/comdlg32/tests/itemdlg.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index e6f4ecb55b9..f3b9a217e79 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -4159,6 +4159,9 @@ static HRESULT WINAPI IFileDialogCustomize_fnRemoveControlItem(IFileDialogCustom item = get_item(ctrl, dwIDItem, CDCS_VISIBLE|CDCS_ENABLED, &position); + if (!item) + return E_INVALIDARG; + if ((item->cdcstate & (CDCS_VISIBLE|CDCS_ENABLED)) == (CDCS_VISIBLE|CDCS_ENABLED)) { if(SendMessageW(ctrl->hwnd, CB_DELETESTRING, position, 0) == CB_ERR) diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 9b4560fced8..8ce0ea806b9 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -2460,6 +2460,42 @@ static void test_overwrite(void) IShellItem_Release(psi_current); } +static void test_customize_remove_from_empty_combobox(void) +{ + IFileDialog *pfod; + IFileDialogCustomize *pfdc; + UINT i; + HRESULT hr; + hr = CoCreateInstance(&CLSID_FileOpenDialog, NULL, CLSCTX_INPROC_SERVER, + &IID_IFileDialog, (void**)&pfod); + ok(hr == S_OK, "got 0x%08lx.\n", hr); + + hr = IFileDialog_QueryInterface(pfod, &IID_IFileDialogCustomize, (void**)&pfdc); + ok(hr == S_OK, "got 0x%08lx.\n", hr); + if(FAILED(hr)) + { + skip("Skipping IFileDialogCustomize tests.\n"); + IFileDialog_Release(pfod); + return; + } + + i = 107; + hr = IFileDialogCustomize_AddComboBox(pfdc, i); + ok(hr == S_OK, "got 0x%08lx.\n", hr); + + hr = IFileDialogCustomize_RemoveAllControlItems(pfdc, i); + ok(hr == E_NOTIMPL, "got 0x%08lx.\n", hr); + + hr = IFileDialogCustomize_SetSelectedControlItem(pfdc, i, 1000); + ok(hr == E_INVALIDARG, "got 0x%08lx.\n", hr); + + hr = IFileDialogCustomize_RemoveControlItem(pfdc, i, 0); + ok(hr == E_INVALIDARG, "got 0x%08lx.\n", hr); + + IFileDialogCustomize_Release(pfdc); + IFileDialog_Release(pfod); +} + START_TEST(itemdlg) { OleInitialize(NULL); @@ -2484,6 +2520,7 @@ START_TEST(itemdlg) test_customize(); test_persistent_state(); test_overwrite(); + test_customize_remove_from_empty_combobox(); } else skip("Skipping all Item Dialog tests.\n");

1 0

Alex Henrie : jscript: Remove unnecessary call to malloc in strbuf_ensure_size.
by Alexandre Julliard 05 Jun '23

05 Jun '23

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

Alex Henrie : conhost: Fix memory leak on error path in edit_line_move_to_history (scan-build).
by Alexandre Julliard 05 Jun '23

05 Jun '23

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

05 Jun '23

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

Ziqing Hui : mf/tests: Test output type for WMA decoder DMO.
by Alexandre Julliard 05 Jun '23

05 Jun '23

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

05 Jun '23

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

Nikolay Sivov : vkd3d-shader/hlsl: Fix sampler type used for samplerCUBE.
by Alexandre Julliard 05 Jun '23

05 Jun '23

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

05 Jun '23

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 : msi: Fix memory leak in ready_media (scan-build).
by Alexandre Julliard 05 Jun '23

05 Jun '23

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