ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bugfix for string formatting on some non-MSW platforms. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3652 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2010-08-17 12:09:03 +00:00
parent 645188e0e8
commit 365ffdb66c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/Utilities/FastFormatString.cpp
View File

@ -175,7 +175,7 @@ static __ri void format_that_unicode_mess( SafeArray<char>& buffer, uint writepo
{
while( true )
{
int size = buffer.GetLength()/2;
int size = buffer.GetLength() / sizeof(wxChar);
int len = wxVsnprintf((wxChar*)buffer.GetPtr(writepos), size-writepos, fmt, argptr);
// some implementations of vsnprintf() don't NUL terminate
@ -194,7 +194,7 @@ static __ri void format_that_unicode_mess( SafeArray<char>& buffer, uint writepo
len += writepos;
if (len < size) break;
buffer.ExactAlloc( (len + 31) * 2 );
buffer.ExactAlloc( (len + 31) * sizeof(wxChar) );
};
// performing an assertion or log of a truncated string is unsafe, so let's not; even
@ -236,7 +236,7 @@ FastFormatUnicode& FastFormatUnicode::WriteV( const char* fmt, va_list argptr )
wxString converted( fromUTF8(FastFormatAscii().WriteV( fmt, argptr )) );
uint inspos = wxStrlen((wxChar*)m_dest->GetPtr());
m_dest->MakeRoomFor((inspos + converted.Length() + 31)*2);
m_dest->MakeRoomFor((inspos + converted.Length() + 31)*sizeof(wxChar));
wxStrcpy( &((wxChar*)m_dest->GetPtr())[inspos], converted );
return *this;