Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
fcb08263
Commit
fcb08263
authored
Nov 17, 2020
by
Nikolay Sivov
Committed by
Alexandre Julliard
Nov 17, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
evr/presenter: Fix error code for unsupported services.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
315cf3b6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
presenter.c
dlls/evr/presenter.c
+1
-1
evr.c
dlls/evr/tests/evr.c
+5
-0
No files found.
dlls/evr/presenter.c
View file @
fcb08263
...
...
@@ -1258,7 +1258,7 @@ static HRESULT WINAPI video_presenter_getservice_GetService(IMFGetService *iface
FIXME
(
"Unimplemented service %s.
\n
"
,
debugstr_guid
(
service
));
return
E_NOTIMPL
;
return
MF_E_UNSUPPORTED_SERVICE
;
}
static
const
IMFGetServiceVtbl
video_presenter_getservice_vtbl
=
...
...
dlls/evr/tests/evr.c
View file @
fcb08263
...
...
@@ -1129,6 +1129,7 @@ static void test_default_presenter(void)
IDirect3DDeviceManager9
*
dm
;
IMFVideoDeviceID
*
deviceid
;
HWND
hwnd
,
hwnd2
;
IUnknown
*
unk
;
DWORD
flags
;
float
rate
;
HRESULT
hr
;
...
...
@@ -1162,8 +1163,12 @@ static void test_default_presenter(void)
check_service_interface
(
presenter
,
&
MR_VIDEO_RENDER_SERVICE
,
&
IID_IMFGetService
,
TRUE
);
check_service_interface
(
presenter
,
&
MR_VIDEO_RENDER_SERVICE
,
&
IID_IMFVideoDeviceID
,
TRUE
);
check_service_interface
(
presenter
,
&
MR_VIDEO_RENDER_SERVICE
,
&
IID_IMFQualityAdvise
,
TRUE
);
check_service_interface
(
presenter
,
&
MR_VIDEO_RENDER_SERVICE
,
&
IID_IMFTransform
,
FALSE
);
check_service_interface
(
presenter
,
&
MR_VIDEO_ACCELERATION_SERVICE
,
&
IID_IDirect3DDeviceManager9
,
TRUE
);
hr
=
MFGetService
((
IUnknown
*
)
presenter
,
&
MR_VIDEO_MIXER_SERVICE
,
&
IID_IUnknown
,
(
void
**
)
&
unk
);
ok
(
hr
==
MF_E_UNSUPPORTED_SERVICE
,
"Unexpected hr %#x.
\n
"
,
hr
);
hr
=
IMFVideoPresenter_QueryInterface
(
presenter
,
&
IID_IMFVideoDeviceID
,
(
void
**
)
&
deviceid
);
ok
(
hr
==
S_OK
,
"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