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
5512d8e7
Commit
5512d8e7
authored
Mar 26, 2012
by
Christian Costa
Committed by
Alexandre Julliard
Mar 26, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
amstream: Video streams do not support default renderer.
parent
f5ee1304
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
amstream.c
dlls/amstream/amstream.c
+3
-0
amstream.c
dlls/amstream/tests/amstream.c
+4
-4
No files found.
dlls/amstream/amstream.c
View file @
5512d8e7
...
...
@@ -329,6 +329,9 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream
if
(
!
IsEqualGUID
(
PurposeId
,
&
MSPID_PrimaryVideo
)
&&
!
IsEqualGUID
(
PurposeId
,
&
MSPID_PrimaryAudio
))
return
MS_E_PURPOSEID
;
if
(
IsEqualGUID
(
PurposeId
,
&
MSPID_PrimaryVideo
)
&&
(
dwFlags
&
AMMSF_ADDDEFAULTRENDERER
))
return
MS_E_PURPOSEID
;
hr
=
mediastream_create
((
IMultiMediaStream
*
)
iface
,
PurposeId
,
This
->
StreamType
,
&
pStream
);
if
(
SUCCEEDED
(
hr
))
{
...
...
dlls/amstream/tests/amstream.c
View file @
5512d8e7
...
...
@@ -190,13 +190,13 @@ static void test_media_streams(void)
/* Verify there is no default renderer for video stream */
hr
=
IAMMultiMediaStream_AddMediaStream
(
pams
,
(
IUnknown
*
)
pdd7
,
&
MSPID_PrimaryVideo
,
AMMSF_ADDDEFAULTRENDERER
,
NULL
);
todo_wine
ok
(
hr
==
MS_E_PURPOSEID
,
"IAMMultiMediaStream_AddMediaStream returned: %x
\n
"
,
hr
);
ok
(
hr
==
MS_E_PURPOSEID
,
"IAMMultiMediaStream_AddMediaStream returned: %x
\n
"
,
hr
);
hr
=
IAMMultiMediaStream_GetMediaStream
(
pams
,
&
MSPID_PrimaryVideo
,
&
video_stream
);
todo_wine
ok
(
hr
==
MS_E_NOSTREAM
,
"IAMMultiMediaStream_GetMediaStream returned: %x
\n
"
,
hr
);
ok
(
hr
==
MS_E_NOSTREAM
,
"IAMMultiMediaStream_GetMediaStream returned: %x
\n
"
,
hr
);
hr
=
IAMMultiMediaStream_AddMediaStream
(
pams
,
NULL
,
&
MSPID_PrimaryVideo
,
AMMSF_ADDDEFAULTRENDERER
,
NULL
);
todo_wine
ok
(
hr
==
MS_E_PURPOSEID
,
"IAMMultiMediaStream_AddMediaStream returned: %x
\n
"
,
hr
);
ok
(
hr
==
MS_E_PURPOSEID
,
"IAMMultiMediaStream_AddMediaStream returned: %x
\n
"
,
hr
);
hr
=
IAMMultiMediaStream_GetMediaStream
(
pams
,
&
MSPID_PrimaryVideo
,
&
video_stream
);
todo_wine
ok
(
hr
==
MS_E_NOSTREAM
,
"IAMMultiMediaStream_GetMediaStream returned: %x
\n
"
,
hr
);
ok
(
hr
==
MS_E_NOSTREAM
,
"IAMMultiMediaStream_GetMediaStream returned: %x
\n
"
,
hr
);
/* Verify normal case for video stream */
hr
=
IAMMultiMediaStream_AddMediaStream
(
pams
,
NULL
,
&
MSPID_PrimaryVideo
,
0
,
NULL
);
...
...
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