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

wxIsoFile: fixed support for dumpfiles. 

git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxIsoFile@3954 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2010-10-21 15:06:57 +00:00
parent 5ba7b0650d
commit aba50c4bf7
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pcsx2/CDVD/IsoFileFormats.cpp
View File

@ -46,7 +46,10 @@ void isoFile::_ReadDtable()
_IsoPart& headpart( m_parts[0] ); _IsoPart& headpart( m_parts[0] );
wxFileOffset flen = headpart.handle->GetLength(); wxFileOffset flen = headpart.handle->GetLength();
m_dtablesize = (flen - BlockDumpHeaderSize) / (m_blocksize + 4); static const wxFileOffset datalen = flen - BlockDumpHeaderSize;
pxAssert( (datalen % (m_blocksize + 4)) == 0);
m_dtablesize = datalen / (m_blocksize + 4);
m_dtable = new u32[m_dtablesize]; m_dtable = new u32[m_dtablesize];
headpart.Seek(BlockDumpHeaderSize); headpart.Seek(BlockDumpHeaderSize);
@ -174,6 +177,7 @@ void isoFile::_ReadBlockD(u8* dst, uint lsn)
#endif #endif
m_parts[0].Read( dst + m_blockofs, m_blocksize ); m_parts[0].Read( dst + m_blockofs, m_blocksize );
return;
} }
Console.WriteLn("Block %u not found in dump", lsn); Console.WriteLn("Block %u not found in dump", lsn);
@ -240,6 +244,13 @@ void isoFile::_WriteBlock(const u8* src, uint lsn)
void isoFile::_WriteBlockD(const u8* src, uint lsn) void isoFile::_WriteBlockD(const u8* src, uint lsn)
{ {
// Find and ignore blocks that have already been dumped:
for (uint i=0; i<m_dtablesize; ++i)
{
if (m_dtable[i] == lsn) return;
}
m_dtable[m_dtablesize++] = lsn;
outWrite<u32>( lsn ); outWrite<u32>( lsn );
outWrite( src + m_blockofs, m_blocksize ); outWrite( src + m_blockofs, m_blocksize );
} }
@ -403,13 +414,15 @@ void isoFile::Open( const wxString& srcfile )
if (!Detect()) if (!Detect())
throw Exception::BadStream().SetUserMsg(wxLt("Unrecognized ISO file format.")); throw Exception::BadStream().SetUserMsg(wxLt("Unrecognized ISO file format."));
if (!(m_flags & ISOFLAGS_BLOCKDUMP_V2))
{
m_blocks = m_parts[0].CalculateBlocks( 0, m_blocksize ); m_blocks = m_parts[0].CalculateBlocks( 0, m_blocksize );
FindParts(); FindParts();
if (m_numparts > 1) if (m_numparts > 1)
{ {
Console.WriteLn( Color_Blue, "isoFile: multi-part ISO detected. %u parts found." ); Console.WriteLn( Color_Blue, "isoFile: multi-part ISO detected. %u parts found." );
} }
}
const char* isotypename = NULL; const char* isotypename = NULL;
switch(m_type) switch(m_type)