January 2022 - Wine-commits

Fabian Maurer : mfplay/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: 2bd79e8ed6059b0631d77052592dc3d24d6b5218 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bd79e8ed6059b0631d77052… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 27 20:16:05 2022 +0100 mfplay/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/tests/mfplay.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index 1daaa3af1d5..727ab1e3b9a 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -203,7 +203,7 @@ static void test_shutdown(void) ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFPMediaPlayer_UpdateVideo(player); -todo_wine + todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFPMediaPlayer_CreateMediaItemFromURL(player, L"url", TRUE, 0, &item); @@ -316,7 +316,7 @@ static void test_video_control(void) ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); hr = IMFPMediaPlayer_UpdateVideo(player); -todo_wine + todo_wine ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); IMFPMediaPlayer_Release(player); @@ -356,7 +356,7 @@ todo_wine ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); hr = IMFPMediaPlayer_UpdateVideo(player); -todo_wine + todo_wine ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); IMFPMediaPlayer_Release(player);

1 0

Fabian Maurer : nsi/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: b6a93c96768697bcb05eaa81dfcf17dd4e8946e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6a93c96768697bcb05eaa81… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 27 20:16:13 2022 +0100 nsi/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/tests/nsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index a9f8ba3ae6e..fc85d4ba8ff 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -631,7 +631,7 @@ static void test_ip_neighbour( int family ) err = NsiAllocateAndGetTable( 1, mod, NSI_IP_NEIGHBOUR_TABLE, (void **)&key_tbl, key_size, (void **)&rw_tbl, sizeof(*rw), (void **)&dyn_tbl, sizeof(*dyn), NULL, 0, &count, 0 ); -todo_wine_if( family == AF_INET6 ) + todo_wine_if( family == AF_INET6 ) ok( !err, "got %x\n", err ); if (err) goto err;

1 0

Fabian Maurer : mlang/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: 9178825fc9c18bf828cbfbd39cbbd6c2af96cf13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9178825fc9c18bf828cbfbd3… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 27 20:16:06 2022 +0100 mlang/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/tests/mlang.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 1486a643604..fd0611c72ac 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -2256,7 +2256,7 @@ static void test_IMLangConvertCharset(IMultiLanguage *ml) HRESULT hr; hr = IMultiLanguage_CreateConvertCharset(ml, CP_ACP, CP_UTF8, 0, &convert); -todo_wine + todo_wine ok(hr == S_FALSE, "expected S_FALSE got 0x%08x\n", hr); hr = IMLangConvertCharset_GetSourceCodePage(convert, NULL);

1 0

Fabian Maurer : msi/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: 164664a34ee7f01395e8b9028728a026268c1595 URL: https://source.winehq.org/git/wine.git/?a=commit;h=164664a34ee7f01395e8b902… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 27 20:16:08 2022 +0100 msi/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 6 +++--- dlls/msi/tests/db.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 1db132fbd2f..52ac63dc61b 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2782,7 +2782,7 @@ static void test_register_product(void) } res = RegDeleteKeyA(usage, ""); -todo_wine + todo_wine ok(!res, "got %d\n", res); RegCloseKey(usage); res = RegDeleteKeyA(hkey, ""); @@ -2887,7 +2887,7 @@ todo_wine } res = RegDeleteKeyA(usage, ""); -todo_wine + todo_wine ok(!res, "got %d\n", res); RegCloseKey(usage); res = RegDeleteKeyA(hkey, ""); @@ -2999,7 +2999,7 @@ todo_wine } res = RegDeleteKeyA(usage, ""); - todo_wine + todo_wine ok(!res, "got %d\n", res); RegCloseKey(usage); res = RegDeleteKeyA(hkey, ""); diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 447f2cdd0ee..b75e5f7a4b5 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -8864,7 +8864,7 @@ static void test_viewmodify_merge(void) MsiRecordSetInteger(rec, 1, 1); MsiRecordSetInteger(rec, 2, 3); r = MsiViewModify(view, MSIMODIFY_MERGE, rec); -todo_wine + todo_wine ok(r == ERROR_FUNCTION_FAILED, "got %u\n", r); MsiRecordSetInteger(rec, 1, 2); @@ -8913,7 +8913,7 @@ todo_wine MsiRecordSetInteger(rec, 3, 4); r = MsiViewModify(view, MSIMODIFY_MERGE, rec); -todo_wine + todo_wine ok(r == ERROR_FUNCTION_FAILED, "got %u\n", r); MsiRecordSetInteger(rec, 2, 4); @@ -8958,7 +8958,7 @@ todo_wine MsiRecordSetInteger(rec, 2, 3); r = MsiViewModify(view, MSIMODIFY_MERGE, rec); -todo_wine + todo_wine ok(r == ERROR_FUNCTION_FAILED, "got %u\n", r); MsiCloseHandle(rec); @@ -8998,7 +8998,7 @@ todo_wine MsiRecordSetInteger(rec, 2, 2); MsiRecordSetInteger(rec, 3, 3); r = MsiViewModify(view, MSIMODIFY_MERGE, rec); -todo_wine + todo_wine ok(r == ERROR_FUNCTION_FAILED, "got %u\n", r); MsiRecordSetInteger(rec, 1, 1);

