Grazvydas Ignotas : gdi32: Implement font selection by its full name.
Alexandre Julliard
julliard at winehq.org
Thu May 12 13:57:54 CDT 2011
Module: wine
Branch: master
Commit: adcce5d7128ab8f3ccb3ced29d6dc271222aeabb
URL: http://source.winehq.org/git/wine.git/?a=commit;h=adcce5d7128ab8f3ccb3ced29d6dc271222aeabb
Author: Grazvydas Ignotas <notasas at gmail.com>
Date: Tue May 10 23:38:07 2011 +0300
gdi32: Implement font selection by its full name.
---
dlls/gdi32/freetype.c | 19 +++++++++++++++++++
dlls/gdi32/tests/font.c | 1 -
2 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index e95376e..d6271db 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -262,6 +262,7 @@ struct enum_data
typedef struct tagFace {
struct list entry;
WCHAR *StyleName;
+ const WCHAR *FullName;
char *file;
void *font_data_ptr;
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->cached_enum_data = NULL;
face->StyleName = StyleW;
+ face->FullName = get_face_name(ft_face, TT_NAME_ID_FULL_NAME, TT_MS_LANGID_ENGLISH_UNITED_STATES);
if (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.
* We may find good replacements there.
@@ -3763,6 +3779,9 @@ found:
ret->fake_italic = (it && !(face->ntmFlags & NTM_ITALIC));
ret->fake_bold = (bd && !(face->ntmFlags & NTM_BOLD));
+found_face:
+ height = lf.lfHeight;
+
ret->fs = face->fs;
if(csi.fs.fsCsb[0]) {
diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index 151e655..330d25e 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -3771,7 +3771,6 @@ static void test_fullname(void)
buf[0] = 0;
ok(get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, buf, sizeof(buf)),
"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);
SelectObject(hdc, of);
DeleteObject(hfont);
More information about the wine-cvs
mailing list