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
6f7a9158
Commit
6f7a9158
authored
Dec 05, 2019
by
Nikolay Sivov
Committed by
Alexandre Julliard
Dec 05, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dwrite: Implement GetFontResource() for fontface.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
16152993
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
13 deletions
+6
-13
font.c
dlls/dwrite/font.c
+4
-2
font.c
dlls/dwrite/tests/font.c
+2
-11
No files found.
dlls/dwrite/font.c
View file @
6f7a9158
...
@@ -1435,9 +1435,11 @@ static BOOL WINAPI dwritefontface5_HasVariations(IDWriteFontFace5 *iface)
...
@@ -1435,9 +1435,11 @@ static BOOL WINAPI dwritefontface5_HasVariations(IDWriteFontFace5 *iface)
static
HRESULT
WINAPI
dwritefontface5_GetFontResource
(
IDWriteFontFace5
*
iface
,
IDWriteFontResource
**
resource
)
static
HRESULT
WINAPI
dwritefontface5_GetFontResource
(
IDWriteFontFace5
*
iface
,
IDWriteFontResource
**
resource
)
{
{
FIXME
(
"%p, %p: stub
\n
"
,
iface
,
resour
ce
);
struct
dwrite_fontface
*
fontface
=
impl_from_IDWriteFontFace5
(
ifa
ce
);
return
E_NOTIMPL
;
TRACE
(
"%p, %p.
\n
"
,
iface
,
resource
);
return
IDWriteFactory7_CreateFontResource
(
fontface
->
factory
,
fontface
->
files
[
0
],
fontface
->
index
,
resource
);
}
}
static
const
IDWriteFontFace5Vtbl
dwritefontfacevtbl
=
static
const
IDWriteFontFace5Vtbl
dwritefontfacevtbl
=
...
...
dlls/dwrite/tests/font.c
View file @
6f7a9158
...
@@ -9294,28 +9294,19 @@ if (SUCCEEDED(hr))
...
@@ -9294,28 +9294,19 @@ if (SUCCEEDED(hr))
ok
(
hr
==
S_OK
,
"Failed to get interface, hr %#x.
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"Failed to get interface, hr %#x.
\n
"
,
hr
);
hr
=
IDWriteFontFace5_GetFontResource
(
fontface5
,
&
resource2
);
hr
=
IDWriteFontFace5_GetFontResource
(
fontface5
,
&
resource2
);
todo_wine
ok
(
hr
==
S_OK
,
"Failed to get font resource, hr %#x.
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"Failed to get font resource, hr %#x.
\n
"
,
hr
);
if
(
SUCCEEDED
(
hr
))
{
ok
(
resource
!=
resource2
,
"Unexpected resource instance.
\n
"
);
ok
(
resource
!=
resource2
,
"Unexpected resource instance.
\n
"
);
IDWriteFontResource_Release
(
resource
);
IDWriteFontResource_Release
(
resource
);
}
hr
=
IDWriteFontFace5_GetFontResource
(
fontface5
,
&
resource
);
hr
=
IDWriteFontFace5_GetFontResource
(
fontface5
,
&
resource
);
todo_wine
ok
(
hr
==
S_OK
,
"Failed to get font resource, hr %#x.
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"Failed to get font resource, hr %#x.
\n
"
,
hr
);
if
(
SUCCEEDED
(
hr
))
{
ok
(
resource
!=
resource2
,
"Unexpected resource instance.
\n
"
);
ok
(
resource
!=
resource2
,
"Unexpected resource instance.
\n
"
);
EXPECT_REF
(
resource
,
1
);
EXPECT_REF
(
resource
,
1
);
IDWriteFontResource_Release
(
resource
);
IDWriteFontResource_Release
(
resource
);
IDWriteFontResource_Release
(
resource2
);
IDWriteFontResource_Release
(
resource2
);
}
IDWriteFontFace5_Release
(
fontface5
);
IDWriteFontFace5_Release
(
fontface5
);
IDWriteFontResource_Release
(
resource
);
IDWriteFontFile_Release
(
fontfile
);
IDWriteFontFile_Release
(
fontfile
);
IDWriteFontFace_Release
(
fontface
);
IDWriteFontFace_Release
(
fontface
);
...
...
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