The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-10 16:19:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compilation of the Linux version. Also some small cleanups.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@568 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Maarten ter Huurne 2008-09-18 00:22:28 +00:00
parent 89fa3804f1
commit a112da66ea
2 changed files with 45 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
Source/Core/DiscIO/Src/FileBlob.cpp
View File

@ -22,10 +22,13 @@
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#endif
namespace DiscIO namespace DiscIO
{ {
#ifdef _WIN32
PlainFileReader::PlainFileReader(HANDLE hFile_) PlainFileReader::PlainFileReader(HANDLE hFile_)
{ {
hFile = hFile_; hFile = hFile_;
@ -50,72 +53,58 @@ PlainFileReader::~PlainFileReader()
CloseHandle(hFile); CloseHandle(hFile);
} }
bool PlainFileReader::Read(u64 offset, u64 size, u8* out_ptr) bool PlainFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr)
{ {
LONG offset_high = (LONG)(offset >> 32); LONG offset_high = (LONG)(offset >> 32);
SetFilePointer(hFile, (DWORD)(offset & 0xFFFFFFFF), &offset_high, FILE_BEGIN); SetFilePointer(hFile, (DWORD)(offset & 0xFFFFFFFF), &offset_high, FILE_BEGIN);
if (size >= 0x100000000ULL) if (nbytes >= 0x100000000ULL)
return false; // WTF, does windows really have this limitation? return false; // WTF, does windows really have this limitation?
DWORD unused; DWORD unused;
if (!ReadFile(hFile, out_ptr, DWORD(size & 0xFFFFFFFF), &unused, NULL)) if (!ReadFile(hFile, out_ptr, DWORD(nbytes & 0xFFFFFFFF), &unused, NULL))
return false; return false;
else else
return true; return true;
} }
} // namespace #else // POSIX
#else // linux, 64-bit. We do not yet care about linux32 PlainFileReader::PlainFileReader(FILE* file__)
namespace DiscIO
{ {
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);
}
class PlainFileReader : public IBlobReader PlainFileReader* PlainFileReader::Create(const char* filename)
{ {
FILE* file_; FILE* file_ = fopen(filename, "rb");
s64 size; if (file_)
private: return new PlainFileReader(file_);
PlainFileReader(FILE* file__) else
{
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);
}
public:
static PlainFileReader* Create(const char* filename)
{
FILE* file_ = fopen(filename, "rb");
if (file_)
{
return new PlainFileReader(file_);
}
return 0; return 0;
} }
~PlainFileReader() PlainFileReader::~PlainFileReader()
{ {
fclose(file_); fclose(file_);
} }
u64 GetDataSize() const { return(size); } bool PlainFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr)
u64 GetRawSize() const { return(size); } {
int seekStatus = fseek(file_, offset, SEEK_SET);
bool Read(u64 offset, u64 nbytes, u8* out_ptr) if (seekStatus != 0)
{ return false;
fseek(file_, offset, SEEK_SET); size_t bytesRead = fread(out_ptr, nbytes, 1, file_);
fread(out_ptr, nbytes, 1, file_); return bytesRead == nbytes;
return true; }
}
};
} // namespace
#endif #endif
} // namespace

11
Source/Core/DiscIO/Src/FileBlob.h
View File

@ -22,6 +22,8 @@
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#else
#include <cstdio>
#endif #endif
namespace DiscIO namespace DiscIO
@ -31,18 +33,21 @@ class PlainFileReader : public IBlobReader
{ {
#ifdef _WIN32 #ifdef _WIN32
HANDLE hFile; HANDLE hFile;
s64 size;
PlainFileReader(HANDLE hFile_); PlainFileReader(HANDLE hFile_);
#else
FILE* file_;
PlainFileReader(FILE* file__);
#endif #endif
s64 size;
public: public:
static PlainFileReader* Create(const char* filename); static PlainFileReader* Create(const char* filename);
~PlainFileReader(); ~PlainFileReader();
u64 GetDataSize() const { return size; } u64 GetDataSize() const { return size; }
u64 GetRawSize() const { return size; } u64 GetRawSize() const { return size; }
bool Read(u64 offset, u64 size, u8* out_ptr); bool Read(u64 offset, u64 nbytes, u8* out_ptr);
}; };
} // namespace } // namespace
#endif // _FILE_BLOB_H #endif // _FILE_BLOB_H