piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix issue r3458. I don't have a 32bit linux install, however I know it will at least fix compressing. Please test if uncompressed games run.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6510 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman
2010-12-03 12:42:01 +00:00
parent 08a3b60f8c
commit 3d441febda
12 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/DiscIO/Src/CompressedBlob.cpp
View File

@ -39,9 +39,7 @@ CompressedBlobReader::CompressedBlobReader(const char *filename)
{
file_name = filename;
file = fopen(filename, "rb");
fseek(file, 0, SEEK_END);
file_size = ftell(file);
fseek(file, 0, SEEK_SET);
file_size = File::GetSize(filename);
fread(&header, sizeof(CompressedBlobHeader), 1, file);
SetSectorSize(header.block_size);
@ -190,14 +188,11 @@ bool CompressFileToBlob(const char* infile, const char* outfile, u32 sub_type,
callback("Files opened, ready to compress.", 0, arg);
fseek(inf, 0, SEEK_END);
s64 insize = ftell(inf);
fseek(inf, 0, SEEK_SET);
CompressedBlobHeader header;
header.magic_cookie = kBlobCookie;
header.sub_type = sub_type;
header.block_size = block_size;
header.data_size = insize;
header.data_size = File::GetSize(infile);
// round upwards!
header.num_blocks = (u32)((header.data_size + (block_size - 1)) / block_size);

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

@ -19,6 +19,7 @@
#include "Blob.h"
#include "FileBlob.h"
#include "FileUtil.h"
namespace DiscIO
{
@ -26,9 +27,7 @@ namespace DiscIO
PlainFileReader::PlainFileReader(FILE* file__)
{
file_ = file__;
fseek(file_, 0, SEEK_END);
size = ftell(file_);
fseek(file_, 0, SEEK_SET);
size = File::GetSize(file__);
}
PlainFileReader* PlainFileReader::Create(const char* filename)

2
Source/Core/DiscIO/Src/VolumeGC.cpp
View File

@ -129,7 +129,7 @@ std::string CVolumeGC::GetApploaderDate() const
u64 CVolumeGC::GetSize() const
{
if (m_pReader)
return (size_t)m_pReader->GetDataSize();
return m_pReader->GetDataSize();
else
return 0;
}