ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dsound: Check for invalid parameter when locking primary and secondary buffers.

Browse Source
This commit is contained in:
Jeff Zaroyko 2009-01-02 17:39:10 +11:00 committed by Alexandre Julliard
parent 14db70036d
commit aff1dbe531
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/dsound/buffer.c
View File

@ -532,6 +532,9 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Lock(
GetTickCount() GetTickCount()
); );
if (!audiobytes1)
return DSERR_INVALIDPARAM;
/* when this flag is set, writecursor is meaningless and must be calculated */ /* when this flag is set, writecursor is meaningless and must be calculated */
if (flags & DSBLOCK_FROMWRITECURSOR) { if (flags & DSBLOCK_FROMWRITECURSOR) {
/* GetCurrentPosition does too much magic to duplicate here */ /* GetCurrentPosition does too much magic to duplicate here */

3
dlls/dsound/primary.c
View File

@ -837,6 +837,9 @@ static HRESULT WINAPI PrimaryBufferImpl_Lock(
GetTickCount() GetTickCount()
); );
if (!audiobytes1)
return DSERR_INVALIDPARAM;
if (device->priolevel != DSSCL_WRITEPRIMARY) { if (device->priolevel != DSSCL_WRITEPRIMARY) {
WARN("failed priority check!\n"); WARN("failed priority check!\n");
return DSERR_PRIOLEVELNEEDED; return DSERR_PRIOLEVELNEEDED;

4
dlls/dsound/tests/ds3d.c
View File

@ -184,6 +184,10 @@ static int buffer_refill(play_state_t* state, DWORD size)
if (size>state->wave_len-state->written) if (size>state->wave_len-state->written)
size=state->wave_len-state->written; size=state->wave_len-state->written;
/* some broken apps like Navyfield mistakenly pass NULL for a ppValue */
rc=IDirectSoundBuffer_Lock(state->dsbo,state->offset,size,
&ptr1,NULL,&ptr2,&len2,0);
ok(rc==DSERR_INVALIDPARAM,"expected %08x got %08x\n",DSERR_INVALIDPARAM, rc);
rc=IDirectSoundBuffer_Lock(state->dsbo,state->offset,size, rc=IDirectSoundBuffer_Lock(state->dsbo,state->offset,size,
&ptr1,&len1,&ptr2,&len2,0); &ptr1,&len1,&ptr2,&len2,0);
ok(rc==DS_OK,"IDirectSoundBuffer_Lock() failed: %08x\n", rc); ok(rc==DS_OK,"IDirectSoundBuffer_Lock() failed: %08x\n", rc);