- Wine-Devel - list.winehq.org

[PATCH 1/3] gdi32: Index font families by name in an rbtree.
by Rémi Bernon Nov. 13, 2020

Nov. 13, 2020

Keeping them sorted with the vertical / default family rules. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This series brings another ~150ms prefix startup time improvement, from 1.65s to 1.50s execution time for "wine cmd /c exit" on average, when lot of system fonts are installed (for instance with the Noto fonts). dlls/gdi32/font.c | 136 +++++++++++++++++++++++----------------------- 1 file changed, 68 insertions(+), 68 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 6ad03df176b..ce3b2bc915f 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -56,7 +56,8 @@ static inline struct font_physdev *get_font_dev( PHYSDEV dev ) struct gdi_font_family { - struct list entry; + struct wine_rb_entry entry; + struct wine_rb_entry entry_second; unsigned int refcount; WCHAR family_name[LF_FACESIZE]; WCHAR second_name[LF_FACESIZE]; @@ -251,6 +252,9 @@ static const WCHAR * const default_sans_list[3] = L"Liberation Sans", L"Bitstream Vera Sans" }; +static WCHAR ff_roman_default[LF_FACESIZE]; +static WCHAR ff_modern_default[LF_FACESIZE]; +static WCHAR ff_swiss_default[LF_FACESIZE]; static const struct nls_update_font_list { @@ -530,7 +534,39 @@ static void load_gdi_font_subst(void) /* font families */ -static struct list font_list = LIST_INIT(font_list); +static int family_namecmp( const WCHAR *str1, const WCHAR *str2 ) +{ + int prio1, prio2, vert1 = (str1[0] == '@' ? 1 : 0), vert2 = (str2[0] == '@' ? 1 : 0); + + if (!wcsnicmp( str1, ff_swiss_default, LF_FACESIZE - 1 )) prio1 = 0; + else if (!wcsnicmp( str1, ff_modern_default, LF_FACESIZE - 1 )) prio1 = 1; + else if (!wcsnicmp( str1, ff_roman_default, LF_FACESIZE - 1 )) prio1 = 2; + else prio1 = 3; + + if (!wcsnicmp( str2, ff_swiss_default, LF_FACESIZE - 1 )) prio2 = 0; + else if (!wcsnicmp( str2, ff_modern_default, LF_FACESIZE - 1 )) prio2 = 1; + else if (!wcsnicmp( str2, ff_roman_default, LF_FACESIZE - 1 )) prio2 = 2; + else prio2 = 3; + + if (prio1 != prio2) return prio1 - prio2; + if (vert1 != vert2) return vert1 - vert2; + return wcsnicmp( str1 + vert1, str2 + vert2, LF_FACESIZE - 1 ); +} + +static int family_name_compare( const void *key, const struct wine_rb_entry *entry ) +{ + const struct gdi_font_family *family = WINE_RB_ENTRY_VALUE( entry, const struct gdi_font_family, entry ); + return family_namecmp( (const WCHAR *)key, family->family_name ); +} + +static int family_second_name_compare( const void *key, const struct wine_rb_entry *entry ) +{ + const struct gdi_font_family *family = WINE_RB_ENTRY_VALUE( entry, const struct gdi_font_family, entry_second ); + return family_namecmp( (const WCHAR *)key, family->second_name ); +} + +static struct wine_rb_tree family_tree = { family_name_compare }; +static struct wine_rb_tree family_second_tree = { family_second_name_compare }; static struct gdi_font_family *create_family( const WCHAR *name, const WCHAR *second_name ) { @@ -546,7 +582,8 @@ static struct gdi_font_family *create_family( const WCHAR *name, const WCHAR *se else family->second_name[0] = 0; list_init( &family->faces ); family->replacement = NULL; - list_add_tail( &font_list, &family->entry ); + wine_rb_put( &family_tree, family->family_name, &family->entry ); + if (family->second_name[0]) wine_rb_put( &family_second_tree, family->second_name, &family->entry_second ); return family; } @@ -554,30 +591,26 @@ static void release_family( struct gdi_font_family *family ) { if (--family->refcount) return; assert( list_empty( &family->faces )); - list_remove( &family->entry ); + wine_rb_remove( &family_tree, &family->entry ); + if (family->second_name[0]) wine_rb_remove( &family_second_tree, &family->entry_second ); if (family->replacement) release_family( family->replacement ); HeapFree( GetProcessHeap(), 0, family ); } static struct gdi_font_family *find_family_from_name( const WCHAR *name ) { - struct gdi_font_family *family; - - LIST_FOR_EACH_ENTRY( family, &font_list, struct gdi_font_family, entry ) - if (!wcsnicmp( family->family_name, name, LF_FACESIZE - 1 )) return family; - return NULL; + struct wine_rb_entry *entry; + if (!(entry = wine_rb_get( &family_tree, name ))) return NULL; + return WINE_RB_ENTRY_VALUE( entry, struct gdi_font_family, entry ); } static struct gdi_font_family *find_family_from_any_name( const WCHAR *name ) { + struct wine_rb_entry *entry; struct gdi_font_family *family; - - LIST_FOR_EACH_ENTRY( family, &font_list, struct gdi_font_family, entry ) - { - if (!wcsnicmp( family->family_name, name, LF_FACESIZE - 1 )) return family; - if (!wcsnicmp( family->second_name, name, LF_FACESIZE - 1 )) return family; - } - return NULL; + if ((family = find_family_from_name( name ))) return family; + if (!(entry = wine_rb_get( &family_second_tree, name ))) return NULL; + return WINE_RB_ENTRY_VALUE( entry, struct gdi_font_family, entry_second ); } static const struct list *get_family_face_list( const struct gdi_font_family *family ) @@ -593,7 +626,7 @@ static struct gdi_font_face *find_face_from_filename( const WCHAR *file_name, co TRACE( "looking for file %s name %s\n", debugstr_w(file_name), debugstr_w(family_name) ); - LIST_FOR_EACH_ENTRY( family, &font_list, struct gdi_font_family, entry ) + WINE_RB_FOR_EACH_ENTRY( family, &family_tree, struct gdi_font_family, entry ) { if (family_name && wcsnicmp( family_name, family->family_name, LF_FACESIZE - 1 )) continue; LIST_FOR_EACH_ENTRY( face, get_family_face_list(family), struct gdi_font_face, entry ) @@ -695,7 +728,7 @@ static void dump_gdi_font_list(void) struct gdi_font_family *family; struct gdi_font_face *face; - LIST_FOR_EACH_ENTRY( family, &font_list, struct gdi_font_family, entry ) + WINE_RB_FOR_EACH_ENTRY( family, &family_tree, struct gdi_font_family, entry ) { TRACE( "Family: %s\n", debugstr_w(family->family_name) ); LIST_FOR_EACH_ENTRY( face, &family->faces, struct gdi_font_face, entry ) @@ -726,26 +759,27 @@ static BOOL enum_fallbacks( DWORD pitch_and_family, int index, WCHAR buffer[LF_F return font_funcs->enum_family_fallbacks( pitch_and_family, index - 3, buffer ); } -static void set_default_family( DWORD pitch_and_family ) +static void set_default_family( DWORD pitch_and_family, WCHAR *default_name ) { - struct gdi_font_family *family; + struct wine_rb_entry *entry; WCHAR name[LF_FACESIZE]; int i = 0; while (enum_fallbacks( pitch_and_family, i++, name )) { - if (!(family = find_family_from_name( name ))) continue; - list_remove( &family->entry ); - list_add_head( &font_list, &family->entry ); + if (!(entry = wine_rb_get( &family_tree, name ))) continue; + wine_rb_remove( &family_tree, entry ); + lstrcpynW( default_name, name, LF_FACESIZE - 1 ); + wine_rb_put( &family_tree, name, entry ); return; } } static void reorder_font_list(void) { - set_default_family( FF_ROMAN ); - set_default_family( FF_MODERN ); - set_default_family( FF_SWISS ); + set_default_family( FF_ROMAN, ff_roman_default ); + set_default_family( FF_MODERN, ff_modern_default ); + set_default_family( FF_SWISS, ff_swiss_default ); } static void release_face( struct gdi_font_face *face ) @@ -771,7 +805,7 @@ static int remove_font( const WCHAR *file, DWORD flags ) int count = 0; EnterCriticalSection( &font_cs ); - LIST_FOR_EACH_ENTRY_SAFE( family, family_next, &font_list, struct gdi_font_family, entry ) + WINE_RB_FOR_EACH_ENTRY_DESTRUCTOR( family, family_next, &family_tree, struct gdi_font_family, entry ) { family->refcount++; LIST_FOR_EACH_ENTRY_SAFE( face, face_next, &family->faces, struct gdi_font_face, entry ) @@ -1018,38 +1052,6 @@ static void load_face_from_cache( HKEY hkey_family, struct gdi_font_family *fami } } -/* move vertical fonts after their horizontal counterpart */ -/* assumes that font_list is already sorted by family name */ -static void reorder_vertical_fonts(void) -{ - struct gdi_font_family *family, *next, *vert_family; - struct list *ptr, *vptr; - struct list vertical_families = LIST_INIT( vertical_families ); - - LIST_FOR_EACH_ENTRY_SAFE( family, next, &font_list, struct gdi_font_family, entry ) - { - if (family->family_name[0] != '@') continue; - list_remove( &family->entry ); - list_add_tail( &vertical_families, &family->entry ); - } - - ptr = list_head( &font_list ); - vptr = list_head( &vertical_families ); - while (ptr && vptr) - { - family = LIST_ENTRY( ptr, struct gdi_font_family, entry ); - vert_family = LIST_ENTRY( vptr, struct gdi_font_family, entry ); - if (wcsicmp( family->family_name, vert_family->family_name + 1 ) > 0) - { - list_remove( vptr ); - list_add_before( ptr, vptr ); - vptr = list_head( &vertical_families ); - } - else ptr = list_next( &font_list, ptr ); - } - list_move_tail( &font_list, &vertical_families ); -} - static void load_font_list_from_cache(void) { DWORD size, family_index = 0; @@ -1074,8 +1076,6 @@ static void load_font_list_from_cache(void) release_family( family ); size = sizeof(buffer); } - - reorder_vertical_fonts(); } static void add_face_to_cache( struct gdi_font_face *face ) @@ -1465,7 +1465,7 @@ static struct gdi_font_face *find_matching_face_by_name( const WCHAR *name, cons } /* search by full face name */ - LIST_FOR_EACH_ENTRY( family, &font_list, struct gdi_font_family, entry ) + WINE_RB_FOR_EACH_ENTRY( family, &family_tree, struct gdi_font_family, entry ) LIST_FOR_EACH_ENTRY( face, get_family_face_list(family), struct gdi_font_face, entry ) if (!wcsnicmp( face->full_name, name, LF_FACESIZE - 1 ) && can_select_face( face, fs, can_use_bitmap )) @@ -1489,7 +1489,7 @@ static struct gdi_font_face *find_any_face( const LOGFONTW *lf, FONTSIGNATURE fs /* first try the family fallbacks */ while (enum_fallbacks( lf->lfPitchAndFamily, i++, name )) { - LIST_FOR_EACH_ENTRY( family, &font_list, struct gdi_font_family, entry ) + WINE_RB_FOR_EACH_ENTRY( family, &family_tree, struct gdi_font_family, entry ) { if ((family->family_name[0] == '@') == !want_vertical) continue; if (wcsicmp( family->family_name + want_vertical, name ) && @@ -1498,14 +1498,14 @@ static struct gdi_font_face *find_any_face( const LOGFONTW *lf, FONTSIGNATURE fs } } /* otherwise try only scalable */ - LIST_FOR_EACH_ENTRY( family, &font_list, struct gdi_font_family, entry ) + WINE_RB_FOR_EACH_ENTRY( family, &family_tree, struct gdi_font_family, entry ) { if ((family->family_name[0] == '@') == !want_vertical) continue; if ((face = find_best_matching_face( family, lf, fs, FALSE ))) return face; } if (!can_use_bitmap) return NULL; /* then also bitmap fonts */ - LIST_FOR_EACH_ENTRY( family, &font_list, struct gdi_font_family, entry ) + WINE_RB_FOR_EACH_ENTRY( family, &family_tree, struct gdi_font_family, entry ) { if ((family->family_name[0] == '@') == !want_vertical) continue; if ((face = find_best_matching_face( family, lf, fs, can_use_bitmap ))) return face; @@ -2788,7 +2788,7 @@ static BOOL CDECL font_EnumFonts( PHYSDEV dev, LOGFONTW *lf, FONTENUMPROCW proc, } else face_name = lf->lfFaceName; - LIST_FOR_EACH_ENTRY( family, &font_list, struct gdi_font_family, entry ) + WINE_RB_FOR_EACH_ENTRY( family, &family_tree, struct gdi_font_family, entry ) { if (!family_matches(family, face_name)) continue; LIST_FOR_EACH_ENTRY( face, get_family_face_list(family), struct gdi_font_face, entry ) @@ -2802,7 +2802,7 @@ static BOOL CDECL font_EnumFonts( PHYSDEV dev, LOGFONTW *lf, FONTENUMPROCW proc, else { TRACE( "charset %d\n", charset ); - LIST_FOR_EACH_ENTRY( family, &font_list, struct gdi_font_family, entry ) + WINE_RB_FOR_EACH_ENTRY( family, &family_tree, struct gdi_font_family, entry ) { face = LIST_ENTRY( list_head(get_family_face_list(family)), struct gdi_font_face, entry ); if (!enum_face_charsets( family, face, enum_charsets, count, proc, lparam, NULL )) @@ -7815,7 +7815,7 @@ static void update_external_font_keys( HKEY hkey ) /* enumerate the fonts and add external ones to the two keys */ - LIST_FOR_EACH_ENTRY( family, &font_list, struct gdi_font_family, entry ) + WINE_RB_FOR_EACH_ENTRY( family, &family_tree, struct gdi_font_family, entry ) { LIST_FOR_EACH_ENTRY( face, &family->faces, struct gdi_font_face, entry ) { -- 2.29.2

2 3

[PATCH v2 3/3] gdi32: Rewrite find_any_face using the rbtree.
by Huw Davies Nov. 13, 2020

Nov. 13, 2020

From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index a6acea6008c..af1ce610ede 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1493,19 +1493,20 @@ static struct gdi_font_face *find_any_face( const LOGFONTW *lf, FONTSIGNATURE fs { struct gdi_font_family *family; struct gdi_font_face *face; - WCHAR name[LF_FACESIZE]; + WCHAR name[LF_FACESIZE + 1]; int i = 0; /* first try the family fallbacks */ while (enum_fallbacks( lf->lfPitchAndFamily, i++, name )) { - WINE_RB_FOR_EACH_ENTRY( family, &family_name_tree, struct gdi_font_family, name_entry ) + if (want_vertical) { - if ((family->family_name[0] == '@') == !want_vertical) continue; - if (wcsicmp( family->family_name + want_vertical, name ) && - wcsicmp( family->second_name + want_vertical, name )) continue; - if ((face = find_best_matching_face( family, lf, fs, FALSE ))) return face; + memmove(name + 1, name, min(lstrlenW(name), LF_FACESIZE)); + name[0] = '@'; } + + if (!(family = find_family_from_any_name(name))) continue; + if ((face = find_best_matching_face( family, lf, fs, FALSE ))) return face; } /* otherwise try only scalable */ WINE_RB_FOR_EACH_ENTRY( family, &family_name_tree, struct gdi_font_family, name_entry ) -- 2.23.0

1 0

[PATCH v2 2/3] gdi32: Rewrite find_face_from_filename using the rbtree.
by Huw Davies Nov. 13, 2020

Nov. 13, 2020

From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 8c476cb3fa6..a6acea6008c 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -618,29 +618,39 @@ static const struct list *get_family_face_list( const struct gdi_font_family *fa return family->replacement ? &family->replacement->faces : &family->faces; } +static struct gdi_font_face *family_find_face_from_filename( struct gdi_font_family *family, const WCHAR *file_name ) +{ + struct gdi_font_face *face; + const WCHAR *file; + LIST_FOR_EACH_ENTRY( face, get_family_face_list(family), struct gdi_font_face, entry ) + { + if (!face->file) continue; + file = wcsrchr(face->file, '\\'); + if (!file) file = face->file; + else file++; + if (wcsicmp( file, file_name )) continue; + face->refcount++; + return face; + } + return NULL; +} + static struct gdi_font_face *find_face_from_filename( const WCHAR *file_name, const WCHAR *family_name ) { struct gdi_font_family *family; struct gdi_font_face *face; - const WCHAR *file; TRACE( "looking for file %s name %s\n", debugstr_w(file_name), debugstr_w(family_name) ); - WINE_RB_FOR_EACH_ENTRY( family, &family_name_tree, struct gdi_font_family, name_entry ) + if (!family_name) { - if (family_name && wcsnicmp( family_name, family->family_name, LF_FACESIZE - 1 )) continue; - LIST_FOR_EACH_ENTRY( face, get_family_face_list(family), struct gdi_font_face, entry ) - { - if (!face->file) continue; - file = wcsrchr(face->file, '\\'); - if (!file) file = face->file; - else file++; - if (wcsicmp( file, file_name )) continue; - face->refcount++; - return face; - } + WINE_RB_FOR_EACH_ENTRY( family, &family_name_tree, struct gdi_font_family, name_entry ) + if ((face = family_find_face_from_filename( family, file_name ))) return face; + return NULL; } - return NULL; + + if (!(family = find_family_from_name( family_name ))) return NULL; + return family_find_face_from_filename( family, file_name ); } static BOOL add_family_replacement( const WCHAR *new_name, const WCHAR *replace ) -- 2.23.0

1 0

[PATCH v2 1/3] gdi32: Index font families by name in an rbtree.
by Huw Davies Nov. 13, 2020

Nov. 13, 2020

From: Rémi Bernon <rbernon(a)codeweavers.com> Keeping them sorted with the vertical / default family rules. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 136 +++++++++++++++++++++++----------------------- 1 file changed, 68 insertions(+), 68 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 4a6ca1916ac..8c476cb3fa6 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -56,7 +56,8 @@ static inline struct font_physdev *get_font_dev( PHYSDEV dev ) struct gdi_font_family { - struct list entry; + struct wine_rb_entry name_entry; + struct wine_rb_entry second_name_entry; unsigned int refcount; WCHAR family_name[LF_FACESIZE]; WCHAR second_name[LF_FACESIZE]; @@ -251,6 +252,9 @@ static const WCHAR * const default_sans_list[3] = L"Liberation Sans", L"Bitstream Vera Sans" }; +static WCHAR ff_roman_default[LF_FACESIZE]; +static WCHAR ff_modern_default[LF_FACESIZE]; +static WCHAR ff_swiss_default[LF_FACESIZE]; static const struct nls_update_font_list { @@ -530,7 +534,39 @@ static void load_gdi_font_subst(void) /* font families */ -static struct list font_list = LIST_INIT(font_list); +static int family_namecmp( const WCHAR *str1, const WCHAR *str2 ) +{ + int prio1, prio2, vert1 = (str1[0] == '@' ? 1 : 0), vert2 = (str2[0] == '@' ? 1 : 0); + + if (!wcsnicmp( str1, ff_swiss_default, LF_FACESIZE - 1 )) prio1 = 0; + else if (!wcsnicmp( str1, ff_modern_default, LF_FACESIZE - 1 )) prio1 = 1; + else if (!wcsnicmp( str1, ff_roman_default, LF_FACESIZE - 1 )) prio1 = 2; + else prio1 = 3; + + if (!wcsnicmp( str2, ff_swiss_default, LF_FACESIZE - 1 )) prio2 = 0; + else if (!wcsnicmp( str2, ff_modern_default, LF_FACESIZE - 1 )) prio2 = 1; + else if (!wcsnicmp( str2, ff_roman_default, LF_FACESIZE - 1 )) prio2 = 2; + else prio2 = 3; + + if (prio1 != prio2) return prio1 - prio2; + if (vert1 != vert2) return vert1 - vert2; + return wcsnicmp( str1 + vert1, str2 + vert2, LF_FACESIZE - 1 ); +} + +static int family_name_compare( const void *key, const struct wine_rb_entry *entry ) +{ + const struct gdi_font_family *family = WINE_RB_ENTRY_VALUE( entry, const struct gdi_font_family, name_entry ); + return family_namecmp( (const WCHAR *)key, family->family_name ); +} + +static int family_second_name_compare( const void *key, const struct wine_rb_entry *entry ) +{ + const struct gdi_font_family *family = WINE_RB_ENTRY_VALUE( entry, const struct gdi_font_family, second_name_entry ); + return family_namecmp( (const WCHAR *)key, family->second_name ); +} + +static struct wine_rb_tree family_name_tree = { family_name_compare }; +static struct wine_rb_tree family_second_name_tree = { family_second_name_compare }; static struct gdi_font_family *create_family( const WCHAR *name, const WCHAR *second_name ) { @@ -546,7 +582,8 @@ static struct gdi_font_family *create_family( const WCHAR *name, const WCHAR *se else family->second_name[0] = 0; list_init( &family->faces ); family->replacement = NULL; - list_add_tail( &font_list, &family->entry ); + wine_rb_put( &family_name_tree, family->family_name, &family->name_entry ); + if (family->second_name[0]) wine_rb_put( &family_second_name_tree, family->second_name, &family->second_name_entry ); return family; } @@ -554,30 +591,26 @@ static void release_family( struct gdi_font_family *family ) { if (--family->refcount) return; assert( list_empty( &family->faces )); - list_remove( &family->entry ); + wine_rb_remove( &family_name_tree, &family->name_entry ); + if (family->second_name[0]) wine_rb_remove( &family_second_name_tree, &family->second_name_entry ); if (family->replacement) release_family( family->replacement ); HeapFree( GetProcessHeap(), 0, family ); } static struct gdi_font_family *find_family_from_name( const WCHAR *name ) { - struct gdi_font_family *family; - - LIST_FOR_EACH_ENTRY( family, &font_list, struct gdi_font_family, entry ) - if (!wcsnicmp( family->family_name, name, LF_FACESIZE - 1 )) return family; - return NULL; + struct wine_rb_entry *entry; + if (!(entry = wine_rb_get( &family_name_tree, name ))) return NULL; + return WINE_RB_ENTRY_VALUE( entry, struct gdi_font_family, name_entry ); } static struct gdi_font_family *find_family_from_any_name( const WCHAR *name ) { + struct wine_rb_entry *entry; struct gdi_font_family *family; - - LIST_FOR_EACH_ENTRY( family, &font_list, struct gdi_font_family, entry ) - { - if (!wcsnicmp( family->family_name, name, LF_FACESIZE - 1 )) return family; - if (!wcsnicmp( family->second_name, name, LF_FACESIZE - 1 )) return family; - } - return NULL; + if ((family = find_family_from_name( name ))) return family; + if (!(entry = wine_rb_get( &family_second_name_tree, name ))) return NULL; + return WINE_RB_ENTRY_VALUE( entry, struct gdi_font_family, second_name_entry ); } static const struct list *get_family_face_list( const struct gdi_font_family *family ) @@ -593,7 +626,7 @@ static struct gdi_font_face *find_face_from_filename( const WCHAR *file_name, co TRACE( "looking for file %s name %s\n", debugstr_w(file_name), debugstr_w(family_name) ); - LIST_FOR_EACH_ENTRY( family, &font_list, struct gdi_font_family, entry ) + WINE_RB_FOR_EACH_ENTRY( family, &family_name_tree, struct gdi_font_family, name_entry ) { if (family_name && wcsnicmp( family_name, family->family_name, LF_FACESIZE - 1 )) continue; LIST_FOR_EACH_ENTRY( face, get_family_face_list(family), struct gdi_font_face, entry ) @@ -695,7 +728,7 @@ static void dump_gdi_font_list(void) struct gdi_font_family *family; struct gdi_font_face *face; - LIST_FOR_EACH_ENTRY( family, &font_list, struct gdi_font_family, entry ) + WINE_RB_FOR_EACH_ENTRY( family, &family_name_tree, struct gdi_font_family, name_entry ) { TRACE( "Family: %s\n", debugstr_w(family->family_name) ); LIST_FOR_EACH_ENTRY( face, &family->faces, struct gdi_font_face, entry ) @@ -726,26 +759,27 @@ static BOOL enum_fallbacks( DWORD pitch_and_family, int index, WCHAR buffer[LF_F return font_funcs->enum_family_fallbacks( pitch_and_family, index - 3, buffer ); } -static void set_default_family( DWORD pitch_and_family ) +static void set_default_family( DWORD pitch_and_family, WCHAR *default_name ) { - struct gdi_font_family *family; + struct wine_rb_entry *entry; WCHAR name[LF_FACESIZE]; int i = 0; while (enum_fallbacks( pitch_and_family, i++, name )) { - if (!(family = find_family_from_name( name ))) continue; - list_remove( &family->entry ); - list_add_head( &font_list, &family->entry ); + if (!(entry = wine_rb_get( &family_name_tree, name ))) continue; + wine_rb_remove( &family_name_tree, entry ); + lstrcpynW( default_name, name, LF_FACESIZE - 1 ); + wine_rb_put( &family_name_tree, name, entry ); return; } } static void reorder_font_list(void) { - set_default_family( FF_ROMAN ); - set_default_family( FF_MODERN ); - set_default_family( FF_SWISS ); + set_default_family( FF_ROMAN, ff_roman_default ); + set_default_family( FF_MODERN, ff_modern_default ); + set_default_family( FF_SWISS, ff_swiss_default ); } static void release_face( struct gdi_font_face *face ) @@ -771,7 +805,7 @@ static int remove_font( const WCHAR *file, DWORD flags ) int count = 0; EnterCriticalSection( &font_cs ); - LIST_FOR_EACH_ENTRY_SAFE( family, family_next, &font_list, struct gdi_font_family, entry ) + WINE_RB_FOR_EACH_ENTRY_DESTRUCTOR( family, family_next, &family_name_tree, struct gdi_font_family, name_entry ) { family->refcount++; LIST_FOR_EACH_ENTRY_SAFE( face, face_next, &family->faces, struct gdi_font_face, entry ) @@ -1018,38 +1052,6 @@ static void load_face_from_cache( HKEY hkey_family, struct gdi_font_family *fami } } -/* move vertical fonts after their horizontal counterpart */ -/* assumes that font_list is already sorted by family name */ -static void reorder_vertical_fonts(void) -{ - struct gdi_font_family *family, *next, *vert_family; - struct list *ptr, *vptr; - struct list vertical_families = LIST_INIT( vertical_families ); - - LIST_FOR_EACH_ENTRY_SAFE( family, next, &font_list, struct gdi_font_family, entry ) - { - if (family->family_name[0] != '@') continue; - list_remove( &family->entry ); - list_add_tail( &vertical_families, &family->entry ); - } - - ptr = list_head( &font_list ); - vptr = list_head( &vertical_families ); - while (ptr && vptr) - { - family = LIST_ENTRY( ptr, struct gdi_font_family, entry ); - vert_family = LIST_ENTRY( vptr, struct gdi_font_family, entry ); - if (wcsicmp( family->family_name, vert_family->family_name + 1 ) > 0) - { - list_remove( vptr ); - list_add_before( ptr, vptr ); - vptr = list_head( &vertical_families ); - } - else ptr = list_next( &font_list, ptr ); - } - list_move_tail( &font_list, &vertical_families ); -} - static void load_font_list_from_cache(void) { DWORD size, family_index = 0; @@ -1074,8 +1076,6 @@ static void load_font_list_from_cache(void) release_family( family ); size = sizeof(buffer); } - - reorder_vertical_fonts(); } static void add_face_to_cache( struct gdi_font_face *face ) @@ -1465,7 +1465,7 @@ static struct gdi_font_face *find_matching_face_by_name( const WCHAR *name, cons } /* search by full face name */ - LIST_FOR_EACH_ENTRY( family, &font_list, struct gdi_font_family, entry ) + WINE_RB_FOR_EACH_ENTRY( family, &family_name_tree, struct gdi_font_family, name_entry ) LIST_FOR_EACH_ENTRY( face, get_family_face_list(family), struct gdi_font_face, entry ) if (!wcsnicmp( face->full_name, name, LF_FACESIZE - 1 ) && can_select_face( face, fs, can_use_bitmap )) @@ -1489,7 +1489,7 @@ static struct gdi_font_face *find_any_face( const LOGFONTW *lf, FONTSIGNATURE fs /* first try the family fallbacks */ while (enum_fallbacks( lf->lfPitchAndFamily, i++, name )) { - LIST_FOR_EACH_ENTRY( family, &font_list, struct gdi_font_family, entry ) + WINE_RB_FOR_EACH_ENTRY( family, &family_name_tree, struct gdi_font_family, name_entry ) { if ((family->family_name[0] == '@') == !want_vertical) continue; if (wcsicmp( family->family_name + want_vertical, name ) && @@ -1498,14 +1498,14 @@ static struct gdi_font_face *find_any_face( const LOGFONTW *lf, FONTSIGNATURE fs } } /* otherwise try only scalable */ - LIST_FOR_EACH_ENTRY( family, &font_list, struct gdi_font_family, entry ) + WINE_RB_FOR_EACH_ENTRY( family, &family_name_tree, struct gdi_font_family, name_entry ) { if ((family->family_name[0] == '@') == !want_vertical) continue; if ((face = find_best_matching_face( family, lf, fs, FALSE ))) return face; } if (!can_use_bitmap) return NULL; /* then also bitmap fonts */ - LIST_FOR_EACH_ENTRY( family, &font_list, struct gdi_font_family, entry ) + WINE_RB_FOR_EACH_ENTRY( family, &family_name_tree, struct gdi_font_family, name_entry ) { if ((family->family_name[0] == '@') == !want_vertical) continue; if ((face = find_best_matching_face( family, lf, fs, can_use_bitmap ))) return face; @@ -2788,7 +2788,7 @@ static BOOL CDECL font_EnumFonts( PHYSDEV dev, LOGFONTW *lf, FONTENUMPROCW proc, } else face_name = lf->lfFaceName; - LIST_FOR_EACH_ENTRY( family, &font_list, struct gdi_font_family, entry ) + WINE_RB_FOR_EACH_ENTRY( family, &family_name_tree, struct gdi_font_family, name_entry ) { if (!family_matches(family, face_name)) continue; LIST_FOR_EACH_ENTRY( face, get_family_face_list(family), struct gdi_font_face, entry ) @@ -2802,7 +2802,7 @@ static BOOL CDECL font_EnumFonts( PHYSDEV dev, LOGFONTW *lf, FONTENUMPROCW proc, else { TRACE( "charset %d\n", charset ); - LIST_FOR_EACH_ENTRY( family, &font_list, struct gdi_font_family, entry ) + WINE_RB_FOR_EACH_ENTRY( family, &family_name_tree, struct gdi_font_family, name_entry ) { face = LIST_ENTRY( list_head(get_family_face_list(family)), struct gdi_font_face, entry ); if (!enum_face_charsets( family, face, enum_charsets, count, proc, lparam, NULL )) @@ -7825,7 +7825,7 @@ static void update_external_font_keys( HKEY hkey ) /* enumerate the fonts and add external ones to the two keys */ - LIST_FOR_EACH_ENTRY( family, &font_list, struct gdi_font_family, entry ) + WINE_RB_FOR_EACH_ENTRY( family, &family_name_tree, struct gdi_font_family, name_entry ) { LIST_FOR_EACH_ENTRY( face, &family->faces, struct gdi_font_face, entry ) { -- 2.23.0

1 0

[PATCH] wordpad: Fill font selection combobox with fully processed font list.
by Nikolay Sivov Nov. 13, 2020

Nov. 13, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46478 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- The issue is in how combo control is used. For every enumerated name a message is sent to find if it's been already added (that internally iterates over whole list of items), and if it wasn't there is a linear search through already added items to find a spot for new item to keep list sorted. This change reduces startup time on my system from ~80 sec to a couple of seconds, for larger number of fonts (fc-list returns ~2.5K lines). programs/wordpad/wordpad.c | 142 +++++++++++++++++++++++++++---------- 1 file changed, 104 insertions(+), 38 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index c8e3132b343..5ba5cc857f6 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -536,36 +536,6 @@ static void on_fontlist_modified(LPWSTR wszNewFaceName) set_font(wszNewFaceName); } -static void add_font(LPCWSTR fontName, DWORD fontType, HWND hListWnd, const NEWTEXTMETRICEXW *ntmc) -{ - COMBOBOXEXITEMW cbItem; - WCHAR buffer[MAX_PATH]; - int fontHeight = 0; - - cbItem.mask = CBEIF_TEXT; - cbItem.pszText = buffer; - cbItem.cchTextMax = MAX_STRING_LEN; - cbItem.iItem = 0; - - while(SendMessageW(hListWnd, CBEM_GETITEMW, 0, (LPARAM)&cbItem)) - { - if(lstrcmpiW(cbItem.pszText, fontName) <= 0) - cbItem.iItem++; - else - break; - } - cbItem.pszText = HeapAlloc( GetProcessHeap(), 0, (lstrlenW(fontName) + 1)*sizeof(WCHAR) ); - lstrcpyW( cbItem.pszText, fontName ); - - cbItem.mask |= CBEIF_LPARAM; - if(fontType & RASTER_FONTTYPE) - fontHeight = ntmc->ntmTm.tmHeight - ntmc->ntmTm.tmInternalLeading; - - cbItem.lParam = MAKELONG(fontType,fontHeight); - SendMessageW(hListWnd, CBEM_INSERTITEMW, 0, (LPARAM)&cbItem); - HeapFree( GetProcessHeap(), 0, cbItem.pszText ); -} - static void dialog_choose_font(void) { CHOOSEFONTW cf; @@ -614,36 +584,132 @@ static void dialog_choose_font(void) } } +struct font_desc +{ + WCHAR *name; + LPARAM lParam; +}; + +struct font_array +{ + struct font_desc *fonts; + size_t count; + size_t capacity; +}; + +static BOOL array_reserve(void **elements, size_t *capacity, size_t count, size_t size) +{ + size_t new_capacity, max_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~(SIZE_T)0 / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(4, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = max_capacity; + + new_elements = *elements ? HeapReAlloc(GetProcessHeap(), 0, *elements, new_capacity * size) : + HeapAlloc(GetProcessHeap(), 0, new_capacity * size); + if (!new_elements) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + + return TRUE; +} + +static void add_font(struct font_array *fonts, LPCWSTR fontName, DWORD fontType, const NEWTEXTMETRICEXW *ntmc) +{ + int fontHeight = 0; + size_t idx; + + if (!array_reserve((void **)&fonts->fonts, &fonts->capacity, fonts->count + 1, sizeof(*fonts->fonts))) + return; + + if (fontType & RASTER_FONTTYPE) + fontHeight = ntmc->ntmTm.tmHeight - ntmc->ntmTm.tmInternalLeading; + + idx = fonts->count; + fonts->fonts[idx].name = HeapAlloc( GetProcessHeap(), 0, (lstrlenW(fontName) + 1)*sizeof(WCHAR) ); + lstrcpyW( fonts->fonts[idx].name, fontName ); + fonts->fonts[idx].lParam = MAKELONG(fontType, fontHeight); + + fonts->count++; +} static int CALLBACK enum_font_proc(const LOGFONTW *lpelfe, const TEXTMETRICW *lpntme, DWORD FontType, LPARAM lParam) { - HWND hListWnd = (HWND) lParam; + struct font_array *fonts = (void *)lParam; if (lpelfe->lfFaceName[0] == '@') return 1; /* ignore vertical fonts */ - if(SendMessageW(hListWnd, CB_FINDSTRINGEXACT, -1, (LPARAM)lpelfe->lfFaceName) == CB_ERR) - { - - add_font(lpelfe->lfFaceName, FontType, hListWnd, (const NEWTEXTMETRICEXW*)lpntme); - } + add_font(fonts, lpelfe->lfFaceName, FontType, (const NEWTEXTMETRICEXW *)lpntme); return 1; } +static int fonts_desc_compare(const void *a, const void *b) +{ + const struct font_desc *left = a, *right = b; + return lstrcmpiW(left->name, right->name); +} + static void populate_font_list(HWND hListWnd) { + struct font_array font_array = { 0 }; HDC hdc = GetDC(hMainWnd); LOGFONTW fontinfo; HWND hListEditWnd = (HWND)SendMessageW(hListWnd, CBEM_GETEDITCONTROL, 0, 0); CHARFORMAT2W fmt; + size_t i, j; fontinfo.lfCharSet = DEFAULT_CHARSET; *fontinfo.lfFaceName = '\0'; fontinfo.lfPitchAndFamily = 0; - EnumFontFamiliesExW(hdc, &fontinfo, enum_font_proc, - (LPARAM)hListWnd, 0); + /* Collect font names, sort, remove duplicates. */ + EnumFontFamiliesExW(hdc, &fontinfo, enum_font_proc, (LPARAM)&font_array, 0); + + qsort(font_array.fonts, font_array.count, sizeof(*font_array.fonts), fonts_desc_compare); + + for (i = 1, j = 0; i < font_array.count; ++i) + { + if (!lstrcmpiW(font_array.fonts[i].name, font_array.fonts[j].name)) + { + HeapFree(GetProcessHeap(), 0, font_array.fonts[i].name); + font_array.fonts[i].name = NULL; + } + else if (++j != i) + { + font_array.fonts[j] = font_array.fonts[i]; + font_array.fonts[i].name = NULL; + } + } + font_array.count = j + 1; + + for (i = 0; i < font_array.count; ++i) + { + COMBOBOXEXITEMW cbitem = { 0 }; + + cbitem.mask = CBEIF_TEXT | CBEIF_LPARAM; + cbitem.pszText = font_array.fonts[i].name; + cbitem.iItem = -1; + cbitem.lParam = font_array.fonts[i].lParam; + + SendMessageW(hListWnd, CBEM_INSERTITEMW, 0, (LPARAM)&cbitem); + + HeapFree(GetProcessHeap(), 0, font_array.fonts[i].name); + } + HeapFree(GetProcessHeap(), 0, font_array.fonts); ZeroMemory(&fmt, sizeof(fmt)); fmt.cbSize = sizeof(fmt); -- 2.28.0

1 0

[PATCH] user32/tests: Pass a struct DEVMODEA pointer to expect_dm() for monitor tests.
by Zhiyi Zhang Nov. 13, 2020

Nov. 13, 2020

No need to pass parameters via struct copying. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 56 ++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 009fc0d626e..c3f5d1eddcb 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -284,7 +284,7 @@ struct device_info }; #define expect_dm(a, b, c) _expect_dm(__LINE__, a, b, c) -static void _expect_dm(INT line, DEVMODEA expected, const CHAR *device, DWORD test) +static void _expect_dm(INT line, const DEVMODEA *expected, const CHAR *device, DWORD test) { DEVMODEA dm; BOOL ret; @@ -295,27 +295,27 @@ static void _expect_dm(INT line, DEVMODEA expected, const CHAR *device, DWORD te ret = EnumDisplaySettingsA(device, ENUM_CURRENT_SETTINGS, &dm); ok_(__FILE__, line)(ret, "Device %s test %d EnumDisplaySettingsA failed, error %#x\n", device, test, GetLastError()); - ok_(__FILE__, line)((dm.dmFields & expected.dmFields) == expected.dmFields, - "Device %s test %d expect dmFields to contain %#x, got %#x\n", device, test, expected.dmFields, dm.dmFields); + ok_(__FILE__, line)((dm.dmFields & expected->dmFields) == expected->dmFields, + "Device %s test %d expect dmFields to contain %#x, got %#x\n", device, test, expected->dmFields, dm.dmFields); /* Wine doesn't support changing color depth yet */ - todo_wine_if(expected.dmFields & DM_BITSPERPEL && expected.dmBitsPerPel != 32 && expected.dmBitsPerPel != 24) - ok_(__FILE__, line)(!(expected.dmFields & DM_BITSPERPEL) || dm.dmBitsPerPel == expected.dmBitsPerPel, - "Device %s test %d expect dmBitsPerPel %u, got %u\n", device, test, expected.dmBitsPerPel, dm.dmBitsPerPel); - ok_(__FILE__, line)(!(expected.dmFields & DM_PELSWIDTH) || dm.dmPelsWidth == expected.dmPelsWidth, - "Device %s test %d expect dmPelsWidth %u, got %u\n", device, test, expected.dmPelsWidth, dm.dmPelsWidth); - ok_(__FILE__, line)(!(expected.dmFields & DM_PELSHEIGHT) || dm.dmPelsHeight == expected.dmPelsHeight, - "Device %s test %d expect dmPelsHeight %u, got %u\n", device, test, expected.dmPelsHeight, dm.dmPelsHeight); - ok_(__FILE__, line)(!(expected.dmFields & DM_POSITION) || dm.dmPosition.x == expected.dmPosition.x, - "Device %s test %d expect dmPosition.x %d, got %d\n", device, test, expected.dmPosition.x, dm.dmPosition.x); - ok_(__FILE__, line)(!(expected.dmFields & DM_POSITION) || dm.dmPosition.y == expected.dmPosition.y, - "Device %s test %d expect dmPosition.y %d, got %d\n", device, test, expected.dmPosition.y, dm.dmPosition.y); - ok_(__FILE__, line)(!(expected.dmFields & DM_DISPLAYFREQUENCY) || - dm.dmDisplayFrequency == expected.dmDisplayFrequency, - "Device %s test %d expect dmDisplayFrequency %u, got %u\n", device, test, expected.dmDisplayFrequency, + todo_wine_if(expected->dmFields & DM_BITSPERPEL && expected->dmBitsPerPel != 32 && expected->dmBitsPerPel != 24) + ok_(__FILE__, line)(!(expected->dmFields & DM_BITSPERPEL) || dm.dmBitsPerPel == expected->dmBitsPerPel, + "Device %s test %d expect dmBitsPerPel %u, got %u\n", device, test, expected->dmBitsPerPel, dm.dmBitsPerPel); + ok_(__FILE__, line)(!(expected->dmFields & DM_PELSWIDTH) || dm.dmPelsWidth == expected->dmPelsWidth, + "Device %s test %d expect dmPelsWidth %u, got %u\n", device, test, expected->dmPelsWidth, dm.dmPelsWidth); + ok_(__FILE__, line)(!(expected->dmFields & DM_PELSHEIGHT) || dm.dmPelsHeight == expected->dmPelsHeight, + "Device %s test %d expect dmPelsHeight %u, got %u\n", device, test, expected->dmPelsHeight, dm.dmPelsHeight); + ok_(__FILE__, line)(!(expected->dmFields & DM_POSITION) || dm.dmPosition.x == expected->dmPosition.x, + "Device %s test %d expect dmPosition.x %d, got %d\n", device, test, expected->dmPosition.x, dm.dmPosition.x); + ok_(__FILE__, line)(!(expected->dmFields & DM_POSITION) || dm.dmPosition.y == expected->dmPosition.y, + "Device %s test %d expect dmPosition.y %d, got %d\n", device, test, expected->dmPosition.y, dm.dmPosition.y); + ok_(__FILE__, line)(!(expected->dmFields & DM_DISPLAYFREQUENCY) || + dm.dmDisplayFrequency == expected->dmDisplayFrequency, + "Device %s test %d expect dmDisplayFrequency %u, got %u\n", device, test, expected->dmDisplayFrequency, dm.dmDisplayFrequency); - ok_(__FILE__, line)(!(expected.dmFields & DM_DISPLAYORIENTATION) || - dm.dmDisplayOrientation == expected.dmDisplayOrientation, - "Device %s test %d expect dmDisplayOrientation %d, got %d\n", device, test, expected.dmDisplayOrientation, + ok_(__FILE__, line)(!(expected->dmFields & DM_DISPLAYORIENTATION) || + dm.dmDisplayOrientation == expected->dmDisplayOrientation, + "Device %s test %d expect dmDisplayOrientation %d, got %d\n", device, test, expected->dmDisplayOrientation, dm.dmDisplayOrientation); } @@ -667,7 +667,7 @@ static void test_ChangeDisplaySettingsEx(void) continue; } flush_events(); - expect_dm(dm3, devices[device].name, test); + expect_dm(&dm3, devices[device].name, test); /* Change the registry mode to the second mode */ res = ChangeDisplaySettingsExA(devices[device].name, &dm2, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); @@ -765,7 +765,7 @@ static void test_ChangeDisplaySettingsEx(void) } flush_events(); - expect_dm(dm, devices[device].name, mode); + expect_dm(&dm, devices[device].name, mode); } /* Restore settings */ @@ -838,7 +838,7 @@ static void test_ChangeDisplaySettingsEx(void) } flush_events(); - expect_dm(dm, devices[device].name, 0); + expect_dm(&dm, devices[device].name, 0); /* Test specifying only position, width and height */ memset(&dm, 0, sizeof(dm)); @@ -883,7 +883,7 @@ static void test_ChangeDisplaySettingsEx(void) ok(dm.dmBitsPerPel, "Expected dmBitsPerPel not zero.\n"); ok(dm.dmDisplayFrequency, "Expected dmDisplayFrequency not zero.\n"); - expect_dm(dm, devices[device].name, 0); + expect_dm(&dm, devices[device].name, 0); } /* Test dmPosition */ @@ -955,7 +955,7 @@ static void test_ChangeDisplaySettingsEx(void) ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[1].name, res); dm2.dmPosition.x = dm.dmPosition.x + dm.dmPelsWidth; - expect_dm(dm2, devices[1].name, 0); + expect_dm(&dm2, devices[1].name, 0); /* Test placing the secondary adapter to all sides of the primary adapter */ for (test = 0; test < 8; ++test) @@ -1014,7 +1014,7 @@ static void test_ChangeDisplaySettingsEx(void) } flush_events(); - expect_dm(dm2, devices[1].name, test); + expect_dm(&dm2, devices[1].name, test); } /* Test automatic position update when other adapters change resolution */ @@ -1079,7 +1079,7 @@ static void test_ChangeDisplaySettingsEx(void) ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s mode %d returned unexpected %d.\n", devices[device].name, mode, res); flush_events(); - expect_dm(dm2, devices[device].name, mode); + expect_dm(&dm2, devices[device].name, mode); /* EnumDisplaySettingsEx without EDS_ROTATEDMODE reports modes with current orientation */ memset(&dm3, 0, sizeof(dm3)); @@ -1125,7 +1125,7 @@ static void test_ChangeDisplaySettingsEx(void) broken(res == DISP_CHANGE_FAILED), /* win8 TestBot */ "ChangeDisplaySettingsExA returned unexpected %d\n", res); for (device = 0; device < device_count; ++device) - expect_dm(devices[device].original_mode, devices[device].name, 0); + expect_dm(&devices[device].original_mode, devices[device].name, 0); heap_free(devices); } -- 2.27.0

1 0

[PATCH] winex11.drv: Call XIconifyWindow() after XMapWindow() with a minimized window.
by Zhiyi Zhang Nov. 13, 2020

Nov. 13, 2020

Mutter always unminimizes a window when handling map requests. So a window could be in normal state as far as Mutter concerns while Wine mistakenly considers it still minimized. Fix Disgaea PC black screen after Alt+Tab in fullscreen mode. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Also see https://gitlab.gnome.org/GNOME/mutter/-/blob/master/src/x11/events.c#L1430 dlls/winex11.drv/window.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 457173964eb..03eed3ce091 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1128,6 +1128,9 @@ static void map_window( HWND hwnd, DWORD new_style ) data->mapped = TRUE; data->iconic = (new_style & WS_MINIMIZE) != 0; + /* Mutter always unminimizes windows when handling map requests. Restore iconic state here */ + if (data->iconic) + XIconifyWindow( data->display, data->whole_window, data->vis.screen ); } release_win_data( data ); } -- 2.27.0

1 0

[PATCH 2/2] wined3d: Do not use wined3d_output_get_desc() to retrieve display rotation.
by Zhiyi Zhang Nov. 13, 2020

Nov. 13, 2020

Most of the time when wined3d_output_get_desc() is called, display rotation is not needed. Retrieving display rotation is quite expensive because it needs to query information from XRandR. So use wined3d_output_get_display_mode() to retrieve display rotation when needed. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/output.c | 34 ++++++++++++++++++++++++++++++---- dlls/wined3d/directx.c | 4 +--- include/wine/wined3d.h | 1 - 3 files changed, 31 insertions(+), 8 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 03b5384f326..3ffa5d16408 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -288,6 +288,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput6 *iface, DXGI_O { struct dxgi_output *output = impl_from_IDXGIOutput6(iface); struct wined3d_output_desc wined3d_desc; + enum wined3d_display_rotation rotation; + struct wined3d_display_mode mode; HRESULT hr; TRACE("iface %p, desc %p.\n", iface, desc); @@ -297,18 +299,26 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput6 *iface, DXGI_O wined3d_mutex_lock(); hr = wined3d_output_get_desc(output->wined3d_output, &wined3d_desc); - wined3d_mutex_unlock(); - if (FAILED(hr)) { WARN("Failed to get output desc, hr %#x.\n", hr); + wined3d_mutex_unlock(); return hr; } + hr = wined3d_output_get_display_mode(output->wined3d_output, &mode, &rotation); + if (FAILED(hr)) + { + WARN("Failed to get output display mode, hr %#x.\n", hr); + wined3d_mutex_unlock(); + return hr; + } + wined3d_mutex_unlock(); + memcpy(desc->DeviceName, wined3d_desc.device_name, sizeof(desc->DeviceName)); desc->DesktopCoordinates = wined3d_desc.desktop_rect; desc->AttachedToDesktop = wined3d_desc.attached_to_desktop; - desc->Rotation = wined3d_desc.rotation; + desc->Rotation = rotation; desc->Monitor = wined3d_desc.monitor; return S_OK; @@ -550,6 +560,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc1(IDXGIOutput6 *iface, { struct dxgi_output *output = impl_from_IDXGIOutput6(iface); struct wined3d_output_desc wined3d_desc; + enum wined3d_display_rotation rotation; + struct wined3d_display_mode mode; HRESULT hr; FIXME("iface %p, desc %p semi-stub!\n", iface, desc); @@ -559,6 +571,20 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc1(IDXGIOutput6 *iface, wined3d_mutex_lock(); hr = wined3d_output_get_desc(output->wined3d_output, &wined3d_desc); + if (FAILED(hr)) + { + WARN("Failed to get output desc, hr %#x.\n", hr); + wined3d_mutex_unlock(); + return hr; + } + + hr = wined3d_output_get_display_mode(output->wined3d_output, &mode, &rotation); + if (FAILED(hr)) + { + WARN("Failed to get output display mode, hr %#x.\n", hr); + wined3d_mutex_unlock(); + return hr; + } wined3d_mutex_unlock(); if (FAILED(hr)) @@ -570,7 +596,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc1(IDXGIOutput6 *iface, memcpy(desc->DeviceName, wined3d_desc.device_name, sizeof(desc->DeviceName)); desc->DesktopCoordinates = wined3d_desc.desktop_rect; desc->AttachedToDesktop = wined3d_desc.attached_to_desktop; - desc->Rotation = wined3d_desc.rotation; + desc->Rotation = rotation; desc->Monitor = wined3d_desc.monitor; /* FIXME: fill this from monitor EDID */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 439720032f9..e73752315ba 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1002,14 +1002,12 @@ static BOOL CALLBACK enum_monitor_proc(HMONITOR monitor, HDC hdc, RECT *rect, LP HRESULT CDECL wined3d_output_get_desc(const struct wined3d_output *output, struct wined3d_output_desc *desc) { - struct wined3d_display_mode mode; - TRACE("output %p, desc %p.\n", output, desc); memset(desc, 0, sizeof(*desc)); lstrcpyW(desc->device_name, output->device_name); EnumDisplayMonitors(NULL, NULL, enum_monitor_proc, (LPARAM)desc); - return wined3d_output_get_display_mode(output, &mode, &desc->rotation); + return WINED3D_OK; } unsigned int CDECL wined3d_output_get_ordinal(const struct wined3d_output *output) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ac51fdf3528..c491e91aacb 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2156,7 +2156,6 @@ struct wined3d_output_desc WCHAR device_name[CCHDEVICENAME]; RECT desktop_rect; BOOL attached_to_desktop; - enum wined3d_display_rotation rotation; HMONITOR monitor; }; -- 2.27.0

1 0

[PATCH] gdiplus: Use wide-char string literals.
by Michael Stefaniuc Nov. 13, 2020

Nov. 13, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/font.c | 18 +++----- dlls/gdiplus/image.c | 101 +++++++++++++++++++------------------------ 2 files changed, 50 insertions(+), 69 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index eb0b6c08366..b0504b5d894 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -961,16 +961,14 @@ GpStatus WINGDIPAPI GdipIsStyleAvailable(GDIPCONST GpFontFamily* family, */ GpStatus WINGDIPAPI GdipGetGenericFontFamilyMonospace(GpFontFamily **nativeFamily) { - static const WCHAR CourierNew[] = {'C','o','u','r','i','e','r',' ','N','e','w','\0'}; - static const WCHAR LiberationMono[] = {'L','i','b','e','r','a','t','i','o','n',' ','M','o','n','o','\0'}; GpStatus stat; if (nativeFamily == NULL) return InvalidParameter; - stat = GdipCreateFontFamilyFromName(CourierNew, NULL, nativeFamily); + stat = GdipCreateFontFamilyFromName(L"Courier New", NULL, nativeFamily); if (stat == FontFamilyNotFound) - stat = GdipCreateFontFamilyFromName(LiberationMono, NULL, nativeFamily); + stat = GdipCreateFontFamilyFromName(L"Liberation Mono", NULL, nativeFamily); if (stat == FontFamilyNotFound) ERR("Missing 'Courier New' font\n"); @@ -992,18 +990,16 @@ GpStatus WINGDIPAPI GdipGetGenericFontFamilyMonospace(GpFontFamily **nativeFamil */ GpStatus WINGDIPAPI GdipGetGenericFontFamilySerif(GpFontFamily **nativeFamily) { - static const WCHAR TimesNewRoman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n','\0'}; - static const WCHAR LiberationSerif[] = {'L','i','b','e','r','a','t','i','o','n',' ','S','e','r','i','f','\0'}; GpStatus stat; TRACE("(%p)\n", nativeFamily); if (nativeFamily == NULL) return InvalidParameter; - stat = GdipCreateFontFamilyFromName(TimesNewRoman, NULL, nativeFamily); + stat = GdipCreateFontFamilyFromName(L"Times New Roman", NULL, nativeFamily); if (stat == FontFamilyNotFound) - stat = GdipCreateFontFamilyFromName(LiberationSerif, NULL, nativeFamily); + stat = GdipCreateFontFamilyFromName(L"Liberation Serif", NULL, nativeFamily); if (stat == FontFamilyNotFound) ERR("Missing 'Times New Roman' font\n"); @@ -1026,18 +1022,16 @@ GpStatus WINGDIPAPI GdipGetGenericFontFamilySerif(GpFontFamily **nativeFamily) GpStatus WINGDIPAPI GdipGetGenericFontFamilySansSerif(GpFontFamily **nativeFamily) { GpStatus stat; - static const WCHAR MicrosoftSansSerif[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; - static const WCHAR Tahoma[] = {'T','a','h','o','m','a','\0'}; TRACE("(%p)\n", nativeFamily); if (nativeFamily == NULL) return InvalidParameter; - stat = GdipCreateFontFamilyFromName(MicrosoftSansSerif, NULL, nativeFamily); + stat = GdipCreateFontFamilyFromName(L"Microsoft Sans Serif", NULL, nativeFamily); if (stat == FontFamilyNotFound) /* FIXME: Microsoft Sans Serif is not installed on Wine. */ - stat = GdipCreateFontFamilyFromName(Tahoma, NULL, nativeFamily); + stat = GdipCreateFontFamilyFromName(L"Tahoma", NULL, nativeFamily); return stat; } diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 39f717b5b3d..7a3ba8f4761 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3089,10 +3089,9 @@ static PropertyItem *get_property(IWICMetadataReader *reader, const GUID *guid, static PropertyItem *get_gif_comment(IWICMetadataReader *reader) { - static const WCHAR textentryW[] = { 'T','e','x','t','E','n','t','r','y',0 }; PropertyItem *comment; - comment = get_property(reader, &GUID_MetadataFormatGifComment, textentryW); + comment = get_property(reader, &GUID_MetadataFormatGifComment, L"TextEntry"); if (comment) comment->id = PropertyTagExifUserComment; @@ -3101,17 +3100,15 @@ static PropertyItem *get_gif_comment(IWICMetadataReader *reader) static PropertyItem *get_gif_loopcount(IWICMetadataReader *reader) { - static const WCHAR applicationW[] = { 'A','p','p','l','i','c','a','t','i','o','n',0 }; - static const WCHAR dataW[] = { 'D','a','t','a',0 }; PropertyItem *appext = NULL, *appdata = NULL, *loop = NULL; - appext = get_property(reader, &GUID_MetadataFormatAPE, applicationW); + appext = get_property(reader, &GUID_MetadataFormatAPE, L"Application"); if (appext) { if (appext->type == PropertyTagTypeByte && appext->length == 11 && (!memcmp(appext->value, "NETSCAPE2.0", 11) || !memcmp(appext->value, "ANIMEXTS1.0", 11))) { - appdata = get_property(reader, &GUID_MetadataFormatAPE, dataW); + appdata = get_property(reader, &GUID_MetadataFormatAPE, L"Data"); if (appdata) { if (appdata->type == PropertyTagTypeByte && appdata->length == 4) @@ -3142,10 +3139,9 @@ static PropertyItem *get_gif_loopcount(IWICMetadataReader *reader) static PropertyItem *get_gif_background(IWICMetadataReader *reader) { - static const WCHAR backgroundW[] = { 'B','a','c','k','g','r','o','u','n','d','C','o','l','o','r','I','n','d','e','x',0 }; PropertyItem *background; - background = get_property(reader, &GUID_MetadataFormatLSD, backgroundW); + background = get_property(reader, &GUID_MetadataFormatLSD, L"BackgroundColorIndex"); if (background) background->id = PropertyTagIndexBackground; @@ -3154,14 +3150,13 @@ static PropertyItem *get_gif_background(IWICMetadataReader *reader) static PropertyItem *get_gif_palette(IWICBitmapDecoder *decoder, IWICMetadataReader *reader) { - static const WCHAR global_flagW[] = { 'G','l','o','b','a','l','C','o','l','o','r','T','a','b','l','e','F','l','a','g',0 }; HRESULT hr; IWICImagingFactory *factory; IWICPalette *palette; UINT count = 0; WICColor colors[256]; - if (!get_bool_property(reader, &GUID_MetadataFormatLSD, global_flagW)) + if (!get_bool_property(reader, &GUID_MetadataFormatLSD, L"GlobalColorTableFlag")) return NULL; hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); @@ -3209,13 +3204,11 @@ static PropertyItem *get_gif_palette(IWICBitmapDecoder *decoder, IWICMetadataRea static PropertyItem *get_gif_transparent_idx(IWICMetadataReader *reader) { - static const WCHAR transparency_flagW[] = { 'T','r','a','n','s','p','a','r','e','n','c','y','F','l','a','g',0 }; - static const WCHAR colorW[] = { 'T','r','a','n','s','p','a','r','e','n','t','C','o','l','o','r','I','n','d','e','x',0 }; PropertyItem *index = NULL; - if (get_bool_property(reader, &GUID_MetadataFormatGCE, transparency_flagW)) + if (get_bool_property(reader, &GUID_MetadataFormatGCE, L"TransparencyFlag")) { - index = get_property(reader, &GUID_MetadataFormatGCE, colorW); + index = get_property(reader, &GUID_MetadataFormatGCE, L"TransparentColorIndex"); if (index) index->id = PropertyTagIndexTransparent; } @@ -3264,7 +3257,6 @@ static LONG get_gif_frame_property(IWICBitmapFrameDecode *frame, const GUID *for static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT active_frame) { - static const WCHAR delayW[] = { 'D','e','l','a','y',0 }; HRESULT hr; IWICBitmapFrameDecode *frame; IWICMetadataBlockReader *block_reader; @@ -3293,7 +3285,7 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI hr = IWICBitmapDecoder_GetFrame(decoder, i, &frame); if (hr == S_OK) { - value[i] = get_gif_frame_property(frame, &GUID_MetadataFormatGCE, delayW); + value[i] = get_gif_frame_property(frame, &GUID_MetadataFormatGCE, L"Delay"); IWICBitmapFrameDecode_Release(frame); } else value[i] = 0; @@ -3799,11 +3791,8 @@ static GpStatus select_frame_wic(GpImage *image, UINT active_frame) static HRESULT get_gif_frame_rect(IWICBitmapFrameDecode *frame, UINT *left, UINT *top, UINT *width, UINT *height) { - static const WCHAR leftW[] = {'L','e','f','t',0}; - static const WCHAR topW[] = {'T','o','p',0}; - - *left = get_gif_frame_property(frame, &GUID_MetadataFormatIMD, leftW); - *top = get_gif_frame_property(frame, &GUID_MetadataFormatIMD, topW); + *left = get_gif_frame_property(frame, &GUID_MetadataFormatIMD, L"Left"); + *top = get_gif_frame_property(frame, &GUID_MetadataFormatIMD, L"Top"); return IWICBitmapFrameDecode_GetSize(frame, width, height); } @@ -3885,8 +3874,6 @@ static DWORD get_gif_background_color(GpBitmap *bitmap) static GpStatus select_frame_gif(GpImage* image, UINT active_frame) { - static const WCHAR disposalW[] = {'D','i','s','p','o','s','a','l',0}; - GpBitmap *bitmap = (GpBitmap*)image; IWICBitmapFrameDecode *frame; int cur_frame=0, disposal; @@ -3898,7 +3885,7 @@ static GpStatus select_frame_gif(GpImage* image, UINT active_frame) hr = IWICBitmapDecoder_GetFrame(bitmap->image.decoder, image->current_frame, &frame); if(FAILED(hr)) return hresult_to_status(hr); - disposal = get_gif_frame_property(frame, &GUID_MetadataFormatGCE, disposalW); + disposal = get_gif_frame_property(frame, &GUID_MetadataFormatGCE, L"Disposal"); IWICBitmapFrameDecode_Release(frame); if(disposal == GIF_DISPOSE_RESTORE_TO_BKGND) @@ -3911,7 +3898,7 @@ static GpStatus select_frame_gif(GpImage* image, UINT active_frame) hr = IWICBitmapDecoder_GetFrame(bitmap->image.decoder, cur_frame, &frame); if(FAILED(hr)) return hresult_to_status(hr); - disposal = get_gif_frame_property(frame, &GUID_MetadataFormatGCE, disposalW); + disposal = get_gif_frame_property(frame, &GUID_MetadataFormatGCE, L"Disposal"); if(disposal==GIF_DISPOSE_UNSPECIFIED || disposal==GIF_DISPOSE_DO_NOT_DISPOSE) { hr = blit_gif_frame(bitmap, frame, cur_frame==0); @@ -4852,59 +4839,59 @@ GpStatus WINGDIPAPI GdipSetImagePalette(GpImage *image, */ /* ImageCodecInfo creation routines taken from libgdiplus */ -static const WCHAR bmp_codecname[] = {'B', 'u', 'i','l', 't', '-','i', 'n', ' ', 'B', 'M', 'P', 0}; /* Built-in BMP */ -static const WCHAR bmp_extension[] = {'*','.','B', 'M', 'P',';', '*','.', 'D','I', 'B',';', '*','.', 'R', 'L', 'E',0}; /* *.BMP;*.DIB;*.RLE */ -static const WCHAR bmp_mimetype[] = {'i', 'm', 'a','g', 'e', '/', 'b', 'm', 'p', 0}; /* image/bmp */ -static const WCHAR bmp_format[] = {'B', 'M', 'P', 0}; /* BMP */ +static const WCHAR bmp_codecname[] = L"Built-in BMP"; +static const WCHAR bmp_extension[] = L"*.BMP;*.DIB;*.RLE"; +static const WCHAR bmp_mimetype[] = L"image/bmp"; +static const WCHAR bmp_format[] = L"BMP"; static const BYTE bmp_sig_pattern[] = { 0x42, 0x4D }; static const BYTE bmp_sig_mask[] = { 0xFF, 0xFF }; -static const WCHAR jpeg_codecname[] = {'B', 'u', 'i','l', 't', '-','i', 'n', ' ', 'J','P','E','G', 0}; -static const WCHAR jpeg_extension[] = {'*','.','J','P','G',';', '*','.','J','P','E','G',';', '*','.','J','P','E',';', '*','.','J','F','I','F',0}; -static const WCHAR jpeg_mimetype[] = {'i','m','a','g','e','/','j','p','e','g', 0}; -static const WCHAR jpeg_format[] = {'J','P','E','G',0}; +static const WCHAR jpeg_codecname[] = L"Built-in JPEG"; +static const WCHAR jpeg_extension[] = L"*.JPG;*.JPEG;*.JPE;*.JFIF"; +static const WCHAR jpeg_mimetype[] = L"image/jpeg"; +static const WCHAR jpeg_format[] = L"JPEG"; static const BYTE jpeg_sig_pattern[] = { 0xFF, 0xD8 }; static const BYTE jpeg_sig_mask[] = { 0xFF, 0xFF }; -static const WCHAR gif_codecname[] = {'B', 'u', 'i','l', 't', '-','i', 'n', ' ', 'G','I','F', 0}; -static const WCHAR gif_extension[] = {'*','.','G','I','F',0}; -static const WCHAR gif_mimetype[] = {'i','m','a','g','e','/','g','i','f', 0}; -static const WCHAR gif_format[] = {'G','I','F',0}; +static const WCHAR gif_codecname[] = L"Built-in GIF"; +static const WCHAR gif_extension[] = L"*.GIF"; +static const WCHAR gif_mimetype[] = L"image/gif"; +static const WCHAR gif_format[] = L"GIF"; static const BYTE gif_sig_pattern[12] = "GIF87aGIF89a"; static const BYTE gif_sig_mask[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; -static const WCHAR tiff_codecname[] = {'B', 'u', 'i','l', 't', '-','i', 'n', ' ', 'T','I','F','F', 0}; -static const WCHAR tiff_extension[] = {'*','.','T','I','F','F',';','*','.','T','I','F',0}; -static const WCHAR tiff_mimetype[] = {'i','m','a','g','e','/','t','i','f','f', 0}; -static const WCHAR tiff_format[] = {'T','I','F','F',0}; +static const WCHAR tiff_codecname[] = L"Built-in TIFF"; +static const WCHAR tiff_extension[] = L"*.TIFF;*.TIF"; +static const WCHAR tiff_mimetype[] = L"image/tiff"; +static const WCHAR tiff_format[] = L"TIFF"; static const BYTE tiff_sig_pattern[] = {0x49,0x49,42,0,0x4d,0x4d,0,42}; static const BYTE tiff_sig_mask[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; -static const WCHAR emf_codecname[] = {'B', 'u', 'i','l', 't', '-','i', 'n', ' ', 'E','M','F', 0}; -static const WCHAR emf_extension[] = {'*','.','E','M','F',0}; -static const WCHAR emf_mimetype[] = {'i','m','a','g','e','/','x','-','e','m','f', 0}; -static const WCHAR emf_format[] = {'E','M','F',0}; +static const WCHAR emf_codecname[] = L"Built-in EMF"; +static const WCHAR emf_extension[] = L"*.EMF"; +static const WCHAR emf_mimetype[] = L"image/x-emf"; +static const WCHAR emf_format[] = L"EMF"; static const BYTE emf_sig_pattern[] = { 0x01, 0x00, 0x00, 0x00 }; static const BYTE emf_sig_mask[] = { 0xFF, 0xFF, 0xFF, 0xFF }; -static const WCHAR wmf_codecname[] = {'B', 'u', 'i','l', 't', '-','i', 'n', ' ', 'W','M','F', 0}; -static const WCHAR wmf_extension[] = {'*','.','W','M','F',0}; -static const WCHAR wmf_mimetype[] = {'i','m','a','g','e','/','x','-','w','m','f', 0}; -static const WCHAR wmf_format[] = {'W','M','F',0}; +static const WCHAR wmf_codecname[] = L"Built-in WMF"; +static const WCHAR wmf_extension[] = L"*.WMF"; +static const WCHAR wmf_mimetype[] = L"image/x-wmf"; +static const WCHAR wmf_format[] = L"WMF"; static const BYTE wmf_sig_pattern[] = { 0xd7, 0xcd }; static const BYTE wmf_sig_mask[] = { 0xFF, 0xFF }; -static const WCHAR png_codecname[] = {'B', 'u', 'i','l', 't', '-','i', 'n', ' ', 'P','N','G', 0}; -static const WCHAR png_extension[] = {'*','.','P','N','G',0}; -static const WCHAR png_mimetype[] = {'i','m','a','g','e','/','p','n','g', 0}; -static const WCHAR png_format[] = {'P','N','G',0}; +static const WCHAR png_codecname[] = L"Built-in PNG"; +static const WCHAR png_extension[] = L"*.PNG"; +static const WCHAR png_mimetype[] = L"image/png"; +static const WCHAR png_format[] = L"PNG"; static const BYTE png_sig_pattern[] = { 137, 80, 78, 71, 13, 10, 26, 10, }; static const BYTE png_sig_mask[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; -static const WCHAR ico_codecname[] = {'B', 'u', 'i','l', 't', '-','i', 'n', ' ', 'I','C','O', 0}; -static const WCHAR ico_extension[] = {'*','.','I','C','O',0}; -static const WCHAR ico_mimetype[] = {'i','m','a','g','e','/','x','-','i','c','o','n', 0}; -static const WCHAR ico_format[] = {'I','C','O',0}; +static const WCHAR ico_codecname[] = L"Built-in ICO"; +static const WCHAR ico_extension[] = L"*.ICO"; +static const WCHAR ico_mimetype[] = L"image/x-icon"; +static const WCHAR ico_format[] = L"ICO"; static const BYTE ico_sig_pattern[] = { 0x00, 0x00, 0x01, 0x00 }; static const BYTE ico_sig_mask[] = { 0xFF, 0xFF, 0xFF, 0xFF }; -- 2.26.2

2 1

[PATCH 1/2] d3dx10/tests: Add tests for D3DX10GetImageInfoFromResource{A, W}().
by Ziqing Hui Nov. 13, 2020

Nov. 13, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 78 +++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+)

3 5