Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Zsolt Vadász
wine
Commits
c67bfb28
Commit
c67bfb28
authored
20 years ago
by
Robert Reif
Committed by
Alexandre Julliard
20 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Don't consider no driver a test failure.
parent
0a16d361
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/winmm/tests/capture.c
+9
-7
9 additions, 7 deletions
dlls/winmm/tests/capture.c
dlls/winmm/tests/mixer.c
+16
-8
16 additions, 8 deletions
dlls/winmm/tests/mixer.c
with
25 additions
and
15 deletions
dlls/winmm/tests/capture.c
+
9
−
7
View file @
c67bfb28
...
...
@@ -577,13 +577,13 @@ static void wave_in_tests()
rc
=
waveInGetDevCapsA
(
WAVE_MAPPER
,
&
capsA
,
sizeof
(
capsA
));
if
(
ndev
>
0
)
ok
(
rc
==
MMSYSERR_NOERROR
,
"waveInGetDevCapsA(%s): MMSYSERR_NOERROR
expected, got %s
\n
"
,
dev_name
(
ndev
+
1
),
wave_in_error
(
rc
));
ok
(
rc
==
MMSYSERR_NOERROR
||
rc
==
MMSYSERR_NODRIVER
,
"waveInGetDevCapsA(%s): MMSYSERR_NOERROR
or MMSYSERR_NODRIVER "
"expected, got %s
\n
"
,
dev_name
(
WAVE_MAPPER
),
wave_in_error
(
rc
));
else
ok
(
rc
==
MMSYSERR_BADDEVICEID
||
rc
==
MMSYSERR_NODRIVER
,
"waveInGetDevCapsA(%s): MMSYSERR_BADDEVICEID or MMSYSERR_NODRIVER "
"expected, got %s
\n
"
,
dev_name
(
ndev
+
1
),
wave_in_error
(
rc
));
"expected, got %s
\n
"
,
dev_name
(
WAVE_MAPPER
),
wave_in_error
(
rc
));
rc
=
waveInGetDevCapsW
(
ndev
+
1
,
&
capsW
,
sizeof
(
capsW
));
ok
(
rc
==
MMSYSERR_BADDEVICEID
||
rc
==
MMSYSERR_NOTSUPPORTED
,
...
...
@@ -592,9 +592,11 @@ static void wave_in_tests()
rc
=
waveInGetDevCapsW
(
WAVE_MAPPER
,
&
capsW
,
sizeof
(
capsW
));
if
(
ndev
>
0
)
ok
(
rc
==
MMSYSERR_NOERROR
||
rc
==
MMSYSERR_NOTSUPPORTED
,
"waveInGetDevCapsW(%s): MMSYSERR_NOERROR or MMSYSERR_NOTSUPPORTED "
"expected, got %s
\n
"
,
dev_name
(
ndev
+
1
),
wave_in_error
(
rc
));
ok
(
rc
==
MMSYSERR_NOERROR
||
rc
==
MMSYSERR_NODRIVER
||
rc
==
MMSYSERR_NOTSUPPORTED
,
"waveInGetDevCapsW(%s): MMSYSERR_NOERROR or MMSYSERR_NODRIVER or "
"MMSYSERR_NOTSUPPORTED expected, got %s
\n
"
,
dev_name
(
ndev
+
1
),
wave_in_error
(
rc
));
else
ok
(
rc
==
MMSYSERR_BADDEVICEID
||
rc
==
MMSYSERR_NODRIVER
,
"waveInGetDevCapsW(%s): MMSYSERR_BADDEVICEID or MMSYSERR_NODRIVER "
...
...
This diff is collapsed.
Click to expand it.
dlls/winmm/tests/mixer.c
+
16
−
8
View file @
c67bfb28
...
...
@@ -432,11 +432,13 @@ void mixer_test_deviceA(int device)
mixerlineA
.
dwDestination
=
d
;
rc
=
mixerGetLineInfoA
((
HMIXEROBJ
)
mix
,
&
mixerlineA
,
MIXER_GETLINEINFOF_DESTINATION
);
ok
(
rc
==
MMSYSERR_NOERROR
,
ok
(
rc
==
MMSYSERR_NOERROR
||
rc
==
MMSYSERR_NODRIVER
,
"mixerGetLineInfoA(MIXER_GETLINEINFOF_DESTINATION): "
"MMSYSERR_NOERROR expected, got %s
\n
"
,
mmsys_error
(
rc
));
if
(
rc
==
MMSYSERR_NOERROR
&&
winetest_interactive
)
{
if
(
rc
==
MMSYSERR_NODRIVER
)
trace
(
" No Driver
\n
"
);
else
if
(
rc
==
MMSYSERR_NOERROR
&&
winetest_interactive
)
{
trace
(
" %ld:
\"
%s
\"
(%s) Destination=%ld Source=%ld
\n
"
,
d
,
mixerlineA
.
szShortName
,
mixerlineA
.
szName
,
mixerlineA
.
dwDestination
,
mixerlineA
.
dwSource
);
...
...
@@ -464,11 +466,13 @@ void mixer_test_deviceA(int device)
mixerlineA
.
dwSource
=
s
;
rc
=
mixerGetLineInfoA
((
HMIXEROBJ
)
mix
,
&
mixerlineA
,
MIXER_GETLINEINFOF_SOURCE
);
ok
(
rc
==
MMSYSERR_NOERROR
,
ok
(
rc
==
MMSYSERR_NOERROR
||
rc
==
MMSYSERR_NODRIVER
,
"mixerGetLineInfoA(MIXER_GETLINEINFOF_SOURCE): "
"MMSYSERR_NOERROR expected, got %s
\n
"
,
mmsys_error
(
rc
));
if
(
rc
==
MMSYSERR_NOERROR
)
{
if
(
rc
==
MMSYSERR_NODRIVER
)
trace
(
" No Driver
\n
"
);
else
if
(
rc
==
MMSYSERR_NOERROR
)
{
LPMIXERCONTROLA
array
;
MIXERLINECONTROLSA
controls
;
if
(
winetest_interactive
)
{
...
...
@@ -809,11 +813,13 @@ void mixer_test_deviceW(int device)
mixerlineW
.
dwDestination
=
d
;
rc
=
mixerGetLineInfoW
((
HMIXEROBJ
)
mix
,
&
mixerlineW
,
MIXER_GETLINEINFOF_DESTINATION
);
ok
(
rc
==
MMSYSERR_NOERROR
,
ok
(
rc
==
MMSYSERR_NOERROR
||
rc
==
MMSYSERR_NODRIVER
,
"mixerGetLineInfoW(MIXER_GETLINEINFOF_DESTINATION): "
"MMSYSERR_NOERROR expected, got %s
\n
"
,
mmsys_error
(
rc
));
if
(
rc
==
MMSYSERR_NOERROR
&&
winetest_interactive
)
{
if
(
rc
==
MMSYSERR_NODRIVER
)
trace
(
" No Driver
\n
"
);
else
if
(
rc
==
MMSYSERR_NOERROR
&&
winetest_interactive
)
{
WideCharToMultiByte
(
CP_ACP
,
0
,
mixerlineW
.
szShortName
,
MIXER_SHORT_NAME_CHARS
,
szShortName
,
MIXER_SHORT_NAME_CHARS
,
NULL
,
NULL
);
...
...
@@ -849,11 +855,13 @@ void mixer_test_deviceW(int device)
mixerlineW
.
dwSource
=
s
;
rc
=
mixerGetLineInfoW
((
HMIXEROBJ
)
mix
,
&
mixerlineW
,
MIXER_GETLINEINFOF_SOURCE
);
ok
(
rc
==
MMSYSERR_NOERROR
,
ok
(
rc
==
MMSYSERR_NOERROR
||
rc
==
MMSYSERR_NODRIVER
,
"mixerGetLineInfoW(MIXER_GETLINEINFOF_SOURCE): "
"MMSYSERR_NOERROR expected, got %s
\n
"
,
mmsys_error
(
rc
));
if
(
rc
==
MMSYSERR_NOERROR
)
{
if
(
rc
==
MMSYSERR_NODRIVER
)
trace
(
" No Driver
\n
"
);
else
if
(
rc
==
MMSYSERR_NOERROR
)
{
LPMIXERCONTROLW
array
;
MIXERLINECONTROLSW
controls
;
if
(
winetest_interactive
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment