commit 24b315c51f1bc84866bb80331fd3c8ded72517e5
author Francois Gouget <fgouget@free.fr> Mon May 28 01:20:07 2007 +0200
committer Alexandre Julliard <julliard@winehq.org> Tue May 29 13:47:06 2007 +0200
tree 50c666e9d2ebf3f08a77ee164dc6a42780c4ba52
parent 30b7744472ea6e61476b08ad654ea3a9164457c1

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

dlls/dsound/tests/ds3d.c

diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c
index 7790014..54b50e2 100644
--- a/dlls/dsound/tests/ds3d.c
+++ b/dlls/dsound/tests/ds3d.c
@@ -608,8 +608,8 @@
             ok(rc==DS_OK,"IDirectSound3dListener_GetAllParameters() "
                "failed: %s\n",DXGetErrorString8(rc));
             if (move_listener) {
-                listener_param.vPosition.x = -5.0;
-                listener_param.vVelocity.x = 10.0/duration;
+                listener_param.vPosition.x = -5.0f;
+                listener_param.vVelocity.x = (float)(10.0/duration);
             }
             rc=IDirectSound3DListener_SetAllParameters(listener,
                                                        &listener_param,
@@ -619,8 +619,8 @@
         }
         if (buffer3d) {
             if (move_sound) {
-                buffer_param.vPosition.x = 100.0;
-                buffer_param.vVelocity.x = -200.0/duration;
+                buffer_param.vPosition.x = 100.0f;
+                buffer_param.vVelocity.x = (float)(-200.0/duration);
             }
             buffer_param.flMinDistance = 10;
             rc=IDirectSound3DBuffer_SetAllParameters(buffer,&buffer_param,
@@ -634,8 +634,7 @@
             WaitForSingleObject(GetCurrentProcess(),TIME_SLICE);
             now=GetTickCount();
             if (listener && move_listener) {
-                listener_param.vPosition.x = -5.0+10.0*(now-start_time)/
-                    1000/duration;
+                listener_param.vPosition.x = (float)(-5.0+10.0*(now-start_time)/1000/duration);
                 if (winetest_debug>2)
                     trace("listener position=%g\n",listener_param.vPosition.x);
                 rc=IDirectSound3DListener_SetPosition(listener,
@@ -645,8 +644,7 @@
                    "%s\n",DXGetErrorString8(rc));
             }
             if (buffer3d && move_sound) {
-                buffer_param.vPosition.x = 100-200.0*(now-start_time)/
-                    1000/duration;
+                buffer_param.vPosition.x = (float)(100-200.0*(now-start_time)/1000/duration);
                 if (winetest_debug>2)
                     trace("sound position=%g\n",buffer_param.vPosition.x);
                 rc=IDirectSound3DBuffer_SetPosition(buffer,

dlls/dsound/tests/ds3d8.c

diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c
index 70b7526..00c0ef7 100644
--- a/dlls/dsound/tests/ds3d8.c
+++ b/dlls/dsound/tests/ds3d8.c
@@ -485,8 +485,8 @@
             ok(rc==DS_OK,"IDirectSound3dListener_GetAllParameters() "
                "failed: %s\n",DXGetErrorString8(rc));
             if (move_listener) {
-                listener_param.vPosition.x = -5.0;
-                listener_param.vVelocity.x = 10.0/duration;
+                listener_param.vPosition.x = -5.0f;
+                listener_param.vVelocity.x = (float)(10.0/duration);
             }
             rc=IDirectSound3DListener_SetAllParameters(listener,
                                                        &listener_param,
@@ -496,8 +496,8 @@
         }
         if (buffer3d) {
             if (move_sound) {
-                buffer_param.vPosition.x = 100.0;
-                buffer_param.vVelocity.x = -200.0/duration;
+                buffer_param.vPosition.x = 100.0f;
+                buffer_param.vVelocity.x = (float)(-200.0/duration);
             }
             buffer_param.flMinDistance = 10;
             rc=IDirectSound3DBuffer_SetAllParameters(buffer,&buffer_param,
@@ -511,8 +511,7 @@
             WaitForSingleObject(GetCurrentProcess(),TIME_SLICE);
             now=GetTickCount();
             if (listener && move_listener) {
-                listener_param.vPosition.x = -5.0+10.0*(now-start_time)/
-                    1000/duration;
+                listener_param.vPosition.x = (float)(-5.0+10.0*(now-start_time)/1000/duration);
                 if (winetest_debug>2)
                     trace("listener position=%g\n",listener_param.vPosition.x);
                 rc=IDirectSound3DListener_SetPosition(listener,
@@ -522,8 +521,7 @@
                    "%s\n",DXGetErrorString8(rc));
             }
             if (buffer3d && move_sound) {
-                buffer_param.vPosition.x = 100-200.0*(now-start_time)/
-                    1000/duration;
+                buffer_param.vPosition.x = (float)(100-200.0*(now-start_time)/1000/duration);
                 if (winetest_debug>2)
                     trace("sound position=%g\n",buffer_param.vPosition.x);
                 rc=IDirectSound3DBuffer_SetPosition(buffer,