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
52f8191b
Commit
52f8191b
authored
Jul 08, 2020
by
Nikolay Sivov
Committed by
Alexandre Julliard
Jul 08, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
evr: Respond to IMFVideoMixerControl in mixer's GetService().
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
f557a5ee
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
mixer.c
dlls/evr/mixer.c
+3
-1
evr.c
dlls/evr/tests/evr.c
+4
-0
No files found.
dlls/evr/mixer.c
View file @
52f8191b
...
...
@@ -1021,7 +1021,9 @@ static HRESULT WINAPI video_mixer_getservice_GetService(IMFGetService *iface, RE
{
if
(
IsEqualIID
(
riid
,
&
IID_IMFVideoMixerBitmap
)
||
IsEqualIID
(
riid
,
&
IID_IMFVideoProcessor
)
||
IsEqualIID
(
riid
,
&
IID_IMFVideoPositionMapper
))
IsEqualIID
(
riid
,
&
IID_IMFVideoPositionMapper
)
||
IsEqualIID
(
riid
,
&
IID_IMFVideoMixerControl
)
||
IsEqualIID
(
riid
,
&
IID_IMFVideoMixerControl2
))
{
return
IMFGetService_QueryInterface
(
iface
,
riid
,
obj
);
}
...
...
dlls/evr/tests/evr.c
View file @
52f8191b
...
...
@@ -450,6 +450,10 @@ static void test_default_mixer(void)
hr
=
IMFGetService_GetService
(
gs
,
&
MR_VIDEO_MIXER_SERVICE
,
&
IID_IMFVideoProcessor
,
(
void
**
)
&
processor
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
hr
=
IMFGetService_GetService
(
gs
,
&
MR_VIDEO_MIXER_SERVICE
,
&
IID_IMFVideoMixerControl
,
(
void
**
)
&
unk
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
IUnknown_Release
(
unk
);
hr
=
IMFVideoProcessor_GetBackgroundColor
(
processor
,
NULL
);
ok
(
hr
==
E_POINTER
,
"Unexpected hr %#x.
\n
"
,
hr
);
...
...
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