Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-02-18 03:09:18 +01:00
Code Releases Wiki Activity

sys: Don't keep files open in File Provider

Browse Source 
Closes #752
This commit is contained in:
WerWolv 2022-09-26 11:49:35 +02:00
parent 86274b8b94
commit ceaf80a186
12 changed files with 62 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/builtin/include/content/providers/file_provider.hpp
View File

@ -41,7 +41,6 @@ namespace hex::plugin::builtin::prv {
void readRaw(u64 offset, void *buffer, size_t size) override;
void writeRaw(u64 offset, const void *buffer, size_t size) override;
[[nodiscard]] size_t getActualSize() const override;
[[nodiscard]] size_t getRealTimeSize();
void save() override;
void saveAs(const std::fs::path &path) override;
@ -67,16 +66,6 @@ namespace hex::plugin::builtin::prv {
std::pair<Region, bool> getRegionValidity(u64 address) const override;
protected:
#if defined(OS_WINDOWS)
HANDLE m_file = INVALID_HANDLE_VALUE;
#else
int m_file = -1;
#endif
std::fs::path m_path;
void *m_mappedFile = nullptr;
size_t m_fileSize = 0;

8
plugins/builtin/source/content/main_menu_items.cpp
View File

@ -38,6 +38,14 @@ namespace hex::plugin::builtin {
ImGui::EndMenu();
}
if (ImGui::MenuItem("hex.builtin.menu.file.reload_file"_lang, "CTRL + R", false, !taskRunning && ImHexApi::Provider::isValid())) {
auto provider = ImHexApi::Provider::get();
provider->close();
if (!provider->open())
ImHexApi::Provider::remove(provider, true);
}
});
/* File open, quit imhex */

76
plugins/builtin/source/content/providers/file_provider.cpp
View File

