Reinstated the changes from rev 568. Also fixed the actual bug: fread() was told to read 1 n-byte record, while it should be told to read n 1-byte records, so we know exactly how much it actually read.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@573 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/DiscIO/Src/FileBlob.cpp

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

Source/Core/DiscIO/Src/FileBlob.h

@@ -22,6 +22,8 @@
 
 #ifdef _WIN32
 #include <windows.h>
+#else
+#include <cstdio>
 #endif
 
 namespace DiscIO
@@ -33,8 +35,8 @@ class PlainFileReader : public IBlobReader
 	HANDLE hFile;
 	PlainFileReader(HANDLE hFile_);
 #else
-	FILE *file_;
+	FILE* file_;
-	PlainFileReader(FILE *file__);
+	PlainFileReader(FILE* file__);
 #endif
 	s64 size;
 
@@ -43,7 +45,7 @@ public:
 	~PlainFileReader();
 	u64 GetDataSize() 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