August 2022 - Wine-Commits - list.winehq.org

Zhiyi Zhang : win32u: Choose a smaller ppem to avoid exceeding the requested font height.
by Alexandre Julliard Aug. 19, 2022

Aug. 19, 2022

Module: wine Branch: master Commit: 58b477d1581f715d75c2e117ffa9489c6e64a678 URL: https://gitlab.winehq.org/wine/wine/-/commit/58b477d1581f715d75c2e117ffa948… 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> --- 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 b7624942ead..12a5bff5969 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4124,7 +4124,6 @@ static void test_GetTextMetrics(void) old_hf = SelectObject(hdc, hf); ret = GetTextMetricsA(hdc, &tm); ok(ret, "GetTextMetricsA failed, error %lu\n", GetLastError()); - todo_wine ok(tm.tmHeight <= 20, "Got unexpected tmHeight %ld\n", tm.tmHeight); SelectObject(hdc, old_hf); DeleteObject(hf); diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index f6cdddd7819..d911039647b 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -1927,10 +1927,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

Jiajin Cui : win32u: Don't allow a replaced font to be a replacement.
by Alexandre Julliard Aug. 19, 2022

Aug. 19, 2022

Module: wine Branch: master Commit: 53f6d82e69377a3f4f112275bbc61978946ad2a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/53f6d82e69377a3f4f112275bbc619… Author: Jiajin Cui <cuijiajin(a)uniontech.com> Date: Fri Aug 19 08:49:52 2022 +0800 win32u: Don't allow a replaced font to be a replacement. This is to prevent replacement loops. --- dlls/win32u/font.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index e26c7bfa316..e281db9b0c8 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -903,6 +903,12 @@ static BOOL add_family_replacement( const WCHAR *new_name, const WCHAR *replace return FALSE; } + if (family->replacement) + { + TRACE( "%s is replaced by another font, skipping.\n", debugstr_w(replace) ); + return FALSE; + } + if (!(new_family = create_family( new_name, NULL ))) return FALSE; new_family->replacement = family; family->refcount++;

1 0

Jiajin Cui : win32u: Ensure that either the primary or secondary name is in English.
by Alexandre Julliard Aug. 19, 2022

Aug. 19, 2022

Module: wine Branch: master Commit: 88ead398ebcdebef8ce9f9f5a420d62be4477869 URL: https://gitlab.winehq.org/wine/wine/-/commit/88ead398ebcdebef8ce9f9f5a420d6… Author: Jiajin Cui <cuijiajin(a)uniontech.com> Date: Thu Aug 11 11:01:29 2022 +0800 win32u: Ensure that either the primary or secondary name is in English. --- dlls/win32u/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index f00df7ed86d..f6cdddd7819 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -1100,7 +1100,7 @@ static BOOL search_family_names_callback( LANGID langid, struct opentype_name *n else if (data->primary_langid == langid) { data->primary_seen = TRUE; - if (!data->second_name.bytes) data->second_name = data->family_name; + if (data->family_name.bytes) data->second_name = data->family_name; data->family_name = *name; } else if (!data->second_name.bytes) data->second_name = *name;

1 0

Alexandre Julliard : comctl32/tests: Use client coordinates for right click test.
by Alexandre Julliard Aug. 19, 2022

Aug. 19, 2022

Module: wine Branch: master Commit: e28c2caac0f1f039dcddd8713b1abcbbaf31a4a6 URL: https://gitlab.winehq.org/wine/wine/-/commit/e28c2caac0f1f039dcddd8713b1abc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 19 21:21:42 2022 +0200 comctl32/tests: Use client coordinates for right click test. Fix the corresponding message sequences. --- dlls/comctl32/tests/treeview.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 41a61f1465b..eda57ed2c81 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -232,9 +232,13 @@ static const struct message test_right_click_seq[] = { { WM_RBUTTONDOWN, sent|wparam, MK_RBUTTON }, { WM_CAPTURECHANGED, sent|defwinproc }, { TVM_GETNEXTITEM, sent|wparam|lparam|defwinproc, TVGN_CARET, 0 }, + { WM_PAINT, sent|optional }, + { WM_ERASEBKGND, sent|defwinproc|optional }, { WM_NCHITTEST, sent|optional }, { WM_SETCURSOR, sent|optional }, { WM_MOUSEMOVE, sent|optional }, + { WM_PAINT, sent|optional }, + { WM_ERASEBKGND, sent|defwinproc|optional }, { 0 } }; @@ -384,6 +388,16 @@ static const struct message parent_right_click_seq[] = { { WM_CONTEXTMENU, sent }, { WM_NOTIFY, sent|optional }, { WM_SETCURSOR, sent|optional }, + { WM_CTLCOLOREDIT, sent|optional }, + { WM_NOTIFY, sent|optional }, + { WM_NOTIFY, sent|optional }, + { WM_NOTIFY, sent|optional }, + { WM_NOTIFY, sent|optional }, + { WM_NOTIFY, sent|optional }, + { WM_NOTIFY, sent|optional }, + { WM_NOTIFY, sent|optional }, + { WM_NOTIFY, sent|optional }, + { WM_SETCURSOR, sent|optional }, { 0 } }; @@ -2942,6 +2956,7 @@ static void test_right_click(void) flush_events(); flush_sequences(sequences, NUM_MSG_SEQUENCES); + ScreenToClient(hTree, &pt); PostMessageA(hTree, WM_RBUTTONDOWN, MK_RBUTTON, MAKELPARAM(pt.x, pt.y)); PostMessageA(hTree, WM_RBUTTONUP, 0, MAKELPARAM(pt.x, pt.y));

1 0

Zhiyi Zhang : gdi32/tests: Add more tests for GetTextMetrics().
by Alexandre Julliard Aug. 19, 2022

Aug. 19, 2022

Module: wine Branch: master Commit: 821b36e00bd99924a454bf2e982fe7d4924f08e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/821b36e00bd99924a454bf2e982fe7… 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> --- 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 76d787c1440..b7624942ead 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4102,7 +4102,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; @@ -4113,6 +4116,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 %lu\n", GetLastError()); + old_hf = SelectObject(hdc, hf); + ret = GetTextMetricsA(hdc, &tm); + ok(ret, "GetTextMetricsA failed, error %lu\n", GetLastError()); + todo_wine + ok(tm.tmHeight <= 20, "Got unexpected tmHeight %ld\n", tm.tmHeight); + SelectObject(hdc, old_hf); + DeleteObject(hf); + ReleaseDC(0, hdc); }

1 0

Konstantin Romanov : kerberos: Fix condition for create_context_handle in kerberos_SpInitLsaModeContext and kerberos_SpAcceptLsaModeContext.
by Alexandre Julliard Aug. 19, 2022

Aug. 19, 2022

Module: wine Branch: master Commit: 0b18d0c825848abeec62b650d3b95056297c5d87 URL: https://gitlab.winehq.org/wine/wine/-/commit/0b18d0c825848abeec62b650d3b950… Author: Konstantin Romanov <incubusrk(a)gmail.com> Date: Thu Aug 18 17:01:13 2022 +0300 kerberos: Fix condition for create_context_handle in kerberos_SpInitLsaModeContext and kerberos_SpAcceptLsaModeContext. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53472 --- dlls/kerberos/krb5_ap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index b600ff06052..84d742079e6 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -424,9 +424,10 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, params.output_token_length = &output->pBuffers[idx].cbBuffer; status = KRB5_CALL( initialize_context, &params ); + if (status == SEC_E_OK || status == SEC_I_CONTINUE_NEEDED) + *new_context = create_context_handle( context_handle, new_context_handle ); if (!status) { - *new_context = create_context_handle( context_handle, new_context_handle ); *mapped_context = TRUE; expiry_to_timestamp( exptime, expiry ); } @@ -473,9 +474,10 @@ static NTSTATUS NTAPI kerberos_SpAcceptLsaModeContext( LSA_SEC_HANDLE credential /* FIXME: check if larger output buffer exists */ status = KRB5_CALL( accept_context, &params ); + if (status == SEC_E_OK || status == SEC_I_CONTINUE_NEEDED) + *new_context = create_context_handle( context_handle, new_context_handle ); if (!status) { - *new_context = create_context_handle( context_handle, new_context_handle ); *mapped_context = TRUE; expiry_to_timestamp( exptime, expiry ); }

1 0

Robert Wilhelm : scrrun: Correct string length returned from GetTempName.
by Alexandre Julliard Aug. 19, 2022

Aug. 19, 2022

Module: wine Branch: master Commit: 1f4c48a0007341589bb7c17b95268669c988bfbc URL: https://gitlab.winehq.org/wine/wine/-/commit/1f4c48a0007341589bb7c17b952686… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Fri Aug 19 10:54:25 2022 +0200 scrrun: Correct string length returned from GetTempName. You have to pass string length without terminal null to SysAllocStringLen. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53569 --- dlls/scrrun/filesystem.c | 2 +- dlls/scrrun/tests/filesystem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 35b43e2f124..458c550a004 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -3449,7 +3449,7 @@ static HRESULT WINAPI filesys_GetTempName(IFileSystem3 *iface, BSTR *result) if (!result) return E_POINTER; - if (!(*result = SysAllocStringLen(NULL, 13))) + if (!(*result = SysAllocStringLen(NULL, 12))) return E_OUTOFMEMORY; if(!RtlGenRandom(&random, sizeof(random))) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 5ec2d3edea5..5e88eaec46b 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -485,7 +485,7 @@ static void test_GetTempName(void) hr = IFileSystem3_GetTempName(fs3, &result); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!!wcsstr( result,L".tmp"), "GetTempName returned %s, expected .tmp suffix\n", debugstr_w(result)); - todo_wine ok(SysStringLen(result) == lstrlenW(result),"GetTempName returned %s, has incorrect string len.\n", debugstr_w(result)); + ok(SysStringLen(result) == lstrlenW(result),"GetTempName returned %s, has incorrect string len.\n", debugstr_w(result)); SysFreeString(result); }

