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

Zhiyi Zhang : win32u: Fix a memory leak.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: d75cfe9749008622ea98e54d2292e16820b35e78 URL: https://gitlab.winehq.org/wine/wine/-/commit/d75cfe9749008622ea98e54d2292e1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 17 14:19:01 2022 +0800 win32u: Fix a memory leak. The subkey handle is leaked when deleting a GPU entry succeeded. Also, there is no need to restart the enumeration for the grandparent key hkey. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e55515bf5b21580499ee05bee964444be8dc3c3a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/win32u/sysparams.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 4c65bd9d7f1..76dd2e77d49 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -673,7 +673,6 @@ static void cleanup_devices(void) hkey = reg_open_key( enum_key, pciW, sizeof(pciW) ); -restart: while (!NtEnumerateKey( hkey, i++, KeyNodeInformation, key, sizeof(buffer), &size )) { unsigned int j = 0; @@ -706,7 +705,7 @@ restart: NtClose( device_key ); if (!present && reg_delete_tree( subkey, bufferW, lstrlenW( bufferW ) * sizeof(WCHAR) )) - goto restart; + j = 0; } NtClose( subkey );

1 0

Alex Henrie : user32: Plug icon handle leak in MDI_AugmentFrameMenu (Coverity).
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: f87e48d6df2817a225b4115df592ab4b10a65ba0 URL: https://gitlab.winehq.org/wine/wine/-/commit/f87e48d6df2817a225b4115df592ab… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun May 29 16:37:19 2022 -0600 user32: Plug icon handle leak in MDI_AugmentFrameMenu (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> (cherry picked from commit 001d78a58257b67871924774485ce226f4b87a9c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/mdi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 1047b969c17..e8558fe07f5 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -859,7 +859,7 @@ static BOOL MDI_AugmentFrameMenu( HWND frame, HWND hChild ) hIcon = (HICON)GetClassLongPtrW(hChild, GCLP_HICON); if (!hIcon) hIcon = LoadImageW(0, (LPWSTR)IDI_WINLOGO, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), - GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); + GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR | LR_SHARED); if (hIcon) { HDC hMemDC;

1 0

Claire Girka : winepulse: Fix memory leak in pulse_create_stream in some error cases.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 4ba4c3b0587bab99b71798abd28866ddc2128551 URL: https://gitlab.winehq.org/wine/wine/-/commit/4ba4c3b0587bab99b71798abd28866… Author: Claire Girka <claire(a)sitedethib.com> Date: Tue Jul 5 17:13:08 2022 +0200 winepulse: Fix memory leak in pulse_create_stream in some error cases. (cherry picked from commit 32a6380825cc05972a95a8f3138088da3a846203) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winepulse.drv/pulse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 356f68e0db2..9362e2af6b0 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -916,8 +916,8 @@ exit: if (stream->stream) { pa_stream_disconnect(stream->stream); pa_stream_unref(stream->stream); - free(stream); } + free(stream); } pulse_unlock();

1 0

Akihiro Sagawa : mciqtz32: Fix thread handle leak if a second play.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 43688617bb97320e987afa3542780b717c425b91 URL: https://gitlab.winehq.org/wine/wine/-/commit/43688617bb97320e987afa3542780b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jul 5 21:02:49 2022 +0900 mciqtz32: Fix thread handle leak if a second play. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> (cherry picked from commit de0794a1ddbfaa5bab9728e5d8f956541079c341) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mciqtz32/mciqtz.c | 11 +++++++---- dlls/winmm/tests/mci.c | 13 +++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 487a0d820cd..551bf54a25a 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -449,10 +449,13 @@ static DWORD MCIQTZ_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms IVideoWindow_put_Visible(wma->vidwin, OATRUE); - wma->thread = CreateThread(NULL, 0, MCIQTZ_notifyThread, wma, 0, NULL); - if (!wma->thread) { - TRACE("Can't create thread\n"); - return MCIERR_INTERNAL; + if (!wma->thread) + { + wma->thread = CreateThread(NULL, 0, MCIQTZ_notifyThread, wma, 0, NULL); + if (!wma->thread) { + TRACE("Can't create thread\n"); + return MCIERR_INTERNAL; + } } return 0; } diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index f8bb4c56ac0..69f63279b2f 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1336,6 +1336,19 @@ static void test_playWaveTypeMpegvideo(void) err = mciSendStringA("close mysound", NULL, 0, NULL); ok(!err,"mci close returned %s\n", dbg_mcierr(err)); + + /* test a second play */ + err = mciSendStringA("open tempfile.wav type MPEGVideo alias mysound", NULL, 0, NULL); + ok(err==ok_saved,"mci open tempfile.wav type MPEGVideo returned %s\n", dbg_mcierr(err)); + + err = mciSendStringA("play mysound", NULL, 0, NULL); + ok(!err,"mci play retuend %s\n", dbg_mcierr(err)); + + err = mciSendStringA("play mysound", NULL, 0, NULL); + ok(!err,"mci play retuend %s\n", dbg_mcierr(err)); + + err = mciSendStringA("close mysound", NULL, 0, NULL); + ok(!err,"mci close returned %s\n", dbg_mcierr(err)); } static void test_asyncWaveTypeMpegvideo(HWND hwnd)

