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

Revert "module manager: safer ldr init block setup" (#695)

Browse Source 
The change from fixed size 0xF0 to sizeof(PS_SYSTEM_DLL_INIT_BLOCK)
(which is 0x128 for V3 struct) causes memory corruption when using
Windows 10 system files.

**Before (working):**
```
constexpr uint64_t symtem_dll_init_block_fix_size = 0xF0; // Wine or WIN10
init_block.Size = symtem_dll_init_block_fix_size;
// ...
this->memory_->write_memory(ldr_init_block_addr, &init_block, symtem_dll_init_block_fix_size);
```

**After (broken):**
```
constexpr uint64_t system_dll_init_block_size = sizeof(PS_SYSTEM_DLL_INIT_BLOCK);  // = 0x128
init_block.Size = system_dll_init_block_size;
// ...
this->memory_->write_memory(ldr_init_block_addr, &init_block, write_size);
```

**Symptom:**
```
Executing syscall: NtQueryVirtualMemory (0x23) at 0x18009d442 via 0x1800d4920 (ntdll.dll)
Interrupt 41
Suspicious: Breakpoint at 0x1800ac7d8 (via 0x1800ac7d5)
Executing syscall: NtQueryVirtualMemory (0x23) at 0x18009d442 via 0x180033579 (ntdll.dll)
Executing syscall: NtQueryVirtualMemory (0x23) at 0x18009d442 via 0x180033579 (ntdll.dll)
Executing syscall: NtQueryVirtualMemory (0x23) at 0x18009d442 via 0x180033579 (ntdll.dll)
Executing syscall: NtQueryVirtualMemory (0x23) at 0x18009d442 via 0x180033579 (ntdll.dll)
Bad address for memory image request: 0x5f0000
Executing syscall: NtRaiseException (0x168) at 0x18009fcd2 via 0x1800a0ee3 (ntdll.dll)
!!! NtRaiseException: Code=0x80000003, Flags=0x0, Address=0x1800ac7d7, NumParams=0, HandleException=0
Emulation terminated without status!
```

**Root cause:** PS_SYSTEM_DLL_INIT_BLOCK has different sizes across
Windows versions. It needs to detect the Windows version from ntdll and
use the appropriate size. I will submit a PR to fix this issue soon.
This commit is contained in:
Maurice Heumann
2026-01-08 11:42:34 +01:00
committed by GitHub
parent 01851ad571 7ba5a7b2e4
commit 9090e29e21
1 changed files with 3 additions and 6 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 system_dll_init_block_size = sizeof(PS_SYSTEM_DLL_INIT_BLOCK); constexpr uint64_t symtem_dll_init_block_fix_size = 0xF0; // Wine or WIN10
// Basic structure initialization // Basic structure initialization
init_block.Size = system_dll_init_block_size; init_block.Size = symtem_dll_init_block_fix_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,11 +344,8 @@ 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, write_size); this->memory_->write_memory(ldr_init_block_addr, &init_block, symtem_dll_init_block_fix_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);