Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-02-22 12:50:29 +01:00
Code Releases Wiki Activity

fix: Opening files with unicode paths in external program/explorer not working

Browse Source
This commit is contained in:
WerWolv 2024-06-27 23:12:20 +02:00
parent a950796306
commit b642c493d7
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/libimhex/source/helpers/fs.cpp
View File

@ -32,6 +32,9 @@
#include <wolv/io/fs.hpp> #include <wolv/io/fs.hpp>
#include <wolv/utils/string.hpp> #include <wolv/utils/string.hpp>
#include <fmt/format.h>
#include <fmt/xchar.h>
namespace hex::fs { namespace hex::fs {
static AutoReset<std::function<void(const std::string&)>> s_fileBrowserErrorCallback; static AutoReset<std::function<void(const std::string&)>> s_fileBrowserErrorCallback;
@ -48,7 +51,7 @@ namespace hex::fs {
#if defined(OS_WINDOWS) #if defined(OS_WINDOWS)
hex::unused( hex::unused(
ShellExecute(nullptr, "open", wolv::util::toUTF8String(filePath).c_str(), nullptr, nullptr, SW_SHOWNORMAL) ShellExecuteW(nullptr, L"open", filePath.c_str(), nullptr, nullptr, SW_SHOWNORMAL)
); );
#elif defined(OS_MACOS) #elif defined(OS_MACOS)
hex::unused(system( hex::unused(system(
@ -66,9 +69,8 @@ namespace hex::fs {
} }
#if defined(OS_WINDOWS) #if defined(OS_WINDOWS)
hex::unused(system( auto args = fmt::format(L"\"{}\"", dirPath.c_str());
hex::format("explorer.exe {}", wolv::util::toUTF8String(dirPath)).c_str() ShellExecuteW(nullptr, L"open", L"explorer.exe", args.c_str(), nullptr, SW_SHOWNORMAL);
));
#elif defined(OS_MACOS) #elif defined(OS_MACOS)
hex::unused(system( hex::unused(system(
hex::format("open {}", wolv::util::toUTF8String(dirPath)).c_str() hex::format("open {}", wolv::util::toUTF8String(dirPath)).c_str()
@ -85,9 +87,8 @@ namespace hex::fs {
} }
#if defined(OS_WINDOWS) #if defined(OS_WINDOWS)
hex::unused(system( auto args = fmt::format(L"/select,\"{}\"", selectedFilePath.c_str());
hex::format(R"(explorer.exe /select,"{}")", wolv::util::toUTF8String(selectedFilePath)).c_str() ShellExecuteW(nullptr, L"open", L"explorer.exe", args.c_str(), nullptr, SW_SHOWNORMAL);
));
#elif defined(OS_MACOS) #elif defined(OS_MACOS)
hex::unused(system( hex::unused(system(
hex::format( hex::format(