Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
bf23b8a5
Commit
bf23b8a5
authored
Dec 07, 2016
by
Nikolay Sivov
Committed by
Alexandre Julliard
Dec 07, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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
>
parent
547d9491
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
opentype.c
dlls/dwrite/opentype.c
+1
-1
font.c
dlls/dwrite/tests/font.c
+1
-1
winnls.h
include/winnls.h
+1
-0
No files found.
dlls/dwrite/opentype.c
View file @
bf23b8a5
...
...
@@ -1645,7 +1645,7 @@ HRESULT opentype_get_font_facename(struct file_stream_desc *stream_desc, WCHAR *
BOOL
exists
;
exists
=
FALSE
;
if
(
Get
User
DefaultLocaleName
(
localeW
,
sizeof
(
localeW
)
/
sizeof
(
WCHAR
)))
if
(
Get
System
DefaultLocaleName
(
localeW
,
sizeof
(
localeW
)
/
sizeof
(
WCHAR
)))
IDWriteLocalizedStrings_FindLocaleName
(
lfnames
,
localeW
,
&
index
,
&
exists
);
if
(
!
exists
)
...
...
dlls/dwrite/tests/font.c
View file @
bf23b8a5
...
...
@@ -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
(
Get
User
DefaultLocaleName
(
localeW
,
sizeof
(
localeW
)
/
sizeof
(
WCHAR
)))
if
(
Get
System
DefaultLocaleName
(
localeW
,
sizeof
(
localeW
)
/
sizeof
(
WCHAR
)))
IDWriteLocalizedStrings_FindLocaleName
(
names
,
localeW
,
&
index
,
&
exists
);
if
(
!
exists
)
...
...
include/winnls.h
View file @
bf23b8a5
...
...
@@ -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
*
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment