March 2020 - Wine-commits - list.winehq.org

Jacek Caban : dbghelp: Use local declarations of r_debug and link_map structs.
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: 11ea231501f4f2a54433031ada21052d81641fee URL: https://source.winehq.org/git/wine.git/?a=commit;h=11ea231501f4f2a54433031a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 31 18:21:23 2020 +0200 dbghelp: Use local declarations of r_debug and link_map structs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 94 +++++++++++++++++++---------------------------- 1 file changed, 38 insertions(+), 56 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 6bdbcdeb3e..cca07ead31 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -47,49 +47,6 @@ #define ELF_INFO_MODULE 0x0002 #define ELF_INFO_NAME 0x0004 -#ifndef HAVE_STRUCT_R_DEBUG -struct r_debug -{ - int r_version; - struct link_map *r_map; - ElfW(Addr) r_brk; - enum - { - RT_CONSISTENT, - RT_ADD, - RT_DELETE - } r_state; - ElfW(Addr) r_ldbase; -}; -#endif /* HAVE_STRUCT_R_DEBUG */ - -struct r_debug32 -{ - int r_version; - DWORD r_map; - Elf32_Addr r_brk; - int r_state; - Elf32_Addr r_ldbase; -}; - -#ifndef HAVE_STRUCT_LINK_MAP -struct link_map -{ - ElfW(Addr) l_addr; - char *l_name; - ElfW(Dyn) *l_ld; - struct link_map *l_next, *l_prev; -}; -#endif /* HAVE_STRUCT_LINK_MAP */ - -struct link_map32 -{ - Elf32_Addr l_addr; - DWORD l_name; - DWORD l_ld; - DWORD l_next, l_prev; -}; - WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); struct elf_info @@ -1402,12 +1359,25 @@ static BOOL elf_enum_modules_internal(const struct process* pcs, { WCHAR bufstrW[MAX_PATH]; char bufstr[256]; - void *lm_addr; + ULONG_PTR lm_addr; if (pcs->is_64bit) { - struct r_debug dbg_hdr; - struct link_map lm; + struct + { + UINT32 r_version; + UINT64 r_map; + UINT64 r_brk; + UINT32 r_state; + UINT64 r_ldbase; + } dbg_hdr; + struct + { + UINT64 l_addr; + UINT64 l_name; + UINT64 l_ld; + UINT64 l_next, l_prev; + } lm; if (!pcs->dbg_hdr_addr || !ReadProcessMemory(pcs->handle, (void*)pcs->dbg_hdr_addr, @@ -1419,14 +1389,14 @@ static BOOL elf_enum_modules_internal(const struct process* pcs, * cases the first entry doesn't appear with a name, in other cases it * does. */ - for (lm_addr = (void*)dbg_hdr.r_map; lm_addr; lm_addr = (void*)lm.l_next) + for (lm_addr = dbg_hdr.r_map; lm_addr; lm_addr = lm.l_next) { - if (!ReadProcessMemory(pcs->handle, lm_addr, &lm, sizeof(lm), NULL)) + if (!ReadProcessMemory(pcs->handle, (void*)lm_addr, &lm, sizeof(lm), NULL)) return FALSE; - if (lm.l_prev != NULL && /* skip first entry, normally debuggee itself */ - lm.l_name != NULL && - ReadProcessMemory(pcs->handle, lm.l_name, bufstr, sizeof(bufstr), NULL)) + if (lm.l_prev && /* skip first entry, normally debuggee itself */ + lm.l_name && + ReadProcessMemory(pcs->handle, (void*)(ULONG_PTR)lm.l_name, bufstr, sizeof(bufstr), NULL)) { bufstr[sizeof(bufstr) - 1] = '\0'; MultiByteToWideChar(CP_UNIXCP, 0, bufstr, -1, bufstrW, ARRAY_SIZE(bufstrW)); @@ -1438,8 +1408,21 @@ static BOOL elf_enum_modules_internal(const struct process* pcs, } else { - struct r_debug32 dbg_hdr; - struct link_map32 lm; + struct + { + UINT32 r_version; + UINT32 r_map; + UINT32 r_brk; + UINT32 r_state; + UINT32 r_ldbase; + } dbg_hdr; + struct + { + UINT32 l_addr; + UINT32 l_name; + UINT32 l_ld; + UINT32 l_next, l_prev; + } lm; if (!pcs->dbg_hdr_addr || !ReadProcessMemory(pcs->handle, (void*)pcs->dbg_hdr_addr, @@ -1451,10 +1434,9 @@ static BOOL elf_enum_modules_internal(const struct process* pcs, * cases the first entry doesn't appear with a name, in other cases it * does. */ - for (lm_addr = (void *)(DWORD_PTR)dbg_hdr.r_map; lm_addr; - lm_addr = (void *)(DWORD_PTR)lm.l_next) + for (lm_addr = dbg_hdr.r_map; lm_addr; lm_addr = lm.l_next) { - if (!ReadProcessMemory(pcs->handle, lm_addr, &lm, sizeof(lm), NULL)) + if (!ReadProcessMemory(pcs->handle, (void*)lm_addr, &lm, sizeof(lm), NULL)) return FALSE; if (lm.l_prev && /* skip first entry, normally debuggee itself */

