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
dee729ae
Commit
dee729ae
authored
Feb 14, 2022
by
Eric Pouech
Committed by
Alexandre Julliard
Feb 14, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mcicda: Enable compilation with long types.
Signed-off-by:
Eric Pouech
<
eric.pouech@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
365b208f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
41 additions
and
42 deletions
+41
-42
Makefile.in
dlls/mcicda/Makefile.in
+0
-1
mcicda.c
dlls/mcicda/mcicda.c
+41
-41
No files found.
dlls/mcicda/Makefile.in
View file @
dee729ae
EXTRADEFS
=
-DWINE_NO_LONG_TYPES
MODULE
=
mcicda.dll
MODULE
=
mcicda.dll
IMPORTS
=
winmm user32
IMPORTS
=
winmm user32
...
...
dlls/mcicda/mcicda.c
View file @
dee729ae
...
@@ -95,10 +95,10 @@ static BOOL device_io(HANDLE dev, DWORD code, void *inbuffer, DWORD insize, void
...
@@ -95,10 +95,10 @@ static BOOL device_io(HANDLE dev, DWORD code, void *inbuffer, DWORD insize, void
XX
(
IOCTL_CDROM_RESUME_AUDIO
);
XX
(
IOCTL_CDROM_RESUME_AUDIO
);
XX
(
IOCTL_STORAGE_EJECT_MEDIA
);
XX
(
IOCTL_STORAGE_EJECT_MEDIA
);
XX
(
IOCTL_STORAGE_LOAD_MEDIA
);
XX
(
IOCTL_STORAGE_LOAD_MEDIA
);
default:
str
=
wine_dbg_sprintf
(
"UNKNOWN (0x%x)"
,
code
);
default:
str
=
wine_dbg_sprintf
(
"UNKNOWN (0x%
l
x)"
,
code
);
};
};
#undef XX
#undef XX
TRACE
(
"Device %p, Code %s -> Return %d, Bytes %u
\n
"
,
dev
,
str
,
ret
,
*
retsize
);
TRACE
(
"Device %p, Code %s -> Return %d, Bytes %
l
u
\n
"
,
dev
,
str
,
ret
,
*
retsize
);
return
ret
;
return
ret
;
}
}
...
@@ -145,7 +145,7 @@ static DWORD CALLBACK MCICDA_playLoop(void *ptr)
...
@@ -145,7 +145,7 @@ static DWORD CALLBACK MCICDA_playLoop(void *ptr)
if
(
SUCCEEDED
(
hr
))
{
if
(
SUCCEEDED
(
hr
))
{
if
(
rdInfo
.
SectorCount
>
0
)
{
if
(
rdInfo
.
SectorCount
>
0
)
{
if
(
!
device_io
(
wmcda
->
handle
,
IOCTL_CDROM_RAW_READ
,
&
rdInfo
,
sizeof
(
rdInfo
),
cdData
,
lockLen
,
&
br
,
NULL
))
if
(
!
device_io
(
wmcda
->
handle
,
IOCTL_CDROM_RAW_READ
,
&
rdInfo
,
sizeof
(
rdInfo
),
cdData
,
lockLen
,
&
br
,
NULL
))
WARN
(
"CD read failed at sector %
d: 0x%
x
\n
"
,
wmcda
->
start
,
GetLastError
());
WARN
(
"CD read failed at sector %
ld: 0x%l
x
\n
"
,
wmcda
->
start
,
GetLastError
());
}
}
if
(
rdInfo
.
SectorCount
*
RAW_SECTOR_SIZE
<
lockLen
)
{
if
(
rdInfo
.
SectorCount
*
RAW_SECTOR_SIZE
<
lockLen
)
{
if
(
endPos
==
~
0u
)
endPos
=
lastPos
;
if
(
endPos
==
~
0u
)
endPos
=
lastPos
;
...
@@ -319,7 +319,7 @@ static int MCICDA_GetError(WINE_MCICDAUDIO* wmcda)
...
@@ -319,7 +319,7 @@ static int MCICDA_GetError(WINE_MCICDAUDIO* wmcda)
case
ERROR_NOT_SUPPORTED
:
case
ERROR_NOT_SUPPORTED
:
case
ERROR_IO_DEVICE
:
return
MCIERR_HARDWARE
;
case
ERROR_IO_DEVICE
:
return
MCIERR_HARDWARE
;
default:
default:
FIXME
(
"Unknown mode %u
\n
"
,
GetLastError
());
FIXME
(
"Unknown mode %
l
u
\n
"
,
GetLastError
());
}
}
return
MCIERR_DRIVER_INTERNAL
;
return
MCIERR_DRIVER_INTERNAL
;
}
}
...
@@ -335,12 +335,12 @@ static DWORD MCICDA_CalcFrame(WINE_MCICDAUDIO* wmcda, DWORD dwTime)
...
@@ -335,12 +335,12 @@ static DWORD MCICDA_CalcFrame(WINE_MCICDAUDIO* wmcda, DWORD dwTime)
DWORD
br
;
DWORD
br
;
BYTE
*
addr
;
BYTE
*
addr
;
TRACE
(
"(%p, %08
X, %
u);
\n
"
,
wmcda
,
wmcda
->
dwTimeFormat
,
dwTime
);
TRACE
(
"(%p, %08
lX, %l
u);
\n
"
,
wmcda
,
wmcda
->
dwTimeFormat
,
dwTime
);
switch
(
wmcda
->
dwTimeFormat
)
{
switch
(
wmcda
->
dwTimeFormat
)
{
case
MCI_FORMAT_MILLISECONDS
:
case
MCI_FORMAT_MILLISECONDS
:
dwFrame
=
((
dwTime
-
1
)
*
CDFRAMES_PERSEC
+
500
)
/
1000
;
dwFrame
=
((
dwTime
-
1
)
*
CDFRAMES_PERSEC
+
500
)
/
1000
;
TRACE
(
"MILLISECONDS %u
\n
"
,
dwFrame
);
TRACE
(
"MILLISECONDS %
l
u
\n
"
,
dwFrame
);
break
;
break
;
case
MCI_FORMAT_MSF
:
case
MCI_FORMAT_MSF
:
TRACE
(
"MSF %02u:%02u:%02u
\n
"
,
TRACE
(
"MSF %02u:%02u:%02u
\n
"
,
...
@@ -384,12 +384,12 @@ static DWORD MCICDA_CalcTime(WINE_MCICDAUDIO* wmcda, DWORD tf, DWORD dwFrame, LP
...
@@ -384,12 +384,12 @@ static DWORD MCICDA_CalcTime(WINE_MCICDAUDIO* wmcda, DWORD tf, DWORD dwFrame, LP
CDROM_TOC
toc
;
CDROM_TOC
toc
;
DWORD
br
;
DWORD
br
;
TRACE
(
"(%p, %08
X, %
u);
\n
"
,
wmcda
,
tf
,
dwFrame
);
TRACE
(
"(%p, %08
lX, %l
u);
\n
"
,
wmcda
,
tf
,
dwFrame
);
switch
(
tf
)
{
switch
(
tf
)
{
case
MCI_FORMAT_MILLISECONDS
:
case
MCI_FORMAT_MILLISECONDS
:
dwTime
=
(
dwFrame
*
1000
)
/
CDFRAMES_PERSEC
+
1
;
dwTime
=
(
dwFrame
*
1000
)
/
CDFRAMES_PERSEC
+
1
;
TRACE
(
"MILLISECONDS %u
\n
"
,
dwTime
);
TRACE
(
"MILLISECONDS %
l
u
\n
"
,
dwTime
);
*
lpRet
=
0
;
*
lpRet
=
0
;
break
;
break
;
case
MCI_FORMAT_MSF
:
case
MCI_FORMAT_MSF
:
...
@@ -397,7 +397,7 @@ static DWORD MCICDA_CalcTime(WINE_MCICDAUDIO* wmcda, DWORD tf, DWORD dwFrame, LP
...
@@ -397,7 +397,7 @@ static DWORD MCICDA_CalcTime(WINE_MCICDAUDIO* wmcda, DWORD tf, DWORD dwFrame, LP
wSeconds
=
(
dwFrame
-
CDFRAMES_PERMIN
*
wMinutes
)
/
CDFRAMES_PERSEC
;
wSeconds
=
(
dwFrame
-
CDFRAMES_PERMIN
*
wMinutes
)
/
CDFRAMES_PERSEC
;
wFrames
=
dwFrame
-
CDFRAMES_PERMIN
*
wMinutes
-
CDFRAMES_PERSEC
*
wSeconds
;
wFrames
=
dwFrame
-
CDFRAMES_PERMIN
*
wMinutes
-
CDFRAMES_PERSEC
*
wSeconds
;
dwTime
=
MCI_MAKE_MSF
(
wMinutes
,
wSeconds
,
wFrames
);
dwTime
=
MCI_MAKE_MSF
(
wMinutes
,
wSeconds
,
wFrames
);
TRACE
(
"MSF %02u:%02u:%02u -> dwTime=%u
\n
"
,
TRACE
(
"MSF %02u:%02u:%02u -> dwTime=%
l
u
\n
"
,
wMinutes
,
wSeconds
,
wFrames
,
dwTime
);
wMinutes
,
wSeconds
,
wFrames
,
dwTime
);
*
lpRet
=
MCI_COLONIZED3_RETURN
;
*
lpRet
=
MCI_COLONIZED3_RETURN
;
break
;
break
;
...
@@ -408,7 +408,7 @@ static DWORD MCICDA_CalcTime(WINE_MCICDAUDIO* wmcda, DWORD tf, DWORD dwFrame, LP
...
@@ -408,7 +408,7 @@ static DWORD MCICDA_CalcTime(WINE_MCICDAUDIO* wmcda, DWORD tf, DWORD dwFrame, LP
return
0
;
return
0
;
if
(
dwFrame
<
FRAME_OF_TOC
(
toc
,
toc
.
FirstTrack
)
||
if
(
dwFrame
<
FRAME_OF_TOC
(
toc
,
toc
.
FirstTrack
)
||
dwFrame
>
FRAME_OF_TOC
(
toc
,
toc
.
LastTrack
+
1
))
{
dwFrame
>
FRAME_OF_TOC
(
toc
,
toc
.
LastTrack
+
1
))
{
ERR
(
"Out of range value %u [%u,%u]
\n
"
,
ERR
(
"Out of range value %
l
u [%u,%u]
\n
"
,
dwFrame
,
FRAME_OF_TOC
(
toc
,
toc
.
FirstTrack
),
dwFrame
,
FRAME_OF_TOC
(
toc
,
toc
.
FirstTrack
),
FRAME_OF_TOC
(
toc
,
toc
.
LastTrack
+
1
));
FRAME_OF_TOC
(
toc
,
toc
.
LastTrack
+
1
));
*
lpRet
=
0
;
*
lpRet
=
0
;
...
@@ -443,7 +443,7 @@ static DWORD MCICDA_Open(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSW lpOpenPar
...
@@ -443,7 +443,7 @@ static DWORD MCICDA_Open(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSW lpOpenPar
WINE_MCICDAUDIO
*
wmcda
=
(
WINE_MCICDAUDIO
*
)
mciGetDriverData
(
wDevID
);
WINE_MCICDAUDIO
*
wmcda
=
(
WINE_MCICDAUDIO
*
)
mciGetDriverData
(
wDevID
);
WCHAR
root
[
7
],
drive
=
0
;
WCHAR
root
[
7
],
drive
=
0
;
TRACE
(
"(%04X, %08X, %p);
\n
"
,
wDevID
,
dwFlags
,
lpOpenParms
);
TRACE
(
"(%04X, %08
l
X, %p);
\n
"
,
wDevID
,
dwFlags
,
lpOpenParms
);
if
(
lpOpenParms
==
NULL
)
return
MCIERR_NULL_PARAMETER_BLOCK
;
if
(
lpOpenParms
==
NULL
)
return
MCIERR_NULL_PARAMETER_BLOCK
;
if
(
wmcda
==
NULL
)
return
MCIERR_INVALID_DEVICE_ID
;
if
(
wmcda
==
NULL
)
return
MCIERR_INVALID_DEVICE_ID
;
...
@@ -533,7 +533,7 @@ static DWORD MCICDA_Close(UINT wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParm
...
@@ -533,7 +533,7 @@ static DWORD MCICDA_Close(UINT wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParm
{
{
WINE_MCICDAUDIO
*
wmcda
=
MCICDA_GetOpenDrv
(
wDevID
);
WINE_MCICDAUDIO
*
wmcda
=
MCICDA_GetOpenDrv
(
wDevID
);
TRACE
(
"(%04X, %08X, %p);
\n
"
,
wDevID
,
dwParam
,
lpParms
);
TRACE
(
"(%04X, %08
l
X, %p);
\n
"
,
wDevID
,
dwParam
,
lpParms
);
if
(
wmcda
==
NULL
)
return
MCIERR_INVALID_DEVICE_ID
;
if
(
wmcda
==
NULL
)
return
MCIERR_INVALID_DEVICE_ID
;
...
@@ -556,13 +556,13 @@ static DWORD MCICDA_GetDevCaps(UINT wDevID, DWORD dwFlags,
...
@@ -556,13 +556,13 @@ static DWORD MCICDA_GetDevCaps(UINT wDevID, DWORD dwFlags,
WINE_MCICDAUDIO
*
wmcda
=
(
WINE_MCICDAUDIO
*
)
mciGetDriverData
(
wDevID
);
WINE_MCICDAUDIO
*
wmcda
=
(
WINE_MCICDAUDIO
*
)
mciGetDriverData
(
wDevID
);
DWORD
ret
=
0
;
DWORD
ret
=
0
;
TRACE
(
"(%04X, %08X, %p);
\n
"
,
wDevID
,
dwFlags
,
lpParms
);
TRACE
(
"(%04X, %08
l
X, %p);
\n
"
,
wDevID
,
dwFlags
,
lpParms
);
if
(
lpParms
==
NULL
)
return
MCIERR_NULL_PARAMETER_BLOCK
;
if
(
lpParms
==
NULL
)
return
MCIERR_NULL_PARAMETER_BLOCK
;
if
(
wmcda
==
NULL
)
return
MCIERR_INVALID_DEVICE_ID
;
if
(
wmcda
==
NULL
)
return
MCIERR_INVALID_DEVICE_ID
;
if
(
dwFlags
&
MCI_GETDEVCAPS_ITEM
)
{
if
(
dwFlags
&
MCI_GETDEVCAPS_ITEM
)
{
TRACE
(
"MCI_GETDEVCAPS_ITEM dwItem=%08X;
\n
"
,
lpParms
->
dwItem
);
TRACE
(
"MCI_GETDEVCAPS_ITEM dwItem=%08
l
X;
\n
"
,
lpParms
->
dwItem
);
switch
(
lpParms
->
dwItem
)
{
switch
(
lpParms
->
dwItem
)
{
case
MCI_GETDEVCAPS_CAN_RECORD
:
case
MCI_GETDEVCAPS_CAN_RECORD
:
...
@@ -602,14 +602,14 @@ static DWORD MCICDA_GetDevCaps(UINT wDevID, DWORD dwFlags,
...
@@ -602,14 +602,14 @@ static DWORD MCICDA_GetDevCaps(UINT wDevID, DWORD dwFlags,
ret
=
MCI_RESOURCE_RETURNED
;
ret
=
MCI_RESOURCE_RETURNED
;
break
;
break
;
default:
default:
WARN
(
"Unsupported %x devCaps item
\n
"
,
lpParms
->
dwItem
);
WARN
(
"Unsupported %
l
x devCaps item
\n
"
,
lpParms
->
dwItem
);
return
MCIERR_UNSUPPORTED_FUNCTION
;
return
MCIERR_UNSUPPORTED_FUNCTION
;
}
}
}
else
{
}
else
{
TRACE
(
"No GetDevCaps-Item !
\n
"
);
TRACE
(
"No GetDevCaps-Item !
\n
"
);
return
MCIERR_MISSING_PARAMETER
;
return
MCIERR_MISSING_PARAMETER
;
}
}
TRACE
(
"lpParms->dwReturn=%08X;
\n
"
,
lpParms
->
dwReturn
);
TRACE
(
"lpParms->dwReturn=%08
l
X;
\n
"
,
lpParms
->
dwReturn
);
if
(
dwFlags
&
MCI_NOTIFY
)
{
if
(
dwFlags
&
MCI_NOTIFY
)
{
MCICDA_Notify
(
lpParms
->
dwCallback
,
wmcda
,
MCI_NOTIFY_SUCCESSFUL
);
MCICDA_Notify
(
lpParms
->
dwCallback
,
wmcda
,
MCI_NOTIFY_SUCCESSFUL
);
}
}
...
@@ -656,13 +656,13 @@ static DWORD MCICDA_Info(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms)
...
@@ -656,13 +656,13 @@ static DWORD MCICDA_Info(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms)
DWORD
ret
=
0
;
DWORD
ret
=
0
;
WCHAR
buffer
[
16
];
WCHAR
buffer
[
16
];
TRACE
(
"(%04X, %08X, %p);
\n
"
,
wDevID
,
dwFlags
,
lpParms
);
TRACE
(
"(%04X, %08
l
X, %p);
\n
"
,
wDevID
,
dwFlags
,
lpParms
);
if
(
lpParms
==
NULL
||
lpParms
->
lpstrReturn
==
NULL
)
if
(
lpParms
==
NULL
||
lpParms
->
lpstrReturn
==
NULL
)
return
MCIERR_NULL_PARAMETER_BLOCK
;
return
MCIERR_NULL_PARAMETER_BLOCK
;
if
(
wmcda
==
NULL
)
return
MCIERR_INVALID_DEVICE_ID
;
if
(
wmcda
==
NULL
)
return
MCIERR_INVALID_DEVICE_ID
;
TRACE
(
"buf=%p, len=%u
\n
"
,
lpParms
->
lpstrReturn
,
lpParms
->
dwRetSize
);
TRACE
(
"buf=%p, len=%
l
u
\n
"
,
lpParms
->
lpstrReturn
,
lpParms
->
dwRetSize
);
if
(
dwFlags
&
MCI_INFO_PRODUCT
)
{
if
(
dwFlags
&
MCI_INFO_PRODUCT
)
{
str
=
L"Wine's audio CD"
;
str
=
L"Wine's audio CD"
;
...
@@ -682,7 +682,7 @@ static DWORD MCICDA_Info(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms)
...
@@ -682,7 +682,7 @@ static DWORD MCICDA_Info(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms)
swprintf
(
buffer
,
ARRAY_SIZE
(
buffer
),
L"%lu"
,
res
);
swprintf
(
buffer
,
ARRAY_SIZE
(
buffer
),
L"%lu"
,
res
);
str
=
buffer
;
str
=
buffer
;
}
else
{
}
else
{
WARN
(
"Don't know this info command (%u)
\n
"
,
dwFlags
);
WARN
(
"Don't know this info command (%
l
u)
\n
"
,
dwFlags
);
ret
=
MCIERR_MISSING_PARAMETER
;
ret
=
MCIERR_MISSING_PARAMETER
;
}
}
if
(
!
ret
)
{
if
(
!
ret
)
{
...
@@ -710,13 +710,13 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm
...
@@ -710,13 +710,13 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm
CDROM_TOC
toc
;
CDROM_TOC
toc
;
DWORD
br
;
DWORD
br
;
TRACE
(
"(%04X, %08X, %p);
\n
"
,
wDevID
,
dwFlags
,
lpParms
);
TRACE
(
"(%04X, %08
l
X, %p);
\n
"
,
wDevID
,
dwFlags
,
lpParms
);
if
(
lpParms
==
NULL
)
return
MCIERR_NULL_PARAMETER_BLOCK
;
if
(
lpParms
==
NULL
)
return
MCIERR_NULL_PARAMETER_BLOCK
;
if
(
wmcda
==
NULL
)
return
MCIERR_INVALID_DEVICE_ID
;
if
(
wmcda
==
NULL
)
return
MCIERR_INVALID_DEVICE_ID
;
if
(
dwFlags
&
MCI_STATUS_ITEM
)
{
if
(
dwFlags
&
MCI_STATUS_ITEM
)
{
TRACE
(
"dwItem = %x
\n
"
,
lpParms
->
dwItem
);
TRACE
(
"dwItem = %
l
x
\n
"
,
lpParms
->
dwItem
);
switch
(
lpParms
->
dwItem
)
{
switch
(
lpParms
->
dwItem
)
{
case
MCI_STATUS_CURRENT_TRACK
:
case
MCI_STATUS_CURRENT_TRACK
:
fmt
.
Format
=
IOCTL_CDROM_CURRENT_POSITION
;
fmt
.
Format
=
IOCTL_CDROM_CURRENT_POSITION
;
...
@@ -727,14 +727,14 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm
...
@@ -727,14 +727,14 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm
/* alt. data.CurrentPosition.TrackNumber = 1; -- what native yields */
/* alt. data.CurrentPosition.TrackNumber = 1; -- what native yields */
}
}
lpParms
->
dwReturn
=
data
.
CurrentPosition
.
TrackNumber
;
lpParms
->
dwReturn
=
data
.
CurrentPosition
.
TrackNumber
;
TRACE
(
"CURRENT_TRACK=%
l
u
\n
"
,
lpParms
->
dwReturn
);
TRACE
(
"CURRENT_TRACK=%
I
u
\n
"
,
lpParms
->
dwReturn
);
break
;
break
;
case
MCI_STATUS_LENGTH
:
case
MCI_STATUS_LENGTH
:
if
(
!
MCICDA_ReadTOC
(
wmcda
,
&
toc
,
&
br
))
if
(
!
MCICDA_ReadTOC
(
wmcda
,
&
toc
,
&
br
))
return
MCICDA_GetError
(
wmcda
);
return
MCICDA_GetError
(
wmcda
);
if
(
dwFlags
&
MCI_TRACK
)
{
if
(
dwFlags
&
MCI_TRACK
)
{
TRACE
(
"MCI_TRACK #%u LENGTH=??? !
\n
"
,
lpParms
->
dwTrack
);
TRACE
(
"MCI_TRACK #%
l
u LENGTH=??? !
\n
"
,
lpParms
->
dwTrack
);
if
(
lpParms
->
dwTrack
<
toc
.
FirstTrack
||
lpParms
->
dwTrack
>
toc
.
LastTrack
)
if
(
lpParms
->
dwTrack
<
toc
.
FirstTrack
||
lpParms
->
dwTrack
>
toc
.
LastTrack
)
return
MCIERR_OUTOFRANGE
;
return
MCIERR_OUTOFRANGE
;
lpParms
->
dwReturn
=
FRAME_OF_TOC
(
toc
,
lpParms
->
dwTrack
+
1
)
-
lpParms
->
dwReturn
=
FRAME_OF_TOC
(
toc
,
lpParms
->
dwTrack
+
1
)
-
...
@@ -755,11 +755,11 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm
...
@@ -755,11 +755,11 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm
?
MCI_FORMAT_MSF
:
wmcda
->
dwTimeFormat
,
?
MCI_FORMAT_MSF
:
wmcda
->
dwTimeFormat
,
lpParms
->
dwReturn
,
lpParms
->
dwReturn
,
&
ret
);
&
ret
);
TRACE
(
"LENGTH=%
l
u
\n
"
,
lpParms
->
dwReturn
);
TRACE
(
"LENGTH=%
I
u
\n
"
,
lpParms
->
dwReturn
);
break
;
break
;
case
MCI_STATUS_MODE
:
case
MCI_STATUS_MODE
:
lpParms
->
dwReturn
=
MCICDA_GetStatus
(
wmcda
);
lpParms
->
dwReturn
=
MCICDA_GetStatus
(
wmcda
);
TRACE
(
"MCI_STATUS_MODE=%08
l
X
\n
"
,
lpParms
->
dwReturn
);
TRACE
(
"MCI_STATUS_MODE=%08
I
X
\n
"
,
lpParms
->
dwReturn
);
lpParms
->
dwReturn
=
MAKEMCIRESOURCE
(
lpParms
->
dwReturn
,
lpParms
->
dwReturn
);
lpParms
->
dwReturn
=
MAKEMCIRESOURCE
(
lpParms
->
dwReturn
,
lpParms
->
dwReturn
);
ret
=
MCI_RESOURCE_RETURNED
;
ret
=
MCI_RESOURCE_RETURNED
;
break
;
break
;
...
@@ -774,7 +774,7 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm
...
@@ -774,7 +774,7 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm
return
MCICDA_GetError
(
wmcda
);
return
MCICDA_GetError
(
wmcda
);
lpParms
->
dwReturn
=
toc
.
LastTrack
-
toc
.
FirstTrack
+
1
;
lpParms
->
dwReturn
=
toc
.
LastTrack
-
toc
.
FirstTrack
+
1
;
TRACE
(
"MCI_STATUS_NUMBER_OF_TRACKS = %
l
u
\n
"
,
lpParms
->
dwReturn
);
TRACE
(
"MCI_STATUS_NUMBER_OF_TRACKS = %
I
u
\n
"
,
lpParms
->
dwReturn
);
if
(
lpParms
->
dwReturn
==
(
WORD
)
-
1
)
if
(
lpParms
->
dwReturn
==
(
WORD
)
-
1
)
return
MCICDA_GetError
(
wmcda
);
return
MCICDA_GetError
(
wmcda
);
break
;
break
;
...
@@ -794,7 +794,7 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm
...
@@ -794,7 +794,7 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm
if
(
lpParms
->
dwTrack
<
toc
.
FirstTrack
||
lpParms
->
dwTrack
>
toc
.
LastTrack
)
if
(
lpParms
->
dwTrack
<
toc
.
FirstTrack
||
lpParms
->
dwTrack
>
toc
.
LastTrack
)
return
MCIERR_OUTOFRANGE
;
return
MCIERR_OUTOFRANGE
;
lpParms
->
dwReturn
=
FRAME_OF_TOC
(
toc
,
lpParms
->
dwTrack
);
lpParms
->
dwReturn
=
FRAME_OF_TOC
(
toc
,
lpParms
->
dwTrack
);
TRACE
(
"get MCI_TRACK #%u !
\n
"
,
lpParms
->
dwTrack
);
TRACE
(
"get MCI_TRACK #%
l
u !
\n
"
,
lpParms
->
dwTrack
);
break
;
break
;
case
0
:
case
0
:
fmt
.
Format
=
IOCTL_CDROM_CURRENT_POSITION
;
fmt
.
Format
=
IOCTL_CDROM_CURRENT_POSITION
;
...
@@ -808,7 +808,7 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm
...
@@ -808,7 +808,7 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm
return
MCIERR_FLAGS_NOT_COMPATIBLE
;
return
MCIERR_FLAGS_NOT_COMPATIBLE
;
}
}
lpParms
->
dwReturn
=
MCICDA_CalcTime
(
wmcda
,
wmcda
->
dwTimeFormat
,
lpParms
->
dwReturn
,
&
ret
);
lpParms
->
dwReturn
=
MCICDA_CalcTime
(
wmcda
,
wmcda
->
dwTimeFormat
,
lpParms
->
dwReturn
,
&
ret
);
TRACE
(
"MCI_STATUS_POSITION=%08
l
X
\n
"
,
lpParms
->
dwReturn
);
TRACE
(
"MCI_STATUS_POSITION=%08
I
X
\n
"
,
lpParms
->
dwReturn
);
break
;
break
;
case
MCI_STATUS_READY
:
case
MCI_STATUS_READY
:
TRACE
(
"MCI_STATUS_READY !
\n
"
);
TRACE
(
"MCI_STATUS_READY !
\n
"
);
...
@@ -845,10 +845,10 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm
...
@@ -845,10 +845,10 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm
MCI_CDA_TRACK_OTHER
:
MCI_CDA_TRACK_AUDIO
;
MCI_CDA_TRACK_OTHER
:
MCI_CDA_TRACK_AUDIO
;
/* FIXME: MAKEMCIRESOURCE "audio" | "other", localised */
/* FIXME: MAKEMCIRESOURCE "audio" | "other", localised */
}
}
TRACE
(
"MCI_CDA_STATUS_TYPE_TRACK[%
d]=%l
d
\n
"
,
lpParms
->
dwTrack
,
lpParms
->
dwReturn
);
TRACE
(
"MCI_CDA_STATUS_TYPE_TRACK[%
ld]=%I
d
\n
"
,
lpParms
->
dwTrack
,
lpParms
->
dwReturn
);
break
;
break
;
default:
default:
FIXME
(
"unknown command %08X !
\n
"
,
lpParms
->
dwItem
);
FIXME
(
"unknown command %08
l
X !
\n
"
,
lpParms
->
dwItem
);
return
MCIERR_UNSUPPORTED_FUNCTION
;
return
MCIERR_UNSUPPORTED_FUNCTION
;
}
}
}
else
return
MCIERR_MISSING_PARAMETER
;
}
else
return
MCIERR_MISSING_PARAMETER
;
...
@@ -902,7 +902,7 @@ static DWORD MCICDA_Play(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms)
...
@@ -902,7 +902,7 @@ static DWORD MCICDA_Play(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms)
SUB_Q_CHANNEL_DATA
data
;
SUB_Q_CHANNEL_DATA
data
;
CDROM_TOC
toc
;
CDROM_TOC
toc
;
TRACE
(
"(%04X, %08X, %p);
\n
"
,
wDevID
,
dwFlags
,
lpParms
);
TRACE
(
"(%04X, %08
l
X, %p);
\n
"
,
wDevID
,
dwFlags
,
lpParms
);
if
(
lpParms
==
NULL
)
if
(
lpParms
==
NULL
)
return
MCIERR_NULL_PARAMETER_BLOCK
;
return
MCIERR_NULL_PARAMETER_BLOCK
;
...
@@ -917,7 +917,7 @@ static DWORD MCICDA_Play(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms)
...
@@ -917,7 +917,7 @@ static DWORD MCICDA_Play(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms)
start
=
MCICDA_CalcFrame
(
wmcda
,
lpParms
->
dwFrom
);
start
=
MCICDA_CalcFrame
(
wmcda
,
lpParms
->
dwFrom
);
if
(
(
ret
=
MCICDA_SkipDataTracks
(
wmcda
,
&
start
))
)
if
(
(
ret
=
MCICDA_SkipDataTracks
(
wmcda
,
&
start
))
)
return
ret
;
return
ret
;
TRACE
(
"MCI_FROM=%08
X -> %
u
\n
"
,
lpParms
->
dwFrom
,
start
);
TRACE
(
"MCI_FROM=%08
lX -> %l
u
\n
"
,
lpParms
->
dwFrom
,
start
);
}
else
{
}
else
{
fmt
.
Format
=
IOCTL_CDROM_CURRENT_POSITION
;
fmt
.
Format
=
IOCTL_CDROM_CURRENT_POSITION
;
if
(
!
device_io
(
wmcda
->
handle
,
IOCTL_CDROM_READ_Q_CHANNEL
,
&
fmt
,
sizeof
(
fmt
),
if
(
!
device_io
(
wmcda
->
handle
,
IOCTL_CDROM_READ_Q_CHANNEL
,
&
fmt
,
sizeof
(
fmt
),
...
@@ -932,12 +932,12 @@ static DWORD MCICDA_Play(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms)
...
@@ -932,12 +932,12 @@ static DWORD MCICDA_Play(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms)
end
=
MCICDA_CalcFrame
(
wmcda
,
lpParms
->
dwTo
);
end
=
MCICDA_CalcFrame
(
wmcda
,
lpParms
->
dwTo
);
if
(
(
ret
=
MCICDA_SkipDataTracks
(
wmcda
,
&
end
))
)
if
(
(
ret
=
MCICDA_SkipDataTracks
(
wmcda
,
&
end
))
)
return
ret
;
return
ret
;
TRACE
(
"MCI_TO=%08
X -> %
u
\n
"
,
lpParms
->
dwTo
,
end
);
TRACE
(
"MCI_TO=%08
lX -> %l
u
\n
"
,
lpParms
->
dwTo
,
end
);
}
else
{
}
else
{
end
=
FRAME_OF_TOC
(
toc
,
toc
.
LastTrack
+
1
)
-
1
;
end
=
FRAME_OF_TOC
(
toc
,
toc
.
LastTrack
+
1
)
-
1
;
}
}
if
(
end
<
start
)
return
MCIERR_OUTOFRANGE
;
if
(
end
<
start
)
return
MCIERR_OUTOFRANGE
;
TRACE
(
"Playing from %
u to %
u
\n
"
,
start
,
end
);
TRACE
(
"Playing from %
lu to %l
u
\n
"
,
start
,
end
);
oldcb
=
InterlockedExchangePointer
(
&
wmcda
->
hCallback
,
oldcb
=
InterlockedExchangePointer
(
&
wmcda
->
hCallback
,
(
dwFlags
&
MCI_NOTIFY
)
?
HWND_32
(
LOWORD
(
lpParms
->
dwCallback
))
:
NULL
);
(
dwFlags
&
MCI_NOTIFY
)
?
HWND_32
(
LOWORD
(
lpParms
->
dwCallback
))
:
NULL
);
...
@@ -1081,7 +1081,7 @@ static DWORD MCICDA_Stop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms
...
@@ -1081,7 +1081,7 @@ static DWORD MCICDA_Stop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms
HANDLE
oldcb
;
HANDLE
oldcb
;
DWORD
br
;
DWORD
br
;
TRACE
(
"(%04X, %08X, %p);
\n
"
,
wDevID
,
dwFlags
,
lpParms
);
TRACE
(
"(%04X, %08
l
X, %p);
\n
"
,
wDevID
,
dwFlags
,
lpParms
);
if
(
wmcda
==
NULL
)
return
MCIERR_INVALID_DEVICE_ID
;
if
(
wmcda
==
NULL
)
return
MCIERR_INVALID_DEVICE_ID
;
...
@@ -1119,7 +1119,7 @@ static DWORD MCICDA_Pause(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParm
...
@@ -1119,7 +1119,7 @@ static DWORD MCICDA_Pause(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParm
HANDLE
oldcb
;
HANDLE
oldcb
;
DWORD
br
;
DWORD
br
;
TRACE
(
"(%04X, %08X, %p);
\n
"
,
wDevID
,
dwFlags
,
lpParms
);
TRACE
(
"(%04X, %08
l
X, %p);
\n
"
,
wDevID
,
dwFlags
,
lpParms
);
if
(
wmcda
==
NULL
)
return
MCIERR_INVALID_DEVICE_ID
;
if
(
wmcda
==
NULL
)
return
MCIERR_INVALID_DEVICE_ID
;
...
@@ -1148,7 +1148,7 @@ static DWORD MCICDA_Resume(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpPar
...
@@ -1148,7 +1148,7 @@ static DWORD MCICDA_Resume(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpPar
WINE_MCICDAUDIO
*
wmcda
=
MCICDA_GetOpenDrv
(
wDevID
);
WINE_MCICDAUDIO
*
wmcda
=
MCICDA_GetOpenDrv
(
wDevID
);
DWORD
br
;
DWORD
br
;
TRACE
(
"(%04X, %08X, %p);
\n
"
,
wDevID
,
dwFlags
,
lpParms
);
TRACE
(
"(%04X, %08
l
X, %p);
\n
"
,
wDevID
,
dwFlags
,
lpParms
);
if
(
wmcda
==
NULL
)
return
MCIERR_INVALID_DEVICE_ID
;
if
(
wmcda
==
NULL
)
return
MCIERR_INVALID_DEVICE_ID
;
...
@@ -1177,7 +1177,7 @@ static DWORD MCICDA_Seek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms)
...
@@ -1177,7 +1177,7 @@ static DWORD MCICDA_Seek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms)
DWORD
br
,
position
,
ret
;
DWORD
br
,
position
,
ret
;
CDROM_TOC
toc
;
CDROM_TOC
toc
;
TRACE
(
"(%04X, %08X, %p);
\n
"
,
wDevID
,
dwFlags
,
lpParms
);
TRACE
(
"(%04X, %08
l
X, %p);
\n
"
,
wDevID
,
dwFlags
,
lpParms
);
if
(
wmcda
==
NULL
)
return
MCIERR_INVALID_DEVICE_ID
;
if
(
wmcda
==
NULL
)
return
MCIERR_INVALID_DEVICE_ID
;
if
(
lpParms
==
NULL
)
return
MCIERR_NULL_PARAMETER_BLOCK
;
if
(
lpParms
==
NULL
)
return
MCIERR_NULL_PARAMETER_BLOCK
;
...
@@ -1210,7 +1210,7 @@ static DWORD MCICDA_Seek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms)
...
@@ -1210,7 +1210,7 @@ static DWORD MCICDA_Seek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms)
return
ret
;
return
ret
;
break
;
break
;
case
MCI_TO
:
case
MCI_TO
:
TRACE
(
"Seeking to %u
\n
"
,
lpParms
->
dwTo
);
TRACE
(
"Seeking to %
l
u
\n
"
,
lpParms
->
dwTo
);
at
=
MCICDA_CalcFrame
(
wmcda
,
lpParms
->
dwTo
);
at
=
MCICDA_CalcFrame
(
wmcda
,
lpParms
->
dwTo
);
if
(
(
ret
=
MCICDA_SkipDataTracks
(
wmcda
,
&
at
))
)
if
(
(
ret
=
MCICDA_SkipDataTracks
(
wmcda
,
&
at
))
)
return
ret
;
return
ret
;
...
@@ -1260,7 +1260,7 @@ static DWORD MCICDA_Set(UINT wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms)
...
@@ -1260,7 +1260,7 @@ static DWORD MCICDA_Set(UINT wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms)
{
{
WINE_MCICDAUDIO
*
wmcda
=
MCICDA_GetOpenDrv
(
wDevID
);
WINE_MCICDAUDIO
*
wmcda
=
MCICDA_GetOpenDrv
(
wDevID
);
TRACE
(
"(%04X, %08X, %p);
\n
"
,
wDevID
,
dwFlags
,
lpParms
);
TRACE
(
"(%04X, %08
l
X, %p);
\n
"
,
wDevID
,
dwFlags
,
lpParms
);
if
(
wmcda
==
NULL
)
return
MCIERR_INVALID_DEVICE_ID
;
if
(
wmcda
==
NULL
)
return
MCIERR_INVALID_DEVICE_ID
;
...
@@ -1293,7 +1293,7 @@ static DWORD MCICDA_Set(UINT wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms)
...
@@ -1293,7 +1293,7 @@ static DWORD MCICDA_Set(UINT wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms)
wmcda
->
dwTimeFormat
=
lpParms
->
dwTimeFormat
;
wmcda
->
dwTimeFormat
=
lpParms
->
dwTimeFormat
;
}
}
if
(
dwFlags
&
MCI_SET_AUDIO
)
/* one xp machine ignored it */
if
(
dwFlags
&
MCI_SET_AUDIO
)
/* one xp machine ignored it */
TRACE
(
"SET_AUDIO %
X %
x
\n
"
,
dwFlags
,
lpParms
->
dwAudio
);
TRACE
(
"SET_AUDIO %
lX %l
x
\n
"
,
dwFlags
,
lpParms
->
dwAudio
);
if
(
dwFlags
&
MCI_NOTIFY
)
if
(
dwFlags
&
MCI_NOTIFY
)
MCICDA_Notify
(
lpParms
->
dwCallback
,
wmcda
,
MCI_NOTIFY_SUCCESSFUL
);
MCICDA_Notify
(
lpParms
->
dwCallback
,
wmcda
,
MCI_NOTIFY_SUCCESSFUL
);
...
...
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