[DSOUND] add info to failed tests

Robert Reif reif at earthlink.net
Tue Mar 14 18:17:43 CST 2006


Print format for failed SetFormat calls.
-------------- next part --------------
Index: dlls/dsound/tests/ds3d.c
===================================================================
RCS file: /home/wine/wine/dlls/dsound/tests/ds3d.c,v
retrieving revision 1.33
diff -p -u -r1.33 ds3d.c
--- dlls/dsound/tests/ds3d.c	17 Jan 2006 15:33:21 -0000	1.33
+++ dlls/dsound/tests/ds3d.c	15 Mar 2006 00:12:56 -0000
@@ -378,8 +378,8 @@ void test_buffer(LPDIRECTSOUND dso, LPDI
 
         init_format(&wfx2,WAVE_FORMAT_PCM,11025,16,2);
         rc=IDirectSoundBuffer_SetFormat(*dsbo,&wfx2);
-        ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat() failed: %s\n",
-           DXGetErrorString8(rc));
+        ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %s\n",
+           format_string(&wfx2), DXGetErrorString8(rc));
 
         /* There is no garantee that SetFormat will actually change the
 	 * format to what we asked for. It depends on what the soundcard
Index: dlls/dsound/tests/ds3d8.c
===================================================================
RCS file: /home/wine/wine/dlls/dsound/tests/ds3d8.c,v
retrieving revision 1.25
diff -p -u -r1.25 ds3d8.c
--- dlls/dsound/tests/ds3d8.c	17 Jan 2006 15:33:21 -0000	1.25
+++ dlls/dsound/tests/ds3d8.c	15 Mar 2006 00:12:57 -0000
@@ -270,8 +270,8 @@ void test_buffer8(LPDIRECTSOUND8 dso, LP
 
         init_format(&wfx2,WAVE_FORMAT_PCM,11025,16,2);
         rc=IDirectSoundBuffer_SetFormat(*dsbo,&wfx2);
-        ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat() failed: %s\n",
-           DXGetErrorString8(rc));
+        ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %s\n",
+           format_string(&wfx2), DXGetErrorString8(rc));
 
         /* There is no garantee that SetFormat will actually change the
 	 * format to what we asked for. It depends on what the soundcard
Index: dlls/dsound/tests/dsound.c
===================================================================
RCS file: /home/wine/wine/dlls/dsound/tests/dsound.c,v
retrieving revision 1.57
diff -p -u -r1.57 dsound.c
--- dlls/dsound/tests/dsound.c	6 Jan 2006 12:18:52 -0000	1.57
+++ dlls/dsound/tests/dsound.c	15 Mar 2006 00:12:58 -0000
@@ -550,8 +550,8 @@ static HRESULT test_primary_secondary(LP
                         formats[f][2]);
             wfx2=wfx;
             rc=IDirectSoundBuffer_SetFormat(primary,&wfx);
-            ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat() failed: %s\n",
-               DXGetErrorString8(rc));
+            ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %s\n",
+               format_string(&wfx), DXGetErrorString8(rc));
 
             /* There is no garantee that SetFormat will actually change the
              * format to what we asked for. It depends on what the soundcard
Index: dlls/dsound/tests/dsound8.c
===================================================================
RCS file: /home/wine/wine/dlls/dsound/tests/dsound8.c,v
retrieving revision 1.28
diff -p -u -r1.28 dsound8.c
--- dlls/dsound/tests/dsound8.c	6 Jan 2006 12:18:52 -0000	1.28
+++ dlls/dsound/tests/dsound8.c	15 Mar 2006 00:12:58 -0000
@@ -582,8 +582,8 @@ static HRESULT test_primary_secondary8(L
                         formats[f][2]);
             wfx2=wfx;
             rc=IDirectSoundBuffer_SetFormat(primary,&wfx);
-            ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat() failed: %s\n",
-               DXGetErrorString8(rc));
+            ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %s\n",
+               format_string(&wfx), DXGetErrorString8(rc));
 
             /* There is no garantee that SetFormat will actually change the
              * format to what we asked for. It depends on what the soundcard


More information about the wine-patches mailing list