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
d9c44605
Commit
d9c44605
authored
Apr 20, 2016
by
Nikolay Sivov
Committed by
Alexandre Julliard
Apr 21, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dwrite: Implement IDWriteFont3::GetFontFaceReference().
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
9777c77a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
2 deletions
+24
-2
font.c
dlls/dwrite/font.c
+5
-2
font.c
dlls/dwrite/tests/font.c
+19
-0
No files found.
dlls/dwrite/font.c
View file @
d9c44605
...
...
@@ -1511,8 +1511,11 @@ static BOOL WINAPI dwritefont3_Equals(IDWriteFont3 *iface, IDWriteFont *font)
static
HRESULT
WINAPI
dwritefont3_GetFontFaceReference
(
IDWriteFont3
*
iface
,
IDWriteFontFaceReference
**
reference
)
{
struct
dwrite_font
*
This
=
impl_from_IDWriteFont3
(
iface
);
FIXME
(
"(%p)->(%p): stub
\n
"
,
This
,
reference
);
return
E_NOTIMPL
;
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
reference
);
return
IDWriteFactory3_CreateFontFaceReference_
(
This
->
data
->
factory
,
This
->
data
->
file
,
This
->
data
->
face_index
,
This
->
data
->
simulations
,
reference
);
}
static
BOOL
WINAPI
dwritefont3_HasCharacter
(
IDWriteFont3
*
iface
,
UINT32
ch
)
...
...
dlls/dwrite/tests/font.c
View file @
d9c44605
...
...
@@ -5830,6 +5830,8 @@ static void test_CreateFontFaceReference(void)
IDWriteFontFile
*
file
,
*
file1
;
IDWriteFactory3
*
factory3
;
IDWriteFactory
*
factory
;
IDWriteFont3
*
font3
;
IDWriteFont
*
font
;
UINT32
index
;
WCHAR
*
path
;
HRESULT
hr
;
...
...
@@ -5921,6 +5923,23 @@ todo_wine
IDWriteFontFile_Release
(
file
);
IDWriteFontFile_Release
(
file1
);
/* references returned from IDWriteFont3 */
font
=
get_tahoma_instance
((
IDWriteFactory
*
)
factory3
,
DWRITE_FONT_STYLE_NORMAL
);
hr
=
IDWriteFont_QueryInterface
(
font
,
&
IID_IDWriteFont3
,
(
void
**
)
&
font3
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
IDWriteFont_Release
(
font
);
hr
=
IDWriteFont3_GetFontFaceReference
(
font3
,
&
ref
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
hr
=
IDWriteFont3_GetFontFaceReference
(
font3
,
&
ref1
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
ok
(
ref
!=
ref1
,
"got %p, %p
\n
"
,
ref1
,
ref
);
IDWriteFontFaceReference_Release
(
ref
);
IDWriteFontFaceReference_Release
(
ref1
);
IDWriteFont3_Release
(
font3
);
IDWriteFactory3_Release
(
factory3
);
DELETE_FONTFILE
(
path
);
}
...
...
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