@ -13,11 +13,7 @@
namespace hex::plugin::builtin::prv {
bool FileProvider::isAvailable() const {
#if defined(OS_WINDOWS)
return this->m_file != INVALID_HANDLE_VALUE && this->m_mappedFile != nullptr;
#else
return this->m_file != -1 && this->m_mappedFile != nullptr;
#endif
return this->m_mappedFile != nullptr;
}
bool FileProvider::isReadable() const {
@ -59,7 +55,7 @@ namespace hex::plugin::builtin::prv {
}
void FileProvider::readRaw(u64 offset, void *buffer, size_t size) {
if ((offset + size) > this->getRealTimeSize() || buffer == nullptr || size == 0)
if ((offset + size) > this->getActualSize() || buffer == nullptr || size == 0)
return;
std::memcpy(buffer, reinterpret_cast<u8 *>(this->m_mappedFile) + offset, size);
@ -151,20 +147,6 @@ namespace hex::plugin::builtin::prv {
Provider::insert(offset, size);
}
size_t FileProvider::getRealTimeSize() {
#if defined(OS_LINUX)
if (struct stat newStats; (this->m_fileStatsValid = fstat(this->m_file, &newStats) == 0)) {
if (static_cast<off_t>(this->m_fileSize) != newStats.st_size ||
std::memcmp(&newStats.st_mtim, &this->m_fileStats.st_mtim, sizeof(newStats.st_mtim))) {
this->m_fileStats = newStats;
this->m_fileSize = this->m_fileStats.st_size;
msync(this->m_mappedFile, this->m_fileStats.st_size, MS_INVALIDATE);
}
}
#endif
return getActualSize();
}
size_t FileProvider::getActualSize() const {
return this->m_fileSize;
}
@ -208,35 +190,30 @@ namespace hex::plugin::builtin::prv {
this->m_fileStatsValid = wstat(path.c_str(), &this->m_fileStats) == 0;
LARGE_INTEGER fileSize = {};
this->m_file = reinterpret_cast<HANDLE>(CreateFileW(path.c_str(), GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr));
auto file = reinterpret_cast<HANDLE>(CreateFileW(path.c_str(), GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr));
GetFileSizeEx(this->m_file, &fileSize);
GetFileSizeEx(file, &fileSize);
this->m_fileSize = fileSize.QuadPart;
CloseHandle(this->m_file);
CloseHandle(file);
this->m_file = reinterpret_cast<HANDLE>(CreateFileW(path.c_str(), GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr));
if (this->m_file == nullptr || this->m_file == INVALID_HANDLE_VALUE) {
this->m_file = reinterpret_cast<HANDLE>(CreateFileW(path.c_str(), GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr));
file = reinterpret_cast<HANDLE>(CreateFileW(path.c_str(), GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr));
if (file == nullptr || file == INVALID_HANDLE_VALUE) {
file = reinterpret_cast<HANDLE>(CreateFileW(path.c_str(), GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr));
this->m_writable = false;
}
auto fileCleanup = SCOPE_GUARD {
CloseHandle(this->m_file);
this->m_readable = false;
this->m_file = nullptr;
};
if (this->m_file == nullptr || this->m_file == INVALID_HANDLE_VALUE) {
if (file == nullptr || file == INVALID_HANDLE_VALUE) {
return false;
}
ON_SCOPE_EXIT { CloseHandle(file); };
if (this->m_fileSize > 0) {
HANDLE mapping = CreateFileMapping(this->m_file, nullptr, PAGE_READWRITE, 0, 0, nullptr);
HANDLE mapping = CreateFileMapping(file, nullptr, PAGE_READWRITE, 0, 0, nullptr);
ON_SCOPE_EXIT { CloseHandle(mapping); };
if (mapping == nullptr || mapping == INVALID_HANDLE_VALUE) {
mapping = CreateFileMapping(this->m_file, nullptr, PAGE_READONLY, 0, 0, nullptr);
mapping = CreateFileMapping(file, nullptr, PAGE_READONLY, 0, 0, nullptr);
if (mapping == nullptr || mapping == INVALID_HANDLE_VALUE)
return false;
@ -258,9 +235,6 @@ namespace hex::plugin::builtin::prv {
} else {
return false;
}
fileCleanup.release();
#else
const auto &path = this->m_path.native();
@ -268,27 +242,25 @@ namespace hex::plugin::builtin::prv {
int mmapprot = PROT_READ | PROT_WRITE;
this->m_file = ::open(path.c_str(), O_RDWR);
if (this->m_file == -1) {
this->m_file = ::open(path.c_str(), O_RDONLY);
auto file = ::open(path.c_str(), O_RDWR);
if (file == -1) {
file = ::open(path.c_str(), O_RDONLY);
this->m_writable = false;
mmapprot &= ~(PROT_WRITE);
}
if (this->m_file == -1) {
if (file == -1) {
this->m_readable = false;
return false;
}
ON_SCOPE_EXIT { close(file); };
this->m_fileSize = this->m_fileStats.st_size;
this->m_mappedFile = ::mmap(nullptr, this->m_fileSize, mmapprot, MAP_SHARED, this->m_file, 0);
if (this->m_mappedFile == MAP_FAILED) {
::close(this->m_file);
this->m_file = -1;
this->m_mappedFile = ::mmap(nullptr, this->m_fileSize, mmapprot, MAP_SHARED, file, 0);
if (this->m_mappedFile == MAP_FAILED)
return false;
}
#endif
@ -300,13 +272,11 @@ namespace hex::plugin::builtin::prv {
if (this->m_mappedFile != nullptr)
::UnmapViewOfFile(this->m_mappedFile);
if (this->m_file != nullptr)
::CloseHandle(this->m_file);
#else
::munmap(this->m_mappedFile, this->m_fileSize);
::close(this->m_file);
if (this->m_mappedFile != nullptr)
::munmap(this->m_mappedFile, this->m_fileSize);
#endif
}

16
plugins/builtin/source/content/shortcuts.cpp
View File

@ -1,6 +1,8 @@
#include <hex/api/keybinding.hpp>
#include <hex/api/event.hpp>
#include <hex/providers/provider.hpp>
namespace hex::plugin::builtin {
void registerShortcuts() {
@ -16,7 +18,19 @@ namespace hex::plugin::builtin {
// Close file
ShortcutManager::addGlobalShortcut(CTRL + Keys::W, [] {
ImHexApi::Provider::remove(ImHexApi::Provider::get());
if (ImHexApi::Provider::isValid())
ImHexApi::Provider::remove(ImHexApi::Provider::get());
});
// Reload file
ShortcutManager::addGlobalShortcut(CTRL + Keys::R, [] {
if (ImHexApi::Provider::isValid()) {
auto provider = ImHexApi::Provider::get();
provider->close();
if (!provider->open())
ImHexApi::Provider::remove(provider, true);
}
});
}

17
plugins/builtin/source/lang/de_DE.cpp
View File

@ -136,14 +136,15 @@ namespace hex::plugin::builtin {
{ "hex.builtin.popup.error.file_dialog.common", "Ein Fehler trat beim öffnen des Dateibrowser auf!" },
{ "hex.builtin.menu.file", "Datei" },
{ "hex.builtin.file.open_file", "Datei öffnen..." },
{ "hex.builtin.file.open_recent", "Kürzlich geöffnete Dateien" },
{ "hex.builtin.file.clear_recent", "Löschen" },
{ "hex.builtin.file.open_other", "Provider öffnen..." },
{ "hex.builtin.file.close", "Schliessen" },
{ "hex.builtin.file.quit", "ImHex Beenden" },
{ "hex.builtin.file.open_project", "Projekt öffnen..." },
{ "hex.builtin.file.save_project", "Projekt speichern..." },
{ "hex.builtin.menu.file.open_file", "Datei öffnen..." },
{ "hex.builtin.menu.file.open_recent", "Kürzlich geöffnete Dateien" },
{ "hex.builtin.menu.file.clear_recent", "Löschen" },
{ "hex.builtin.menu.file.open_other", "Provider öffnen..." },
{ "hex.builtin.menu.file.close", "Schliessen" },
{ "hex.builtin.menu.file.reload_file", "Datei neu laden" },
{ "hex.builtin.menu.file.quit", "ImHex Beenden" },
{ "hex.builtin.menu.file.open_project", "Projekt öffnen..." },
{ "hex.builtin.menu.file.save_project", "Projekt speichern..." },
{ "hex.builtin.menu.file.import", "Importieren..." },
{ "hex.builtin.menu.file.import.base64", "Base64 Datei" },
{ "hex.builtin.menu.file.import.base64.popup.import_error", "Datei ist nicht in einem korrekten Base64 Format!" },

1
plugins/builtin/source/lang/en_US.cpp
View File

@ -143,6 +143,7 @@ namespace hex::plugin::builtin {
{ "hex.builtin.menu.file.clear_recent", "Clear" },
{ "hex.builtin.menu.file.open_other", "Open Other..." },
{ "hex.builtin.menu.file.close", "Close" },
{ "hex.builtin.menu.file.reload_file", "Reload File" },
{ "hex.builtin.menu.file.quit", "Quit ImHex" },
{ "hex.builtin.menu.file.open_project", "Open Project..." },
{ "hex.builtin.menu.file.save_project", "Save Project..." },

1
plugins/builtin/source/lang/it_IT.cpp
View File

@ -142,6 +142,7 @@ namespace hex::plugin::builtin {
{ "hex.builtin.menu.file.clear_recent", "Pulisci" },
{ "hex.builtin.menu.file.open_other", "Apri altro..." },
{ "hex.builtin.menu.file.close", "Chiudi" },
//{ "hex.builtin.menu.file.reload_file", "Reload File" },
{ "hex.builtin.menu.file.quit", "Uscita ImHex" },
{ "hex.builtin.menu.file.open_project", "Apri un Progetto..." },
{ "hex.builtin.menu.file.save_project", "Salva Progetto..." },

1
plugins/builtin/source/lang/ja_JP.cpp
View File

@ -142,6 +142,7 @@ namespace hex::plugin::builtin {
{ "hex.builtin.menu.file.clear_recent", "リストをクリア" },
{ "hex.builtin.menu.file.open_other", "その他の開くオプション…" },
{ "hex.builtin.menu.file.close", "ファイルを閉じる" },
//{ "hex.builtin.menu.file.reload_file", "Reload File" },
{ "hex.builtin.menu.file.quit", "ImHexを終了" },
{ "hex.builtin.menu.file.open_project", "プロジェクトを開く…" },
{ "hex.builtin.menu.file.save_project", "プロジェクトを保存…" },

1
plugins/builtin/source/lang/ko_KR.cpp
View File

@ -142,6 +142,7 @@ namespace hex::plugin::builtin {
{ "hex.builtin.menu.file.clear_recent", "최근 이력 지우기" },
{ "hex.builtin.menu.file.open_other", "다른 공급자 열기..." },
{ "hex.builtin.menu.file.close", "닫기" },
//{ "hex.builtin.menu.file.reload_file", "Reload File" },
{ "hex.builtin.menu.file.quit", "ImHex 종료하기" },
{ "hex.builtin.menu.file.open_project", "프로젝트 열기..." },
{ "hex.builtin.menu.file.save_project", "프로젝트 저장..." },

1
plugins/builtin/source/lang/pt_BR.cpp
View File

@ -142,6 +142,7 @@ namespace hex::plugin::builtin {
{ "hex.builtin.menu.file.clear_recent", "Limpar" },
{ "hex.builtin.menu.file.open_other", "Abrir outro..." },
{ "hex.builtin.menu.file.close", "Fechar" },
//{ "hex.builtin.menu.file.reload_file", "Reload File" },
{ "hex.builtin.menu.file.quit", "Sair do ImHex" },
{ "hex.builtin.menu.file.open_project", "Abrir Projeto..." },
{ "hex.builtin.menu.file.save_project", "Salvar Projeto..." },

1
plugins/builtin/source/lang/zh_CN.cpp
View File

@ -142,6 +142,7 @@ namespace hex::plugin::builtin {
{ "hex.builtin.menu.file.clear_recent", "清除" },
{ "hex.builtin.menu.file.open_other", "打开其他..." },
{ "hex.builtin.menu.file.close", "关闭" },
//{ "hex.builtin.menu.file.reload_file", "Reload File" },
{ "hex.builtin.menu.file.quit", "退出 ImHex" },
{ "hex.builtin.menu.file.open_project", "打开项目..." },
{ "hex.builtin.menu.file.save_project", "保存项目..." },

1
plugins/builtin/source/lang/zh_TW.cpp
View File

@ -142,6 +142,7 @@ namespace hex::plugin::builtin {
{ "hex.builtin.menu.file.clear_recent", "清除" },
{ "hex.builtin.menu.file.open_other", "開啟其他..." },
{ "hex.builtin.menu.file.close", "關閉" },
//{ "hex.builtin.menu.file.reload_file", "Reload File" },
{ "hex.builtin.menu.file.quit", "退出 ImHex" },
{ "hex.builtin.menu.file.open_project", "開啟專案..." },
{ "hex.builtin.menu.file.save_project", "儲存專案..." },