joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-09 11:51:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Renamed class localFile to LocalFile

Browse Source
This commit is contained in:
Jaak Ristioja 2024-03-21 13:54:02 +02:00
parent 6376f00898
commit b16b7bac76
No known key found for this signature in database
GPG Key ID: FDF21BBE6F65E284
4 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/dos_system.h
View File

@ -173,10 +173,10 @@ private:
}; };
class localFile : public DOS_File { class LocalFile : public DOS_File {
public: public:
localFile(); LocalFile();
localFile(const char* _name, FILE * handle); LocalFile(const char* _name, FILE * handle);
bool Read(uint8_t * data,uint16_t * size); bool Read(uint8_t * data,uint16_t * size);
bool Write(const uint8_t * data,uint16_t * size); bool Write(const uint8_t * data,uint16_t * size);
bool Seek(uint32_t * pos,uint32_t type); bool Seek(uint32_t * pos,uint32_t type);

2
src/dos/dos_files.cpp
View File

@ -2557,7 +2557,7 @@ void POD_Load_DOS_Files( std::istream& stream )
} else { } else {
//Alien carnage ->pop data for invalid file from stream //Alien carnage ->pop data for invalid file from stream
if (dummy == NULL) { if (dummy == NULL) {
dummy = new localFile(); dummy = new LocalFile();
} }
dummy->LoadState(stream, true); dummy->LoadState(stream, true);
}; };

38
src/dos/drive_local.cpp
View File

