Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-11 04:47:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32SS][FONT] Fix ntmCellHeight value to usWinAscent + usWinDescent (#1010)

Browse source 
CORE-15331
This commit is contained in:
Katayama Hirofumi MZ 2018-11-05 06:03:53 +09:00 • committed by GitHub
parent 751674c98e
commit 7f679a116b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
win32ss/gdi/ntgdi/freetype.c
View file

@ -2583,10 +2583,6 @@ FontFamilyFillInfo(PFONTFAMILYINFO Info, LPCWSTR FaceName,
if (0 == Ntm->ntmFlags) Ntm->ntmFlags = NTM_REGULAR; 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) Info->FontType = (0 != (TM->tmPitchAndFamily & TMPF_TRUETYPE)
? TRUETYPE_FONTTYPE : 0); ? TRUETYPE_FONTTYPE : 0);
@ -2629,6 +2625,10 @@ FontFamilyFillInfo(PFONTFAMILYINFO Info, LPCWSTR FaceName,
return; return;
} }
Ntm->ntmSizeEM = Otm->otmEMSquare;
Ntm->ntmCellHeight = pOS2->usWinAscent + pOS2->usWinDescent;
Ntm->ntmAvgWidth = 0;
fs.fsCsb[0] = pOS2->ulCodePageRange1; fs.fsCsb[0] = pOS2->ulCodePageRange1;
fs.fsCsb[1] = pOS2->ulCodePageRange2; fs.fsCsb[1] = pOS2->ulCodePageRange2;
fs.fsUsb[0] = pOS2->ulUnicodeRange1; fs.fsUsb[0] = pOS2->ulUnicodeRange1;