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

module manager: safer ldr init block setup (#693)

Browse Source
This commit is contained in:
Maurice Heumann
2026-01-07 07:50:23 +01:00
committed by GitHub
parent ff99a1cb56 4e5ba450c1
commit e7abe50f00
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/windows-emulator/module/module_manager.cpp
View File

@@ -285,10 +285,10 @@ void module_manager::load_wow64_modules(const windows_path& executable_path, con
// Set up LdrSystemDllInitBlock structure // Set up LdrSystemDllInitBlock structure
PS_SYSTEM_DLL_INIT_BLOCK init_block = {}; PS_SYSTEM_DLL_INIT_BLOCK init_block = {};
constexpr uint64_t symtem_dll_init_block_fix_size = 0xF0; // Wine or WIN10 constexpr uint64_t system_dll_init_block_size = sizeof(PS_SYSTEM_DLL_INIT_BLOCK);
// Basic structure initialization // Basic structure initialization
init_block.Size = symtem_dll_init_block_fix_size; init_block.Size = system_dll_init_block_size;
// Calculate relocation values // Calculate relocation values
// SystemDllWowRelocation = mapped_base - original_imagebase for 32-bit ntdll // SystemDllWowRelocation = mapped_base - original_imagebase for 32-bit ntdll
@@ -344,8 +344,11 @@ void module_manager::load_wow64_modules(const windows_path& executable_path, con
return; return;
} }
const auto write_size = static_cast<uint32_t>(system_dll_init_block_size);
init_block.Size = write_size;
// Write the initialized structure to the export address // Write the initialized structure to the export address
this->memory_->write_memory(ldr_init_block_addr, &init_block, symtem_dll_init_block_fix_size); this->memory_->write_memory(ldr_init_block_addr, &init_block, write_size);
logger.info("Successfully initialized LdrSystemDllInitBlock at 0x%" PRIx64 "\n", ldr_init_block_addr); logger.info("Successfully initialized LdrSystemDllInitBlock at 0x%" PRIx64 "\n", ldr_init_block_addr);