OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-25 13:50:15 +00:00
Code Issues Projects Releases Wiki Activity

Update string_util.cpp

Browse Source 
Reduce the modifications to the code
This commit is contained in:
yami-hack 2016-06-13 16:45:17 +08:00 committed by GitHub
parent 1645eee8f4
commit 0f60caf49a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/string_util.cpp
View File

@ -13,7 +13,7 @@
#include "common/logging/log.h" #include "common/logging/log.h"
#include "common/string_util.h" #include "common/string_util.h"
#if defined(_MSC_VER) || __MINGW64__ #if defined(_MSC_VER) || defined(__MINGW64__)
#include <Windows.h> #include <Windows.h>
#include <codecvt> #include <codecvt>
#include "common/common_funcs.h" #include "common/common_funcs.h"
@ -52,7 +52,7 @@ bool CharArrayFromFormatV(char* out, int outsize, const char* format, va_list ar
{ {
int writtenCount; int writtenCount;
#if defined(_MSC_VER) || !defined(__MINGW64__) #if defined(_MSC_VER)
// You would think *printf are simple, right? Iterate on each character, // You would think *printf are simple, right? Iterate on each character,
// if it's a format specifier handle it properly, etc. // if it's a format specifier handle it properly, etc.
// //
@ -292,7 +292,7 @@ std::string ReplaceAll(std::string result, const std::string& src, const std::st
return result; return result;
} }
#if defined(_MSC_VER) || !__MINGW32__ || __MINGW64__ #if defined(_MSC_VER) || defined(__MINGW64__)
std::string UTF16ToUTF8(const std::u16string& input) std::string UTF16ToUTF8(const std::u16string& input)
{ {
@ -323,7 +323,7 @@ std::u16string UTF8ToUTF16(const std::string& input)
static std::wstring CPToUTF16(u32 code_page, const std::string& input) static std::wstring CPToUTF16(u32 code_page, const std::string& input)
{ {
auto const size = MultiByteToWideChar(code_page, 0, input.data(), static_cast<int>(input.size()), nullptr, 0); auto const size = MultiByteToWideChar(code_page, 0, input.data(), static_cast<int>(input.size()), nullptr, 0);
std::wstring output(size,'\0'); std::wstring output;
output.resize(size); output.resize(size);
if (size == 0 || size != MultiByteToWideChar(code_page, 0, input.data(), static_cast<int>(input.size()), &output[0], static_cast<int>(output.size()))) if (size == 0 || size != MultiByteToWideChar(code_page, 0, input.data(), static_cast<int>(input.size()), &output[0], static_cast<int>(output.size())))