November 2020 - Wine-commits

Alexandre Julliard : gdi32: Move the remove_font() function out of freetype.c.
by Alexandre Julliard 04 Nov '20

04 Nov '20

Module: wine Branch: master Commit: 6c5dc58a82fbf923f3e8d10801642b280a4050c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c5dc58a82fbf923f3e8d108… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 4 09:12:24 2020 +0100 gdi32: Move the remove_font() function out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 44 ++++++++++++++++++++++++++++++++------------ dlls/gdi32/freetype.c | 29 ----------------------------- dlls/gdi32/gdi_private.h | 3 --- 3 files changed, 32 insertions(+), 44 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 6369ffeb7b4..ef552bfc896 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -574,7 +574,7 @@ static struct gdi_font_family *create_family( const WCHAR *name, const WCHAR *se return family; } -void release_family( struct gdi_font_family *family ) +static void release_family( struct gdi_font_family *family ) { if (--family->refcount) return; assert( list_empty( &family->faces )); @@ -754,7 +754,7 @@ static void reorder_font_list(void) default_sans = set_default_family( default_sans_list ); } -void release_face( struct gdi_font_face *face ) +static void release_face( struct gdi_font_face *face ) { if (--face->refcount) return; if (face->family) @@ -770,6 +770,33 @@ void release_face( struct gdi_font_face *face ) HeapFree( GetProcessHeap(), 0, face ); } +static int remove_font( const WCHAR *file, DWORD flags ) +{ + struct gdi_font_family *family, *family_next; + struct gdi_font_face *face, *face_next; + int count = 0; + + EnterCriticalSection( &font_cs ); + LIST_FOR_EACH_ENTRY_SAFE( family, family_next, &font_list, struct gdi_font_family, entry ) + { + family->refcount++; + LIST_FOR_EACH_ENTRY_SAFE( face, face_next, &family->faces, struct gdi_font_face, entry ) + { + if (!face->file) continue; + if (LOWORD(face->flags) != LOWORD(flags)) continue; + if (!strcmpiW( face->file, file )) + { + TRACE( "removing matching face %s refcount %d\n", debugstr_w(face->file), face->refcount ); + release_face( face ); + count++; + } + } + release_family( family ); + } + LeaveCriticalSection( &font_cs ); + return count; +} + static inline BOOL faces_equal( const struct gdi_font_face *f1, const struct gdi_font_face *f2 ) { if (strcmpiW( f1->full_name, f2->full_name )) return FALSE; @@ -7351,15 +7378,10 @@ static BOOL remove_system_font_resource( LPCWSTR file, DWORD flags ) int ret; get_fonts_win_dir_path( file, path ); - EnterCriticalSection( &font_cs ); - ret = font_funcs->remove_font( path, flags ); - LeaveCriticalSection( &font_cs ); - if (!ret) + if (!(ret = remove_font( path, flags ))) { get_fonts_data_dir_path( file, path ); - EnterCriticalSection( &font_cs ); - ret = font_funcs->remove_font( path, flags ); - LeaveCriticalSection( &font_cs ); + ret = remove_font( path, flags ); } return ret; } @@ -7395,9 +7417,7 @@ static BOOL remove_font_resource( LPCWSTR file, DWORD flags ) DWORD addfont_flags = ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE; if (!(flags & FR_PRIVATE)) addfont_flags |= ADDFONT_ADD_TO_CACHE; - EnterCriticalSection( &font_cs ); - ret = font_funcs->remove_font( path, addfont_flags ); - LeaveCriticalSection( &font_cs ); + ret = remove_font( path, addfont_flags ); } if (!ret && !strchrW( file, '\\' )) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 755f1286eda..83fe76115ef 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1178,34 +1178,6 @@ static INT CDECL freetype_add_mem_font( void *ptr, SIZE_T size, DWORD flags ) return AddFontToList( NULL, NULL, ptr, size, flags ); } -/************************************************************* - * freetype_remove_font - */ -static INT CDECL freetype_remove_font( const WCHAR *file, DWORD flags ) -{ - Family *family, *family_next; - Face *face, *face_next; - int count = 0; - - LIST_FOR_EACH_ENTRY_SAFE( family, family_next, &font_list, Family, entry ) - { - family->refcount++; - LIST_FOR_EACH_ENTRY_SAFE( face, face_next, &family->faces, Face, entry ) - { - if (!face->file) continue; - if (LOWORD(face->flags) != LOWORD(flags)) continue; - if (!strcmpiW( face->file, file )) - { - TRACE( "removing matching face %s refcount %d\n", debugstr_w(face->file), face->refcount ); - release_face( face ); - count++; - } - } - release_family( family ); - } - return count; -} - #ifdef __ANDROID__ static BOOL ReadFontDir(const char *dirname, BOOL external_fonts) { @@ -4431,7 +4403,6 @@ static const struct font_backend_funcs font_funcs = freetype_load_fonts, freetype_add_font, freetype_add_mem_font, - freetype_remove_font, freetype_load_font, freetype_get_font_data, freetype_get_aa_flags, diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 1afbddf603a..7147d8ebc41 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -430,7 +430,6 @@ struct font_backend_funcs void (CDECL *load_fonts)(void); INT (CDECL *add_font)( const WCHAR *file, DWORD flags ); INT (CDECL *add_mem_font)( void *ptr, SIZE_T size, DWORD flags ); - BOOL (CDECL *remove_font)( const WCHAR *file, DWORD flags ); BOOL (CDECL *load_font)( struct gdi_font *gdi_font ); DWORD (CDECL *get_font_data)( struct gdi_font *gdi_font, DWORD table, DWORD offset, @@ -452,9 +451,7 @@ struct font_backend_funcs extern const WCHAR *get_gdi_font_subst( const WCHAR *from_name, int from_charset, int *to_charset ) DECLSPEC_HIDDEN; extern struct list font_list DECLSPEC_HIDDEN; -extern void release_family( struct gdi_font_family *family ) DECLSPEC_HIDDEN; extern struct gdi_font_family *find_family_from_any_name( const WCHAR *name ) DECLSPEC_HIDDEN; -extern void release_face( struct gdi_font_face *face ) DECLSPEC_HIDDEN; extern int add_gdi_face( const WCHAR *family_name, const WCHAR *second_name, const WCHAR *style, const WCHAR *fullname, const WCHAR *file, void *data_ptr, SIZE_T data_size, UINT index, FONTSIGNATURE fs,

