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

Zhiyi Zhang : win32u: Fix a memory leak.
by Alexandre Julliard March 27, 2023

March 27, 2023

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

Torge Matthies : msvcp90: Fix segfault in bad_alloc exception default constructor.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 84692f4c9164b7653f6ac6a3a48a9735ddc9a587 URL: https://gitlab.winehq.org/wine/wine/-/commit/84692f4c9164b7653f6ac6a3a48a97… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Tue Jun 7 10:30:07 2022 +0200 msvcp90: Fix segfault in bad_alloc exception default constructor. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 00012d3381c4fdd81d2e9c5fc7de5c74e7740cf9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp90/exception.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index e5b6018fe31..eaf8121c56a 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -36,7 +36,7 @@ int* __cdecl __processing_throw(void); #if _MSVCP_VER >= 70 || defined(_MSVCIRT) typedef const char **exception_name; #define EXCEPTION_STR(name) (*name) -#define EXCEPTION_NAME(str) ((exception_name)&str) +#define EXCEPTION_NAME(str) (&str) #else typedef const char *exception_name; #define EXCEPTION_STR(name) (name) @@ -96,7 +96,7 @@ exception* __thiscall exception_copy_ctor(exception *this, const exception *rhs) this->name = rhs->name; this->do_free = FALSE; } else - MSVCP_exception_ctor(this, EXCEPTION_NAME(rhs->name)); + MSVCP_exception_ctor(this, (exception_name)EXCEPTION_NAME(rhs->name)); TRACE("name = %s\n", this->name); return this; } @@ -214,7 +214,7 @@ bad_alloc* __thiscall MSVCP_bad_alloc_ctor(bad_alloc *this, exception_name name) DEFINE_THISCALL_WRAPPER(MSVCP_bad_alloc_default_ctor, 4) bad_alloc* __thiscall MSVCP_bad_alloc_default_ctor(bad_alloc *this) { - static const char name[] = "bad allocation"; + static const char *name = "bad allocation"; return MSVCP_bad_alloc_ctor(this, EXCEPTION_NAME(name)); }

1 0

Zhiyi Zhang : win32u: Choose a smaller ppem to avoid exceeding the requested font height.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 047d3f054495e644fdfa28ea91668469918f7a11 URL: https://gitlab.winehq.org/wine/wine/-/commit/047d3f054495e644fdfa28ea916684… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 12 11:32:54 2022 +0800 win32u: Choose a smaller ppem to avoid exceeding the requested font height. When height > 0, CreateFontA/W() should not return a font face exceeding the requested height. For instance, Tahoma has 2049 units of ascent, 423 units of descent and its units per EM square is 2048. When requesting a font 20 pixels in height, ppem = units_per_EM * requested_height / (ascent + descent) = 2048 * 20 / (2049 + 423) = 16.57 ~= 17. When getting the resulting height back from the ppem, resulting_height = (ascent + descent) * ppem / units_per_EM = (2049.0 + 423) * 17 / 2048 = 20.52 ~=21. So it ends up getting a larger font than requested and violates the spec. Fix Nancy Drew: Legend of the Crystal Skull crash at start. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> (cherry picked from commit 58b477d1581f715d75c2e117ffa9489c6e64a678) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/tests/font.c | 1 - dlls/win32u/freetype.c | 12 ++++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 18fbf0660d6..5a67cf4fcf0 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4032,7 +4032,6 @@ static void test_GetTextMetrics(void) old_hf = SelectObject(hdc, hf); ret = GetTextMetricsA(hdc, &tm); ok(ret, "GetTextMetricsA failed, error %u\n", GetLastError()); - todo_wine ok(tm.tmHeight <= 20, "Got unexpected tmHeight %d\n", tm.tmHeight); SelectObject(hdc, old_hf); DeleteObject(hf); diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index 77f4ef8eab3..0879c29b5f9 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -1975,10 +1975,18 @@ static LONG calc_ppem_for_height(FT_Face ft_face, LONG height) if(height > 0) { USHORT windescent = get_fixed_windescent(pOS2->usWinDescent); + LONG units; + if(pOS2->usWinAscent + windescent == 0) - ppem = pFT_MulDiv(ft_face->units_per_EM, height, pHori->Ascender - pHori->Descender); + units = pHori->Ascender - pHori->Descender; else - ppem = pFT_MulDiv(ft_face->units_per_EM, height, pOS2->usWinAscent + windescent); + units = pOS2->usWinAscent + windescent; + ppem = pFT_MulDiv(ft_face->units_per_EM, height, units); + + /* If rounding ends up getting a font exceeding height, choose a smaller ppem */ + if(ppem > 1 && pFT_MulDiv(units, ppem, ft_face->units_per_EM) > height) + --ppem; + if(ppem > MAX_PPEM) { WARN("Ignoring too large height %d, ppem %d\n", height, ppem); ppem = 1;

1 0

Alexandre Julliard : gdiplus: Get the compositing mode directly from the graphics object.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: b30b5520a765ba6fcfd094ae0f7be3e31c8526dd URL: https://gitlab.winehq.org/wine/wine/-/commit/b30b5520a765ba6fcfd094ae0f7be3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 28 14:44:35 2022 +0200 gdiplus: Get the compositing mode directly from the graphics object. GdipGetCompositingMode() fails when the object is busy, which happens when flushing changes in GdipReleaseDC(). Fixes a test crash on Gitlab CI. (cherry picked from commit fe7df461189e59e0e6d54a83ad3903f1fd93aa01) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/graphics.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 65cdf96510d..ff1e3cd1db9 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -418,9 +418,7 @@ static GpStatus alpha_blend_bmp_pixels(GpGraphics *graphics, INT dst_x, INT dst_ { GpBitmap *dst_bitmap = (GpBitmap*)graphics->image; INT x, y; - CompositingMode comp_mode; - - GdipGetCompositingMode(graphics, &comp_mode); + CompositingMode comp_mode = graphics->compmode; for (y=0; y<src_height; y++) {

1 0

Zhiyi Zhang : gdi32/tests: Add more tests for GetTextMetrics().
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: e743adebb14c988a0b995c00d6a8631aab0d7304 URL: https://gitlab.winehq.org/wine/wine/-/commit/e743adebb14c988a0b995c00d6a863… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 12 11:32:54 2022 +0800 gdi32/tests: Add more tests for GetTextMetrics(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> (cherry picked from commit 821b36e00bd99924a454bf2e982fe7d4924f08e7) Conflicts: dlls/gdi32/tests/font.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/tests/font.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 03ac72254cc..18fbf0660d6 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4010,7 +4010,10 @@ static INT CALLBACK enum_truetype_font_proc(const LOGFONTA *lf, const TEXTMETRIC static void test_GetTextMetrics(void) { + HFONT old_hf, hf; + TEXTMETRICA tm; LOGFONTA lf; + BOOL ret; HDC hdc; INT enumed; @@ -4021,6 +4024,19 @@ static void test_GetTextMetrics(void) enumed = 0; EnumFontFamiliesExA(hdc, &lf, enum_truetype_font_proc, (LPARAM)&enumed, 0); + /* Test a bug triggered by rounding up FreeType ppem */ + hf = CreateFontA(20, 0, 0, 0, FW_REGULAR, FALSE, FALSE, FALSE, DEFAULT_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, + "Tahoma"); + ok(hf != NULL, "CreateFontA failed, error %u\n", GetLastError()); + old_hf = SelectObject(hdc, hf); + ret = GetTextMetricsA(hdc, &tm); + ok(ret, "GetTextMetricsA failed, error %u\n", GetLastError()); + todo_wine + ok(tm.tmHeight <= 20, "Got unexpected tmHeight %d\n", tm.tmHeight); + SelectObject(hdc, old_hf); + DeleteObject(hf); + ReleaseDC(0, hdc); }

1 0

