imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-04-01 21:17:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make sure important data is synchronized between ImHex and plugins

Browse Source
This commit is contained in:
WerWolv
2021-01-04 00:19:56 +01:00
parent c7c654d310
commit eed7ef1ac3
24 changed files with 148 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/helpers/loader_script_handler.cpp
View File

@@ -81,7 +81,7 @@ namespace hex {
return nullptr;
}
hex::ScopeExit instanceCleanup([&]{ Py_DECREF(instance); });
SCOPE_EXIT( Py_DECREF(instance); );
if (instance->ob_type->tp_base == nullptr || instance->ob_type->tp_base->tp_name != "ImHexType"s) {
PyErr_SetString(PyExc_TypeError, "class type must extend from ImHexType");
@@ -106,7 +106,7 @@ namespace hex {
return nullptr;
}
hex::ScopeExit listCleanup([&]{ Py_DECREF(list); });
SCOPE_EXIT( Py_DECREF(list); );
std::string code = keyword + " " + instance->ob_type->tp_name + " {\n";

8
source/helpers/plugin_handler.cpp
View File

@@ -9,8 +9,8 @@ namespace hex {
constexpr auto CreateViewSymbol = "_ZN3hex6plugin10createViewEv";
// hex::plugin::drawToolsEntry(void)
constexpr auto DrawToolsEntrySymbol = "_ZN3hex6plugin14drawToolsEntryEv";
// hex::plugin::internal::initializePlugin(ImGuiContext*, hex::prv::Provider**)
constexpr auto InitializePluginSymbol = "_ZN3hex6plugin8internal16initializePluginEP12ImGuiContextPPNS_3prv8ProviderE";
// hex::plugin::internal::initializePlugin(SharedData&)
constexpr auto InitializePluginSymbol = "_ZN3hex6plugin8internal16initializePluginER10SharedData";
Plugin::Plugin(std::string_view path) {
this->m_handle = dlopen(path.data(), RTLD_LAZY);
@@ -28,9 +28,9 @@ namespace hex {
dlclose(this->m_handle);
}
void Plugin::initializePlugin(ImGuiContext *ctx, prv::Provider **provider) const {
void Plugin::initializePlugin(SharedData &sharedData) const {
if (this->m_initializePluginFunction != nullptr)
this->m_initializePluginFunction(ctx, provider);
this->m_initializePluginFunction(sharedData);
}
View* Plugin::createView() const {

2
source/main.cpp
View File

@@ -31,8 +31,6 @@ int main(int argc, char **argv) {
// Shared Data
std::vector<hex::lang::PatternData*> patternData;
hex::prv::Provider *dataProvider = nullptr;
hex::prv::Provider::setProviderStorage(dataProvider);
// Create views
window.addView<hex::ViewHexEditor>(patternData);

2
source/views/view_bookmarks.cpp
View File

@@ -55,7 +55,7 @@ namespace hex {
{
u8 bytes[10] = { 0 };
prv::Provider::getCurrentProvider()->read(region.address, bytes, std::min(region.size, size_t(10)));
(*SharedData::get().currentProvider)->read(region.address, bytes, std::min(region.size, size_t(10)));
std::string bytesString;
for (u8 i = 0; i < std::min(region.size, size_t(10)); i++) {

4
source/views/view_command_palette.cpp
View File

@@ -19,8 +19,8 @@ namespace hex {
void ViewCommandPalette::drawContent() {
auto windowPos = View::getWindowPosition();
auto windowSize = View::getWindowSize();
auto windowPos = *SharedData::get().windowPos;
auto windowSize = *SharedData::get().windowSize;
auto paletteSize = this->getMinSize();
ImGui::SetNextWindowPos(ImVec2(windowPos.x + (windowSize.x - paletteSize.x) / 2.0F, windowPos.y), ImGuiCond_Always);
if (ImGui::BeginPopup("Command Palette")) {

4
source/views/view_data_inspector.cpp
View File

@@ -13,7 +13,7 @@ namespace hex {
View::subscribeEvent(Events::RegionSelected, [this](const void* userData){
Region region = *static_cast<const Region*>(userData);
auto provider = prv::Provider::getCurrentProvider();
auto provider = *SharedData::get().currentProvider;
if (provider == nullptr) {
this->m_validBytes = 0;
@@ -137,7 +137,7 @@ namespace hex {
if (ImGui::Begin("Data Inspector", &this->getWindowOpenState(), ImGuiWindowFlags_NoCollapse)) {
auto provider = prv::Provider::getCurrentProvider();
auto provider = *SharedData::get().currentProvider;
if (provider != nullptr && provider->isReadable()) {
if (ImGui::BeginTable("##datainspector", 2,

4
source/views/view_disassembler.cpp
View File

@@ -51,7 +51,7 @@ namespace hex {
if (cs_open(Disassembler::toCapstoneArchictecture(this->m_architecture), mode, &capstoneHandle) == CS_ERR_OK) {
auto provider = prv::Provider::getCurrentProvider();
auto provider = *SharedData::get().currentProvider;
std::vector<u8> buffer(2048, 0x00);
for (u64 address = 0; address < (this->m_codeRegion[1] - this->m_codeRegion[0] + 1); address += 2048) {
size_t bufferSize = std::min(u64(2048), (this->m_codeRegion[1] - this->m_codeRegion[0] + 1) - address);
@@ -95,7 +95,7 @@ namespace hex {
if (ImGui::Begin("Disassembler", &this->getWindowOpenState(), ImGuiWindowFlags_NoCollapse)) {
auto provider = prv::Provider::getCurrentProvider();
auto provider = *SharedData::get().currentProvider;
if (provider != nullptr && provider->isReadable()) {
ImGui::TextUnformatted("Position");
ImGui::Separator();

2
source/views/view_hashes.cpp
View File

@@ -41,7 +41,7 @@ namespace hex {
if (ImGui::Begin("Hashing", &this->getWindowOpenState(), ImGuiWindowFlags_NoCollapse)) {
ImGui::BeginChild("##scrolling", ImVec2(0, 0), false, ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoNav);
auto provider = prv::Provider::getCurrentProvider();
auto provider = *SharedData::get().currentProvider;
if (provider != nullptr && provider->isAvailable()) {
ImGui::TextUnformatted("Region");

30
source/views/view_hexeditor.cpp
View File

@@ -19,7 +19,7 @@ namespace hex {
: View("Hex Editor"), m_patternData(patternData) {
this->m_memoryEditor.ReadFn = [](const ImU8 *data, size_t off) -> ImU8 {
auto provider = prv::Provider::getCurrentProvider();
auto provider = *SharedData::get().currentProvider;
if (!provider->isAvailable() || !provider->isReadable())
return 0x00;
@@ -30,7 +30,7 @@ namespace hex {
};
this->m_memoryEditor.WriteFn = [](ImU8 *data, size_t off, ImU8 d) -> void {
auto provider = prv::Provider::getCurrentProvider();
auto provider = *SharedData::get().currentProvider;
if (!provider->isAvailable() || !provider->isWritable())
return;
@@ -71,7 +71,7 @@ namespace hex {
View::subscribeEvent(Events::SelectionChangeRequest, [this](const void *userData) {
const Region &region = *reinterpret_cast<const Region*>(userData);
auto provider = prv::Provider::getCurrentProvider();
auto provider = *SharedData::get().currentProvider;
auto page = provider->getPageOfAddress(region.address);
if (!page.has_value())
return;
@@ -110,7 +110,7 @@ namespace hex {
}
void ViewHexEditor::drawContent() {
auto provider = prv::Provider::getCurrentProvider();
auto provider = *SharedData::get().currentProvider;
size_t dataSize = (provider == nullptr || !provider->isReadable()) ? 0x00 : provider->getSize();
@@ -277,7 +277,7 @@ namespace hex {
}
void ViewHexEditor::drawMenu() {
auto provider = prv::Provider::getCurrentProvider();
auto provider = *SharedData::get().currentProvider;
if (ImGui::BeginMenu("File")) {
if (ImGui::MenuItem("Open File...", "CTRL + O")) {
@@ -432,7 +432,7 @@ namespace hex {
bool ViewHexEditor::handleShortcut(int key, int mods) {
if (mods == GLFW_MOD_CONTROL && key == GLFW_KEY_S) {
auto provider = prv::Provider::getCurrentProvider();
auto provider = *SharedData::get().currentProvider;
for (const auto &[address, value] : provider->getPatches())
provider->writeRaw(address, &value, sizeof(u8));
return true;
@@ -461,7 +461,7 @@ namespace hex {
void ViewHexEditor::openFile(std::string path) {
auto& provider = prv::Provider::getCurrentProvider();
auto& provider = *SharedData::get().currentProvider;
if (provider != nullptr)
delete provider;
@@ -509,7 +509,7 @@ namespace hex {
}
void ViewHexEditor::copyBytes() {
auto provider = prv::Provider::getCurrentProvider();
auto provider = *SharedData::get().currentProvider;
size_t start = std::min(this->m_memoryEditor.DataPreviewAddr, this->m_memoryEditor.DataPreviewAddrEnd);
size_t end = std::max(this->m_memoryEditor.DataPreviewAddr, this->m_memoryEditor.DataPreviewAddrEnd);
@@ -528,7 +528,7 @@ namespace hex {
}
void ViewHexEditor::copyString() {
auto provider = prv::Provider::getCurrentProvider();
auto provider = *SharedData::get().currentProvider;
size_t start = std::min(this->m_memoryEditor.DataPreviewAddr, this->m_memoryEditor.DataPreviewAddrEnd);
size_t end = std::max(this->m_memoryEditor.DataPreviewAddr, this->m_memoryEditor.DataPreviewAddrEnd);
@@ -543,7 +543,7 @@ namespace hex {
}
void ViewHexEditor::copyLanguageArray(Language language) {
auto provider = prv::Provider::getCurrentProvider();
auto provider = *SharedData::get().currentProvider;
size_t start = std::min(this->m_memoryEditor.DataPreviewAddr, this->m_memoryEditor.DataPreviewAddrEnd);
size_t end = std::max(this->m_memoryEditor.DataPreviewAddr, this->m_memoryEditor.DataPreviewAddrEnd);
@@ -645,7 +645,7 @@ namespace hex {
}
void ViewHexEditor::copyHexView() {
auto provider = prv::Provider::getCurrentProvider();
auto provider = *SharedData::get().currentProvider;
size_t start = std::min(this->m_memoryEditor.DataPreviewAddr, this->m_memoryEditor.DataPreviewAddrEnd);
size_t end = std::max(this->m_memoryEditor.DataPreviewAddr, this->m_memoryEditor.DataPreviewAddrEnd);
@@ -692,7 +692,7 @@ namespace hex {
}
void ViewHexEditor::copyHexViewHTML() {
auto provider = prv::Provider::getCurrentProvider();
auto provider = *SharedData::get().currentProvider;
size_t start = std::min(this->m_memoryEditor.DataPreviewAddr, this->m_memoryEditor.DataPreviewAddrEnd);
size_t end = std::max(this->m_memoryEditor.DataPreviewAddr, this->m_memoryEditor.DataPreviewAddrEnd);
@@ -825,7 +825,7 @@ R"(
void ViewHexEditor::drawSearchPopup() {
static auto InputCallback = [](ImGuiInputTextCallbackData* data) -> int {
auto _this = static_cast<ViewHexEditor*>(data->UserData);
auto provider = prv::Provider::getCurrentProvider();
auto provider = *SharedData::get().currentProvider;
*_this->m_lastSearchBuffer = _this->m_searchFunction(provider, data->Buf);
_this->m_lastSearchIndex = 0;
@@ -837,7 +837,7 @@ R"(
};
static auto Find = [this](char *buffer) {
auto provider = prv::Provider::getCurrentProvider();
auto provider = *SharedData::get().currentProvider;
*this->m_lastSearchBuffer = this->m_searchFunction(provider, buffer);
this->m_lastSearchIndex = 0;
@@ -915,7 +915,7 @@ R"(
}
void ViewHexEditor::drawGotoPopup() {
auto provider = prv::Provider::getCurrentProvider();
auto provider = *SharedData::get().currentProvider;
if (ImGui::BeginPopup("Goto")) {
ImGui::TextUnformatted("Goto");

4
source/views/view_information.cpp
View File

@@ -49,7 +49,7 @@ namespace hex {
if (ImGui::Begin("Data Information", &this->getWindowOpenState(), ImGuiWindowFlags_NoCollapse)) {
ImGui::BeginChild("##scrolling", ImVec2(0, 0), false, ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoNav);
auto provider = prv::Provider::getCurrentProvider();
auto provider = *SharedData::get().currentProvider;
if (provider != nullptr && provider->isReadable()) {
if (this->m_shouldInvalidate) {
@@ -135,7 +135,7 @@ namespace hex {
if (this->m_dataValid) {
for (auto &[name, value] : prv::Provider::getCurrentProvider()->getDataInformation()) {
for (auto &[name, value] : (*SharedData::get().currentProvider)->getDataInformation()) {
ImGui::LabelText(name.c_str(), "%s", value.c_str());
}

6
source/views/view_patches.cpp
View File

@@ -13,13 +13,13 @@ namespace hex {
ViewPatches::ViewPatches() : View("Patches") {
View::subscribeEvent(Events::ProjectFileStore, [this](const void*) {
auto provider = prv::Provider::getCurrentProvider();
auto provider = *SharedData::get().currentProvider;
if (provider != nullptr)
ProjectFile::setPatches(provider->getPatches());
});
View::subscribeEvent(Events::ProjectFileLoad, [this](const void*) {
auto provider = prv::Provider::getCurrentProvider();
auto provider = *SharedData::get().currentProvider;
if (provider != nullptr)
provider->getPatches() = ProjectFile::getPatches();
});
@@ -32,7 +32,7 @@ namespace hex {
void ViewPatches::drawContent() {
if (ImGui::Begin("Patches", &this->getWindowOpenState(), ImGuiWindowFlags_NoCollapse)) {
auto provider = prv::Provider::getCurrentProvider();
auto provider = *SharedData::get().currentProvider;
if (provider != nullptr && provider->isReadable()) {

6
source/views/view_pattern.cpp
View File

@@ -109,7 +109,7 @@ namespace hex {
if (error)
return;
auto provider = prv::Provider::getCurrentProvider();
auto provider = *SharedData::get().currentProvider;
if (provider == nullptr)
return;
@@ -182,7 +182,7 @@ namespace hex {
void ViewPattern::drawContent() {
if (ImGui::Begin("Pattern", &this->getWindowOpenState(), ImGuiWindowFlags_None | ImGuiWindowFlags_NoCollapse)) {
auto provider = prv::Provider::getCurrentProvider();
auto provider = *SharedData::get().currentProvider;
if (provider != nullptr && provider->isAvailable()) {
this->m_textEditor.Render("Pattern");
@@ -303,7 +303,7 @@ namespace hex {
return;
}
auto provider = prv::Provider::getCurrentProvider();
auto provider = *SharedData::get().currentProvider;
hex::lang::Evaluator evaluator(provider, defaultDataEndianess);
auto patternData = evaluator.evaluate(ast.value());
if (!patternData.has_value()) {

2
source/views/view_pattern_data.cpp
View File

@@ -50,7 +50,7 @@ namespace hex {
void ViewPatternData::drawContent() {
if (ImGui::Begin("Pattern Data", &this->getWindowOpenState(), ImGuiWindowFlags_NoCollapse)) {
auto provider = prv::Provider::getCurrentProvider();
auto provider = *SharedData::get().currentProvider;
if (provider != nullptr && provider->isReadable()) {
if (beginPatternDataTable(provider, this->m_patternData, this->m_sortedPatternData)) {

2
source/views/view_strings.cpp
View File

@@ -47,7 +47,7 @@ namespace hex {
void ViewStrings::drawContent() {
auto provider = prv::Provider::getCurrentProvider();
auto provider = *SharedData::get().currentProvider;
if (this->m_shouldInvalidate) {
this->m_shouldInvalidate = false;

4
source/views/view_tools.cpp
View File

@@ -42,7 +42,7 @@ namespace hex {
this->m_mathEvaluator.setFunction("read", [this](auto args) -> std::optional<long double> {
u8 value = 0;
auto provider = prv::Provider::getCurrentProvider();
auto provider = *SharedData::get().currentProvider;
if (provider == nullptr || !provider->isReadable() || args[0] >= provider->getActualSize())
return { };
@@ -52,7 +52,7 @@ namespace hex {
}, 1, 1);
this->m_mathEvaluator.setFunction("write", [this](auto args) -> std::optional<long double> {
auto provider = prv::Provider::getCurrentProvider();
auto provider = *SharedData::get().currentProvider;
if (provider == nullptr || !provider->isWritable() || args[0] >= provider->getActualSize())
return { };

12
source/window.cpp
View File

@@ -48,6 +48,8 @@ namespace hex {
}
Window::Window() {
SharedData::get().initializeData();
this->initGLFW();
this->initImGui();
this->initPlugins();
@@ -282,21 +284,21 @@ namespace hex {
{
int x = 0, y = 0;
glfwGetWindowPos(this->m_window, &x, &y);
View::setWindowPosition(x, y);
*SharedData::get().windowPos = ImVec2(x, y);
}
{
int width = 0, height = 0;
glfwGetWindowSize(this->m_window, &width, &height);
View::setWindowSize(width, height);
*SharedData::get().windowSize = ImVec2(width, height);
}
glfwSetWindowPosCallback(this->m_window, [](GLFWwindow *window, int x, int y) {
View::setWindowPosition(x, y);
*SharedData::get().windowPos = ImVec2(x, y);
});
glfwSetWindowSizeCallback(this->m_window, [](GLFWwindow *window, int width, int height) {
View::setWindowSize(width, height);
*SharedData::get().windowSize = ImVec2(width, height);
});
glfwSetKeyCallback(this->m_window, [](GLFWwindow *window, int key, int scancode, int action, int mods) {
@@ -377,7 +379,7 @@ namespace hex {
PluginHandler::load((std::filesystem::path(mainArgv[0]).parent_path() / "plugins").string());
for (const auto &plugin : PluginHandler::getPlugins()) {
plugin.initializePlugin(ImGui::GetCurrentContext(), &prv::Provider::getCurrentProvider());
plugin.initializePlugin(SharedData::get());
if (auto view = plugin.createView(); view != nullptr)
this->m_pluginViews.push_back(view);
}