1 0

Alexandre Julliard : gdi32: Add some helper functions for font matching.
by Alexandre Julliard 04 Nov '20

04 Nov '20

Module: wine Branch: master Commit: caf0b9c082488f87abfddb7a37a3e19e64e4b514 URL: https://source.winehq.org/git/wine.git/?a=commit;h=caf0b9c082488f87abfddb7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 4 09:15:06 2020 +0100 gdi32: Add some helper functions for font matching. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 142 +++++++++++++++++++++++------ dlls/gdi32/freetype.c | 232 +++++++---------------------------------------- dlls/gdi32/gdi_private.h | 8 +- 3 files changed, 151 insertions(+), 231 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=caf0b9c082488f87abfd…

1 0

Alexandre Julliard : gdi32: Move the handling of font family fallbacks out of freetype.c.
by Alexandre Julliard 04 Nov '20

04 Nov '20

Module: wine Branch: master Commit: 4cddf0d47d68cc7f548fcd358fff28ca9b65ea87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cddf0d47d68cc7f548fcd35… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 4 09:16:19 2020 +0100 gdi32: Move the handling of font family fallbacks out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 71 +++++++++++++++++++--------- dlls/gdi32/freetype.c | 118 ++++++++++++++++------------------------------- dlls/gdi32/gdi_private.h | 4 +- 3 files changed, 90 insertions(+), 103 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4cddf0d47d68cc7f548f…

1 0

Alexandre Julliard : gdi32: Move the rest of the font matching code out of freetype.c.
by Alexandre Julliard 04 Nov '20

04 Nov '20

