Jacek Caban : dbghelp: Use local ELF program segment header declaration.
Alexandre Julliard
julliard at winehq.org
Tue Mar 31 16:44:25 CDT 2020
Module: wine
Branch: master
Commit: 186d610442e1db009e40945fc4725c43ea8721ab
URL: https://source.winehq.org/git/wine.git/?a=commit;h=186d610442e1db009e40945fc4725c43ea8721ab
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue Mar 31 18:22:00 2020 +0200
dbghelp: Use local ELF program segment header declaration.
Based on glibc.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dbghelp/elf_module.c | 24 ++++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c
index 3a9af1d15d..01ba4528e0 100644
--- a/dlls/dbghelp/elf_module.c
+++ b/dlls/dbghelp/elf_module.c
@@ -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)) &&
More information about the wine-cvs
mailing list