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

dwrite: Use system default locale when filling LOGFONT.lfFaceName. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Nikolay Sivov 2016-12-07 16:46:38 +03:00 committed by Alexandre Julliard
parent 547d9491af
commit bf23b8a529
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/dwrite/opentype.c
View File

@ -1645,7 +1645,7 @@ HRESULT opentype_get_font_facename(struct file_stream_desc *stream_desc, WCHAR *
BOOL exists;
exists = FALSE;
if (GetUserDefaultLocaleName(localeW, sizeof(localeW)/sizeof(WCHAR)))
if (GetSystemDefaultLocaleName(localeW, sizeof(localeW)/sizeof(WCHAR)))
IDWriteLocalizedStrings_FindLocaleName(lfnames, localeW, &index, &exists);
if (!exists)

2
dlls/dwrite/tests/font.c
View File

@ -3544,7 +3544,7 @@ static void get_logfont_from_font(IDWriteFont *font, LOGFONTW *logfont)
/* Fallback to en-us if there's no string for user locale. */
exists = FALSE;
if (GetUserDefaultLocaleName(localeW, sizeof(localeW)/sizeof(WCHAR)))
if (GetSystemDefaultLocaleName(localeW, sizeof(localeW)/sizeof(WCHAR)))
IDWriteLocalizedStrings_FindLocaleName(names, localeW, &index, &exists);
if (!exists)

1
include/winnls.h
View File

@ -915,6 +915,7 @@ WINBASEAPI BOOL WINAPI GetStringTypeExA(LCID,DWORD,LPCSTR,INT,LPWORD);
WINBASEAPI BOOL WINAPI GetStringTypeExW(LCID,DWORD,LPCWSTR,INT,LPWORD);
#define GetStringTypeEx WINELIB_NAME_AW(GetStringTypeEx)
WINBASEAPI LANGID WINAPI GetSystemDefaultLangID(void);
WINBASEAPI INT WINAPI GetSystemDefaultLocaleName(LPWSTR,int);
WINBASEAPI LCID WINAPI GetSystemDefaultLCID(void);
WINBASEAPI LANGID WINAPI GetSystemDefaultUILanguage(void);
WINBASEAPI BOOL WINAPI GetSystemPreferredUILanguages(DWORD,ULONG*,WCHAR*,ULONG*);