1 0

David Kahurani : ieframe: Fix memory leak in open_dde_url.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: f0d48a022b30272b70aa769c032a1496835be185 URL: https://gitlab.winehq.org/wine/wine/-/commit/f0d48a022b30272b70aa769c032a14… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Mon Jul 11 19:15:43 2022 +0300 ieframe: Fix memory leak in open_dde_url. Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> (cherry picked from commit 6e32c011a2b977246f9ab2282d30b69cff90142b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ieframe/iexplore.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 00883c80e77..9dafafa0c3e 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -1027,10 +1027,12 @@ static HDDEDATA open_dde_url(WCHAR *dde_url) } hres = IWebBrowser2_Navigate2(&ie->IWebBrowser2_iface, &urlv, NULL, NULL, NULL, NULL); - if(FAILED(hres)) - return 0; + SysFreeString(V_BSTR(&urlv)); IWebBrowser2_Release(&ie->IWebBrowser2_iface); + + if(FAILED(hres)) + return 0; return ULongToHandle(DDE_FACK); }

1 0

Robert Wilhelm : scrrun: Avoid memory leak in error case.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 7398ee371ab1dd9465fcb12eb12dd1963cc0eab7 URL: https://gitlab.winehq.org/wine/wine/-/commit/7398ee371ab1dd9465fcb12eb12dd1… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Fri Aug 19 11:02:01 2022 +0200 scrrun: Avoid memory leak in error case. (cherry picked from commit ccc001ee4379d74d6dd04269532e1d824cc85763) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/scrrun/filesystem.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 28636800131..38a21443ff2 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -3328,7 +3328,11 @@ static HRESULT WINAPI filesys_GetTempName(IFileSystem3 *iface, BSTR *result) return E_OUTOFMEMORY; if(!RtlGenRandom(&random, sizeof(random))) + { + SysFreeString(*result); return E_FAIL; + } + swprintf(*result, 13, L"rad%05X.tmp", random & 0xfffff); return S_OK; }

1 0

Hugh McMaster : conhost: Set correct face name when the specified font is not available.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: a40055a4612c86eaebcd3641bc9bedf46bd18e77 URL: https://gitlab.winehq.org/wine/wine/-/commit/a40055a4612c86eaebcd3641bc9bed… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue May 24 23:27:23 2022 +1000 conhost: Set correct face name when the specified font is not available. conhost.exe currently copies the user-specified face name from the LOGFONT structure. This results in an invalid face name when the specified font is not available. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 303f8042f9db508adaca02ef21f8de4992cb9c03) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/conhost/window.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 7ad0d48effd..3a21db3542b 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -675,6 +675,7 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) struct font_info *font_info = &console->active->font; HFONT font, old_font; TEXTMETRICW tm; + WCHAR face_name[LF_FACESIZE]; CPINFO cpinfo; HDC dc; @@ -700,6 +701,7 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) old_font = SelectObject( dc, font ); GetTextMetricsW( dc, &tm ); + font_info->face_len = GetTextFaceW( dc, ARRAY_SIZE(face_name), face_name ) - 1; SelectObject( dc, old_font ); ReleaseDC( console->win, dc ); @@ -708,9 +710,8 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) font_info->weight = tm.tmWeight; free( font_info->face_name ); - font_info->face_len = wcslen( logfont->lfFaceName ); font_info->face_name = malloc( font_info->face_len * sizeof(WCHAR) ); - memcpy( font_info->face_name, logfont->lfFaceName, font_info->face_len * sizeof(WCHAR) ); + memcpy( font_info->face_name, face_name, font_info->face_len * sizeof(WCHAR) ); /* FIXME: use maximum width for DBCS codepages since some chars take two cells */ if (GetCPInfo( console->output_cp, &cpinfo ) && cpinfo.MaxCharSize == 2)

