Commit 84954c0d authored by Qian Hong's avatar Qian Hong Committed by Alexandre Julliard

gdi32/tests: Added tests for symbol fonts.

parent 80dbd4e9
...@@ -2777,6 +2777,7 @@ end: ...@@ -2777,6 +2777,7 @@ end:
} }
#define TT_PLATFORM_MICROSOFT 3 #define TT_PLATFORM_MICROSOFT 3
#define TT_MS_ID_SYMBOL_CS 0
#define TT_MS_ID_UNICODE_CS 1 #define TT_MS_ID_UNICODE_CS 1
#define TT_MS_LANGID_ENGLISH_UNITED_STATES 0x0409 #define TT_MS_LANGID_ENGLISH_UNITED_STATES 0x0409
#define TT_NAME_ID_FONT_FAMILY 1 #define TT_NAME_ID_FONT_FAMILY 1
...@@ -2840,7 +2841,7 @@ static BOOL get_ttf_nametable_entry(HDC hdc, WORD name_id, WCHAR *out_buf, SIZE_ ...@@ -2840,7 +2841,7 @@ static BOOL get_ttf_nametable_entry(HDC hdc, WORD name_id, WCHAR *out_buf, SIZE_
for (i = 0; i < header->number_of_record; i++) for (i = 0; i < header->number_of_record; i++)
{ {
if (GET_BE_WORD(entry[i].platform_id) != TT_PLATFORM_MICROSOFT || if (GET_BE_WORD(entry[i].platform_id) != TT_PLATFORM_MICROSOFT ||
GET_BE_WORD(entry[i].encoding_id) != TT_MS_ID_UNICODE_CS || (GET_BE_WORD(entry[i].encoding_id) != TT_MS_ID_UNICODE_CS && GET_BE_WORD(entry[i].encoding_id) != TT_MS_ID_SYMBOL_CS) ||
GET_BE_WORD(entry[i].language_id) != language_id || GET_BE_WORD(entry[i].language_id) != language_id ||
GET_BE_WORD(entry[i].name_id) != name_id) GET_BE_WORD(entry[i].name_id) != name_id)
{ {
...@@ -4150,7 +4151,9 @@ static void test_fullname2_helper(const char *Family) ...@@ -4150,7 +4151,9 @@ 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;
ok(!lstrcmpA(otmStr, bufA), "UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", otmStr, bufA); if (efnd.elf[i].elfLogFont.lfCharSet == SYMBOL_CHARSET)
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);
...@@ -4165,6 +4168,8 @@ static void test_fullname2_helper(const char *Family) ...@@ -4165,6 +4168,8 @@ static void test_fullname2_helper(const char *Family)
static void test_fullname2(void) static void test_fullname2(void)
{ {
test_fullname2_helper("Lucida Sans"); test_fullname2_helper("Lucida Sans");
test_fullname2_helper("Webdings");
test_fullname2_helper("Wingdings");
} }
static BOOL write_ttf_file(const char *fontname, char *tmp_name) static BOOL write_ttf_file(const char *fontname, char *tmp_name)
......
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