Zebediah Figura : qcap/vfwcapture: Share pin and filter reference counts.

[Alexandre Julliard]

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

Author: Zebediah Figura 
Date:   Mon Jun 17 20:41:56 2019 -0500

qcap/vfwcapture: Share pin and filter reference counts.

Signed-off-by: Zebediah Figura 
Signed-off-by: Alexandre Julliard

---

dlls/qcap/vfwcapture.c | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c
index 0bf8c45..2cb1f7d 100644
--- a/dlls/qcap/vfwcapture.c
+++ b/dlls/qcap/vfwcapture.c
@@ -97,6 +97,11 @@ typedef struct VfwPinImpl
     VfwCapture *parent;
 } VfwPinImpl;

+static inline VfwPinImpl *impl_from_IPin(IPin *iface)
+{
+    return CONTAINING_RECORD(iface, VfwPinImpl, pin.pin.IPin_iface);
+}
+
 static IPin *vfw_capture_get_pin(BaseFilter *iface, unsigned int index)
 {
     VfwCapture *This = impl_from_BaseFilter(iface);
@@ -125,7 +130,7 @@ static void vfw_capture_destroy(BaseFilter *iface)
         IPin_Disconnect(filter->pOutputPin);
         IPin_Release(peer);
     }
-    IPin_Release(filter->pOutputPin);
+    BaseOutputPin_Destroy(&impl_from_IPin(filter->pOutputPin)->pin);
     strmbase_filter_cleanup(&filter->filter);
     CoTaskMemFree(filter);
     ObjectRefCount(FALSE);
@@ -648,11 +653,6 @@ VfwPin_Construct( IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec,
     return hr;
 }

-static inline VfwPinImpl *impl_from_IPin(IPin *iface)
-{
-    return CONTAINING_RECORD(iface, VfwPinImpl, pin.pin.IPin_iface);
-}
-
 static HRESULT WINAPI VfwPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv)
 {
     VfwPinImpl *This = impl_from_IPin(iface);
@@ -677,20 +677,17 @@ static HRESULT WINAPI VfwPin_QueryInterface(IPin * iface, REFIID riid, LPVOID *
     return E_NOINTERFACE;
 }

+static ULONG WINAPI VfwPin_AddRef(IPin *iface)
+{
+    VfwPinImpl *pin = impl_from_IPin(iface);
+    return IBaseFilter_AddRef(pin->pin.pin.pinInfo.pFilter);
+}
+
 static ULONG WINAPI
 VfwPin_Release(IPin * iface)
 {
-   VfwPinImpl *This = impl_from_IPin(iface);
-   ULONG refCount = InterlockedDecrement(&This->pin.pin.refCount);
-
-   TRACE("() -> new refcount: %u\n", refCount);
-
-   if (!refCount)
-   {
-      BaseOutputPin_Destroy(&This->pin);
-      ObjectRefCount(FALSE);
-   }
-   return refCount;
+    VfwPinImpl *pin = impl_from_IPin(iface);
+    return IBaseFilter_Release(pin->pin.pin.pinInfo.pFilter);
 }

static HRESULT WINAPI
@@ -719,7 +716,7 @@ VfwPin_QueryInternalConnections(IPin * iface, IPin ** apPin, ULONG * cPin)
 static const IPinVtbl VfwPin_Vtbl =
 {
     VfwPin_QueryInterface,
-    BasePinImpl_AddRef,
+    VfwPin_AddRef,
     VfwPin_Release,
     BaseOutputPinImpl_Connect,
     BaseOutputPinImpl_ReceiveConnection,