[PATCH 1/3] amstream: Display new ref in AddRef and Release. (try 2)

[Christian Costa]

Try 2: Remove case (spotted by Nikolay)
---
 dlls/amstream/mediastreamfilter.c |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c
index ee9d970..9d38b72 100644
--- a/dlls/amstream/mediastreamfilter.c
+++ b/dlls/amstream/mediastreamfilter.c
@@ -133,17 +133,22 @@ static HRESULT WINAPI MediaStreamFilterImpl_QueryInterface(IMediaStreamFilter *i
 
 static ULONG WINAPI MediaStreamFilterImpl_AddRef(IMediaStreamFilter *iface)
 {
-    return BaseFilterImpl_AddRef((IBaseFilter*)iface);
+    IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface);
+    ULONG ref = BaseFilterImpl_AddRef(&This->filter.IBaseFilter_iface);
+
+    TRACE("(%p)->(): new ref = %u\n", iface, ref);
+
+    return ref;
 }
 
 static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface)
 {
     IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface);
-    ULONG refCount = BaseFilterImpl_Release((IBaseFilter*)iface);
+    ULONG ref = BaseFilterImpl_Release(&This->filter.IBaseFilter_iface);
 
-    TRACE("(%p)->() Release from %d\n", iface, refCount + 1);
+    TRACE("(%p)->(): new ref = %u\n", iface, ref);
 
-    if (!refCount)
+    if (!ref)
     {
         int i;
         for (i = 0; i < This->nb_streams; i++)
@@ -154,7 +159,7 @@ static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface)
         HeapFree(GetProcessHeap(), 0, This);
     }
 
-    return refCount;
+    return ref;
 }
 
 /*** IPersist methods ***/