RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-05 06:26:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

make it compilable, don't merge this, string logs are broken and paths absolute to my machine

Browse source
This commit is contained in:
Peter Tissen 2014-02-10 02:13:13 +01:00
parent 6dcfaf8617
commit 59dcbd3ba3
31 changed files with 465 additions and 227 deletions
Download patch file Download diff file Expand all files Collapse all files

13
rpcs3/Gui/ConLog.cpp
View file

@ -158,7 +158,7 @@ wxString FormatV(const wxString fmt, va_list args)
str.Clear();
wxStringBuffer buf(str, length+1);
memset(buf, 0, length+1);
if(vsnprintf(buf, length, fmt, args) != -1) break;
if(vsnprintf((char *)((wxStringCharType *)buf), length, fmt, args) != -1) break;
length *= 2;
}
@ -170,11 +170,12 @@ void LogWriter::Write(const wxString fmt, ...)
va_list list;
va_start(list, fmt);
const wxString& frmt = FormatV(fmt, list);
wxString frmt;
frmt.PrintfV(fmt, list);
va_end(list);
WriteToLog("!", frmt.mb_str(), "White");
WriteToLog("!", (const char *)frmt.mb_str(), "White");
}
void LogWriter::Error(const wxString fmt, ...)
@ -186,7 +187,7 @@ void LogWriter::Error(const wxString fmt, ...)
va_end(list);
WriteToLog("E", frmt.mb_str(), "Red");
WriteToLog("E", frmt.ToStdString(), "Red");
}
void LogWriter::Warning(const wxString fmt, ...)
@ -198,7 +199,7 @@ void LogWriter::Warning(const wxString fmt, ...)
va_end(list);
WriteToLog("W", frmt.mb_str(), "Yellow");
WriteToLog("W", frmt.ToStdString(), "Yellow");
}
void LogWriter::Success(const wxString fmt, ...)
@ -210,7 +211,7 @@ void LogWriter::Success(const wxString fmt, ...)
va_end(list);
WriteToLog("S", frmt.mb_str(), "Green");
WriteToLog("S", frmt.ToStdString(), "Green");
}
void LogWriter::SkipLn()