Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-02 20:43:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Load also the last font file in the font directory.

Browse source 
svn path=/trunk/; revision=10670
This commit is contained in:
Filip Navara 2004-08-24 17:29:00 +00:00
parent df072d8e25
commit 489265e774
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
reactos/subsys/win32k/objects/text.c
View file

@ -22,7 +22,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: text.c,v 1.109 2004/08/21 02:22:45 navaraf Exp $ */ /* $Id: text.c,v 1.110 2004/08/24 17:29:00 navaraf Exp $ */
#include <w32k.h> #include <w32k.h>
#include <ft2build.h> #include <ft2build.h>
@ -213,9 +213,8 @@ IntLoadSystemFonts(VOID)
break; break;
} }
for (DirInfo = (PFILE_DIRECTORY_INFORMATION)DirInfoBuffer; DirInfo = (PFILE_DIRECTORY_INFORMATION)DirInfoBuffer;
DirInfo->NextEntryOffset != 0; while (1)
DirInfo = (PFILE_DIRECTORY_INFORMATION)((ULONG_PTR)DirInfo + DirInfo->NextEntryOffset))
{ {
TempString.Buffer = DirInfo->FileName; TempString.Buffer = DirInfo->FileName;
TempString.Length = TempString.Length =
@ -223,6 +222,9 @@ IntLoadSystemFonts(VOID)
RtlCopyUnicodeString(&FileName, &Directory); RtlCopyUnicodeString(&FileName, &Directory);
RtlAppendUnicodeStringToString(&FileName, &TempString); RtlAppendUnicodeStringToString(&FileName, &TempString);
IntGdiAddFontResource(&FileName, 0); IntGdiAddFontResource(&FileName, 0);
if (DirInfo->NextEntryOffset == 0)
break;
DirInfo = (PFILE_DIRECTORY_INFORMATION)((ULONG_PTR)DirInfo + DirInfo->NextEntryOffset);
} }
bRestartScan = FALSE; bRestartScan = FALSE;
@ -380,7 +382,8 @@ IntGdiAddFontResource(PUNICODE_STRING FileName, DWORD Characteristics)
/* FIXME: Complete text metrics */ /* FIXME: Complete text metrics */
FontGDI->TextMetric.tmAscent = (Face->size->metrics.ascender + 32) >> 6; /* units above baseline */ FontGDI->TextMetric.tmAscent = (Face->size->metrics.ascender + 32) >> 6; /* units above baseline */
FontGDI->TextMetric.tmDescent = (32 - Face->size->metrics.descender) >> 6; /* units below baseline */ FontGDI->TextMetric.tmDescent = (32 - Face->size->metrics.descender) >> 6; /* units below baseline */
FontGDI->TextMetric.tmHeight = FontGDI->TextMetric.tmAscent + FontGDI->TextMetric.tmDescent; FontGDI->TextMetric.tmHeight = (Face->size->metrics.ascender -
Face->size->metrics.descender) >> 6;
DPRINT("Font loaded: %s (%s)\n", Face->family_name, Face->style_name); DPRINT("Font loaded: %s (%s)\n", Face->family_name, Face->style_name);
DPRINT("Num glyphs: %u\n", Face->num_glyphs); DPRINT("Num glyphs: %u\n", Face->num_glyphs);
@ -815,7 +818,6 @@ IntGetOutlineTextMetrics(PFONTGDI FontGDI, UINT Size,
} }
pPost = FT_Get_Sfnt_Table(FontGDI->face, ft_sfnt_post); /* we can live with this failing */ pPost = FT_Get_Sfnt_Table(FontGDI->face, ft_sfnt_post); /* we can live with this failing */
IntUnLockFreeType;
Otm->otmSize = Needed; Otm->otmSize = Needed;
@ -963,6 +965,8 @@ IntGetOutlineTextMetrics(PFONTGDI FontGDI, UINT Size,
Otm->otmsUnderscorePosition = (FT_MulFix(pPost->underlinePosition, YScale) + 32) >> 6; Otm->otmsUnderscorePosition = (FT_MulFix(pPost->underlinePosition, YScale) + 32) >> 6;
} }
IntUnLockFreeType;
/* otmp* members should clearly have type ptrdiff_t, but M$ knows best */ /* otmp* members should clearly have type ptrdiff_t, but M$ knows best */
Cp = (char*) Otm + sizeof(OUTLINETEXTMETRICW); Cp = (char*) Otm + sizeof(OUTLINETEXTMETRICW);
Otm->otmpFamilyName = (LPSTR)(Cp - (char*) Otm); Otm->otmpFamilyName = (LPSTR)(Cp - (char*) Otm);
@ -1893,11 +1897,11 @@ NtGdiExtTextOut(
if (NULL == Dx) if (NULL == Dx)
{ {
TextLeft += glyph->advance.x; TextLeft += glyph->advance.x;
} }
else else
{ {
TextLeft += Dx[i] << 6; TextLeft += Dx[i] << 6;
} }
previous = glyph_index; previous = glyph_index;
@ -2860,7 +2864,7 @@ FindBestFontFromList(HFONT *Font, UINT *MatchScore, LOGFONTW *LogFont,
continue; continue;
} }
Score = GetFontScore(LogFont, FaceName, FontGDI); Score = GetFontScore(LogFont, FaceName, FontGDI);
if (*MatchScore < Score) if (*MatchScore == 0 || *MatchScore < Score)
{ {
*Font = CurrentEntry->hFont; *Font = CurrentEntry->hFont;
*MatchScore = Score; *MatchScore = Score;