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

gdi32: Fixed get_name_table_entry for symbol fonts.

This commit is contained in:
Qian Hong 2012-09-11 01:06:39 +08:00 committed by Alexandre Julliard
parent 84954c0dbe
commit de5972081e
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/gdi32/freetype.c
View File

@ -1146,7 +1146,7 @@ static BOOL get_name_table_entry(FT_Face ft_face, FT_SfntName *req)
if(!pFT_Get_Sfnt_Name(ft_face, name_index, &name)) if(!pFT_Get_Sfnt_Name(ft_face, name_index, &name))
{ {
if((name.platform_id == req->platform_id) && if((name.platform_id == req->platform_id) &&
(name.encoding_id == req->encoding_id) && ((name.encoding_id == TT_MS_ID_UNICODE_CS) || (name.encoding_id == TT_MS_ID_SYMBOL_CS)) &&
(name.language_id == req->language_id) && (name.language_id == req->language_id) &&
(name.name_id == req->name_id)) (name.name_id == req->name_id))
{ {
@ -1168,7 +1168,6 @@ static WCHAR *get_face_name(FT_Face ft_face, FT_UShort name_id, FT_UShort langua
FT_SfntName name; FT_SfntName name;
name.platform_id = TT_PLATFORM_MICROSOFT; name.platform_id = TT_PLATFORM_MICROSOFT;
name.encoding_id = TT_MS_ID_UNICODE_CS;
name.language_id = language_id; name.language_id = language_id;
name.name_id = name_id; name.name_id = name_id;

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

@ -4151,9 +4151,7 @@ static void test_fullname2_helper(const char *Family)
ok(ret, "UNIQUE_ID (full name) could not be read\n"); ok(ret, "UNIQUE_ID (full name) could not be read\n");
WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE);
otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFullName; otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFullName;
if (efnd.elf[i].elfLogFont.lfCharSet == SYMBOL_CHARSET) ok(!lstrcmpA(otmStr, bufA), "UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", otmStr, bufA);
todo_wine ok(!lstrcmpA(otmStr, bufA), "UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", otmStr, bufA);
else ok(!lstrcmpA(otmStr, bufA), "UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", otmStr, bufA);
SelectObject(hdc, of); SelectObject(hdc, of);
DeleteObject(hfont); DeleteObject(hfont);