Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-01 03:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] dbghelp: Read the Elf_auxv_t struct corresponding to the target's architecture.

Browse source 
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 51ada19ac235df104e95476e9b3fa8204357bb9a by Zebediah Figura <zfigura@codeweavers.com>
This commit is contained in:
winesync 2020-09-11 13:05:43 +02:00 committed by Jérôme Gardou
parent dd5baf8750
commit 4a24f9acfc
3 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
dll/win32/dbghelp/elf_module.c
View file

@ -1522,7 +1522,6 @@ static BOOL elf_search_auxv(const struct process* pcs, unsigned type, unsigned l
void* addr;
void* str;
void* str_max;
Elf_auxv_t auxv;
si->SizeOfStruct = sizeof(*si);
si->MaxNameLen = MAX_SYM_NAME;
@ -1548,14 +1547,33 @@ static BOOL elf_search_auxv(const struct process* pcs, unsigned type, unsigned l
while (addr < str_max && ReadProcessMemory(pcs->handle, addr, &str, sizeof(str), NULL) && str == NULL)
addr = (void*)((DWORD_PTR)addr + sizeof(str));
while (ReadProcessMemory(pcs->handle, addr, &auxv, sizeof(auxv), NULL) && auxv.a_type != AT_NULL)
if (pcs->is_64bit)
{
if (auxv.a_type == type)
Elf64_auxv_t auxv;
while (ReadProcessMemory(pcs->handle, addr, &auxv, sizeof(auxv), NULL) && auxv.a_type != AT_NULL)
{
*val = auxv.a_un.a_val;
return TRUE;
if (auxv.a_type == type)
{
*val = auxv.a_un.a_val;
return TRUE;
}
addr = (void*)((DWORD_PTR)addr + sizeof(auxv));
}
}
else
{
Elf32_auxv_t auxv;
while (ReadProcessMemory(pcs->handle, addr, &auxv, sizeof(auxv), NULL) && auxv.a_type != AT_NULL)
{
if (auxv.a_type == type)
{
*val = auxv.a_un.a_val;
return TRUE;
}
addr = (void*)((DWORD_PTR)addr + sizeof(auxv));
}
addr = (void*)((DWORD_PTR)addr + sizeof(auxv));
}
return FALSE;

2
dll/win32/dbghelp/image_private.h
View file

@ -62,10 +62,8 @@ typedef struct section macho_section;
#ifdef _WIN64
#define Elf_Sym Elf64_Sym
#define Elf_auxv_t Elf64_auxv_t
#else
#define Elf_Sym Elf32_Sym
#define Elf_auxv_t Elf32_auxv_t
#endif
#else
#ifndef SHT_NULL

2
sdk/tools/winesync/dbghelp.cfg
View file

@ -3,4 +3,4 @@ directories:
files:
include/dbghelp.h: sdk/include/psdk/dbghelp.h
tags:
wine: bb53152faab705d972de3763ddd9bb3351e92460
wine: 51ada19ac235df104e95476e9b3fa8204357bb9a