Module: wine Branch: master Commit: 3b87839ec92ffd09baf077583321464c388a8e23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b87839ec92ffd09baf07758… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 4 09:18:59 2020 +0100 gdi32: Move the rest of the font matching code out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 62 ++++++++++++++++++++++++++++++++++++++++++++---- dlls/gdi32/freetype.c | 60 ++++------------------------------------------ dlls/gdi32/gdi_private.h | 6 ++--- 3 files changed, 65 insertions(+), 63 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 55030bf95bf..47d52f6c3dc 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1461,8 +1461,9 @@ static struct gdi_font_face *find_best_matching_face( const struct gdi_font_fami return best->scalable ? best : best_bitmap; } -struct gdi_font_face *find_matching_face_by_name( const WCHAR *name, const WCHAR *subst, const LOGFONTW *lf, - FONTSIGNATURE fs, BOOL can_use_bitmap ) +static struct gdi_font_face *find_matching_face_by_name( const WCHAR *name, const WCHAR *subst, + const LOGFONTW *lf, FONTSIGNATURE fs, + BOOL can_use_bitmap ) { struct gdi_font_family *family; struct gdi_font_face *face; @@ -1489,8 +1490,8 @@ struct gdi_font_face *find_matching_face_by_name( const WCHAR *name, const WCHAR return NULL; } -struct gdi_font_face *find_any_face( const LOGFONTW *lf, FONTSIGNATURE fs, - BOOL can_use_bitmap, BOOL want_vertical ) +static struct gdi_font_face *find_any_face( const LOGFONTW *lf, FONTSIGNATURE fs, + BOOL can_use_bitmap, BOOL want_vertical ) { struct gdi_font_family *family; struct gdi_font_face *face; @@ -1524,6 +1525,59 @@ struct gdi_font_face *find_any_face( const LOGFONTW *lf, FONTSIGNATURE fs, return NULL; } +struct gdi_font_face *find_matching_face( LOGFONTW *lf, CHARSETINFO *csi, BOOL can_use_bitmap, + const WCHAR **orig_name ) +{ + BOOL want_vertical = (lf->lfFaceName[0] == '@'); + struct gdi_font_face *face; + + if (!TranslateCharsetInfo( (DWORD *)(INT_PTR)lf->lfCharSet, csi, TCI_SRCCHARSET )) + { + if (lf->lfCharSet != DEFAULT_CHARSET) FIXME( "Untranslated charset %d\n", lf->lfCharSet ); + csi->fs.fsCsb[0] = 0; + } + + if (lf->lfFaceName[0]) + { + int subst_charset; + const WCHAR *subst = get_gdi_font_subst( lf->lfFaceName, lf->lfCharSet, &subst_charset ); + + if (subst) + { + TRACE( "substituting %s,%d -> %s,%d\n", debugstr_w(lf->lfFaceName), lf->lfCharSet, + debugstr_w(subst), (subst_charset != -1) ? subst_charset : lf->lfCharSet ); + if (subst_charset != -1) lf->lfCharSet = subst_charset; + *orig_name = lf->lfFaceName; + } + + if ((face = find_matching_face_by_name( lf->lfFaceName, subst, lf, csi->fs, can_use_bitmap ))) + return face; + } + *orig_name = NULL; /* substitution is no longer relevant */ + + /* If requested charset was DEFAULT_CHARSET then try using charset + corresponding to the current ansi codepage */ + if (!csi->fs.fsCsb[0]) + { + INT acp = GetACP(); + if (!TranslateCharsetInfo( (DWORD *)(INT_PTR)acp, csi, TCI_SRCCODEPAGE )) + { + FIXME( "TCI failed on codepage %d\n", acp ); + csi->fs.fsCsb[0] = 0; + } + else lf->lfCharSet = csi->ciCharset; + } + + if ((face = find_any_face( lf, csi->fs, can_use_bitmap, want_vertical ))) return face; + if (csi->fs.fsCsb[0]) + { + csi->fs.fsCsb[0] = 0; + if ((face = find_any_face( lf, csi->fs, can_use_bitmap, want_vertical ))) return face; + } + if (want_vertical && (face = find_any_face( lf, csi->fs, can_use_bitmap, FALSE ))) return face; + return NULL; +} + /* realized font objects */ #define FIRST_FONT_HANDLE 1 diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 464d58df09c..46ab0b9f6d7 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2217,9 +2217,8 @@ static struct gdi_font * CDECL freetype_SelectFont( DC *dc, HFONT hfont ) { struct gdi_font *font; Face *face; - Family *family; INT height; - BOOL can_use_bitmap, want_vertical; + BOOL can_use_bitmap; LOGFONTW lf; CHARSETINFO csi; FMAT2 dcmat; @@ -2279,61 +2278,12 @@ static struct gdi_font * CDECL freetype_SelectFont( DC *dc, HFONT hfont ) if(!strcmpiW(lf.lfFaceName, SymbolW)) lf.lfCharSet = SYMBOL_CHARSET; - if(!TranslateCharsetInfo((DWORD*)(INT_PTR)lf.lfCharSet, &csi, TCI_SRCCHARSET)) { - switch(lf.lfCharSet) { - case DEFAULT_CHARSET: - csi.fs.fsCsb[0] = 0; - break; - default: - FIXME("Untranslated charset %d\n", lf.lfCharSet); - csi.fs.fsCsb[0] = 0; - break; - } - } - - family = NULL; - if(lf.lfFaceName[0] != '\0') { - LPWSTR FaceName = lf.lfFaceName; - int subst_charset; - const WCHAR *subst = get_gdi_font_subst( FaceName, lf.lfCharSet, &subst_charset ); - - if(subst) { - TRACE("substituting %s,%d -> %s,%d\n", debugstr_w(FaceName), lf.lfCharSet, - debugstr_w(subst), (subst_charset != -1) ? subst_charset : lf.lfCharSet); - if (subst_charset != -1) lf.lfCharSet = subst_charset; - orig_name = FaceName; - } - - if ((face = find_matching_face_by_name( FaceName, subst, &lf, csi.fs, can_use_bitmap ))) - goto found_face; - } - - orig_name = NULL; /* substitution is no longer relevant */ - - /* If requested charset was DEFAULT_CHARSET then try using charset - corresponding to the current ansi codepage */ - if (!csi.fs.fsCsb[0]) + if (!(face = find_matching_face( &lf, &csi, can_use_bitmap, &orig_name ))) { - INT acp = GetACP(); - if(!TranslateCharsetInfo((DWORD*)(INT_PTR)acp, &csi, TCI_SRCCODEPAGE)) { - FIXME("TCI failed on codepage %d\n", acp); - csi.fs.fsCsb[0] = 0; - } else - lf.lfCharSet = csi.ciCharset; + FIXME("can't find a single appropriate font - bailing\n"); + return NULL; } - - want_vertical = (lf.lfFaceName[0] == '@'); - - if ((face = find_any_face( &lf, csi.fs, can_use_bitmap, want_vertical ))) goto found_face; - csi.fs.fsCsb[0] = 0; - if ((face = find_any_face( &lf, csi.fs, can_use_bitmap, want_vertical ))) goto found_face; - if (want_vertical && (face = find_any_face( &lf, csi.fs, can_use_bitmap, FALSE ))) goto found_face; - FIXME("can't find a single appropriate font - bailing\n"); - return NULL; - -found_face: height = lf.lfHeight; - family = face->family; TRACE("not in cache\n"); font = create_gdi_font( face, orig_name, &lf ); @@ -2345,7 +2295,7 @@ found_face: font->codepage = csi.ciACP; } else - font->charset = get_nearest_charset( family->family_name, face, &font->codepage ); + font->charset = get_nearest_charset( face->family->family_name, face, &font->codepage ); TRACE( "Chosen: %s (%s/%p:%u)\n", debugstr_w(face->full_name), debugstr_w(face->file), face->data_ptr, face->face_index ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index ef98fa0e8fd..48bf823ff92 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -459,10 +459,8 @@ extern int add_gdi_face( const WCHAR *family_name, const WCHAR *second_name, extern struct gdi_font_link *find_gdi_font_link( const WCHAR *name ) DECLSPEC_HIDDEN; extern void create_child_font_list( struct gdi_font *font ) DECLSPEC_HIDDEN; -extern struct gdi_font_face *find_matching_face_by_name( const WCHAR *name, const WCHAR *subst, const LOGFONTW *lf, - FONTSIGNATURE fs, BOOL can_use_bitmap ) DECLSPEC_HIDDEN; -extern struct gdi_font_face *find_any_face( const LOGFONTW *lf, FONTSIGNATURE fs, - BOOL can_use_bitmap, BOOL want_vertical ) DECLSPEC_HIDDEN; +extern struct gdi_font_face *find_matching_face( LOGFONTW *lf, CHARSETINFO *csi, BOOL can_use_bitmap, + const WCHAR **orig_name ) DECLSPEC_HIDDEN; extern void free_gdi_font( struct gdi_font *font ) DECLSPEC_HIDDEN; extern void cache_gdi_font( struct gdi_font *font ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Move the SelectFont() implementation out of freetype.c.
by Alexandre Julliard 04 Nov '20

04 Nov '20

Module: wine Branch: master Commit: 53acdd5a8ae18aca11483fe2c1653e1d7d17a233 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53acdd5a8ae18aca11483fe2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 4 09:20:26 2020 +0100 gdi32: Move the SelectFont() implementation out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 192 +++++++++++++++++++++++++++++++++++++++++++---- dlls/gdi32/freetype.c | 191 ---------------------------------------------- dlls/gdi32/gdi_private.h | 16 ---- 3 files changed, 178 insertions(+), 221 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=53acdd5a8ae18aca1148…

1 0

Alexandre Julliard : gdi32: Make a few definitions private to font.c.
by Alexandre Julliard 04 Nov '20

04 Nov '20

Module: wine Branch: master Commit: e1b193d8bab3ab295a0dbfde2e3721e63054a592 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1b193d8bab3ab295a0dbfde… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 4 09:20:50 2020 +0100 gdi32: Make a few definitions private to font.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 56 ++++++++++++++++++++++++++++++++++++++++++------ dlls/gdi32/freetype.c | 17 ++++----------- dlls/gdi32/gdi_private.h | 50 ------------------------------------------ 3 files changed, 54 insertions(+), 69 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 24681c2097e..89197361fe2 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -58,6 +58,36 @@ static inline struct font_physdev *get_font_dev( PHYSDEV dev ) return (struct font_physdev *)dev; } +struct gdi_font_family +{ + struct list entry; + unsigned int refcount; + WCHAR family_name[LF_FACESIZE]; + WCHAR second_name[LF_FACESIZE]; + struct list faces; + struct gdi_font_family *replacement; +}; + +struct gdi_font_face +{ + struct list entry; + unsigned int refcount; + WCHAR *style_name; + WCHAR *full_name; + WCHAR *file; + void *data_ptr; + SIZE_T data_size; + UINT face_index; + FONTSIGNATURE fs; + DWORD ntmFlags; + DWORD version; + DWORD flags; /* ADDFONT flags */ + BOOL scalable; + struct bitmap_font_size size; /* set if face is a bitmap */ + struct gdi_font_family *family; + struct gdi_font_enum_data *cached_enum_data; +}; + static const struct font_backend_funcs *font_funcs; static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} }; @@ -1160,6 +1190,21 @@ static void remove_face_from_cache( struct gdi_font_face *face ) /* font links */ +struct gdi_font_link +{ + struct list entry; + struct list links; + WCHAR name[LF_FACESIZE]; + FONTSIGNATURE fs; +}; + +struct gdi_font_link_entry +{ + struct list entry; + FONTSIGNATURE fs; + WCHAR family_name[LF_FACESIZE]; +}; + static struct list font_links = LIST_INIT(font_links); static struct gdi_font_link *find_gdi_font_link( const WCHAR *name ) @@ -1704,12 +1749,9 @@ static void free_gdi_font( struct gdi_font *font ) HeapFree( GetProcessHeap(), 0, font ); } -void set_gdi_font_names( struct gdi_font *font, const WCHAR *family_name, const WCHAR *style_name, - const WCHAR *full_name ) +static inline const WCHAR *get_gdi_font_name( struct gdi_font *font ) { - font->otm.otmpFamilyName = (char *)strdupW( family_name ); - font->otm.otmpStyleName = (char *)strdupW( style_name ); - font->otm.otmpFaceName = (char *)strdupW( full_name ); + return (WCHAR *)font->otm.otmpFamilyName; } static struct gdi_font *create_gdi_font( const struct gdi_font_face *face, const WCHAR *family_name, @@ -1727,7 +1769,9 @@ static struct gdi_font *create_gdi_font( const struct gdi_font_face *face, const font->ntmFlags = face->ntmFlags; font->aa_flags = HIWORD( face->flags ); if (!family_name) family_name = face->family->family_name; - set_gdi_font_names( font, family_name, face->style_name, face->full_name ); + font->otm.otmpFamilyName = (char *)strdupW( family_name ); + font->otm.otmpStyleName = (char *)strdupW( face->style_name ); + font->otm.otmpFaceName = (char *)strdupW( face->full_name ); return font; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ff1fa7d0c04..c23ed714b4c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -233,10 +233,6 @@ typedef struct { FT_Pos size, x_ppem, y_ppem; } My_FT_Bitmap_Size; -typedef struct gdi_font_face Face; - -typedef struct gdi_font_family Family; - struct font_private_data { FT_Face ft_face; @@ -2131,14 +2127,9 @@ static BOOL CDECL freetype_load_font( struct gdi_font *font ) if (!font->aa_flags) font->aa_flags = ADDFONT_AA_FLAGS( default_aa_flags ); if (!font->otm.otmpFamilyName) { - WCHAR *family_name = ft_face_get_family_name( ft_face, GetSystemDefaultLCID() ); - WCHAR *style_name = ft_face_get_style_name( ft_face, GetSystemDefaultLangID() ); - WCHAR *full_name = ft_face_get_full_name( ft_face, GetSystemDefaultLangID() ); - - set_gdi_font_names( font, family_name, style_name, full_name ); - HeapFree( GetProcessHeap(), 0, family_name ); - HeapFree( GetProcessHeap(), 0, style_name ); - HeapFree( GetProcessHeap(), 0, full_name ); + font->otm.otmpFamilyName = (char *)ft_face_get_family_name( ft_face, GetSystemDefaultLCID() ); + font->otm.otmpStyleName = (char *)ft_face_get_style_name( ft_face, GetSystemDefaultLangID() ); + font->otm.otmpFaceName = (char *)ft_face_get_full_name( ft_face, GetSystemDefaultLangID() ); } if (font->scalable) @@ -3396,7 +3387,7 @@ static BOOL CDECL freetype_set_outline_text_metrics( struct gdi_font *font ) GetSystemDefaultLangID() ))) { static const WCHAR fake_nameW[] = {'f','a','k','e',' ','n','a','m','e', 0}; - FIXME("failed to read full_nameW for font %s!\n", wine_dbgstr_w(get_gdi_font_name(font))); + FIXME("failed to read full_nameW for font %s!\n", wine_dbgstr_w((WCHAR *)font->otm.otmpFamilyName)); font->otm.otmpFullName = (char *)strdupW(fake_nameW); } needed = sizeof(font->otm) + (strlenW( (WCHAR *)font->otm.otmpFamilyName ) + 1 + diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index fdedb4ab705..12f469af979 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -303,18 +303,6 @@ struct char_width_info typedef struct { FLOAT eM11, eM12, eM21, eM22; } FMAT2; -struct glyph_metrics; - -struct gdi_font_family -{ - struct list entry; - unsigned int refcount; - WCHAR family_name[LF_FACESIZE]; - WCHAR second_name[LF_FACESIZE]; - struct list faces; - struct gdi_font_family *replacement; -}; - struct bitmap_font_size { int width; @@ -325,41 +313,6 @@ struct bitmap_font_size int internal_leading; }; -struct gdi_font_face -{ - struct list entry; - unsigned int refcount; - WCHAR *style_name; - WCHAR *full_name; - WCHAR *file; - void *data_ptr; - SIZE_T data_size; - UINT face_index; - FONTSIGNATURE fs; - DWORD ntmFlags; - DWORD version; - DWORD flags; /* ADDFONT flags */ - BOOL scalable; - struct bitmap_font_size size; /* set if face is a bitmap */ - struct gdi_font_family *family; - struct gdi_font_enum_data *cached_enum_data; -}; - -struct gdi_font_link -{ - struct list entry; - struct list links; - WCHAR name[LF_FACESIZE]; - FONTSIGNATURE fs; -}; - -struct gdi_font_link_entry -{ - struct list entry; - FONTSIGNATURE fs; - WCHAR family_name[LF_FACESIZE]; -}; - struct gdi_font { struct list entry; @@ -453,9 +406,6 @@ extern int add_gdi_face( const WCHAR *family_name, const WCHAR *second_name, DWORD ntmflags, DWORD version, DWORD flags, const struct bitmap_font_size *size ) DECLSPEC_HIDDEN; -static inline const WCHAR *get_gdi_font_name( struct gdi_font *font ) { return (WCHAR *)font->otm.otmpFamilyName; } -extern void set_gdi_font_names( struct gdi_font *font, const WCHAR *family_name, const WCHAR *style_name, - const WCHAR *full_name ) DECLSPEC_HIDDEN; extern void font_init(void) DECLSPEC_HIDDEN; /* freetype.c */

1 0

Nikolay Sivov : mfmediaengine: Implement GetNativeVideoSize().
by Alexandre Julliard 04 Nov '20

04 Nov '20

Module: wine Branch: master Commit: b793799d3d5facb765d97041669da4bc159b860b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b793799d3d5facb765d97041… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 4 16:45:08 2020 +0300 mfmediaengine: Implement GetNativeVideoSize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/Makefile.in | 2 +- dlls/mfmediaengine/main.c | 113 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 101 insertions(+), 14 deletions(-) diff --git a/dlls/mfmediaengine/Makefile.in b/dlls/mfmediaengine/Makefile.in index b97e9eec331..ed06dd40f26 100644 --- a/dlls/mfmediaengine/Makefile.in +++ b/dlls/mfmediaengine/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfmediaengine.dll IMPORTLIB = mfmediaengine -IMPORTS = oleaut32 mfplat mf mfuuid uuid +IMPORTS = oleaut32 ole32 mfplat mf mfuuid uuid EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index e126a925b67..cbea4263702 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -74,6 +74,8 @@ enum media_engine_flags struct video_frame { LONGLONG pts; + UINT64 size; + TOPOID node_id; }; struct media_engine @@ -250,6 +252,42 @@ static struct media_engine *impl_from_IMFSampleGrabberSinkCallback(IMFSampleGrab return CONTAINING_RECORD(iface, struct media_engine, grabber_callback); } +static void media_engine_get_frame_size(struct media_engine *engine, IMFTopology *topology) +{ + IMFMediaTypeHandler *handler; + IMFMediaType *media_type; + IMFStreamDescriptor *sd; + IMFTopologyNode *node; + HRESULT hr; + + engine->video_frame.size = 0; + + if (FAILED(IMFTopology_GetNodeByID(topology, engine->video_frame.node_id, &node))) + return; + + hr = IMFTopologyNode_GetUnknown(node, &MF_TOPONODE_STREAM_DESCRIPTOR, + &IID_IMFStreamDescriptor, (void **)&sd); + IMFTopologyNode_Release(node); + if (FAILED(hr)) + return; + + hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &handler); + IMFStreamDescriptor_Release(sd); + if (FAILED(hr)) + return; + + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &media_type); + IMFMediaTypeHandler_Release(handler); + if (FAILED(hr)) + { + WARN("Failed to get current media type %#x.\n", hr); + return; + } + + IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &engine->video_frame.size); + IMFMediaType_Release(media_type); +} + static HRESULT WINAPI media_engine_callback_QueryInterface(IMFAsyncCallback *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IMFAsyncCallback) || @@ -312,9 +350,43 @@ static HRESULT WINAPI media_engine_session_events_Invoke(IMFAsyncCallback *iface case MESessionTopologyStatus: { UINT32 topo_status = 0; + IMFTopology *topology; + PROPVARIANT value; + IMFMediaEvent_GetUINT32(event, &MF_EVENT_TOPOLOGY_STATUS, &topo_status); - if (topo_status == MF_TOPOSTATUS_READY) - IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_CANPLAY, 0, 0); + if (topo_status != MF_TOPOSTATUS_READY) + break; + + value.vt = VT_EMPTY; + if (FAILED(IMFMediaEvent_GetValue(event, &value))) + break; + + if (value.vt != VT_UNKNOWN) + { + PropVariantClear(&value); + break; + } + + topology = (IMFTopology *)value.punkVal; + + EnterCriticalSection(&engine->cs); + + engine->ready_state = MF_MEDIA_ENGINE_READY_HAVE_METADATA; + + media_engine_get_frame_size(engine, topology); + + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_DURATIONCHANGE, 0, 0); + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_LOADEDMETADATA, 0, 0); + + engine->ready_state = MF_MEDIA_ENGINE_READY_HAVE_ENOUGH_DATA; + + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_LOADEDDATA, 0, 0); + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_CANPLAY, 0, 0); + + LeaveCriticalSection(&engine->cs); + + PropVariantClear(&value); + break; } case MESessionStarted: @@ -461,6 +533,9 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi UINT64 duration; HRESULT hr; + engine->video_frame.node_id = 0; + engine->video_frame.size = 0; + if (FAILED(hr = IMFMediaSource_CreatePresentationDescriptor(source, &pd))) return hr; @@ -525,15 +600,6 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi else engine->duration = INFINITY; - engine->ready_state = MF_MEDIA_ENGINE_READY_HAVE_METADATA; - - IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_DURATIONCHANGE, 0, 0); - IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_LOADEDMETADATA, 0, 0); - - engine->ready_state = MF_MEDIA_ENGINE_READY_HAVE_ENOUGH_DATA; - - IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_LOADEDDATA, 0, 0); - if (SUCCEEDED(hr = MFCreateTopology(&topology))) { IMFTopologyNode *sar_node = NULL, *audio_src = NULL; @@ -575,6 +641,9 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi IMFTopologyNode_ConnectOutput(video_src, 0, grabber_node, 0); } + if (SUCCEEDED(hr)) + IMFTopologyNode_GetTopoNodeID(video_src, &engine->video_frame.node_id); + if (grabber_node) IMFTopologyNode_Release(grabber_node); if (video_src) @@ -1230,9 +1299,27 @@ static BOOL WINAPI media_engine_HasAudio(IMFMediaEngine *iface) static HRESULT WINAPI media_engine_GetNativeVideoSize(IMFMediaEngine *iface, DWORD *cx, DWORD *cy) { - FIXME("(%p, %p, %p): stub.\n", iface, cx, cy); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, cx, cy); + + if (!cx && !cy) + return E_INVALIDARG; + + EnterCriticalSection(&engine->cs); + + if (!engine->video_frame.size) + hr = E_FAIL; + else + { + if (cx) *cx = engine->video_frame.size >> 32; + if (cy) *cy = engine->video_frame.size; + } + + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_GetVideoAspectRatio(IMFMediaEngine *iface, DWORD *cx, DWORD *cy)