1 0

Jacek Caban : dbghelp: Use local elf_header declaration.
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: 78845911da06fc75c6d74237f816a1547c24b20b URL: https://source.winehq.org/git/wine.git/?a=commit;h=78845911da06fc75c6d74237… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 31 18:21:37 2020 +0200 dbghelp: Use local elf_header declaration. Based on glibc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 22 +++++++++++++++++++--- dlls/dbghelp/image_private.h | 20 +++++++++++++++++++- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index cca07ead31..cb30eb23d4 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -359,7 +359,7 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* unsigned int i; size_t tmp, page_mask = sysinfo.dwPageSize - 1; WCHAR *dos_path; - unsigned char e_ident[EI_NIDENT]; + unsigned char e_ident[ARRAY_SIZE(fmap->u.elf.elfhdr.e_ident)]; elf_reset_file_map(fmap); @@ -394,12 +394,28 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* if (fmap->addr_size == 32) { - Elf32_Ehdr elfhdr32; + struct + { + UINT8 e_ident[16]; /* Magic number and other info */ + UINT16 e_type; /* Object file type */ + UINT16 e_machine; /* Architecture */ + UINT32 e_version; /* Object file version */ + UINT32 e_entry; /* Entry point virtual address */ + UINT32 e_phoff; /* Program header table file offset */ + UINT32 e_shoff; /* Section header table file offset */ + UINT32 e_flags; /* Processor-specific flags */ + UINT16 e_ehsize; /* ELF header size in bytes */ + UINT16 e_phentsize; /* Program header table entry size */ + UINT16 e_phnum; /* Program header table entry count */ + UINT16 e_shentsize; /* Section header table entry size */ + UINT16 e_shnum; /* Section header table entry count */ + UINT16 e_shstrndx; /* Section header string table index */ + } elfhdr32; if (!elf_map_file_read(fmap, emfd, &elfhdr32, sizeof(elfhdr32), 0)) return FALSE; - memcpy(fmap->u.elf.elfhdr.e_ident, elfhdr32.e_ident, EI_NIDENT); + memcpy(fmap->u.elf.elfhdr.e_ident, elfhdr32.e_ident, sizeof(e_ident)); fmap->u.elf.elfhdr.e_type = elfhdr32.e_type; fmap->u.elf.elfhdr.e_machine = elfhdr32.e_machine; fmap->u.elf.elfhdr.e_version = elfhdr32.e_version; diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index d2a89bd7c5..600cf72159 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -48,6 +48,24 @@ #define IMAGE_NO_MAP ((void*)-1) +struct elf_header +{ + UINT8 e_ident[16]; /* Magic number and other info */ + UINT16 e_type; /* Object file type */ + UINT16 e_machine; /* Architecture */ + UINT32 e_version; /* Object file version */ + UINT64 e_entry; /* Entry point virtual address */ + UINT64 e_phoff; /* Program header table file offset */ + UINT64 e_shoff; /* Section header table file offset */ + UINT32 e_flags; /* Processor-specific flags */ + UINT16 e_ehsize; /* ELF header size in bytes */ + UINT16 e_phentsize; /* Program header table entry size */ + UINT16 e_phnum; /* Program header table entry count */ + UINT16 e_shentsize; /* Section header table entry size */ + UINT16 e_shnum; /* Section header table entry count */ + UINT16 e_shstrndx; /* Section header string table index */ +}; + /* structure holding information while handling an ELF image * allows one by one section mapping for memory savings */ @@ -66,8 +84,8 @@ struct image_file_map HANDLE handle; const char* shstrtab; char* target_copy; + struct elf_header elfhdr; #ifdef __ELF__ - Elf64_Ehdr elfhdr; struct { Elf64_Shdr shdr;

1 0

