diff --git a/win32ss/gdi/eng/engobjects.h b/win32ss/gdi/eng/engobjects.h index 98af01af982..f601e6cdda5 100644 --- a/win32ss/gdi/eng/engobjects.h +++ b/win32ss/gdi/eng/engobjects.h @@ -152,7 +152,6 @@ typedef struct _FONTGDI { BYTE RequestUnderline; BYTE RequestStrikeOut; BYTE RequestItalic; - LONG RequestWeight; BYTE OriginalItalic; LONG OriginalWeight; BYTE CharSet; diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 5100c20dc76..4737fbcb66f 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -1181,7 +1181,6 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont, FontGDI->OriginalItalic = FALSE; FontGDI->RequestItalic = FALSE; FontGDI->OriginalWeight = FALSE; - FontGDI->RequestWeight = FW_NORMAL; IntLockFreeType(); pOS2 = (TT_OS2 *)FT_Get_Sfnt_Table(Face, FT_SFNT_OS2); @@ -2129,7 +2128,7 @@ FillTM(TEXTMETRICW *TM, PFONTGDI FontGDI, TM->tmDefaultChar = pFNT->default_char + pFNT->first_char; TM->tmBreakChar = pFNT->break_char + pFNT->first_char; TM->tmPitchAndFamily = pFNT->pitch_and_family; - TM->tmWeight = FontGDI->RequestWeight; + TM->tmWeight = pFNT->weight; TM->tmItalic = FontGDI->RequestItalic; TM->tmUnderlined = FontGDI->RequestUnderline; TM->tmStruckOut = FontGDI->RequestStrikeOut; @@ -2175,15 +2174,7 @@ FillTM(TEXTMETRICW *TM, PFONTGDI FontGDI, /* Correct forumla to get the maxcharwidth from unicode and ansi font */ TM->tmMaxCharWidth = (FT_MulFix(Face->max_advance_width, XScale) + 32) >> 6; - if (FontGDI->OriginalWeight != FW_DONTCARE && - FontGDI->OriginalWeight != FW_NORMAL) - { - TM->tmWeight = FontGDI->OriginalWeight; - } - else - { - TM->tmWeight = FontGDI->RequestWeight; - } + TM->tmWeight = FontGDI->OriginalWeight; TM->tmOverhang = 0; TM->tmDigitizedAspectX = 96; @@ -5280,10 +5271,6 @@ TextIntRealizeFont(HFONT FontHandle, PTEXTOBJ pTextObj) FontGdi->RequestUnderline = pLogFont->lfUnderline ? 0xFF : 0; FontGdi->RequestStrikeOut = pLogFont->lfStrikeOut ? 0xFF : 0; FontGdi->RequestItalic = pLogFont->lfItalic ? 0xFF : 0; - if (pLogFont->lfWeight != FW_DONTCARE) - FontGdi->RequestWeight = pLogFont->lfWeight; - else - FontGdi->RequestWeight = FW_NORMAL; TextObj->fl |= TEXTOBJECT_INIT; Status = STATUS_SUCCESS;