Use ok("xxx\n") in the winmm test

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Chaneglog:

 * dlls/winmm/tests/wave.c

   Modify ok("xxx") calls into ok("xxx\n") as is now expected.

This test can now be used as a reference.


Index: dlls/winmm/tests/wave.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/tests/wave.c,v
retrieving revision 1.11
diff -u -r1.11 wave.c
--- dlls/winmm/tests/wave.c	5 Sep 2003 23:08:27 -0000	1.11
+++ dlls/winmm/tests/wave.c	10 Sep 2003 10:47:36 -0000
@@ -196,7 +196,7 @@
     /* Note: Win9x doesn't know WAVE_FORMAT_DIRECT */
     ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_BADDEVICEID ||
        (rc==MMSYSERR_INVALFLAG && (flags & WAVE_FORMAT_DIRECT)),
-       "waveOutOpen: device=%d format=%ldx%2dx%d flags=%lx(%s) rc=%d(%s)",device,
+       "waveOutOpen: device=%d format=%ldx%2dx%d flags=%lx(%s) rc=%d(%s)\n",device,
        wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels,CALLBACK_EVENT|flags,
        wave_open_flags(CALLBACK_EVENT|flags),rc,wave_out_error(rc));
     if (rc!=MMSYSERR_NOERROR) {
@@ -260,7 +260,7 @@

     rc=waveOutGetDevCapsA(ndev+1,&caps,sizeof(caps));
     ok(rc==MMSYSERR_BADDEVICEID,
-       "waveOutGetDevCapsA: MMSYSERR_BADDEVICEID expected, got %d",rc);
+       "waveOutGetDevCapsA: MMSYSERR_BADDEVICEID expected, got %d\n",rc);

     format.wFormatTag=WAVE_FORMAT_PCM;
     format.nChannels=2;
@@ -271,12 +271,12 @@
     format.cbSize=0;
     rc=waveOutOpen(&wout,ndev+1,&format,0,0,CALLBACK_NULL);
     ok(rc==MMSYSERR_BADDEVICEID,
-       "waveOutOpen: MMSYSERR_BADDEVICEID expected, got %d",rc);
+       "waveOutOpen: MMSYSERR_BADDEVICEID expected, got %d\n",rc);

     for (d=0;d<ndev;d++) {
         rc=waveOutGetDevCapsA(d,&caps,sizeof(caps));
         ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_BADDEVICEID,
-           "waveOutGetDevCapsA: failed to get capabilities of device %d: rc=%d",d,rc);
+           "waveOutGetDevCapsA: failed to get capabilities of device %d: rc=%d\n",d,rc);
         if (rc==MMSYSERR_BADDEVICEID)
             continue;

