Zebediah Figura : qcap: Return the connection type from IAMStreamConfig::GetFormat() if connected.

Alexandre Julliard julliard at winehq.org
Thu Nov 26 16:30:59 CST 2020


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

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Wed Nov 25 17:43:35 2020 -0600

qcap: Return the connection type from IAMStreamConfig::GetFormat() if connected.

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/qcap/vfwcapture.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c
index f0a985d5f4b..5c1ce9af980 100644
--- a/dlls/qcap/vfwcapture.c
+++ b/dlls/qcap/vfwcapture.c
@@ -344,8 +344,14 @@ static HRESULT WINAPI AMStreamConfig_GetFormat(IAMStreamConfig *iface, AM_MEDIA_
     if (!(*mt = CoTaskMemAlloc(sizeof(**mt))))
         return E_OUTOFMEMORY;
 
-    if (SUCCEEDED(hr = capture_funcs->get_format(filter->device, *mt)))
+    EnterCriticalSection(&filter->filter.csFilter);
+
+    if (filter->source.pin.peer)
+        hr = CopyMediaType(*mt, &filter->source.pin.mt);
+    else if (SUCCEEDED(hr = capture_funcs->get_format(filter->device, *mt)))
         strmbase_dump_media_type(*mt);
+
+    LeaveCriticalSection(&filter->filter.csFilter);
     return hr;
 }
 




More information about the wine-cvs mailing list