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
f83762e6
Commit
f83762e6
authored
Feb 08, 2012
by
Aric Stewart
Committed by
Alexandre Julliard
Feb 08, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdi32: Allow font replacements to be specified either in localized name or English name.
parent
b32b969e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
2 deletions
+17
-2
freetype.c
dlls/gdi32/freetype.c
+17
-2
No files found.
dlls/gdi32/freetype.c
View file @
f83762e6
...
...
@@ -937,6 +937,21 @@ static Family *find_family_from_name(const WCHAR *name)
return
NULL
;
}
static
Family
*
find_family_from_any_name
(
const
WCHAR
*
name
)
{
Family
*
family
;
LIST_FOR_EACH_ENTRY
(
family
,
&
font_list
,
Family
,
entry
)
{
if
(
!
strcmpiW
(
family
->
FamilyName
,
name
))
return
family
;
if
(
family
->
EnglishName
&&
!
strcmpiW
(
family
->
EnglishName
,
name
))
return
family
;
}
return
NULL
;
}
static
void
DumpSubstList
(
void
)
{
FontSubst
*
psub
;
...
...
@@ -1888,13 +1903,13 @@ static void LoadReplaceList(void)
/* "NewName"="Oldname" */
WideCharToMultiByte
(
CP_ACP
,
0
,
value
,
-
1
,
familyA
,
sizeof
(
familyA
),
NULL
,
NULL
);
if
(
!
find_family_from_name
(
value
))
if
(
!
find_family_from_
any_
name
(
value
))
{
/* Find the old family and hence all of the font files
in that family */
LIST_FOR_EACH
(
family_elem_ptr
,
&
font_list
)
{
family
=
LIST_ENTRY
(
family_elem_ptr
,
Family
,
entry
);
if
(
!
strcmpiW
(
family
->
FamilyName
,
data
))
{
if
(
!
strcmpiW
(
family
->
FamilyName
,
data
)
||
(
family
->
EnglishName
&&
!
strcmpiW
(
family
->
EnglishName
,
data
))
)
{
LIST_FOR_EACH
(
face_elem_ptr
,
&
family
->
faces
)
{
face
=
LIST_ENTRY
(
face_elem_ptr
,
Face
,
entry
);
TRACE
(
"mapping %s %s to %s
\n
"
,
debugstr_w
(
family
->
FamilyName
),
...
...
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