piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Common: Rename UTF16ToUTF8

Browse Source 
This function does *not* always convert from UTF-16. It converts
from UTF-16 on Windows and UTF-32 on other operating systems.

Also renaming UTF8ToUTF16 for consistency, even though it
technically doesn't have the same problem since it only was
implemented on Windows.
This commit is contained in:
JosJuice
2020-06-28 18:15:30 +02:00
parent cd51552fe4
commit 15d9fab0bb
14 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/WinUpdater/WinUI.cpp
View File

@ -180,7 +180,7 @@ void ResetCurrentProgress()
void Error(const std::string& text)
{
auto wide_text = UTF8ToUTF16(text);
auto wide_text = UTF8ToWString(text);
MessageBox(nullptr,
(L"A fatal error occured and the updater cannot continue:\n " + wide_text).c_str(),
@ -200,7 +200,7 @@ void SetCurrentProgress(int current, int total)
void SetDescription(const std::string& text)
{
SetWindowText(label_handle, UTF8ToUTF16(text).c_str());
SetWindowText(label_handle, UTF8ToWString(text).c_str());
}
void MessageLoop()
@ -256,7 +256,7 @@ void LaunchApplication(std::string path)
{
// Hack: Launching the updater over the explorer ensures that admin priviliges are dropped. Why?
// Ask Microsoft.
ShellExecuteW(nullptr, nullptr, L"explorer.exe", UTF8ToUTF16(path).c_str(), nullptr, SW_SHOW);
ShellExecuteW(nullptr, nullptr, L"explorer.exe", UTF8ToWString(path).c_str(), nullptr, SW_SHOW);
}
void Sleep(int sleep)