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
bee56c33
Commit
bee56c33
authored
Jun 16, 2016
by
Nikolay Sivov
Committed by
Alexandre Julliard
Jun 17, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dwrite: Don't bother going through fallback for non-visual runs.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
a963b6c8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
32 additions
and
1 deletion
+32
-1
layout.c
dlls/dwrite/layout.c
+32
-1
No files found.
dlls/dwrite/layout.c
View file @
bee56c33
...
...
@@ -789,17 +789,48 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout)
/* resolve run fonts */
LIST_FOR_EACH_ENTRY
(
r
,
&
layout
->
runs
,
struct
layout_run
,
entry
)
{
struct
regular_layout_run
*
run
=
&
r
->
u
.
regular
;
IDWriteFont
*
font
;
UINT32
length
;
if
(
r
->
kind
==
LAYOUT_RUN_INLINE
)
continue
;
range
=
get_layout_range_by_pos
(
layout
,
run
->
descr
.
textPosition
);
if
(
run
->
sa
.
shapes
==
DWRITE_SCRIPT_SHAPES_NO_VISUAL
)
{
IDWriteFontCollection
*
collection
;
if
(
range
->
collection
)
{
collection
=
range
->
collection
;
IDWriteFontCollection_AddRef
(
collection
);
}
else
IDWriteFactory_GetSystemFontCollection
((
IDWriteFactory
*
)
layout
->
factory
,
&
collection
,
FALSE
);
hr
=
create_matching_font
(
range
->
collection
,
range
->
fontfamily
,
range
->
weight
,
range
->
style
,
range
->
stretch
,
&
font
);
IDWriteFontCollection_Release
(
collection
);
if
(
FAILED
(
hr
))
{
WARN
(
"%s: failed to create a font for non visual run, %s, collection %p
\n
"
,
debugstr_rundescr
(
&
run
->
descr
),
debugstr_w
(
range
->
fontfamily
),
range
->
collection
);
return
hr
;
}
hr
=
IDWriteFont_CreateFontFace
(
font
,
&
run
->
run
.
fontFace
);
IDWriteFont_Release
(
font
);
if
(
FAILED
(
hr
))
return
hr
;
run
->
run
.
fontEmSize
=
range
->
fontsize
;
continue
;
}
length
=
run
->
descr
.
stringLength
;
while
(
length
)
{
UINT32
mapped_length
;
IDWriteFont
*
font
;
FLOAT
scale
;
run
=
&
r
->
u
.
regular
;
...
...
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