Commit fbda8db3 authored by Martin Storsjo's avatar Martin Storsjo Committed by Alexandre Julliard

kernel32: Add a special case to EnumProcessModules for the local process.

LLVM's libunwind uses EnumProcessModules for locating .eh_frame sections when unwinding dwarf exceptions (used on i686). When running wine in docker (without adding custom additional permissions), EnumProcessModules currently fails as it uses ReadProcessMemory, which requires the SYS_PTRACE capability. The current implementation also is slower than necessary (by a couple orders of magnituide), for accessing the current process. Currently, unwinding 10000 exception throws with libunwind on i686 takes 24 seconds when run in wine, while it runs in less than 0.1 second with this patch. Signed-off-by: 's avatarMartin Storsjo <martin@martin.st> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent fef1d403
......@@ -555,6 +555,40 @@ BOOL WINAPI K32EnumProcessModules(HANDLE process, HMODULE *lphModule,
DWORD size = 0;
INT ret;
if (process == GetCurrentProcess())
{
PPEB_LDR_DATA ldr_data = NtCurrentTeb()->Peb->LdrData;
PLIST_ENTRY head = &ldr_data->InLoadOrderModuleList;
PLIST_ENTRY entry = head->Flink;
if (cb && !lphModule)
{
SetLastError(ERROR_NOACCESS);
return FALSE;
}
while (entry != head)
{
PLDR_MODULE table_entry = (PLDR_MODULE)
((PBYTE)entry - offsetof(LDR_MODULE, InLoadOrderModuleList));
if (cb >= sizeof(HMODULE))
{
*lphModule++ = table_entry->BaseAddress;
cb -= sizeof(HMODULE);
}
size += sizeof(HMODULE);
entry = entry->Flink;
}
if (!needed)
{
SetLastError(ERROR_NOACCESS);
return FALSE;
}
*needed = size;
return TRUE;
}
if (!init_module_iterator(&iter, process))
return FALSE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment