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
0f222057
Commit
0f222057
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: Respond to IDWriteFontFace5 queries.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
393d50f9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
10 deletions
+14
-10
font.c
dlls/dwrite/font.c
+4
-3
font.c
dlls/dwrite/tests/font.c
+10
-7
No files found.
dlls/dwrite/font.c
View file @
0f222057
...
...
@@ -474,7 +474,8 @@ static HRESULT WINAPI dwritefontface_QueryInterface(IDWriteFontFace5 *iface, REF
TRACE
(
"%p, %s, %p.
\n
"
,
iface
,
debugstr_guid
(
riid
),
obj
);
if
(
IsEqualIID
(
riid
,
&
IID_IDWriteFontFace4
)
||
if
(
IsEqualIID
(
riid
,
&
IID_IDWriteFontFace5
)
||
IsEqualIID
(
riid
,
&
IID_IDWriteFontFace4
)
||
IsEqualIID
(
riid
,
&
IID_IDWriteFontFace3
)
||
IsEqualIID
(
riid
,
&
IID_IDWriteFontFace2
)
||
IsEqualIID
(
riid
,
&
IID_IDWriteFontFace1
)
||
...
...
@@ -1425,7 +1426,7 @@ static HRESULT WINAPI dwritefontface5_GetFontAxisValues(IDWriteFontFace5 *iface,
return
E_NOTIMPL
;
}
static
BOOL
WINAPI
dwritefontface5_HasVaria
n
tions
(
IDWriteFontFace5
*
iface
)
static
BOOL
WINAPI
dwritefontface5_HasVariations
(
IDWriteFontFace5
*
iface
)
{
FIXME
(
"%p: stub
\n
"
,
iface
);
...
...
@@ -1496,7 +1497,7 @@ static const IDWriteFontFace5Vtbl dwritefontfacevtbl =
dwritefontface4_ReleaseGlyphImageData
,
dwritefontface5_GetFontAxisValueCount
,
dwritefontface5_GetFontAxisValues
,
dwritefontface5_HasVaria
n
tions
,
dwritefontface5_HasVariations
,
dwritefontface5_GetFontResource
,
};
...
...
dlls/dwrite/tests/font.c
View file @
0f222057
...
...
@@ -9291,25 +9291,28 @@ if (SUCCEEDED(hr))
IDWriteFontFaceReference1_Release
(
reference
);
}
hr
=
IDWriteFontFace_QueryInterface
(
fontface
,
&
IID_IDWriteFontFace5
,
(
void
**
)
&
fontface5
);
todo_wine
ok
(
hr
==
S_OK
,
"Failed to get interface, hr %#x.
\n
"
,
hr
);
if
(
FAILED
(
hr
))
return
;
hr
=
IDWriteFontFace5_GetFontResource
(
fontface5
,
&
resource2
);
todo_wine
ok
(
hr
==
S_OK
,
"Failed to get font resource, hr %#x.
\n
"
,
hr
);
if
(
SUCCEEDED
(
hr
))
{
ok
(
resource
!=
resource2
,
"Unexpected resource instance.
\n
"
);
IDWriteFontResource_Release
(
resource
);
}
hr
=
IDWriteFontFace5_GetFontResource
(
fontface5
,
&
resource
);
todo_wine
ok
(
hr
==
S_OK
,
"Failed to get font resource, hr %#x.
\n
"
,
hr
);
if
(
SUCCEEDED
(
hr
))
{
ok
(
resource
!=
resource2
,
"Unexpected resource instance.
\n
"
);
EXPECT_REF
(
resource
,
1
);
IDWriteFontResource_Release
(
resource
);
IDWriteFontResource_Release
(
resource2
);
}
IDWriteFontFace5_Release
(
fontface5
);
IDWriteFontResource_Release
(
resource
);
...
...
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