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

impr: Make long running tasks not freeze ImHex, fix saving non-continuous providers

Browse Source 
Fixes #1454
This commit is contained in:
WerWolv
2023-12-05 14:32:28 +01:00
parent 13145bba03
commit 760b8c7a88
6 changed files with 59 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/libimhex/source/providers/provider.cpp
View File

@@ -9,11 +9,14 @@
#include <hex/helpers/magic.hpp>
#include <wolv/io/file.hpp>
#include <wolv/literals.hpp>
#include <nlohmann/json.hpp>
namespace hex::prv {
using namespace wolv::literals;
namespace {
u32 s_idCounter = 0;
@@ -53,21 +56,13 @@ namespace hex::prv {
wolv::io::File file(path, wolv::io::File::Mode::Create);
if (file.isValid()) {
std::vector<u8> buffer(std::min<size_t>(0xFF'FFFF, this->getActualSize()), 0x00);
std::vector<u8> buffer(std::min<size_t>(2_MiB, this->getActualSize()), 0x00);
size_t bufferSize = 0;
for (u64 offset = 0; offset < this->getActualSize(); offset += bufferSize) {
bufferSize = buffer.size();
bufferSize = std::min<size_t>(buffer.size(), this->getActualSize() - offset);
auto [region, valid] = this->getRegionValidity(offset + this->getBaseAddress());
if (!valid)
offset = region.getEndAddress() + 1;
auto [newRegion, newValid] = this->getRegionValidity(offset + this->getBaseAddress());
bufferSize = std::min<size_t>(bufferSize, (newRegion.getEndAddress() - offset) + 1);
bufferSize = std::min<size_t>(bufferSize, this->getActualSize() - offset);
this->read(offset + this->getBaseAddress(), buffer.data(), bufferSize, true);
this->read(this->getBaseAddress() + offset, buffer.data(), bufferSize, true);
file.writeBuffer(buffer.data(), bufferSize);
}