Rooba
/
ImHex
mirror of https://github.com/WerWolv/ImHex.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed includes on unix

This commit is contained in:
WerWolv 2021-01-03 15:09:12 +01:00
parent 5a0f965125
commit e770fcd197
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/providers/file_provider.hpp
View File

@ -1,7 +1,6 @@
#pragma once
#include "providers/provider.hpp"
#include "helpers/utils.hpp"
#include <string_view>
@ -11,6 +10,8 @@
#include <windows.h>
#else
#include <sys/mman.h>
#include <unistd.h>
#include <sys/fcntl.h>
#endif
namespace hex::prv {

13
source/providers/file_provider.cpp
View File

@ -1,13 +1,8 @@
#include "providers/file_provider.hpp"
#undef __STRICT_ANSI__
#include <cstdio>
#include <sys/stat.h>
#include <sys/fcntl.h>
#include <time.h>
#include <cstring>
#include "helpers/utils.hpp"
#include "helpers/project_file_handler.hpp"
namespace hex::prv {
@ -118,7 +113,7 @@ namespace hex::prv {
if ((offset + size) > this->getSize() || buffer == nullptr || size == 0)
return;
memcpy(buffer, reinterpret_cast<u8*>(this->m_mappedFile) + offset, size);
std::memcpy(buffer, reinterpret_cast<u8*>(this->m_mappedFile) + offset, size);
for (u64 i = 0; i < size; i++)
if (this->m_patches.back().contains(offset + i))
@ -139,14 +134,14 @@ namespace hex::prv {
if ((offset + size) > this->getSize() || buffer == nullptr || size == 0)
return;
memcpy(buffer, reinterpret_cast<u8*>(this->m_mappedFile) + offset, size);
std::memcpy(buffer, reinterpret_cast<u8*>(this->m_mappedFile) + offset, size);
}
void FileProvider::writeRaw(u64 offset, const void *buffer, size_t size) {
if (buffer == nullptr || size == 0)
return;
memcpy(reinterpret_cast<u8*>(this->m_mappedFile) + offset, buffer, size);
std::memcpy(reinterpret_cast<u8*>(this->m_mappedFile) + offset, buffer, size);
}
size_t FileProvider::getActualSize() {
return this->m_fileSize;