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

Correction to my last revision. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2168 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-11-08 22:06:33 +00:00
parent f2b32b57aa
commit de00eb95e7
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pcsx2/Elfheader.cpp
View File

@ -587,13 +587,10 @@ void loadElfFile(const wxString& filename)
{ {
if( memcmp( "rom0:OSDSYS", (char*)PSM( i ), 11 ) == 0 ) if( memcmp( "rom0:OSDSYS", (char*)PSM( i ), 11 ) == 0 )
{ {
char* temp;
strcpy( (char*)PSM( i ), fnptr ); strcpy( (char*)PSM( i ), fnptr );
strcpy(temp, fnptr); // Passing wxCharBuffers to WriteLn crashes pcsx2. DevCon.WriteLn( "loadElfFile: addr %x \"%s\" -> \"%s\"", i, "rom0:OSDSYS", fnptr.data() );
DevCon.WriteLn( "loadElfFile: addr %x \"%s\" -> \"%s\"", i, "rom0:OSDSYS", temp );
} }
} }
ElfCRC = elfobj.GetCRC(); ElfCRC = elfobj.GetCRC();
Console.WriteLn( L"loadElfFile: %s; CRC = %8.8X", filename.c_str(), ElfCRC ); Console.WriteLn( L"loadElfFile: %s; CRC = %8.8X", filename.c_str(), ElfCRC );
ElfApplyPatches(); ElfApplyPatches();

1
pcsx2/Linux/pcsx2.cbp
View File

@ -122,6 +122,7 @@
<Unit filename="../CDVD/CDVDisoReader.h" /> <Unit filename="../CDVD/CDVDisoReader.h" />
<Unit filename="../CDVD/CdRom.cpp" /> <Unit filename="../CDVD/CdRom.cpp" />
<Unit filename="../CDVD/CdRom.h" /> <Unit filename="../CDVD/CdRom.h" />
<Unit filename="../CDVD/IsoFS/IsoDirectory.h" />
<Unit filename="../CDVD/IsoFS/IsoFS.cpp" /> <Unit filename="../CDVD/IsoFS/IsoFS.cpp" />
<Unit filename="../CDVD/IsoFS/IsoFS.h" /> <Unit filename="../CDVD/IsoFS/IsoFS.h" />
<Unit filename="../CDVD/IsoFS/IsoFSCDVD.cpp" /> <Unit filename="../CDVD/IsoFS/IsoFSCDVD.cpp" />