1 0

Fabian Maurer : msvcirt/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: 1ebee86f6dad81232307b66df5b7a0d24b86a198 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ebee86f6dad81232307b66d… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 27 20:16:10 2022 +0100 msvcirt/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 21d513c0fd9..43ffb277ed4 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -3586,8 +3586,8 @@ static void test_ostream(void) { ret = (int) call_func1(p_ostream_opfx, &os1); ok(ret == 1, "expected 1 got %d\n", ret); os1.base_ios.sb = NULL; -if (0) /* crashes on native */ - call_func1(p_ostream_osfx, &os1); + if (0) /* crashes on native */ + call_func1(p_ostream_osfx, &os1); os1.base_ios.sb = &fb1.base; os1.base_ios.flags = FLAGS_unitbuf; call_func1(p_ostream_osfx, &os1);

1 0

Nikolay Sivov : mfmediaengine: Handle shutdown state in GetCurrentSource().
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: 86c0afc79701be10a56b99718f3441db2ae4082c URL: https://source.winehq.org/git/wine.git/?a=commit;h=86c0afc79701be10a56b9971… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 28 10:17:09 2022 +0300 mfmediaengine: Handle shutdown state in GetCurrentSource(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 4 ++++ dlls/mfmediaengine/tests/mfmediaengine.c | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 5c00c10f718..99beb17e429 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1464,11 +1464,15 @@ static HRESULT WINAPI media_engine_GetCurrentSource(IMFMediaEngineEx *iface, BST *url = NULL; EnterCriticalSection(&engine->cs); + + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; if (engine->current_source) { if (!(*url = SysAllocString(engine->current_source))) hr = E_OUTOFMEMORY; } + LeaveCriticalSection(&engine->cs); return hr; diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 8584554a2b6..6448e7f2169 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -319,7 +319,6 @@ static void test_Shutdown(void) ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFMediaEngine_GetCurrentSource(media_engine, &str); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); state = IMFMediaEngine_GetNetworkState(media_engine);

1 0

Nikolay Sivov : mfmediaengine: Handle shutdown state in Play().
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: 0f4f7ca9379aae020a2afcd6605a8d7595274af9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f4f7ca9379aae020a2afcd6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 28 10:17:10 2022 +0300 mfmediaengine: Handle shutdown state in Play(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 32 +++++++++++++++++++------------- dlls/mfmediaengine/tests/mfmediaengine.c | 1 - 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 99beb17e429..87851cee9c4 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1784,31 +1784,37 @@ static HRESULT WINAPI media_engine_SetLoop(IMFMediaEngineEx *iface, BOOL loop) static HRESULT WINAPI media_engine_Play(IMFMediaEngineEx *iface) { struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); + HRESULT hr = S_OK; TRACE("%p.\n", iface); EnterCriticalSection(&engine->cs); - IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PURGEQUEUEDEVENTS, 0, 0); - - if (!(engine->flags & FLAGS_ENGINE_WAITING)) + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else { - media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED | FLAGS_ENGINE_IS_ENDED, FALSE); - IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PLAY, 0, 0); + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PURGEQUEUEDEVENTS, 0, 0); - if (!(engine->flags & FLAGS_ENGINE_SOURCE_PENDING)) - media_engine_start_playback(engine); - else - media_engine_set_flag(engine, FLAGS_ENGINE_PLAY_PENDING, TRUE); + if (!(engine->flags & FLAGS_ENGINE_WAITING)) + { + media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED | FLAGS_ENGINE_IS_ENDED, FALSE); + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PLAY, 0, 0); - media_engine_set_flag(engine, FLAGS_ENGINE_WAITING, TRUE); - } + if (!(engine->flags & FLAGS_ENGINE_SOURCE_PENDING)) + media_engine_start_playback(engine); + else + media_engine_set_flag(engine, FLAGS_ENGINE_PLAY_PENDING, TRUE); - IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_WAITING, 0, 0); + media_engine_set_flag(engine, FLAGS_ENGINE_WAITING, TRUE); + } + + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_WAITING, 0, 0); + } LeaveCriticalSection(&engine->cs); - return S_OK; + return hr; } static HRESULT WINAPI media_engine_Pause(IMFMediaEngineEx *iface) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 6448e7f2169..ac34bd7c4cd 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -414,7 +414,6 @@ todo_wine ok(!!state, "Unexpected state.\n"); hr = IMFMediaEngine_Play(media_engine); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFMediaEngine_Pause(media_engine);

