archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-11 01:08:39 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

use .wx_str() instead of .mb_str(), Dbg console is still broken

Browse source
This commit is contained in:
Peter Tissen 2014-02-10 13:53:09 +01:00
parent fdcdd7769f
commit b9c3dc352d
32 changed files with 216 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rpcs3/Loader/ELF64.cpp
View file

@ -336,14 +336,14 @@ bool ELF64Loader::LoadPhdrData(u64 offset)
stub.s_text = re(stub.s_text);
const wxString& module_name = Memory.ReadString(stub.s_modulename);
Module* module = GetModuleByName((const char*)module_name.mb_str());
Module* module = GetModuleByName(module_name.ToStdString());
if(module)
{
//module->SetLoaded();
}
else
{
ConLog.Warning("Unknown module '%s'", module_name.mb_str());
ConLog.Warning("Unknown module '%s'", module_name.wx_str());
}
#ifdef LOADER_DEBUG
@ -353,7 +353,7 @@ bool ELF64Loader::LoadPhdrData(u64 offset)
ConLog.Write("*** unk0: 0x%x", stub.s_unk0);
ConLog.Write("*** unk1: 0x%x", stub.s_unk1);
ConLog.Write("*** imports: %d", stub.s_imports);
ConLog.Write("*** module name: %s [0x%x]", module_name.mb_str(), stub.s_modulename);
ConLog.Write("*** module name: %s [0x%x]", module_name.wx_str(), stub.s_modulename);
ConLog.Write("*** nid: 0x%x", stub.s_nid);
ConLog.Write("*** text: 0x%x", stub.s_text);
#endif
@ -370,7 +370,7 @@ bool ELF64Loader::LoadPhdrData(u64 offset)
{
if(!module->Load(nid))
{
ConLog.Warning("Unknown function 0x%08x in '%s' module", nid, module_name.mb_str());
ConLog.Warning("Unknown function 0x%08x in '%s' module", nid, module_name.wx_str());
SysCalls::DoFunc(nid);
}
}