1 0

Piotr Caban : msvcrt: Fix _wputenv_s return value on error.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: d4a998f795bd354284abc451f256facbdf192228 URL: https://gitlab.winehq.org/wine/wine/-/commit/d4a998f795bd354284abc451f256fa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 21 13:30:19 2022 +0200 msvcrt: Fix _wputenv_s return value on error. (cherry picked from commit f0e6447b7fc10c21bf6aa04f70a5094f16a294a5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/environ.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 698dc761381..5e07fe5e367 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -186,19 +186,24 @@ int CDECL _putenv_s(const char *name, const char *value) /********************************************************************* * _wputenv_s (MSVCRT.@) */ -int CDECL _wputenv_s(const wchar_t *name, const wchar_t *value) +errno_t CDECL _wputenv_s(const wchar_t *name, const wchar_t *value) { - int ret; + errno_t ret = 0; TRACE("%s %s\n", debugstr_w(name), debugstr_w(value)); if (!MSVCRT_CHECK_PMT(name != NULL)) return -1; if (!MSVCRT_CHECK_PMT(value != NULL)) return -1; - ret = SetEnvironmentVariableW(name, value[0] ? value : NULL) ? 0 : -1; - - /* _putenv returns success on deletion of nonexistent variable, unlike [Rtl]SetEnvironmentVariable */ - if ((ret == -1) && (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) ret = 0; + if (!SetEnvironmentVariableW(name, value[0] ? value : NULL)) + { + /* _putenv returns success on deletion of nonexistent variable */ + if (GetLastError() != ERROR_ENVVAR_NOT_FOUND) + { + msvcrt_set_errno(GetLastError()); + ret = *_errno(); + } + } MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(MSVCRT__environ); MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(MSVCRT__wenviron);

1 0

Piotr Caban : msvcrt: Fix _putenv_s return value on error.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: e5c7a6685d6293c5c69b84aea744e0b89697b80a URL: https://gitlab.winehq.org/wine/wine/-/commit/e5c7a6685d6293c5c69b84aea744e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 21 13:28:23 2022 +0200 msvcrt: Fix _putenv_s return value on error. (cherry picked from commit 53acb6e736d6feb10b19fd609771ecfa33f7d1e9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/environ.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 5e07fe5e367..5c4db668be3 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -165,17 +165,22 @@ finish: */ int CDECL _putenv_s(const char *name, const char *value) { - int ret; + errno_t ret = 0; TRACE("%s %s\n", debugstr_a(name), debugstr_a(value)); - if (!MSVCRT_CHECK_PMT(name != NULL)) return -1; - if (!MSVCRT_CHECK_PMT(value != NULL)) return -1; - - ret = SetEnvironmentVariableA(name, value[0] ? value : NULL) ? 0 : -1; + if (!MSVCRT_CHECK_PMT(name != NULL)) return EINVAL; + if (!MSVCRT_CHECK_PMT(value != NULL)) return EINVAL; - /* _putenv returns success on deletion of nonexistent variable, unlike [Rtl]SetEnvironmentVariable */ - if ((ret == -1) && (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) ret = 0; + if (!SetEnvironmentVariableA(name, value[0] ? value : NULL)) + { + /* _putenv returns success on deletion of nonexistent variable */ + if (GetLastError() != ERROR_ENVVAR_NOT_FOUND) + { + msvcrt_set_errno(GetLastError()); + ret = *_errno(); + } + } MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(MSVCRT__environ); MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(MSVCRT__wenviron);

1 0