Jacek Caban : dbghelp: Use local elf_section_header declaration.
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: a6f0fe8d1ca16243771784ec34c49453c96e6479 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6f0fe8d1ca16243771784ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 31 18:21:51 2020 +0200 dbghelp: Use local elf_section_header declaration. Based on glibc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 18 +++++++++++++++--- dlls/dbghelp/image_private.h | 18 +++++++++++++++--- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index cb30eb23d4..3a9af1d15d 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -322,10 +322,22 @@ static BOOL elf_map_shdr(struct elf_map_file_data* emfd, struct image_file_map* { if (fmap->addr_size == 32) { - Elf32_Shdr shdr32; + struct + { + UINT32 sh_name; /* Section name (string tbl index) */ + UINT32 sh_type; /* Section type */ + UINT32 sh_flags; /* Section flags */ + UINT32 sh_addr; /* Section virtual addr at execution */ + UINT32 sh_offset; /* Section file offset */ + UINT32 sh_size; /* Section size in bytes */ + UINT32 sh_link; /* Link to another section */ + UINT32 sh_info; /* Additional section information */ + UINT32 sh_addralign; /* Section alignment */ + UINT32 sh_entsize; /* Entry size if section holds table */ + } shdr32; if (!elf_map_file_read(fmap, emfd, &shdr32, sizeof(shdr32), - fmap->u.elf.elfhdr.e_shoff + i * sizeof(Elf32_Shdr))) + fmap->u.elf.elfhdr.e_shoff + i * sizeof(shdr32))) return FALSE; fmap->u.elf.sect[i].shdr.sh_name = shdr32.sh_name; @@ -342,7 +354,7 @@ static BOOL elf_map_shdr(struct elf_map_file_data* emfd, struct image_file_map* else { if (!elf_map_file_read(fmap, emfd, &fmap->u.elf.sect[i].shdr, sizeof(fmap->u.elf.sect[i].shdr), - fmap->u.elf.elfhdr.e_shoff + i * sizeof(Elf64_Shdr))) + fmap->u.elf.elfhdr.e_shoff + i * sizeof(fmap->u.elf.sect[i].shdr))) return FALSE; } return TRUE; diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index 600cf72159..8c6f463ecb 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -66,6 +66,20 @@ struct elf_header UINT16 e_shstrndx; /* Section header string table index */ }; +struct elf_section_header +{ + UINT32 sh_name; /* Section name (string tbl index) */ + UINT32 sh_type; /* Section type */ + UINT64 sh_flags; /* Section flags */ + UINT64 sh_addr; /* Section virtual addr at execution */ + UINT64 sh_offset; /* Section file offset */ + UINT64 sh_size; /* Section size in bytes */ + UINT32 sh_link; /* Link to another section */ + UINT32 sh_info; /* Additional section information */ + UINT64 sh_addralign; /* Section alignment */ + UINT64 sh_entsize; /* Entry size if section holds table */ +}; + /* structure holding information while handling an ELF image * allows one by one section mapping for memory savings */ @@ -85,13 +99,11 @@ struct image_file_map const char* shstrtab; char* target_copy; struct elf_header elfhdr; -#ifdef __ELF__ struct { - Elf64_Shdr shdr; + struct elf_section_header shdr; const char* mapped; }* sect; -#endif } elf; struct macho_file_map {

1 0

Jacek Caban : dbghelp: Use local ELF program segment header declaration.
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: 186d610442e1db009e40945fc4725c43ea8721ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=186d610442e1db009e40945f… Author: Jacek Caban <jacek(a)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(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)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)) &&

1 0

Jacek Caban : dbghelp: Use local dynamic section entry declaration.
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: 849cf6ed514aaa5071e61dc471dca6be1d58393f URL: https://source.winehq.org/git/wine.git/?a=commit;h=849cf6ed514aaa5071e61dc4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 31 18:22:11 2020 +0200 dbghelp: Use local dynamic section entry declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 01ba4528e0..17f0ecb263 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1106,7 +1106,11 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename, if (fmap->addr_size == 32) { - Elf32_Dyn dyn; + struct + { + INT32 d_tag; /* Dynamic entry type */ + UINT32 d_val; /* Integer or address value */ + } dyn; do { @@ -1115,7 +1119,7 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename, return ret; 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 */ /* Assume this module (the Wine loader) has been * loaded at its preferred address */ @@ -1128,7 +1132,11 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename, } else { - Elf64_Dyn dyn; + struct + { + INT64 d_tag; /* Dynamic entry type */ + UINT64 d_val; /* Integer or address value */ + } dyn; do { @@ -1137,7 +1145,7 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename, return ret; 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 */ /* Assume this module (the Wine loader) has been * loaded at its preferred address */

