claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed several CD-ROM-related status bar icon bugs;

Browse Source 
CD-ROM set to host drive no longer gets reset to empty;
The CD audio thread initializer now ignores the mute status of the drives;
CD-ROM IOCTL audio handler is now more thread-safe;
Fixed CD-ROM image audio;
Added more sanity checks to memory read/write code in 808x.c;
Initial settings are now sane again.
This commit is contained in:
OBattler
2017-06-01 01:47:54 +02:00
parent 339f81b553
commit e6adf90e29
12 changed files with 193 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/cdrom_dosbox.cpp
View File

@@ -51,27 +51,38 @@ using namespace std;
CDROM_Interface_Image::BinaryFile::BinaryFile(const char *filename, bool &error)
{
file = fopen64(filename, "rb");
error = (file == NULL);
// file = fopen64(filename, "rb");
// error = (file == NULL);
memset(fn, 0, sizeof(fn));
strcpy(fn, filename);
error = false;
}
CDROM_Interface_Image::BinaryFile::~BinaryFile()
{
delete file;
// delete file;
memset(fn, 0, sizeof(fn));
}
bool CDROM_Interface_Image::BinaryFile::read(Bit8u *buffer, uint64_t seek, uint64_t count)
{
uint64_t offs = 0;
file = fopen64(fn, "rb");
fseeko64(file, seek, SEEK_SET);
offs = fread(buffer, 1, count, file);
return (offs == count);
fclose(file);
// return (offs == count);
return 1;
}
uint64_t CDROM_Interface_Image::BinaryFile::getLength()
{
uint64_t ret = 0;
file = fopen64(fn, "rb");
fseeko64(file, 0, SEEK_END);
return ftello64(file);
ret = ftello64(file);
fclose(file);
return ret;
}
CDROM_Interface_Image::CDROM_Interface_Image()
@@ -184,9 +195,9 @@ bool CDROM_Interface_Image::ReadSector(Bit8u *buffer, bool raw, unsigned long se
{
int track = GetTrack(sector) - 1;
if (track < 0) return false;
uint64_t seek = tracks[track].skip + (sector - tracks[track].start);
seek *= (uint64_t) tracks[track].sectorSize;
uint64_t s = (uint64_t) sector;
uint64_t seek = tracks[track].skip + ((s - tracks[track].start) * tracks[track].sectorSize);
uint64_t length = (raw ? RAW_SECTOR_SIZE : COOKED_SECTOR_SIZE);
if (tracks[track].sectorSize != RAW_SECTOR_SIZE && raw) return false;
if (tracks[track].sectorSize == RAW_SECTOR_SIZE && !tracks[track].mode2 && !raw) seek += 16;
@@ -259,10 +270,10 @@ bool CDROM_Interface_Image::LoadIsoFile(char* filename)
return true;
}
bool CDROM_Interface_Image::CanReadPVD(TrackFile *file, int sectorSize, bool mode2)
bool CDROM_Interface_Image::CanReadPVD(TrackFile *file, uint64_t sectorSize, bool mode2)
{
Bit8u pvd[COOKED_SECTOR_SIZE];
int seek = 16 * sectorSize; // first vd is located at sector 16
uint64_t seek = 16 * sectorSize; // first vd is located at sector 16
if (sectorSize == RAW_SECTOR_SIZE && !mode2) seek += 16;
if (mode2) seek += 24;
file->read(pvd, seek, COOKED_SECTOR_SIZE);
@@ -292,9 +303,9 @@ bool CDROM_Interface_Image::LoadCueSheet(char *cuefile)
Track track = {0, 0, 0, 0, 0, 0, false, NULL};
tracks.clear();
uint64_t shift = 0;
int currPregap = 0;
int totalPregap = 0;
int prestart = 0;
uint64_t currPregap = 0;
uint64_t totalPregap = 0;
uint64_t prestart = 0;
bool success;
bool canAddTrack = false;
char tmp[MAX_FILENAME_LENGTH]; // dirname can change its argument
@@ -353,9 +364,9 @@ bool CDROM_Interface_Image::LoadCueSheet(char *cuefile)
canAddTrack = true;
}
else if (command == "INDEX") {
int index;
uint64_t index;
line >> index;
int frame;
uint64_t frame;
success = GetCueFrame(frame, line);
if (index == 1) track.start = frame;
@@ -410,10 +421,10 @@ bool CDROM_Interface_Image::LoadCueSheet(char *cuefile)
return true;
}
bool CDROM_Interface_Image::AddTrack(Track &curr, uint64_t &shift, int prestart, int &totalPregap, int currPregap)
bool CDROM_Interface_Image::AddTrack(Track &curr, uint64_t &shift, uint64_t prestart, uint64_t &totalPregap, uint64_t currPregap)
{
// frames between index 0(prestart) and 1(curr.start) must be skipped
int skip;
uint64_t skip;
if (prestart > 0) {
if (prestart > curr.start) return false;
skip = curr.start - prestart;
@@ -434,8 +445,8 @@ bool CDROM_Interface_Image::AddTrack(Track &curr, uint64_t &shift, int prestart,
// current track consumes data from the same file as the previous
if (prev.file == curr.file) {
curr.start += shift;
prev.length = curr.start + ((uint64_t) totalPregap) - prev.start - ((uint64_t) skip);
curr.skip += prev.skip + prev.length * prev.sectorSize + skip * curr.sectorSize;
prev.length = curr.start + totalPregap - prev.start - skip;
curr.skip += prev.skip + (prev.length * prev.sectorSize) + (skip * curr.sectorSize);
totalPregap += currPregap;
curr.start += totalPregap;
// current track uses a different file as the previous track
@@ -525,7 +536,7 @@ bool CDROM_Interface_Image::GetCueKeyword(string &keyword, istream &in)
return true;
}
bool CDROM_Interface_Image::GetCueFrame(int &frames, istream &in)
bool CDROM_Interface_Image::GetCueFrame(uint64_t &frames, istream &in)
{
string msf;
in >> msf;