ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-30 19:26:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CDFS] Use IOCTL_CDROM_READ_TOC instead of IOCTL_CDROM_GET_LAST_SESSION, which is not always available

Browse Source 
svn path=/trunk/; revision=64106
This commit is contained in:
Hervé Poussineau
2014-09-10 16:02:02 +00:00
parent 37ff67c8fc
commit fa4b180304
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/drivers/filesystems/cdfs/fsctl.c
+5 -12
View File
@@ -201,14 +201,7 @@ CdfsGetVolumeData(PDEVICE_OBJECT DeviceObject,
ULONG Size;
ULONG Offset;
ULONG i;
struct
{
UCHAR Length[2];
UCHAR FirstSession;
UCHAR LastSession;
TRACK_DATA TrackData;
}
Toc;
CDROM_TOC Toc;
DPRINT("CdfsGetVolumeData\n");
@@ -219,7 +212,7 @@ CdfsGetVolumeData(PDEVICE_OBJECT DeviceObject,
Size = sizeof(Toc);
Status = CdfsDeviceIoControl(DeviceObject,
IOCTL_CDROM_GET_LAST_SESSION,
IOCTL_CDROM_READ_TOC,
NULL,
0,
&Toc,
@@ -231,13 +224,13 @@ CdfsGetVolumeData(PDEVICE_OBJECT DeviceObject,
return Status;
}
DPRINT("FirstSession %u, LastSession %u, FirstTrack %u\n",
Toc.FirstSession, Toc.LastSession, Toc.TrackData.TrackNumber);
DPRINT("FirstTrack %u, LastTrack %u, TrackNumber %u\n",
Toc.FirstTrack, Toc.LastTrack, Toc.TrackData[0].TrackNumber);
Offset = 0;
for (i = 0; i < 4; i++)
{
Offset = (Offset << 8) + Toc.TrackData.Address[i];
Offset = (Offset << 8) + Toc.TrackData[0].Address[i];
}
CdInfo->VolumeOffset = Offset;