ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Implement font selection by its full name.

Browse Source
This commit is contained in:
Grazvydas Ignotas 2011-05-10 23:38:07 +03:00 committed by Alexandre Julliard
parent 0374102625
commit adcce5d712
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/gdi32/freetype.c
View File

@ -262,6 +262,7 @@ struct enum_data
typedef struct tagFace { typedef struct tagFace {
struct list entry; struct list entry;
WCHAR *StyleName; WCHAR *StyleName;
const WCHAR *FullName;
char *file; char *file;
void *font_data_ptr; void *font_data_ptr;
DWORD font_data_size; DWORD font_data_size;
@ -1461,6 +1462,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_
face = HeapAlloc(GetProcessHeap(), 0, sizeof(*face)); face = HeapAlloc(GetProcessHeap(), 0, sizeof(*face));
face->cached_enum_data = NULL; face->cached_enum_data = NULL;
face->StyleName = StyleW; face->StyleName = StyleW;
face->FullName = get_face_name(ft_face, TT_NAME_ID_FULL_NAME, TT_MS_LANGID_ENGLISH_UNITED_STATES);
if (file) if (file)
{ {
face->file = strdupA(file); face->file = strdupA(file);
@ -3610,6 +3612,20 @@ GdiFont *WineEngCreateFontInstance(DC *dc, HFONT hfont)
} }
} }
/* Search by full face name. */
LIST_FOR_EACH(family_elem_ptr, &font_list) {
family = LIST_ENTRY(family_elem_ptr, Family, entry);
LIST_FOR_EACH(face_elem_ptr, &family->faces) {
face = LIST_ENTRY(face_elem_ptr, Face, entry);
if(face->FullName && !strcmpiW(face->FullName, FaceName) &&
((csi.fs.fsCsb[0] & (face->fs.fsCsb[0] | face->fs_links.fsCsb[0])) || !csi.fs.fsCsb[0]))
{
if(face->scalable || can_use_bitmap)
goto found_face;
}
}
}
/* /*
* Try check the SystemLink list first for a replacement font. * Try check the SystemLink list first for a replacement font.
* We may find good replacements there. * We may find good replacements there.
@ -3763,6 +3779,9 @@ found:
ret->fake_italic = (it && !(face->ntmFlags & NTM_ITALIC)); ret->fake_italic = (it && !(face->ntmFlags & NTM_ITALIC));
ret->fake_bold = (bd && !(face->ntmFlags & NTM_BOLD)); ret->fake_bold = (bd && !(face->ntmFlags & NTM_BOLD));
found_face:
height = lf.lfHeight;
ret->fs = face->fs; ret->fs = face->fs;
if(csi.fs.fsCsb[0]) { if(csi.fs.fsCsb[0]) {

1
dlls/gdi32/tests/font.c
View File

@ -3771,7 +3771,6 @@ static void test_fullname(void)
buf[0] = 0; buf[0] = 0;
ok(get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, buf, sizeof(buf)), ok(get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, buf, sizeof(buf)),
"face full name could not be read\n"); "face full name could not be read\n");
todo_wine
ok(!lstrcmpA(buf, TestName[i]), "font full names don't match: %s != %s\n", TestName[i], buf); ok(!lstrcmpA(buf, TestName[i]), "font full names don't match: %s != %s\n", TestName[i], buf);
SelectObject(hdc, of); SelectObject(hdc, of);
DeleteObject(hfont); DeleteObject(hfont);