1 0

Robert Wilhelm : scrrun: Avoid memory leak in error case.
by Alexandre Julliard Aug. 19, 2022

Aug. 19, 2022

Module: wine Branch: master Commit: ccc001ee4379d74d6dd04269532e1d824cc85763 URL: https://gitlab.winehq.org/wine/wine/-/commit/ccc001ee4379d74d6dd04269532e1d… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Fri Aug 19 11:02:01 2022 +0200 scrrun: Avoid memory leak in error case. --- dlls/scrrun/filesystem.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 458c550a004..37753a84b5e 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -3453,7 +3453,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

Robert Wilhelm : scrrun: Add test for correct string length returned from GetTempName.
by Alexandre Julliard Aug. 19, 2022

Aug. 19, 2022

Module: wine Branch: master Commit: 412e1de2b4ec79a20ee8d5800f5995e03f12efd3 URL: https://gitlab.winehq.org/wine/wine/-/commit/412e1de2b4ec79a20ee8d5800f5995… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Fri Aug 19 10:50:57 2022 +0200 scrrun: Add test for correct string length returned from GetTempName. --- dlls/scrrun/tests/filesystem.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 1ba0e81a2d1..5ec2d3edea5 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -485,6 +485,7 @@ static void test_GetTempName(void) hr = IFileSystem3_GetTempName(fs3, &result); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!!wcsstr( result,L".tmp"), "GetTempName returned %s, expected .tmp suffix\n", debugstr_w(result)); + todo_wine ok(SysStringLen(result) == lstrlenW(result),"GetTempName returned %s, has incorrect string len.\n", debugstr_w(result)); SysFreeString(result); }

1 0

Jacek Caban : win32u: Fix handling uninitialized process_layout.
by Alexandre Julliard Aug. 18, 2022

Aug. 18, 2022

Module: wine Branch: master Commit: 50bbaf9d5e40cfd0c36d7e8e82e33822b3df23bb URL: https://gitlab.winehq.org/wine/wine/-/commit/50bbaf9d5e40cfd0c36d7e8e82e338… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 5 12:34:19 2022 +0200 win32u: Fix handling uninitialized process_layout. --- dlls/win32u/sysparams.c | 7 ++++++- dlls/win32u/win32u_private.h | 2 +- dlls/win32u/window.c | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 201004e1447..454c4702612 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -375,7 +375,7 @@ union sysparam_all_entry static UINT system_dpi; static RECT work_area; -DWORD process_layout = ~0u; +static DWORD process_layout = ~0u; static HDC display_dc; static pthread_mutex_t display_dc_lock = PTHREAD_MUTEX_INITIALIZER; @@ -1631,6 +1631,11 @@ DPI_AWARENESS get_thread_dpi_awareness(void) } } +DWORD get_process_layout(void) +{ + return process_layout == ~0u ? 0 : process_layout; +} + /********************************************************************** * get_thread_dpi */ diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index a0bc1d62882..e1d163ea8eb 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -326,7 +326,6 @@ extern void track_scroll_bar( HWND hwnd, int scrollbar, POINT pt ) DECLSPEC_HIDD /* sysparams.c */ extern BOOL enable_thunk_lock DECLSPEC_HIDDEN; -extern DWORD process_layout DECLSPEC_HIDDEN; extern HBRUSH get_55aa_brush(void) DECLSPEC_HIDDEN; extern DWORD get_dialog_base_units(void) DECLSPEC_HIDDEN; extern LONG get_char_dimensions( HDC hdc, TEXTMETRICW *metric, LONG *height ) DECLSPEC_HIDDEN; @@ -335,6 +334,7 @@ extern UINT get_monitor_dpi( HMONITOR monitor ) DECLSPEC_HIDDEN; extern BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info ) DECLSPEC_HIDDEN; extern UINT get_win_monitor_dpi( HWND hwnd ) DECLSPEC_HIDDEN; extern RECT get_primary_monitor_rect( UINT dpi ) DECLSPEC_HIDDEN; +extern DWORD get_process_layout(void) DECLSPEC_HIDDEN; extern COLORREF get_sys_color( int index ) DECLSPEC_HIDDEN; extern HBRUSH get_sys_color_brush( unsigned int index ) DECLSPEC_HIDDEN; extern HPEN get_sys_color_pen( unsigned int index ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index b4a65b883f3..d9c771e5d3d 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -5094,7 +5094,7 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, (class_name->Length != sizeof(messageW) || wcsnicmp( class_name->Buffer, messageW, ARRAYSIZE(messageW) ))) { - if (process_layout & LAYOUT_RTL) cs.dwExStyle |= WS_EX_LAYOUTRTL; + if (get_process_layout() & LAYOUT_RTL) cs.dwExStyle |= WS_EX_LAYOUTRTL; parent = get_desktop_window(); } }

1 0