Lightemerald/windows-user-space-emulator
2
0
Fork 0
mirror of https://github.com/momo5502/emulator.git synced 2026-01-28 15:31:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup snapshot generation

Browse Source
This commit is contained in:
momo5502
2025-03-23 12:01:04 +01:00
parent 95dc6994b3
commit 2bc3cda062
14 changed files with 258 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/windows-emulator/apiset/apiset.cpp
View File

@@ -42,7 +42,7 @@ namespace apiset
return static_cast<ULONG>(address - result_base);
}
std::vector<uint8_t> decompress_apiset(const std::vector<uint8_t>& apiset)
std::vector<std::byte> decompress_apiset(const std::vector<std::byte>& apiset)
{
auto buffer = utils::compression::zlib::decompress(apiset);
if (buffer.empty())
@@ -53,7 +53,7 @@ namespace apiset
return buffer;
}
std::vector<uint8_t> obtain_data(const location location, const std::filesystem::path& root)
std::vector<std::byte> obtain_data(const location location, const std::filesystem::path& root)
{
switch (location)
{
@@ -61,7 +61,7 @@ namespace apiset
case location::host: {
const auto apiSetMap =
reinterpret_cast<const API_SET_NAMESPACE*>(NtCurrentTeb64()->ProcessEnvironmentBlock->ApiSetMap);
const auto* dataPtr = reinterpret_cast<const uint8_t*>(apiSetMap);
const auto* dataPtr = reinterpret_cast<const std::byte*>(apiSetMap);
return {dataPtr, dataPtr + apiSetMap->Size};
}
#else
@@ -78,11 +78,13 @@ namespace apiset
return decompress_apiset(apiset);
}
case location::default_windows_10: {
const std::vector<uint8_t> apiset{apiset_w10, apiset_w10 + sizeof(apiset_w10)};
const auto* byte_apiset = reinterpret_cast<const std::byte*>(apiset_w10);
const std::vector<std::byte> apiset{byte_apiset, byte_apiset + sizeof(apiset_w10)};
return decompress_apiset(apiset);
}
case location::default_windows_11: {
const std::vector<uint8_t> apiset{apiset_w11, apiset_w11 + sizeof(apiset_w11)};
const auto* byte_apiset = reinterpret_cast<const std::byte*>(apiset_w11);
const std::vector<std::byte> apiset{byte_apiset, byte_apiset + sizeof(apiset_w11)};
return decompress_apiset(apiset);
}
default:

2
src/windows-emulator/apiset/apiset.hpp
View File

@@ -18,7 +18,7 @@ namespace apiset
struct container
{
std::vector<uint8_t> data{};
std::vector<std::byte> data{};
const API_SET_NAMESPACE& get() const
{

16
src/windows-emulator/module/module_mapping.cpp
View File

@@ -20,16 +20,16 @@ namespace
return nt_headers_offset + (first_section_absolute - absolute_base);
}
std::vector<uint8_t> read_mapped_memory(const memory_manager& memory, const mapped_module& binary)
std::vector<std::byte> read_mapped_memory(const memory_manager& memory, const mapped_module& binary)
{
std::vector<uint8_t> mem{};
std::vector<std::byte> mem{};
mem.resize(binary.size_of_image);
memory.read_memory(binary.image_base, mem.data(), mem.size());
return mem;
}
void collect_exports(mapped_module& binary, const utils::safe_buffer_accessor<const uint8_t> buffer,
void collect_exports(mapped_module& binary, const utils::safe_buffer_accessor<const std::byte> buffer,
const PEOptionalHeader_t<std::uint64_t>& optional_header)
{
const auto& export_directory_entry = optional_header.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT];
@@ -70,7 +70,7 @@ namespace
template <typename T>
requires(std::is_integral_v<T>)
void apply_relocation(const utils::safe_buffer_accessor<uint8_t> buffer, const uint64_t offset,
void apply_relocation(const utils::safe_buffer_accessor<std::byte> buffer, const uint64_t offset,
const uint64_t delta)
{
const auto obj = buffer.as<T>(offset);
@@ -79,7 +79,7 @@ namespace
obj.set(new_value);
}
void apply_relocations(const mapped_module& binary, const utils::safe_buffer_accessor<uint8_t> buffer,
void apply_relocations(const mapped_module& binary, const utils::safe_buffer_accessor<std::byte> buffer,
const PEOptionalHeader_t<std::uint64_t>& optional_header)
{
const auto delta = binary.image_base - optional_header.ImageBase;
@@ -142,7 +142,7 @@ namespace
}
void map_sections(memory_manager& memory, mapped_module& binary,
const utils::safe_buffer_accessor<const uint8_t> buffer,
const utils::safe_buffer_accessor<const std::byte> buffer,
const PENTHeaders_t<std::uint64_t>& nt_headers, const uint64_t nt_headers_offset)
{
const auto first_section_offset = get_first_section_offset(nt_headers, nt_headers_offset);
@@ -196,7 +196,7 @@ namespace
}
}
mapped_module map_module_from_data(memory_manager& memory, const std::span<const uint8_t> data,
mapped_module map_module_from_data(memory_manager& memory, const std::span<const std::byte> data,
std::filesystem::path file)
{
mapped_module binary{};
@@ -241,7 +241,7 @@ mapped_module map_module_from_data(memory_manager& memory, const std::span<const
map_sections(memory, binary, buffer, nt_headers, nt_headers_offset);
auto mapped_memory = read_mapped_memory(memory, binary);
utils::safe_buffer_accessor<uint8_t> mapped_buffer{mapped_memory};
utils::safe_buffer_accessor<std::byte> mapped_buffer{mapped_memory};
apply_relocations(binary, mapped_buffer, optional_header);
collect_exports(binary, mapped_buffer, optional_header);

2
src/windows-emulator/syscalls.cpp
View File

@@ -791,7 +791,7 @@ namespace
}
uint64_t size = section_entry->maximum_size;
std::vector<uint8_t> file_data{};
std::vector<std::byte> file_data{};
if (!section_entry->file_name.empty())
{