@ -1364,7 +1364,7 @@ bool localDrive::FileCreate(DOS_File * * file,const char * name,uint16_t attribu
} }
/* Make the 16 bit device information */ /* Make the 16 bit device information */
*file=new localFile(name,hand); *file=new LocalFile(name,hand);
(*file)->flags=OPEN_READWRITE; (*file)->flags=OPEN_READWRITE;
return true; return true;
@ -1493,7 +1493,7 @@ bool localDrive::FileOpen(DOS_File * * file,const char * name,uint32_t flags) {
//Flush the buffer of handles for the same file. (Betrayal in Antara) //Flush the buffer of handles for the same file. (Betrayal in Antara)
uint8_t i,drive=DOS_DRIVES; uint8_t i,drive=DOS_DRIVES;
localFile *lfp; LocalFile *lfp;
for (i=0;i<DOS_DRIVES;i++) { for (i=0;i<DOS_DRIVES;i++) {
if (Drives[i]==this) { if (Drives[i]==this) {
drive=i; drive=i;
@ -1503,7 +1503,7 @@ bool localDrive::FileOpen(DOS_File * * file,const char * name,uint32_t flags) {
if(!dos_kernel_disabled) if(!dos_kernel_disabled)
for(i = 0; i < DOS_FILES; i++) { for(i = 0; i < DOS_FILES; i++) {
if(Files[i] && Files[i]->IsOpen() && Files[i]->GetDrive() == drive && Files[i]->IsName(name)) { if(Files[i] && Files[i]->IsOpen() && Files[i]->GetDrive() == drive && Files[i]->IsName(name)) {
lfp = dynamic_cast<localFile*>(Files[i]); lfp = dynamic_cast<LocalFile*>(Files[i]);
if(lfp) lfp->Flush(); if(lfp) lfp->Flush();
} }
} }
@ -1564,7 +1564,7 @@ bool localDrive::FileOpen(DOS_File * * file,const char * name,uint32_t flags) {
return false; return false;
} }
*file=new localFile(name,hand); *file=new LocalFile(name,hand);
(*file)->flags=flags; //for the inheritance flag and maybe check for others. (*file)->flags=flags; //for the inheritance flag and maybe check for others.
// (*file)->SetFileName(host_name); // (*file)->SetFileName(host_name);
return true; return true;
@ -2576,7 +2576,7 @@ localDrive::localDrive(const char * startdir,uint16_t _bytes_sector,uint8_t _sec
//TODO Maybe use fflush, but that seemed to fuck up in visual c //TODO Maybe use fflush, but that seemed to fuck up in visual c
bool localFile::Read(uint8_t * data,uint16_t * size) { bool LocalFile::Read(uint8_t * data,uint16_t * size) {
if ((this->flags & 0xf) == OPEN_WRITE) { // check if file opened in write-only mode if ((this->flags & 0xf) == OPEN_WRITE) { // check if file opened in write-only mode
DOS_SetError(DOSERR_ACCESS_DENIED); DOS_SetError(DOSERR_ACCESS_DENIED);
return false; return false;
@ -2618,7 +2618,7 @@ bool localFile::Read(uint8_t * data,uint16_t * size) {
return true; return true;
} }
bool localFile::Write(const uint8_t * data,uint16_t * size) { bool LocalFile::Write(const uint8_t * data,uint16_t * size) {
uint32_t lastflags = this->flags & 0xf; uint32_t lastflags = this->flags & 0xf;
if (lastflags == OPEN_READ || lastflags == OPEN_READ_NO_MOD) { // check if file opened in read-only mode if (lastflags == OPEN_READ || lastflags == OPEN_READ_NO_MOD) { // check if file opened in read-only mode
DOS_SetError(DOSERR_ACCESS_DENIED); DOS_SetError(DOSERR_ACCESS_DENIED);
@ -2689,7 +2689,7 @@ bool toLock(int fd, bool is_lock, uint32_t pos, uint16_t size) {
// ert, 20100711: Locking extensions // ert, 20100711: Locking extensions
// Wengier, 20201230: All platforms // Wengier, 20201230: All platforms
bool localFile::LockFile(uint8_t mode, uint32_t pos, uint16_t size) { bool LocalFile::LockFile(uint8_t mode, uint32_t pos, uint16_t size) {
#if defined(WIN32) #if defined(WIN32)
static bool lockWarn = true; static bool lockWarn = true;
HANDLE hFile = (HANDLE)_get_osfhandle(_fileno(fhandle)); HANDLE hFile = (HANDLE)_get_osfhandle(_fileno(fhandle));
@ -2780,7 +2780,7 @@ bool localFile::LockFile(uint8_t mode, uint32_t pos, uint16_t size) {
} }
extern const char* RunningProgram; extern const char* RunningProgram;
bool localFile::Seek(uint32_t * pos,uint32_t type) { bool LocalFile::Seek(uint32_t * pos,uint32_t type) {
int seektype; int seektype;
switch (type) { switch (type) {
case DOS_SEEK_SET:seektype=SEEK_SET;break; case DOS_SEEK_SET:seektype=SEEK_SET;break;
@ -2826,7 +2826,7 @@ bool localFile::Seek(uint32_t * pos,uint32_t type) {
return true; return true;
} }
bool localFile::Close() { bool LocalFile::Close() {
if (!newtime && fhandle && last_action == WRITE) UpdateLocalDateTime(); if (!newtime && fhandle && last_action == WRITE) UpdateLocalDateTime();
if (newtime && fhandle) { if (newtime && fhandle) {
// force STDIO to flush buffers on this file handle, or else fclose() will write buffered data // force STDIO to flush buffers on this file handle, or else fclose() will write buffered data
@ -2886,20 +2886,20 @@ bool localFile::Close() {
return true; return true;
} }
uint16_t localFile::GetInformation(void) { uint16_t LocalFile::GetInformation(void) {
return read_only_medium ? DeviceInfoFlags::NotWritten : 0; return read_only_medium ? DeviceInfoFlags::NotWritten : 0;
} }
uint32_t localFile::GetSeekPos() { uint32_t LocalFile::GetSeekPos() {
return file_access_tries>0?(uint32_t)lseek(fileno(fhandle),0,SEEK_CUR):(uint32_t)ftell( fhandle ); return file_access_tries>0?(uint32_t)lseek(fileno(fhandle),0,SEEK_CUR):(uint32_t)ftell( fhandle );
} }
localFile::localFile() {} LocalFile::LocalFile() {}
localFile::localFile(const char* _name, FILE* handle) : fhandle(handle) { LocalFile::LocalFile(const char* _name, FILE* handle) : fhandle(handle) {
open=true; open=true;
localFile::UpdateDateTimeFromHost(); LocalFile::UpdateDateTimeFromHost();
attr=DOS_ATTR_ARCHIVE; attr=DOS_ATTR_ARCHIVE;
last_action=NONE; last_action=NONE;
@ -2908,11 +2908,11 @@ localFile::localFile(const char* _name, FILE* handle) : fhandle(handle) {
SetName(_name); SetName(_name);
} }
void localFile::FlagReadOnlyMedium(void) { void LocalFile::FlagReadOnlyMedium(void) {
read_only_medium = true; read_only_medium = true;
} }
bool localFile::UpdateDateTimeFromHost(void) { bool LocalFile::UpdateDateTimeFromHost(void) {
if(!open) return false; if(!open) return false;
struct stat temp_stat; struct stat temp_stat;
fstat(fileno(fhandle),&temp_stat); fstat(fileno(fhandle),&temp_stat);
@ -2926,7 +2926,7 @@ bool localFile::UpdateDateTimeFromHost(void) {
return true; return true;
} }
bool localFile::UpdateLocalDateTime(void) { bool LocalFile::UpdateLocalDateTime(void) {
time_t timet = ::time(NULL); time_t timet = ::time(NULL);
struct tm *tm = localtime(&timet); struct tm *tm = localtime(&timet);
tm->tm_isdst = -1; tm->tm_isdst = -1;
@ -2961,7 +2961,7 @@ bool localFile::UpdateLocalDateTime(void) {
} }
void localFile::Flush(void) { void LocalFile::Flush(void) {
#if defined(WIN32) #if defined(WIN32)
if (file_access_tries>0) return; if (file_access_tries>0) return;
#endif #endif
@ -3008,7 +3008,7 @@ bool cdromDrive::FileOpen(DOS_File * * file,const char * name,uint32_t flags) {
return false; return false;
} }
bool retcode = localDrive::FileOpen(file,name,flags); bool retcode = localDrive::FileOpen(file,name,flags);
if(retcode) (dynamic_cast<localFile*>(*file))->FlagReadOnlyMedium(); if(retcode) (dynamic_cast<LocalFile*>(*file))->FlagReadOnlyMedium();
return retcode; return retcode;
} }

18
src/dos/drive_overlay.cpp
View File

@ -317,9 +317,9 @@ bool Overlay_Drive::TestDir(const char * dir) {
} }
class OverlayFile: public localFile { class OverlayFile: public LocalFile {
public: public:
OverlayFile(const char* name, FILE * handle):localFile(name,handle){ OverlayFile(const char* name, FILE * handle):LocalFile(name,handle){
overlay_active = false; overlay_active = false;
if (logoverlay) LOG_MSG("constructing OverlayFile: %s",name); if (logoverlay) LOG_MSG("constructing OverlayFile: %s",name);
} }
@ -339,7 +339,7 @@ public:
overlay_active = true; overlay_active = true;
} }
return localFile::Write(data,size); return LocalFile::Write(data,size);
} }
bool create_copy(); bool create_copy();
//private: //private:
@ -470,8 +470,8 @@ bool OverlayFile::create_copy() {
static OverlayFile* ccc(DOS_File* file) { static OverlayFile* ccc(DOS_File* file) {
localFile* l = dynamic_cast<localFile*>(file); LocalFile* l = dynamic_cast<LocalFile*>(file);
if (!l) E_Exit("overlay input file is not a localFile"); if (!l) E_Exit("overlay input file is not a LocalFile");
//Create an overlayFile //Create an overlayFile
OverlayFile* ret = new OverlayFile(l->GetName(),l->fhandle); OverlayFile* ret = new OverlayFile(l->GetName(),l->fhandle);
ret->flags = l->flags; ret->flags = l->flags;
@ -590,7 +590,7 @@ bool Overlay_Drive::FileOpen(DOS_File * * file,const char * name,uint32_t flags)
//Flush the buffer of handles for the same file. (Betrayal in Antara) //Flush the buffer of handles for the same file. (Betrayal in Antara)
uint8_t i,drive = DOS_DRIVES; uint8_t i,drive = DOS_DRIVES;
localFile *lfp; LocalFile *lfp;
for (i=0;i<DOS_DRIVES;i++) { for (i=0;i<DOS_DRIVES;i++) {
if (Drives[i]==this) { if (Drives[i]==this) {
drive=i; drive=i;
@ -600,7 +600,7 @@ bool Overlay_Drive::FileOpen(DOS_File * * file,const char * name,uint32_t flags)
if (!dos_kernel_disabled) if (!dos_kernel_disabled)
for (i=0;i<DOS_FILES;i++) { for (i=0;i<DOS_FILES;i++) {
if (Files[i] && Files[i]->IsOpen() && Files[i]->GetDrive()==drive && Files[i]->IsName(name)) { if (Files[i] && Files[i]->IsOpen() && Files[i]->GetDrive()==drive && Files[i]->IsName(name)) {
lfp=dynamic_cast<localFile*>(Files[i]); lfp=dynamic_cast<LocalFile*>(Files[i]);
if (lfp) lfp->Flush(); if (lfp) lfp->Flush();
} }
} }
@ -639,7 +639,7 @@ bool Overlay_Drive::FileOpen(DOS_File * * file,const char * name,uint32_t flags)
bool fileopened = false; bool fileopened = false;
if (hand) { if (hand) {
if (logoverlay) LOG_MSG("overlay file opened %s",newname); if (logoverlay) LOG_MSG("overlay file opened %s",newname);
*file=new localFile(name,hand); *file=new LocalFile(name,hand);
(*file)->flags=flags; (*file)->flags=flags;
fileopened = true; fileopened = true;
} else { } else {
@ -685,7 +685,7 @@ bool Overlay_Drive::FileCreate(DOS_File * * file,const char * name,uint16_t /*at
if (logoverlay) LOG_MSG("File creation in overlay system failed %s",name); if (logoverlay) LOG_MSG("File creation in overlay system failed %s",name);
return false; return false;
} }
*file = new localFile(name,f); *file = new LocalFile(name,f);
(*file)->flags = OPEN_READWRITE; (*file)->flags = OPEN_READWRITE;
OverlayFile* of = ccc(*file); OverlayFile* of = ccc(*file);
of->overlay_active = true; of->overlay_active = true;