fix: Missing reference

build: Always extract magic file database
fix: Crashes when opening diffing view
2026-03-31 13:26:02 -05:00 · 2023-12-28 19:25:37 +01:00 · 2023-12-28 19:24:56 +01:00 · 2023-12-28 19:21:15 +01:00 · 2023-12-28 18:33:36 +01:00 · 2023-12-28 18:05:49 +01:00
12 changed files with 98 additions and 78 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -154,7 +154,6 @@ jobs:
          WINGET_GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
        if: "${{ env.WINGET_GITHUB_TOKEN != '' }}"
        run: |
-          set -x
          $tagname = $env:GITHUB_REF.Replace("refs/tags/", "")
          $version = $tagname.Replace("v", "")
          $url = "https://github.com/WerWolv/ImHex/releases/download/${tagname}/imhex-${version}-Windows-x86_64.msi"
--- a/2
+++ b/2
@@ -1 +1 @@
-1.32.0
+1.32.1
--- a/cmake/build_helpers.cmake
+++ b/cmake/build_helpers.cmake
@@ -180,12 +180,17 @@ macro(createPackage)
        # Install binaries directly in the prefix, usually C:\Program Files\ImHex.
        set(CMAKE_INSTALL_BINDIR ".")

+        set(PLUGIN_TARGET_FILES "")
+        foreach (plugin IN LISTS PLUGINS)
+            list(APPEND PLUGIN_TARGET_FILES "$<TARGET_FILE:${plugin}>")
+        endforeach ()
+
        # Grab all dynamically linked dependencies.
