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 ELF program segment header declaration.

Browse source 
Based on glibc.

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

wine commit id 186d610442e1db009e40945fc4725c43ea8721ab 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 2a7f64af1f
commit 582c24d09a
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -470,7 +470,17 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map*
{
if (fmap->addr_size == 32)
{
Elf32_Phdr phdr;
struct
{
UINT32 p_type; /* Segment type */
UINT32 p_offset; /* Segment file offset */
UINT32 p_vaddr; /* Segment virtual address */
UINT32 p_paddr; /* Segment physical address */
UINT32 p_filesz; /* Segment size in file */
UINT32 p_memsz; /* Segment size in memory */
UINT32 p_flags; /* Segment flags */
UINT32 p_align; /* Segment alignment */
} phdr;
if (elf_map_file_read(fmap, emfd, &phdr, sizeof(phdr),
fmap->u.elf.elfhdr.e_phoff + i * sizeof(phdr)) &&
@ -483,7 +493,17 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map*
}
else
{
Elf64_Phdr phdr;
struct
{
UINT32 p_type; /* Segment type */
UINT32 p_flags; /* Segment flags */
UINT64 p_offset; /* Segment file offset */
UINT64 p_vaddr; /* Segment virtual address */
UINT64 p_paddr; /* Segment physical address */
UINT64 p_filesz; /* Segment size in file */
UINT64 p_memsz; /* Segment size in memory */
UINT64 p_align; /* Segment alignment */
} phdr;
if (elf_map_file_read(fmap, emfd, &phdr, sizeof(phdr),
fmap->u.elf.elfhdr.e_phoff + i * sizeof(phdr)) &&

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

@ -4,4 +4,4 @@ files:
include/dbghelp.h: sdk/include/psdk/dbghelp.h
include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h
tags:
wine: a6f0fe8d1ca16243771784ec34c49453c96e6479
wine: 186d610442e1db009e40945fc4725c43ea8721ab