Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
6a49adee
Commit
6a49adee
authored
Mar 14, 2012
by
Kusanagi Kouichi
Committed by
Alexandre Julliard
Mar 14, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdi32: find_face_from_filename() needs to take font replacements into account.
parent
cf7479ca
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
9 deletions
+11
-9
freetype.c
dlls/gdi32/freetype.c
+11
-9
No files found.
dlls/gdi32/freetype.c
View file @
6a49adee
...
...
@@ -890,6 +890,14 @@ static inline FT_Fixed FT_FixedFromFIXED(FIXED f)
}
static
const
struct
list
*
get_face_list_from_family
(
const
Family
*
family
)
{
if
(
!
list_empty
(
&
family
->
faces
))
return
&
family
->
faces
;
else
return
family
->
replacement
;
}
static
Face
*
find_face_from_filename
(
const
WCHAR
*
file_name
,
const
WCHAR
*
face_name
)
{
Family
*
family
;
...
...
@@ -903,9 +911,11 @@ static Face *find_face_from_filename(const WCHAR *file_name, const WCHAR *face_n
LIST_FOR_EACH_ENTRY
(
family
,
&
font_list
,
Family
,
entry
)
{
const
struct
list
*
face_list
;
if
(
face_name
&&
strcmpiW
(
face_name
,
family
->
FamilyName
))
continue
;
LIST_FOR_EACH_ENTRY
(
face
,
&
family
->
faces
,
Face
,
entry
)
face_list
=
get_face_list_from_family
(
family
);
LIST_FOR_EACH_ENTRY
(
face
,
face_list
,
Face
,
entry
)
{
if
(
!
face
->
file
)
continue
;
...
...
@@ -1957,14 +1967,6 @@ static SYSTEM_LINKS *find_font_link(const WCHAR *name)
return
NULL
;
}
static
const
struct
list
*
get_face_list_from_family
(
const
Family
*
family
)
{
if
(
!
list_empty
(
&
family
->
faces
))
return
&
family
->
faces
;
else
return
family
->
replacement
;
}
static
void
populate_system_links
(
const
WCHAR
*
name
,
const
WCHAR
*
const
*
values
)
{
const
WCHAR
*
value
;
...
...
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