Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 05:53:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTGDI:FREETYPE] Fix Fonts broken by opening VLC About (Retry of PR #4579) (#7952)

Browse source 
* Check is FontGDI->OriginalWeight > FontGDI->RequestWeight and if so, then return original weight.
* Do not handle FontGDI->OriginalWeight as a boolean. Use 'FontGDI->OriginalWeight = FW_DONTCARE;'.

CORE-17011
This commit is contained in:
Doug Lyons 2025-05-01 17:44:10 -05:00 • committed by GitHub
parent bbd6a57c0f
commit e98bba2535
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1816,7 +1816,7 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont,
FontGDI->CharSet = ANSI_CHARSET; FontGDI->CharSet = ANSI_CHARSET;
FontGDI->OriginalItalic = FALSE; FontGDI->OriginalItalic = FALSE;
FontGDI->RequestItalic = FALSE; FontGDI->RequestItalic = FALSE;
FontGDI->OriginalWeight = FALSE; FontGDI->OriginalWeight = FW_DONTCARE;
FontGDI->RequestWeight = FW_NORMAL; FontGDI->RequestWeight = FW_NORMAL;
IntLockFreeType(); IntLockFreeType();
@ -2921,7 +2921,7 @@ FillTM(TEXTMETRICW *TM, PFONTGDI FontGDI,
TM->tmMaxCharWidth = (FT_MulFix(Face->max_advance_width, XScale) + 32) >> 6; TM->tmMaxCharWidth = (FT_MulFix(Face->max_advance_width, XScale) + 32) >> 6;
if (FontGDI->OriginalWeight != FW_DONTCARE && if (FontGDI->OriginalWeight != FW_DONTCARE &&
FontGDI->OriginalWeight != FW_NORMAL) FontGDI->OriginalWeight > FontGDI->RequestWeight)
{ {
TM->tmWeight = FontGDI->OriginalWeight; TM->tmWeight = FontGDI->OriginalWeight;
} }