Zebediah Figura : dsound: Call interface methods properly.

Alexandre Julliard julliard at winehq.org
Tue Apr 3 15:39:07 CDT 2018


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

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Thu Mar 29 23:04:48 2018 -0500

dsound: Call interface methods properly.

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

---

 dlls/dsound/buffer.c  | 2 +-
 dlls/dsound/capture.c | 4 ++--
 dlls/dsound/duplex.c  | 2 +-
 dlls/dsound/primary.c | 2 +-
 dlls/dsound/sound3d.c | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
index e85a5d1..1cdc388 100644
--- a/dlls/dsound/buffer.c
+++ b/dlls/dsound/buffer.c
@@ -1229,7 +1229,7 @@ static HRESULT WINAPI IKsPropertySetImpl_QueryInterface(IKsPropertySet *iface, R
 
     TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj);
 
-    return IDirectSoundBuffer_QueryInterface(&This->IDirectSoundBuffer8_iface, riid, ppobj);
+    return IDirectSoundBuffer8_QueryInterface(&This->IDirectSoundBuffer8_iface, riid, ppobj);
 }
 
 static ULONG WINAPI IKsPropertySetImpl_AddRef(IKsPropertySet *iface)
diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c
index 30870ae..fcc363d 100644
--- a/dlls/dsound/capture.c
+++ b/dlls/dsound/capture.c
@@ -129,7 +129,7 @@ static HRESULT WINAPI IDirectSoundNotifyImpl_QueryInterface(IDirectSoundNotify *
 
     TRACE("(%p,%s,%p)\n", This, debugstr_guid(riid), ppobj);
 
-    return IDirectSoundCaptureBuffer_QueryInterface(&This->IDirectSoundCaptureBuffer8_iface, riid, ppobj);
+    return IDirectSoundCaptureBuffer8_QueryInterface(&This->IDirectSoundCaptureBuffer8_iface, riid, ppobj);
 }
 
 static ULONG WINAPI IDirectSoundNotifyImpl_AddRef(IDirectSoundNotify *iface)
@@ -811,7 +811,7 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create(
         This->thread = CreateThread(NULL, 0, DSOUND_capture_thread, This, 0, NULL);
     }
 
-    IDirectSoundCaptureBuffer_AddRef(&This->IDirectSoundCaptureBuffer8_iface);
+    IDirectSoundCaptureBuffer8_AddRef(&This->IDirectSoundCaptureBuffer8_iface);
     *ppobj = This;
 
     TRACE("returning DS_OK\n");
diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c
index 153c7b6..4a88dd8 100644
--- a/dlls/dsound/duplex.c
+++ b/dlls/dsound/duplex.c
@@ -202,7 +202,7 @@ static HRESULT WINAPI IDirectSoundFullDuplexImpl_Initialize(IDirectSoundFullDupl
             TRUE);
     if (SUCCEEDED(hr)) {
         IUnknown_QueryInterface(This->ds8_unk, &IID_IDirectSound8, (void**)&ds8);
-        hr = IDirectSound_Initialize(ds8, render_dev);
+        hr = IDirectSound8_Initialize(ds8, render_dev);
     }
     if (hr != DS_OK) {
         WARN("Creating/initializing IDirectSound8 failed\n");
diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c
index 6eb5a98..887ee73 100644
--- a/dlls/dsound/primary.c
+++ b/dlls/dsound/primary.c
@@ -1208,7 +1208,7 @@ HRESULT primarybuffer_create(DirectSoundDevice *device, IDirectSoundBufferImpl *
                 device->pwfx->nBlockAlign, device->pwfx->wBitsPerSample,
                 device->pwfx->cbSize);
 
-        IDirectSoundBuffer_AddRef(&dsb->IDirectSoundBuffer8_iface);
+        IDirectSoundBuffer8_AddRef(&dsb->IDirectSoundBuffer8_iface);
 	*ppdsb = dsb;
 	return S_OK;
 }
diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c
index a3a5b41..03fd3d4 100644
--- a/dlls/dsound/sound3d.c
+++ b/dlls/dsound/sound3d.c
@@ -730,7 +730,7 @@ static HRESULT WINAPI IDirectSound3DListenerImpl_QueryInterface(IDirectSound3DLi
 
         TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppobj);
 
-        return IDirectSoundBuffer_QueryInterface(&This->IDirectSoundBuffer8_iface, riid, ppobj);
+        return IDirectSoundBuffer8_QueryInterface(&This->IDirectSoundBuffer8_iface, riid, ppobj);
 }
 
 static ULONG WINAPI IDirectSound3DListenerImpl_AddRef(IDirectSound3DListener *iface)




More information about the wine-cvs mailing list