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
Alexey Alyaev
wine
Commits
60f21c3d
Commit
60f21c3d
authored
22 years ago
by
Eric Pouech
Committed by
Alexandre Julliard
22 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Got rid of recursion in sub device opening.
parent
b4ba9fa7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/winmm/wavemap/wavemap.c
+65
-52
65 additions, 52 deletions
dlls/winmm/wavemap/wavemap.c
with
65 additions
and
52 deletions
dlls/winmm/wavemap/wavemap.c
+
65
−
52
View file @
60f21c3d
...
...
@@ -128,7 +128,6 @@ static DWORD wodOpen(LPDWORD lpdwUser, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
UINT
ndlo
,
ndhi
;
UINT
i
;
WAVEMAPDATA
*
wom
=
HeapAlloc
(
GetProcessHeap
(),
0
,
sizeof
(
WAVEMAPDATA
));
WAVEFORMATEX
wfx
;
TRACE
(
"(%p %p %08lx
\n
"
,
lpdwUser
,
lpDesc
,
dwFlags
);
...
...
@@ -155,45 +154,49 @@ static DWORD wodOpen(LPDWORD lpdwUser, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
* level, this will be done transparently
*/
if
(
waveOutOpen
(
&
wom
->
hInnerWave
,
i
,
lpDesc
->
lpFormat
,
(
DWORD
)
wodCallback
,
(
DWORD
)
wom
,
(
dwFlags
&
~
CALLBACK_TYPEMASK
)
|
CALLBACK_FUNCTION
)
==
MMSYSERR_NOERROR
)
{
(
DWORD
)
wom
,
(
dwFlags
&
~
CALLBACK_TYPEMASK
)
|
CALLBACK_FUNCTION
|
WAVE_FORMAT_DIRECT
)
==
MMSYSERR_NOERROR
)
{
wom
->
hAcmStream
=
0
;
goto
found
;
}
}
wfx
.
wFormatTag
=
WAVE_FORMAT_PCM
;
wfx
.
cbSize
=
0
;
/* normally, this field is not used for PCM format, just in case */
/* try some ACM stuff */
if
((
dwFlags
&
WAVE_FORMAT_DIRECT
)
==
0
)
{
WAVEFORMATEX
wfx
;
#define TRY(sps,bps) wfx.nSamplesPerSec = (sps); wfx.wBitsPerSample = (bps); \
if (wodOpenHelper(wom, i, lpDesc, &wfx, dwFlags) == MMSYSERR_NOERROR) goto found;
wfx
.
wFormatTag
=
WAVE_FORMAT_PCM
;
wfx
.
cbSize
=
0
;
/* normally, this field is not used for PCM format, just in case */
/* try some ACM stuff */
for
(
i
=
ndlo
;
i
<
ndhi
;
i
++
)
{
/* first try with same stereo/mono option as source */
wfx
.
nChannels
=
lpDesc
->
lpFormat
->
nChannels
;
TRY
(
44100
,
16
);
TRY
(
22050
,
16
);
TRY
(
11025
,
16
);
/* 2^3 => 1, 1^3 => 2, so if stereo, try mono (and the other way around) */
wfx
.
nChannels
^=
3
;
TRY
(
44100
,
16
);
TRY
(
22050
,
16
);
TRY
(
11025
,
16
);
/* first try with same stereo/mono option as source */
wfx
.
nChannels
=
lpDesc
->
lpFormat
->
nChannels
;
TRY
(
44100
,
8
);
TRY
(
22050
,
8
);
TRY
(
11025
,
8
);
/* 2^3 => 1, 1^3 => 2, so if stereo, try mono (and the other way around) */
wfx
.
nChannels
^=
3
;
TRY
(
44100
,
8
);
TRY
(
22050
,
8
);
TRY
(
11025
,
8
);
}
#define TRY(sps,bps) wfx.nSamplesPerSec = (sps); wfx.wBitsPerSample = (bps); \
if (wodOpenHelper(wom, i, lpDesc, &wfx, dwFlags | WAVE_FORMAT_DIRECT) == MMSYSERR_NOERROR) goto found;
for
(
i
=
ndlo
;
i
<
ndhi
;
i
++
)
{
/* first try with same stereo/mono option as source */
wfx
.
nChannels
=
lpDesc
->
lpFormat
->
nChannels
;
TRY
(
44100
,
16
);
TRY
(
22050
,
16
);
TRY
(
11025
,
16
);
/* 2^3 => 1, 1^3 => 2, so if stereo, try mono (and the other way around) */
wfx
.
nChannels
^=
3
;
TRY
(
44100
,
16
);
TRY
(
22050
,
16
);
TRY
(
11025
,
16
);
/* first try with same stereo/mono option as source */
wfx
.
nChannels
=
lpDesc
->
lpFormat
->
nChannels
;
TRY
(
44100
,
8
);
TRY
(
22050
,
8
);
TRY
(
11025
,
8
);
/* 2^3 => 1, 1^3 => 2, so if stereo, try mono (and the other way around) */
wfx
.
nChannels
^=
3
;
TRY
(
44100
,
8
);
TRY
(
22050
,
8
);
TRY
(
11025
,
8
);
}
#undef TRY
}
HeapFree
(
GetProcessHeap
(),
0
,
wom
);
return
MMSYSERR_ALLOCATED
;
...
...
@@ -239,6 +242,11 @@ static DWORD wodWrite(WAVEMAPDATA* wom, LPWAVEHDR lpWaveHdrSrc, DWORD dwParam2)
return
MMSYSERR_ERROR
;
lpWaveHdrDst
=
(
LPWAVEHDR
)((
LPSTR
)
ash
+
sizeof
(
ACMSTREAMHEADER
));
if
(
ash
->
cbSrcLength
>
ash
->
cbSrcLengthUsed
)
FIXME
(
"Not all src buffer has been written, expect bogus sound
\n
"
);
else
if
(
ash
->
cbSrcLength
<
ash
->
cbSrcLengthUsed
)
ERR
(
"CoDec has read more data than it is allowed to
\n
"
);
if
(
ash
->
cbDstLengthUsed
==
0
)
{
/* something went wrong in decoding */
...
...
@@ -536,7 +544,6 @@ static DWORD widOpen(LPDWORD lpdwUser, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
UINT
ndlo
,
ndhi
;
UINT
i
;
WAVEMAPDATA
*
wim
=
HeapAlloc
(
GetProcessHeap
(),
0
,
sizeof
(
WAVEMAPDATA
));
WAVEFORMATEX
wfx
;
TRACE
(
"(%p %p %08lx)
\n
"
,
lpdwUser
,
lpDesc
,
dwFlags
);
...
...
@@ -561,32 +568,38 @@ static DWORD widOpen(LPDWORD lpdwUser, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
for
(
i
=
ndlo
;
i
<
ndhi
;
i
++
)
{
if
(
waveInOpen
(
&
wim
->
hInnerWave
,
i
,
lpDesc
->
lpFormat
,
(
DWORD
)
widCallback
,
(
DWORD
)
wim
,
(
dwFlags
&
~
CALLBACK_TYPEMASK
)
|
CALLBACK_FUNCTION
)
==
MMSYSERR_NOERROR
)
{
(
DWORD
)
wim
,
(
dwFlags
&
~
CALLBACK_TYPEMASK
)
|
CALLBACK_FUNCTION
|
WAVE_FORMAT_DIRECT
)
==
MMSYSERR_NOERROR
)
{
wim
->
hAcmStream
=
0
;
goto
found
;
}
}
wfx
.
wFormatTag
=
WAVE_FORMAT_PCM
;
wfx
.
cbSize
=
0
;
/* normally, this field is not used for PCM format, just in case */
/* try some ACM stuff */
#define TRY(sps,bps) wfx.nSamplesPerSec = (sps); wfx.wBitsPerSample = (bps); \
if (widOpenHelper(wim, i, lpDesc, &wfx, dwFlags) == MMSYSERR_NOERROR) goto found;
if
((
dwFlags
&
WAVE_FORMAT_DIRECT
)
==
0
)
{
WAVEFORMATEX
wfx
;
for
(
i
=
ndlo
;
i
<
ndhi
;
i
++
)
{
/* first try with same stereo/mono option as source */
wfx
.
nChannels
=
lpDesc
->
lpFormat
->
nChannels
;
TRY
(
44100
,
8
);
TRY
(
22050
,
8
);
TRY
(
11025
,
8
);
/* 2^3 => 1, 1^3 => 2, so if stereo, try mono (and the other way around) */
wfx
.
nChannels
^=
3
;
TRY
(
44100
,
8
);
TRY
(
22050
,
8
);
TRY
(
11025
,
8
);
}
wfx
.
wFormatTag
=
WAVE_FORMAT_PCM
;
wfx
.
cbSize
=
0
;
/* normally, this field is not used for PCM format, just in case */
/* try some ACM stuff */
#define TRY(sps,bps) wfx.nSamplesPerSec = (sps); wfx.wBitsPerSample = (bps); \
if (widOpenHelper(wim, i, lpDesc, &wfx, dwFlags | WAVE_FORMAT_DIRECT) == MMSYSERR_NOERROR) goto found;
for
(
i
=
ndlo
;
i
<
ndhi
;
i
++
)
{
/* first try with same stereo/mono option as source */
wfx
.
nChannels
=
lpDesc
->
lpFormat
->
nChannels
;
TRY
(
44100
,
8
);
TRY
(
22050
,
8
);
TRY
(
11025
,
8
);
/* 2^3 => 1, 1^3 => 2, so if stereo, try mono (and the other way around) */
wfx
.
nChannels
^=
3
;
TRY
(
44100
,
8
);
TRY
(
22050
,
8
);
TRY
(
11025
,
8
);
}
#undef TRY
}
HeapFree
(
GetProcessHeap
(),
0
,
wim
);
return
MMSYSERR_ALLOCATED
;
...
...
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