From: Paul Gofman pgofman@codeweavers.com
--- dlls/gdi32/tests/font.c | 2 +- dlls/win32u/freetype.c | 15 ++------------- 2 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 198fba2d847..1212e88fdfa 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -7776,7 +7776,7 @@ static INT CALLBACK test_font_weight_enum(const LOGFONTW *lf, const TEXTMETRICW if (type != TRUETYPE_FONTTYPE) return 1; ok(!wcscmp(lf->lfFaceName, L"wine_heavy"), "got %s.\n", debugstr_w(lf->lfFaceName)); ok((ntm->ntmFlags & (NTM_REGULAR | NTM_BOLD)) == NTM_REGULAR, "got %#lx.\n", ntm->ntmFlags); - todo_wine ok(ntm->tmWeight == 700, "got %ld.\n", ntm->tmWeight); + ok(ntm->tmWeight == 700, "got %ld.\n", ntm->tmWeight); *called = 1;
return 1; diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index 3e640115ab7..2c4d2c446df 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -3751,19 +3751,8 @@ static BOOL freetype_set_outline_text_metrics( struct gdi_font *font ) TM.tmAveCharWidth = 1; } TM.tmMaxCharWidth = SCALE_X(ft_face->bbox.xMax - ft_face->bbox.xMin); - TM.tmWeight = FW_REGULAR; - if (font->fake_bold) - TM.tmWeight = FW_BOLD; - else - { - if (ft_face->style_flags & FT_STYLE_FLAG_BOLD) - { - if (pOS2->usWeightClass > FW_MEDIUM) - TM.tmWeight = pOS2->usWeightClass; - } - else if (pOS2->usWeightClass <= FW_MEDIUM) - TM.tmWeight = pOS2->usWeightClass; - } + TM.tmWeight = font->fake_bold ? FW_BOLD : pOS2->usWeightClass; + TM.tmOverhang = 0; TM.tmDigitizedAspectX = 96; /* FIXME */ TM.tmDigitizedAspectY = 96; /* FIXME */