diff --git a/common/src/Utilities/FastFormatString.cpp b/common/src/Utilities/FastFormatString.cpp index 0eed1374d1..7507536a21 100644 --- a/common/src/Utilities/FastFormatString.cpp +++ b/common/src/Utilities/FastFormatString.cpp @@ -265,7 +265,7 @@ FastFormatUnicode& FastFormatUnicode::WriteV( const char* fmt, va_list argptr ) const uint inspos = m_Length; const uint convLen = converted.Length(); m_dest->MakeRoomFor((inspos + convLen + 64) * sizeof(wxChar)); - memcpy_fast( &((wxChar*)m_dest->GetPtr())[inspos], converted, (convLen+1)*sizeof(wxChar) ); + memcpy_fast( &((wxChar*)m_dest->GetPtr())[inspos], converted.wc_str(), (convLen+1)*sizeof(wxChar) ); m_Length += convLen; return *this; diff --git a/pcsx2/GameDatabase.h b/pcsx2/GameDatabase.h index 3fd510287d..02894dea46 100644 --- a/pcsx2/GameDatabase.h +++ b/pcsx2/GameDatabase.h @@ -32,7 +32,7 @@ public: HashTools::hash_key_t operator()( const wxString& src ) const { - return HashTools::Hash( (const char *)src.Lower().data(), src.length() * sizeof( wxChar ) ); + return HashTools::Hash( (const char *)src.Lower().wc_str(), src.length() * sizeof( wxChar ) ); } }; diff --git a/pcsx2/gui/ConsoleLogger.cpp b/pcsx2/gui/ConsoleLogger.cpp index 36efbc206c..b115e3cc5e 100644 --- a/pcsx2/gui/ConsoleLogger.cpp +++ b/pcsx2/gui/ConsoleLogger.cpp @@ -584,7 +584,7 @@ bool ConsoleLogFrame::Write( ConsoleColors color, const wxString& text ) int endpos = m_CurQueuePos + text.Length(); m_QueueBuffer.MakeRoomFor( endpos + 1 ); // and the null!! - memcpy_fast( &m_QueueBuffer[m_CurQueuePos], text.c_str(), sizeof(wxChar) * text.Length() ); + memcpy_fast( &m_QueueBuffer[m_CurQueuePos], text.wc_str(), sizeof(wxChar) * text.Length() ); m_CurQueuePos = endpos; // this NULL may be overwritten if the next message sent doesn't perform a color change.