Alexandre Julliard : winmm/tests: Fix printf format warnings for the Windows build.
Alexandre Julliard
julliard at winehq.org
Fri Apr 5 16:04:58 CDT 2019
Module: wine
Branch: master
Commit: 1c7312a0c66e56c1d44d086849682a30145dd0bb
URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c7312a0c66e56c1d44d086849682a30145dd0bb
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Apr 5 18:47:14 2019 +0200
winmm/tests: Fix printf format warnings for the Windows build.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/winmm/tests/capture.c | 11 +++++------
dlls/winmm/tests/wave.c | 3 +--
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c
index ba71f9c..4290c35 100644
--- a/dlls/winmm/tests/capture.c
+++ b/dlls/winmm/tests/capture.c
@@ -141,7 +141,8 @@ static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format,
DWORD nSamplesPerSec = pwfx->nSamplesPerSec;
win=NULL;
- rc=waveInOpen(&win,device,pwfx,(DWORD_PTR)hevent,0,CALLBACK_EVENT|flags);
+ flags |= CALLBACK_EVENT;
+ rc=waveInOpen(&win,device,pwfx,(DWORD_PTR)hevent,0,flags);
/* Note: Win9x doesn't know WAVE_FORMAT_DIRECT */
ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_BADDEVICEID ||
rc==MMSYSERR_NOTENABLED || rc==MMSYSERR_NODRIVER ||
@@ -154,8 +155,7 @@ static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format,
(rc==MMSYSERR_INVALFLAG && (flags & WAVE_FORMAT_DIRECT)),
"waveInOpen(%s): format=%dx%2dx%d flags=%x(%s) rc=%s\n",
dev_name(device),pwfx->nSamplesPerSec,pwfx->wBitsPerSample,
- pwfx->nChannels,CALLBACK_EVENT|flags,
- wave_open_flags(CALLBACK_EVENT|flags),wave_in_error(rc));
+ pwfx->nChannels,flags,wave_open_flags(flags),wave_in_error(rc));
if ((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) &&
(flags & WAVE_FORMAT_DIRECT) && (pcaps->dwFormats & format))
trace(" Reason: The device lists this format as supported in its "
@@ -261,10 +261,9 @@ static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format,
rc==MMSYSERR_ALLOCATED ||
((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) &&
!(pcaps->dwFormats & format)),
- "waveOutOpen(%s) format=%dx%2dx%d flags=%x(%s) rc=%s\n",
+ "waveOutOpen(%s) format=%dx%2dx%d flags=CALLBACK_EVENT rc=%s\n",
dev_name(device),pwfx->nSamplesPerSec,pwfx->wBitsPerSample,
- pwfx->nChannels,CALLBACK_EVENT|flags,
- wave_open_flags(CALLBACK_EVENT),wave_out_error(rc));
+ pwfx->nChannels,wave_out_error(rc));
if (rc==MMSYSERR_NOERROR)
{
rc=waveOutPrepareHeader(wout, &frag, sizeof(frag));
diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c
index 9c114c8..a2f2a82 100644
--- a/dlls/winmm/tests/wave.c
+++ b/dlls/winmm/tests/wave.c
@@ -665,8 +665,7 @@ static void wave_out_test_deviceOut(int device, double duration, int headers, in
(rc==MMSYSERR_INVALFLAG && (flags & WAVE_FORMAT_DIRECT)),
"waveOutOpen(%s): format=%dx%2dx%d flags=%x(%s) rc=%s\n",
dev_name(device),pwfx->nSamplesPerSec,pwfx->wBitsPerSample,
- pwfx->nChannels,CALLBACK_EVENT|flags,
- wave_open_flags(CALLBACK_EVENT|flags),wave_out_error(rc));
+ pwfx->nChannels,flags,wave_open_flags(flags),wave_out_error(rc));
if ((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) &&
(flags & WAVE_FORMAT_DIRECT) && (pcaps->dwFormats & format))
trace(" Reason: The device lists this format as supported in its "
More information about the wine-cvs
mailing list