Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
0a16d361
Commit
0a16d361
authored
Oct 25, 2004
by
Robert Reif
Committed by
Alexandre Julliard
Oct 25, 2004
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't consider a device in use a failure.
parent
c2dcecc3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
19 deletions
+30
-19
capture.c
dlls/dsound/tests/capture.c
+2
-2
dsound.c
dlls/dsound/tests/dsound.c
+14
-8
dsound8.c
dlls/dsound/tests/dsound8.c
+14
-9
No files found.
dlls/dsound/tests/capture.c
View file @
0a16d361
...
...
@@ -446,8 +446,8 @@ static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription,
}
else
if
(
rc
==
DSERR_BADFORMAT
)
{
ok
(
!
(
dsccaps
.
dwFormats
&
formats
[
f
][
3
]),
"IDirectSoundCapture_CreateCaptureBuffer() failed to create a "
"capture buffer: format listed as supported but using it failed
\n
"
);
if
(
!
(
dsccaps
.
dwFormats
&
formats
[
f
][
3
]))
"capture buffer: format listed as supported but using it failed
\n
"
);
if
(
!
(
dsccaps
.
dwFormats
&
formats
[
f
][
3
]))
trace
(
" Format not supported: %s
\n
"
,
format_string
(
&
wfx
));
}
else
if
(
rc
==
DSERR_ALLOCATED
)
trace
(
" Already In Use
\n
"
);
...
...
dlls/dsound/tests/dsound.c
View file @
0a16d361
...
...
@@ -94,10 +94,15 @@ static void IDirectSound_test(LPDIRECTSOUND dso, BOOL initialized,
DXGetErrorString8
(
rc
));
rc
=
IDirectSound_Initialize
(
dso
,
lpGuid
);
ok
(
rc
==
DS_OK
||
rc
==
DSERR_NODRIVER
,
"IDirectSound_Initialize() failed: %s
\n
"
,
DXGetErrorString8
(
rc
));
if
(
rc
==
DSERR_NODRIVER
)
ok
(
rc
==
DS_OK
||
rc
==
DSERR_NODRIVER
||
rc
==
DSERR_ALLOCATED
,
"IDirectSound_Initialize() failed: %s
\n
"
,
DXGetErrorString8
(
rc
));
if
(
rc
==
DSERR_NODRIVER
)
{
trace
(
" No Driver
\n
"
);
return
;
}
else
if
(
rc
==
DSERR_ALLOCATED
)
{
trace
(
" Already Allocated
\n
"
);
return
;
}
}
/* DSOUND: Error: Invalid caps buffer */
...
...
@@ -210,21 +215,22 @@ static void IDirectSound_tests()
/* try with no device specified */
rc
=
DirectSoundCreate
(
NULL
,
&
dso
,
NULL
);
ok
(
rc
==
S_OK
||
rc
==
DSERR_NODRIVER
,
"DirectSoundCreate(NULL) failed: %s
\n
"
,
DXGetErrorString8
(
rc
));
ok
(
rc
==
S_OK
||
rc
==
DSERR_NODRIVER
||
rc
==
DSERR_ALLOCATED
,
"DirectSoundCreate(NULL) failed: %s
\n
"
,
DXGetErrorString8
(
rc
));
if
(
rc
==
S_OK
&&
dso
)
IDirectSound_test
(
dso
,
TRUE
,
NULL
);
/* try with default playback device specified */
rc
=
DirectSoundCreate
(
&
DSDEVID_DefaultPlayback
,
&
dso
,
NULL
);
ok
(
rc
==
S_OK
||
rc
==
DSERR_NODRIVER
,
"DirectSoundCreate(DSDEVID_DefaultPlayback)"
" failed: %s
\n
"
,
DXGetErrorString8
(
rc
));
ok
(
rc
==
S_OK
||
rc
==
DSERR_NODRIVER
||
rc
==
DSERR_ALLOCATED
,
"DirectSoundCreate(DSDEVID_DefaultPlayback) failed: %s
\n
"
,
DXGetErrorString8
(
rc
));
if
(
rc
==
DS_OK
&&
dso
)
IDirectSound_test
(
dso
,
TRUE
,
NULL
);
/* try with default voice playback device specified */
rc
=
DirectSoundCreate
(
&
DSDEVID_DefaultVoicePlayback
,
&
dso
,
NULL
);
ok
(
rc
==
S_OK
||
rc
==
DSERR_NODRIVER
,
ok
(
rc
==
S_OK
||
rc
==
DSERR_NODRIVER
||
rc
==
DSERR_ALLOCATED
,
"DirectSoundCreate(DSDEVID_DefaultVoicePlayback) failed: %s
\n
"
,
DXGetErrorString8
(
rc
));
if
(
rc
==
DS_OK
&&
dso
)
...
...
dlls/dsound/tests/dsound8.c
View file @
0a16d361
...
...
@@ -103,10 +103,15 @@ static void IDirectSound8_test(LPDIRECTSOUND8 dso, BOOL initialized,
DXGetErrorString8
(
rc
));
rc
=
IDirectSound8_Initialize
(
dso
,
lpGuid
);
ok
(
rc
==
DS_OK
||
rc
==
DSERR_NODRIVER
,
"IDirectSound8_Initialize() failed: %s
\n
"
,
DXGetErrorString8
(
rc
));
if
(
rc
==
DSERR_NODRIVER
)
ok
(
rc
==
DS_OK
||
rc
==
DSERR_NODRIVER
||
rc
==
DSERR_ALLOCATED
,
"IDirectSound8_Initialize() failed: %s
\n
"
,
DXGetErrorString8
(
rc
));
if
(
rc
==
DSERR_NODRIVER
)
{
trace
(
" No Driver
\n
"
);
return
;
}
else
if
(
rc
==
DSERR_ALLOCATED
)
{
trace
(
" Already In Use
\n
"
);
return
;
}
}
/* DSOUND: Error: Invalid caps buffer */
...
...
@@ -222,22 +227,22 @@ static void IDirectSound8_tests()
/* try with no device specified */
rc
=
pDirectSoundCreate8
(
NULL
,
&
dso
,
NULL
);
ok
(
rc
==
S_OK
||
rc
==
DSERR_NODRIVER
,
"DirectSoundCreate8() failed: %s
\n
"
,
DXGetErrorString8
(
rc
));
ok
(
rc
==
S_OK
||
rc
==
DSERR_NODRIVER
||
rc
==
DSERR_ALLOCATED
,
"DirectSoundCreate8() failed: %s
\n
"
,
DXGetErrorString8
(
rc
));
if
(
rc
==
DS_OK
&&
dso
)
IDirectSound8_test
(
dso
,
TRUE
,
NULL
);
/* try with default playback device specified */
rc
=
pDirectSoundCreate8
(
&
DSDEVID_DefaultPlayback
,
&
dso
,
NULL
);
ok
(
rc
==
S_OK
||
rc
==
DSERR_NODRIVER
,
"DirectSoundCreate8() failed: %s
\n
"
,
DXGetErrorString8
(
rc
));
ok
(
rc
==
S_OK
||
rc
==
DSERR_NODRIVER
||
rc
==
DSERR_ALLOCATED
,
"DirectSoundCreate8() failed: %s
\n
"
,
DXGetErrorString8
(
rc
));
if
(
rc
==
DS_OK
&&
dso
)
IDirectSound8_test
(
dso
,
TRUE
,
NULL
);
/* try with default voice playback device specified */
rc
=
pDirectSoundCreate8
(
&
DSDEVID_DefaultVoicePlayback
,
&
dso
,
NULL
);
ok
(
rc
==
S_OK
||
rc
==
DSERR_NODRIVER
,
"DirectSoundCreate8() failed: %s
\n
"
,
DXGetErrorString8
(
rc
));
ok
(
rc
==
S_OK
||
rc
==
DSERR_NODRIVER
||
rc
==
DSERR_ALLOCATED
,
"DirectSoundCreate8() failed: %s
\n
"
,
DXGetErrorString8
(
rc
));
if
(
rc
==
DS_OK
&&
dso
)
IDirectSound8_test
(
dso
,
TRUE
,
NULL
);
...
...
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