[PATCH] gdi32/tests: Expect English font names even on non-English locales
Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes numerous test VM failures dlls/gdi32/tests/font.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 117a14f153..f1b7e9a91c 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5477,8 +5477,7 @@ static void test_fullname2_helper(const char *Family) bufW[0] = 0; bufA[0] = 0; - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size, GetSystemDefaultLangID()); - if (!ret) ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); ok(ret, "%s: FAMILY (family name) could not be read\n", FamilyName); if (want_vertical) bufW = prepend_at(bufW); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); @@ -5488,8 +5487,7 @@ static void test_fullname2_helper(const char *Family) bufW[0] = 0; bufA[0] = 0; - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, buf_size, GetSystemDefaultLangID()); - if (!ret) ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); ok(ret, "FULL_NAME (face name) could not be read\n"); if (want_vertical) bufW = prepend_at(bufW); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); @@ -5499,8 +5497,7 @@ static void test_fullname2_helper(const char *Family) bufW[0] = 0; bufA[0] = 0; - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, GetSystemDefaultLangID()); - if (!ret) ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); ok(ret, "%s: SUBFAMILY (style name) could not be read\n", FamilyName); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); ok(!lstrcmpA(StyleName, bufA), "%s: style names don't match: returned %s, expect %s\n", FamilyName, StyleName, bufA); @@ -5509,8 +5506,7 @@ static void test_fullname2_helper(const char *Family) bufW[0] = 0; bufA[0] = 0; - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size, GetSystemDefaultLangID()); - if (!ret) ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); ok(ret, "%s: UNIQUE_ID (full name) could not be read\n", FamilyName); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFullName; -- 2.15.1
Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=34978 Your paranoid android. === w7u (32 bit font) === font.c:5503: Test failed: MS UI Gothic: style names don't match: returned W, expect Regular font.c:5503: Test failed: MS UI Gothic: style names don't match: returned W, expect Regular font.c:5503: Test failed: MS UI Gothic: style names don't match: returned W, expect Regular font.c:5503: Test failed: MS UI Gothic: style names don't match: returned W, expect Regular font.c:5503: Test failed: MS UI Gothic: style names don't match: returned W, expect Regular font.c:5503: Test failed: MS UI Gothic: style names don't match: returned W, expect Regular font.c:5503: Test failed: MS UI Gothic: style names don't match: returned W, expect Regular font.c:5484: Test failed: font family names don't match: returned lr SVbN, expect MS Gothic font.c:5494: Test failed: lr SVbN: font face names don't match: returned lr SVbN, expect MS Gothic font.c:5503: Test failed: lr SVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: lr SVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr SVbN:2009, expect Microsoft:MS Gothic:2009 font.c:5484: Test failed: font family names don't match: returned lr SVbN, expect MS Gothic font.c:5494: Test failed: lr SVbN: font face names don't match: returned lr SVbN, expect MS Gothic font.c:5503: Test failed: lr SVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: lr SVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr SVbN:2009, expect Microsoft:MS Gothic:2009 font.c:5484: Test failed: font family names don't match: returned lr SVbN, expect MS Gothic font.c:5494: Test failed: lr SVbN: font face names don't match: returned lr SVbN, expect MS Gothic font.c:5503: Test failed: lr SVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: lr SVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr SVbN:2009, expect Microsoft:MS Gothic:2009 font.c:5484: Test failed: font family names don't match: returned lr SVbN, expect MS Gothic font.c:5494: Test failed: lr SVbN: font face names don't match: returned lr SVbN, expect MS Gothic font.c:5503: Test failed: lr SVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: lr SVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr SVbN:2009, expect Microsoft:MS Gothic:2009 font.c:5484: Test failed: font family names don't match: returned lr SVbN, expect MS Gothic font.c:5494: Test failed: lr SVbN: font face names don't match: returned lr SVbN, expect MS Gothic font.c:5503: Test failed: lr SVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: lr SVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr SVbN:2009, expect Microsoft:MS Gothic:2009 font.c:5484: Test failed: font family names don't match: returned lr SVbN, expect MS Gothic font.c:5494: Test failed: lr SVbN: font face names don't match: returned lr SVbN, expect MS Gothic font.c:5503: Test failed: lr SVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: lr SVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr SVbN:2009, expect Microsoft:MS Gothic:2009 font.c:5484: Test failed: font family names don't match: returned lr SVbN, expect MS Gothic font.c:5494: Test failed: lr SVbN: font face names don't match: returned lr SVbN, expect MS Gothic font.c:5503: Test failed: lr SVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: lr SVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr SVbN:2009, expect Microsoft:MS Gothic:2009 font.c:5484: Test failed: font family names don't match: returned lr oSVbN, expect MS PGothic font.c:5494: Test failed: lr oSVbN: font face names don't match: returned lr oSVbN, expect MS PGothic font.c:5503: Test failed: lr oSVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: lr oSVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr oSVbN:2009, expect Microsoft:MS PGothic:2009 font.c:5484: Test failed: font family names don't match: returned lr oSVbN, expect MS PGothic font.c:5494: Test failed: lr oSVbN: font face names don't match: returned lr oSVbN, expect MS PGothic font.c:5503: Test failed: lr oSVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: lr oSVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr oSVbN:2009, expect Microsoft:MS PGothic:2009 font.c:5484: Test failed: font family names don't match: returned lr oSVbN, expect MS PGothic font.c:5494: Test failed: lr oSVbN: font face names don't match: returned lr oSVbN, expect MS PGothic font.c:5503: Test failed: lr oSVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: lr oSVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr oSVbN:2009, expect Microsoft:MS PGothic:2009 font.c:5484: Test failed: font family names don't match: returned lr oSVbN, expect MS PGothic font.c:5494: Test failed: lr oSVbN: font face names don't match: returned lr oSVbN, expect MS PGothic font.c:5503: Test failed: lr oSVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: lr oSVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr oSVbN:2009, expect Microsoft:MS PGothic:2009 font.c:5484: Test failed: font family names don't match: returned lr oSVbN, expect MS PGothic font.c:5494: Test failed: lr oSVbN: font face names don't match: returned lr oSVbN, expect MS PGothic font.c:5503: Test failed: lr oSVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: lr oSVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr oSVbN:2009, expect Microsoft:MS PGothic:2009 font.c:5484: Test failed: font family names don't match: returned lr oSVbN, expect MS PGothic font.c:5494: Test failed: lr oSVbN: font face names don't match: returned lr oSVbN, expect MS PGothic font.c:5503: Test failed: lr oSVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: lr oSVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr oSVbN:2009, expect Microsoft:MS PGothic:2009 font.c:5484: Test failed: font family names don't match: returned lr oSVbN, expect MS PGothic font.c:5494: Test failed: lr oSVbN: font face names don't match: returned lr oSVbN, expect MS PGothic font.c:5503: Test failed: lr oSVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: lr oSVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr oSVbN:2009, expect Microsoft:MS PGothic:2009 font.c:5503: Test failed: @MS UI Gothic: style names don't match: returned W, expect Regular font.c:5503: Test failed: @MS UI Gothic: style names don't match: returned W, expect Regular font.c:5503: Test failed: @MS UI Gothic: style names don't match: returned W, expect Regular font.c:5503: Test failed: @MS UI Gothic: style names don't match: returned W, expect Regular font.c:5503: Test failed: @MS UI Gothic: style names don't match: returned W, expect Regular font.c:5503: Test failed: @MS UI Gothic: style names don't match: returned W, expect Regular font.c:5503: Test failed: @MS UI Gothic: style names don't match: returned W, expect Regular font.c:5484: Test failed: font family names don't match: returned @lr SVbN, expect @MS Gothic font.c:5494: Test failed: @lr SVbN: font face names don't match: returned @lr SVbN, expect @MS Gothic font.c:5503: Test failed: @lr SVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: @lr SVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr SVbN:2009, expect Microsoft:MS Gothic:2009 font.c:5484: Test failed: font family names don't match: returned @lr SVbN, expect @MS Gothic font.c:5494: Test failed: @lr SVbN: font face names don't match: returned @lr SVbN, expect @MS Gothic font.c:5503: Test failed: @lr SVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: @lr SVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr SVbN:2009, expect Microsoft:MS Gothic:2009 font.c:5484: Test failed: font family names don't match: returned @lr SVbN, expect @MS Gothic font.c:5494: Test failed: @lr SVbN: font face names don't match: returned @lr SVbN, expect @MS Gothic font.c:5503: Test failed: @lr SVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: @lr SVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr SVbN:2009, expect Microsoft:MS Gothic:2009 font.c:5484: Test failed: font family names don't match: returned @lr SVbN, expect @MS Gothic font.c:5494: Test failed: @lr SVbN: font face names don't match: returned @lr SVbN, expect @MS Gothic font.c:5503: Test failed: @lr SVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: @lr SVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr SVbN:2009, expect Microsoft:MS Gothic:2009 font.c:5484: Test failed: font family names don't match: returned @lr SVbN, expect @MS Gothic font.c:5494: Test failed: @lr SVbN: font face names don't match: returned @lr SVbN, expect @MS Gothic font.c:5503: Test failed: @lr SVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: @lr SVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr SVbN:2009, expect Microsoft:MS Gothic:2009 font.c:5484: Test failed: font family names don't match: returned @lr SVbN, expect @MS Gothic font.c:5494: Test failed: @lr SVbN: font face names don't match: returned @lr SVbN, expect @MS Gothic font.c:5503: Test failed: @lr SVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: @lr SVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr SVbN:2009, expect Microsoft:MS Gothic:2009 font.c:5484: Test failed: font family names don't match: returned @lr SVbN, expect @MS Gothic font.c:5494: Test failed: @lr SVbN: font face names don't match: returned @lr SVbN, expect @MS Gothic font.c:5503: Test failed: @lr SVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: @lr SVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr SVbN:2009, expect Microsoft:MS Gothic:2009 font.c:5484: Test failed: font family names don't match: returned @lr oSVbN, expect @MS PGothic font.c:5494: Test failed: @lr oSVbN: font face names don't match: returned @lr oSVbN, expect @MS PGothic font.c:5503: Test failed: @lr oSVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: @lr oSVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr oSVbN:2009, expect Microsoft:MS PGothic:2009 font.c:5484: Test failed: font family names don't match: returned @lr oSVbN, expect @MS PGothic font.c:5494: Test failed: @lr oSVbN: font face names don't match: returned @lr oSVbN, expect @MS PGothic font.c:5503: Test failed: @lr oSVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: @lr oSVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr oSVbN:2009, expect Microsoft:MS PGothic:2009 font.c:5484: Test failed: font family names don't match: returned @lr oSVbN, expect @MS PGothic font.c:5494: Test failed: @lr oSVbN: font face names don't match: returned @lr oSVbN, expect @MS PGothic font.c:5503: Test failed: @lr oSVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: @lr oSVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr oSVbN:2009, expect Microsoft:MS PGothic:2009 font.c:5484: Test failed: font family names don't match: returned @lr oSVbN, expect @MS PGothic font.c:5494: Test failed: @lr oSVbN: font face names don't match: returned @lr oSVbN, expect @MS PGothic font.c:5503: Test failed: @lr oSVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: @lr oSVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr oSVbN:2009, expect Microsoft:MS PGothic:2009 font.c:5484: Test failed: font family names don't match: returned @lr oSVbN, expect @MS PGothic font.c:5494: Test failed: @lr oSVbN: font face names don't match: returned @lr oSVbN, expect @MS PGothic font.c:5503: Test failed: @lr oSVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: @lr oSVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr oSVbN:2009, expect Microsoft:MS PGothic:2009 font.c:5484: Test failed: font family names don't match: returned @lr oSVbN, expect @MS PGothic font.c:5494: Test failed: @lr oSVbN: font face names don't match: returned @lr oSVbN, expect @MS PGothic font.c:5503: Test failed: @lr oSVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: @lr oSVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr oSVbN:2009, expect Microsoft:MS PGothic:2009 font.c:5484: Test failed: font family names don't match: returned @lr oSVbN, expect @MS PGothic font.c:5494: Test failed: @lr oSVbN: font face names don't match: returned @lr oSVbN, expect @MS PGothic font.c:5503: Test failed: @lr oSVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: @lr oSVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr oSVbN:2009, expect Microsoft:MS PGothic:2009
Please ignore this patch. I should have double-checked it with the testbot before submitting. -Alex
participants (2)
-
Alex Henrie -
Marvin