Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
1c7312a0
Commit
1c7312a0
authored
Apr 05, 2019
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winmm/tests: Fix printf format warnings for the Windows build.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
45bf872a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
8 deletions
+6
-8
capture.c
dlls/winmm/tests/capture.c
+5
-6
wave.c
dlls/winmm/tests/wave.c
+1
-2
No files found.
dlls/winmm/tests/capture.c
View file @
1c7312a0
...
...
@@ -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
));
...
...
dlls/winmm/tests/wave.c
View file @
1c7312a0
...
...
@@ -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 "
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment