https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7f679a116b92f55e6f4364c689958a984595027f
commit 7f679a116b92f55e6f4364c689958a984595027f Author: Katayama Hirofumi MZ <[email protected]> AuthorDate: Mon Nov 5 06:03:53 2018 +0900 Commit: GitHub <[email protected]> CommitDate: Mon Nov 5 06:03:53 2018 +0900 [WIN32SS][FONT] Fix ntmCellHeight value to usWinAscent + usWinDescent (#1010) CORE-15331 --- win32ss/gdi/ntgdi/freetype.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 55efa4ecc5..ee242a39ce 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -2583,10 +2583,6 @@ FontFamilyFillInfo(PFONTFAMILYINFO Info, LPCWSTR FaceName, if (0 == Ntm->ntmFlags) Ntm->ntmFlags = NTM_REGULAR; - Ntm->ntmSizeEM = Otm->otmEMSquare; - Ntm->ntmCellHeight = Otm->otmEMSquare; - Ntm->ntmAvgWidth = 0; - Info->FontType = (0 != (TM->tmPitchAndFamily & TMPF_TRUETYPE) ? TRUETYPE_FONTTYPE : 0); @@ -2629,6 +2625,10 @@ FontFamilyFillInfo(PFONTFAMILYINFO Info, LPCWSTR FaceName, return; } + Ntm->ntmSizeEM = Otm->otmEMSquare; + Ntm->ntmCellHeight = pOS2->usWinAscent + pOS2->usWinDescent; + Ntm->ntmAvgWidth = 0; + fs.fsCsb[0] = pOS2->ulCodePageRange1; fs.fsCsb[1] = pOS2->ulCodePageRange2; fs.fsUsb[0] = pOS2->ulUnicodeRange1;
