Signed-off-by: Andrew Eikum aeikum@codeweavers.com --- dlls/quartz/filtergraph.c | 3 --- dlls/quartz/tests/filtergraph.c | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 47b9da9510b..4351eaaffef 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2213,9 +2213,6 @@ static HRESULT WINAPI MediaSeeking_SetTimeFormat(IMediaSeeking *iface, const GUI
TRACE("(%p/%p)->(%s)\n", This, iface, debugstr_guid(pFormat));
- if (This->state != State_Stopped) - return VFW_E_WRONG_STATE; - if (!IsEqualGUID(&TIME_FORMAT_MEDIA_TIME, pFormat)) { FIXME("Unhandled time format %s\n", debugstr_guid(pFormat)); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index fef7b972fac..a83bfde0806 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -4930,6 +4930,12 @@ static void test_graph_seeking(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(time == 6000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(time));
+ hr = IMediaSeeking_SetTimeFormat(seeking, &TIME_FORMAT_MEDIA_TIME); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaSeeking_SetTimeFormat(seeking, &TIME_FORMAT_NONE); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr);
Since our current implementation is pretty much a stub anyway, this is fine.
That said, the tests are not exactly interesting (we only try setting it to MEDIA_TIME, which is already the format, and NONE, which is kind of special). As usual, I ended up writing more tests to validate the implementation, and found, interestingly enough, that while the filter graph is fine with changing the time format while running, it does not expect the same of its filters, and will actually stop and restart itself if you try to actually change the time format to something interesting. Rudimentary tests attached here.
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=102942
Your paranoid android.
=== build (build log) ===
error: patch failed: dlls/quartz/tests/filtergraph.c:4930 Task: Patch failed to apply
=== debiant2 (build log) ===
error: patch failed: dlls/quartz/tests/filtergraph.c:4930 Task: Patch failed to apply
=== debiant2 (build log) ===
error: patch failed: dlls/quartz/tests/filtergraph.c:4930 Task: Patch failed to apply