1 0

Jacek Caban : dbghelp: Use local symbol table entry declaration.
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: 7b12b1849c711476b64b3ed6bc60805ff8f2715f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b12b1849c711476b64b3ed6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 31 18:22:21 2020 +0200 dbghelp: Use local symbol table entry declaration. Based on glibc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 17f0ecb263..4cbb09ff78 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -57,10 +57,30 @@ struct elf_info const WCHAR* module_name; /* OUT found module name (if ELF_INFO_NAME is set) */ }; +struct elf_sym32 +{ + UINT32 st_name; /* Symbol name (string tbl index) */ + UINT32 st_value; /* Symbol value */ + UINT32 st_size; /* Symbol size */ + UINT8 st_info; /* Symbol type and binding */ + UINT8 st_other; /* Symbol visibility */ + UINT16 st_shndx; /* Section index */ +}; + +struct elf_sym +{ + UINT32 st_name; /* Symbol name (string tbl index) */ + UINT8 st_info; /* Symbol type and binding */ + UINT8 st_other; /* Symbol visibility */ + UINT16 st_shndx; /* Section index */ + UINT64 st_value; /* Symbol value */ + UINT64 st_size; /* Symbol size */ +}; + struct symtab_elt { struct hash_table_elt ht_elt; - Elf64_Sym sym; + struct elf_sym sym; struct symt_compiland* compiland; unsigned used; }; @@ -605,18 +625,18 @@ static void elf_hash_symtab(struct module* module, struct pool* pool, } nsym = image_get_map_size(&ism) / - (fmap->addr_size == 32 ? sizeof(Elf32_Sym) : sizeof(Elf64_Sym)); + (fmap->addr_size == 32 ? sizeof(struct elf_sym32) : sizeof(struct elf_sym)); for (j = 0; thunks[j].symname; j++) thunks[j].rva_start = thunks[j].rva_end = 0; for (i = 0; i < nsym; i++) { - Elf64_Sym sym; + struct elf_sym sym; if (fmap->addr_size == 32) { - Elf32_Sym *sym32 = &((Elf32_Sym *)symtab)[i]; + struct elf_sym32 *sym32 = &((struct elf_sym32 *)symtab)[i]; sym.st_name = sym32->st_name; sym.st_value = sym32->st_value; @@ -626,7 +646,7 @@ static void elf_hash_symtab(struct module* module, struct pool* pool, sym.st_shndx = sym32->st_shndx; } else - sym = ((Elf64_Sym *)symtab)[i]; + sym = ((struct elf_sym *)symtab)[i]; /* Ignore certain types of entries which really aren't of that much * interest. @@ -709,9 +729,9 @@ static void elf_hash_symtab(struct module* module, struct pool* pool, * * lookup a symbol by name in our internal hash table for the symtab */ -static const Elf64_Sym *elf_lookup_symtab(const struct module* module, - const struct hash_table* ht_symtab, - const char* name, const struct symt* compiland) +static const struct elf_sym *elf_lookup_symtab(const struct module* module, + const struct hash_table* ht_symtab, + const char* name, const struct symt* compiland) { struct symtab_elt* weak_result = NULL; /* without compiland name */ struct symtab_elt* result = NULL; @@ -783,7 +803,7 @@ static void elf_finish_stabs_info(struct module* module, const struct hash_table struct hash_table_iter hti; void* ptr; struct symt_ht* sym; - const Elf64_Sym* symp; + const struct elf_sym* symp; struct elf_module_info* elf_info = module->format_info[DFI_ELF]->u.elf_info; hash_table_iter_init(&module->ht_symbols, &hti, NULL);

1 0

Jacek Caban : dbghelp: Don't use ELF32_ST_BIND and ELF32_ST_TYPE macros.
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: 6fde25300d6c93290887e47c3c4bfd55a948609b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fde25300d6c93290887e47c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 31 18:23:05 2020 +0200 dbghelp: Don't use ELF32_ST_BIND and ELF32_ST_TYPE macros. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 9449c9ab61..a6255e134c 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -632,6 +632,7 @@ static void elf_hash_symtab(struct module* module, struct pool* pool, for (i = 0; i < nsym; i++) { struct elf_sym sym; + unsigned int type; if (fmap->addr_size == 32) { @@ -647,14 +648,13 @@ static void elf_hash_symtab(struct module* module, struct pool* pool, else sym = ((struct elf_sym *)symtab)[i]; + type = sym.st_info & 0xf; + /* Ignore certain types of entries which really aren't of that much * interest. */ - if ((ELF32_ST_TYPE(sym.st_info) != STT_NOTYPE && - ELF32_ST_TYPE(sym.st_info) != STT_FILE && - ELF32_ST_TYPE(sym.st_info) != STT_OBJECT && - ELF32_ST_TYPE(sym.st_info) != STT_FUNC) || - sym.st_shndx == SHN_UNDEF) + if ((type != STT_NOTYPE && type != STT_FILE && type != STT_OBJECT && type != STT_FUNC) + || !sym.st_shndx) { continue; } @@ -662,7 +662,7 @@ static void elf_hash_symtab(struct module* module, struct pool* pool, symname = strp + sym.st_name; /* handle some specific symtab (that we'll throw away when done) */ - switch (ELF32_ST_TYPE(sym.st_info)) + switch (type) { case STT_FILE: if (symname) @@ -791,6 +791,11 @@ static const struct elf_sym *elf_lookup_symtab(const struct module* module, return &result->sym; } +static BOOL elf_is_local_symbol(unsigned int info) +{ + return !(info >> 4); +} + /****************************************************************** * elf_finish_stabs_info * @@ -857,7 +862,7 @@ static void elf_finish_stabs_info(struct module* module, const struct hash_table ((struct symt_function*)sym)->address, wine_dbgstr_longlong(elf_info->elf_addr + symp->st_value)); ((struct symt_data*)sym)->u.var.offset = elf_info->elf_addr + symp->st_value; - ((struct symt_data*)sym)->kind = (ELF32_ST_BIND(symp->st_info) == STB_LOCAL) ? + ((struct symt_data*)sym)->kind = elf_is_local_symbol(symp->st_info) ? DataIsFileStatic : DataIsGlobal; } else FIXME("Couldn't find %s!%s\n", @@ -916,7 +921,7 @@ static int elf_new_wine_thunks(struct module* module, const struct hash_table* h * used yet (ie we have no debug information on them) * That's the case, for example, of the .spec.c files */ - switch (ELF32_ST_TYPE(ste->sym.st_info)) + switch (ste->sym.st_info & 0xf) { case STT_FUNC: symt_new_function(module, ste->compiland, ste->ht_elt.name, @@ -927,7 +932,7 @@ static int elf_new_wine_thunks(struct module* module, const struct hash_table* h loc.reg = 0; loc.offset = addr; symt_new_global_variable(module, ste->compiland, ste->ht_elt.name, - ELF32_ST_BIND(ste->sym.st_info) == STB_LOCAL, + elf_is_local_symbol(ste->sym.st_info), loc, ste->sym.st_size, NULL); break; default:

1 0

Jacek Caban : dbghelp: Inline ELF magic constants.
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: 66ab2c503de6d39f1a0256d66511da05d326ac5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=66ab2c503de6d39f1a0256d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 31 18:22:38 2020 +0200 dbghelp: Inline ELF magic constants. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 4cbb09ff78..9449c9ab61 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -387,7 +387,6 @@ static BOOL elf_map_shdr(struct elf_map_file_data* emfd, struct image_file_map* */ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* fmap) { - static const BYTE elf_signature[4] = { ELFMAG0, ELFMAG1, ELFMAG2, ELFMAG3 }; unsigned int i; size_t tmp, page_mask = sysinfo.dwPageSize - 1; WCHAR *dos_path; @@ -419,10 +418,10 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* return FALSE; /* and check for an ELF header */ - if (memcmp(e_ident, elf_signature, sizeof(elf_signature))) + if (memcmp(e_ident, "\177ELF", 4)) return FALSE; - fmap->addr_size = e_ident[EI_CLASS] == ELFCLASS64 ? 64 : 32; + fmap->addr_size = e_ident[4] == 2 /* ELFCLASS64 */ ? 64 : 32; if (fmap->addr_size == 32) {

1 0

Jacek Caban : dbghelp: Use local ELF constants definitions.
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: 56f2b950c3a090d1951edd687e1c6e9ed9388732 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56f2b950c3a090d1951edd68… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 31 18:23:25 2020 +0200 dbghelp: Use local ELF constants definitions. Based on glibc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 61 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 15 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index a6255e134c..ae25170bfc 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -101,7 +101,38 @@ struct elf_module_info struct image_file_map file_map; }; -#define ELF_AT_SYSINFO_EHDR 33 +/* Legal values for sh_type (section type). */ +#define ELF_SHT_NULL 0 /* Section header table entry unused */ +#define ELF_SHT_PROGBITS 1 /* Program data */ +#define ELF_SHT_SYMTAB 2 /* Symbol table */ +#define ELF_SHT_STRTAB 3 /* String table */ +#define ELF_SHT_RELA 4 /* Relocation entries with addends */ +#define ELF_SHT_HASH 5 /* Symbol hash table */ +#define ELF_SHT_DYNAMIC 6 /* Dynamic linking information */ +#define ELF_SHT_NOTE 7 /* Notes */ +#define ELF_SHT_NOBITS 8 /* Program space with no data (bss) */ +#define ELF_SHT_REL 9 /* Relocation entries, no addends */ +#define ELF_SHT_SHLIB 10 /* Reserved */ +#define ELF_SHT_DYNSYM 11 /* Dynamic linker symbol table */ +#define ELF_SHT_INIT_ARRAY 14 /* Array of constructors */ +#define ELF_SHT_FINI_ARRAY 15 /* Array of destructors */ +#define ELF_SHT_PREINIT_ARRAY 16 /* Array of pre-constructors */ +#define ELF_SHT_GROUP 17 /* Section group */ +#define ELF_SHT_SYMTAB_SHNDX 18 /* Extended section indeces */ +#define ELF_SHT_NUM 19 /* Number of defined types. */ + +/* Legal values for ST_TYPE subfield of st_info (symbol type). */ +#define ELF_STT_NOTYPE 0 /* Symbol type is unspecified */ +#define ELF_STT_OBJECT 1 /* Symbol is a data object */ +#define ELF_STT_FUNC 2 /* Symbol is a code object */ +#define ELF_STT_SECTION 3 /* Symbol associated with a section */ +#define ELF_STT_FILE 4 /* Symbol's name is file name */ + +#define ELF_PT_LOAD 1 /* Loadable program segment */ + +#define ELF_DT_DEBUG 21 /* For debugging; unspecified */ + +#define ELF_AT_SYSINFO_EHDR 33 /****************************************************************** * elf_map_section @@ -116,7 +147,7 @@ static const char* elf_map_section(struct image_section_map* ism) assert(ism->fmap->modtype == DMT_ELF); if (ism->sidx < 0 || ism->sidx >= ism->fmap->u.elf.elfhdr.e_shnum || - fmap->sect[ism->sidx].shdr.sh_type == SHT_NOBITS) + fmap->sect[ism->sidx].shdr.sh_type == ELF_SHT_NOBITS) return IMAGE_NO_MAP; if (fmap->target_copy) @@ -503,7 +534,7 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* if (elf_map_file_read(fmap, emfd, &phdr, sizeof(phdr), fmap->u.elf.elfhdr.e_phoff + i * sizeof(phdr)) && - phdr.p_type == PT_LOAD) + phdr.p_type == ELF_PT_LOAD) { tmp = (phdr.p_vaddr + phdr.p_memsz + page_mask) & ~page_mask; if (fmap->u.elf.elf_size < tmp) fmap->u.elf.elf_size = tmp; @@ -526,7 +557,7 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* if (elf_map_file_read(fmap, emfd, &phdr, sizeof(phdr), fmap->u.elf.elfhdr.e_phoff + i * sizeof(phdr)) && - phdr.p_type == PT_LOAD) + phdr.p_type == ELF_PT_LOAD) { tmp = (phdr.p_vaddr + phdr.p_memsz + page_mask) & ~page_mask; if (fmap->u.elf.elf_size < tmp) fmap->u.elf.elf_size = tmp; @@ -612,8 +643,8 @@ static void elf_hash_symtab(struct module* module, struct pool* pool, struct image_section_map ism, ism_str; const char *symtab; - if (!elf_find_section_type(fmap, ".symtab", SHT_SYMTAB, &ism) && - !elf_find_section_type(fmap, ".dynsym", SHT_DYNSYM, &ism)) return; + if (!elf_find_section_type(fmap, ".symtab", ELF_SHT_SYMTAB, &ism) && + !elf_find_section_type(fmap, ".dynsym", ELF_SHT_DYNSYM, &ism)) return; if ((symtab = image_map_section(&ism)) == IMAGE_NO_MAP) return; ism_str.fmap = ism.fmap; ism_str.sidx = fmap->u.elf.sect[ism.sidx].shdr.sh_link; @@ -653,7 +684,7 @@ static void elf_hash_symtab(struct module* module, struct pool* pool, /* Ignore certain types of entries which really aren't of that much * interest. */ - if ((type != STT_NOTYPE && type != STT_FILE && type != STT_OBJECT && type != STT_FUNC) + if ((type != ELF_STT_NOTYPE && type != ELF_STT_FILE && type != ELF_STT_OBJECT && type != ELF_STT_FUNC) || !sym.st_shndx) { continue; @@ -664,14 +695,14 @@ static void elf_hash_symtab(struct module* module, struct pool* pool, /* handle some specific symtab (that we'll throw away when done) */ switch (type) { - case STT_FILE: + case ELF_STT_FILE: if (symname) compiland = symt_new_compiland(module, sym.st_value, source_new(module, NULL, symname)); else compiland = NULL; continue; - case STT_NOTYPE: + case ELF_STT_NOTYPE: /* we are only interested in wine markers inserted by winebuild */ for (j = 0; thunks[j].symname; j++) { @@ -923,11 +954,11 @@ static int elf_new_wine_thunks(struct module* module, const struct hash_table* h */ switch (ste->sym.st_info & 0xf) { - case STT_FUNC: + case ELF_STT_FUNC: symt_new_function(module, ste->compiland, ste->ht_elt.name, addr, ste->sym.st_size, NULL); break; - case STT_OBJECT: + case ELF_STT_OBJECT: loc.kind = loc_absolute; loc.reg = 0; loc.offset = addr; @@ -1121,7 +1152,7 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename, { struct image_section_map ism; - if (elf_find_section_type(fmap, ".dynamic", SHT_DYNAMIC, &ism)) + if (elf_find_section_type(fmap, ".dynamic", ELF_SHT_DYNAMIC, &ism)) { char* ptr = (char*)(ULONG_PTR)fmap->u.elf.sect[ism.sidx].shdr.sh_addr; ULONG_PTR len; @@ -1141,7 +1172,7 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename, if (!ReadProcessMemory(pcs->handle, ptr, &dyn, sizeof(dyn), &len) || len != sizeof(dyn)) return ret; - if (dyn.d_tag == DT_DEBUG) + if (dyn.d_tag == ELF_DT_DEBUG) { elf_info->dbg_hdr_addr = dyn.d_val; if (load_offset == 0 && dyn_addr == 0) /* likely the case */ @@ -1167,7 +1198,7 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename, if (!ReadProcessMemory(pcs->handle, ptr, &dyn, sizeof(dyn), &len) || len != sizeof(dyn)) return ret; - if (dyn.d_tag == DT_DEBUG) + if (dyn.d_tag == ELF_DT_DEBUG) { elf_info->dbg_hdr_addr = dyn.d_val; if (load_offset == 0 && dyn_addr == 0) /* likely the case */ @@ -1191,7 +1222,7 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename, struct image_section_map ism; ULONG_PTR modbase = load_offset; - if (elf_find_section_type(fmap, ".dynamic", SHT_DYNAMIC, &ism)) + if (elf_find_section_type(fmap, ".dynamic", ELF_SHT_DYNAMIC, &ism)) { ULONG_PTR rva_dyn = elf_get_map_rva(&ism);

1 0

Jacek Caban : dbghelp: Don't use system headers for ELF declarations.
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: b664ae8e60e08224cdc3025c28a37cb22356aaa4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b664ae8e60e08224cdc3025c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 31 18:23:45 2020 +0200 dbghelp: Don't use system headers for ELF declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 34 ---------------------------------- configure.ac | 10 ---------- dlls/dbghelp/elf_module.c | 6 +----- dlls/dbghelp/image_private.h | 17 ----------------- include/config.h.in | 12 ------------ 5 files changed, 1 insertion(+), 78 deletions(-) diff --git a/configure b/configure index ee1ebe8066..018fb1bfd7 100755 --- a/configure +++ b/configure @@ -7438,10 +7438,8 @@ for ac_header in \ sys/attr.h \ sys/auxv.h \ sys/cdio.h \ - sys/elf32.h \ sys/epoll.h \ sys/event.h \ - sys/exec_elf.h \ sys/filio.h \ sys/ioctl.h \ sys/ipc.h \ @@ -18571,38 +18569,6 @@ _ACEOF fi -ac_fn_c_check_type "$LINENO" "struct r_debug" "ac_cv_type_struct_r_debug" "#ifdef HAVE_LINK_H -#include <link.h> -#endif -#ifdef HAVE_SYS_LINK_H -#include <sys/link.h> -#endif -" -if test "x$ac_cv_type_struct_r_debug" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_R_DEBUG 1 -_ACEOF - - -fi -ac_fn_c_check_type "$LINENO" "struct link_map" "ac_cv_type_struct_link_map" "#ifdef HAVE_LINK_H -#include <link.h> -#endif -#ifdef HAVE_SYS_LINK_H -#include <sys/link.h> -#endif -" -if test "x$ac_cv_type_struct_link_map" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_LINK_MAP 1 -_ACEOF - - -fi - - ac_fn_c_check_member "$LINENO" "struct ff_effect" "direction" "ac_cv_member_struct_ff_effect_direction" "#ifdef HAVE_LINUX_INPUT_H #include <linux/input.h> #endif diff --git a/configure.ac b/configure.ac index b05a0f540a..9bae6a5dda 100644 --- a/configure.ac +++ b/configure.ac @@ -498,10 +498,8 @@ AC_CHECK_HEADERS(\ sys/attr.h \ sys/auxv.h \ sys/cdio.h \ - sys/elf32.h \ sys/epoll.h \ sys/event.h \ - sys/exec_elf.h \ sys/filio.h \ sys/ioctl.h \ sys/ipc.h \ @@ -2313,14 +2311,6 @@ AC_CHECK_TYPES([struct xinpgen],,, #include <netinet/in_pcb.h> #endif]) -AC_CHECK_TYPES([struct r_debug, struct link_map],,, -[#ifdef HAVE_LINK_H -#include <link.h> -#endif -#ifdef HAVE_SYS_LINK_H -#include <sys/link.h> -#endif]) - AC_CHECK_MEMBERS([struct ff_effect.direction],,, [#ifdef HAVE_LINUX_INPUT_H #include <linux/input.h> diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index ae25170bfc..23cb8a54b7 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -24,9 +24,6 @@ #if defined(__svr4__) || defined(__sun) #define __ELF__ 1 -/* large files are not supported by libelf */ -#undef _FILE_OFFSET_BITS -#define _FILE_OFFSET_BITS 32 #endif #include <assert.h> @@ -34,9 +31,8 @@ #include <stdlib.h> #include "dbghelp_private.h" -#include "winternl.h" - #include "image_private.h" +#include "winternl.h" #include "wine/debug.h" #include "wine/heap.h" diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index 8c6f463ecb..2b414b9607 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -19,23 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifdef HAVE_ELF_H -# include <elf.h> -#endif -#ifdef HAVE_SYS_ELF32_H -# include <sys/elf32.h> -#endif -#ifdef HAVE_SYS_EXEC_ELF_H -# include <sys/exec_elf.h> -#endif -#if !defined(DT_NUM) -# if defined(DT_COUNT) -# define DT_NUM DT_COUNT -# else -/* this seems to be a satisfactory value on Solaris, which doesn't support this AFAICT */ -# define DT_NUM 24 -# endif -#endif #ifdef HAVE_LINK_H # include <link.h> #endif diff --git a/include/config.h.in b/include/config.h.in index d670f2b51a..b6da8d8684 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -887,9 +887,6 @@ /* Define to 1 if `ips_total' is a member of `struct ip_stats'. */ #undef HAVE_STRUCT_IP_STATS_IPS_TOTAL -/* Define to 1 if the system has the type `struct link_map'. */ -#undef HAVE_STRUCT_LINK_MAP - /* Define to 1 if `msg_accrights' is a member of `struct msghdr'. */ #undef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS @@ -905,9 +902,6 @@ /* Define to 1 if `name' is a member of `struct option'. */ #undef HAVE_STRUCT_OPTION_NAME -/* Define to 1 if the system has the type `struct r_debug'. */ -#undef HAVE_STRUCT_R_DEBUG - /* Define to 1 if `sin6_scope_id' is a member of `struct sockaddr_in6'. */ #undef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID @@ -1018,18 +1012,12 @@ /* Define to 1 if you have the <sys/cdio.h> header file. */ #undef HAVE_SYS_CDIO_H -/* Define to 1 if you have the <sys/elf32.h> header file. */ -#undef HAVE_SYS_ELF32_H - /* Define to 1 if you have the <sys/epoll.h> header file. */ #undef HAVE_SYS_EPOLL_H /* Define to 1 if you have the <sys/event.h> header file. */ #undef HAVE_SYS_EVENT_H -/* Define to 1 if you have the <sys/exec_elf.h> header file. */ -#undef HAVE_SYS_EXEC_ELF_H - /* Define to 1 if you have the <sys/filio.h> header file. */ #undef HAVE_SYS_FILIO_H

1 0