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
2d15db61
Commit
2d15db61
authored
Oct 27, 2008
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
Oct 27, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdi32: Search the child font list first.
parent
9fbe249f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
0 deletions
+14
-0
freetype.c
dlls/gdi32/freetype.c
+14
-0
No files found.
dlls/gdi32/freetype.c
View file @
2d15db61
...
...
@@ -3114,6 +3114,19 @@ static GdiFont *find_in_cache(HFONT hfont, const LOGFONTW *plf, const FMAT2 *pma
fd
.
can_use_bitmap
=
can_use_bitmap
;
calc_hash
(
&
fd
);
/* try the child list */
LIST_FOR_EACH
(
font_elem_ptr
,
&
child_font_list
)
{
ret
=
LIST_ENTRY
(
font_elem_ptr
,
struct
tagGdiFont
,
entry
);
if
(
!
fontcmp
(
ret
,
&
fd
))
{
if
(
!
can_use_bitmap
&&
!
FT_IS_SCALABLE
(
ret
->
ft_face
))
continue
;
LIST_FOR_EACH
(
hfontlist_elem_ptr
,
&
ret
->
hfontlist
)
{
hflist
=
LIST_ENTRY
(
hfontlist_elem_ptr
,
struct
tagHFONTLIST
,
entry
);
if
(
hflist
->
hfont
==
hfont
)
return
ret
;
}
}
}
/* try the in-use list */
LIST_FOR_EACH
(
font_elem_ptr
,
&
gdi_font_list
)
{
ret
=
LIST_ENTRY
(
font_elem_ptr
,
struct
tagGdiFont
,
entry
);
...
...
@@ -5340,6 +5353,7 @@ static BOOL load_child_font(GdiFont *font, CHILD_FONT *child)
return
FALSE
;
}
child
->
font
->
font_desc
=
font
->
font_desc
;
child
->
font
->
ntmFlags
=
child
->
face
->
ntmFlags
;
child
->
font
->
orientation
=
font
->
orientation
;
child
->
font
->
scale_y
=
font
->
scale_y
;
...
...
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