ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dbghelp: Use local ELF program segment header declaration. 

Based on glibc.

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2020-03-31 18:22:00 +02:00 committed by Alexandre Julliard
parent a6f0fe8d1c
commit 186d610442
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/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) 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), if (elf_map_file_read(fmap, emfd, &phdr, sizeof(phdr),
fmap->u.elf.elfhdr.e_phoff + i * 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 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), if (elf_map_file_read(fmap, emfd, &phdr, sizeof(phdr),
fmap->u.elf.elfhdr.e_phoff + i * sizeof(phdr)) && fmap->u.elf.elfhdr.e_phoff + i * sizeof(phdr)) &&