[PATCH v2 1/2] gdi32: In AddFaceToList allow fonts with long names and add tests
Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/gdi32/freetype.c | 9 ++--- dlls/gdi32/tests/font.c | 51 ++++++++++++++++++++++++++++ dlls/gdi32/tests/resource.rc | 3 ++ dlls/gdi32/tests/wine_longname.sfd | 66 +++++++++++++++++++++++++++++++++++++ dlls/gdi32/tests/wine_longname.ttf | Bin 0 -> 2252 bytes 5 files changed, 125 insertions(+), 4 deletions(-) create mode 100644 dlls/gdi32/tests/wine_longname.sfd create mode 100644 dlls/gdi32/tests/wine_longname.ttf diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 346e21dc21..8be1bfe22e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1571,6 +1571,9 @@ static BOOL insert_face_in_family_list( Face *face, Family *family ) face->family = family; family->refcount++; face->refcount++; + /* GDI32 can't deal with long names, truncate them */ + if (face->FullName && lstrlenW(face->FullName) > LF_FACESIZE - 1) + face->FullName[LF_FACESIZE - 1] = 0; return TRUE; } @@ -2143,10 +2146,8 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr family = get_family( ft_face, flags & ADDFONT_VERTICAL_FONT ); if (strlenW(family->FamilyName) >= LF_FACESIZE) { - WARN("Ignoring %s because name is too long\n", debugstr_w(family->FamilyName)); - release_face( face ); - release_family( family ); - return; + WARN("Truncating %s because name is too long\n", debugstr_w(family->FamilyName)); + family->FamilyName[LF_FACESIZE - 1] = 0; } if (insert_face_in_family_list( face, family )) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 299fadbab1..acdaa02123 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6679,10 +6679,61 @@ static void test_GetCharWidthI(void) ReleaseDC(0, hdc); } +static BOOL found_font; +static INT CALLBACK long_enum_proc(const LOGFONTA *lf, const TEXTMETRICA *tm, DWORD type, LPARAM lparam) +{ + found_font = TRUE; + return 1; +} + +static void test_long_names(void) +{ + char ttf_name[MAX_PATH]; + LOGFONTA font = {0}; + HFONT handle_font; + int ret; + + if (!pAddFontResourceExA || !pRemoveFontResourceExA) + { + win_skip("AddFontResourceExA is not available on this platform\n"); + return; + } + + if (!write_ttf_file("wine_longname.ttf", ttf_name)) + { + skip("Failed to create ttf file for testing\n"); + return; + } + + ret = pAddFontResourceExA(ttf_name, FR_PRIVATE, 0); + ok(ret, "AddFontResourceEx() failed\n"); + + strcpy(font.lfFaceName, "wine_3_this_is_a_very_long_name"); + found_font = FALSE; + EnumFontFamiliesExA(GetDC(0), &font, long_enum_proc, 0, 0); + ok(found_font == TRUE, "EnumFontFamiliesExA didn't find font.\n"); + + strcpy(font.lfFaceName, "wine_2_this_is_a_very_long_name"); + found_font = FALSE; + EnumFontFamiliesExA(GetDC(0), &font, long_enum_proc, 0, 0); + ok(found_font == TRUE, "EnumFontFamiliesExA didn't find font.\n"); + + handle_font = CreateFontIndirectA(&font); + ok(handle_font != NULL, "CreateFontIndirectA failed\n"); + DeleteObject(handle_font); + + + ret = pRemoveFontResourceExA(ttf_name, 0, 0); + ok(!ret, "RemoveFontResourceEx() should fail\n"); + + DeleteFileA(ttf_name); +} + START_TEST(font) { init(); + test_long_names(); test_stock_fonts(); test_logfont(); test_bitmap_font(); diff --git a/dlls/gdi32/tests/resource.rc b/dlls/gdi32/tests/resource.rc index fdd95f687a..6dcbd42ab5 100644 --- a/dlls/gdi32/tests/resource.rc +++ b/dlls/gdi32/tests/resource.rc @@ -28,3 +28,6 @@ wine_vdmx.ttf RCDATA wine_vdmx.ttf /* @makedep: vertical.ttf */ vertical.ttf RCDATA vertical.ttf + +/* @makedep: wine_longname.ttf */ +wine_longname.ttf RCDATA wine_longname.ttf diff --git a/dlls/gdi32/tests/wine_longname.sfd b/dlls/gdi32/tests/wine_longname.sfd new file mode 100644 index 0000000000..998d7cc01f --- /dev/null +++ b/dlls/gdi32/tests/wine_longname.sfd @@ -0,0 +1,66 @@ +SplineFontDB: 3.0 +FontName: wine_1_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +FullName: wine_2_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +FamilyName: wine_3_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +Weight: Regular +Copyright: Copyright (c) 2017, Fabian Maurer +UComments: "2017-11-17: Created with FontForge (http://fontforge.org)" +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: -102.4 +UnderlineWidth: 51.2 +Ascent: 819 +Descent: 205 +InvalidEm: 0 +LayerCount: 2 +Layer: 0 0 "Back" 1 +Layer: 1 0 "Fore" 0 +XUID: [1021 48 28337276 3092883] +OS2Version: 0 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 1 +CreationTime: 1510948643 +ModificationTime: 1510949092 +OS2TypoAscent: 0 +OS2TypoAOffset: 1 +OS2TypoDescent: 0 +OS2TypoDOffset: 1 +OS2TypoLinegap: 0 +OS2WinAscent: 0 +OS2WinAOffset: 1 +OS2WinDescent: 0 +OS2WinDOffset: 1 +HheadAscent: 0 +HheadAOffset: 1 +HheadDescent: 0 +HheadDOffset: 1 +OS2Vendor: 'PfEd' +MarkAttachClasses: 1 +DEI: 91125 +Encoding: ISO8859-1 +UnicodeInterp: none +NameList: AGL For New Fonts +DisplaySize: -48 +AntiAlias: 1 +FitToEm: 0 +WinInfo: 64 16 4 +BeginPrivate: 0 +EndPrivate +BeginChars: 256 1 + +StartChar: at +Encoding: 64 64 0 +Width: 1024 +VWidth: 0 +Flags: HW +LayerCount: 2 +Fore +SplineSet +259 332 m 29 + 468 664 l 29 + 514 332 l 29 + 259 332 l 29 +EndSplineSet +EndChar +EndChars +EndSplineFont diff --git a/dlls/gdi32/tests/wine_longname.ttf b/dlls/gdi32/tests/wine_longname.ttf new file mode 100644 index 0000000000000000000000000000000000000000..59d9517560592e9578f1510f99f4fb65065c1195 GIT binary patch literal 2252 zcmdT`J!~6Q9RIz$vy(ze6NyY%=$Z!6pv1io)Gv83{V*L80j0`9(dA;F&nMYF>wHP- zEn;Fof`I`fHnvbz#A0FuAu(hCArJ#BOqEKh7`jo+(a)4dUk$yy{T-ueID|MR{7*WEJ& zfGKQ4$6Bp+W96OM-;M#3pOag9^~%*6X7McP4<-HDn`fNWg1-fb7U{Km$M4}p(a)gC`) z376`dsfju5T|h5UZiIfnHyUwgOuk2YGHef;-|P-8$`?uZT7lnq=Jxy@;=dElw#X<P zGYZ^mp7eaHlioTG(a)dD{@Nl&-qx{r0-puI`@sg8fEhikY%`8CpJ*Y5=DvzvRAf5PLx z>c#zZw1cxedX4gzAY&y=efL?(J5hOvrwuZIpI(0OX}12^z#O1y+79VSXp+l88^yVq z>1&$WDU)Thp*Y5YjkFYsS4CN=7*zQHj7|Gkqlb7uTg5%Nf*IFP;G7TX=fQZrd9}g% zR8iI4k&Bzk6Xnx^iU~o_=sBZSAeeKRcLk-~+X^YUbBRhOSA&nFtE`clM_=cf5XJEU zLdGKD(a)Hpb(VZj)e$N$fV>Sgwge9ki#P3BlQtbmRQly?QrRE84<?mN51!Y`Gft`Wtq zF4+ai9!?a+UzH(Kc;9hnPR_jO&YYSP(|_#kX*-Wr=d>ob6S`Pt$9*JoES(a)9zeOWAv z<-fm>$(zER{hHt;uH?8t6?b!7!-Tky<2v3Jk8<2VRr(a)u^3z*icIbLKR{UAHRko|Uv zkl}(o*35AYQ(_^<b$lsa$#DbQ+FLnZfT=&9<3()iZ{RXw^e{kz2q9WX*=46u#{yRe z7HpiuBJmpJTO4ujl3L-qL7RYp%W-dzL}4p6PuCYr$Fk2Ynl*nt^1J4WzmWt~*`j5a z+8$g&%5x(0iDk1-Y*XzuAl9ZwUHam2_R&#R(!!^mM|$5+kN(IVQ|iY@?3$z#azZqy z?J^E*Mcu%2y|fkeJ^p-eGe`zrJMM;_`~Xqlr(Q<};jNR3<4o3!6EAE;E_b-j!$Jn# zrX!5#dJt~3eIhmGZmQOV8i7h&nW-~zkuVP3QO^F?p=Vy$d=-{hOq=t5Sy79-X)R8| zz;w!%dC^o!avncP+`>M;WZO%!2M!ng$wZzN{a?fbtg(a)U5J2g^8Hd$2pM#$pI$D~4# z^rN_IT9#e5EQ_3Rz3nGb?<{Kj(a)vF#>%l^$V+UDEC51eEj8S=ss)H<cOf_KsQc0JDj V9#YOPqq5Ab)%@daq1MB9_dm8?dc^<$ literal 0 HcmV?d00001 -- 2.15.0
Fixes Bug 43956. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/gdiplus/font.c | 38 ++++++++++-------- dlls/gdiplus/tests/Makefile.in | 2 + dlls/gdiplus/tests/font.c | 72 +++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/resource.rc | 22 +++++++++++ dlls/gdiplus/tests/wine_longname.sfd | 66 ++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/wine_longname.ttf | Bin 0 -> 2252 bytes 6 files changed, 184 insertions(+), 16 deletions(-) create mode 100644 dlls/gdiplus/tests/resource.rc create mode 100644 dlls/gdiplus/tests/wine_longname.sfd create mode 100644 dlls/gdiplus/tests/wine_longname.ttf diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index ccf93ed395..f99b026b25 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1393,33 +1393,36 @@ static int match_name_table_language( const tt_name_record *name, LANGID lang ) return 0; } -static WCHAR *copy_name_table_string( const tt_name_record *name, const BYTE *data, WCHAR *ret, DWORD len ) +static WCHAR *copy_name_table_string( const tt_name_record *name, const BYTE *data ) { WORD name_len = GET_BE_WORD(name->length); WORD codepage; + WCHAR *ret; + int len; switch (GET_BE_WORD(name->platform_id)) { case TT_PLATFORM_APPLE_UNICODE: case TT_PLATFORM_MICROSOFT: - if (name_len >= len*sizeof(WCHAR)) - return NULL; + ret = heap_alloc((name_len / 2 + 1) * sizeof(WCHAR)); for (len = 0; len < name_len / 2; len++) ret[len] = (data[len * 2] << 8) | data[len * 2 + 1]; ret[len] = 0; return ret; case TT_PLATFORM_MACINTOSH: codepage = get_mac_code_page( name ); - len = MultiByteToWideChar( codepage, 0, (char *)data, name_len, ret, len-1 ); + len = MultiByteToWideChar( codepage, 0, (char *)data, name_len, NULL, 0 ) + 1; if (!len) return NULL; + ret = heap_alloc(len * sizeof(WCHAR)); + len = MultiByteToWideChar( codepage, 0, (char *)data, name_len, ret, len - 1 ); ret[len] = 0; return ret; } return NULL; } -static WCHAR *load_ttf_name_id( const BYTE *mem, DWORD_PTR size, DWORD id, WCHAR *ret, DWORD len ) +static WCHAR *load_ttf_name_id( const BYTE *mem, DWORD_PTR size, DWORD id ) { LANGID lang = GetSystemDefaultLangID(); const tt_header *header; @@ -1480,8 +1483,9 @@ static WCHAR *load_ttf_name_id( const BYTE *mem, DWORD_PTR size, DWORD id, WCHAR if (best_lang) { + WCHAR *ret; name_record = (const tt_name_record*)(name_table + 1) + best_index; - ret = copy_name_table_string( name_record, mem+ofs+GET_BE_WORD(name_record->offset), ret, len ); + ret = copy_name_table_string( name_record, mem+ofs+GET_BE_WORD(name_record->offset) ); TRACE( "name %u found platform %u lang %04x %s\n", GET_BE_WORD(name_record->name_id), GET_BE_WORD(name_record->platform_id), GET_BE_WORD(name_record->language_id), debugstr_w( ret )); return ret; @@ -1497,43 +1501,45 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, D GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection* fontCollection, GDIPCONST void* memory, INT length) { - WCHAR buf[32], *name; + WCHAR *name; DWORD count = 0; HANDLE font; + GpStatus ret = Ok; TRACE("%p, %p, %d\n", fontCollection, memory, length); if (!fontCollection || !memory || !length) return InvalidParameter; - name = load_ttf_name_id(memory, length, NAME_ID_FULL_FONT_NAME, buf, sizeof(buf)/sizeof(*buf)); + name = load_ttf_name_id(memory, length, NAME_ID_FULL_FONT_NAME); if (!name) return OutOfMemory; font = AddFontMemResourceEx((void*)memory, length, NULL, &count); TRACE("%s: %p/%u\n", debugstr_w(name), font, count); if (!font || !count) - return InvalidParameter; - - if (count) + ret = InvalidParameter; + else { HDC hdc; LOGFONTW lfw; hdc = CreateCompatibleDC(0); + /* Truncate name if necessary, GDI32 can't deal with long names */ + if(lstrlenW(name) > LF_FACESIZE - 1) + name[LF_FACESIZE - 1] = 0; + lfw.lfCharSet = DEFAULT_CHARSET; lstrcpyW(lfw.lfFaceName, name); lfw.lfPitchAndFamily = 0; if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)fontCollection, 0)) - { - DeleteDC(hdc); - return OutOfMemory; - } + ret = OutOfMemory; DeleteDC(hdc); } - return Ok; + heap_free(name); + return ret; } /***************************************************************************** diff --git a/dlls/gdiplus/tests/Makefile.in b/dlls/gdiplus/tests/Makefile.in index f427b02b13..3e1a037889 100644 --- a/dlls/gdiplus/tests/Makefile.in +++ b/dlls/gdiplus/tests/Makefile.in @@ -14,3 +14,5 @@ C_SRCS = \ pen.c \ region.c \ stringformat.c + +RC_SRCS = resource.rc diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 2cae48192e..f7d1524bca 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -43,6 +43,74 @@ static void set_rect_empty(RectF *rc) rc->Height = 0.0; } +static WCHAR *create_testfontfile(const WCHAR *filename, int resource) +{ + static WCHAR pathW[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + lstrcatW(pathW, filename); + + file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", wine_dbgstr_w(pathW), + GetLastError()); + + res = FindResourceA(GetModuleHandleA(NULL), (LPCSTR)MAKEINTRESOURCE(resource), (LPCSTR)RT_RCDATA); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); + + return pathW; +} + +#define DELETE_FONTFILE(filename) _delete_testfontfile(filename, __LINE__) +static void _delete_testfontfile(const WCHAR *filename, int line) +{ + BOOL ret = DeleteFileW(filename); + ok_(__FILE__,line)(ret, "failed to delete file %s, error %d\n", wine_dbgstr_w(filename), GetLastError()); +} + +static void test_long_name(void) +{ + WCHAR* path; + static const WCHAR path_longname[] = {'w','i','n','e','_','l','o','n','g','n','a','m','e','.','t','t','f',0}; + GpStatus stat; + GpFontCollection *fonts; + INT num_families; + GpFontFamily *family; + WCHAR family_name[LF_FACESIZE]; + GpFont *font; + + stat = GdipNewPrivateFontCollection(&fonts); + ok(stat == Ok, "GdipNewPrivateFontCollection failed: %d\n", stat); + + path = create_testfontfile(path_longname, 1); + + stat = GdipPrivateAddFontFile(fonts, path); + ok(stat == Ok, "GdipPrivateAddFontFile failed: %d\n", stat); + + stat = GdipGetFontCollectionFamilyCount(fonts, &num_families); + ok(stat == Ok, "GdipGetFontCollectionFamilyCount failed: %d\n", stat); + + ok(num_families == 1, "expected num_families to be 1, got %d\n", num_families); + + stat = GdipGetFontCollectionFamilyList(fonts, num_families, &family, &num_families); + ok(stat == Ok, "GdipGetFontCollectionFamilyList failed: %d\n", stat); + + stat = GdipGetFamilyName(family, family_name, LANG_NEUTRAL); + ok(stat == Ok, "GdipGetFamilyName failed: %d\n", stat); + + stat = GdipCreateFont(family, 256.0, FontStyleRegular, UnitPixel, &font); + ok(stat == Ok, "GdipCreateFont failed: %d\n", stat); + + DELETE_FONTFILE(path); +} + static void test_createfont(void) { GpFontFamily* fontfamily = NULL, *fontfamily2; @@ -1129,6 +1197,10 @@ START_TEST(font) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + test_long_name(); + + return; + test_font_transform(); test_font_substitution(); test_font_metrics(); diff --git a/dlls/gdiplus/tests/resource.rc b/dlls/gdiplus/tests/resource.rc new file mode 100644 index 0000000000..d7d915ce00 --- /dev/null +++ b/dlls/gdiplus/tests/resource.rc @@ -0,0 +1,22 @@ +/* + * Resources for gdiplus test suite. + * + * Copyright 2017 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: wine_longname.ttf */ +1 RCDATA wine_longname.ttf diff --git a/dlls/gdiplus/tests/wine_longname.sfd b/dlls/gdiplus/tests/wine_longname.sfd new file mode 100644 index 0000000000..998d7cc01f --- /dev/null +++ b/dlls/gdiplus/tests/wine_longname.sfd @@ -0,0 +1,66 @@ +SplineFontDB: 3.0 +FontName: wine_1_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +FullName: wine_2_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +FamilyName: wine_3_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +Weight: Regular +Copyright: Copyright (c) 2017, Fabian Maurer +UComments: "2017-11-17: Created with FontForge (http://fontforge.org)" +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: -102.4 +UnderlineWidth: 51.2 +Ascent: 819 +Descent: 205 +InvalidEm: 0 +LayerCount: 2 +Layer: 0 0 "Back" 1 +Layer: 1 0 "Fore" 0 +XUID: [1021 48 28337276 3092883] +OS2Version: 0 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 1 +CreationTime: 1510948643 +ModificationTime: 1510949092 +OS2TypoAscent: 0 +OS2TypoAOffset: 1 +OS2TypoDescent: 0 +OS2TypoDOffset: 1 +OS2TypoLinegap: 0 +OS2WinAscent: 0 +OS2WinAOffset: 1 +OS2WinDescent: 0 +OS2WinDOffset: 1 +HheadAscent: 0 +HheadAOffset: 1 +HheadDescent: 0 +HheadDOffset: 1 +OS2Vendor: 'PfEd' +MarkAttachClasses: 1 +DEI: 91125 +Encoding: ISO8859-1 +UnicodeInterp: none +NameList: AGL For New Fonts +DisplaySize: -48 +AntiAlias: 1 +FitToEm: 0 +WinInfo: 64 16 4 +BeginPrivate: 0 +EndPrivate +BeginChars: 256 1 + +StartChar: at +Encoding: 64 64 0 +Width: 1024 +VWidth: 0 +Flags: HW +LayerCount: 2 +Fore +SplineSet +259 332 m 29 + 468 664 l 29 + 514 332 l 29 + 259 332 l 29 +EndSplineSet +EndChar +EndChars +EndSplineFont diff --git a/dlls/gdiplus/tests/wine_longname.ttf b/dlls/gdiplus/tests/wine_longname.ttf new file mode 100644 index 0000000000000000000000000000000000000000..59d9517560592e9578f1510f99f4fb65065c1195 GIT binary patch literal 2252 zcmdT`J!~6Q9RIz$vy(ze6NyY%=$Z!6pv1io)Gv83{V*L80j0`9(dA;F&nMYF>wHP- zEn;Fof`I`fHnvbz#A0FuAu(hCArJ#BOqEKh7`jo+(a)4dUk$yy{T-ueID|MR{7*WEJ& zfGKQ4$6Bp+W96OM-;M#3pOag9^~%*6X7McP4<-HDn`fNWg1-fb7U{Km$M4}p(a)gC`) z376`dsfju5T|h5UZiIfnHyUwgOuk2YGHef;-|P-8$`?uZT7lnq=Jxy@;=dElw#X<P zGYZ^mp7eaHlioTG(a)dD{@Nl&-qx{r0-puI`@sg8fEhikY%`8CpJ*Y5=DvzvRAf5PLx z>c#zZw1cxedX4gzAY&y=efL?(J5hOvrwuZIpI(0OX}12^z#O1y+79VSXp+l88^yVq z>1&$WDU)Thp*Y5YjkFYsS4CN=7*zQHj7|Gkqlb7uTg5%Nf*IFP;G7TX=fQZrd9}g% zR8iI4k&Bzk6Xnx^iU~o_=sBZSAeeKRcLk-~+X^YUbBRhOSA&nFtE`clM_=cf5XJEU zLdGKD(a)Hpb(VZj)e$N$fV>Sgwge9ki#P3BlQtbmRQly?QrRE84<?mN51!Y`Gft`Wtq zF4+ai9!?a+UzH(Kc;9hnPR_jO&YYSP(|_#kX*-Wr=d>ob6S`Pt$9*JoES(a)9zeOWAv z<-fm>$(zER{hHt;uH?8t6?b!7!-Tky<2v3Jk8<2VRr(a)u^3z*icIbLKR{UAHRko|Uv zkl}(o*35AYQ(_^<b$lsa$#DbQ+FLnZfT=&9<3()iZ{RXw^e{kz2q9WX*=46u#{yRe z7HpiuBJmpJTO4ujl3L-qL7RYp%W-dzL}4p6PuCYr$Fk2Ynl*nt^1J4WzmWt~*`j5a z+8$g&%5x(0iDk1-Y*XzuAl9ZwUHam2_R&#R(!!^mM|$5+kN(IVQ|iY@?3$z#azZqy z?J^E*Mcu%2y|fkeJ^p-eGe`zrJMM;_`~Xqlr(Q<};jNR3<4o3!6EAE;E_b-j!$Jn# zrX!5#dJt~3eIhmGZmQOV8i7h&nW-~zkuVP3QO^F?p=Vy$d=-{hOq=t5Sy79-X)R8| zz;w!%dC^o!avncP+`>M;WZO%!2M!ng$wZzN{a?fbtg(a)U5J2g^8Hd$2pM#$pI$D~4# z^rN_IT9#e5EQ_3Rz3nGb?<{Kj(a)vF#>%l^$V+UDEC51eEj8S=ss)H<cOf_KsQc0JDj V9#YOPqq5Ab)%@daq1MB9_dm8?dc^<$ literal 0 HcmV?d00001 -- 2.15.0
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=34238 Your paranoid android. === w1064 (32 bit font) === font.c:111: Test failed: failed to delete file L"C:\\Users\\winetest\\AppData\\Local\\Temp\\wine_longname.ttf", error 5 === w1064 (64 bit font) === font.c:111: Test failed: failed to delete file L"C:\\Users\\winetest\\AppData\\Local\\Temp\\wine_longname.ttf", error 5
=== w1064 (32 bit font) === font.c:111: Test failed: failed to delete file L"C:\\Users\\winetest\\AppData\\Local\\Temp\\wine_longname.ttf", error 5
=== w1064 (64 bit font) === font.c:111: Test failed: failed to delete file L"C:\\Users\\winetest\\AppData\\Local\\Temp\\wine_longname.ttf", error 5
Should I put in a sleep or something to fix that? Regards, Fabian Maurer
Fabian Maurer <dark.shadow4(a)web.de> wrote:
=== w1064 (32 bit font) === font.c:111: Test failed: failed to delete file L"C:\\Users\\winetest\\AppData\\Local\\Temp\\wine_longname.ttf", error 5
=== w1064 (64 bit font) === font.c:111: Test failed: failed to delete file L"C:\\Users\\winetest\\AppData\\Local\\Temp\\wine_longname.ttf", error 5
Should I put in a sleep or something to fix that?
A font can't be deleted if it's still being used. Make sure that all font instances are deleted and the font is unloaded. -- Dmitry.
Fabian Maurer <dark.shadow4(a)web.de> wrote:
@@ -1129,6 +1197,10 @@ START_TEST(font)
GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL);
+ test_long_name(); + + return; + test_font_transform(); test_font_substitution(); test_font_metrics();
Please remove stray 'return;'. -- Dmitry.
Thanks for the quick reply, don't know how I missed that. Sent in an updated version that also properly cleans up the font. Regards, Fabian Maurer
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=34237 Your paranoid android. === wxppro (32 bit font) === font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2811: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2811: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 === w2003std (32 bit font) === font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2811: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2811: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 === wvistau64 (32 bit font) === font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2811: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2811: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 === w2008s64 (32 bit font) === font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2811: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2811: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 === w7u (32 bit font) === font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2811: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2811: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 === w7pro64 (32 bit font) === font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2811: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2811: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 === w8 (32 bit font) === font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2811: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2811: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 === w864 (32 bit font) === font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2811: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2811: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 === w1064 (32 bit font) === font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2811: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2811: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 === wvistau64 (64 bit font) === font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2811: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2811: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 === w2008s64 (64 bit font) === font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2811: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2811: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 === w7pro64 (64 bit font) === font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2811: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2811: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 === w864 (64 bit font) === font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2811: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2811: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 === w1064 (64 bit font) === font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2811: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2811: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024 font.c:2785: Test failed: ntmCellHeight 682 should be close to ntmSizeEM 1024
On 11/18/2017 06:06 PM, Fabian Maurer wrote:
+static BOOL found_font; +static INT CALLBACK long_enum_proc(const LOGFONTA *lf, const TEXTMETRICA *tm, DWORD type, LPARAM lparam) +{ + found_font = TRUE; + return 1; +} You don't need global variable for that.
+static void test_long_names(void) +{ + char ttf_name[MAX_PATH]; + LOGFONTA font = {0}; + HFONT handle_font; + int ret; + + if (!pAddFontResourceExA || !pRemoveFontResourceExA) + { + win_skip("AddFontResourceExA is not available on this platform\n"); + return; + } I don't think this is necessary any more, we should use them directly now, and assume they are always available. + + if (!write_ttf_file("wine_longname.ttf", ttf_name)) + { + skip("Failed to create ttf file for testing\n"); + return; + } + + ret = pAddFontResourceExA(ttf_name, FR_PRIVATE, 0); + ok(ret, "AddFontResourceEx() failed\n"); + + strcpy(font.lfFaceName, "wine_3_this_is_a_very_long_name"); + found_font = FALSE; + EnumFontFamiliesExA(GetDC(0), &font, long_enum_proc, 0, 0); + ok(found_font == TRUE, "EnumFontFamiliesExA didn't find font.\n"); + + strcpy(font.lfFaceName, "wine_2_this_is_a_very_long_name"); + found_font = FALSE; + EnumFontFamiliesExA(GetDC(0), &font, long_enum_proc, 0, 0); + ok(found_font == TRUE, "EnumFontFamiliesExA didn't find font.\n"); I think it's better to release dc properly. + + handle_font = CreateFontIndirectA(&font); + ok(handle_font != NULL, "CreateFontIndirectA failed\n"); + DeleteObject(handle_font); + + + ret = pRemoveFontResourceExA(ttf_name, 0, 0); + ok(!ret, "RemoveFontResourceEx() should fail\n"); + + DeleteFileA(ttf_name); +} Also note that this test does cause additional test failures in existing tests.
On 18.11.2017 21:37, Fabian Maurer wrote:
Hi Nikolay,
thanks, I'll rewrite that.
Also note that this test does cause additional test failures in
existing tests.
I don't quite understand why, mind explaining?
Is it enough if I just move the tests at the end, so it's executed last?
I don't know why, but that's something to resolve.
Regards,
Fabian Maurer
participants (4)
-
Dmitry Timoshkov -
Fabian Maurer -
Marvin -
Nikolay Sivov