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
0d533dea
Commit
0d533dea
authored
Dec 09, 2019
by
Nikolay Sivov
Committed by
Alexandre Julliard
Dec 09, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dwrite: Implement returning axis values from face reference.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
f7f93399
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
2 deletions
+19
-2
font.c
dlls/dwrite/font.c
+9
-2
font.c
dlls/dwrite/tests/font.c
+10
-0
No files found.
dlls/dwrite/font.c
View file @
0d533dea
...
...
@@ -6280,9 +6280,16 @@ static UINT32 WINAPI fontfacereference1_GetFontAxisValueCount(IDWriteFontFaceRef
static
HRESULT
WINAPI
fontfacereference1_GetFontAxisValues
(
IDWriteFontFaceReference1
*
iface
,
DWRITE_FONT_AXIS_VALUE
*
axis_values
,
UINT32
value_count
)
{
FIXME
(
"%p, %p, %u.
\n
"
,
iface
,
axis_values
,
value_count
);
struct
dwrite_fontfacereference
*
reference
=
impl_from_IDWriteFontFaceReference1
(
iface
);
return
E_NOTIMPL
;
TRACE
(
"%p, %p, %u.
\n
"
,
iface
,
axis_values
,
value_count
);
if
(
value_count
<
reference
->
axis_values_count
)
return
E_NOT_SUFFICIENT_BUFFER
;
memcpy
(
axis_values
,
reference
->
axis_values
,
value_count
*
sizeof
(
*
axis_values
));
return
S_OK
;
}
static
const
IDWriteFontFaceReference1Vtbl
fontfacereferencevtbl
=
...
...
dlls/dwrite/tests/font.c
View file @
0d533dea
...
...
@@ -9408,6 +9408,16 @@ static void test_font_resource(void)
ok
(
!
ret
,
"Unexpected result.
\n
"
);
IDWriteFontFaceReference1_Release
(
reference2
);
memset
(
axis_values
,
0
,
sizeof
(
axis_values
));
hr
=
IDWriteFontFaceReference1_GetFontAxisValues
(
reference
,
axis_values
,
1
);
ok
(
hr
==
E_NOT_SUFFICIENT_BUFFER
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
!
axis_values
[
0
].
axisTag
,
"Unexpected axis tag.
\n
"
);
memset
(
axis_values
,
0
,
sizeof
(
axis_values
));
hr
=
IDWriteFontFaceReference1_GetFontAxisValues
(
reference
,
axis_values
,
2
);
ok
(
hr
==
S_OK
,
"Failed to get axis values, hr %#x.
\n
"
,
hr
);
ok
(
axis_values
[
0
].
axisTag
==
DWRITE_FONT_AXIS_TAG_WEIGHT
,
"Unexpected axis tag.
\n
"
);
IDWriteFontFaceReference1_Release
(
reference
);
IDWriteFontFile_Release
(
fontfile
);
...
...
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