[PATCH 4/5] gdi32: Added font name tests on non English locale.

Alexandre Julliard julliard at winehq.org
Thu Sep 6 13:28:20 CDT 2012


Qian Hong <fracting at gmail.com> writes:

> @@ -4110,7 +4120,9 @@ static void test_fullname2_helper(const char *Family)
>  
>          bufW[0] = 0;
>          bufA[0] = 0;
> -        ok(get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size), "FAMILY (family name) could not be read\n");
> +        ok(get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size, GetSystemDefaultLangID()) ||
> +           get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES),

You should avoid that sort of thing, it will be hard to debug,
particularly since get_ttf_nametable_entry itself has ok() calls. Store
the result in a variable instead.

-- 
Alexandre Julliard
julliard at winehq.org



More information about the wine-devel mailing list