- Wine-Commits - list.winehq.org

Alex Henrie : localspl: Fix memory leak in lpr_start_doc (scan-build).
by Alexandre Julliard June 6, 2023

June 6, 2023

Module: wine Branch: master Commit: 78ef7c3461f9930a7fe0c3c7aebc956f20ce942e URL: https://gitlab.winehq.org/wine/wine/-/commit/78ef7c3461f9930a7fe0c3c7aebc95… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 6 00:06:07 2023 -0600 localspl: Fix memory leak in lpr_start_doc (scan-build). --- dlls/localspl/cups.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/localspl/cups.c b/dlls/localspl/cups.c index 8ef25c71157..a7f2273aba1 100644 --- a/dlls/localspl/cups.c +++ b/dlls/localspl/cups.c @@ -219,12 +219,15 @@ static BOOL lpr_start_doc(doc_t *doc, const WCHAR *printer_name) static const WCHAR quote[] = { '\'',0 }; int printer_len = wcslen(printer_name); WCHAR *cmd; + BOOL ret; cmd = malloc(printer_len * sizeof(WCHAR) + sizeof(lpr) + sizeof(quote)); memcpy(cmd, lpr, sizeof(lpr)); memcpy(cmd + ARRAY_SIZE(lpr), printer_name, printer_len * sizeof(WCHAR)); memcpy(cmd + ARRAY_SIZE(lpr) + printer_len, quote, sizeof(quote)); - return pipe_start_doc(doc, cmd); + ret = pipe_start_doc(doc, cmd); + free(cmd); + return ret; } #ifdef SONAME_LIBCUPS

1 0

Alex Henrie : msvcrt: Use 'else if' in _wgetcwd.
by Alexandre Julliard June 6, 2023

June 6, 2023

Module: wine Branch: master Commit: 76acd5916fd026a92f6647757ade7aeae44340a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/76acd5916fd026a92f6647757ade7a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jun 5 23:16:20 2023 -0600 msvcrt: Use 'else if' in _wgetcwd. Fixes a scan-build warning. --- dlls/msvcrt/dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 72c8018a74b..546e8d49a7b 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -824,7 +824,7 @@ wchar_t* CDECL _wgetcwd(wchar_t * buf, int size) if (size <= dir_len) size = dir_len + 1; if (!(buf = malloc( size * sizeof(WCHAR) ))) return NULL; } - if (dir_len >= size) + else if (dir_len >= size) { *_errno() = ERANGE; return NULL; /* buf too small */

1 0

Rémi Bernon : evr/tests: Test IMFVideoDisplayControl_GetCurrentImage orientation.
by Alexandre Julliard June 6, 2023

June 6, 2023

Module: wine Branch: master Commit: df91b31428ab22fe26c82729d80ef064b5bc8dfc URL: https://gitlab.winehq.org/wine/wine/-/commit/df91b31428ab22fe26c82729d80ef0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 25 23:49:31 2023 +0200 evr/tests: Test IMFVideoDisplayControl_GetCurrentImage orientation. --- dlls/evr/tests/Makefile.in | 2 + dlls/evr/tests/evr.c | 269 ++++++++++++++++++++++++++++++++++++- dlls/evr/tests/nv12frame.bmp | Bin 0 -> 50742 bytes dlls/evr/tests/resource.rc | 33 +++++ dlls/evr/tests/rgb32frame-flip.bmp | Bin 0 -> 36918 bytes dlls/evr/tests/rgb32frame.bmp | Bin 0 -> 36918 bytes 6 files changed, 299 insertions(+), 5 deletions(-)

1 0

Rémi Bernon : evr: Respect RGB format stride in GetCurrentImage.
by Alexandre Julliard June 6, 2023

June 6, 2023

Module: wine Branch: master Commit: 486531ca8a8d0dc3aff2804c574928a37c96664c URL: https://gitlab.winehq.org/wine/wine/-/commit/486531ca8a8d0dc3aff2804c574928… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 26 11:13:49 2023 +0200 evr: Respect RGB format stride in GetCurrentImage. --- dlls/evr/presenter.c | 3 ++- dlls/evr/tests/evr.c | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index d8bdbee3915..06592f8766e 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -1531,7 +1531,8 @@ static HRESULT WINAPI video_presenter_control_GetCurrentImage(IMFVideoDisplayCon { if (SUCCEEDED(hr = IDirect3DSurface9_LockRect(readback, &mapped_rect, NULL, D3DLOCK_READONLY))) { - memcpy(*dib, mapped_rect.pBits, *dib_size); + hr = MFCopyImage(stride < 0 ? *dib + *dib_size + stride : *dib, stride, + mapped_rect.pBits, mapped_rect.Pitch, abs(stride), surface_desc.Height); IDirect3DSurface9_UnlockRect(readback); } } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 161d910971f..8842a858b83 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -3466,8 +3466,7 @@ static void test_presenter_orientation(const GUID *subtype) SetRect(&rect, 0, 0, header.biWidth, header.biHeight); diff = check_rgb32_data(L"rgb32frame-flip.bmp", data, header.biSizeImage, &rect); - todo_wine - ok(diff <= 3, "Unexpected %lu%% diff\n", diff); + ok(diff <= 5, "Unexpected %lu%% diff\n", diff); CoTaskMemFree(data); hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_ENDSTREAMING, 0);

1 0

Bernhard Übelacker : comdlg32: Avoid crash in RemoveControlItem.
by Alexandre Julliard June 5, 2023

June 5, 2023

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

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