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

[WINESYNC] dbghelp: Use local AT_SYSINFO_EHDR definition.

Browse source 
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 620019fd71fd519470b4d624949a74fba9f350e9 by Jacek Caban <jacek@codeweavers.com>
This commit is contained in:
winesync 2020-09-11 18:54:57 +02:00 committed by Jérôme Gardou
parent 77888f05a4
commit 72a0721cf7
2 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -124,6 +124,8 @@ struct elf_module_info
struct image_file_map file_map; struct image_file_map file_map;
}; };
#define ELF_AT_SYSINFO_EHDR 33
/****************************************************************** /******************************************************************
* elf_map_section * elf_map_section
* *
@ -1269,7 +1271,6 @@ static BOOL elf_load_file_cb(void *param, HANDLE handle, const WCHAR *filename)
return elf_load_file(load_file->process, filename, load_file->load_offset, load_file->dyn_addr, load_file->elf_info); return elf_load_file(load_file->process, filename, load_file->load_offset, load_file->dyn_addr, load_file->elf_info);
} }
#ifdef AT_SYSINFO_EHDR
/****************************************************************** /******************************************************************
* elf_search_auxv * elf_search_auxv
* *
@ -1279,9 +1280,9 @@ static BOOL elf_search_auxv(const struct process* pcs, unsigned type, ULONG_PTR*
{ {
char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME]; char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME];
SYMBOL_INFO*si = (SYMBOL_INFO*)buffer; SYMBOL_INFO*si = (SYMBOL_INFO*)buffer;
void* addr; BYTE* addr;
void* str; BYTE* str;
void* str_max; BYTE* str_max;
si->SizeOfStruct = sizeof(*si); si->SizeOfStruct = sizeof(*si);
si->MaxNameLen = MAX_SYM_NAME; si->MaxNameLen = MAX_SYM_NAME;
@ -1309,36 +1310,43 @@ static BOOL elf_search_auxv(const struct process* pcs, unsigned type, ULONG_PTR*
if (pcs->is_64bit) if (pcs->is_64bit)
{ {
Elf64_auxv_t auxv; struct
{
UINT64 a_type;
UINT64 a_val;
} auxv;
while (ReadProcessMemory(pcs->handle, addr, &auxv, sizeof(auxv), NULL) && auxv.a_type) while (ReadProcessMemory(pcs->handle, addr, &auxv, sizeof(auxv), NULL) && auxv.a_type)
{ {
if (auxv.a_type == type) if (auxv.a_type == type)
{ {
*val = auxv.a_un.a_val; *val = auxv.a_val;
return TRUE; return TRUE;
} }
addr = (void*)((DWORD_PTR)addr + sizeof(auxv)); addr += sizeof(auxv);
} }
} }
else else
{ {
Elf32_auxv_t auxv; struct
{
UINT32 a_type;
UINT32 a_val;
} auxv;
while (ReadProcessMemory(pcs->handle, addr, &auxv, sizeof(auxv), NULL) && auxv.a_type) while (ReadProcessMemory(pcs->handle, addr, &auxv, sizeof(auxv), NULL) && auxv.a_type)
{ {
if (auxv.a_type == type) if (auxv.a_type == type)
{ {
*val = auxv.a_un.a_val; *val = auxv.a_val;
return TRUE; return TRUE;
} }
addr = (void*)((DWORD_PTR)addr + sizeof(auxv)); addr += sizeof(auxv);
} }
} }
return FALSE; return FALSE;
} }
#endif
/****************************************************************** /******************************************************************
* elf_search_and_load_file * elf_search_and_load_file
@ -1463,18 +1471,16 @@ static BOOL elf_enum_modules_internal(const struct process* pcs,
} }
} }
#ifdef AT_SYSINFO_EHDR
if (!lm_addr) if (!lm_addr)
{ {
ULONG_PTR ehdr_addr; ULONG_PTR ehdr_addr;
if (elf_search_auxv(pcs, AT_SYSINFO_EHDR, &ehdr_addr)) if (elf_search_auxv(pcs, ELF_AT_SYSINFO_EHDR, &ehdr_addr))
{ {
static const WCHAR vdsoW[] = {'[','v','d','s','o',']','.','s','o',0}; static const WCHAR vdsoW[] = {'[','v','d','s','o',']','.','s','o',0};
cb(vdsoW, ehdr_addr, 0, TRUE, user); cb(vdsoW, ehdr_addr, 0, TRUE, user);
} }
} }
#endif
return TRUE; return TRUE;
} }

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

@ -4,4 +4,4 @@ files:
include/dbghelp.h: sdk/include/psdk/dbghelp.h include/dbghelp.h: sdk/include/psdk/dbghelp.h
include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h
tags: tags:
wine: ee34cf365d34b23669c2ead03b040f09b7fb1e2b wine: 620019fd71fd519470b4d624949a74fba9f350e9