[PATCH v2] dsound: Trace ref in a consistent way
Alistair Leslie-Hughes
leslie_alistair at hotmail.com
Thu Jan 10 16:41:04 CST 2019
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
---
dlls/dsound/buffer.c | 16 ++++++++--------
dlls/dsound/capture.c | 10 +++++-----
dlls/dsound/dsound.c | 4 ++--
dlls/dsound/primary.c | 4 ++--
dlls/dsound/propset.c | 4 ++--
dlls/dsound/sound3d.c | 8 ++++----
6 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
index cb7ff78..5262628 100644
--- a/dlls/dsound/buffer.c
+++ b/dlls/dsound/buffer.c
@@ -60,7 +60,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_AddRef(IDirectSoundNotify *iface)
IDirectSoundBufferImpl *This = impl_from_IDirectSoundNotify(iface);
ULONG ref = InterlockedIncrement(&This->refn);
- TRACE("(%p) ref was %d\n", This, ref - 1);
+ TRACE("(%p) ref %d\n", This, ref);
if(ref == 1)
InterlockedIncrement(&This->numIfaces);
@@ -73,7 +73,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_Release(IDirectSoundNotify *iface)
IDirectSoundBufferImpl *This = impl_from_IDirectSoundNotify(iface);
ULONG ref = InterlockedDecrement(&This->refn);
- TRACE("(%p) ref was %d\n", This, ref + 1);
+ TRACE("(%p) ref %d\n", This, ref);
if (!ref && !InterlockedDecrement(&This->numIfaces))
secondarybuffer_destroy(This);
@@ -344,7 +344,7 @@ static ULONG WINAPI IDirectSoundBufferImpl_AddRef(IDirectSoundBuffer8 *iface)
IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref was %d\n", This, ref - 1);
+ TRACE("(%p) ref %d\n", This, ref);
if(ref == 1)
InterlockedIncrement(&This->numIfaces);
@@ -361,7 +361,7 @@ static ULONG WINAPI IDirectSoundBufferImpl_Release(IDirectSoundBuffer8 *iface)
ref = capped_refcount_dec(&This->ref);
if(!ref)
capped_refcount_dec(&This->numIfaces);
- TRACE("(%p) ref is now: %d\n", This, ref);
+ TRACE("(%p) ref %d\n", This, ref);
return ref;
}
@@ -369,7 +369,7 @@ static ULONG WINAPI IDirectSoundBufferImpl_Release(IDirectSoundBuffer8 *iface)
if (!ref && !InterlockedDecrement(&This->numIfaces))
secondarybuffer_destroy(This);
- TRACE("(%p) ref is now %d\n", This, ref);
+ TRACE("(%p) ref %d\n", This, ref);
return ref;
}
@@ -1237,7 +1237,7 @@ static ULONG WINAPI IKsPropertySetImpl_AddRef(IKsPropertySet *iface)
IDirectSoundBufferImpl *This = impl_from_IKsPropertySet(iface);
ULONG ref = InterlockedIncrement(&This->refiks);
- TRACE("(%p) ref was %d\n", This, ref - 1);
+ TRACE("(%p) ref %d\n", This, ref);
if(ref == 1)
InterlockedIncrement(&This->numIfaces);
@@ -1254,7 +1254,7 @@ static ULONG WINAPI IKsPropertySetImpl_Release(IKsPropertySet *iface)
ref = capped_refcount_dec(&This->refiks);
if(!ref)
capped_refcount_dec(&This->numIfaces);
- TRACE("(%p) ref is now: %d\n", This, ref);
+ TRACE("(%p) ref %d\n", This, ref);
return ref;
}
@@ -1262,7 +1262,7 @@ static ULONG WINAPI IKsPropertySetImpl_Release(IKsPropertySet *iface)
if (!ref && !InterlockedDecrement(&This->numIfaces))
secondarybuffer_destroy(This);
- TRACE("(%p) ref is now %d\n", This, ref);
+ TRACE("(%p) ref %d\n", This, ref);
return ref;
}
diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c
index c849624..8fc2749 100644
--- a/dlls/dsound/capture.c
+++ b/dlls/dsound/capture.c
@@ -137,7 +137,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_AddRef(IDirectSoundNotify *iface)
IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundNotify(iface);
ULONG ref = InterlockedIncrement(&This->refn);
- TRACE("(%p) ref was %d\n", This, ref - 1);
+ TRACE("(%p) ref %d\n", This, ref);
if(ref == 1)
InterlockedIncrement(&This->numIfaces);
@@ -150,7 +150,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_Release(IDirectSoundNotify *iface)
IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundNotify(iface);
ULONG ref = InterlockedDecrement(&This->refn);
- TRACE("(%p) ref was %d\n", This, ref + 1);
+ TRACE("(%p) ref %d\n", This, ref);
if (!ref && !InterlockedDecrement(&This->numIfaces))
capturebuffer_destroy(This);
@@ -263,7 +263,7 @@ static ULONG WINAPI IDirectSoundCaptureBufferImpl_AddRef(IDirectSoundCaptureBuff
IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref was %d\n", This, ref - 1);
+ TRACE("(%p) ref %d\n", This, ref);
if(ref == 1)
InterlockedIncrement(&This->numIfaces);
@@ -276,7 +276,7 @@ static ULONG WINAPI IDirectSoundCaptureBufferImpl_Release(IDirectSoundCaptureBuf
IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref was %d\n", This, ref + 1);
+ TRACE("(%p) ref %d\n", This, ref);
if (!ref && !InterlockedDecrement(&This->numIfaces))
capturebuffer_destroy(This);
@@ -851,7 +851,7 @@ static ULONG DirectSoundCaptureDevice_Release(
DirectSoundCaptureDevice * device)
{
ULONG ref = InterlockedDecrement(&(device->ref));
- TRACE("(%p) ref was %d\n", device, ref + 1);
+ TRACE("(%p) ref %d\n", device, ref);
if (!ref) {
TRACE("deleting object\n");
diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c
index 71ede7d..2fbb3ce 100644
--- a/dlls/dsound/dsound.c
+++ b/dlls/dsound/dsound.c
@@ -189,7 +189,7 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice)
static ULONG DirectSoundDevice_AddRef(DirectSoundDevice * device)
{
ULONG ref = InterlockedIncrement(&(device->ref));
- TRACE("(%p) ref was %d\n", device, ref - 1);
+ TRACE("(%p) ref %d\n", device, ref);
return ref;
}
@@ -197,7 +197,7 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device)
{
HRESULT hr;
ULONG ref = InterlockedDecrement(&(device->ref));
- TRACE("(%p) ref was %u\n", device, ref + 1);
+ TRACE("(%p) ref %d\n", device, ref);
if (!ref) {
int i;
diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c
index f74db2f..a30fc5e 100644
--- a/dlls/dsound/primary.c
+++ b/dlls/dsound/primary.c
@@ -675,7 +675,7 @@ static ULONG WINAPI PrimaryBufferImpl_AddRef(IDirectSoundBuffer8 *iface)
{
IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface);
ULONG ref = InterlockedIncrement(&(This->ref));
- TRACE("(%p) ref was %d\n", This, ref - 1);
+ TRACE("(%p) ref %d\n", This, ref);
if(ref == 1)
InterlockedIncrement(&This->numIfaces);
return ref;
@@ -704,7 +704,7 @@ static ULONG WINAPI PrimaryBufferImpl_Release(IDirectSoundBuffer8 *iface)
if(!ref)
capped_refcount_dec(&This->numIfaces);
- TRACE("(%p) primary ref is now %d\n", This, ref);
+ TRACE("(%p) primary ref %d\n", This, ref);
return ref;
}
diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c
index 0272ac0..92aae8f 100644
--- a/dlls/dsound/propset.c
+++ b/dlls/dsound/propset.c
@@ -81,7 +81,7 @@ static ULONG WINAPI IKsPrivatePropertySetImpl_AddRef(LPKSPROPERTYSET iface)
{
IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface);
ULONG ref = InterlockedIncrement(&(This->ref));
- TRACE("(%p) ref was %d\n", This, ref - 1);
+ TRACE("(%p) ref %d\n", This, ref);
return ref;
}
@@ -89,7 +89,7 @@ static ULONG WINAPI IKsPrivatePropertySetImpl_Release(LPKSPROPERTYSET iface)
{
IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface);
ULONG ref = InterlockedDecrement(&(This->ref));
- TRACE("(%p) ref was %d\n", This, ref + 1);
+ TRACE("(%p) ref %d\n", This, ref);
if (!ref) {
HeapFree(GetProcessHeap(), 0, This);
diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c
index 118bb60..27fc416 100644
--- a/dlls/dsound/sound3d.c
+++ b/dlls/dsound/sound3d.c
@@ -396,7 +396,7 @@ static ULONG WINAPI IDirectSound3DBufferImpl_AddRef(IDirectSound3DBuffer *iface)
IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
ULONG ref = InterlockedIncrement(&This->ref3D);
- TRACE("(%p) ref was %d\n", This, ref - 1);
+ TRACE("(%p) ref %d\n", This, ref);
if(ref == 1)
InterlockedIncrement(&This->numIfaces);
@@ -409,7 +409,7 @@ static ULONG WINAPI IDirectSound3DBufferImpl_Release(IDirectSound3DBuffer *iface
IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
ULONG ref = InterlockedDecrement(&This->ref3D);
- TRACE("(%p) ref was %d\n", This, ref + 1);
+ TRACE("(%p) ref %d\n", This, ref);
if (!ref && !InterlockedDecrement(&This->numIfaces))
secondarybuffer_destroy(This);
@@ -744,7 +744,7 @@ static ULONG WINAPI IDirectSound3DListenerImpl_AddRef(IDirectSound3DListener *if
IDirectSoundBufferImpl *This = impl_from_IDirectSound3DListener(iface);
ULONG ref = InterlockedIncrement(&This->ref3D);
- TRACE("(%p) ref was %d\n", This, ref - 1);
+ TRACE("(%p) ref %d\n", This, ref);
if(ref == 1)
InterlockedIncrement(&This->numIfaces);
@@ -761,7 +761,7 @@ static ULONG WINAPI IDirectSound3DListenerImpl_Release(IDirectSound3DListener *i
if(!ref)
capped_refcount_dec(&This->numIfaces);
- TRACE("(%p) ref is now %d\n", This, ref);
+ TRACE("(%p) ref %d\n", This, ref);
return ref;
}
--
1.9.1
More information about the wine-devel
mailing list