1 0

Nikolay Sivov : mfmediaengine: Handle shutdown state in Pause().
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: 318aa0f387d8c6ee037d9eb375951602041c743c URL: https://source.winehq.org/git/wine.git/?a=commit;h=318aa0f387d8c6ee037d9eb3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 28 10:17:11 2022 +0300 mfmediaengine: Handle shutdown state in Pause(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 22 ++++++++++++++-------- dlls/mfmediaengine/tests/mfmediaengine.c | 1 - 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 87851cee9c4..490d1630e95 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1820,25 +1820,31 @@ static HRESULT WINAPI media_engine_Play(IMFMediaEngineEx *iface) static HRESULT WINAPI media_engine_Pause(IMFMediaEngineEx *iface) { struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); + HRESULT hr = S_OK; TRACE("%p.\n", iface); EnterCriticalSection(&engine->cs); - if (!(engine->flags & FLAGS_ENGINE_PAUSED)) + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else { - media_engine_set_flag(engine, FLAGS_ENGINE_WAITING | FLAGS_ENGINE_IS_ENDED, FALSE); - media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED, TRUE); + if (!(engine->flags & FLAGS_ENGINE_PAUSED)) + { + media_engine_set_flag(engine, FLAGS_ENGINE_WAITING | FLAGS_ENGINE_IS_ENDED, FALSE); + media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED, TRUE); - IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_TIMEUPDATE, 0, 0); - IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PAUSE, 0, 0); - } + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_TIMEUPDATE, 0, 0); + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PAUSE, 0, 0); + } - IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PURGEQUEUEDEVENTS, 0, 0); + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PURGEQUEUEDEVENTS, 0, 0); + } LeaveCriticalSection(&engine->cs); - return S_OK; + return hr; } static BOOL WINAPI media_engine_GetMuted(IMFMediaEngineEx *iface) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index ac34bd7c4cd..388af4b1877 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -417,7 +417,6 @@ todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFMediaEngine_Pause(media_engine); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); state = IMFMediaEngine_GetMuted(media_engine);

1 0

