Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-02-13 17:12:39 +01:00
Code Releases Wiki Activity

build: Updated libwolv

Browse Source
This commit is contained in:
WerWolv 2025-02-11 23:05:25 +01:00
parent b3d208e6e6
commit a83610bc06
4 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/external/libwolv vendored

@ -1 +1 @@
Subproject commit 75c66934415785597bfc089c5373fb47747d3083 Subproject commit a745623029d36fdaafeec0f1ccb539ff815b691b

2
lib/external/pattern_language vendored

@ -1 +1 @@
Subproject commit bc002793b0da4886f89b9bf230dff0d0226d21f3 Subproject commit 950a47547553ff3c095c833c484547c8445bbac9

10
main/gui/source/init/run/cli.cpp
View File

@ -40,16 +40,20 @@ namespace hex::init {
// On Windows, argv contains UTF-16 encoded strings, so we need to convert them to UTF-8 // On Windows, argv contains UTF-16 encoded strings, so we need to convert them to UTF-8
auto convertedCommandLine = ::CommandLineToArgvW(::GetCommandLineW(), &argc); auto convertedCommandLine = ::CommandLineToArgvW(::GetCommandLineW(), &argc);
if (convertedCommandLine == nullptr) { if (convertedCommandLine == nullptr) {
log::error("Failed to convert command line arguments to UTF-8"); log::error("Failed to get command line arguments");
std::exit(EXIT_FAILURE); std::exit(EXIT_FAILURE);
} }
// Skip the first argument (the executable path) and convert the rest to a vector of UTF-8 strings // Skip the first argument (the executable path) and convert the rest to a vector of UTF-8 strings
for (int i = 1; i < argc; i += 1) { for (int i = 1; i < argc; i += 1) {
std::wstring wcharArg = convertedCommandLine[i]; std::wstring wcharArg = convertedCommandLine[i];
std::string utf8Arg = wolv::util::wstringToUtf8(wcharArg); auto utf8Arg = wolv::util::wstringToUtf8(wcharArg);
if (!utf8Arg.has_value()) {
log::error("Failed to convert command line arguments to UTF-8");
std::exit(EXIT_FAILURE);
}
args.push_back(utf8Arg); args.push_back(*utf8Arg);
} }
::LocalFree(convertedCommandLine); ::LocalFree(convertedCommandLine);

16
plugins/builtin/source/content/popups/hex_editor/popup_hex_editor_find.cpp
View File

@ -286,25 +286,29 @@ namespace hex::plugin::builtin {
} }
case Encoding::UTF16: { case Encoding::UTF16: {
auto utf16 = wolv::util::utf8ToUtf16(s_inputString); auto utf16 = wolv::util::utf8ToUtf16(s_inputString);
if (!utf16.has_value())
return;
for (auto &c: utf16) { for (auto &c : *utf16) {
swapEndianness(c, Encoding::UTF16, m_stringEndianness); swapEndianness(c, Encoding::UTF16, m_stringEndianness);
} }
std::copy(reinterpret_cast<const u8 *>(utf16.data()), std::copy(reinterpret_cast<const u8 *>(utf16->data()),
reinterpret_cast<const u8 *>(utf16.data() + utf16.size()), reinterpret_cast<const u8 *>(utf16->data() + utf16->size()),
std::back_inserter(m_searchByteSequence)); std::back_inserter(m_searchByteSequence));
break; break;
} }
case Encoding::UTF32: { case Encoding::UTF32: {
auto utf32 = wolv::util::utf8ToUtf32(s_inputString); auto utf32 = wolv::util::utf8ToUtf32(s_inputString);
if (!utf32.has_value())
return;
for (auto &c: utf32) { for (auto &c : *utf32) {
swapEndianness(c, Encoding::UTF32, m_stringEndianness); swapEndianness(c, Encoding::UTF32, m_stringEndianness);
} }
std::copy(reinterpret_cast<const u8 *>(utf32.data()), std::copy(reinterpret_cast<const u8 *>(utf32->data()),
reinterpret_cast<const u8 *>(utf32.data() + utf32.size()), reinterpret_cast<const u8 *>(utf32->data() + utf32->size()),
std::back_inserter(m_searchByteSequence)); std::back_inserter(m_searchByteSequence));
break; break;
} }