[ros-diffs] [janderwald] 45530: [DSOUND_NEW] - Add more parameter checks - Implement a few more functions for the primary sound buffer
janderwald at svn.reactos.org
janderwald at svn.reactos.org
Tue Feb 9 15:24:50 CET 2010
Author: janderwald
Date: Tue Feb 9 15:24:50 2010
New Revision: 45530
URL: http://svn.reactos.org/svn/reactos?rev=45530&view=rev
Log:
[DSOUND_NEW]
- Add more parameter checks
- Implement a few more functions for the primary sound buffer
Modified:
trunk/reactos/dll/directx/dsound_new/directsound.c
trunk/reactos/dll/directx/dsound_new/precomp.h
trunk/reactos/dll/directx/dsound_new/primary.c
Modified: trunk/reactos/dll/directx/dsound_new/directsound.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/directsound.c?rev=45530&r1=45529&r2=45530&view=diff
==============================================================================
--- trunk/reactos/dll/directx/dsound_new/directsound.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/dsound_new/directsound.c [iso-8859-1] Tue Feb 9 15:24:50 2010
@@ -121,6 +121,12 @@
return DSERR_INVALIDPARAM;
}
+ if (lpcDSBufferDesc->dwBufferBytes != 0)
+ {
+ /* buffer size must be zero for primary sound buffer */
+ return DSERR_INVALIDPARAM;
+ }
+
if (This->PrimaryBuffer)
{
/* primary buffer already exists */
@@ -129,7 +135,7 @@
return S_OK;
}
- hResult = NewPrimarySoundBuffer((LPLPDIRECTSOUNDBUFFER8)lplpDirectSoundBuffer, This->Filter, This->dwLevel);
+ hResult = NewPrimarySoundBuffer((LPLPDIRECTSOUNDBUFFER8)lplpDirectSoundBuffer, This->Filter, This->dwLevel, lpcDSBufferDesc->dwFlags);
if (SUCCEEDED(hResult))
{
/* store primary buffer */
@@ -145,9 +151,15 @@
return DSERR_INVALIDPARAM;
}
+ if (lpcDSBufferDesc->dwBufferBytes < DSBSIZE_MIN || lpcDSBufferDesc->dwBufferBytes > DSBSIZE_MAX)
+ {
+ /* buffer size must be within bounds for secondary sound buffer*/
+ return DSERR_INVALIDPARAM;
+ }
+
if (!This->PrimaryBuffer)
{
- hResult = NewPrimarySoundBuffer((LPLPDIRECTSOUNDBUFFER8)lplpDirectSoundBuffer, This->Filter, This->dwLevel);
+ hResult = NewPrimarySoundBuffer((LPLPDIRECTSOUNDBUFFER8)lplpDirectSoundBuffer, This->Filter, This->dwLevel, lpcDSBufferDesc->dwFlags);
if (SUCCEEDED(hResult))
{
/* store primary buffer */
Modified: trunk/reactos/dll/directx/dsound_new/precomp.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/precomp.h?rev=45530&r1=45529&r2=45530&view=diff
==============================================================================
--- trunk/reactos/dll/directx/dsound_new/precomp.h [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/dsound_new/precomp.h [iso-8859-1] Tue Feb 9 15:24:50 2010
@@ -201,7 +201,8 @@
NewPrimarySoundBuffer(
LPDIRECTSOUNDBUFFER8 *OutBuffer,
LPFILTERINFO Filter,
- DWORD dwLevel);
+ DWORD dwLevel,
+ DWORD dwFlags);
HRESULT
PrimaryDirectSoundBuffer_SetFormat(
Modified: trunk/reactos/dll/directx/dsound_new/primary.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/primary.c?rev=45530&r1=45529&r2=45530&view=diff
==============================================================================
--- trunk/reactos/dll/directx/dsound_new/primary.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/dsound_new/primary.c [iso-8859-1] Tue Feb 9 15:24:50 2010
@@ -17,6 +17,10 @@
LPFILTERINFO Filter;
DWORD dwLevel;
+ DWORD dwFlags;
+ DWORD dwFrequency;
+ LONG Volume;
+ LONG VolumePan;
WAVEFORMATEX Format;
HANDLE hPin;
CRITICAL_SECTION Lock;
@@ -94,8 +98,27 @@
LPDIRECTSOUNDBUFFER8 iface,
LPDSBCAPS pDSBufferCaps)
{
- UNIMPLEMENTED
- return DSERR_INVALIDPARAM;
+ LPCDirectSoundBuffer This = (LPCDirectSoundBuffer)CONTAINING_RECORD(iface, CDirectSoundBuffer, lpVtbl);
+
+ if (!pDSBufferCaps)
+ {
+ /* invalid parameter */
+ return DSERR_INVALIDPARAM;
+ }
+
+ if (pDSBufferCaps->dwSize < sizeof(DSBCAPS))
+ {
+ /* invalid buffer size */
+ return DSERR_INVALIDPARAM;
+ }
+
+ /* get buffer details */
+ pDSBufferCaps->dwUnlockTransferRate = 0;
+ pDSBufferCaps->dwPlayCpuOverhead = 0;
+ pDSBufferCaps->dwSize = 0; //FIXME
+ pDSBufferCaps->dwFlags = This->dwFlags;
+
+ return DS_OK;
}
HRESULT
@@ -105,7 +128,21 @@
LPDWORD pdwCurrentPlayCursor,
LPDWORD pdwCurrentWriteCursor)
{
- UNIMPLEMENTED
+ LPCDirectSoundBuffer This = (LPCDirectSoundBuffer)CONTAINING_RECORD(iface, CDirectSoundBuffer, lpVtbl);
+
+ if (This->dwLevel < DSSCL_PRIORITY)
+ {
+ /* needs priority level */
+ return DSERR_PRIOLEVELNEEDED;
+ }
+
+ if (!pdwCurrentPlayCursor && !pdwCurrentWriteCursor)
+ {
+ /* all parameters are null */
+ return DSERR_INVALIDPARAM;
+ }
+
+ UNIMPLEMENTED;
return DSERR_INVALIDPARAM;
}
@@ -160,8 +197,18 @@
LPDIRECTSOUNDBUFFER8 iface,
LPLONG plVolume)
{
- UNIMPLEMENTED
- return DSERR_INVALIDPARAM;
+ LPCDirectSoundBuffer This = (LPCDirectSoundBuffer)CONTAINING_RECORD(iface, CDirectSoundBuffer, lpVtbl);
+
+ if (!plVolume)
+ {
+ /* invalid parameter */
+ return DSERR_INVALIDPARAM;
+ }
+
+ /* get volume */
+ *plVolume = This->Volume;
+
+ return DS_OK;
}
HRESULT
@@ -170,8 +217,18 @@
LPDIRECTSOUNDBUFFER8 iface,
LPLONG plPan)
{
- UNIMPLEMENTED
- return DSERR_INVALIDPARAM;
+ LPCDirectSoundBuffer This = (LPCDirectSoundBuffer)CONTAINING_RECORD(iface, CDirectSoundBuffer, lpVtbl);
+
+ if (!plPan)
+ {
+ /* invalid parameter */
+ return DSERR_INVALIDPARAM;
+ }
+
+ /* get frequency */
+ *plPan = This->VolumePan;
+
+ return DS_OK;
}
HRESULT
@@ -180,8 +237,18 @@
LPDIRECTSOUNDBUFFER8 iface,
LPDWORD pdwFrequency)
{
- UNIMPLEMENTED
- return DSERR_INVALIDPARAM;
+ LPCDirectSoundBuffer This = (LPCDirectSoundBuffer)CONTAINING_RECORD(iface, CDirectSoundBuffer, lpVtbl);
+
+ if (!pdwFrequency)
+ {
+ /* invalid parameter */
+ return DSERR_INVALIDPARAM;
+ }
+
+ /* get frequency */
+ *pdwFrequency = This->dwFrequency;
+
+ return DS_OK;
}
HRESULT
@@ -190,8 +257,22 @@
LPDIRECTSOUNDBUFFER8 iface,
LPDWORD pdwStatus)
{
- UNIMPLEMENTED
- return DSERR_INVALIDPARAM;
+ LPCDirectSoundBuffer This = (LPCDirectSoundBuffer)CONTAINING_RECORD(iface, CDirectSoundBuffer, lpVtbl);
+
+ if (!pdwStatus)
+ {
+ /* invalid parameter */
+ return DSERR_INVALIDPARAM;
+ }
+
+ *pdwStatus = 0;
+ if (This->State == KSSTATE_RUN || This->State == KSSTATE_ACQUIRE)
+ {
+ /* buffer is playing */
+ *pdwStatus |= DSBSTATUS_PLAYING | DSBSTATUS_LOOPING;
+ }
+
+ return DS_OK;
}
HRESULT
@@ -201,8 +282,8 @@
LPDIRECTSOUND pDirectSound,
LPCDSBUFFERDESC pcDSBufferDesc)
{
- UNIMPLEMENTED
- return DSERR_INVALIDPARAM;
+ /* RTFM */
+ return DSERR_ALREADYINITIALIZED;
}
HRESULT
@@ -303,8 +384,20 @@
LPDIRECTSOUNDBUFFER8 iface,
LONG lVolume)
{
- UNIMPLEMENTED
- return DSERR_INVALIDPARAM;
+ LPCDirectSoundBuffer This = (LPCDirectSoundBuffer)CONTAINING_RECORD(iface, CDirectSoundBuffer, lpVtbl);
+
+ if (lVolume < DSBVOLUME_MIN || lVolume > DSBVOLUME_MAX)
+ {
+ /* invalid parameter */
+ return DSERR_INVALIDPARAM;
+ }
+
+ /* TODO: call volume node */
+
+ /* Store volume */
+ This->Volume = lVolume;
+
+ return DS_OK;
}
HRESULT
@@ -313,8 +406,20 @@
LPDIRECTSOUNDBUFFER8 iface,
LONG lPan)
{
- UNIMPLEMENTED
- return DSERR_INVALIDPARAM;
+ LPCDirectSoundBuffer This = (LPCDirectSoundBuffer)CONTAINING_RECORD(iface, CDirectSoundBuffer, lpVtbl);
+
+ if (lPan < DSBPAN_LEFT || lPan > DSBPAN_RIGHT)
+ {
+ /* invalid parameter */
+ return DSERR_INVALIDPARAM;
+ }
+
+ /* TODO: call volume node */
+
+ /* Store volume pan */
+ This->VolumePan = lPan;
+
+ return DS_OK;
}
HRESULT
@@ -323,8 +428,16 @@
LPDIRECTSOUNDBUFFER8 iface,
DWORD dwFrequency)
{
- UNIMPLEMENTED
- return DSERR_INVALIDPARAM;
+ LPCDirectSoundBuffer This = (LPCDirectSoundBuffer)CONTAINING_RECORD(iface, CDirectSoundBuffer, lpVtbl);
+
+ if (This->dwLevel < DSSCL_PRIORITY)
+ {
+ /* needs priority level */
+ return DSERR_PRIOLEVELNEEDED;
+ }
+
+ /* invalid request */
+ return DSERR_CONTROLUNAVAIL;
}
HRESULT
@@ -372,8 +485,6 @@
UNIMPLEMENTED
return DSERR_INVALIDPARAM;
}
-
-
HRESULT
@@ -593,7 +704,10 @@
Result = OpenPin(This->Filter->hFilter, PinId, (LPWAVEFORMATEX)pcfxFormat, &This->hPin, bLooped);
DPRINT("PinId %u Result %u\n", PinId, Result);
if (Result == ERROR_SUCCESS)
+ {
+ This->dwFrequency = pcfxFormat->nSamplesPerSec;
break;
+ }
This->hPin = NULL;
DeviceId++;
@@ -635,7 +749,8 @@
NewPrimarySoundBuffer(
LPDIRECTSOUNDBUFFER8 *OutBuffer,
LPFILTERINFO Filter,
- DWORD dwLevel)
+ DWORD dwLevel,
+ DWORD dwFlags)
{
LPCDirectSoundBuffer This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CDirectSoundBuffer));
@@ -649,6 +764,10 @@
This->lpVtbl = &vt_DirectSoundBuffer8;
This->Filter = Filter;
This->dwLevel = dwLevel;
+ This->dwFlags = dwFlags;
+ This->dwFrequency = 0;
+ This->Volume = DSBVOLUME_MAX;
+ This->VolumePan = DSBPAN_CENTER;
This->hPin = NULL;
InitializeCriticalSection(&This->Lock);
More information about the Ros-diffs
mailing list