ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hack up hack number 7328, just to get things to compile. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7329 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2011-03-11 12:56:26 +00:00
parent 59fd1008ca
commit 5706abf4a1
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Common/Src/SysConf.cpp
View File

@ -71,8 +71,9 @@ bool SysConf::LoadFromFile(const char *filename)
return false; return false;
} }
bool SysConf::LoadFromFileInternal(File::IOFile f) bool SysConf::LoadFromFileInternal(FILE *fh)
{ {
File::IOFile f(fh);
// Fill in infos // Fill in infos
SSysConfHeader s_Header; SSysConfHeader s_Header;
f.ReadArray(s_Header.version, 4); f.ReadArray(s_Header.version, 4);

2
Source/Core/Common/Src/SysConf.h
View File

@ -179,7 +179,7 @@ public:
bool Reload(); bool Reload();
private: private:
bool LoadFromFileInternal(File::IOFile f); bool LoadFromFileInternal(FILE *fh);
void GenerateSysConf(); void GenerateSysConf();
void Clear(); void Clear();

4
Source/Core/DiscIO/Src/DriveBlob.cpp
View File

@ -129,8 +129,8 @@ bool DriveReader::ReadMultipleAlignedBlocks(u64 block_num, u64 num_blocks, u8 *o
return false; return false;
} }
#else #else
fseeko(file_, m_blocksize*block_num, SEEK_SET); fseeko(file_.GetHandle(), m_blocksize*block_num, SEEK_SET);
if(fread(out_ptr, 1, m_blocksize * num_blocks, file_) != m_blocksize * num_blocks) if(fread(out_ptr, 1, m_blocksize * num_blocks, file_.GetHandle()) != m_blocksize * num_blocks)
return false; return false;
#endif #endif
return true; return true;

5
Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp
View File

@ -796,9 +796,10 @@ u32 GCMemcard::ImportGci(const char *inputFile, std::string outputFile)
return result; return result;
} }
u32 GCMemcard::ImportGciInternal(File::IOFile gci, const char *inputFile, std::string outputFile) u32 GCMemcard::ImportGciInternal(FILE* gcih, const char *inputFile, std::string outputFile)
{ {
int offset; File::IOFile gci(gcih);
unsigned int offset;
char tmp[0xD]; char tmp[0xD];
std::string fileType; std::string fileType;
SplitPath(inputFile, NULL, NULL, &fileType); SplitPath(inputFile, NULL, NULL, &fileType);

2
Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.h
View File

@ -228,7 +228,7 @@ public:
// if remove > 0 it will pad bat.map with 0's sizeof remove // if remove > 0 it will pad bat.map with 0's sizeof remove
u32 ImportFile(DEntry& direntry, u8* contents, int remove); u32 ImportFile(DEntry& direntry, u8* contents, int remove);
private: private:
u32 ImportGciInternal(File::IOFile gci, const char *inputFile, std::string outputFile); u32 ImportGciInternal(FILE* gcih, const char *inputFile, std::string outputFile);
public: public:
// delete a file from the directory // delete a file from the directory

2
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
View File

@ -1158,7 +1158,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
} }
// Frame dumps are handled a little differently in Windows // Frame dumps are handled a little differently in Windows
#if defined _WIN32 || defined HAVE_LIBAV && 0 #if defined _WIN32 || defined HAVE_LIBAV
if (g_ActiveConfig.bDumpFrames) if (g_ActiveConfig.bDumpFrames)
{ {
std::lock_guard<std::mutex> lk(s_criticalScreenshot); std::lock_guard<std::mutex> lk(s_criticalScreenshot);