Piotr Caban : msvcrt: Fix _wputenv_s invalid argument handling.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 43b190c7075ddaab7584a8668c194d7cd593a64d URL: https://gitlab.winehq.org/wine/wine/-/commit/43b190c7075ddaab7584a8668c194d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Oct 22 14:32:30 2022 +0200 msvcrt: Fix _wputenv_s invalid argument handling. (cherry picked from commit f943d4497226e69265a8a278f5795756ba1b2f47) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/environ.c | 4 ++-- dlls/msvcrt/tests/environ.c | 39 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 5c4db668be3..fbde7dbbed6 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -197,8 +197,8 @@ errno_t CDECL _wputenv_s(const wchar_t *name, const wchar_t *value) TRACE("%s %s\n", debugstr_w(name), debugstr_w(value)); - if (!MSVCRT_CHECK_PMT(name != NULL)) return -1; - if (!MSVCRT_CHECK_PMT(value != NULL)) return -1; + if (!MSVCRT_CHECK_PMT(name != NULL)) return EINVAL; + if (!MSVCRT_CHECK_PMT(value != NULL)) return EINVAL; if (!SetEnvironmentVariableW(name, value[0] ? value : NULL)) { diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index 62e4f3133cf..03129dcbf14 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -19,6 +19,7 @@ */ #include "wine/test.h" +#include <errno.h> #include <stdlib.h> #include <process.h> @@ -45,8 +46,10 @@ static const char *a_very_long_env_string = static char ***(__cdecl *p__p__environ)(void); static WCHAR ***(__cdecl *p__p__wenviron)(void); -static void (*p_get_environ)(char ***); -static void (*p_get_wenviron)(WCHAR ***); +static void (__cdecl *p_get_environ)(char ***); +static void (__cdecl *p_get_wenviron)(WCHAR ***); +static errno_t (__cdecl *p_putenv_s)(const char*, const char*); +static errno_t (__cdecl *p_wputenv_s)(const wchar_t*, const wchar_t*); static char ***p_environ; static WCHAR ***p_wenviron; @@ -61,6 +64,8 @@ static void init(void) p_wenviron = (void *)GetProcAddress(hmod, "_wenviron"); p_get_environ = (void *)GetProcAddress(hmod, "_get_environ"); p_get_wenviron = (void *)GetProcAddress(hmod, "_get_wenviron"); + p_putenv_s = (void *)GetProcAddress(hmod, "_putenv_s"); + p_wputenv_s = (void *)GetProcAddress(hmod, "_wputenv_s"); } static void test_system(void) @@ -237,6 +242,8 @@ static void test__wenviron(void) static void test_environment_manipulation(void) { + errno_t ret; + ok( _putenv("cat=") == 0, "_putenv failed on deletion of nonexistent environment variable\n" ); ok( _putenv("cat=dog") == 0, "failed setting cat=dog\n" ); ok( strcmp(getenv("cat"), "dog") == 0, "getenv did not return 'dog'\n" ); @@ -247,6 +254,34 @@ static void test_environment_manipulation(void) ok( _putenv(a_very_long_env_string) == 0, "_putenv failed for long environment string\n"); ok( getenv("nonexistent") == NULL, "getenv should fail with nonexistent var name\n" ); + + if (p_putenv_s) + { + ret = p_putenv_s(NULL, "dog"); + ok( ret == EINVAL, "_putenv_s returned %d\n", ret); + ret = p_putenv_s("cat", NULL); + ok( ret == EINVAL, "_putenv_s returned %d\n", ret); + ret = p_putenv_s("a=b", NULL); + ok( ret == EINVAL, "_putenv_s returned %d\n", ret); + ret = p_putenv_s("cat", "a=b"); + ok( !ret, "_putenv_s returned %d\n", ret); + ret = p_putenv_s("cat", ""); + ok( !ret, "_putenv_s returned %d\n", ret); + } + + if (p_wputenv_s) + { + ret = p_wputenv_s(NULL, L"dog"); + ok( ret == EINVAL, "_wputenv_s returned %d\n", ret); + ret = p_wputenv_s(L"cat", NULL); + ok( ret == EINVAL, "_wputenv_s returned %d\n", ret); + ret = p_wputenv_s(L"a=b", NULL); + ok( ret == EINVAL, "_wputenv_s returned %d\n", ret); + ret = p_wputenv_s(L"cat", L"a=b"); + ok( !ret, "_wputenv_s returned %d\n", ret); + ret = p_wputenv_s(L"cat", L""); + ok( !ret, "_wputenv_s returned %d\n", ret); + } } START_TEST(environ)

1 0