1 0

Michael Stefaniuc : wscript: Use wide-char string literals.
by Alexandre Julliard 04 Nov '20

04 Nov '20

Module: wine Branch: master Commit: 4e3c4d6f1d4bf7085581b63f124d137769785cca URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e3c4d6f1d4bf7085581b63f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 3 23:34:33 2020 +0100 wscript: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wscript/host.c | 12 +++--------- programs/wscript/main.c | 30 +++++++++--------------------- 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index 315b8ac7234..9541994d3b0 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -33,8 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wscript); #define BUILDVERSION 16535 - -static const WCHAR wshNameW[] = {'W','i','n','d','o','w','s',' ','S','c','r','i','p','t',' ','H','o','s','t',0}; static const WCHAR wshVersionW[] = {'5','.','8'}; VARIANT_BOOL wshInteractive = @@ -49,10 +47,8 @@ static HRESULT to_string(VARIANT *src, BSTR *dst) VARIANT v; HRESULT hres; - static const WCHAR nullW[] = {'n','u','l','l',0}; - if(V_VT(src) == VT_NULL) { - *dst = SysAllocString(nullW); + *dst = SysAllocString(L"null"); return *dst ? S_OK : E_OUTOFMEMORY; } @@ -73,9 +69,7 @@ static void print_string(const WCHAR *string) char *buf; if(wshInteractive) { - static const WCHAR windows_script_hostW[] = - {'W','i','n','d','o','w','s',' ','S','c','r','i','p','t',' ','H','o','s','t',0}; - MessageBoxW(NULL, string, windows_script_hostW, MB_OK); + MessageBoxW(NULL, string, L"Windows Script Host", MB_OK); return; } @@ -163,7 +157,7 @@ static HRESULT WINAPI Host_get_Name(IHost *iface, BSTR *out_Name) { WINE_TRACE("(%p)\n", out_Name); - if(!(*out_Name = SysAllocString(wshNameW))) + if(!(*out_Name = SysAllocString(L"Windows Script Host"))) return E_OUTOFMEMORY; return S_OK; } diff --git a/programs/wscript/main.c b/programs/wscript/main.c index 8a8036073bd..a7005a9289c 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -47,9 +47,6 @@ #endif WINE_DEFAULT_DEBUG_CHANNEL(wscript); - -static const WCHAR wscriptW[] = {'W','S','c','r','i','p','t',0}; -static const WCHAR wshW[] = {'W','S','H',0}; WCHAR scriptFullName[MAX_PATH]; ITypeInfo *host_ti; @@ -86,7 +83,7 @@ static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, { WINE_TRACE("(%s %x %p %p)\n", wine_dbgstr_w(pstrName), dwReturnMask, ppunkItem, ppti); - if(lstrcmpW(pstrName, wshW) && lstrcmpW(pstrName, wscriptW)) + if(lstrcmpW(pstrName, L"WSH") && lstrcmpW(pstrName, L"WScript")) return E_FAIL; if(dwReturnMask & SCRIPTINFO_ITYPEINFO) { @@ -223,9 +220,7 @@ static BOOL load_typelib(void) ITypeLib *typelib; HRESULT hres; - static const WCHAR wscript_exeW[] = {'w','s','c','r','i','p','t','.','e','x','e',0}; - - hres = LoadTypeLib(wscript_exeW, &typelib); + hres = LoadTypeLib(L"wscript.exe", &typelib); if(FAILED(hres)) return FALSE; @@ -245,9 +240,6 @@ static BOOL get_engine_clsid(const WCHAR *ext, CLSID *clsid) HKEY hkey; HRESULT hres; - static const WCHAR script_engineW[] = - {'\\','S','c','r','i','p','t','E','n','g','i','n','e',0}; - res = RegOpenKeyW(HKEY_CLASSES_ROOT, ext, &hkey); if(res != ERROR_SUCCESS) return FALSE; @@ -260,7 +252,7 @@ static BOOL get_engine_clsid(const WCHAR *ext, CLSID *clsid) WINE_TRACE("fileid is %s\n", wine_dbgstr_w(fileid)); - lstrcatW(fileid, script_engineW); + lstrcatW(fileid, L"\\ScriptEngine"); res = RegOpenKeyW(HKEY_CLASSES_ROOT, fileid, &hkey); if(res != ERROR_SUCCESS) return FALSE; @@ -319,11 +311,11 @@ static BOOL init_engine(IActiveScript *script, IActiveScriptParse *parser) if(FAILED(hres)) return FALSE; - hres = IActiveScript_AddNamedItem(script, wscriptW, SCRIPTITEM_ISVISIBLE); + hres = IActiveScript_AddNamedItem(script, L"WScript", SCRIPTITEM_ISVISIBLE); if(FAILED(hres)) return FALSE; - hres = IActiveScript_AddNamedItem(script, wshW, SCRIPTITEM_ISVISIBLE); + hres = IActiveScript_AddNamedItem(script, L"WSH", SCRIPTITEM_ISVISIBLE); if(FAILED(hres)) return FALSE; @@ -387,10 +379,6 @@ static void run_script(const WCHAR *filename, IActiveScript *script, IActiveScri static BOOL set_host_properties(const WCHAR *prop) { - static const WCHAR nologoW[] = {'n','o','l','o','g','o',0}; - static const WCHAR iactive[] = {'i',0}; - static const WCHAR batch[] = {'b',0}; - if(*prop == '/') { ++prop; if(*prop == '/') @@ -399,12 +387,12 @@ static BOOL set_host_properties(const WCHAR *prop) else ++prop; - if(wcsicmp(prop, iactive) == 0) + if(wcsicmp(prop, L"i") == 0) wshInteractive = VARIANT_TRUE; - else if(wcsicmp(prop, batch) == 0) + else if(wcsicmp(prop, L"b") == 0) wshInteractive = VARIANT_FALSE; - else if(wcsicmp(prop, nologoW) == 0) - WINE_FIXME("ignored %s switch\n", debugstr_w(nologoW)); + else if(wcsicmp(prop, L"nologo") == 0) + WINE_FIXME("ignored %s switch\n", debugstr_w(L"nologo")); else { WINE_FIXME("unsupported switch %s\n", debugstr_w(prop));

