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

dbghelp: Split storage of PE header. 

Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Eric Pouech 2021-08-31 13:20:26 +02:00 committed by Alexandre Julliard
parent 2586907566
commit 339953cced
2 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/dbghelp/image_private.h
View File

@ -150,7 +150,8 @@ struct image_file_map
struct pe_file_map struct pe_file_map
{ {
HANDLE hMap; HANDLE hMap;
IMAGE_NT_HEADERS ntheader; IMAGE_FILE_HEADER file_header;
IMAGE_OPTIONAL_HEADER opt_header;
BOOL builtin; BOOL builtin;
unsigned full_count; unsigned full_count;
void* full_map; void* full_map;

49
dlls/dbghelp/pe_module.c
View File

@ -75,7 +75,7 @@ static const char* pe_map_section(struct image_section_map* ism)
void* mapping; void* mapping;
struct pe_file_map* fmap = &ism->fmap->u.pe; struct pe_file_map* fmap = &ism->fmap->u.pe;
if (ism->sidx >= 0 && ism->sidx < fmap->ntheader.FileHeader.NumberOfSections && if (ism->sidx >= 0 && ism->sidx < fmap->file_header.NumberOfSections &&
fmap->sect[ism->sidx].mapped == IMAGE_NO_MAP) fmap->sect[ism->sidx].mapped == IMAGE_NO_MAP)
{ {
IMAGE_NT_HEADERS* nth; IMAGE_NT_HEADERS* nth;
@ -115,7 +115,7 @@ static BOOL pe_find_section(struct image_file_map* fmap, const char* name,
unsigned i; unsigned i;
char tmp[IMAGE_SIZEOF_SHORT_NAME + 1]; char tmp[IMAGE_SIZEOF_SHORT_NAME + 1];
for (i = 0; i < fmap->u.pe.ntheader.FileHeader.NumberOfSections; i++) for (i = 0; i < fmap->u.pe.file_header.NumberOfSections; i++)
{ {
sectname = (const char*)fmap->u.pe.sect[i].shdr.Name; sectname = (const char*)fmap->u.pe.sect[i].shdr.Name;
/* long section names start with a '/' (at least on MinGW32) */ /* long section names start with a '/' (at least on MinGW32) */
@ -147,7 +147,7 @@ static BOOL pe_find_section(struct image_file_map* fmap, const char* name,
*/ */
static void pe_unmap_section(struct image_section_map* ism) static void pe_unmap_section(struct image_section_map* ism)
{ {
if (ism->sidx >= 0 && ism->sidx < ism->fmap->u.pe.ntheader.FileHeader.NumberOfSections && if (ism->sidx >= 0 && ism->sidx < ism->fmap->u.pe.file_header.NumberOfSections &&
ism->fmap->u.pe.sect[ism->sidx].mapped != IMAGE_NO_MAP) ism->fmap->u.pe.sect[ism->sidx].mapped != IMAGE_NO_MAP)
{ {
pe_unmap_full(ism->fmap); pe_unmap_full(ism->fmap);
@ -162,7 +162,7 @@ static void pe_unmap_section(struct image_section_map* ism)
*/ */
static DWORD_PTR pe_get_map_rva(const struct image_section_map* ism) static DWORD_PTR pe_get_map_rva(const struct image_section_map* ism)
{ {
if (ism->sidx < 0 || ism->sidx >= ism->fmap->u.pe.ntheader.FileHeader.NumberOfSections) if (ism->sidx < 0 || ism->sidx >= ism->fmap->u.pe.file_header.NumberOfSections)
return 0; return 0;
return ism->fmap->u.pe.sect[ism->sidx].shdr.VirtualAddress; return ism->fmap->u.pe.sect[ism->sidx].shdr.VirtualAddress;
} }
@ -174,7 +174,7 @@ static DWORD_PTR pe_get_map_rva(const struct image_section_map* ism)
*/ */
static unsigned pe_get_map_size(const struct image_section_map* ism) static unsigned pe_get_map_size(const struct image_section_map* ism)
{ {
if (ism->sidx < 0 || ism->sidx >= ism->fmap->u.pe.ntheader.FileHeader.NumberOfSections) if (ism->sidx < 0 || ism->sidx >= ism->fmap->u.pe.file_header.NumberOfSections)
return 0; return 0;
return ism->fmap->u.pe.sect[ism->sidx].shdr.Misc.VirtualSize; return ism->fmap->u.pe.sect[ism->sidx].shdr.Misc.VirtualSize;
} }
@ -190,7 +190,7 @@ static void pe_unmap_file(struct image_file_map* fmap)
{ {
struct image_section_map ism; struct image_section_map ism;
ism.fmap = fmap; ism.fmap = fmap;
for (ism.sidx = 0; ism.sidx < fmap->u.pe.ntheader.FileHeader.NumberOfSections; ism.sidx++) for (ism.sidx = 0; ism.sidx < fmap->u.pe.file_header.NumberOfSections; ism.sidx++)
{ {
pe_unmap_section(&ism); pe_unmap_section(&ism);
} }
@ -258,7 +258,8 @@ BOOL pe_map_file(HANDLE file, struct image_file_map* fmap, enum module_type mt)
unsigned i; unsigned i;
if (!(nthdr = RtlImageNtHeader(mapping))) goto error; if (!(nthdr = RtlImageNtHeader(mapping))) goto error;
memcpy(&fmap->u.pe.ntheader, nthdr, sizeof(fmap->u.pe.ntheader)); memcpy(&fmap->u.pe.file_header, &nthdr->FileHeader, sizeof(fmap->u.pe.file_header));
memcpy(&fmap->u.pe.opt_header, &nthdr->OptionalHeader, sizeof(fmap->u.pe.opt_header));
switch (nthdr->OptionalHeader.Magic) switch (nthdr->OptionalHeader.Magic)
{ {
case 0x10b: fmap->addr_size = 32; break; case 0x10b: fmap->addr_size = 32; break;
@ -298,8 +299,8 @@ BOOL pe_map_file(HANDLE file, struct image_file_map* fmap, enum module_type mt)
{ {
WARN("Bad coff table... wipping out\n"); WARN("Bad coff table... wipping out\n");
/* we have bad information here, wipe it out */ /* we have bad information here, wipe it out */
fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable = 0; fmap->u.pe.file_header.PointerToSymbolTable = 0;
fmap->u.pe.ntheader.FileHeader.NumberOfSymbols = 0; fmap->u.pe.file_header.NumberOfSymbols = 0;
fmap->u.pe.strtable = NULL; fmap->u.pe.strtable = NULL;
} }
} }
@ -362,16 +363,16 @@ static BOOL pe_locate_with_coff_symbol_table(struct module* module)
struct symt_data* sym; struct symt_data* sym;
const char* mapping; const char* mapping;
numsym = fmap->u.pe.ntheader.FileHeader.NumberOfSymbols; numsym = fmap->u.pe.file_header.NumberOfSymbols;
if (!fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable || !numsym) if (!fmap->u.pe.file_header.PointerToSymbolTable || !numsym)
return TRUE; return TRUE;
if (!(mapping = pe_map_full(fmap, NULL))) return FALSE; if (!(mapping = pe_map_full(fmap, NULL))) return FALSE;
isym = (const IMAGE_SYMBOL*)(mapping + fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable); isym = (const IMAGE_SYMBOL*)(mapping + fmap->u.pe.file_header.PointerToSymbolTable);
for (i = 0; i < numsym; i+= naux, isym += naux) for (i = 0; i < numsym; i+= naux, isym += naux)
{ {
if (isym->StorageClass == IMAGE_SYM_CLASS_EXTERNAL && if (isym->StorageClass == IMAGE_SYM_CLASS_EXTERNAL &&
isym->SectionNumber > 0 && isym->SectionNumber <= fmap->u.pe.ntheader.FileHeader.NumberOfSections) isym->SectionNumber > 0 && isym->SectionNumber <= fmap->u.pe.file_header.NumberOfSections)
{ {
if (isym->N.Name.Short) if (isym->N.Name.Short)
{ {
@ -424,11 +425,11 @@ static BOOL pe_load_coff_symbol_table(struct module* module)
const IMAGE_SECTION_HEADER* sect; const IMAGE_SECTION_HEADER* sect;
const char* mapping; const char* mapping;
numsym = fmap->u.pe.ntheader.FileHeader.NumberOfSymbols; numsym = fmap->u.pe.file_header.NumberOfSymbols;
if (!fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable || !numsym) if (!fmap->u.pe.file_header.PointerToSymbolTable || !numsym)
return TRUE; return TRUE;
if (!(mapping = pe_map_full(fmap, NULL))) return FALSE; if (!(mapping = pe_map_full(fmap, NULL))) return FALSE;
isym = (const IMAGE_SYMBOL*)(mapping + fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable); isym = (const IMAGE_SYMBOL*)(mapping + fmap->u.pe.file_header.PointerToSymbolTable);
/* FIXME: no way to get strtable size */ /* FIXME: no way to get strtable size */
strtable = (const char*)&isym[numsym]; strtable = (const char*)&isym[numsym];
sect = IMAGE_FIRST_SECTION(RtlImageNtHeader((HMODULE)mapping)); sect = IMAGE_FIRST_SECTION(RtlImageNtHeader((HMODULE)mapping));
@ -441,7 +442,7 @@ static BOOL pe_load_coff_symbol_table(struct module* module)
compiland = NULL; compiland = NULL;
} }
if (isym->StorageClass == IMAGE_SYM_CLASS_EXTERNAL && if (isym->StorageClass == IMAGE_SYM_CLASS_EXTERNAL &&
isym->SectionNumber > 0 && isym->SectionNumber <= fmap->u.pe.ntheader.FileHeader.NumberOfSections) isym->SectionNumber > 0 && isym->SectionNumber <= fmap->u.pe.file_header.NumberOfSections)
{ {
if (isym->N.Name.Short) if (isym->N.Name.Short)
{ {
@ -496,7 +497,7 @@ static BOOL pe_load_stabs(const struct process* pcs, struct module* module)
if (stab != IMAGE_NO_MAP && stabstr != IMAGE_NO_MAP) if (stab != IMAGE_NO_MAP && stabstr != IMAGE_NO_MAP)
{ {
ret = stabs_parse(module, ret = stabs_parse(module,
module->module.BaseOfImage - fmap->u.pe.ntheader.OptionalHeader.ImageBase, module->module.BaseOfImage - fmap->u.pe.opt_header.ImageBase,
stab, image_get_map_size(&sect_stabs) / sizeof(struct stab_nlist), sizeof(struct stab_nlist), stab, image_get_map_size(&sect_stabs) / sizeof(struct stab_nlist), sizeof(struct stab_nlist),
stabstr, image_get_map_size(&sect_stabstr), stabstr, image_get_map_size(&sect_stabstr),
NULL, NULL); NULL, NULL);
@ -522,7 +523,7 @@ static BOOL pe_load_dwarf(struct module* module)
BOOL ret; BOOL ret;
ret = dwarf2_parse(module, ret = dwarf2_parse(module,
module->module.BaseOfImage - fmap->u.pe.ntheader.OptionalHeader.ImageBase, module->module.BaseOfImage - fmap->u.pe.opt_header.ImageBase,
NULL, /* FIXME: some thunks to deal with ? */ NULL, /* FIXME: some thunks to deal with ? */
fmap); fmap);
TRACE("%s the DWARF debug info\n", ret ? "successfully loaded" : "failed to load"); TRACE("%s the DWARF debug info\n", ret ? "successfully loaded" : "failed to load");
@ -792,12 +793,12 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name,
image_unmap_file(&modfmt->u.pe_info->fmap); image_unmap_file(&modfmt->u.pe_info->fmap);
modfmt->u.pe_info->fmap = builtin.fmap; modfmt->u.pe_info->fmap = builtin.fmap;
} }
if (!base) base = modfmt->u.pe_info->fmap.u.pe.ntheader.OptionalHeader.ImageBase; if (!base) base = modfmt->u.pe_info->fmap.u.pe.opt_header.ImageBase;
if (!size) size = modfmt->u.pe_info->fmap.u.pe.ntheader.OptionalHeader.SizeOfImage; if (!size) size = modfmt->u.pe_info->fmap.u.pe.opt_header.SizeOfImage;
module = module_new(pcs, loaded_name, DMT_PE, FALSE, base, size, module = module_new(pcs, loaded_name, DMT_PE, FALSE, base, size,
modfmt->u.pe_info->fmap.u.pe.ntheader.FileHeader.TimeDateStamp, modfmt->u.pe_info->fmap.u.pe.file_header.TimeDateStamp,
modfmt->u.pe_info->fmap.u.pe.ntheader.OptionalHeader.CheckSum); modfmt->u.pe_info->fmap.u.pe.opt_header.CheckSum);
if (module) if (module)
{ {
module->real_path = builtin.path; module->real_path = builtin.path;
@ -810,7 +811,7 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name,
module->module.SymType = SymDeferred; module->module.SymType = SymDeferred;
else else
pe_load_debug_info(pcs, module); pe_load_debug_info(pcs, module);
module->reloc_delta = base - modfmt->u.pe_info->fmap.u.pe.ntheader.OptionalHeader.ImageBase; module->reloc_delta = base - modfmt->u.pe_info->fmap.u.pe.opt_header.ImageBase;
} }
else else
{ {