From: Bernhard Kölbl <bkoelbl@codeweavers.com> --- dlls/gdi32/tests/font.c | 14 +++++++------- dlls/win32u/font.c | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index c641316a609..a5d8d6d3d82 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -8033,13 +8033,13 @@ static void test_font_family(void) { 96, DEFAULT_CHARSET, FF_ROMAN, L"Times New Roman" }, /* Test font family with invalid bit */ - { 6, DEFAULT_CHARSET, 0x80 | FF_ROMAN, L"Times New Roman", 1 }, - { 12, DEFAULT_CHARSET, 0x80 | FF_SWISS, L"Small Fonts", 0 }, - { 16, DEFAULT_CHARSET, 0x80 | FF_ROMAN, L"MS Serif" , 1 }, - { 24, DEFAULT_CHARSET, 0x80 | FF_ROMAN, L"Times New Roman", 1 }, - { 32, DEFAULT_CHARSET, 0x80 | FF_SWISS, L"Arial", 0 }, - { 48, DEFAULT_CHARSET, 0x80 | FF_MODERN, L"Courier New", 1 }, - { 96, DEFAULT_CHARSET, 0x80 | FF_SWISS, L"Arial", 0 }, + { 6, DEFAULT_CHARSET, 0x80 | FF_ROMAN, L"Times New Roman" }, + { 12, DEFAULT_CHARSET, 0x80 | FF_SWISS, L"Small Fonts" }, + { 16, DEFAULT_CHARSET, 0x80 | FF_ROMAN, L"MS Serif" }, + { 24, DEFAULT_CHARSET, 0x80 | FF_ROMAN, L"Times New Roman" }, + { 32, DEFAULT_CHARSET, 0x80 | FF_SWISS, L"Arial" }, + { 48, DEFAULT_CHARSET, 0x80 | FF_MODERN, L"Courier New" }, + { 96, DEFAULT_CHARSET, 0x80 | FF_SWISS, L"Arial" }, }; WCHAR font_name[1024] = { 0 }; TEXTMETRICW metric; diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 511f01f371c..e4d7b8ab121 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -1019,9 +1019,9 @@ static BOOL enum_fallbacks( DWORD pitch_and_family, int index, WCHAR buffer[LF_F { const char * const *defaults; - if ((pitch_and_family & FIXED_PITCH) || (pitch_and_family & 0xf0) == FF_MODERN) + if ((pitch_and_family & FIXED_PITCH) || (pitch_and_family & 0x70) == FF_MODERN) defaults = default_fixed_list; - else if ((pitch_and_family & 0xf0) == FF_ROMAN) + else if ((pitch_and_family & 0x70) == FF_ROMAN) defaults = default_serif_list; else defaults = default_sans_list; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9514