Alexandre Julliard : mountmgr: Don't crash if connecting to dbus fails.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 025172bdc9ca860afc5d5663c2e5c51da302241c URL: https://gitlab.winehq.org/wine/wine/-/commit/025172bdc9ca860afc5d5663c2e5c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 17 16:45:57 2022 +0200 mountmgr: Don't crash if connecting to dbus fails. (cherry picked from commit 3110b72e12a2dba79a3993fe6511351a97ce1917) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mountmgr.sys/dbus.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c index 581d45e7702..e5f4240d8e1 100644 --- a/dlls/mountmgr.sys/dbus.c +++ b/dlls/mountmgr.sys/dbus.c @@ -600,6 +600,9 @@ static DBusMessage *device_by_iface_request( const char *iface ) DBusMessage *request, *reply; DBusMessageIter iter; DBusError error; + DBusConnection *connection = get_dhcp_connection(); + + if (!connection) return NULL; request = p_dbus_message_new_method_call( "org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager", "org.freedesktop.NetworkManager", "GetDeviceByIpIface" ); @@ -609,7 +612,7 @@ static DBusMessage *device_by_iface_request( const char *iface ) p_dbus_message_iter_append_basic( &iter, DBUS_TYPE_STRING, &iface ); p_dbus_error_init( &error ); - reply = p_dbus_connection_send_with_reply_and_block( get_dhcp_connection(), request, -1, &error ); + reply = p_dbus_connection_send_with_reply_and_block( connection, request, -1, &error ); p_dbus_message_unref( request ); if (!reply) {

1 0

Zebediah Figura : msvcrt: Add SEH annotations for sse2_memcpy().
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: b17e54de418eac8a5e282102c5a1b2570faa6154 URL: https://gitlab.winehq.org/wine/wine/-/commit/b17e54de418eac8a5e282102c5a1b2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 1 17:02:24 2022 -0500 msvcrt: Add SEH annotations for sse2_memcpy(). This allows unwinding from a crash inside the function. (cherry picked from commit 57140421378ade6a5b5dea32bb94a1e8ab92906f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/string.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index d92b7a38d12..5071d2fa8b3 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2724,8 +2724,11 @@ int __cdecl memcmp(const void *ptr1, const void *ptr2, size_t n) #define MEMMOVE_INIT \ "pushq " SRC_REG "\n\t" \ + __ASM_SEH(".seh_pushreg " SRC_REG "\n\t") \ __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") \ "pushq " DEST_REG "\n\t" \ + __ASM_SEH(".seh_pushreg " DEST_REG "\n\t") \ + __ASM_SEH(".seh_endprologue\n\t") \ __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") \ "movq %rcx, " DEST_REG "\n\t" \ "movq %rdx, " SRC_REG "\n\t"

1 0

Santino Mazza : jscript: Return ParseProcedureText when compile fails.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: e854d91eed61450b7a488c056e7668de0a8b6487 URL: https://gitlab.winehq.org/wine/wine/-/commit/e854d91eed61450b7a488c056e7668… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Tue Jul 19 20:49:00 2022 -0300 jscript: Return ParseProcedureText when compile fails. This prevents crashes when there is an invalid script inside a tag property. Because ParseProcedureText calls release_bytecode without checking if compile_script failed, "code" is not set, and this leads to a crash when release_bytecode tries to access it. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> (cherry picked from commit d93712feee25bfe989b5dabcd25759e713a8580a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/jscript/jscript.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 160269cc3c9..4e59d4f2e01 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -1204,9 +1204,12 @@ static HRESULT WINAPI JScriptParseProcedure_ParseProcedureText(IActiveScriptPars enter_script(This->ctx, &ei); hres = compile_script(This->ctx, pstrCode, dwSourceContextCookie, ulStartingLineNumber, pstrFormalParams, pstrDelimiter, FALSE, This->is_encode, item, &code); - if(SUCCEEDED(hres)) - hres = create_source_function(This->ctx, code, &code->global_code, NULL, &dispex); + if(FAILED(hres)) + return leave_script(This->ctx, hres); + + hres = create_source_function(This->ctx, code, &code->global_code, NULL, &dispex); release_bytecode(code); + hres = leave_script(This->ctx, hres); if(FAILED(hres)) return hres;

1 0

Tim Clem : kernelbase: Don't assume the length of the process image name.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 67c81ef39e5a22c89da7bc56cb3872ac6a1dc6a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/67c81ef39e5a22c89da7bc56cb3872… Author: Tim Clem <tclem(a)codeweavers.com> Date: Tue Aug 9 13:10:15 2022 -0700 kernelbase: Don't assume the length of the process image name. NtQueryInformationProcess(ProcessImageFileNameWin32) may return an empty string in some circumstances, which leads QueryFullProcessImageNameW to crash if called with flags including PROCESS_NAME_NATIVE, as that path assumed the image name had a length of at least 2. (cherry picked from commit a7937e83b2f8606aa777098eb5e738241a5458e1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernelbase/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 45bb6c019e9..450cb33ce8e 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -1567,7 +1567,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH QueryFullProcessImageNameW( HANDLE process, DWORD if (status) goto cleanup; - if (flags & PROCESS_NAME_NATIVE) + if (flags & PROCESS_NAME_NATIVE && result->Length > 2 * sizeof(WCHAR)) { WCHAR drive[3]; WCHAR device[1024];

1 0

Zhiyi Zhang : winegstreamer: Always check the return value from mf_media_type_from_wg_format().
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: b2c3fce40b222d1fd97823ad3ae301a0dee93e89 URL: https://gitlab.winehq.org/wine/wine/-/commit/b2c3fce40b222d1fd97823ad3ae301… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Aug 1 17:19:48 2022 +0800 winegstreamer: Always check the return value from mf_media_type_from_wg_format(). mf_media_type_from_wg_format() may return NULL. Fix Airborne Kingdom crash at start because WG_AUDIO_FORMAT_UNKNOWN is passed to mf_media_type_from_wg_format(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> (cherry picked from commit 6f8990b4318b25709cd90f6e10e8f3fdaa89c4c4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winegstreamer/media_source.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 5e36ef391da..5f7c6a35f5d 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -902,6 +902,12 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) IMFMediaType *base_type = mf_media_type_from_wg_format(&format); GUID base_subtype; + if (!base_type) + { + hr = MF_E_INVALIDMEDIATYPE; + goto done; + } + IMFMediaType_GetGUID(base_type, &MF_MT_SUBTYPE, &base_subtype); stream_types[0] = base_type; @@ -934,8 +940,8 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) WG_AUDIO_FORMAT_F32LE, }; - stream_types[0] = mf_media_type_from_wg_format(&format); - type_count = 1; + if ((stream_types[0] = mf_media_type_from_wg_format(&format))) + type_count = 1; for (i = 0; i < ARRAY_SIZE(audio_types); i++) { @@ -944,7 +950,8 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) continue; new_format = format; new_format.u.audio.format = audio_types[i]; - stream_types[type_count++] = mf_media_type_from_wg_format(&new_format); + if ((stream_types[type_count] = mf_media_type_from_wg_format(&new_format))) + type_count++; } } else

1 0