ToAscii() -> ToUFT8() [missed a few last time]

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2124 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-11-03 20:36:47 +00:00
parent d868edc17c
commit 30584cb9f6
8 changed files with 19 additions and 21 deletions

View File

@ -325,7 +325,7 @@ void cdvdReadKey(u8 arg0, u16 arg1, u32 arg2, u8* key) {
// get main elf name
bool IsPs2 = (GetPS2ElfName(fname) == 2);
const wxCharBuffer crap( fname.ToAscii() );
const wxCharBuffer crap( fname.To8BitData() );
const char* str = crap.data();
sprintf(exeName, "%c%c%c%c%c%c%c%c%c%c%c",str[8],str[9],str[10],str[11],str[12],str[13],str[14],str[15],str[16],str[17],str[18]);
DevCon.Warning("exeName = %s", &str[8]);
@ -515,7 +515,7 @@ static void cdvdDetectDisk()
wxString str;
bool IsPs2 = (GetPS2ElfName(str) == 2);
if (IsPs2) reloadElfInfo(str.ToAscii().data());
if (IsPs2) reloadElfInfo( str.ToUTF8() );
}
void cdvdNewDiskCB()

View File

@ -343,7 +343,7 @@ bool DoCDVDopen()
cdvdTD td;
CDVD->getTD(0, &td);
blockDumpFile = isoCreate(temp.ToAscii().data(), ISOFLAGS_BLOCKDUMP_V3);
blockDumpFile = isoCreate(temp.ToUTF8(), ISOFLAGS_BLOCKDUMP_V3);
if( blockDumpFile != NULL )
{

View File

@ -246,7 +246,7 @@ struct ElfObject
// Destructor!
// C++ does all the cleanup automagically for us.
~ElfObject() { }
virtual ~ElfObject() { }
ElfObject( const wxString& srcfile, uint hdrsize ) :
filename( srcfile )
@ -321,11 +321,11 @@ struct ElfObject
void readFile()
{
int rsize = 0;
const wxCharBuffer work( filename.ToAscii() );
if ((strnicmp( work.data(), "cdrom0:", strlen("cdromN:")) == 0) ||
(strnicmp( work.data(), "cdrom1:", strlen("cdromN:")) == 0))
const wxCharBuffer work( filename.ToUTF8() );
if ((strnicmp( work, "cdrom0:", strlen("cdromN:")) == 0) ||
(strnicmp( work, "cdrom1:", strlen("cdromN:")) == 0))
{
int fi = IsoFS_open(work.data() + strlen("cdromN:"), 1);//RDONLY
int fi = IsoFS_open(work + strlen("cdromN:"), 1);//RDONLY
if (fi < 0) throw Exception::FileNotFound( filename );
@ -499,12 +499,12 @@ void ElfApplyPatches()
/*if(LoadPatch( filename ) != 0)
{
Console.WriteLn( "XML Loader returned an error. Trying to load a pnach..." );
inifile_read( filename.ToAscii().data() );
inifile_read( filename.ToUTF8() );
}
else
Console.WriteLn( "XML Loading success. Will not load from pnach..." );*/
inifile_read( filename.ToAscii().data() );
inifile_read( filename.ToUTF8() );
applypatch( 0 );
}
@ -542,9 +542,9 @@ void loadElfFile(const wxString& filename)
if( filename.IsEmpty() ) return;
s64 elfsize;
Console.WriteLn( L"loadElfFile: %s", filename.c_str() );
Console.WriteLn( L"loadElfFile: " + filename );
const wxCharBuffer buffer( filename.ToAscii() );
const wxCharBuffer buffer( filename.ToUTF8() );
const char* fnptr = buffer.data();
bool useCdvdSource=false;

View File

@ -105,8 +105,8 @@ void SaveStateBase::FreezeBios()
memzero( descin );
memzero( desccmp );
memcpy_fast( descin, descout.ToAscii().data(), descout.Length() );
memcpy_fast( desccmp, descout.ToAscii().data(), descout.Length() );
memcpy_fast( descin, descout.ToUTF8().data(), descout.Length() );
memcpy_fast( desccmp, descout.ToUTF8().data(), descout.Length() );
// ... and only freeze bios info once per state, since the user msg could
// become really annoying on a corrupted state or something. (have to always
@ -123,7 +123,7 @@ void SaveStateBase::FreezeBios()
"\n\tWarning: BIOS Version Mismatch, savestate may be unstable!\n"
"\t\tCurrent Version: %s\n"
"\t\tSavestate Version: %s\n",
descout.ToAscii().data(), descin
descout.ToUTF8().data(), descin
);
}
}

View File

@ -824,8 +824,7 @@ wchar_t ShiftJIS_ConvertChar(const char* input, int& used)
}
used = 2;
const uint SecondByte = input[1];
return TwoBytes[FirstByte][SecondByte];
return TwoBytes[FirstByte][input[1]];
}
}

View File

@ -20,7 +20,6 @@
#include "Utilities/Console.h"
#include "DebugTools/Debug.h"
#include <wx/file.h>
#include <wx/textfile.h>
#ifdef __WXMSW__

View File

@ -123,7 +123,7 @@ static void loadBiosRom( const wxChar *ext, u8 *dest, s64 maxSize )
Bios1 = Path::ReplaceExtension( Bios, ext );
if( (filesize=Path::GetFileSize( Bios1 ) ) <= 0 )
{
Console.Warning( "Load Bios Warning: %s not found (this is not an error!)", wxString(ext).ToAscii().data() );
Console.Warning( L"Load Bios Warning: %s module not found, skipping... (this is not an error)", ext );
return;
}
}

View File

@ -436,7 +436,7 @@ static void iIopDumpBlock( int startpc, u8 * ptr )
AsciiFile f2( L"mydump1", wxFile::write );
f2.Write( ptr, (uptr)x86Ptr - (uptr)ptr );
}
wxCharBuffer buf( filename.ToAscii() );
wxCharBuffer buf( filename.ToUTF8() );
const char* filenamea = buf.data();
sprintf( command, "objdump -D --target=binary --architecture=i386 -M intel mydump1 | cat %s - > tempdump", filenamea );
system( command );