diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-04-28 13:37:21 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-04-28 13:37:21 -0400 |
| commit | 29e1804139691229a887144b612f147e1c9dcffb (patch) | |
| tree | ef7b33360da228b7f2e078dbea5af763c1548230 /indra/llwindow/llwindowwin32.cpp | |
| parent | 26d324a2dd06ebde896f7856622a55414eb75d77 (diff) | |
| parent | 96df3f3eb1351973d140ba73b507de44b1052c89 (diff) | |
automated merge
Diffstat (limited to 'indra/llwindow/llwindowwin32.cpp')
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index e2da3d1ad8..a96ad7e796 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -2877,8 +2877,13 @@ void LLSplashScreenWin32::updateImpl(const std::string& mesg) { if (!mWindow) return; + int output_str_len = MultiByteToWideChar(CP_UTF8, 0, mesg.c_str(), mesg.length(), NULL, 0); + if( output_str_len>1024 ) + return; + WCHAR w_mesg[1024]; - mbstowcs(w_mesg, mesg.c_str(), 1024); + + MultiByteToWideChar (CP_UTF8, 0, mesg.c_str(), mesg.length(), w_mesg, output_str_len); SendDlgItemMessage(mWindow, 666, // HACK: text id |