Ban compression of Wii images until it has been tested. All sorts of minor cleanup.

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

1 files changed, 6 insertions, 5 deletions

diff --git a/Source/Core/DiscIO/Src/CompressedBlob.cpp b/Source/Core/DiscIO/Src/CompressedBlob.cpp
index 41194b537f..c0863a82bc 100644
--- a/Source/Core/DiscIO/Src/CompressedBlob.cpp
+++ b/Source/Core/DiscIO/Src/CompressedBlob.cpp
@@ -26,6 +26,7 @@
 

 #include "Common.h"

 #include "CompressedBlob.h"

+#include "FileUtil.h"

 #include "Hash.h"

 

 #ifdef _WIN32

@@ -35,11 +36,6 @@
 #include "../../../../Externals/zlib/zlib.h"

 #endif

 

-#ifdef _WIN32

-#define fseek _fseeki64

-#endif

-

-

 namespace DiscIO

 {

 

@@ -163,6 +159,11 @@ void CompressedBlobReader::GetBlock(u64 block_num, u8 *out_ptr)
 bool CompressFileToBlob(const char* infile, const char* outfile, u32 sub_type,

 						int block_size, CompressCB callback, void* arg)

 {

+	if (File::GetSize(infile) > 2000000000ULL) {

+		PanicAlert("Sorry - compressing Wii games not yet supported.");

+		return false;

+	}

+

 	if (IsCompressedBlob(infile))

 	{

 		PanicAlert("%s is already compressed! Cannot compress it further.", infile);