-        INSTALL(CODE "set(CMAKE_INSTALL_BINDIR \"${CMAKE_INSTALL_BINDIR}\")")
-        INSTALL(CODE "LIST(APPEND DEP_FOLDERS \${PY_PARENT})")
+        install(CODE "set(CMAKE_INSTALL_BINDIR \"${CMAKE_INSTALL_BINDIR}\")")
+        install(CODE "set(PLUGIN_TARGET_FILES \"${PLUGIN_TARGET_FILES}\")")
        install(CODE [[
        file(GET_RUNTIME_DEPENDENCIES
-            EXECUTABLES $<TARGET_FILE:builtin> $<TARGET_FILE:libimhex> $<TARGET_FILE:main>
+            EXECUTABLES ${PLUGIN_TARGET_FILES} $<TARGET_FILE:libimhex> $<TARGET_FILE:main>
            RESOLVED_DEPENDENCIES_VAR _r_deps
            UNRESOLVED_DEPENDENCIES_VAR _u_deps
            CONFLICTING_DEPENDENCIES_PREFIX _c_deps
--- a/dist/DEBIAN/control.in
+++ b/dist/DEBIAN/control.in
@@ -4,7 +4,7 @@ Section: editors
 Priority: optional
 Architecture: amd64
 License: GNU GPL-2
-Depends: libglfw3 | libglfw3-wayland, libmagic1, libmbedtls14, libfreetype6, libopengl0, libdbus-1-3, xdg-desktop-portal, libarchive
+Depends: libglfw3 | libglfw3-wayland, libmagic1, libmbedtls14, libfreetype6, libopengl0, libdbus-1-3, xdg-desktop-portal, libarchive13
 Maintainer: WerWolv <hey@werwolv.net>
 Description: ImHex Hex Editor
 A Hex Editor for Reverse Engineers, Programmers and
--- a/lib/libimhex/include/hex/plugin.hpp
+++ b/lib/libimhex/include/hex/plugin.hpp
@@ -2,6 +2,7 @@

 #include <hex.hpp>
 #include <hex/api/plugin_manager.hpp>
+#include <hex/helpers/logger.hpp>

 #include <string>

@@ -24,46 +25,51 @@
 #define IMHEX_PLUGIN_SETUP(name, author, description) IMHEX_PLUGIN_SETUP_IMPL(name, author, description)
 #define IMHEX_LIBRARY_SETUP() IMHEX_LIBRARY_SETUP_IMPL()

-#define IMHEX_LIBRARY_SETUP_IMPL()                                                                              \
-    IMHEX_PLUGIN_VISIBILITY_PREFIX void initializeLibrary();                                                    \
-    extern "C" [[gnu::visibility("default")]] void WOLV_TOKEN_CONCAT(forceLinkPlugin_, IMHEX_PLUGIN_NAME)() {   \
-        hex::PluginManager::addPlugin(hex::PluginFunctions {                                                    \
-            nullptr,                                                                                            \
-            initializeLibrary,                                                                                  \
-            nullptr,                                                                                            \
-            nullptr,                                                                                            \
-            nullptr,                                                                                            \
-            nullptr,                                                                                            \
-            nullptr,                                                                                            \
-            nullptr,                                                                                            \
-            nullptr                                                                                             \
-        });                                                                                                     \
-    }                                                                                                           \
+#define IMHEX_LIBRARY_SETUP_IMPL()                                                                                  \
+    IMHEX_PLUGIN_VISIBILITY_PREFIX void initializeLibrary();                                                        \
+    static auto WOLV_TOKEN_CONCAT(libraryInitializer_, IMHEX_PLUGIN_NAME) = [] {                                    \
+        initializeLibrary();                                                                                        \
+        hex::log::info("Library plugin '{}' initialized successfully", WOLV_STRINGIFY(IMHEX_PLUGIN_NAME));          \
+        return 0;                                                                                                   \
+    }();                                                                                                            \
+    extern "C" [[gnu::visibility("default")]] void WOLV_TOKEN_CONCAT(forceLinkPlugin_, IMHEX_PLUGIN_NAME)() {       \
+        hex::PluginManager::addPlugin(hex::PluginFunctions {                                                        \
+            nullptr,                                                                                                \
+            initializeLibrary,                                                                                      \
+            nullptr,                                                                                                \
+            nullptr,                                                                                                \
+            nullptr,                                                                                                \
+            nullptr,                                                                                                \
+            nullptr,                                                                                                \
+            nullptr,                                                                                                \
+            nullptr                                                                                                 \
+        });                                                                                                         \
+    }                                                                                                               \
    IMHEX_PLUGIN_VISIBILITY_PREFIX void initializeLibrary()

-#define IMHEX_PLUGIN_SETUP_IMPL(name, author, description)                                                      \
-    IMHEX_PLUGIN_VISIBILITY_PREFIX const char *getPluginName() { return name; }                                 \
-    IMHEX_PLUGIN_VISIBILITY_PREFIX const char *getPluginAuthor() { return author; }                             \
-    IMHEX_PLUGIN_VISIBILITY_PREFIX const char *getPluginDescription() { return description; }                   \
-    IMHEX_PLUGIN_VISIBILITY_PREFIX const char *getCompatibleVersion() { return IMHEX_VERSION; }                 \
-    IMHEX_PLUGIN_VISIBILITY_PREFIX void setImGuiContext(ImGuiContext *ctx) {                                    \
-        ImGui::SetCurrentContext(ctx);                                                                          \
-        GImGui = ctx;                                                                                           \
-    }                                                                                                           \
-    IMHEX_PLUGIN_VISIBILITY_PREFIX void initializePlugin();                                                     \
-    extern "C" [[gnu::visibility("default")]] void WOLV_TOKEN_CONCAT(forceLinkPlugin_, IMHEX_PLUGIN_NAME)() {   \
-        hex::PluginManager::addPlugin(hex::PluginFunctions {                                                    \
-            initializePlugin,                                                                                   \
-            nullptr,                                                                                            \
-            getPluginName,                                                                                      \
-            getPluginAuthor,                                                                                    \
-            getPluginDescription,                                                                               \
-            getCompatibleVersion,                                                                               \
-            setImGuiContext,                                                                                    \
-            nullptr,                                                                                            \
-            nullptr                                                                                             \
-        });                                                                                                     \
-    }                                                                                                           \
+#define IMHEX_PLUGIN_SETUP_IMPL(name, author, description)                                                          \
+    IMHEX_PLUGIN_VISIBILITY_PREFIX const char *getPluginName() { return name; }                                     \
+    IMHEX_PLUGIN_VISIBILITY_PREFIX const char *getPluginAuthor() { return author; }                                 \
+    IMHEX_PLUGIN_VISIBILITY_PREFIX const char *getPluginDescription() { return description; }                       \
+    IMHEX_PLUGIN_VISIBILITY_PREFIX const char *getCompatibleVersion() { return IMHEX_VERSION; }                     \
+    IMHEX_PLUGIN_VISIBILITY_PREFIX void setImGuiContext(ImGuiContext *ctx) {                                        \
+        ImGui::SetCurrentContext(ctx);                                                                              \
+        GImGui = ctx;                                                                                               \
+    }                                                                                                               \
+    IMHEX_PLUGIN_VISIBILITY_PREFIX void initializePlugin();                                                         \
+    extern "C" [[gnu::visibility("default")]] void WOLV_TOKEN_CONCAT(forceLinkPlugin_, IMHEX_PLUGIN_NAME)() {       \
+        hex::PluginManager::addPlugin(hex::PluginFunctions {                                                        \
+            initializePlugin,                                                                                       \
+            nullptr,                                                                                                \
+            getPluginName,                                                                                          \
+            getPluginAuthor,                                                                                        \
+            getPluginDescription,                                                                                   \
+            getCompatibleVersion,                                                                                   \
+            setImGuiContext,                                                                                        \
+            nullptr,                                                                                                \
+            nullptr                                                                                                 \
+        });                                                                                                         \
+    }                                                                                                               \
    IMHEX_PLUGIN_VISIBILITY_PREFIX void initializePlugin()

 /**
--- a/lib/libimhex/source/api/plugin_manager.cpp
+++ b/lib/libimhex/source/api/plugin_manager.cpp
@@ -17,6 +17,8 @@
 namespace hex {

    Plugin::Plugin(const std::fs::path &path) : m_path(path) {
+        log::info("Loading plugin '{}'", wolv::util::toUTF8String(path.filename()));
+
        #if defined(OS_WINDOWS)
            m_handle = uintptr_t(LoadLibraryW(path.c_str()));

@@ -33,8 +35,6 @@ namespace hex {
            }
        #endif

-        log::info("Loaded plugin '{}'", wolv::util::toUTF8String(path.filename()));
-
        m_functions.initializePluginFunction     = getPluginFunction<PluginFunctions::InitializePluginFunc>("initializePlugin");
        m_functions.initializeLibraryFunction    = getPluginFunction<PluginFunctions::InitializePluginFunc>("initializeLibrary");
        m_functions.getPluginNameFunction        = getPluginFunction<PluginFunctions::GetPluginNameFunc>("getPluginName");
@@ -88,8 +88,6 @@ namespace hex {
        const auto pluginName = wolv::util::toUTF8String(m_path.filename());

        if (this->isLibraryPlugin()) {
-            m_functions.initializeLibraryFunction();
-            log::info("Library plugin '{}' initialized successfully", pluginName);
            return true;
        }

--- a/plugins/builtin/CMakeLists.txt
+++ b/plugins/builtin/CMakeLists.txt
@@ -4,7 +4,7 @@ include(ImHexPlugin)

 find_file(DEFAULT_MAGIC_FILE_PATH magic.mgc HINTS ${MAGIC_INCLUDE_DIRS}/../share/misc)
 if (DEFAULT_MAGIC_FILE_PATH)
-    add_romfs_resource(${DEFAULT_MAGIC_FILE_PATH} auto_extract/magic/magic.mgc)
+    add_romfs_resource(${DEFAULT_MAGIC_FILE_PATH} always_auto_extract/magic/magic.mgc)
 endif ()

 add_imhex_plugin(
--- a/plugins/builtin/source/content/file_extraction.cpp
+++ b/plugins/builtin/source/content/file_extraction.cpp
@@ -6,23 +6,32 @@
 namespace hex::plugin::builtin {

    void extractBundledFiles() {
-        for (const auto &romfsPath : romfs::list("auto_extract")) {
-            for (const auto &imhexPath : fs::getDataPaths()) {
-                const auto path = imhexPath / std::fs::relative(romfsPath, "auto_extract");
-                if (wolv::io::fs::exists(path))
-                    continue;
-
-                wolv::io::File file(path, wolv::io::File::Mode::Create);
-                if (!file.isValid())
-                    continue;
-
-                auto data = romfs::get(romfsPath).span<u8>();
-                file.writeBuffer(data.data(), data.size());
-
-                if (file.getSize() == data.size())
-                    break;
+        constexpr static std::array<std::pair<std::string_view, bool>, 2> Paths = {
+            {
+                { "auto_extract", false },
+                { "always_auto_extract", true }
            }
+        };

+        for (const auto &[extractFolder, alwaysExtract] : Paths) {
+            for (const auto &romfsPath : romfs::list(extractFolder)) {
+                for (const auto &imhexPath : fs::getDataPaths()) {
+                    const auto path = imhexPath / std::fs::relative(romfsPath, extractFolder);
+                    if (!alwaysExtract && wolv::io::fs::exists(path))
+                        continue;
+
+                    wolv::io::File file(path, wolv::io::File::Mode::Create);
+                    if (!file.isValid())
+                        continue;
+
+                    auto data = romfs::get(romfsPath).span<u8>();
+                    file.writeBuffer(data.data(), data.size());
+
+                    if (file.getSize() == data.size())
+                        break;
+                }
+
+            }
        }
    }

--- a/plugins/builtin/source/content/settings_entries.cpp
+++ b/plugins/builtin/source/content/settings_entries.cpp
@@ -374,8 +374,11 @@ namespace hex::plugin::builtin {
        ContentRegistry::Settings::add<Widgets::Checkbox>("hex.builtin.setting.general", "hex.builtin.setting.general.patterns", "hex.builtin.setting.general.auto_load_patterns", true);
        ContentRegistry::Settings::add<Widgets::Checkbox>("hex.builtin.setting.general", "hex.builtin.setting.general.patterns", "hex.builtin.setting.general.sync_pattern_source", false);
        ContentRegistry::Settings::add<Widgets::Checkbox>("hex.builtin.setting.general", "hex.builtin.setting.general.network", "hex.builtin.setting.general.network_interface", false);
-        ContentRegistry::Settings::add<ServerContactWidget>("hex.builtin.setting.general", "hex.builtin.setting.general.network", "hex.builtin.setting.general.server_contact");
-        ContentRegistry::Settings::add<Widgets::Checkbox>("hex.builtin.setting.general", "hex.builtin.setting.general.network", "hex.builtin.setting.general.upload_crash_logs", true);
+
+        #if !defined(OS_WEB)
+            ContentRegistry::Settings::add<ServerContactWidget>("hex.builtin.setting.general", "hex.builtin.setting.general.network", "hex.builtin.setting.general.server_contact");
+            ContentRegistry::Settings::add<Widgets::Checkbox>("hex.builtin.setting.general", "hex.builtin.setting.general.network", "hex.builtin.setting.general.upload_crash_logs", true);
+        #endif

        /* Interface */

--- a/plugins/builtin/source/content/welcome_screen.cpp
+++ b/plugins/builtin/source/content/welcome_screen.cpp
@@ -500,6 +500,16 @@ namespace hex::plugin::builtin {
        });

        EventWindowInitialized::subscribe([] {
+            if (ContentRegistry::Settings::read("hex.builtin.setting.general", "hex.builtin.setting.general.prev_launch_version", "") == "") {
+                ui::PopupQuestion::open("hex.builtin.popup.play_tutorial.desc"_lang,
+                    []{
+                        TutorialManager::startTutorial("hex.builtin.tutorial.introduction");
+                    },
+                    []{ });
+            }
+
+            ContentRegistry::Settings::write("hex.builtin.setting.general", "hex.builtin.setting.general.prev_launch_version", ImHexApi::System::getImHexVersion());
+
            // Documentation of the value above the setting definition
            auto allowServerContact = ContentRegistry::Settings::read("hex.builtin.setting.general", "hex.builtin.setting.general.server_contact", 2);
            if (allowServerContact == 2) {
@@ -510,16 +520,6 @@ namespace hex::plugin::builtin {
                    PopupTelemetryRequest::open();
                #endif
            }
-
-            if (ContentRegistry::Settings::read("hex.builtin.setting.general", "hex.builtin.setting.general.prev_launch_version", "") == "") {
-                ui::PopupQuestion::open("hex.builtin.popup.play_tutorial.desc"_lang,
-                    []{
-                        TutorialManager::startTutorial("hex.builtin.tutorial.introduction");
-                    },
-                    []{ });
-            }
-
-            ContentRegistry::Settings::write("hex.builtin.setting.general", "hex.builtin.setting.general.prev_launch_version", ImHexApi::System::getImHexVersion());
        });

        // Clear project context if we go back to the welcome screen
--- a/plugins/ui/include/ui/hex_editor.hpp
+++ b/plugins/ui/include/ui/hex_editor.hpp
@@ -262,7 +262,7 @@ namespace hex::ui {
            m_tooltipCallback = callback;
        }

-        [[nodiscard]] i64 getScrollPosition() const {
+        [[nodiscard]] i64 getScrollPosition() {
            return m_scrollPosition.get();
        }

--- a/plugins/ui/source/ui/hex_editor.cpp
+++ b/plugins/ui/source/ui/hex_editor.cpp
@@ -311,7 +311,7 @@ namespace hex::ui {
            {
                const auto window = ImGui::GetCurrentWindowRead();
                const auto axis = ImGuiAxis_Y;
-                ImS64 numRows = (m_provider->getSize() / m_bytesPerRow) + ((m_provider->getSize() % m_bytesPerRow) == 0 ? 0 : 1);
+                ImS64 numRows = m_provider == nullptr ? 0 : (m_provider->getSize() / m_bytesPerRow) + ((m_provider->getSize() % m_bytesPerRow) == 0 ? 0 : 1);

                const auto outerRect = window->Rect();
                const auto innerRect = window->InnerRect;
Author	SHA1	Message	Date
WerWolv	9685b39969	fix: Missing reference	2023-12-28 19:25:37 +01:00
WerWolv	03dc26d2d4	build: Always extract magic file database	2023-12-28 19:24:56 +01:00
WerWolv	b64bb3bec9	fix: Crashes when opening diffing view	2023-12-28 19:21:15 +01:00
WerWolv	8d3530a4f3	build: Bumped version to 1.32.1	2023-12-28 18:33:36 +01:00
WerWolv	83b1416797	build: Fixed dependencies of plugins not being bundled correctly	2023-12-28 18:05:49 +01:00
WerWolv	5adeac6bbc	fix: Make sure library plugins are always initialized	2023-12-28 14:59:23 +01:00
WerWolv	f44b44a881	build: Fix wrong dependency name for libarchive on Ubuntu Fixes #1474	2023-12-28 14:48:36 +01:00
WerWolv	1ed978f22e	impr: Remove telemetry checkboxes from settings in the web version They are disabled there and should not be enableable	2023-12-28 13:24:31 +01:00
WerWolv	7ed06ae515	git: Fixed `set -x` wrongfully added to windows CI Closes #1473	2023-12-28 11:48:13 +01:00
@@ -1 +1 @@
 .32.0
 .32.1