From 546447152e8fc828e609e3972e0e31a88b605ea9 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst Date: Mon, 1 Oct 2007 15:07:59 +0200 Subject: [PATCH] dsound: Fix IDirectSoundBuffer_GetPosition. --- dlls/dsound/capture.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index f0b230dcde9..9de2ecd8ddc 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -919,25 +919,22 @@ IDirectSoundCaptureBufferImpl_GetCurrentPosition( if (hres != DS_OK) WARN("IDsCaptureDriverBuffer_GetPosition failed\n"); } else if (This->device->hwi) { - DWORD pos; + DWORD pos; - EnterCriticalSection(&This->device->lock); - pos = (DWORD_PTR)This->device->pwave[This->device->index].lpData - (DWORD_PTR)This->device->buffer; - TRACE("old This->device->state=%s\n",captureStateString[This->device->state]); + EnterCriticalSection(&This->device->lock); + pos = (DWORD_PTR)This->device->pwave[This->device->index].lpData - (DWORD_PTR)This->device->buffer; if (lpdwCapturePosition) - *lpdwCapturePosition = pos; + *lpdwCapturePosition = (This->device->pwave[This->device->index].dwBufferLength + pos) % This->device->buflen; + if (lpdwReadPosition) + *lpdwReadPosition = pos; + LeaveCriticalSection(&This->device->lock); - if (lpdwReadPosition) - *lpdwReadPosition = (This->device->pwave[This->device->index].dwBufferLength + pos) % This->device->buflen; - LeaveCriticalSection(&This->device->lock); - - if (lpdwCapturePosition) TRACE("*lpdwCapturePosition=%d\n",*lpdwCapturePosition); - if (lpdwReadPosition) TRACE("*lpdwReadPosition=%d\n",*lpdwReadPosition); } else { WARN("no driver\n"); hres = DSERR_NODRIVER; } + TRACE("cappos=%d readpos=%d\n", (lpdwCapturePosition?*lpdwCapturePosition:-1), (lpdwReadPosition?*lpdwReadPosition:-1)); TRACE("returning %08x\n", hres); return hres; } -- 2.11.4.GIT