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

Merge pull request #7515 from JosJuice/wcsftime 

Use wcsftime instead of strftime on Windows to fix encoding errors
This commit is contained in:
Pierre Bourdon 2018-10-28 23:58:17 +01:00 committed by GitHub
parent 2bbc9d40f0 5718b870d1
commit 7094f225d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Core/Common/Timer.cpp
View File

@ -7,6 +7,8 @@
#include <string> #include <string>
#ifdef _WIN32 #ifdef _WIN32
#include <cwchar>
#include <windows.h> #include <windows.h>
#include <mmsystem.h> #include <mmsystem.h>
#include <sys/timeb.h> #include <sys/timeb.h>
@ -203,14 +205,19 @@ std::string Timer::GetTimeFormatted()
struct tm* gmTime = localtime(&sysTime); struct tm* gmTime = localtime(&sysTime);
#ifdef _WIN32
wchar_t tmp[13];
wcsftime(tmp, 6, L"%M:%S", gmTime);
#else
char tmp[13]; char tmp[13];
strftime(tmp, 6, "%M:%S", gmTime); strftime(tmp, 6, "%M:%S", gmTime);
#endif
// Now tack on the milliseconds // Now tack on the milliseconds
#ifdef _WIN32 #ifdef _WIN32
struct timeb tp; struct timeb tp;
(void)::ftime(&tp); (void)::ftime(&tp);
return StringFromFormat("%s:%03i", tmp, tp.millitm); return UTF16ToUTF8(tmp) + StringFromFormat(":%03i", tp.millitm);
#elif defined __APPLE__ #elif defined __APPLE__
struct timeval t; struct timeval t;
(void)gettimeofday(&t, nullptr); (void)gettimeofday(&t, nullptr);
@ -265,9 +272,15 @@ std::string Timer::GetDateTimeFormatted(double time)
time_t seconds = (time_t)time + DOUBLE_TIME_OFFSET; time_t seconds = (time_t)time + DOUBLE_TIME_OFFSET;
tm* localTime = localtime(&seconds); tm* localTime = localtime(&seconds);
#ifdef _WIN32
wchar_t tmp[32] = {};
wcsftime(tmp, sizeof(tmp), L"%x %X", localTime);
return UTF16ToUTF8(tmp);
#else
char tmp[32] = {}; char tmp[32] = {};
strftime(tmp, sizeof(tmp), "%x %X", localTime); strftime(tmp, sizeof(tmp), "%x %X", localTime);
return tmp; return tmp;
#endif
} }
} // Namespace Common } // Namespace Common