zontreck/wine
1
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine.git synced 2024-11-21 17:09:06 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'mr/gtasa-earrape' into 'master'

Browse source 
dsound: Reject NaN values in some functions.

See merge request wine/wine!6289
This commit is contained in:
Aida Jonikienė 2024-11-19 22:27:40 +00:00
commit 7c39669c15
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dlls/dsound/sound3d.c
View file

@ -703,6 +703,9 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetPosition(IDirectSound3DBuffer
TRACE("setting: Position vector = (%f,%f,%f); dwApply = %ld\n", x, y, z, dwApply);
if (isnan(x) || isnan(y) || isnan(z))
return DSERR_INVALIDPARAM;
AcquireSRWLockExclusive(&This->lock);
This->ds3db_ds3db.vPosition.x = x;
@ -961,6 +964,11 @@ static HRESULT WINAPI IDirectSound3DListenerImpl_SetOrientation(IDirectSound3DLi
TRACE("setting: Front vector = (%f,%f,%f); Top vector = (%f,%f,%f); dwApply = %ld\n",
xFront, yFront, zFront, xTop, yTop, zTop, dwApply);
if (isnan(xFront) || isnan(yFront) || isnan(zFront)
|| isnan(xTop) || isnan(yTop) || isnan(zTop))
return DSERR_INVALIDPARAM;
This->device->ds3dl.vOrientFront.x = xFront;
This->device->ds3dl.vOrientFront.y = yFront;
This->device->ds3dl.vOrientFront.z = zFront;

6
dlls/dsound/tests/ds3d.c
View file

@ -669,6 +669,10 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo,
buffer_param.vPosition.x,buffer_param.vPosition.y,
buffer_param.vPosition.z,DS3D_IMMEDIATE);
ok(rc==DS_OK,"IDirectSound3dBuffer_SetPosition() failed: %08lx\n", rc);
rc=IDirectSound3DBuffer_SetPosition(buffer,
NAN,NAN,NAN,DS3D_IMMEDIATE);
ok(rc==DSERR_INVALIDPARAM,"IDirectSound3dBuffer_SetPosition() returned %08lx\n", rc);
}
}
/* Check the sound duration was within 10% of the expected value */
@ -1350,6 +1354,8 @@ static void check_doppler(IDirectSound *dsound, IDirectSound3DListener *listener
ok(hr == S_OK, "Got hr %#lx.\n", hr);
hr = IDirectSound3DListener_SetVelocity(listener, 0, 0, 0, DS3D_DEFERRED);
ok(hr == S_OK, "Got hr %#lx.\n", hr);
hr = IDirectSound3DListener_SetOrientation(listener, NAN, NAN, NAN, NAN, NAN, NAN, DS3D_DEFERRED);
ok(hr == DSERR_INVALIDPARAM, "Got hr %#lx.\n", hr);
hr = IDirectSound3DBuffer_SetPosition(buffer_3d, 0, 1, 0, DS3D_DEFERRED);
ok(hr == S_OK, "Got hr %#lx.\n", hr);
hr = IDirectSound3DBuffer_SetVelocity(buffer_3d, 0, -60, 0, DS3D_DEFERRED);