Nikolay Sivov : mfmediaengine: Handle shutdown state in GetBuffered().
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: a4890ac799a01c6fddad6d210ec6f1e2489cb450 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4890ac799a01c6fddad6d21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 28 10:17:12 2022 +0300 mfmediaengine: Handle shutdown state in GetBuffered(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 6 +++++- dlls/mfmediaengine/tests/mfmediaengine.c | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 490d1630e95..91f1224f4b0 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1525,8 +1525,12 @@ static HRESULT WINAPI media_engine_GetBuffered(IMFMediaEngineEx *iface, IMFMedia return hr; EnterCriticalSection(&engine->cs); - if (!isnan(engine->duration)) + + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (!isnan(engine->duration)) hr = IMFMediaTimeRange_AddRange(*range, 0.0, engine->duration); + LeaveCriticalSection(&engine->cs); return hr; diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 388af4b1877..6e201893b0c 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -341,7 +341,6 @@ static void test_Shutdown(void) ok(state == 100, "Unexpected state %d.\n", state); hr = IMFMediaEngine_GetBuffered(media_engine, &time_range); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFMediaEngine_Load(media_engine);

1 0

Nikolay Sivov : mfmediaengine: Handle shutdown state in a few stubs.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: 4c61027967fc5ac7887cfbdb81b9fe726b55e12a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c61027967fc5ac7887cfbdb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 28 10:17:13 2022 +0300 mfmediaengine: Handle shutdown state in a few stubs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 60 +++++++++++++++++++++++++++++--- dlls/mfmediaengine/tests/mfmediaengine.c | 5 --- 2 files changed, 55 insertions(+), 10 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 91f1224f4b0..84d7677a328 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1538,16 +1538,36 @@ static HRESULT WINAPI media_engine_GetBuffered(IMFMediaEngineEx *iface, IMFMedia static HRESULT WINAPI media_engine_Load(IMFMediaEngineEx *iface) { + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); + HRESULT hr = E_NOTIMPL; + FIXME("(%p): stub.\n", iface); - return E_NOTIMPL; + EnterCriticalSection(&engine->cs); + + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_CanPlayType(IMFMediaEngineEx *iface, BSTR type, MF_MEDIA_ENGINE_CANPLAY *answer) { + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); + HRESULT hr = E_NOTIMPL; + FIXME("(%p, %s, %p): stub.\n", iface, debugstr_w(type), answer); - return E_NOTIMPL; + EnterCriticalSection(&engine->cs); + + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + + LeaveCriticalSection(&engine->cs); + + return hr; } static USHORT WINAPI media_engine_GetReadyState(IMFMediaEngineEx *iface) @@ -1595,9 +1615,19 @@ static double WINAPI media_engine_GetCurrentTime(IMFMediaEngineEx *iface) static HRESULT WINAPI media_engine_SetCurrentTime(IMFMediaEngineEx *iface, double time) { + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); + HRESULT hr = E_NOTIMPL; + FIXME("(%p, %f): stub.\n", iface, time); - return E_NOTIMPL; + EnterCriticalSection(&engine->cs); + + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + + LeaveCriticalSection(&engine->cs); + + return hr; } static double WINAPI media_engine_GetStartTime(IMFMediaEngineEx *iface) @@ -1705,16 +1735,36 @@ static HRESULT WINAPI media_engine_SetPlaybackRate(IMFMediaEngineEx *iface, doub static HRESULT WINAPI media_engine_GetPlayed(IMFMediaEngineEx *iface, IMFMediaTimeRange **played) { + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); + HRESULT hr = E_NOTIMPL; + FIXME("(%p, %p): stub.\n", iface, played); - return E_NOTIMPL; + EnterCriticalSection(&engine->cs); + + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_GetSeekable(IMFMediaEngineEx *iface, IMFMediaTimeRange **seekable) { + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); + HRESULT hr = E_NOTIMPL; + FIXME("(%p, %p): stub.\n", iface, seekable); - return E_NOTIMPL; + EnterCriticalSection(&engine->cs); + + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + + LeaveCriticalSection(&engine->cs); + + return hr; } static BOOL WINAPI media_engine_IsEnded(IMFMediaEngineEx *iface) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 6e201893b0c..00690b25ebe 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -344,12 +344,10 @@ static void test_Shutdown(void) ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFMediaEngine_Load(media_engine); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); str = SysAllocString(L"video/mp4"); hr = IMFMediaEngine_CanPlayType(media_engine, str, &state); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); SysFreeString(str); @@ -363,7 +361,6 @@ todo_wine ok(val == 0.0, "Unexpected time %f.\n", val); hr = IMFMediaEngine_SetCurrentTime(media_engine, 1.0); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); val = IMFMediaEngine_GetStartTime(media_engine); @@ -382,11 +379,9 @@ todo_wine ok(val == 1.0, "Unexpected rate %f.\n", val); hr = IMFMediaEngine_GetPlayed(media_engine, &time_range); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFMediaEngine_GetSeekable(media_engine, &time_range); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); state = IMFMediaEngine_IsEnded(media_engine);

1 0