Michael Stefaniuc : qcap: Remove initialization code from QI of VfwCapture.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Jul 28 13:30:06 CDT 2015


Module: wine
Branch: master
Commit: 6984db834a0d9938a3ed83f0ab9f9783f5d0b4c5
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6984db834a0d9938a3ed83f0ab9f9783f5d0b4c5

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Mon Jul 27 09:26:56 2015 +0200

qcap: Remove initialization code from QI of VfwCapture.

---

 dlls/qcap/vfwcapture.c | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c
index 7804a3d..67cc8f5 100644
--- a/dlls/qcap/vfwcapture.c
+++ b/dlls/qcap/vfwcapture.c
@@ -181,22 +181,6 @@ static HRESULT WINAPI VfwCapture_QueryInterface(IBaseFilter * iface, REFIID riid
     else if (IsEqualIID(riid, &IID_IPersistPropertyBag))
         *ppv = &This->IPersistPropertyBag_iface;
 
-    if (!IsEqualIID(riid, &IID_IUnknown) &&
-        !IsEqualIID(riid, &IID_IPersist) &&
-        !IsEqualIID(riid, &IID_IPersistPropertyBag) &&
-        !This->init)
-    {
-        FIXME("Capture system not initialised when looking for %s, "
-              "trying it on primary device now\n", debugstr_guid(riid));
-        This->driver_info = qcap_driver_init( This->pOutputPin, 0 );
-        if (!This->driver_info)
-        {
-            ERR("VfwCapture initialisation failed\n");
-            return E_UNEXPECTED;
-        }
-        This->init = TRUE;
-    }
-
     if (*ppv)
     {
         TRACE("Returning %s interface\n", debugstr_guid(riid));




More information about the wine-cvs mailing list