*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <stdarg.h>
#define NONAMELESSUNION
#include "windef.h"
#include "winbase.h"
+#include "winuser.h"
#include "mmsystem.h"
-#include "winreg.h"
#include "winternl.h"
#include "wine/debug.h"
#include "dsound.h"
WINE_DEFAULT_DEBUG_CHANNEL(dsound);
+static HRESULT SecondaryBufferImpl_Destroy(SecondaryBufferImpl *pdsb);
+
/*******************************************************************************
* IDirectSoundNotify
*/
+
+struct IDirectSoundNotifyImpl
+{
+ /* IUnknown fields */
+ const IDirectSoundNotifyVtbl *lpVtbl;
+ LONG ref;
+ IDirectSoundBufferImpl* dsb;
+};
+
+static HRESULT IDirectSoundNotifyImpl_Create(IDirectSoundBufferImpl *dsb,
+ IDirectSoundNotifyImpl **pdsn);
+static HRESULT IDirectSoundNotifyImpl_Destroy(IDirectSoundNotifyImpl *pdsn);
+
static HRESULT WINAPI IDirectSoundNotifyImpl_QueryInterface(
LPDIRECTSOUNDNOTIFY iface,REFIID riid,LPVOID *ppobj
) {
{
IDirectSoundNotifyImpl *This = (IDirectSoundNotifyImpl *)iface;
ULONG ref = InterlockedIncrement(&(This->ref));
- TRACE("(%p) ref was %ld\n", This, ref - 1);
+ TRACE("(%p) ref was %d\n", This, ref - 1);
return ref;
}
{
IDirectSoundNotifyImpl *This = (IDirectSoundNotifyImpl *)iface;
ULONG ref = InterlockedDecrement(&(This->ref));
- TRACE("(%p) ref was %ld\n", This, ref + 1);
+ TRACE("(%p) ref was %d\n", This, ref + 1);
if (!ref) {
IDirectSoundBuffer_Release((LPDIRECTSOUNDBUFFER)This->dsb);
LPDIRECTSOUNDNOTIFY iface,DWORD howmuch,LPCDSBPOSITIONNOTIFY notify
) {
IDirectSoundNotifyImpl *This = (IDirectSoundNotifyImpl *)iface;
- TRACE("(%p,0x%08lx,%p)\n",This,howmuch,notify);
+ TRACE("(%p,0x%08x,%p)\n",This,howmuch,notify);
if (howmuch > 0 && notify == NULL) {
WARN("invalid parameter: notify == NULL\n");
if (TRACE_ON(dsound)) {
unsigned int i;
for (i=0;i<howmuch;i++)
- TRACE("notify at %ld to %p\n",
+ TRACE("notify at %d to %p\n",
notify[i].dwOffset,notify[i].hEventNotify);
}
} else if (howmuch > 0) {
/* Make an internal copy of the caller-supplied array.
* Replace the existing copy if one is already present. */
- if (This->dsb->notifies)
- This->dsb->notifies = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
- This->dsb->notifies, howmuch * sizeof(DSBPOSITIONNOTIFY));
- else
- This->dsb->notifies = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
+ HeapFree(GetProcessHeap(), 0, This->dsb->notifies);
+ This->dsb->notifies = HeapAlloc(GetProcessHeap(), 0,
howmuch * sizeof(DSBPOSITIONNOTIFY));
if (This->dsb->notifies == NULL) {
IDirectSoundNotifyImpl_SetNotificationPositions,
};
-HRESULT WINAPI IDirectSoundNotifyImpl_Create(
+static HRESULT IDirectSoundNotifyImpl_Create(
IDirectSoundBufferImpl * dsb,
IDirectSoundNotifyImpl **pdsn)
{
IDirectSoundNotifyImpl * dsn;
TRACE("(%p,%p)\n",dsb,pdsn);
- dsn = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(dsn));
+ dsn = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*dsn));
if (dsn == NULL) {
WARN("out of memory\n");
return DS_OK;
}
-HRESULT WINAPI IDirectSoundNotifyImpl_Destroy(
+static HRESULT IDirectSoundNotifyImpl_Destroy(
IDirectSoundNotifyImpl *pdsn)
{
TRACE("(%p)\n",pdsn);
LONG oldVol;
HRESULT hres = DS_OK;
- TRACE("(%p,%ld)\n",This,vol);
+ TRACE("(%p,%d)\n",This,vol);
if (!(This->dsbd.dwFlags & DSBCAPS_CTRLVOLUME)) {
- WARN("control unavailable: This->dsbd.dwFlags = 0x%08lx\n", This->dsbd.dwFlags);
+ WARN("control unavailable: This->dsbd.dwFlags = 0x%08x\n", This->dsbd.dwFlags);
return DSERR_CONTROLUNAVAIL;
}
if ((vol > DSBVOLUME_MAX) || (vol < DSBVOLUME_MIN)) {
- WARN("invalid parameter: vol = %ld\n", vol);
+ WARN("invalid parameter: vol = %d\n", vol);
return DSERR_INVALIDPARAM;
}
/* **** */
- EnterCriticalSection(&(This->lock));
+ RtlAcquireResourceExclusive(&This->lock, TRUE);
if (This->dsbd.dwFlags & DSBCAPS_CTRL3D) {
oldVol = This->ds3db_lVolume;
This->ds3db_lVolume = vol;
+ if (vol != oldVol)
+ /* recalc 3d volume, which in turn recalcs the pans */
+ DSOUND_Calc3DBuffer(This);
} else {
oldVol = This->volpan.lVolume;
This->volpan.lVolume = vol;
hres = IDsDriverBuffer_SetVolumePan(This->hwbuf, &(This->volpan));
if (hres != DS_OK)
WARN("IDsDriverBuffer_SetVolumePan failed\n");
- } else
- DSOUND_ForceRemix(This);
+ }
}
- LeaveCriticalSection(&(This->lock));
+ RtlReleaseResource(&This->lock);
/* **** */
return hres;
IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface;
DWORD oldFreq;
- TRACE("(%p,%ld)\n",This,freq);
+ TRACE("(%p,%d)\n",This,freq);
if (!(This->dsbd.dwFlags & DSBCAPS_CTRLFREQUENCY)) {
WARN("control unavailable\n");
freq = This->pwfx->nSamplesPerSec;
if ((freq < DSBFREQUENCY_MIN) || (freq > DSBFREQUENCY_MAX)) {
- WARN("invalid parameter: freq = %ld\n", freq);
+ WARN("invalid parameter: freq = %d\n", freq);
return DSERR_INVALIDPARAM;
}
/* **** */
- EnterCriticalSection(&(This->lock));
+ RtlAcquireResourceExclusive(&This->lock, TRUE);
oldFreq = This->freq;
This->freq = freq;
if (freq != oldFreq) {
- This->freqAdjust = (freq << DSOUND_FREQSHIFT) / This->dsound->device->pwfx->nSamplesPerSec;
+ This->freqAdjust = ((DWORD64)This->freq << DSOUND_FREQSHIFT) / This->device->pwfx->nSamplesPerSec;
This->nAvgBytesPerSec = freq * This->pwfx->nBlockAlign;
DSOUND_RecalcFormat(This);
- if (!This->hwbuf)
- DSOUND_ForceRemix(This);
+ DSOUND_MixToTemporary(This, 0, This->buflen, FALSE);
}
- LeaveCriticalSection(&(This->lock));
+ RtlReleaseResource(&This->lock);
/* **** */
return DS_OK;
) {
HRESULT hres = DS_OK;
IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface;
- TRACE("(%p,%08lx,%08lx,%08lx)\n",This,reserved1,reserved2,flags);
+ TRACE("(%p,%08x,%08x,%08x)\n",This,reserved1,reserved2,flags);
/* **** */
- EnterCriticalSection(&(This->lock));
+ RtlAcquireResourceExclusive(&This->lock, TRUE);
This->playflags = flags;
- if (This->state == STATE_STOPPED) {
+ if (This->state == STATE_STOPPED && !This->hwbuf) {
This->leadin = TRUE;
- This->startpos = This->buf_mixpos;
This->state = STATE_STARTING;
} else if (This->state == STATE_STOPPING)
This->state = STATE_PLAYING;
This->state = STATE_PLAYING;
}
- LeaveCriticalSection(&(This->lock));
+ RtlReleaseResource(&This->lock);
/* **** */
return hres;
TRACE("(%p)\n",This);
/* **** */
- EnterCriticalSection(&(This->lock));
+ RtlAcquireResourceExclusive(&This->lock, TRUE);
if (This->state == STATE_PLAYING)
This->state = STATE_STOPPING;
else if (This->state == STATE_STARTING)
+ {
This->state = STATE_STOPPED;
+ DSOUND_CheckEvent(This, 0, 0);
+ }
if (This->hwbuf) {
hres = IDsDriverBuffer_Stop(This->hwbuf);
if (hres != DS_OK)
else
This->state = STATE_STOPPED;
}
- DSOUND_CheckEvent(This, 0);
- LeaveCriticalSection(&(This->lock));
+ RtlReleaseResource(&This->lock);
/* **** */
return hres;
{
IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface;
ULONG ref = InterlockedIncrement(&(This->ref));
- TRACE("(%p) ref was %ld\n", This, ref - 1);
+ TRACE("(%p) ref was %d\n", This, ref - 1);
return ref;
}
{
IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface;
ULONG ref = InterlockedDecrement(&(This->ref));
- TRACE("(%p) ref was %ld\n", This, ref + 1);
+ TRACE("(%p) ref was %d\n", This, ref + 1);
if (!ref) {
- DSOUND_RemoveBuffer(This->dsound, This);
+ DirectSoundDevice_RemoveBuffer(This->device, This);
+ RtlDeleteResource(&This->lock);
- This->lock.DebugInfo->Spare[0] = 0;
- DeleteCriticalSection(&(This->lock));
-
- if (This->hwbuf) {
+ if (This->hwbuf)
IDsDriverBuffer_Release(This->hwbuf);
- if (This->dsound->device->drvdesc.dwFlags & DSDDESC_USESYSTEMMEMORY) {
- This->buffer->ref--;
- if (This->buffer->ref==0) {
- HeapFree(GetProcessHeap(),0,This->buffer->memory);
- HeapFree(GetProcessHeap(),0,This->buffer);
- }
- }
- } else {
+ if (!This->hwbuf || (This->device->drvdesc.dwFlags & DSDDESC_USESYSTEMMEMORY)) {
This->buffer->ref--;
+ list_remove(&This->entry);
if (This->buffer->ref==0) {
HeapFree(GetProcessHeap(),0,This->buffer->memory);
HeapFree(GetProcessHeap(),0,This->buffer);
}
}
+ HeapFree(GetProcessHeap(), 0, This->tmp_buffer);
HeapFree(GetProcessHeap(), 0, This->notifies);
HeapFree(GetProcessHeap(), 0, This->pwfx);
HeapFree(GetProcessHeap(), 0, This);
return ref;
}
-DWORD DSOUND_CalcPlayPosition(IDirectSoundBufferImpl *This, DWORD pplay, DWORD pwrite)
-{
- DWORD bplay = This->buf_mixpos;
- DWORD pmix = This->primary_mixpos;
- TRACE("(%p, pplay=%lu, pwrite=%lu)\n", This, pplay, pwrite);
-
- /* the actual primary play position (pplay) is always behind last mixed (pmix),
- * unless the computer is too slow or something */
- /* we need to know how far away we are from there */
- if (pmix < pplay) pmix += This->dsound->device->buflen; /* wraparound */
- pmix -= pplay;
- /* detect buffer underrun */
- if (pwrite < pplay) pwrite += This->dsound->device->buflen; /* wraparound */
- pwrite -= pplay;
- if (pmix > (ds_snd_queue_max * This->dsound->device->fraglen + pwrite + This->dsound->device->writelead)) {
- WARN("detected an underrun: primary queue was %ld\n",pmix);
- pmix = 0;
- }
- /* divide the offset by its sample size */
- pmix /= This->dsound->device->pwfx->nBlockAlign;
- TRACE("primary back-samples=%ld\n",pmix);
- /* adjust for our frequency */
- pmix = (pmix * This->freqAdjust) >> DSOUND_FREQSHIFT;
- /* multiply by our own sample size */
- pmix *= This->pwfx->nBlockAlign;
- TRACE("this back-offset=%ld\n", pmix);
- /* subtract from our last mixed position */
- while (bplay < pmix) bplay += This->buflen; /* wraparound */
- bplay -= pmix;
- if (This->leadin && ((bplay < This->startpos) || (bplay > This->buf_mixpos))) {
- /* seems we haven't started playing yet */
- TRACE("this still in lead-in phase\n");
- bplay = This->startpos;
- }
- /* return the result */
- return bplay;
-}
-
static HRESULT WINAPI IDirectSoundBufferImpl_GetCurrentPosition(
LPDIRECTSOUNDBUFFER8 iface,LPDWORD playpos,LPDWORD writepos
) {
HRESULT hres;
IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface;
TRACE("(%p,%p,%p)\n",This,playpos,writepos);
+
+ RtlAcquireResourceShared(&This->lock, TRUE);
if (This->hwbuf) {
hres=IDsDriverBuffer_GetPosition(This->hwbuf,playpos,writepos);
if (hres != DS_OK) {
return hres;
}
} else {
- if (playpos && (This->state != STATE_PLAYING)) {
- /* we haven't been merged into the primary buffer (yet) */
- *playpos = This->buf_mixpos;
- } else if (playpos) {
- DWORD pplay, pwrite;
- /* let's get this exact; first, recursively call GetPosition on the primary */
- EnterCriticalSection(&(This->dsound->device->mixlock));
- if (DSOUND_PrimaryGetPosition(This->dsound->device, &pplay, &pwrite) != DS_OK)
- WARN("DSOUND_PrimaryGetPosition failed\n");
- /* detect HEL mode underrun */
- if (!(This->dsound->device->hwbuf || This->dsound->device->pwqueue))
- TRACE("detected an underrun\n");
- if ((This->dsbd.dwFlags & DSBCAPS_GETCURRENTPOSITION2) || This->dsound->device->hwbuf) {
- /* calculate play position using this */
- *playpos = DSOUND_CalcPlayPosition(This, pplay, pwrite);
- } else {
- /* (unless the app isn't using GETCURRENTPOSITION2) */
- /* don't know exactly how this should be handled...
- * the docs says that play cursor is reported as directly
- * behind write cursor, hmm... */
- /* let's just do what might work for Half-Life */
- DWORD wp;
- wp = (This->dsound->device->pwplay + ds_hel_margin) * This->dsound->device->fraglen;
- wp %= This->dsound->device->buflen;
- *playpos = DSOUND_CalcPlayPosition(This, wp, pwrite);
- }
- LeaveCriticalSection(&(This->dsound->device->mixlock));
+ DWORD pos = This->sec_mixpos;
+
+ /* sanity */
+ if (pos >= This->buflen){
+ FIXME("Bad play position. playpos: %d, buflen: %d\n", pos, This->buflen);
+ pos %= This->buflen;
}
+
+ if (playpos)
+ *playpos = pos;
if (writepos)
- *writepos = This->buf_mixpos;
+ *writepos = pos;
}
- if (writepos) {
- if (This->state != STATE_STOPPED) {
- /* apply the documented 10ms lead to writepos */
- *writepos += This->writelead;
- }
+ if (writepos && This->state != STATE_STOPPED && (!This->hwbuf || !(This->device->drvdesc.dwFlags & DSDDESC_DONTNEEDWRITELEAD))) {
+ /* apply the documented 10ms lead to writepos */
+ *writepos += This->writelead;
*writepos %= This->buflen;
}
- if (playpos)
- This->last_playpos = *playpos;
- TRACE("playpos = %ld, writepos = %ld (%p, time=%ld)\n", playpos?*playpos:0, writepos?*writepos:0, This, GetTickCount());
+ RtlReleaseResource(&This->lock);
+
+ TRACE("playpos = %d, writepos = %d, buflen=%d (%p, time=%d)\n",
+ playpos?*playpos:-1, writepos?*writepos:-1, This->buflen, This, GetTickCount());
+
return DS_OK;
}
LPDIRECTSOUNDBUFFER8 iface,LPDWORD status
) {
IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface;
- TRACE("(%p,%p), thread is %04lx\n",This,status,GetCurrentThreadId());
+ TRACE("(%p,%p), thread is %04x\n",This,status,GetCurrentThreadId());
if (status == NULL) {
WARN("invalid parameter: status = NULL\n");
}
*status = 0;
+ RtlAcquireResourceShared(&This->lock, TRUE);
if ((This->state == STATE_STARTING) || (This->state == STATE_PLAYING)) {
*status |= DSBSTATUS_PLAYING;
if (This->playflags & DSBPLAY_LOOPING)
*status |= DSBSTATUS_LOOPING;
}
+ RtlReleaseResource(&This->lock);
- TRACE("status=%lx\n", *status);
+ TRACE("status=%x\n", *status);
return DS_OK;
}
{
DWORD size;
IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface;
- TRACE("(%p,%p,%ld,%p)\n",This,lpwf,wfsize,wfwritten);
+ TRACE("(%p,%p,%d,%p)\n",This,lpwf,wfsize,wfwritten);
size = sizeof(WAVEFORMATEX) + This->pwfx->cbSize;
*wfwritten = size;
} else {
WARN("invalid parameter: wfsize too small\n");
+ CopyMemory(lpwf,This->pwfx,wfsize);
if (wfwritten)
- *wfwritten = 0;
+ *wfwritten = wfsize;
return DSERR_INVALIDPARAM;
}
} else {
}
static HRESULT WINAPI IDirectSoundBufferImpl_Lock(
- LPDIRECTSOUNDBUFFER8 iface,DWORD writecursor,DWORD writebytes,LPVOID lplpaudioptr1,LPDWORD audiobytes1,LPVOID lplpaudioptr2,LPDWORD audiobytes2,DWORD flags
+ LPDIRECTSOUNDBUFFER8 iface,DWORD writecursor,DWORD writebytes,LPVOID *lplpaudioptr1,LPDWORD audiobytes1,LPVOID *lplpaudioptr2,LPDWORD audiobytes2,DWORD flags
) {
HRESULT hres = DS_OK;
IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface;
- TRACE("(%p,%ld,%ld,%p,%p,%p,%p,0x%08lx) at %ld\n",
+ TRACE("(%p,%d,%d,%p,%p,%p,%p,0x%08x) at %d\n",
This,
writecursor,
writebytes,
GetTickCount()
);
+ if (!audiobytes1)
+ return DSERR_INVALIDPARAM;
+
+ /* when this flag is set, writecursor is meaningless and must be calculated */
if (flags & DSBLOCK_FROMWRITECURSOR) {
- DWORD writepos;
/* GetCurrentPosition does too much magic to duplicate here */
- hres = IDirectSoundBufferImpl_GetCurrentPosition(iface, NULL, &writepos);
+ hres = IDirectSoundBufferImpl_GetCurrentPosition(iface, NULL, &writecursor);
if (hres != DS_OK) {
WARN("IDirectSoundBufferImpl_GetCurrentPosition failed\n");
return hres;
}
- writecursor += writepos;
}
- writecursor %= This->buflen;
+
+ /* when this flag is set, writebytes is meaningless and must be set */
if (flags & DSBLOCK_ENTIREBUFFER)
writebytes = This->buflen;
- if (writebytes > This->buflen)
- writebytes = This->buflen;
- EnterCriticalSection(&(This->lock));
+ if (writecursor >= This->buflen) {
+ WARN("Invalid parameter, writecursor: %u >= buflen: %u\n",
+ writecursor, This->buflen);
+ return DSERR_INVALIDPARAM;
+ }
- if ((writebytes == This->buflen) &&
- ((This->state == STATE_STARTING) ||
- (This->state == STATE_PLAYING)))
- /* some games, like Half-Life, try to be clever (not) and
- * keep one secondary buffer, and mix sounds into it itself,
- * locking the entire buffer every time... so we can just forget
- * about tracking the last-written-to-position... */
- This->probably_valid_to = (DWORD)-1;
- else
- This->probably_valid_to = writecursor;
+ if (writebytes > This->buflen) {
+ WARN("Invalid parameter, writebytes: %u > buflen: %u\n",
+ writebytes, This->buflen);
+ return DSERR_INVALIDPARAM;
+ }
+
+ /* **** */
+ RtlAcquireResourceShared(&This->lock, TRUE);
- if (!(This->dsound->device->drvdesc.dwFlags & DSDDESC_DONTNEEDSECONDARYLOCK) && This->hwbuf) {
+ if (!(This->device->drvdesc.dwFlags & DSDDESC_DONTNEEDSECONDARYLOCK) && This->hwbuf) {
hres = IDsDriverBuffer_Lock(This->hwbuf,
lplpaudioptr1, audiobytes1,
lplpaudioptr2, audiobytes2,
0);
if (hres != DS_OK) {
WARN("IDsDriverBuffer_Lock failed\n");
- LeaveCriticalSection(&(This->lock));
+ RtlReleaseResource(&This->lock);
return hres;
}
} else {
- BOOL remix = FALSE;
if (writecursor+writebytes <= This->buflen) {
*(LPBYTE*)lplpaudioptr1 = This->buffer->memory+writecursor;
+ if (This->sec_mixpos >= writecursor && This->sec_mixpos < writecursor + writebytes && This->state == STATE_PLAYING)
+ WARN("Overwriting mixing position, case 1\n");
*audiobytes1 = writebytes;
if (lplpaudioptr2)
*(LPBYTE*)lplpaudioptr2 = NULL;
if (audiobytes2)
*audiobytes2 = 0;
- TRACE("->%ld.0\n",writebytes);
+ TRACE("Locked %p(%i bytes) and %p(%i bytes) writecursor=%d\n",
+ *(LPBYTE*)lplpaudioptr1, *audiobytes1, lplpaudioptr2 ? *(LPBYTE*)lplpaudioptr2 : NULL, audiobytes2 ? *audiobytes2: 0, writecursor);
+ TRACE("->%d.0\n",writebytes);
} else {
+ DWORD remainder = writebytes + writecursor - This->buflen;
*(LPBYTE*)lplpaudioptr1 = This->buffer->memory+writecursor;
*audiobytes1 = This->buflen-writecursor;
+ if (This->sec_mixpos >= writecursor && This->sec_mixpos < writecursor + writebytes && This->state == STATE_PLAYING)
+ WARN("Overwriting mixing position, case 2\n");
if (lplpaudioptr2)
*(LPBYTE*)lplpaudioptr2 = This->buffer->memory;
if (audiobytes2)
*audiobytes2 = writebytes-(This->buflen-writecursor);
- TRACE("->%ld.%ld\n",*audiobytes1,audiobytes2?*audiobytes2:0);
- }
- if (This->state == STATE_PLAYING) {
- /* if the segment between playpos and buf_mixpos is touched,
- * we need to cancel some mixing */
- /* we'll assume that the app always calls GetCurrentPosition before
- * locking a playing buffer, so that last_playpos is up-to-date */
- if (This->buf_mixpos >= This->last_playpos) {
- if (This->buf_mixpos > writecursor &&
- This->last_playpos < writecursor+writebytes)
- remix = TRUE;
- } else {
- if (This->buf_mixpos > writecursor ||
- This->last_playpos < writecursor+writebytes)
- remix = TRUE;
- }
- if (remix) {
- TRACE("locking prebuffered region, ouch\n");
- DSOUND_MixCancelAt(This, writecursor);
- }
+ if (audiobytes2 && This->sec_mixpos < remainder && This->state == STATE_PLAYING)
+ WARN("Overwriting mixing position, case 3\n");
+ TRACE("Locked %p(%i bytes) and %p(%i bytes) writecursor=%d\n", *(LPBYTE*)lplpaudioptr1, *audiobytes1, lplpaudioptr2 ? *(LPBYTE*)lplpaudioptr2 : NULL, audiobytes2 ? *audiobytes2: 0, writecursor);
}
}
- LeaveCriticalSection(&(This->lock));
+ RtlReleaseResource(&This->lock);
+ /* **** */
+
return DS_OK;
}
) {
HRESULT hres = DS_OK;
IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface;
- TRACE("(%p,%ld)\n",This,newpos);
+ DWORD oldpos;
+ TRACE("(%p,%d)\n",This,newpos);
/* **** */
- EnterCriticalSection(&(This->lock));
+ RtlAcquireResourceExclusive(&This->lock, TRUE);
+
+ oldpos = This->sec_mixpos;
+ /* start mixing from this new location instead */
newpos %= This->buflen;
- This->buf_mixpos = newpos;
+ newpos -= newpos%This->pwfx->nBlockAlign;
+ This->sec_mixpos = newpos;
+
+ /* at this point, do not attempt to reset buffers, mess with primary mix position,
+ or anything like that to reduce latancy. The data already prebuffered cannot be changed */
+
+ /* position HW buffer if applicable, else just start mixing from new location instead */
if (This->hwbuf) {
hres = IDsDriverBuffer_SetPosition(This->hwbuf, This->buf_mixpos);
if (hres != DS_OK)
WARN("IDsDriverBuffer_SetPosition failed\n");
}
+ else if (oldpos != newpos)
+ /* FIXME: Perhaps add a call to DSOUND_MixToTemporary here? Not sure it's needed */
+ This->buf_mixpos = DSOUND_secpos_to_bufpos(This, newpos, 0, NULL);
- LeaveCriticalSection(&(This->lock));
+ RtlReleaseResource(&This->lock);
/* **** */
return hres;
HRESULT hres = DS_OK;
IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface;
- TRACE("(%p,%ld)\n",This,pan);
+ TRACE("(%p,%d)\n",This,pan);
if ((pan > DSBPAN_RIGHT) || (pan < DSBPAN_LEFT)) {
- WARN("invalid parameter: pan = %ld\n", pan);
+ WARN("invalid parameter: pan = %d\n", pan);
return DSERR_INVALIDPARAM;
}
}
/* **** */
- EnterCriticalSection(&(This->lock));
+ RtlAcquireResourceExclusive(&This->lock, TRUE);
if (This->volpan.lPan != pan) {
This->volpan.lPan = pan;
hres = IDsDriverBuffer_SetVolumePan(This->hwbuf, &(This->volpan));
if (hres != DS_OK)
WARN("IDsDriverBuffer_SetVolumePan failed\n");
- } else
- DSOUND_ForceRemix(This);
+ }
}
- LeaveCriticalSection(&(This->lock));
+ RtlReleaseResource(&This->lock);
/* **** */
return hres;
static HRESULT WINAPI IDirectSoundBufferImpl_Unlock(
LPDIRECTSOUNDBUFFER8 iface,LPVOID p1,DWORD x1,LPVOID p2,DWORD x2
) {
- IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface;
- DWORD probably_valid_to;
+ IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface, *iter;
HRESULT hres = DS_OK;
- TRACE("(%p,%p,%ld,%p,%ld)\n", This,p1,x1,p2,x2);
+ TRACE("(%p,%p,%d,%p,%d)\n", This,p1,x1,p2,x2);
/* **** */
- EnterCriticalSection(&(This->lock));
+ RtlAcquireResourceShared(&This->lock, TRUE);
- if (!(This->dsound->device->drvdesc.dwFlags & DSDDESC_DONTNEEDSECONDARYLOCK) && This->hwbuf) {
+ if (!(This->device->drvdesc.dwFlags & DSDDESC_DONTNEEDSECONDARYLOCK) && This->hwbuf) {
hres = IDsDriverBuffer_Unlock(This->hwbuf, p1, x1, p2, x2);
if (hres != DS_OK)
WARN("IDsDriverBuffer_Unlock failed\n");
}
- if (hres == DS_OK) {
- if (p2) probably_valid_to = (((LPBYTE)p2)-This->buffer->memory) + x2;
- else probably_valid_to = (((LPBYTE)p1)-This->buffer->memory) + x1;
- probably_valid_to %= This->buflen;
- if ((probably_valid_to == 0) && ((x1+x2) == This->buflen) &&
- ((This->state == STATE_STARTING) ||
- (This->state == STATE_PLAYING)))
- /* see IDirectSoundBufferImpl_Lock */
- probably_valid_to = (DWORD)-1;
- This->probably_valid_to = probably_valid_to;
- }
-
- LeaveCriticalSection(&(This->lock));
+ RtlReleaseResource(&This->lock);
/* **** */
- TRACE("probably_valid_to=%ld\n", This->probably_valid_to);
+ if (!p2)
+ x2 = 0;
+
+ if (!This->hwbuf && (x1 || x2))
+ {
+ RtlAcquireResourceShared(&This->device->buffer_list_lock, TRUE);
+ LIST_FOR_EACH_ENTRY(iter, &This->buffer->buffers, IDirectSoundBufferImpl, entry )
+ {
+ RtlAcquireResourceShared(&iter->lock, TRUE);
+ if (x1)
+ {
+ if(x1 + (DWORD_PTR)p1 - (DWORD_PTR)iter->buffer->memory > iter->buflen)
+ hres = DSERR_INVALIDPARAM;
+ else
+ DSOUND_MixToTemporary(iter, (DWORD_PTR)p1 - (DWORD_PTR)iter->buffer->memory, x1, FALSE);
+ }
+ if (x2)
+ DSOUND_MixToTemporary(iter, 0, x2, FALSE);
+ RtlReleaseResource(&iter->lock);
+ }
+ RtlReleaseResource(&This->device->buffer_list_lock);
+ }
+
return hres;
}
}
*freq = This->freq;
- TRACE("-> %ld\n", *freq);
+ TRACE("-> %d\n", *freq);
return DS_OK;
}
IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface;
DWORD u;
- FIXME("(%p,%lu,%p,%p): stub\n",This,dwEffectsCount,pDSFXDesc,pdwResultCodes);
+ FIXME("(%p,%u,%p,%p): stub\n",This,dwEffectsCount,pDSFXDesc,pdwResultCodes);
if (pdwResultCodes)
for (u=0; u<dwEffectsCount; u++) pdwResultCodes[u] = DSFXR_UNKNOWN;
IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface;
DWORD u;
- FIXME("(%p,%08lu,%lu,%p): stub\n",This,dwFlags,dwEffectsCount,pdwResultCodes);
+ FIXME("(%p,%08u,%u,%p): stub\n",This,dwFlags,dwEffectsCount,pdwResultCodes);
if (pdwResultCodes)
for (u=0; u<dwEffectsCount; u++) pdwResultCodes[u] = DSFXR_UNKNOWN;
) {
IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface;
- FIXME("(%p,%s,%lu,%s,%p): stub\n",This,debugstr_guid(rguidObject),dwIndex,debugstr_guid(rguidInterface),ppObject);
+ FIXME("(%p,%s,%u,%s,%p): stub\n",This,debugstr_guid(rguidObject),dwIndex,debugstr_guid(rguidInterface),ppObject);
WARN("control unavailable\n");
return DSERR_CONTROLUNAVAIL;
LPDIRECTSOUNDBUFFER8 iface,LPDIRECTSOUND dsound,LPCDSBUFFERDESC dbsd
) {
IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface;
- FIXME("(%p,%p,%p):stub\n",This,dsound,dbsd);
- DPRINTF("Re-Init!!!\n");
- WARN("already initialized\n");
+ WARN("(%p) already initialized\n", This);
return DSERR_ALREADYINITIALIZED;
}
}
if (caps->dwSize < sizeof(*caps)) {
- WARN("invalid parameter: caps->dwSize = %ld < %d\n",caps->dwSize, sizeof(*caps));
+ WARN("invalid parameter: caps->dwSize = %d\n",caps->dwSize);
return DSERR_INVALIDPARAM;
}
caps->dwBufferBytes = This->buflen;
- /* This value represents the speed of the "unlock" command.
- As unlock is quite fast (it does not do anything), I put
- 4096 ko/s = 4 Mo / s */
- /* FIXME: hwbuf speed */
- caps->dwUnlockTransferRate = 4096;
+ /* According to windows, this is zero*/
+ caps->dwUnlockTransferRate = 0;
caps->dwPlayCpuOverhead = 0;
return DS_OK;
if ( IsEqualGUID(riid, &IID_IUnknown) ||
IsEqualGUID(riid, &IID_IDirectSoundBuffer) ||
IsEqualGUID(riid, &IID_IDirectSoundBuffer8) ) {
- if (!This->dsb)
- SecondaryBufferImpl_Create(This, &(This->dsb));
- if (This->dsb) {
- IDirectSoundBuffer8_AddRef((LPDIRECTSOUNDBUFFER8)This->dsb);
- *ppobj = This->dsb;
+ if (!This->secondary)
+ SecondaryBufferImpl_Create(This, &(This->secondary));
+ if (This->secondary) {
+ IDirectSoundBuffer8_AddRef((LPDIRECTSOUNDBUFFER8)This->secondary);
+ *ppobj = This->secondary;
return S_OK;
}
WARN("IID_IDirectSoundBuffer\n");
IDirectSoundBufferImpl_GetObjectInPath
};
-HRESULT WINAPI IDirectSoundBufferImpl_Create(
- IDirectSoundImpl *ds,
+HRESULT IDirectSoundBufferImpl_Create(
+ DirectSoundDevice * device,
IDirectSoundBufferImpl **pdsb,
LPCDSBUFFERDESC dsbd)
{
HRESULT err = DS_OK;
DWORD capf = 0;
int use_hw, alloc_size, cp_size;
- TRACE("(%p,%p,%p)\n",ds,pdsb,dsbd);
+ TRACE("(%p,%p,%p)\n",device,pdsb,dsbd);
if (dsbd->dwBufferBytes < DSBSIZE_MIN || dsbd->dwBufferBytes > DSBSIZE_MAX) {
- WARN("invalid parameter: dsbd->dwBufferBytes = %ld\n", dsbd->dwBufferBytes);
+ WARN("invalid parameter: dsbd->dwBufferBytes = %d\n", dsbd->dwBufferBytes);
*pdsb = NULL;
return DSERR_INVALIDPARAM; /* FIXME: which error? */
}
TRACE("Created buffer at %p\n", dsb);
dsb->ref = 0;
- dsb->dsb = 0;
- dsb->dsound = ds;
+ dsb->secondary = 0;
+ dsb->device = device;
dsb->lpVtbl = &dsbvt;
dsb->iks = NULL;
if (wfex->wFormatTag == WAVE_FORMAT_PCM) {
alloc_size = sizeof(WAVEFORMATEX);
cp_size = sizeof(PCMWAVEFORMAT);
- } else
+ } else
alloc_size = cp_size = sizeof(WAVEFORMATEX) + wfex->cbSize;
dsb->pwfx = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,alloc_size);
CopyMemory(dsb->pwfx, wfex, cp_size);
if (dsbd->dwBufferBytes % dsbd->lpwfxFormat->nBlockAlign)
- dsb->buflen = dsbd->dwBufferBytes +
- (dsbd->lpwfxFormat->nBlockAlign -
+ dsb->buflen = dsbd->dwBufferBytes +
+ (dsbd->lpwfxFormat->nBlockAlign -
(dsbd->dwBufferBytes % dsbd->lpwfxFormat->nBlockAlign));
else
dsb->buflen = dsbd->dwBufferBytes;
if (wfex->wBitsPerSample==16) capf |= DSCAPS_SECONDARY16BIT;
else capf |= DSCAPS_SECONDARY8BIT;
- use_hw = (ds->device->drvcaps.dwFlags & capf) == capf;
- TRACE("use_hw = 0x%08x, capf = 0x%08lx, ds->drvcaps.dwFlags = 0x%08lx\n", use_hw, capf, ds->device->drvcaps.dwFlags);
+ use_hw = !!(dsbd->dwFlags & DSBCAPS_LOCHARDWARE);
+ TRACE("use_hw = %d, capf = 0x%08x, device->drvcaps.dwFlags = 0x%08x\n", use_hw, capf, device->drvcaps.dwFlags);
+ if (use_hw && ((device->drvcaps.dwFlags & capf) != capf || !device->driver))
+ {
+ if (device->driver)
+ WARN("Format not supported for hardware buffer\n");
+ HeapFree(GetProcessHeap(),0,dsb->pwfx);
+ HeapFree(GetProcessHeap(),0,dsb);
+ *pdsb = NULL;
+ if ((device->drvcaps.dwFlags & capf) != capf)
+ return DSERR_BADFORMAT;
+ return DSERR_GENERIC;
+ }
/* FIXME: check hardware sample rate mixing capabilities */
/* FIXME: check app hints for software/hardware buffer (STATIC, LOCHARDWARE, etc) */
}
/* Allocate system memory for buffer if applicable */
- if ((ds->device->drvdesc.dwFlags & DSDDESC_USESYSTEMMEMORY) || !use_hw) {
+ if ((device->drvdesc.dwFlags & DSDDESC_USESYSTEMMEMORY) || !use_hw) {
dsb->buffer->memory = HeapAlloc(GetProcessHeap(),0,dsb->buflen);
if (dsb->buffer->memory == NULL) {
WARN("out of memory\n");
*pdsb = NULL;
return DSERR_OUTOFMEMORY;
}
- dsb->buffer->ref = 1;
- FillMemory(dsb->buffer->memory, dsb->buflen, dsbd->lpwfxFormat->wBitsPerSample == 8 ? 128 : 0);
}
/* Allocate the hardware buffer */
if (use_hw) {
- err = IDsDriver_CreateSoundBuffer(ds->device->driver,wfex,dsbd->dwFlags,0,
+ err = IDsDriver_CreateSoundBuffer(device->driver,wfex,dsbd->dwFlags,0,
&(dsb->buflen),&(dsb->buffer->memory),
(LPVOID*)&(dsb->hwbuf));
- /* fall back to software buffer on failure */
- if (err != DS_OK) {
- TRACE("IDsDriver_CreateSoundBuffer failed, falling back to software buffer\n");
- use_hw = 0;
- if (ds->device->drvdesc.dwFlags & DSDDESC_USESYSTEMMEMORY) {
- dsb->buffer->memory = HeapAlloc(GetProcessHeap(),0,dsb->buflen);
- if (dsb->buffer->memory == NULL) {
- WARN("out of memory\n");
- HeapFree(GetProcessHeap(),0,dsb->buffer);
- HeapFree(GetProcessHeap(),0,dsb->pwfx);
- HeapFree(GetProcessHeap(),0,dsb);
- *pdsb = NULL;
- return DSERR_OUTOFMEMORY;
- }
- dsb->buffer->ref = 1;
- FillMemory(dsb->buffer->memory, dsb->buflen, dsbd->lpwfxFormat->wBitsPerSample == 8 ? 128 : 0);
- }
- err = DS_OK;
+ if (FAILED(err))
+ {
+ WARN("Failed to create hardware secondary buffer: %08x\n", err);
+ if (device->drvdesc.dwFlags & DSDDESC_USESYSTEMMEMORY)
+ HeapFree(GetProcessHeap(),0,dsb->buffer->memory);
+ HeapFree(GetProcessHeap(),0,dsb->buffer);
+ HeapFree(GetProcessHeap(),0,dsb->pwfx);
+ HeapFree(GetProcessHeap(),0,dsb);
+ *pdsb = NULL;
+ return DSERR_GENERIC;
}
}
- /* calculate fragment size and write lead */
- DSOUND_RecalcFormat(dsb);
+ dsb->buffer->ref = 1;
+ list_init(&dsb->buffer->buffers);
+ list_add_head(&dsb->buffer->buffers, &dsb->entry);
+ FillMemory(dsb->buffer->memory, dsb->buflen, dsbd->lpwfxFormat->wBitsPerSample == 8 ? 128 : 0);
/* It's not necessary to initialize values to zero since */
/* we allocated this structure with HEAP_ZERO_MEMORY... */
- dsb->playpos = 0;
- dsb->buf_mixpos = 0;
+ dsb->buf_mixpos = dsb->sec_mixpos = 0;
dsb->state = STATE_STOPPED;
- dsb->freqAdjust = (dsb->freq << DSOUND_FREQSHIFT) /
- ds->device->pwfx->nSamplesPerSec;
+ dsb->freqAdjust = ((DWORD64)dsb->freq << DSOUND_FREQSHIFT) / device->pwfx->nSamplesPerSec;
dsb->nAvgBytesPerSec = dsb->freq *
dsbd->lpwfxFormat->nBlockAlign;
+ /* calculate fragment size and write lead */
+ DSOUND_RecalcFormat(dsb);
+
if (dsb->dsbd.dwFlags & DSBCAPS_CTRL3D) {
dsb->ds3db_ds3db.dwSize = sizeof(DS3DBUFFER);
dsb->ds3db_ds3db.vPosition.x = 0.0;
} else
DSOUND_RecalcVolPan(&(dsb->volpan));
- InitializeCriticalSection(&(dsb->lock));
- dsb->lock.DebugInfo->Spare[0] = (DWORD_PTR)"DSOUNDBUFFER_lock";
+ RtlInitializeResource(&dsb->lock);
/* register buffer if not primary */
if (!(dsbd->dwFlags & DSBCAPS_PRIMARYBUFFER)) {
- err = DSOUND_AddBuffer(ds, dsb);
+ err = DirectSoundDevice_AddBuffer(device, dsb);
if (err != DS_OK) {
HeapFree(GetProcessHeap(),0,dsb->buffer->memory);
HeapFree(GetProcessHeap(),0,dsb->buffer);
- dsb->lock.DebugInfo->Spare[0] = 0;
- DeleteCriticalSection(&(dsb->lock));
+ RtlDeleteResource(&dsb->lock);
HeapFree(GetProcessHeap(),0,dsb->pwfx);
HeapFree(GetProcessHeap(),0,dsb);
dsb = NULL;
return err;
}
-HRESULT WINAPI IDirectSoundBufferImpl_Destroy(
+HRESULT IDirectSoundBufferImpl_Destroy(
IDirectSoundBufferImpl *pdsb)
{
TRACE("(%p)\n",pdsb);
pdsb->notify = NULL;
}
- if (pdsb->dsb) {
+ if (pdsb->secondary) {
WARN("dsb not NULL\n");
- SecondaryBufferImpl_Destroy(pdsb->dsb);
- pdsb->dsb = NULL;
+ SecondaryBufferImpl_Destroy(pdsb->secondary);
+ pdsb->secondary = NULL;
}
while (IDirectSoundBuffer8_Release((LPDIRECTSOUNDBUFFER8)pdsb) > 0);
return S_OK;
}
+HRESULT IDirectSoundBufferImpl_Duplicate(
+ DirectSoundDevice *device,
+ IDirectSoundBufferImpl **ppdsb,
+ IDirectSoundBufferImpl *pdsb)
+{
+ IDirectSoundBufferImpl *dsb;
+ HRESULT hres = DS_OK;
+ int size;
+ TRACE("(%p,%p,%p)\n", device, pdsb, pdsb);
+
+ dsb = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(*dsb));
+
+ if (dsb == NULL) {
+ WARN("out of memory\n");
+ *ppdsb = NULL;
+ return DSERR_OUTOFMEMORY;
+ }
+
+ CopyMemory(dsb, pdsb, sizeof(IDirectSoundBufferImpl));
+
+ if (pdsb->hwbuf) {
+ TRACE("duplicating hardware buffer\n");
+
+ hres = IDsDriver_DuplicateSoundBuffer(device->driver, pdsb->hwbuf,
+ (LPVOID *)&dsb->hwbuf);
+ if (FAILED(hres)) {
+ WARN("IDsDriver_DuplicateSoundBuffer failed (%08x)\n", hres);
+ HeapFree(GetProcessHeap(),0,dsb);
+ *ppdsb = NULL;
+ return hres;
+ }
+ }
+
+ dsb->buffer->ref++;
+ list_add_head(&dsb->buffer->buffers, &dsb->entry);
+ dsb->ref = 0;
+ dsb->state = STATE_STOPPED;
+ dsb->buf_mixpos = dsb->sec_mixpos = 0;
+ dsb->device = device;
+ dsb->ds3db = NULL;
+ dsb->iks = NULL; /* FIXME? */
+ dsb->secondary = NULL;
+ dsb->tmp_buffer = NULL;
+ DSOUND_RecalcFormat(dsb);
+ DSOUND_MixToTemporary(dsb, 0, dsb->buflen, FALSE);
+
+ /* variable sized struct so calculate size based on format */
+ size = sizeof(WAVEFORMATEX) + pdsb->pwfx->cbSize;
+
+ dsb->pwfx = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,size);
+ if (dsb->pwfx == NULL) {
+ WARN("out of memory\n");
+ HeapFree(GetProcessHeap(),0,dsb->buffer);
+ HeapFree(GetProcessHeap(),0,dsb);
+ *ppdsb = NULL;
+ return DSERR_OUTOFMEMORY;
+ }
+
+ CopyMemory(dsb->pwfx, pdsb->pwfx, size);
+
+ RtlInitializeResource(&dsb->lock);
+
+ /* register buffer */
+ hres = DirectSoundDevice_AddBuffer(device, dsb);
+ if (hres != DS_OK) {
+ RtlDeleteResource(&dsb->lock);
+ HeapFree(GetProcessHeap(),0,dsb->tmp_buffer);
+ HeapFree(GetProcessHeap(),0,dsb->buffer);
+ HeapFree(GetProcessHeap(),0,dsb->pwfx);
+ HeapFree(GetProcessHeap(),0,dsb);
+ *ppdsb = 0;
+ }
+
+ *ppdsb = dsb;
+ return hres;
+}
+
/*******************************************************************************
* SecondaryBuffer
*/
static ULONG WINAPI SecondaryBufferImpl_AddRef(LPDIRECTSOUNDBUFFER8 iface)
{
- IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface;
+ SecondaryBufferImpl *This = (SecondaryBufferImpl *)iface;
ULONG ref = InterlockedIncrement(&(This->ref));
- TRACE("(%p) ref was %ld\n", This, ref - 1);
+ TRACE("(%p) ref was %d\n", This, ref - 1);
return ref;
}
static ULONG WINAPI SecondaryBufferImpl_Release(LPDIRECTSOUNDBUFFER8 iface)
{
- IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface;
- ULONG ref = InterlockedDecrement(&(This->ref));
- TRACE("(%p) ref was %ld\n", This, ref + 1);
+ SecondaryBufferImpl *This = (SecondaryBufferImpl *)iface;
+ ULONG ref;
+ TRACE("(%p)\n", This);
+ ref = InterlockedDecrement(&(This->ref));
+ TRACE("ref was %d\n", ref + 1);
if (!ref) {
- This->dsb->dsb = NULL;
+ This->dsb->secondary = NULL;
IDirectSoundBuffer_Release((LPDIRECTSOUNDBUFFER8)This->dsb);
HeapFree(GetProcessHeap(), 0, This);
TRACE("(%p) released\n", This);
LPDIRECTSOUNDBUFFER8 iface,LPWAVEFORMATEX lpwf,DWORD wfsize,LPDWORD wfwritten)
{
SecondaryBufferImpl *This = (SecondaryBufferImpl *)iface;
- TRACE("(%p,%p,%ld,%p)\n",This,lpwf,wfsize,wfwritten);
+ TRACE("(%p,%p,%d,%p)\n",This,lpwf,wfsize,wfwritten);
return IDirectSoundBufferImpl_GetFormat((LPDIRECTSOUNDBUFFER8)This->dsb,lpwf,wfsize,wfwritten);
}
LPDIRECTSOUNDBUFFER8 iface,
DWORD writecursor,
DWORD writebytes,
- LPVOID lplpaudioptr1,
+ LPVOID *lplpaudioptr1,
LPDWORD audiobytes1,
- LPVOID lplpaudioptr2,
+ LPVOID *lplpaudioptr2,
LPDWORD audiobytes2,
DWORD dwFlags)
{
SecondaryBufferImpl *This = (SecondaryBufferImpl *)iface;
- TRACE("(%p,%ld,%ld,%p,%p,%p,%p,0x%08lx)\n",
+ TRACE("(%p,%d,%d,%p,%p,%p,%p,0x%08x)\n",
This,writecursor,writebytes,lplpaudioptr1,audiobytes1,lplpaudioptr2,audiobytes2,dwFlags);
return IDirectSoundBufferImpl_Lock((LPDIRECTSOUNDBUFFER8)This->dsb,
LPDIRECTSOUNDBUFFER8 iface,DWORD reserved1,DWORD reserved2,DWORD flags)
{
SecondaryBufferImpl *This = (SecondaryBufferImpl *)iface;
- TRACE("(%p,%08lx,%08lx,%08lx)\n",This,reserved1,reserved2,flags);
+ TRACE("(%p,%08x,%08x,%08x)\n",This,reserved1,reserved2,flags);
return IDirectSoundBufferImpl_Play((LPDIRECTSOUNDBUFFER8)This->dsb,reserved1,reserved2,flags);
}
LPDIRECTSOUNDBUFFER8 iface,DWORD newpos)
{
SecondaryBufferImpl *This = (SecondaryBufferImpl *)iface;
- TRACE("(%p,%ld)\n",This,newpos);
+ TRACE("(%p,%d)\n",This,newpos);
return IDirectSoundBufferImpl_SetCurrentPosition((LPDIRECTSOUNDBUFFER8)This->dsb,newpos);
}
LPDIRECTSOUNDBUFFER8 iface,LONG vol)
{
SecondaryBufferImpl *This = (SecondaryBufferImpl *)iface;
- TRACE("(%p,%ld)\n",This,vol);
+ TRACE("(%p,%d)\n",This,vol);
return IDirectSoundBufferImpl_SetVolume((LPDIRECTSOUNDBUFFER8)This->dsb,vol);
}
LPDIRECTSOUNDBUFFER8 iface,LONG pan)
{
SecondaryBufferImpl *This = (SecondaryBufferImpl *)iface;
- TRACE("(%p,%ld)\n",This,pan);
+ TRACE("(%p,%d)\n",This,pan);
return IDirectSoundBufferImpl_SetPan((LPDIRECTSOUNDBUFFER8)This->dsb,pan);
}
LPDIRECTSOUNDBUFFER8 iface,DWORD freq)
{
SecondaryBufferImpl *This = (SecondaryBufferImpl *)iface;
- TRACE("(%p,%ld)\n",This,freq);
+ TRACE("(%p,%d)\n",This,freq);
return IDirectSoundBufferImpl_SetFrequency((LPDIRECTSOUNDBUFFER8)This->dsb,freq);
}
DWORD dwAudioBytes2)
{
SecondaryBufferImpl *This = (SecondaryBufferImpl *)iface;
- TRACE("(%p,%p,%ld,%p,%ld)\n",
+ TRACE("(%p,%p,%d,%p,%d)\n",
This, lpvAudioPtr1, dwAudioBytes1, lpvAudioPtr2, dwAudioBytes2);
return IDirectSoundBufferImpl_Unlock((LPDIRECTSOUNDBUFFER8)This->dsb,
LPDIRECTSOUNDBUFFER8 iface,DWORD dwEffectsCount,LPDSEFFECTDESC pDSFXDesc,LPDWORD pdwResultCodes)
{
SecondaryBufferImpl *This = (SecondaryBufferImpl *)iface;
- TRACE("(%p,%lu,%p,%p)\n",This,dwEffectsCount,pDSFXDesc,pdwResultCodes);
+ TRACE("(%p,%u,%p,%p)\n",This,dwEffectsCount,pDSFXDesc,pdwResultCodes);
return IDirectSoundBufferImpl_SetFX((LPDIRECTSOUNDBUFFER8)This->dsb,dwEffectsCount,pDSFXDesc,pdwResultCodes);
}
LPDIRECTSOUNDBUFFER8 iface,DWORD dwFlags,DWORD dwEffectsCount,LPDWORD pdwResultCodes)
{
SecondaryBufferImpl *This = (SecondaryBufferImpl *)iface;
- TRACE("(%p,%08lu,%lu,%p)\n",This,dwFlags,dwEffectsCount,pdwResultCodes);
+ TRACE("(%p,%08u,%u,%p)\n",This,dwFlags,dwEffectsCount,pdwResultCodes);
return IDirectSoundBufferImpl_AcquireResources((LPDIRECTSOUNDBUFFER8)This->dsb,dwFlags,dwEffectsCount,pdwResultCodes);
}
LPDIRECTSOUNDBUFFER8 iface,REFGUID rguidObject,DWORD dwIndex,REFGUID rguidInterface,LPVOID* ppObject)
{
SecondaryBufferImpl *This = (SecondaryBufferImpl *)iface;
- TRACE("(%p,%s,%lu,%s,%p)\n",This,debugstr_guid(rguidObject),dwIndex,debugstr_guid(rguidInterface),ppObject);
+ TRACE("(%p,%s,%u,%s,%p)\n",This,debugstr_guid(rguidObject),dwIndex,debugstr_guid(rguidInterface),ppObject);
return IDirectSoundBufferImpl_GetObjectInPath((LPDIRECTSOUNDBUFFER8)This->dsb,rguidObject,dwIndex,rguidInterface,ppObject);
}
SecondaryBufferImpl_GetObjectInPath
};
-HRESULT WINAPI SecondaryBufferImpl_Create(
+HRESULT SecondaryBufferImpl_Create(
IDirectSoundBufferImpl *dsb,
SecondaryBufferImpl **psb)
{
return S_OK;
}
-HRESULT WINAPI SecondaryBufferImpl_Destroy(
+static HRESULT SecondaryBufferImpl_Destroy(
SecondaryBufferImpl *pdsb)
{
TRACE("(%p)\n",pdsb);
projects / reactos.git / blobdiff