Skip to content

W
wine-cw
Commit 24b315c5 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard
Browse files
Options

dsound/tests: Fix the Visual C++ double to float conversion warnings.

parent 30b77444
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 16 deletions
dlls/dsound/tests/ds3d.c
View file @ 24b315c5
...@@ -608,8 +608,8 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, ...@@ -608,8 +608,8 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo,
ok(rc==DS_OK,"IDirectSound3dListener_GetAllParameters() " ok(rc==DS_OK,"IDirectSound3dListener_GetAllParameters() "
"failed: %s\n",DXGetErrorString8(rc)); "failed: %s\n",DXGetErrorString8(rc));
if (move_listener) { if (move_listener) {
listener_param.vPosition.x = -5.0; listener_param.vPosition.x = -5.0f;
listener_param.vVelocity.x = 10.0/duration; listener_param.vVelocity.x = (float)(10.0/duration);
} }
rc=IDirectSound3DListener_SetAllParameters(listener, rc=IDirectSound3DListener_SetAllParameters(listener,
&listener_param, &listener_param,
...@@ -619,8 +619,8 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, ...@@ -619,8 +619,8 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo,
} }
if (buffer3d) { if (buffer3d) {
if (move_sound) { if (move_sound) {
buffer_param.vPosition.x = 100.0; buffer_param.vPosition.x = 100.0f;
buffer_param.vVelocity.x = -200.0/duration; buffer_param.vVelocity.x = (float)(-200.0/duration);
} }
buffer_param.flMinDistance = 10; buffer_param.flMinDistance = 10;
rc=IDirectSound3DBuffer_SetAllParameters(buffer,&buffer_param, rc=IDirectSound3DBuffer_SetAllParameters(buffer,&buffer_param,
...@@ -634,8 +634,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, ...@@ -634,8 +634,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo,
WaitForSingleObject(GetCurrentProcess(),TIME_SLICE); WaitForSingleObject(GetCurrentProcess(),TIME_SLICE);
now=GetTickCount(); now=GetTickCount();
if (listener && move_listener) { if (listener && move_listener) {
listener_param.vPosition.x = -5.0+10.0*(now-start_time)/ listener_param.vPosition.x = (float)(-5.0+10.0*(now-start_time)/1000/duration);
1000/duration;
if (winetest_debug>2) if (winetest_debug>2)
trace("listener position=%g\n",listener_param.vPosition.x); trace("listener position=%g\n",listener_param.vPosition.x);
rc=IDirectSound3DListener_SetPosition(listener, rc=IDirectSound3DListener_SetPosition(listener,
...@@ -645,8 +644,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, ...@@ -645,8 +644,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo,
"%s\n",DXGetErrorString8(rc)); "%s\n",DXGetErrorString8(rc));
} }
if (buffer3d && move_sound) { if (buffer3d && move_sound) {
buffer_param.vPosition.x = 100-200.0*(now-start_time)/ buffer_param.vPosition.x = (float)(100-200.0*(now-start_time)/1000/duration);
1000/duration;
if (winetest_debug>2) if (winetest_debug>2)
trace("sound position=%g\n",buffer_param.vPosition.x); trace("sound position=%g\n",buffer_param.vPosition.x);
rc=IDirectSound3DBuffer_SetPosition(buffer, rc=IDirectSound3DBuffer_SetPosition(buffer,
......
dlls/dsound/tests/ds3d8.c
View file @ 24b315c5
...@@ -485,8 +485,8 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, ...@@ -485,8 +485,8 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo,
ok(rc==DS_OK,"IDirectSound3dListener_GetAllParameters() " ok(rc==DS_OK,"IDirectSound3dListener_GetAllParameters() "
"failed: %s\n",DXGetErrorString8(rc)); "failed: %s\n",DXGetErrorString8(rc));
if (move_listener) { if (move_listener) {
listener_param.vPosition.x = -5.0; listener_param.vPosition.x = -5.0f;
listener_param.vVelocity.x = 10.0/duration; listener_param.vVelocity.x = (float)(10.0/duration);
} }
rc=IDirectSound3DListener_SetAllParameters(listener, rc=IDirectSound3DListener_SetAllParameters(listener,
&listener_param, &listener_param,
...@@ -496,8 +496,8 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, ...@@ -496,8 +496,8 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo,
} }
if (buffer3d) { if (buffer3d) {
if (move_sound) { if (move_sound) {
buffer_param.vPosition.x = 100.0; buffer_param.vPosition.x = 100.0f;
buffer_param.vVelocity.x = -200.0/duration; buffer_param.vVelocity.x = (float)(-200.0/duration);
} }
buffer_param.flMinDistance = 10; buffer_param.flMinDistance = 10;
rc=IDirectSound3DBuffer_SetAllParameters(buffer,&buffer_param, rc=IDirectSound3DBuffer_SetAllParameters(buffer,&buffer_param,
...@@ -511,8 +511,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, ...@@ -511,8 +511,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo,
WaitForSingleObject(GetCurrentProcess(),TIME_SLICE); WaitForSingleObject(GetCurrentProcess(),TIME_SLICE);
now=GetTickCount(); now=GetTickCount();
if (listener && move_listener) { if (listener && move_listener) {
listener_param.vPosition.x = -5.0+10.0*(now-start_time)/ listener_param.vPosition.x = (float)(-5.0+10.0*(now-start_time)/1000/duration);
1000/duration;
if (winetest_debug>2) if (winetest_debug>2)
trace("listener position=%g\n",listener_param.vPosition.x); trace("listener position=%g\n",listener_param.vPosition.x);
rc=IDirectSound3DListener_SetPosition(listener, rc=IDirectSound3DListener_SetPosition(listener,
...@@ -522,8 +521,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, ...@@ -522,8 +521,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo,
"%s\n",DXGetErrorString8(rc)); "%s\n",DXGetErrorString8(rc));
} }
if (buffer3d && move_sound) { if (buffer3d && move_sound) {
buffer_param.vPosition.x = 100-200.0*(now-start_time)/ buffer_param.vPosition.x = (float)(100-200.0*(now-start_time)/1000/duration);
1000/duration;
if (winetest_debug>2) if (winetest_debug>2)
trace("sound position=%g\n",buffer_param.vPosition.x); trace("sound position=%g\n",buffer_param.vPosition.x);
rc=IDirectSound3DBuffer_SetPosition(buffer, rc=IDirectSound3DBuffer_SetPosition(buffer,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment