marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dwrite: Sort localized strings by locale name. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Nikolay Sivov 2019-09-19 17:41:02 +03:00 committed by Alexandre Julliard
parent ea07bc4190
commit c435eb5c51
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/dwrite/dwrite_private.h
View File

@ -237,6 +237,7 @@ extern HRESULT create_localizedstrings(IDWriteLocalizedStrings**) DECLSPEC_HIDDE
extern HRESULT add_localizedstring(IDWriteLocalizedStrings*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN;
extern HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **strings) DECLSPEC_HIDDEN;
extern void set_en_localizedstring(IDWriteLocalizedStrings*,const WCHAR*) DECLSPEC_HIDDEN;
extern void sort_localizedstrings(IDWriteLocalizedStrings*) DECLSPEC_HIDDEN;
extern HRESULT get_system_fontcollection(IDWriteFactory5*,IDWriteFontCollection1**) DECLSPEC_HIDDEN;
extern HRESULT get_eudc_fontcollection(IDWriteFactory5*,IDWriteFontCollection1**) DECLSPEC_HIDDEN;
extern IDWriteTextAnalyzer *get_text_analyzer(void) DECLSPEC_HIDDEN;

14
dlls/dwrite/main.c
View File

@ -520,6 +520,20 @@ void set_en_localizedstring(IDWriteLocalizedStrings *iface, const WCHAR *string)
}
}
static int localizedstrings_sorting_compare(const void *left, const void *right)
{
const struct localizedpair *_l = left, *_r = right;
return strcmpW(_l->locale, _r->locale);
};
void sort_localizedstrings(IDWriteLocalizedStrings *iface)
{
struct localizedstrings *strings = impl_from_IDWriteLocalizedStrings(iface);
qsort(strings->data, strings->count, sizeof(*strings->data), localizedstrings_sorting_compare);
}
struct collectionloader
{
struct list entry;

3
dlls/dwrite/opentype.c
View File

@ -2010,6 +2010,9 @@ static HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OP
}
}
if (*strings)
sort_localizedstrings(*strings);
return exists ? S_OK : E_FAIL;
}