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
c18391a0
Commit
c18391a0
authored
24 years ago
by
Huw D. M. Davies
Committed by
Alexandre Julliard
24 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Actually call CDROM_Audio_GetTracksInfo when retrieving
MCI_CDA_STATUS_TRACK_TYPE. WINE_CDA_OPEN maps to MCIERR_HARDWARE.
parent
1dac6eac
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/mcicda/mcicda.c
+13
-6
13 additions, 6 deletions
dlls/winmm/mcicda/mcicda.c
with
13 additions
and
6 deletions
dlls/winmm/mcicda/mcicda.c
+
13
−
6
View file @
c18391a0
...
...
@@ -104,7 +104,7 @@ static int MCICDA_GetError(WINE_MCICDAUDIO* wmcda)
switch
(
wmcda
->
wcda
.
cdaMode
)
{
case
WINE_CDA_DONTKNOW
:
case
WINE_CDA_NOTREADY
:
return
MCIERR_DEVICE_NOT_READY
;
case
WINE_CDA_OPEN
:
return
MCIERR_
DEVICE_OPEN
;
case
WINE_CDA_OPEN
:
return
MCIERR_
HARDWARE
;
case
WINE_CDA_PLAY
:
case
WINE_CDA_STOP
:
case
WINE_CDA_PAUSE
:
break
;
...
...
@@ -428,6 +428,7 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm
wmcda
->
wNotifyDeviceID
,
MCI_NOTIFY_SUCCESSFUL
);
}
if
(
dwFlags
&
MCI_STATUS_ITEM
)
{
TRACE
(
"dwItem = %lx
\n
"
,
lpParms
->
dwItem
);
switch
(
lpParms
->
dwItem
)
{
case
MCI_STATUS_CURRENT_TRACK
:
if
(
!
CDROM_Audio_GetCDStatus
(
&
wmcda
->
wcda
,
-
1
))
{
...
...
@@ -523,11 +524,17 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm
case
MCI_CDA_STATUS_TYPE_TRACK
:
if
(
!
(
dwFlags
&
MCI_TRACK
))
ret
=
MCIERR_MISSING_PARAMETER
;
else
if
(
lpParms
->
dwTrack
>
wmcda
->
wcda
.
nTracks
||
lpParms
->
dwTrack
==
0
)
ret
=
MCIERR_OUTOFRANGE
;
else
lpParms
->
dwReturn
=
(
wmcda
->
wcda
.
lpbTrackFlags
[
lpParms
->
dwTrack
-
1
]
&
else
{
if
(
!
CDROM_Audio_GetTracksInfo
(
&
wmcda
->
wcda
,
-
1
))
{
WARN
(
"Error reading tracks info
\n
"
);
return
MCICDA_GetError
(
wmcda
);
}
if
(
lpParms
->
dwTrack
>
wmcda
->
wcda
.
nTracks
||
lpParms
->
dwTrack
==
0
)
ret
=
MCIERR_OUTOFRANGE
;
else
lpParms
->
dwReturn
=
(
wmcda
->
wcda
.
lpbTrackFlags
[
lpParms
->
dwTrack
-
1
]
&
CDROM_DATA_TRACK
)
?
MCI_CDA_TRACK_OTHER
:
MCI_CDA_TRACK_AUDIO
;
}
TRACE
(
"MCI_CDA_STATUS_TYPE_TRACK[%ld]=%08lx
\n
"
,
lpParms
->
dwTrack
,
lpParms
->
dwReturn
);
break
;
default:
...
...
@@ -582,7 +589,7 @@ static DWORD MCICDA_Play(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms)
end
=
MCICDA_CalcFrame
(
wmcda
,
lpParms
->
dwTo
);
TRACE
(
"MCI_TO=%08lX -> %u
\n
"
,
lpParms
->
dwTo
,
end
);
}
else
end
=
wmcda
->
wcda
.
dwLastFrame
;
end
=
wmcda
->
wcda
.
dwLastFrame
;
if
(
CDROM_Audio_Play
(
&
wmcda
->
wcda
,
start
,
end
,
dev
)
==
-
1
)
{
...
...
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