@@ -305,7 +305,7 @@
 	oformat=format;
         rc=waveOutOpen(&wout,d,&format,0,0,CALLBACK_NULL|WAVE_FORMAT_DIRECT);
         ok(rc==WAVERR_BADFORMAT,
-           "waveOutOpen: opening the device at 2MHz should fail %d: rc=%d",d,rc);
+           "waveOutOpen: opening the device at 2MHz should fail %d: rc=%d\n",d,rc);
         if (rc==MMSYSERR_NOERROR) {
             trace("     got %ldx%2dx%d for %ldx%2dx%d\n",
                   format.nSamplesPerSec, format.wBitsPerSample,
@@ -324,7 +324,7 @@
         format.cbSize=0;
         rc=waveOutOpen(&wout,d,&format,0,0,CALLBACK_NULL|WAVE_FORMAT_DIRECT);
         ok(rc==WAVERR_BADFORMAT || rc==MMSYSERR_INVALFLAG,
-           "waveOutOpen: opening the device at 2MHz should fail %d: rc=%d",d,rc);
+           "waveOutOpen: opening the device at 2MHz should fail %d: rc=%d\n",d,rc);
         if (rc==MMSYSERR_NOERROR) {
             trace("     got %ldx%2dx%d for %dx%2dx%d\n",
                   format.nSamplesPerSec, format.wBitsPerSample,
@@ -373,7 +373,7 @@
     /* Note: Win9x doesn't know WAVE_FORMAT_DIRECT */
     ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_BADDEVICEID ||
        (rc==MMSYSERR_INVALFLAG && (flags & WAVE_FORMAT_DIRECT)),
-       "waveInOpen: device=%d format=%ldx%2dx%d flags=%lx(%s) rc=%d(%s)",device,
+       "waveInOpen: device=%d format=%ldx%2dx%d flags=%lx(%s) rc=%d(%s)\n",device,
        wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels,CALLBACK_EVENT|flags,
        wave_open_flags(CALLBACK_EVENT|flags),rc,wave_in_error(rc));
     if (rc!=MMSYSERR_NOERROR) {
@@ -431,7 +431,7 @@

     rc=waveInGetDevCapsA(ndev+1,&caps,sizeof(caps));
     ok(rc==MMSYSERR_BADDEVICEID,
-       "waveInGetDevCapsA: MMSYSERR_BADDEVICEID expected, got %d",rc);
+       "waveInGetDevCapsA: MMSYSERR_BADDEVICEID expected, got %d\n",rc);

     format.wFormatTag=WAVE_FORMAT_PCM;
     format.nChannels=2;
@@ -442,12 +442,12 @@
     format.cbSize=0;
     rc=waveInOpen(&win,ndev+1,&format,0,0,CALLBACK_NULL);
     ok(rc==MMSYSERR_BADDEVICEID,
-       "waveInOpen: MMSYSERR_BADDEVICEID expected, got %d",rc);
+       "waveInOpen: MMSYSERR_BADDEVICEID expected, got %d\n",rc);

     for (d=0;d<ndev;d++) {
         rc=waveInGetDevCapsA(d,&caps,sizeof(caps));
         ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_BADDEVICEID,
-           "waveInGetDevCapsA: failed to get capabilities of device %d: rc=%d",d,rc);
+           "waveInGetDevCapsA: failed to get capabilities of device %d: rc=%d\n",d,rc);
         if (rc==MMSYSERR_BADDEVICEID)
             continue;

@@ -473,7 +473,7 @@
 	oformat=format;
         rc=waveInOpen(&win,d,&format,0,0,CALLBACK_NULL|WAVE_FORMAT_DIRECT);
         ok(rc==WAVERR_BADFORMAT,
-           "waveInOpen: opening the device at 2MHz should fail %d: rc=%d",d,rc);
+           "waveInOpen: opening the device at 2MHz should fail %d: rc=%d\n",d,rc);
         if (rc==MMSYSERR_NOERROR) {
             trace("     got %ldx%2dx%d for %ldx%2dx%d\n",
                   format.nSamplesPerSec, format.wBitsPerSample,
@@ -495,7 +495,7 @@
         format.cbSize=0;
         rc=waveInOpen(&win,d,&format,0,0,CALLBACK_NULL|WAVE_FORMAT_DIRECT);
         ok(rc==WAVERR_BADFORMAT || rc==MMSYSERR_INVALFLAG,
-           "waveInOpen: opening the device at 2MHz should fail %d: rc=%d",d,rc);
+           "waveInOpen: opening the device at 2MHz should fail %d: rc=%d\n",d,rc);
         if (rc==MMSYSERR_NOERROR) {
             trace("     got %ldx%2dx%d for %dx%2dx%d\n",
                   format.nSamplesPerSec, format.wBitsPerSample,


-- 
Francois Gouget         fgouget@free.fr        http://fgouget.free.fr/
The nice thing about meditation is that it makes doing nothing quite respectable
                                  -- Paul Dean




[Index of Archives]     [Gimp for Windows]     [Red Hat]     [Samba]     [Yosemite Camping]     [Graphics Cards]     [Wine Home]

  Powered by Linux