diff --git a/Source/Core/DiscIO/Src/FileBlob.cpp b/Source/Core/DiscIO/Src/FileBlob.cpp index 1d54a713c7..070b0fa292 100644 --- a/Source/Core/DiscIO/Src/FileBlob.cpp +++ b/Source/Core/DiscIO/Src/FileBlob.cpp @@ -22,13 +22,10 @@ #ifdef _WIN32 #include -#endif namespace DiscIO { -#ifdef _WIN32 - PlainFileReader::PlainFileReader(HANDLE hFile_) { hFile = hFile_; @@ -53,58 +50,62 @@ PlainFileReader::~PlainFileReader() CloseHandle(hFile); } -bool PlainFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr) +bool PlainFileReader::Read(u64 offset, u64 size, u8* out_ptr) { LONG offset_high = (LONG)(offset >> 32); SetFilePointer(hFile, (DWORD)(offset & 0xFFFFFFFF), &offset_high, FILE_BEGIN); - if (nbytes >= 0x100000000ULL) + if (size >= 0x100000000ULL) return false; // WTF, does windows really have this limitation? DWORD unused; - if (!ReadFile(hFile, out_ptr, DWORD(nbytes & 0xFFFFFFFF), &unused, NULL)) + if (!ReadFile(hFile, out_ptr, DWORD(size & 0xFFFFFFFF), &unused, NULL)) return false; else return true; } -#else // POSIX +} // namespace -PlainFileReader::PlainFileReader(FILE* file__) -{ - file_ = file__; - #if 0 - fseek64(file_, 0, SEEK_END); - #else - fseek(file_, 0, SEEK_END); // I don't have fseek64 with gcc 4.3 - #endif - size = ftell(file_); - fseek(file_, 0, SEEK_SET); -} +#else // linux, 64-bit. We do not yet care about linux32 -PlainFileReader* PlainFileReader::Create(const char* filename) +namespace DiscIO { - FILE* file_ = fopen(filename, "rb"); - if (file_) - return new PlainFileReader(file_); - else + + PlainFileReader::PlainFileReader(FILE* file__) + { + file_ = file__; + #if 0 + fseek64(file_, 0, SEEK_END); + #else + fseek(file_, 0, SEEK_END); // I don't have fseek64 with gcc 4.3 + #endif + size = ftell(file_); + fseek(file_, 0, SEEK_SET); + } + + PlainFileReader* PlainFileReader::Create(const char* filename) + { + FILE* file_ = fopen(filename, "rb"); + if (file_) + { + return new PlainFileReader(file_); + } return 0; -} + } -PlainFileReader::~PlainFileReader() -{ - fclose(file_); -} + PlainFileReader::~PlainFileReader() + { + fclose(file_); + } -bool PlainFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr) -{ - int seekStatus = fseek(file_, offset, SEEK_SET); - if (seekStatus != 0) - return false; - size_t bytesRead = fread(out_ptr, nbytes, 1, file_); - return bytesRead == nbytes; -} + bool PlainFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr) + { + fseek(file_, offset, SEEK_SET); + fread(out_ptr, nbytes, 1, file_); + return true; + } + +} // namespace #endif - -} // namespace diff --git a/Source/Core/DiscIO/Src/FileBlob.h b/Source/Core/DiscIO/Src/FileBlob.h index f704608ba1..3e47ffe76c 100644 --- a/Source/Core/DiscIO/Src/FileBlob.h +++ b/Source/Core/DiscIO/Src/FileBlob.h @@ -22,8 +22,6 @@ #ifdef _WIN32 #include -#else -#include #endif namespace DiscIO @@ -35,8 +33,8 @@ class PlainFileReader : public IBlobReader HANDLE hFile; PlainFileReader(HANDLE hFile_); #else - FILE* file_; - PlainFileReader(FILE* file__); + FILE *file_; + PlainFileReader(FILE *file__); #endif s64 size; @@ -45,7 +43,7 @@ public: ~PlainFileReader(); u64 GetDataSize() const { return size; } u64 GetRawSize() const { return size; } - bool Read(u64 offset, u64 nbytes, u8* out_ptr); + bool Read(u64 offset, u64 size, u8* out_ptr); }; } // namespace