1 0

Michael Stefaniuc : wscript: Zero terminate the host version string to avoid random garbage.
by Alexandre Julliard 04 Nov '20

04 Nov '20

Module: wine Branch: master Commit: 7f955f289ac68ef49e73eaa4a8d8f12168f47785 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f955f289ac68ef49e73eaa4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 3 23:34:34 2020 +0100 wscript: Zero terminate the host version string to avoid random garbage. String is used only once and passed to SysAllocString() which assumes a zero terminated string. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wscript/host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index 9541994d3b0..ba3a32a935d 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wscript); #define BUILDVERSION 16535 -static const WCHAR wshVersionW[] = {'5','.','8'}; +static const WCHAR wshVersionW[] = L"5.8"; VARIANT_BOOL wshInteractive = #ifndef CSCRIPT_BUILD

1 0

Michael Stefaniuc : wscript: Use a zero terminated wchar string.
by Alexandre Julliard 04 Nov '20

04 Nov '20

Module: wine Branch: master Commit: 453c461095d59600e646be483119bc83885c9c1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=453c461095d59600e646be48… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 3 23:34:35 2020 +0100 wscript: Use a zero terminated wchar string. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wscript/host.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index ba3a32a935d..e20d3132f16 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -76,8 +76,7 @@ static void print_string(const WCHAR *string) len = lstrlenW(string); ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), string, len, &count, NULL); if(ret) { - static const WCHAR crnlW[] = {'\r','\n'}; - WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), crnlW, ARRAY_SIZE(crnlW), &count, NULL); + WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), L"\r\n", lstrlenW(L"\r\n"), &count, NULL); return; }

1 0