[DSOUND] Fix idirectsound8 interface to use dsoundbuffer8 instead
of dsoundbuffer
Maarten Lankhorst
m.b.lankhorst at gmail.com
Sat Mar 24 16:57:24 CDT 2007
Noticed this after a compiler warning when building a simple dsound
program against wine sdk.
-------------- next part --------------
>From b16574fe8b026d37268ce59948f4c4fb59566830 Mon Sep 17 00:00:00 2001
From: maarten <mlankhorst at maarten-laptop.(none)>
Date: Sat, 24 Mar 2007 22:53:54 +0100
Subject: [PATCH] Fix idirectsound8 interface to use dsoundbuffer8 instead of dsoundbuffer
---
dlls/dsound/dsound.c | 10 +++++-----
dlls/dsound/duplex.c | 10 +++++-----
include/dsound.h | 4 ++--
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c
index 33df102..576b1ee 100644
--- a/dlls/dsound/dsound.c
+++ b/dlls/dsound/dsound.c
@@ -844,12 +844,12 @@ static ULONG WINAPI IDirectSound8_IDirectSound8_Release(
static HRESULT WINAPI IDirectSound8_IDirectSound8_CreateSoundBuffer(
LPDIRECTSOUND8 iface,
LPCDSBUFFERDESC dsbd,
- LPLPDIRECTSOUNDBUFFER ppdsb,
+ LPLPDIRECTSOUNDBUFFER8 ppdsb,
LPUNKNOWN lpunk)
{
IDirectSound8_IDirectSound8 *This = (IDirectSound8_IDirectSound8 *)iface;
TRACE("(%p,%p,%p,%p)\n",This,dsbd,ppdsb,lpunk);
- return DirectSoundDevice_CreateSoundBuffer(((IDirectSoundImpl *)This->pds)->device,dsbd,ppdsb,lpunk,TRUE);
+ return DirectSoundDevice_CreateSoundBuffer(((IDirectSoundImpl *)This->pds)->device,dsbd,(LPLPDIRECTSOUNDBUFFER)ppdsb,lpunk,TRUE);
}
static HRESULT WINAPI IDirectSound8_IDirectSound8_GetCaps(
@@ -863,12 +863,12 @@ static HRESULT WINAPI IDirectSound8_IDirectSound8_GetCaps(
static HRESULT WINAPI IDirectSound8_IDirectSound8_DuplicateSoundBuffer(
LPDIRECTSOUND8 iface,
- LPDIRECTSOUNDBUFFER psb,
- LPLPDIRECTSOUNDBUFFER ppdsb)
+ LPDIRECTSOUNDBUFFER8 psb,
+ LPLPDIRECTSOUNDBUFFER8 ppdsb)
{
IDirectSound8_IDirectSound8 *This = (IDirectSound8_IDirectSound8 *)iface;
TRACE("(%p,%p,%p)\n",This,psb,ppdsb);
- return DirectSoundDevice_DuplicateSoundBuffer(((IDirectSoundImpl *)This->pds)->device,psb,ppdsb);
+ return DirectSoundDevice_DuplicateSoundBuffer(((IDirectSoundImpl *)This->pds)->device,(LPDIRECTSOUNDBUFFER) psb,(LPLPDIRECTSOUNDBUFFER) ppdsb);
}
static HRESULT WINAPI IDirectSound8_IDirectSound8_SetCooperativeLevel(
diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c
index 26fd28c..0449701 100644
--- a/dlls/dsound/duplex.c
+++ b/dlls/dsound/duplex.c
@@ -319,12 +319,12 @@ static ULONG WINAPI IDirectSoundFullDuplex_IDirectSound8_Release(
static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSound8_CreateSoundBuffer(
LPDIRECTSOUND8 iface,
LPCDSBUFFERDESC dsbd,
- LPLPDIRECTSOUNDBUFFER ppdsb,
+ LPLPDIRECTSOUNDBUFFER8 ppdsb,
LPUNKNOWN lpunk)
{
IDirectSoundFullDuplex_IDirectSound8 *This = (IDirectSoundFullDuplex_IDirectSound8 *)iface;
TRACE("(%p,%p,%p,%p)\n",This,dsbd,ppdsb,lpunk);
- return DirectSoundDevice_CreateSoundBuffer(This->pdsfd->renderer_device,dsbd,ppdsb,lpunk,TRUE);
+ return DirectSoundDevice_CreateSoundBuffer(This->pdsfd->renderer_device,dsbd,(LPLPDIRECTSOUNDBUFFER)ppdsb,lpunk,TRUE);
}
static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSound8_GetCaps(
@@ -338,12 +338,12 @@ static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSound8_GetCaps(
static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSound8_DuplicateSoundBuffer(
LPDIRECTSOUND8 iface,
- LPDIRECTSOUNDBUFFER psb,
- LPLPDIRECTSOUNDBUFFER ppdsb)
+ LPDIRECTSOUNDBUFFER8 psb,
+ LPLPDIRECTSOUNDBUFFER8 ppdsb)
{
IDirectSoundFullDuplex_IDirectSound8 *This = (IDirectSoundFullDuplex_IDirectSound8 *)iface;
TRACE("(%p,%p,%p)\n",This,psb,ppdsb);
- return DirectSoundDevice_DuplicateSoundBuffer(This->pdsfd->renderer_device,psb,ppdsb);
+ return DirectSoundDevice_DuplicateSoundBuffer(This->pdsfd->renderer_device,(LPDIRECTSOUNDBUFFER)psb,(LPLPDIRECTSOUNDBUFFER)ppdsb);
}
static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSound8_SetCooperativeLevel(
diff --git a/include/dsound.h b/include/dsound.h
index fc1eeff..66e957f 100644
--- a/include/dsound.h
+++ b/include/dsound.h
@@ -478,9 +478,9 @@ DECLARE_INTERFACE_(IDirectSound8,IUnknown)
STDMETHOD_(ULONG,AddRef)(THIS) PURE;
STDMETHOD_(ULONG,Release)(THIS) PURE;
/*** IDirectSound8 methods ***/
- STDMETHOD(CreateSoundBuffer)(THIS_ LPCDSBUFFERDESC lpcDSBufferDesc, LPLPDIRECTSOUNDBUFFER lplpDirectSoundBuffer, IUnknown *pUnkOuter) PURE;
+ STDMETHOD(CreateSoundBuffer)(THIS_ LPCDSBUFFERDESC lpcDSBufferDesc, LPLPDIRECTSOUNDBUFFER8 lplpDirectSoundBuffer, IUnknown *pUnkOuter) PURE;
STDMETHOD(GetCaps)(THIS_ LPDSCAPS lpDSCaps) PURE;
- STDMETHOD(DuplicateSoundBuffer)(THIS_ LPDIRECTSOUNDBUFFER lpDsbOriginal, LPLPDIRECTSOUNDBUFFER lplpDsbDuplicate) PURE;
+ STDMETHOD(DuplicateSoundBuffer)(THIS_ LPDIRECTSOUNDBUFFER8 lpDsbOriginal, LPLPDIRECTSOUNDBUFFER8 lplpDsbDuplicate) PURE;
STDMETHOD(SetCooperativeLevel)(THIS_ HWND hwnd, DWORD dwLevel) PURE;
STDMETHOD(Compact)(THIS) PURE;
STDMETHOD(GetSpeakerConfig)(THIS_ LPDWORD lpdwSpeakerConfig) PURE;
--
1.4.4.2
More information about the wine-patches
mailing list