Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/amstream/tests/amstream.c | 7 ------- 1 file changed, 7 deletions(-)
diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 4b7320500c..073e372c94 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2394,11 +2394,6 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_cleanup_stream = testfilter_cleanup_stream, };
-static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static HRESULT WINAPI testsource_DecideBufferSize(struct strmbase_source *iface, IMemAllocator *alloc, ALLOCATOR_PROPERTIES *requested) { @@ -2418,8 +2413,6 @@ static HRESULT WINAPI testsource_DecideBufferSize(struct strmbase_source *iface,
static const struct strmbase_source_ops testsource_ops = { - .base.pin_query_accept = testsource_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideBufferSize = testsource_DecideBufferSize, .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator,
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/wineqtdecoder/qtsplitter.c | 1 - dlls/wineqtdecoder/qtvdecoder.c | 7 ------- 2 files changed, 8 deletions(-)
diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index f52971f3f7..cabb090e8d 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -397,7 +397,6 @@ static void qt_splitter_sink_disconnect(struct strmbase_sink *iface) static const struct strmbase_sink_ops sink_ops = { .base.pin_query_accept = sink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .sink_connect = qt_splitter_sink_connect, .sink_disconnect = qt_splitter_sink_disconnect, }; diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index 41b29786cc..031b08e1de 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -168,11 +168,6 @@ static HRESULT video_decoder_sink_query_interface(struct strmbase_pin *iface, RE return S_OK; }
-static HRESULT video_decoder_sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static void trackingCallback( void *decompressionTrackingRefCon, OSStatus result, @@ -462,8 +457,6 @@ static void video_decoder_sink_disconnect(struct strmbase_sink *iface) static const struct strmbase_sink_ops sink_ops = { .base.pin_query_interface = video_decoder_sink_query_interface, - .base.pin_query_accept = video_decoder_sink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnReceive = video_decoder_sink_Receive, .sink_connect = video_decoder_sink_connect, .sink_disconnect = video_decoder_sink_disconnect,
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/qasf/tests/dmowrapper.c | 7 ------- 1 file changed, 7 deletions(-)
diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index a456891a38..72c05ee49c 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -1153,11 +1153,6 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_destroy = testfilter_destroy, };
-static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, IMemInputPin *input, IMemAllocator **allocator) { @@ -1166,8 +1161,6 @@ static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface,
static const struct strmbase_source_ops testsource_ops = { - .base.pin_query_accept = testsource_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = testsource_DecideAllocator, };
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/winegstreamer/gstdemux.c | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 2186192b59..7038cef9b3 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1568,7 +1568,6 @@ static void gstdemux_sink_disconnect(struct strmbase_sink *iface) static const struct strmbase_sink_ops sink_ops = { .base.pin_query_accept = sink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .sink_connect = gstdemux_sink_connect, .sink_disconnect = gstdemux_sink_disconnect, }; @@ -2298,7 +2297,6 @@ static HRESULT wave_parser_sink_query_accept(struct strmbase_pin *iface, const A static const struct strmbase_sink_ops wave_parser_sink_ops = { .base.pin_query_accept = wave_parser_sink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .sink_connect = gstdemux_sink_connect, .sink_disconnect = gstdemux_sink_disconnect, }; @@ -2415,7 +2413,6 @@ static HRESULT avi_splitter_sink_query_accept(struct strmbase_pin *iface, const static const struct strmbase_sink_ops avi_splitter_sink_ops = { .base.pin_query_accept = avi_splitter_sink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .sink_connect = gstdemux_sink_connect, .sink_disconnect = gstdemux_sink_disconnect, }; @@ -2536,7 +2533,6 @@ static HRESULT mpeg_splitter_sink_query_accept(struct strmbase_pin *iface, const static const struct strmbase_sink_ops mpeg_splitter_sink_ops = { .base.pin_query_accept = mpeg_splitter_sink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .sink_connect = gstdemux_sink_connect, .sink_disconnect = gstdemux_sink_disconnect, };
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/quartz/tests/avidec.c | 7 ------- dlls/quartz/tests/avisplit.c | 7 ------- dlls/quartz/tests/filesource.c | 6 ------ dlls/quartz/tests/mpegsplit.c | 7 ------- dlls/quartz/tests/videorenderer.c | 7 ------- dlls/quartz/tests/vmr7.c | 7 ------- dlls/quartz/tests/vmr9.c | 7 ------- 7 files changed, 48 deletions(-)
diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index 7b38561c01..0e1e92a950 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -769,11 +769,6 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_destroy = testfilter_destroy, };
-static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, IMemInputPin *peer, IMemAllocator **allocator) { @@ -782,8 +777,6 @@ static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface,
static const struct strmbase_source_ops testsource_ops = { - .base.pin_query_accept = testsource_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = testsource_DecideAllocator, }; diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 319c7a5ccd..a277256255 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -836,11 +836,6 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_destroy = testfilter_destroy, };
-static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static HRESULT testsource_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) { struct testfilter *filter = impl_from_strmbase_filter(iface->filter); @@ -877,8 +872,6 @@ static HRESULT WINAPI testsource_AttemptConnection(struct strmbase_source *iface static const struct strmbase_source_ops testsource_ops = { .base.pin_query_interface = testsource_query_interface, - .base.pin_query_accept = testsource_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnAttemptConnection = testsource_AttemptConnection, };
diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 2040910516..b50b06dc10 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -1240,11 +1240,6 @@ static const struct strmbase_filter_ops testsink_ops = .filter_destroy = testsink_destroy, };
-static HRESULT testsink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static HRESULT testsink_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) { struct testsink *filter = impl_sink_from_strmbase_filter(iface->filter); @@ -1274,7 +1269,6 @@ static void testsink_disconnect(struct strmbase_sink *iface)
static const struct strmbase_sink_ops testsink_pin_ops = { - .base.pin_query_accept = testsink_query_accept, .base.pin_get_media_type = testsink_get_media_type, .sink_connect = testsink_connect, .sink_disconnect = testsink_disconnect, diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index c8b368e4b6..9bfd7e3bb1 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -1126,11 +1126,6 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_destroy = testfilter_destroy, };
-static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static HRESULT testsource_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) { struct testfilter *filter = impl_from_strmbase_filter(iface->filter); @@ -1167,8 +1162,6 @@ static HRESULT WINAPI testsource_AttemptConnection(struct strmbase_source *iface static const struct strmbase_source_ops testsource_ops = { .base.pin_query_interface = testsource_query_interface, - .base.pin_query_accept = testsource_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnAttemptConnection = testsource_AttemptConnection, };
diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 356cfe96e4..3722a6f9dd 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -517,11 +517,6 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_destroy = testfilter_destroy, };
-static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, IMemInputPin *peer, IMemAllocator **allocator) { @@ -530,8 +525,6 @@ static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface,
static const struct strmbase_source_ops testsource_ops = { - .base.pin_query_accept = testsource_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = testsource_DecideAllocator, }; diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 19a89de573..f4b26db554 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -867,11 +867,6 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_destroy = testfilter_destroy, };
-static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, IMemInputPin *peer, IMemAllocator **allocator) { @@ -880,8 +875,6 @@ static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface,
static const struct strmbase_source_ops testsource_ops = { - .base.pin_query_accept = testsource_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = testsource_DecideAllocator, }; diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 3e9fccedf1..35776e85ff 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -876,11 +876,6 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_destroy = testfilter_destroy, };
-static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, IMemInputPin *peer, IMemAllocator **allocator) { @@ -889,8 +884,6 @@ static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface,
static const struct strmbase_source_ops testsource_ops = { - .base.pin_query_accept = testsource_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = testsource_DecideAllocator, };
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=70481
Your paranoid android.
=== debiant (32 bit Japanese:Japan report) ===
quartz: vmr9.c:2707: Test succeeded inside todo block: Got 1 calls to PresentImage().
-
Marvin -
Zebediah Figura