Skip to content

W
wine-winehq
Commit 70f35229 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

Fixed a few FormatCode entries.

parent 48a01aeb
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
dlls/ntdll/cdrom.c
View file @ 70f35229
...@@ -778,7 +778,7 @@ static DWORD CDROM_ReadQChannel(int dev, const CDROM_SUB_Q_DATA_FORMAT* fmt, ...@@ -778,7 +778,7 @@ static DWORD CDROM_ReadQChannel(int dev, const CDROM_SUB_Q_DATA_FORMAT* fmt,
case IOCTL_CDROM_CURRENT_POSITION: case IOCTL_CDROM_CURRENT_POSITION:
size = sizeof(SUB_Q_CURRENT_POSITION); size = sizeof(SUB_Q_CURRENT_POSITION);
if (hdr->AudioStatus==AUDIO_STATUS_IN_PROGRESS) { if (hdr->AudioStatus==AUDIO_STATUS_IN_PROGRESS) {
data->CurrentPosition.FormatCode = sc.cdsc_format; data->CurrentPosition.FormatCode = IOCTL_CDROM_CURRENT_POSITION;
data->CurrentPosition.Control = sc.cdsc_ctrl; data->CurrentPosition.Control = sc.cdsc_ctrl;
data->CurrentPosition.ADR = sc.cdsc_adr; data->CurrentPosition.ADR = sc.cdsc_adr;
data->CurrentPosition.TrackNumber = sc.cdsc_trk; data->CurrentPosition.TrackNumber = sc.cdsc_trk;
...@@ -890,7 +890,7 @@ static DWORD CDROM_ReadQChannel(int dev, const CDROM_SUB_Q_DATA_FORMAT* fmt, ...@@ -890,7 +890,7 @@ static DWORD CDROM_ReadQChannel(int dev, const CDROM_SUB_Q_DATA_FORMAT* fmt,
case IOCTL_CDROM_CURRENT_POSITION: case IOCTL_CDROM_CURRENT_POSITION:
size = sizeof(SUB_Q_CURRENT_POSITION); size = sizeof(SUB_Q_CURRENT_POSITION);
if (hdr->AudioStatus==AUDIO_STATUS_IN_PROGRESS) { if (hdr->AudioStatus==AUDIO_STATUS_IN_PROGRESS) {
data->CurrentPosition.FormatCode = sc.what.position.data_format; data->CurrentPosition.FormatCode = IOCTL_CDROM_CURRENT_POSITION;
data->CurrentPosition.Control = sc.what.position.control; data->CurrentPosition.Control = sc.what.position.control;
data->CurrentPosition.ADR = sc.what.position.addr_type; data->CurrentPosition.ADR = sc.what.position.addr_type;
data->CurrentPosition.TrackNumber = sc.what.position.track_number; data->CurrentPosition.TrackNumber = sc.what.position.track_number;
...@@ -914,12 +914,12 @@ static DWORD CDROM_ReadQChannel(int dev, const CDROM_SUB_Q_DATA_FORMAT* fmt, ...@@ -914,12 +914,12 @@ static DWORD CDROM_ReadQChannel(int dev, const CDROM_SUB_Q_DATA_FORMAT* fmt,
case IOCTL_CDROM_MEDIA_CATALOG: case IOCTL_CDROM_MEDIA_CATALOG:
size = sizeof(SUB_Q_MEDIA_CATALOG_NUMBER); size = sizeof(SUB_Q_MEDIA_CATALOG_NUMBER);
data->MediaCatalog.FormatCode = IOCTL_CDROM_MEDIA_CATALOG; data->MediaCatalog.FormatCode = IOCTL_CDROM_MEDIA_CATALOG;
data->MediaCatalog.FormatCode = sc.what.media_catalog.data_format;
data->MediaCatalog.Mcval = sc.what.media_catalog.mc_valid; data->MediaCatalog.Mcval = sc.what.media_catalog.mc_valid;
memcpy(data->MediaCatalog.MediaCatalog, sc.what.media_catalog.mc_number, 15); memcpy(data->MediaCatalog.MediaCatalog, sc.what.media_catalog.mc_number, 15);
break; break;
case IOCTL_CDROM_TRACK_ISRC: case IOCTL_CDROM_TRACK_ISRC:
size = sizeof(SUB_Q_CURRENT_POSITION); size = sizeof(SUB_Q_CURRENT_POSITION);
data->TrackIsrc.FormatCode = IOCTL_CDROM_TRACK_ISRC;
data->TrackIsrc.Tcval = sc.what.track_info.ti_valid; data->TrackIsrc.Tcval = sc.what.track_info.ti_valid;
memcpy(data->TrackIsrc.TrackIsrc, sc.what.track_info.ti_number, 15); memcpy(data->TrackIsrc.TrackIsrc, sc.what.track_info.ti_number, 15);
break; break;
...@@ -1045,7 +1045,7 @@ static DWORD CDROM_SeekAudioMSF(int dev, const CDROM_SEEK_AUDIO_MSF* audio_msf) ...@@ -1045,7 +1045,7 @@ static DWORD CDROM_SeekAudioMSF(int dev, const CDROM_SEEK_AUDIO_MSF* audio_msf)
if (i <= toc.FirstTrack || i > toc.LastTrack+1) if (i <= toc.FirstTrack || i > toc.LastTrack+1)
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
i--; i--;
cp->FormatCode = CDROM_MSF; cp->FormatCode = IOCTL_CDROM_CURRENT_POSITION;
cp->Control = toc.TrackData[i-toc.FirstTrack].Control; cp->Control = toc.TrackData[i-toc.FirstTrack].Control;
cp->ADR = toc.TrackData[i-toc.FirstTrack].Adr; cp->ADR = toc.TrackData[i-toc.FirstTrack].Adr;
cp->TrackNumber = toc.TrackData[i-toc.FirstTrack].TrackNumber; cp->TrackNumber = toc.TrackData[i-toc.FirstTrack].TrackNumber;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment