zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-09 17:20:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

- use FString instead of std::string in the Windows shell functions

Browse source
This commit is contained in:
Rachael Alexanderson 2022-08-10 18:13:49 -04:00
parent f2df781b76
commit 04a6fa321b
1 changed files with 9 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/common/platform/win32/i_system.cpp
View file

@ -960,50 +960,20 @@ void I_SetThreadNumaNode(std::thread &thread, int numaNode)
} }
} }
std::wstring ToUtf16(const std::string& str)
{
if (str.empty()) return {};
int needed = MultiByteToWideChar(CP_UTF8, 0, str.data(), (int)str.size(), nullptr, 0);
if (needed == 0)
throw std::runtime_error("MultiByteToWideChar failed");
std::wstring result;
result.resize(needed);
needed = MultiByteToWideChar(CP_UTF8, 0, str.data(), (int)str.size(), &result[0], (int)result.size());
if (needed == 0)
throw std::runtime_error("MultiByteToWideChar failed");
return result;
}
/* // not currently used, but here for reference if it is needed
std::string FromUtf16(const std::wstring& str)
{
if (str.empty()) return {};
int needed = WideCharToMultiByte(CP_UTF8, 0, str.data(), (int)str.size(), nullptr, 0, nullptr, nullptr);
if (needed == 0)
throw std::runtime_error("WideCharToMultiByte failed");
std::string result;
result.resize(needed);
needed = WideCharToMultiByte(CP_UTF8, 0, str.data(), (int)str.size(), &result[0], (int)result.size(), nullptr, nullptr);
if (needed == 0)
throw std::runtime_error("WideCharToMultiByte failed");
return result;
}
*/
void I_OpenShellFolder(const char* folder) void I_OpenShellFolder(const char* folder)
{ {
std::string x = folder; FString proc = folder;
for (auto& c : x) { if (c == '/') c = '\\'; } proc.ReplaceChars('/', '\\');
Printf("Opening folder: %s\n", x.c_str()); Printf("Opening folder: %s\n", proc.GetChars());
ShellExecuteW(NULL, L"open", L"explorer.exe", ToUtf16(x).c_str(), NULL, SW_SHOWNORMAL); ShellExecuteW(NULL, L"open", L"explorer.exe", proc.WideString().c_str(), NULL, SW_SHOWNORMAL);
} }
void I_OpenShellFile(const char* file) void I_OpenShellFile(const char* file)
{ {
std::string x = (std::string)"/select," + (std::string)file; FString proc = file;
for (auto& c : x) { if (c == '/') c = '\\'; } proc.ReplaceChars('/', '\\');
x[0] = '/'; Printf("Opening folder to file: %s\n", proc.GetChars());
Printf("Opening folder to file: %s\n", x.c_str()); proc.Format("/select,%s", proc.GetChars());
ShellExecuteW(NULL, L"open", L"explorer.exe", ToUtf16(x).c_str(), NULL, SW_SHOWNORMAL); ShellExecuteW(NULL, L"open", L"explorer.exe", proc.WideString().c_str(), NULL, SW_SHOWNORMAL);
} }