From 7423997b4221026d3cb2d850c698bde7fe0e935e Mon Sep 17 00:00:00 2001 From: Peter Tissen Date: Mon, 10 Feb 2014 17:13:38 +0100 Subject: [PATCH] convert Dbg console packets uniformly to char* --- rpcs3/Emu/DbgConsole.h | 4 ++-- rpcs3/Emu/Memory/Memory.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rpcs3/Emu/DbgConsole.h b/rpcs3/Emu/DbgConsole.h index 548fcb4458..b36e7929fb 100644 --- a/rpcs3/Emu/DbgConsole.h +++ b/rpcs3/Emu/DbgConsole.h @@ -40,7 +40,7 @@ struct _DbgBuffer : public MTPacketBuffer 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(data.m_text), stext); c_put += stext; m_put = c_put; @@ -58,7 +58,7 @@ struct _DbgBuffer : public MTPacketBuffer 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(&m_buffer[c_get]), stext ); c_get += stext; m_get = c_get; diff --git a/rpcs3/Emu/Memory/Memory.h b/rpcs3/Emu/Memory/Memory.h index ca2712a8fd..a2547bcc55 100644 --- a/rpcs3/Emu/Memory/Memory.h +++ b/rpcs3/Emu/Memory/Memory.h @@ -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)