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
533d3b90
Commit
533d3b90
authored
Apr 19, 2017
by
Nikolay Sivov
Committed by
Alexandre Julliard
Apr 19, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dwrite: Trace QueryInterface fontface calls on failure (Coverity).
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
74f6c996
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
font.c
dlls/dwrite/font.c
+3
-1
main.c
dlls/dwrite/main.c
+3
-1
No files found.
dlls/dwrite/font.c
View file @
533d3b90
...
...
@@ -5135,6 +5135,7 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit
IDWriteFontFace1
*
fontface1
;
D2D_POINT_2F
origin
;
FLOAT
rtl_factor
;
HRESULT
hr
;
UINT32
i
;
*
ret
=
NULL
;
...
...
@@ -5196,7 +5197,8 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit
memcpy
(
analysis
->
glyphs
,
desc
->
run
->
glyphIndices
,
desc
->
run
->
glyphCount
*
sizeof
(
*
desc
->
run
->
glyphIndices
));
IDWriteFontFace_GetMetrics
(
desc
->
run
->
fontFace
,
&
metrics
);
IDWriteFontFace_QueryInterface
(
desc
->
run
->
fontFace
,
&
IID_IDWriteFontFace1
,
(
void
**
)
&
fontface1
);
if
(
FAILED
(
hr
=
IDWriteFontFace_QueryInterface
(
desc
->
run
->
fontFace
,
&
IID_IDWriteFontFace1
,
(
void
**
)
&
fontface1
)))
WARN
(
"Failed to get IDWriteFontFace1, %#x.
\n
"
,
hr
);
origin
.
x
=
desc
->
origin_x
*
desc
->
ppdip
;
origin
.
y
=
desc
->
origin_y
*
desc
->
ppdip
;
...
...
dlls/dwrite/main.c
View file @
533d3b90
...
...
@@ -1449,13 +1449,15 @@ static HRESULT compute_glyph_origins(DWRITE_GLYPH_RUN const *run, DWRITE_MEASURI
IDWriteFontFace1
*
fontface1
=
NULL
;
DWRITE_FONT_METRICS
metrics
;
FLOAT
rtl_factor
;
HRESULT
hr
;
UINT32
i
;
rtl_factor
=
run
->
bidiLevel
&
1
?
-
1
.
0
f
:
1
.
0
f
;
if
(
run
->
fontFace
)
{
IDWriteFontFace_GetMetrics
(
run
->
fontFace
,
&
metrics
);
IDWriteFontFace_QueryInterface
(
run
->
fontFace
,
&
IID_IDWriteFontFace1
,
(
void
**
)
&
fontface1
);
if
(
FAILED
(
hr
=
IDWriteFontFace_QueryInterface
(
run
->
fontFace
,
&
IID_IDWriteFontFace1
,
(
void
**
)
&
fontface1
)))
WARN
(
"Failed to get IDWriteFontFace1, %#x.
\n
"
,
hr
);
}
for
(
i
=
0
;
i
<
run
->
glyphCount
;
i
++
)
{
...
...
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