Nikolay Sivov : mfmediaengine: Implement GetResourceCharacteristics().

Alexandre Julliard julliard at winehq.org
Fri Feb 18 15:14:58 CST 2022


Module: wine
Branch: master
Commit: 1d1eebf38a3fac115a45f7d99aaaecf1c46b8bec
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=1d1eebf38a3fac115a45f7d99aaaecf1c46b8bec

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Fri Feb 18 10:47:40 2022 +0300

mfmediaengine: Implement GetResourceCharacteristics().

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/mfmediaengine/main.c                | 14 ++++++++++++--
 dlls/mfmediaengine/tests/mfmediaengine.c | 15 ++++++++++++++-
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c
index 4a7d85348d7..a78cc130657 100644
--- a/dlls/mfmediaengine/main.c
+++ b/dlls/mfmediaengine/main.c
@@ -2453,9 +2453,19 @@ static HRESULT WINAPI media_engine_FrameStep(IMFMediaEngineEx *iface, BOOL forwa
 
 static HRESULT WINAPI media_engine_GetResourceCharacteristics(IMFMediaEngineEx *iface, DWORD *flags)
 {
-    FIXME("%p, %p stub.\n", iface, flags);
+    struct media_engine *engine = impl_from_IMFMediaEngineEx(iface);
+    HRESULT hr = E_FAIL;
 
-    return E_NOTIMPL;
+    TRACE("%p, %p.\n", iface, flags);
+
+    EnterCriticalSection(&engine->cs);
+    if (engine->flags & FLAGS_ENGINE_SHUT_DOWN)
+        hr = MF_E_SHUTDOWN;
+    else if (engine->presentation.source)
+        hr = IMFMediaSource_GetCharacteristics(engine->presentation.source, flags);
+    LeaveCriticalSection(&engine->cs);
+
+    return hr;
 }
 
 static HRESULT WINAPI media_engine_GetPresentationAttribute(IMFMediaEngineEx *iface, REFGUID attribute,
diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c
index f67b6512db7..f05f24b7172 100644
--- a/dlls/mfmediaengine/tests/mfmediaengine.c
+++ b/dlls/mfmediaengine/tests/mfmediaengine.c
@@ -295,9 +295,9 @@ static void test_Shutdown(void)
     IMFMediaEngineEx *media_engine_ex;
     IMFMediaTimeRange *time_range;
     IMFMediaEngine *media_engine;
+    DWORD flags, cx, cy;
     unsigned int state;
     UINT32 value;
-    DWORD cx, cy;
     double val;
     HRESULT hr;
     BSTR str;
@@ -451,6 +451,12 @@ static void test_Shutdown(void)
         hr = IMFMediaEngineEx_SetAudioEndpointRole(media_engine_ex, eConsole);
         ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr);
 
+        hr = IMFMediaEngineEx_GetResourceCharacteristics(media_engine_ex, NULL);
+        ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr);
+
+        hr = IMFMediaEngineEx_GetResourceCharacteristics(media_engine_ex, &flags);
+        ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr);
+
         IMFMediaEngineEx_Release(media_engine_ex);
     }
 
@@ -863,6 +869,7 @@ static void test_SetSourceFromByteStream(void)
 {
     struct media_engine_notify *notify;
     IMFMediaEngineEx *media_engine;
+    DWORD flags;
     HRESULT hr;
 
     notify = create_callback();
@@ -878,6 +885,12 @@ static void test_SetSourceFromByteStream(void)
     hr = IMFMediaEngineEx_SetSourceFromByteStream(media_engine, NULL, NULL);
     ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr);
 
+    hr = IMFMediaEngineEx_GetResourceCharacteristics(media_engine, NULL);
+    ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr);
+
+    hr = IMFMediaEngineEx_GetResourceCharacteristics(media_engine, &flags);
+    ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr);
+
     IMFMediaEngineEx_Release(media_engine);
     IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface);
 }




More information about the wine-cvs mailing list