Lightemerald/windows-user-space-emulator
2
0
Fork 0
mirror of https://github.com/momo5502/emulator.git synced 2026-01-19 11:43:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix deserialization of optional WOW64 emulator_object members (#633)

Browse Source 
Adds default constructor to `emulator_object` for optional member
deserialization.
Restores `memory_interface` pointer for WOW64 structures after
deserialization.
This commit is contained in:
Maurice Heumann
2025-12-06 08:24:38 +01:00
committed by GitHub
parent 68b0b51bc8 5171ef63dc
commit 28f3fa0aa0
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/windows-emulator/emulator_utils.hpp
View File

@@ -66,6 +66,8 @@ class emulator_object
public:
using value_type = T;
emulator_object() = default;
emulator_object(const x64_emulator_wrapper& wrapper, const uint64_t address = 0)
: emulator_object(wrapper.get(), address)
{
@@ -158,6 +160,11 @@ class emulator_object
this->address_ = address;
}
void set_memory_interface(memory_interface& memory)
{
this->memory_ = &memory;
}
emulator_object<T> shift(const int64_t offset) const
{
return emulator_object<T>(*this->memory_, this->address_ + offset);

9
src/windows-emulator/process_context.cpp
View File

@@ -481,6 +481,15 @@ void process_context::deserialize(utils::buffer_deserializer& buffer)
buffer.read_optional(this->process_params32);
buffer.read(this->kusd);
if (this->peb32.has_value())
{
this->peb32->set_memory_interface(*this->peb64.get_memory_interface());
}
if (this->process_params32.has_value())
{
this->process_params32->set_memory_interface(*this->peb64.get_memory_interface());
}
buffer.read(this->is_wow64_process);
buffer.read(this->ntdll_image_base);
buffer.read(this->ldr_initialize_thunk);