Commit 531219f8 authored by Vincent Povirk's avatar Vincent Povirk Committed by Alexandre Julliard

gdiplus: Do not create FontFamilies for bitmap fonts.

parent 049aa8da
...@@ -521,7 +521,7 @@ GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont *font, REAL dpi, ...@@ -521,7 +521,7 @@ GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont *font, REAL dpi,
static INT CALLBACK is_font_installed_proc(const LOGFONTW *elf, static INT CALLBACK is_font_installed_proc(const LOGFONTW *elf,
const TEXTMETRICW *ntm, DWORD type, LPARAM lParam) const TEXTMETRICW *ntm, DWORD type, LPARAM lParam)
{ {
if (!ntm) if (!ntm || type == RASTER_FONTTYPE)
{ {
return 1; return 1;
} }
...@@ -966,6 +966,9 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, ...@@ -966,6 +966,9 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm,
GpFontCollection* fonts = (GpFontCollection*)lParam; GpFontCollection* fonts = (GpFontCollection*)lParam;
int i; int i;
if (type == RASTER_FONTTYPE)
return 1;
/* skip duplicates */ /* skip duplicates */
for (i=0; i<fonts->count; i++) for (i=0; i<fonts->count; i++)
if (strcmpiW(lfw->lfFaceName, fonts->FontFamilies[i]->FamilyName) == 0) if (strcmpiW(lfw->lfFaceName, fonts->FontFamilies[i]->FamilyName) == 0)
......
...@@ -192,12 +192,9 @@ static void test_fontfamily (void) ...@@ -192,12 +192,9 @@ static void test_fontfamily (void)
expect (FontFamilyNotFound, stat); expect (FontFamilyNotFound, stat);
/* Bitmap fonts are not found */ /* Bitmap fonts are not found */
todo_wine
{
stat = GdipCreateFontFamilyFromName (MSSansSerif, NULL, &family); stat = GdipCreateFontFamilyFromName (MSSansSerif, NULL, &family);
expect (FontFamilyNotFound, stat); expect (FontFamilyNotFound, stat);
if(stat == Ok) GdipDeleteFontFamily(family); if(stat == Ok) GdipDeleteFontFamily(family);
}
stat = GdipCreateFontFamilyFromName (arial, NULL, &family); stat = GdipCreateFontFamilyFromName (arial, NULL, &family);
if(stat == FontFamilyNotFound) if(stat == FontFamilyNotFound)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment