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
1349cf69
Commit
1349cf69
authored
Mar 27, 2012
by
Christian Costa
Committed by
Alexandre Julliard
Mar 28, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
amstream: Add stream to the media stream filter in IAMMultiMediaStreamImpl_AddMediaStream.
parent
76d69cdb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
5 deletions
+11
-5
amstream.c
dlls/amstream/amstream.c
+7
-1
amstream.c
dlls/amstream/tests/amstream.c
+4
-4
No files found.
dlls/amstream/amstream.c
View file @
1349cf69
...
...
@@ -333,7 +333,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream
IMediaStream
*
pStream
;
IMediaStream
**
pNewStreams
;
FIXME
(
"(%p/%p)->(%p,%s,%x,%p) partial stub!
\n
"
,
This
,
iface
,
pStreamObject
,
debugstr_guid
(
PurposeId
),
dwFlags
,
ppNewStream
);
TRACE
(
"(%p/%p)->(%p,%s,%x,%p)
\n
"
,
This
,
iface
,
pStreamObject
,
debugstr_guid
(
PurposeId
),
dwFlags
,
ppNewStream
);
if
(
!
IsEqualGUID
(
PurposeId
,
&
MSPID_PrimaryVideo
)
&&
!
IsEqualGUID
(
PurposeId
,
&
MSPID_PrimaryAudio
))
return
MS_E_PURPOSEID
;
...
...
@@ -379,6 +379,12 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream
*
ppNewStream
=
pStream
;
}
if
(
SUCCEEDED
(
hr
))
{
/* Add stream to the media stream filter */
IMediaStreamFilter_AddMediaStream
((
IMediaStreamFilter
*
)
This
->
media_stream_filter
,
(
IAMMediaStream
*
)
pStream
);
}
return
hr
;
}
...
...
dlls/amstream/tests/amstream.c
View file @
1349cf69
...
...
@@ -215,8 +215,8 @@ static void test_media_streams(void)
if
(
media_stream_filter
)
{
hr
=
IMediaStreamFilter_GetMediaStream
(
media_stream_filter
,
&
MSPID_PrimaryVideo
,
&
dummy_stream
);
todo_wine
ok
(
hr
==
S_OK
,
"IMediaStreamFilter_GetMediaStream returned: %x
\n
"
,
hr
);
todo_wine
ok
(
dummy_stream
==
video_stream
,
"Got wrong returned pointer %p, expected %p
\n
"
,
dummy_stream
,
video_stream
);
ok
(
hr
==
S_OK
,
"IMediaStreamFilter_GetMediaStream returned: %x
\n
"
,
hr
);
ok
(
dummy_stream
==
video_stream
,
"Got wrong returned pointer %p, expected %p
\n
"
,
dummy_stream
,
video_stream
);
if
(
SUCCEEDED
(
hr
))
IMediaStream_Release
(
dummy_stream
);
}
...
...
@@ -241,8 +241,8 @@ static void test_media_streams(void)
if
(
media_stream_filter
)
{
hr
=
IMediaStreamFilter_GetMediaStream
(
media_stream_filter
,
&
MSPID_PrimaryAudio
,
&
dummy_stream
);
todo_wine
ok
(
hr
==
S_OK
,
"IAMMultiMediaStream_GetMediaStream returned: %x
\n
"
,
hr
);
todo_wine
ok
(
dummy_stream
==
audio_stream
,
"Got wrong returned pointer %p, expected %p
\n
"
,
dummy_stream
,
audio_stream
);
ok
(
hr
==
S_OK
,
"IAMMultiMediaStream_GetMediaStream returned: %x
\n
"
,
hr
);
ok
(
dummy_stream
==
audio_stream
,
"Got wrong returned pointer %p, expected %p
\n
"
,
dummy_stream
,
audio_stream
);
if
(
SUCCEEDED
(
hr
))
IMediaStream_Release
(
dummy_stream
);
}
...
...
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