September 2020 - Wine-commits

Alexandre Julliard : libwine: Make the remaining configuration functions obsolete.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: wine Branch: master Commit: 595f2846b2064a6ebeb0b02133e2d68851fb1c06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=595f2846b2064a6ebeb0b021… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 8 10:10:48 2020 +0200 libwine: Make the remaining configuration functions obsolete. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/Makefile.in | 8 -------- libs/wine/config.c | 44 +++++++++++++++++++++++--------------------- libs/wine/wine.map | 6 +++--- 3 files changed, 26 insertions(+), 32 deletions(-) diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index fe2a2b45e5..6bb27e34dc 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -84,8 +84,6 @@ C_SRCS = \ utf8.c \ wctomb.c -EXTRA_OBJS = version.o - config_EXTRADEFS = \ -DBINDIR='"${bindir}"' \ -DDLLDIR='"${dlldir}"' \ @@ -98,9 +96,3 @@ SHAREDLIB = $(LIBWINE_SHAREDLIB) libwine_LDFLAGS = $(LIBWINE_LDFLAGS) libwine_DEPS = $(LIBWINE_DEPENDS) - -version.c: dummy - version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/$.*$/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1) - -dummy: -.PHONY: dummy diff --git a/libs/wine/config.c b/libs/wine/config.c index f46ed4df08..6d4ecb95ae 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -92,14 +92,6 @@ static char *xstrdup( const char *str ) return res; } -/* check if a string ends in a given substring */ -static inline int strendswith( const char* str, const char* end ) -{ - size_t len = strlen( str ); - size_t tail = strlen( end ); - return len >= tail && !strcmp( str + len - tail, end ); -} - /* build a path from the specified dir and name */ static char *build_path( const char *dir, const char *name ) { @@ -348,6 +340,14 @@ static char *config_dir; static char *server_dir; static char *user_name; +/* check if a string ends in a given substring */ +static inline int strendswith( const char* str, const char* end ) +{ + size_t len = strlen( str ); + size_t tail = strlen( end ); + return len >= tail && !strcmp( str + len - tail, end ); +} + /* remove all trailing slashes from a path name */ static inline void remove_trailing_slashes( char *path ) { @@ -500,25 +500,16 @@ const char *wine_get_user_name_obsolete(void) return user_name; } -__ASM_OBSOLETE(wine_get_build_dir); -__ASM_OBSOLETE(wine_get_config_dir); -__ASM_OBSOLETE(wine_get_data_dir); -__ASM_OBSOLETE(wine_get_server_dir); -__ASM_OBSOLETE(wine_get_user_name); - -#endif /* __ASM_OBSOLETE */ - /* return the standard version string */ -const char *wine_get_version(void) +const char *wine_get_version_obsolete(void) { return PACKAGE_VERSION; } /* return the build id string */ -const char *wine_get_build_id(void) +const char *wine_get_build_id_obsolete(void) { - extern const char wine_build[]; - return wine_build; + return PACKAGE_VERSION; } /* exec a binary using the preloader if requested; helper for wine_exec_wine_binary */ @@ -563,7 +554,7 @@ static void preloader_exec( char **argv, int use_preloader ) } /* exec a wine internal binary (either the wine loader or the wine server) */ -void wine_exec_wine_binary( const char *name, char **argv, const char *env_var ) +void wine_exec_wine_binary_obsolete( const char *name, char **argv, const char *env_var ) { const char *path, *pos, *ptr; int use_preloader; @@ -630,3 +621,14 @@ void wine_exec_wine_binary( const char *name, char **argv, const char *env_var ) preloader_exec( argv, use_preloader ); free( argv[0] ); } + +__ASM_OBSOLETE(wine_get_build_dir); +__ASM_OBSOLETE(wine_get_build_id); +__ASM_OBSOLETE(wine_get_config_dir); +__ASM_OBSOLETE(wine_get_data_dir); +__ASM_OBSOLETE(wine_get_server_dir); +__ASM_OBSOLETE(wine_get_user_name); +__ASM_OBSOLETE(wine_get_version); +__ASM_OBSOLETE(wine_exec_wine_binary); + +#endif /* __ASM_OBSOLETE */ diff --git a/libs/wine/wine.map b/libs/wine/wine.map index 1143b12973..192bf4bd46 100644 --- a/libs/wine/wine.map +++ b/libs/wine/wine.map @@ -10,9 +10,6 @@ WINE_1.0 wine_casemap_lower; wine_casemap_upper; wine_dll_set_callback; - wine_exec_wine_binary; - wine_get_build_id; - wine_get_version; wine_init; wine_init_argv0_path; wine_mmap_add_reserved_area; @@ -87,8 +84,10 @@ WINE_1.0 wine_dll_unload; wine_dlopen; wine_dlsym; + wine_exec_wine_binary; wine_fold_string; wine_get_build_dir; + wine_get_build_id; wine_get_config_dir; wine_get_cs; wine_get_data_dir; @@ -100,6 +99,7 @@ WINE_1.0 wine_get_sortkey; wine_get_ss; wine_get_user_name; + wine_get_version; wine_is_dbcs_leadbyte; wine_ldt_alloc_entries; wine_ldt_alloc_fs;

1 0

Rémi Bernon : gdi32/tests: Test extended TTF font names and collisions.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: wine Branch: master Commit: afc857436a424f48c029826dd050e325ff408925 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afc857436a424f48c029826d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 7 15:18:53 2020 +0200 gdi32/tests: Test extended TTF font names and collisions. This shows that although Windows is only matching family names up to LF_FACESIZE chars, and that it doesn't match against the preferred / typographic family names and styles, it still keeps the faces separate when the full names don't match. Wine incorrectly discard one of them. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/Makefile.in | 2 + dlls/gdi32/tests/font.c | 71 ++++++++++++++++++++++++++ dlls/gdi32/tests/resource.rc | 6 +++ dlls/gdi32/tests/wine_ttfnames.sfd | 85 ++++++++++++++++++++++++++++++++ dlls/gdi32/tests/wine_ttfnames.ttf | Bin 0 -> 2232 bytes dlls/gdi32/tests/wine_ttfnames_bold.sfd | 85 ++++++++++++++++++++++++++++++++ dlls/gdi32/tests/wine_ttfnames_bold.ttf | Bin 0 -> 2272 bytes 7 files changed, 249 insertions(+) diff --git a/dlls/gdi32/tests/Makefile.in b/dlls/gdi32/tests/Makefile.in index 9d82c278e9..8b722cfe5d 100644 --- a/dlls/gdi32/tests/Makefile.in +++ b/dlls/gdi32/tests/Makefile.in @@ -22,6 +22,8 @@ FONT_SRCS = \ vertical.sfd \ wine_longname.sfd \ wine_test.sfd \ + wine_ttfnames.sfd \ + wine_ttfnames_bold.sfd \ wine_vdmx.sfd RC_SRCS = resource.rc diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ad894dfdca..b1848a4374 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6940,6 +6940,76 @@ static void test_long_names(void) ReleaseDC(NULL, dc); } +static void test_ttf_names(void) +{ + struct enum_fullname_data efnd; + char ttf_name[MAX_PATH], ttf_name_bold[MAX_PATH]; + LOGFONTA font = {0}; + HFONT handle_font; + int ret; + HDC dc; + + if (!write_ttf_file("wine_ttfnames.ttf", ttf_name)) + { + skip("Failed to create ttf file for testing\n"); + return; + } + + if (!write_ttf_file("wine_ttfnames_bold.ttf", ttf_name_bold)) + { + skip("Failed to create ttf file for testing\n"); + DeleteFileA(ttf_name); + return; + } + + ret = AddFontResourceExA(ttf_name, FR_PRIVATE, 0); + ok(ret, "AddFontResourceEx() failed\n"); + + ret = AddFontResourceExA(ttf_name_bold, FR_PRIVATE, 0); + ok(ret, "AddFontResourceEx() failed\n"); + + dc = GetDC(NULL); + + strcpy(font.lfFaceName, "Wine_TTF_Names_Long_Family1_Con"); + memset(&efnd, 0, sizeof(efnd)); + EnumFontFamiliesExA(dc, &font, enum_fullname_data_proc, (LPARAM)&efnd, 0); + ok(efnd.total == 0, "EnumFontFamiliesExA must not find font.\n"); + + /* Windows doesn't match with Typographic/Preferred Family tags */ + strcpy(font.lfFaceName, "Wine TTF Names Long Family1"); + memset(&efnd, 0, sizeof(efnd)); + EnumFontFamiliesExA(dc, &font, enum_fullname_data_proc, (LPARAM)&efnd, 0); + ok(efnd.total == 0, "EnumFontFamiliesExA must not find font.\n"); + + strcpy(font.lfFaceName, "Wine TTF Names Long Family1 Ext"); + memset(&efnd, 0, sizeof(efnd)); + EnumFontFamiliesExA(dc, &font, enum_fullname_data_proc, (LPARAM)&efnd, 0); + todo_wine + ok(efnd.total == 2, "EnumFontFamiliesExA found %d fonts, expected 2.\n", efnd.total); + + strcpy(font.lfFaceName, "Wine TTF Names Long Family1 Con"); + memset(&efnd, 0, sizeof(efnd)); + EnumFontFamiliesExA(dc, &font, enum_fullname_data_proc, (LPARAM)&efnd, 0); + todo_wine + ok(efnd.total == 2, "EnumFontFamiliesExA found %d fonts, expected 2.\n", efnd.total); + + handle_font = CreateFontIndirectA(&font); + ok(handle_font != NULL, "CreateFontIndirectA failed\n"); + DeleteObject(handle_font); + + ret = RemoveFontResourceExA(ttf_name_bold, FR_PRIVATE, 0); + todo_wine + ok(ret, "RemoveFontResourceEx() failed\n"); + + DeleteFileA(ttf_name_bold); + + ret = RemoveFontResourceExA(ttf_name, FR_PRIVATE, 0); + ok(ret, "RemoveFontResourceEx() failed\n"); + + DeleteFileA(ttf_name); + ReleaseDC(NULL, dc); +} + typedef struct { USHORT majorVersion; @@ -7351,6 +7421,7 @@ START_TEST(font) test_bitmap_font_glyph_index(); test_GetCharWidthI(); test_long_names(); + test_ttf_names(); test_char_width(); /* These tests should be last test until RemoveFontResource diff --git a/dlls/gdi32/tests/resource.rc b/dlls/gdi32/tests/resource.rc index 6dcbd42ab5..b5a6107a98 100644 --- a/dlls/gdi32/tests/resource.rc +++ b/dlls/gdi32/tests/resource.rc @@ -31,3 +31,9 @@ vertical.ttf RCDATA vertical.ttf /* @makedep: wine_longname.ttf */ wine_longname.ttf RCDATA wine_longname.ttf + +/* @makedep: wine_ttfnames.ttf */ +wine_ttfnames.ttf RCDATA wine_ttfnames.ttf + +/* @makedep: wine_ttfnames_bold.ttf */ +wine_ttfnames_bold.ttf RCDATA wine_ttfnames_bold.ttf diff --git a/dlls/gdi32/tests/wine_ttfnames.sfd b/dlls/gdi32/tests/wine_ttfnames.sfd new file mode 100644 index 0000000000..566749d19a --- /dev/null +++ b/dlls/gdi32/tests/wine_ttfnames.sfd @@ -0,0 +1,85 @@ +SplineFontDB: 3.2 +FontName: Wine_TTF_Names_Long_Family1_Cond_Regular +FamilyName: Wine_TTF_Names_Long_Family1_Cond +Weight: Regular +Copyright: Copyright (c) 2020, Remi Bernon for CodeWeavers +UComments: "2017-11-17: Created with FontForge (http://fontforge.org)" +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: -102 +UnderlineWidth: 51 +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: 1598865292 +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 +LangName: 1033 \ + "" \ + "Wine TTF Names Long Family1 Cond" \ + "Regular" \ + "" \ + "Wine TTF Names Long Family1 Extremely Long Full Name Condensed" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "Wine TTF Names Long Family1" \ + "Condensed Regular" \ + +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_ttfnames.ttf b/dlls/gdi32/tests/wine_ttfnames.ttf new file mode 100644 index 0000000000..2eb2ad1f95 Binary files /dev/null and b/dlls/gdi32/tests/wine_ttfnames.ttf differ diff --git a/dlls/gdi32/tests/wine_ttfnames_bold.sfd b/dlls/gdi32/tests/wine_ttfnames_bold.sfd new file mode 100644 index 0000000000..b3bf4ddfe9 --- /dev/null +++ b/dlls/gdi32/tests/wine_ttfnames_bold.sfd @@ -0,0 +1,85 @@ +SplineFontDB: 3.2 +FontName: Wine_TTF_Names_Long_Family1_Cond_Regular +FamilyName: Wine_TTF_Names_Long_Family1_Cond +Weight: Regular +Copyright: Copyright (c) 2020, Remi Bernon for CodeWeavers +UComments: "2017-11-17: Created with FontForge (http://fontforge.org)" +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: -102 +UnderlineWidth: 51 +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: 1598865292 +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 +LangName: 1033 \ + "" \ + "Wine TTF Names Long Family1 CondBold" \ + "Regular" \ + "" \ + "Wine TTF Names Long Family1 Extremely Long Full Name Condensed Bold" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + "Wine TTF Names Long Family1" \ + "Condensed Bold Regular" \ + +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_ttfnames_bold.ttf b/dlls/gdi32/tests/wine_ttfnames_bold.ttf new file mode 100644 index 0000000000..919a5ea131 Binary files /dev/null and b/dlls/gdi32/tests/wine_ttfnames_bold.ttf differ

1 0

Rémi Bernon : gdi32: Introduce ft_face_get_family/style_name helpers.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: wine Branch: master Commit: 01d82af4a3714702394fa7f4dd74f8ae593799b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01d82af4a3714702394fa7f4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 7 15:18:54 2020 +0200 gdi32: Introduce ft_face_get_family/style_name helpers. And use them directly instead of get_family_names. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 81 ++++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 38d59e3fd9..af1473a62b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1482,6 +1482,26 @@ static WCHAR *get_face_name(FT_Face ft_face, FT_UShort name_id, LANGID language_ return NULL; } +static WCHAR *ft_face_get_family_name( FT_Face ft_face, LANGID langid ) +{ + WCHAR *family_name; + + if ((family_name = get_face_name( ft_face, TT_NAME_ID_FONT_FAMILY, langid ))) + return family_name; + + return towstr( CP_ACP, ft_face->family_name ); +} + +static WCHAR *ft_face_get_style_name( FT_Face ft_face, LANGID langid ) +{ + WCHAR *style_name; + + if ((style_name = get_face_name( ft_face, TT_NAME_ID_FONT_SUBFAMILY, langid ))) + return style_name; + + return towstr( CP_ACP, ft_face->style_name ); +} + static inline BOOL faces_equal( const Face *f1, const Face *f2 ) { if (strcmpiW( f1->StyleName, f2->StyleName )) return FALSE; @@ -1905,55 +1925,44 @@ static WCHAR *prepend_at(WCHAR *family) return str; } -static void get_family_names( FT_Face ft_face, WCHAR **name, WCHAR **english, BOOL vertical ) +static Family *get_family( FT_Face ft_face, BOOL vertical ) { - *english = get_face_name( ft_face, TT_NAME_ID_FONT_FAMILY, MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT) ); - if (!*english) *english = towstr( CP_ACP, ft_face->family_name ); + Family *family; + WCHAR *family_name, *english_name; - *name = get_face_name( ft_face, TT_NAME_ID_FONT_FAMILY, GetSystemDefaultLCID() ); - if (!*name) - { - *name = *english; - *english = NULL; - } - else if (!strcmpiW( *name, *english )) + family_name = ft_face_get_family_name( ft_face, GetSystemDefaultLCID() ); + english_name = ft_face_get_family_name( ft_face, MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT) ); + + if (!strcmpiW( family_name, english_name )) { - HeapFree( GetProcessHeap(), 0, *english ); - *english = NULL; + HeapFree( GetProcessHeap(), 0, english_name ); + english_name = NULL; } if (vertical) { - *name = prepend_at( *name ); - *english = prepend_at( *english ); + family_name = prepend_at( family_name ); + english_name = prepend_at( english_name ); } -} - -static Family *get_family( FT_Face ft_face, BOOL vertical ) -{ - Family *family; - WCHAR *name, *english_name; - - get_family_names( ft_face, &name, &english_name, vertical ); - family = find_family_from_name( name ); + family = find_family_from_name( family_name ); if (!family) { - family = create_family( name, english_name ); + family = create_family( family_name, english_name ); if (english_name) { FontSubst *subst = HeapAlloc( GetProcessHeap(), 0, sizeof(*subst) ); subst->from.name = strdupW( english_name ); subst->from.charset = -1; - subst->to.name = strdupW( name ); + subst->to.name = strdupW( family_name ); subst->to.charset = -1; add_font_subst( &font_subst_list, subst, 0 ); } } else { - HeapFree( GetProcessHeap(), 0, name ); + HeapFree( GetProcessHeap(), 0, family_name ); HeapFree( GetProcessHeap(), 0, english_name ); family->refcount++; } @@ -2088,9 +2097,7 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, Face *face = HeapAlloc( GetProcessHeap(), 0, sizeof(*face) ); face->refcount = 1; - face->StyleName = get_face_name( ft_face, TT_NAME_ID_FONT_SUBFAMILY, GetSystemDefaultLangID() ); - if (!face->StyleName) face->StyleName = towstr( CP_ACP, ft_face->style_name ); - + face->StyleName = ft_face_get_style_name( ft_face, GetSystemDefaultLangID() ); face->FullName = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, GetSystemDefaultLangID() ); if (flags & ADDFONT_VERTICAL_FONT) face->FullName = prepend_at( face->FullName ); @@ -3498,20 +3505,19 @@ static BOOL get_fontdir( const char *unix_name, struct fontdir *fd ) { FT_Face ft_face = new_ft_face( unix_name, NULL, 0, 0, FALSE ); Face *face; - WCHAR *name, *english_name; + WCHAR *family_name; ENUMLOGFONTEXW elf; NEWTEXTMETRICEXW ntm; DWORD type; if (!ft_face) return FALSE; face = create_face( ft_face, 0, unix_name, NULL, 0, 0 ); - get_family_names( ft_face, &name, &english_name, FALSE ); + family_name = ft_face_get_family_name( ft_face, GetSystemDefaultLCID() ); pFT_Done_Face( ft_face ); - GetEnumStructs( face, name, &elf, &ntm, &type ); + GetEnumStructs( face, family_name, &elf, &ntm, &type ); release_face( face ); - HeapFree( GetProcessHeap(), 0, name ); - HeapFree( GetProcessHeap(), 0, english_name ); + HeapFree( GetProcessHeap(), 0, family_name ); if ((type & TRUETYPE_FONTTYPE) == 0) return FALSE; @@ -7955,12 +7961,7 @@ static BOOL get_outline_text_metrics(GdiFont *font) lenfam = (strlenW(font->name) + 1) * sizeof(WCHAR); family_nameW = strdupW(font->name); - style_nameW = get_face_name( ft_face, TT_NAME_ID_FONT_SUBFAMILY, GetSystemDefaultLangID() ); - if (!style_nameW) - { - FIXME("failed to read style_nameW for font %s!\n", wine_dbgstr_w(font->name)); - style_nameW = towstr( CP_ACP, ft_face->style_name ); - } + style_nameW = ft_face_get_style_name( ft_face, GetSystemDefaultLangID() ); lensty = (strlenW(style_nameW) + 1) * sizeof(WCHAR); face_nameW = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, GetSystemDefaultLangID() );

1 0

Rémi Bernon : gdi32: Rewrite prepend_at helper as get_vertical_name.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: wine Branch: master Commit: cc6951574a84e671d741497e8d52281bef0899e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc6951574a84e671d741497e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 7 15:18:55 2020 +0200 gdi32: Rewrite prepend_at helper as get_vertical_name. And only prepend '@'' if it's not already there. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index af1473a62b..678196cc5d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1911,18 +1911,17 @@ static void remove_face_from_cache( Face *face ) RegCloseKey(hkey_family); } -static WCHAR *prepend_at(WCHAR *family) +static WCHAR *get_vertical_name( WCHAR *name ) { - WCHAR *str; + SIZE_T length; + if (!name) return NULL; + if (name[0] == '@') return name; - if (!family) - return NULL; - - str = HeapAlloc(GetProcessHeap(), 0, sizeof (WCHAR) * (strlenW(family) + 2)); - str[0] = '@'; - strcpyW(str + 1, family); - HeapFree(GetProcessHeap(), 0, family); - return str; + length = strlenW( name ) + 1; + name = HeapReAlloc( GetProcessHeap(), 0, name, (length + 1) * sizeof(WCHAR) ); + memmove( name + 1, name, length * sizeof(WCHAR) ); + name[0] = '@'; + return name; } static Family *get_family( FT_Face ft_face, BOOL vertical ) @@ -1941,8 +1940,8 @@ static Family *get_family( FT_Face ft_face, BOOL vertical ) if (vertical) { - family_name = prepend_at( family_name ); - english_name = prepend_at( english_name ); + family_name = get_vertical_name( family_name ); + english_name = get_vertical_name( english_name ); } family = find_family_from_name( family_name ); @@ -2099,8 +2098,7 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, face->refcount = 1; face->StyleName = ft_face_get_style_name( ft_face, GetSystemDefaultLangID() ); face->FullName = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, GetSystemDefaultLangID() ); - if (flags & ADDFONT_VERTICAL_FONT) - face->FullName = prepend_at( face->FullName ); + if (flags & ADDFONT_VERTICAL_FONT) face->FullName = get_vertical_name( face->FullName ); face->dev = 0; face->ino = 0; @@ -2378,10 +2376,10 @@ static BOOL map_vertical_font_family(const WCHAR *orig, const WCHAR *repl, const if (!face || !(face->fs.fsCsb[0] & FS_DBCS_MASK)) return FALSE; - at_orig = prepend_at(strdupW(orig)); + at_orig = get_vertical_name( strdupW( orig ) ); if (at_orig && !find_family_from_any_name(at_orig)) { - at_repl = prepend_at(strdupW(repl)); + at_repl = get_vertical_name( strdupW( repl ) ); if (at_repl) ret = map_font_family(at_orig, at_repl); } @@ -7970,7 +7968,7 @@ static BOOL get_outline_text_metrics(GdiFont *font) FIXME("failed to read face_nameW for font %s!\n", wine_dbgstr_w(font->name)); face_nameW = strdupW(font->name); } - if (font->name[0] == '@') face_nameW = prepend_at( face_nameW ); + if (font->name[0] == '@') face_nameW = get_vertical_name( face_nameW ); lenface = (strlenW(face_nameW) + 1) * sizeof(WCHAR); full_nameW = get_face_name( ft_face, TT_NAME_ID_UNIQUE_ID, GetSystemDefaultLangID() );

