mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-14 01:27:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

convert Dbg console packets uniformly to char*

Browse Source
This commit is contained in:
Peter Tissen 2014-02-10 17:13:38 +01:00
parent b9c3dc352d
commit 7423997b42
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rpcs3/Emu/DbgConsole.h
View File

@ -40,7 +40,7 @@ struct _DbgBuffer : public MTPacketBuffer<DbgPacket>
memcpy(&m_buffer[c_put], &stext, sizeof(u32));
c_put += sizeof(u32);
memcpy(&m_buffer[c_put], data.m_text.c_str(), stext);
memcpy(&m_buffer[c_put], static_cast<const char *>(data.m_text), stext);
c_put += stext;
m_put = c_put;
@ -58,7 +58,7 @@ struct _DbgBuffer : public MTPacketBuffer<DbgPacket>
const u32& stext = *(u32*)&m_buffer[c_get];
c_get += sizeof(u32);
if(stext) memcpy(wxStringBuffer(ret.m_text, stext), &m_buffer[c_get], stext);
if (stext) ret.m_text = wxString(reinterpret_cast<const char*>(&m_buffer[c_get]), stext );
c_get += stext;
m_get = c_get;

6
rpcs3/Emu/Memory/Memory.h
View File

@ -301,11 +301,11 @@ public:
wxString ReadString(const u64 addr, const u64 len)
{
wxString ret = wxEmptyString;
wxString ret(GetMemFromAddr(addr), wxConvUTF8,len);
if(len) memcpy(wxStringBuffer(ret, len), GetMemFromAddr(addr), len);
//if(len) memcpy(wxStringBuffer(ret, len), GetMemFromAddr(addr), len);
return wxString(ret.wx_str(), wxConvUTF8);
return ret;
}
wxString ReadString(const u64 addr)