mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-14 17:47:16 +00:00
gdiplus: Do not create FontFamilies for bitmap fonts.
This commit is contained in:
parent
049aa8dacd
commit
531219f84d
|
@ -521,7 +521,7 @@ GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont *font, REAL dpi,
|
|||
static INT CALLBACK is_font_installed_proc(const LOGFONTW *elf,
|
||||
const TEXTMETRICW *ntm, DWORD type, LPARAM lParam)
|
||||
{
|
||||
if (!ntm)
|
||||
if (!ntm || type == RASTER_FONTTYPE)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
@ -966,6 +966,9 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm,
|
|||
GpFontCollection* fonts = (GpFontCollection*)lParam;
|
||||
int i;
|
||||
|
||||
if (type == RASTER_FONTTYPE)
|
||||
return 1;
|
||||
|
||||
/* skip duplicates */
|
||||
for (i=0; i<fonts->count; i++)
|
||||
if (strcmpiW(lfw->lfFaceName, fonts->FontFamilies[i]->FamilyName) == 0)
|
||||
|
|
|
@ -192,12 +192,9 @@ static void test_fontfamily (void)
|
|||
expect (FontFamilyNotFound, stat);
|
||||
|
||||
/* Bitmap fonts are not found */
|
||||
todo_wine
|
||||
{
|
||||
stat = GdipCreateFontFamilyFromName (MSSansSerif, NULL, &family);
|
||||
expect (FontFamilyNotFound, stat);
|
||||
if(stat == Ok) GdipDeleteFontFamily(family);
|
||||
}
|
||||
|
||||
stat = GdipCreateFontFamilyFromName (arial, NULL, &family);
|
||||
if(stat == FontFamilyNotFound)
|
||||
|
|
Loading…
Reference in a new issue