Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 12:13:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] dbghelp: Use local dynamic section entry declaration.

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

wine commit id 849cf6ed514aaa5071e61dc471dca6be1d58393f by Jacek Caban <jacek@codeweavers.com>
This commit is contained in:
winesync 2020-09-11 18:57:58 +02:00 • committed by Jérôme Gardou
parent 582c24d09a
commit 44ef7f5ff5
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1106,7 +1106,11 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename,
if (fmap->addr_size == 32) if (fmap->addr_size == 32)
{ {
Elf32_Dyn dyn; struct
{
INT32 d_tag; /* Dynamic entry type */
UINT32 d_val; /* Integer or address value */
} dyn;
do do
{ {
@ -1115,7 +1119,7 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename,
return ret; return ret;
if (dyn.d_tag == DT_DEBUG) if (dyn.d_tag == DT_DEBUG)
{ {
elf_info->dbg_hdr_addr = dyn.d_un.d_ptr; elf_info->dbg_hdr_addr = dyn.d_val;
if (load_offset == 0 && dyn_addr == 0) /* likely the case */ if (load_offset == 0 && dyn_addr == 0) /* likely the case */
/* Assume this module (the Wine loader) has been /* Assume this module (the Wine loader) has been
* loaded at its preferred address */ * loaded at its preferred address */
@ -1128,7 +1132,11 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename,
} }
else else
{ {
Elf64_Dyn dyn; struct
{
INT64 d_tag; /* Dynamic entry type */
UINT64 d_val; /* Integer or address value */
} dyn;
do do
{ {
@ -1137,7 +1145,7 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename,
return ret; return ret;
if (dyn.d_tag == DT_DEBUG) if (dyn.d_tag == DT_DEBUG)
{ {
elf_info->dbg_hdr_addr = dyn.d_un.d_ptr; elf_info->dbg_hdr_addr = dyn.d_val;
if (load_offset == 0 && dyn_addr == 0) /* likely the case */ if (load_offset == 0 && dyn_addr == 0) /* likely the case */
/* Assume this module (the Wine loader) has been /* Assume this module (the Wine loader) has been
* loaded at its preferred address */ * loaded at its preferred address */

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: 186d610442e1db009e40945fc4725c43ea8721ab wine: 849cf6ed514aaa5071e61dc471dca6be1d58393f