1 0

Rémi Bernon : gdi32: Build full name from family + style when missing.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: wine Branch: master Commit: f360057e2f99613441ea11a7e2de45ea70dff25b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f360057e2f99613441ea11a7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 7 15:18:56 2020 +0200 gdi32: Build full name from family + style when missing. Also add full name in TRACE messages. The gdi32 family not always matches the real font family, as we match only LF_FACESIZE chars, so it could make traces confusing. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 108 ++++++++++++++++++++++++++------------------------ 1 file changed, 57 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f360057e2f99613441ea…

1 0

Robert Wilhelm : vbscript: Colon used in for loop.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: wine Branch: master Commit: 5adbabe90c255f925738f8cec6c52d57a1feaeb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5adbabe90c255f925738f8ce… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Mon Sep 7 21:46:38 2020 +0200 vbscript: Colon used in for loop. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35782 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 4 ++-- dlls/vbscript/tests/lang.vbs | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 71bea72b1b..80f8699bd8 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -178,8 +178,8 @@ StatementsNl_opt | StatementsNl { $$ = $1; } StatementsNl - : StatementNl { $$ = $1; } - | StatementNl StatementsNl { $$ = link_statements($1, $2); } + : SimpleStatement StSep { $$ = $1; } + | SimpleStatement StSep StatementsNl { $$ = link_statements($1, $3); } StatementNl : Statement tNL { $$ = $1; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 94e2bbd436..0d752121b2 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -345,6 +345,10 @@ while empty ok false, "while empty executed" wend +x = 0 +WHILE x < 3 : x = x + 1 : Wend +Call ok(x = 3, "x not equal to 3") + x = 0 WHILE x < 3 : x = x + 1 Wend @@ -370,6 +374,8 @@ call ok((x and y), "x or y is false after while") do while false loop +do while false : loop + do while true exit do ok false, "exit do didn't work" @@ -380,6 +386,10 @@ Do While x < 2 : x = x + 1 Loop Call ok(x = 2, "x not equal to 2") +x = 0 +Do While x < 2 : x = x + 1: Loop +Call ok(x = 2, "x not equal to 2") + x = 0 Do While x >= -2 : x = x - 1 @@ -409,6 +419,10 @@ Do: :: x = x + 2 Loop Until x = 4 Call ok(x = 4, "x not equal to 4") +x = 0 +Do: :: x = x + 2 ::: : Loop Until x = 4 +Call ok(x = 4, "x not equal to 4") + x = 5 Do: : @@ -542,6 +556,16 @@ for x = 1 to 5 : Call ok(false, "exit for not escaped the loop?") next +dim a1(8) +a1(6)=8 +for x=1 to 8:a1(x)=x-1:next +Call ok(a1(6) = 5, "colon used in for loop") + +a1(6)=8 +for x=1 to 8:y=1 +a1(x)=x-2:next +Call ok(a1(6) = 4, "colon used in for loop") + do while true for x = 1 to 100 exit do @@ -574,6 +598,15 @@ Call ok(y = 3, "y = " & y) Call ok(z = 6, "z = " & z) Call ok(getVT(x) = "VT_EMPTY*", "getVT(x) = " & getVT(x)) +Call collectionObj.reset() +y = 0 +x = 10 +z = 0 +for each x in collectionObj : z = z + 2 : y = y+1 :: +Call ok(x = y, "x <> y") : next +Call ok(y = 3, "y = " & y) +Call ok(z = 6, "z = " & z) + Call collectionObj.reset() y = false for each x in collectionObj

1 0

Isabella Bosia : build: Stop ignoring the vkd3d-compiler directory.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: vkd3d Branch: master Commit: ff7a7bf411639e4573e5180d68955899a4dc8a64 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ff7a7bf411639e4573e5180… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Fri Sep 4 10:41:34 2020 +0100 build: Stop ignoring the vkd3d-compiler directory. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 51cba31..63a9ffc 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ libtool Makefile Makefile.in test-suite.log -vkd3d-compiler +/vkd3d-compiler vkd3d-*.tar.xz

1 0

Henri Verbeet : vkd3d-shader: Add some TRACEs.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: vkd3d Branch: master Commit: a10ecbc289138ccc604cc5842129f1b3cd6081f4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a10ecbc289138ccc604cc58… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 4 20:49:14 2020 +0430 vkd3d-shader: Add some TRACEs. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 6984843..16d895f 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -294,6 +294,8 @@ static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_ void vkd3d_shader_free_messages(char *messages) { + TRACE("messages %p.\n", messages); + vkd3d_free(messages); } @@ -912,11 +914,15 @@ done: void vkd3d_shader_free_scan_descriptor_info(struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info) { + TRACE("scan_descriptor_info %p.\n", scan_descriptor_info); + vkd3d_free(scan_descriptor_info->descriptors); } void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *shader_code) { + TRACE("shader_code %p.\n", shader_code); + vkd3d_free((void *)shader_code->code); } @@ -956,6 +962,8 @@ static void vkd3d_shader_free_root_signature_v_1_1(struct vkd3d_shader_root_sign void vkd3d_shader_free_root_signature(struct vkd3d_shader_versioned_root_signature_desc *desc) { + TRACE("desc %p.\n", desc); + if (desc->version == VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_0) { vkd3d_shader_free_root_signature_v_1_0(&desc->u.v_1_0);

1 0

Henri Verbeet : vkd3d-shader: Enable the corresponding capabilities when using the clip/cull distance built-ins.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: vkd3d Branch: master Commit: 56b042d1faa7bcdc6e34e6eb47e38790b262a283 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=56b042d1faa7bcdc6e34e6e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 4 20:49:15 2020 +0430 vkd3d-shader: Enable the corresponding capabilities when using the clip/cull distance built-ins. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 913b017..cc87a87 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3628,6 +3628,12 @@ static void vkd3d_dxbc_compiler_decorate_builtin(struct vkd3d_dxbc_compiler *com case SpvBuiltInSampleId: vkd3d_spirv_enable_capability(builder, SpvCapabilitySampleRateShading); break; + case SpvBuiltInClipDistance: + vkd3d_spirv_enable_capability(builder, SpvCapabilityClipDistance); + break; + case SpvBuiltInCullDistance: + vkd3d_spirv_enable_capability(builder, SpvCapabilityCullDistance); + break; default: break; }

1 0

Henri Verbeet : vkd3d-shader: Do not use built-ins for hull shader clip/cull distance built-ins.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: vkd3d Branch: master Commit: e339cc0edb953ab486e537e1acee0e94ba876faf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e339cc0edb953ab486e537e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 4 20:49:16 2020 +0430 vkd3d-shader: Do not use built-ins for hull shader clip/cull distance built-ins. We need these to be per-vertex. This fixes the Wine d3d11 test_clip_distance() test. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index cc87a87..9a6b632 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5046,9 +5046,11 @@ static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_comp } if (compiler->shader_type != VKD3D_SHADER_TYPE_HULL) + { vkd3d_spirv_builder_begin_main_function(builder); - vkd3d_dxbc_compiler_emit_shader_signature_outputs(compiler); + vkd3d_dxbc_compiler_emit_shader_signature_outputs(compiler); + } } static size_t vkd3d_dxbc_compiler_get_current_function_location(struct vkd3d_dxbc_compiler *compiler)

1 0