dbghelp: Support 64-bit dyld_all_image_infos structures, too.

This commit is contained in:
Charles Davis 2015-02-05 13:28:59 -07:00 committed by Alexandre Julliard
parent 97bda9a05f
commit b3232e7c9d
1 changed files with 4 additions and 2 deletions

View File

@ -981,10 +981,10 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename,
&pbi, sizeof(pbi), NULL);
if (status == STATUS_SUCCESS)
{
ULONG dyld_image_info;
ULONG_PTR dyld_image_info;
/* Read dyld image info address from PEB */
if (ReadProcessMemory(pcs->handle, &pbi.PebBaseAddress->Reserved,
if (ReadProcessMemory(pcs->handle, &pbi.PebBaseAddress->Reserved[0],
&dyld_image_info, sizeof(dyld_image_info), NULL))
{
TRACE("got dyld_image_info 0x%08x from PEB %p MacDyldImageInfo %p\n",
@ -994,6 +994,7 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename,
}
}
#ifndef __LP64__ /* No reading the symtab with nlist(3) in LP64 */
if (!ret)
{
static void* dyld_all_image_infos_addr;
@ -1017,6 +1018,7 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename,
ret = TRUE;
}
}
#endif
}
if (macho_info->flags & MACHO_INFO_MODULE)