#include <assert.h>
#include "dbghelp_private.h"
+#include "image_private.h"
#include "winternl.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
+struct pe_module_info
+{
+ struct image_file_map fmap;
+};
+
+static void* pe_map_full(struct image_file_map* fmap, IMAGE_NT_HEADERS** nth)
+{
+ if (!fmap->u.pe.full_map)
+ {
+ fmap->u.pe.full_map = MapViewOfFile(fmap->u.pe.hMap, FILE_MAP_READ, 0, 0, 0);
+ }
+ if (fmap->u.pe.full_map)
+ {
+ if (nth) *nth = RtlImageNtHeader(fmap->u.pe.full_map);
+ fmap->u.pe.full_count++;
+ return fmap->u.pe.full_map;
+ }
+ return IMAGE_NO_MAP;
+}
+
+static void pe_unmap_full(struct image_file_map* fmap)
+{
+ if (fmap->u.pe.full_count && !--fmap->u.pe.full_count)
+ {
+ UnmapViewOfFile(fmap->u.pe.full_map);
+ fmap->u.pe.full_map = NULL;
+ }
+}
+
/******************************************************************
- * pe_load_stabs
+ * pe_map_section
*
- * look for stabs information in PE header (it's how the mingw compiler provides
- * its debugging information)
+ * Maps a single section into memory from an PE file
*/
-static BOOL pe_load_stabs(const struct process* pcs, struct module* module,
- void* mapping, IMAGE_NT_HEADERS* nth)
+const char* pe_map_section(struct image_section_map* ism)
{
- IMAGE_SECTION_HEADER* section;
- int i, stabsize = 0, stabstrsize = 0;
- unsigned int stabs = 0, stabstr = 0;
- BOOL ret = FALSE;
+ void* mapping;
+ struct pe_file_map* fmap = &ism->fmap->u.pe;
- section = (IMAGE_SECTION_HEADER*)
- ((char*)&nth->OptionalHeader + nth->FileHeader.SizeOfOptionalHeader);
- for (i = 0; i < nth->FileHeader.NumberOfSections; i++, section++)
+ if (ism->sidx >= 0 && ism->sidx < fmap->ntheader.FileHeader.NumberOfSections &&
+ fmap->sect[ism->sidx].mapped == IMAGE_NO_MAP)
+ {
+ IMAGE_NT_HEADERS* nth;
+ /* FIXME: that's rather drastic, but that will do for now
+ * that's ok if the full file map exists, but we could be less agressive otherwise and
+ * only map the relevant section
+ */
+ if ((mapping = pe_map_full(ism->fmap, &nth)))
+ {
+ fmap->sect[ism->sidx].mapped = RtlImageRvaToVa(nth, mapping,
+ fmap->sect[ism->sidx].shdr.VirtualAddress,
+ NULL);
+ return fmap->sect[ism->sidx].mapped;
+ }
+ }
+ return IMAGE_NO_MAP;
+}
+
+/******************************************************************
+ * pe_find_section
+ *
+ * Finds a section by name (and type) into memory from an PE file
+ * or its alternate if any
+ */
+BOOL pe_find_section(struct image_file_map* fmap, const char* name,
+ struct image_section_map* ism)
+{
+ const char* sectname;
+ unsigned i;
+ char tmp[IMAGE_SIZEOF_SHORT_NAME + 1];
+
+ for (i = 0; i < fmap->u.pe.ntheader.FileHeader.NumberOfSections; i++)
+ {
+ sectname = (const char*)fmap->u.pe.sect[i].shdr.Name;
+ /* long section names start with a '/' (at least on MinGW32) */
+ if (sectname[0] == '/' && fmap->u.pe.strtable)
+ sectname = fmap->u.pe.strtable + atoi(sectname + 1);
+ else
+ {
+ /* the section name may not be null terminated */
+ sectname = memcpy(tmp, sectname, IMAGE_SIZEOF_SHORT_NAME);
+ tmp[IMAGE_SIZEOF_SHORT_NAME] = '\0';
+ }
+ if (!strcasecmp(sectname, name))
+ {
+ ism->fmap = fmap;
+ ism->sidx = i;
+ return TRUE;
+ }
+ }
+ ism->fmap = NULL;
+ ism->sidx = -1;
+
+ return FALSE;
+}
+
+/******************************************************************
+ * pe_unmap_section
+ *
+ * Unmaps a single section from memory
+ */
+void pe_unmap_section(struct image_section_map* ism)
+{
+ if (ism->sidx >= 0 && ism->sidx < ism->fmap->u.pe.ntheader.FileHeader.NumberOfSections &&
+ ism->fmap->u.pe.sect[ism->sidx].mapped != IMAGE_NO_MAP)
+ {
+ pe_unmap_full(ism->fmap);
+ ism->fmap->u.pe.sect[ism->sidx].mapped = IMAGE_NO_MAP;
+ }
+}
+
+/******************************************************************
+ * pe_get_map_rva
+ *
+ * Get the RVA of an PE section
+ */
+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)
+ return 0;
+ return ism->fmap->u.pe.sect[ism->sidx].shdr.VirtualAddress;
+}
+
+/******************************************************************
+ * pe_get_map_size
+ *
+ * Get the size of an PE section
+ */
+unsigned pe_get_map_size(const struct image_section_map* ism)
+{
+ if (ism->sidx < 0 || ism->sidx >= ism->fmap->u.pe.ntheader.FileHeader.NumberOfSections)
+ return 0;
+ return ism->fmap->u.pe.sect[ism->sidx].shdr.SizeOfRawData;
+}
+
+/******************************************************************
+ * pe_map_file
+ *
+ * Maps an PE file into memory (and checks it's a real PE file)
+ */
+static BOOL pe_map_file(HANDLE file, struct image_file_map* fmap, enum module_type mt)
+{
+ void* mapping;
+
+ fmap->modtype = mt;
+ fmap->u.pe.hMap = CreateFileMappingW(file, NULL, PAGE_READONLY, 0, 0, NULL);
+ if (fmap->u.pe.hMap == 0) return FALSE;
+ fmap->u.pe.full_count = 0;
+ fmap->u.pe.full_map = NULL;
+ if (!(mapping = pe_map_full(fmap, NULL))) goto error;
+
+ switch (mt)
+ {
+ case DMT_PE:
+ {
+ IMAGE_NT_HEADERS* nthdr;
+ IMAGE_SECTION_HEADER* section;
+ unsigned i;
+
+ if (!(nthdr = RtlImageNtHeader(mapping))) goto error;
+ memcpy(&fmap->u.pe.ntheader, nthdr, sizeof(fmap->u.pe.ntheader));
+ section = (IMAGE_SECTION_HEADER*)
+ ((char*)&nthdr->OptionalHeader + nthdr->FileHeader.SizeOfOptionalHeader);
+ fmap->u.pe.sect = HeapAlloc(GetProcessHeap(), 0,
+ nthdr->FileHeader.NumberOfSections * sizeof(fmap->u.pe.sect[0]));
+ if (!fmap->u.pe.sect) goto error;
+ for (i = 0; i < nthdr->FileHeader.NumberOfSections; i++)
+ {
+ memcpy(&fmap->u.pe.sect[i].shdr, section + i, sizeof(IMAGE_SECTION_HEADER));
+ fmap->u.pe.sect[i].mapped = IMAGE_NO_MAP;
+ }
+ if (nthdr->FileHeader.PointerToSymbolTable && nthdr->FileHeader.NumberOfSymbols)
+ {
+ /* FIXME ugly: should rather map the relevant content instead of copying it */
+ const char* src = (const char*)mapping +
+ nthdr->FileHeader.PointerToSymbolTable +
+ nthdr->FileHeader.NumberOfSymbols * sizeof(IMAGE_SYMBOL);
+ char* dst;
+ DWORD sz = *(DWORD*)src;
+
+ if ((dst = HeapAlloc(GetProcessHeap(), 0, sz)))
+ memcpy(dst, src, sz);
+ fmap->u.pe.strtable = dst;
+ }
+ else fmap->u.pe.strtable = NULL;
+ }
+ break;
+ default: assert(0); goto error;
+ }
+ pe_unmap_full(fmap);
+
+ return TRUE;
+error:
+ pe_unmap_full(fmap);
+ CloseHandle(fmap->u.pe.hMap);
+ return FALSE;
+}
+
+/******************************************************************
+ * pe_unmap_file
+ *
+ * Unmaps an PE file from memory (previously mapped with pe_map_file)
+ */
+static void pe_unmap_file(struct image_file_map* fmap)
+{
+ if (fmap->u.pe.hMap != 0)
{
- if (!strcasecmp((const char*)section->Name, ".stab"))
+ struct image_section_map ism;
+ ism.fmap = fmap;
+ for (ism.sidx = 0; ism.sidx < fmap->u.pe.ntheader.FileHeader.NumberOfSections; ism.sidx++)
{
- stabs = section->VirtualAddress;
- stabsize = section->SizeOfRawData;
+ pe_unmap_section(&ism);
}
- else if (!strncasecmp((const char*)section->Name, ".stabstr", 8))
+ while (fmap->u.pe.full_count) pe_unmap_full(fmap);
+ HeapFree(GetProcessHeap(), 0, fmap->u.pe.sect);
+ HeapFree(GetProcessHeap(), 0, (void*)fmap->u.pe.strtable); /* FIXME ugly (see pe_map_file) */
+ CloseHandle(fmap->u.pe.hMap);
+ fmap->u.pe.hMap = NULL;
+ }
+}
+
+static void pe_module_remove(struct process* pcs, struct module_format* modfmt)
+{
+ pe_unmap_file(&modfmt->u.pe_info->fmap);
+ HeapFree(GetProcessHeap(), 0, modfmt);
+}
+
+/******************************************************************
+ * pe_locate_with_coff_symbol_table
+ *
+ * Use the COFF symbol table (if any) from the IMAGE_FILE_HEADER to set the absolute address
+ * of global symbols.
+ * Mingw32 requires this for stabs debug information as address for global variables isn't filled in
+ * (this is similar to what is done in elf_module.c when using the .symtab ELF section)
+ */
+static BOOL pe_locate_with_coff_symbol_table(struct module* module)
+{
+ struct image_file_map* fmap = &module->format_info[DFI_PE]->u.pe_info->fmap;
+ const IMAGE_SYMBOL* isym;
+ int i, numsym, naux;
+ char tmp[9];
+ const char* name;
+ struct hash_table_iter hti;
+ void* ptr;
+ struct symt_data* sym;
+ const char* mapping;
+
+ numsym = fmap->u.pe.ntheader.FileHeader.NumberOfSymbols;
+ if (!fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable || !numsym)
+ return TRUE;
+ if (!(mapping = pe_map_full(fmap, NULL))) return FALSE;
+ isym = (const IMAGE_SYMBOL*)(mapping + fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable);
+
+ for (i = 0; i < numsym; i+= naux, isym += naux)
+ {
+ if (isym->StorageClass == IMAGE_SYM_CLASS_EXTERNAL &&
+ isym->SectionNumber > 0 && isym->SectionNumber <= fmap->u.pe.ntheader.FileHeader.NumberOfSections)
{
- stabstr = section->VirtualAddress;
- stabstrsize = section->SizeOfRawData;
+ if (isym->N.Name.Short)
+ {
+ name = memcpy(tmp, isym->N.ShortName, 8);
+ tmp[8] = '\0';
+ }
+ else name = fmap->u.pe.strtable + isym->N.Name.Long;
+ if (name[0] == '_') name++;
+ hash_table_iter_init(&module->ht_symbols, &hti, name);
+ while ((ptr = hash_table_iter_up(&hti)))
+ {
+ sym = GET_ENTRY(ptr, struct symt_data, hash_elt);
+ if (sym->symt.tag == SymTagData &&
+ (sym->kind == DataIsGlobal || sym->kind == DataIsFileStatic) &&
+ !strcmp(sym->hash_elt.name, name))
+ {
+ TRACE("Changing absolute address for %d.%s: %lx -> %s\n",
+ isym->SectionNumber, name, sym->u.var.offset,
+ wine_dbgstr_longlong(module->module.BaseOfImage +
+ fmap->u.pe.sect[isym->SectionNumber - 1].shdr.VirtualAddress +
+ isym->Value));
+ sym->u.var.offset = module->module.BaseOfImage +
+ fmap->u.pe.sect[isym->SectionNumber - 1].shdr.VirtualAddress + isym->Value;
+ break;
+ }
+ }
}
+ naux = isym->NumberOfAuxSymbols + 1;
}
+ pe_unmap_full(fmap);
+ return TRUE;
+}
- if (stabstrsize && stabsize)
+/******************************************************************
+ * pe_load_coff_symbol_table
+ *
+ * Load public symbols out of the COFF symbol table (if any).
+ */
+static BOOL pe_load_coff_symbol_table(struct module* module)
+{
+ struct image_file_map* fmap = &module->format_info[DFI_PE]->u.pe_info->fmap;
+ const IMAGE_SYMBOL* isym;
+ int i, numsym, naux;
+ const char* strtable;
+ char tmp[9];
+ const char* name;
+ const char* lastfilename = NULL;
+ struct symt_compiland* compiland = NULL;
+ const IMAGE_SECTION_HEADER* sect;
+ const char* mapping;
+
+ numsym = fmap->u.pe.ntheader.FileHeader.NumberOfSymbols;
+ if (!fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable || !numsym)
+ return TRUE;
+ if (!(mapping = pe_map_full(fmap, NULL))) return FALSE;
+ isym = (const IMAGE_SYMBOL*)((char*)mapping + fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable);
+ /* FIXME: no way to get strtable size */
+ strtable = (const char*)&isym[numsym];
+ sect = IMAGE_FIRST_SECTION(&fmap->u.pe.ntheader);
+
+ for (i = 0; i < numsym; i+= naux, isym += naux)
{
- ret = stabs_parse(module,
- module->module.BaseOfImage - nth->OptionalHeader.ImageBase,
- RtlImageRvaToVa(nth, mapping, stabs, NULL),
- stabsize,
- RtlImageRvaToVa(nth, mapping, stabstr, NULL),
- stabstrsize);
+ if (isym->StorageClass == IMAGE_SYM_CLASS_FILE)
+ {
+ lastfilename = (const char*)(isym + 1);
+ compiland = NULL;
+ }
+ if (isym->StorageClass == IMAGE_SYM_CLASS_EXTERNAL &&
+ isym->SectionNumber > 0 && isym->SectionNumber <= fmap->u.pe.ntheader.FileHeader.NumberOfSections)
+ {
+ if (isym->N.Name.Short)
+ {
+ name = memcpy(tmp, isym->N.ShortName, 8);
+ tmp[8] = '\0';
+ }
+ else name = strtable + isym->N.Name.Long;
+ if (name[0] == '_') name++;
+
+ if (!compiland && lastfilename)
+ compiland = symt_new_compiland(module, 0,
+ source_new(module, NULL, lastfilename));
+
+ if (!(dbghelp_options & SYMOPT_NO_PUBLICS))
+ symt_new_public(module, compiland, name,
+ module->module.BaseOfImage + sect[isym->SectionNumber - 1].VirtualAddress +
+ isym->Value,
+ 1);
+ }
+ naux = isym->NumberOfAuxSymbols + 1;
}
+ module->module.SymType = SymCoff;
+ module->module.LineNumbers = FALSE;
+ module->module.GlobalSymbols = FALSE;
+ module->module.TypeInfo = FALSE;
+ module->module.SourceIndexed = FALSE;
+ module->module.Publics = TRUE;
+ pe_unmap_full(fmap);
+
+ return TRUE;
+}
+
+static inline void* pe_get_sect(IMAGE_NT_HEADERS* nth, void* mapping,
+ IMAGE_SECTION_HEADER* sect)
+{
+ return (sect) ? RtlImageRvaToVa(nth, mapping, sect->VirtualAddress, NULL) : NULL;
+}
+
+static inline DWORD pe_get_sect_size(IMAGE_SECTION_HEADER* sect)
+{
+ return (sect) ? sect->SizeOfRawData : 0;
+}
+
+/******************************************************************
+ * pe_load_stabs
+ *
+ * look for stabs information in PE header (it's how the mingw compiler provides
+ * its debugging information)
+ */
+static BOOL pe_load_stabs(const struct process* pcs, struct module* module)
+{
+ struct image_file_map* fmap = &module->format_info[DFI_PE]->u.pe_info->fmap;
+ struct image_section_map sect_stabs, sect_stabstr;
+ BOOL ret = FALSE;
+ if (pe_find_section(fmap, ".stab", §_stabs) && pe_find_section(fmap, ".stabstr", §_stabstr))
+ {
+ const char* stab;
+ const char* stabstr;
+
+ stab = image_map_section(§_stabs);
+ stabstr = image_map_section(§_stabstr);
+ if (stab != IMAGE_NO_MAP && stabstr != IMAGE_NO_MAP)
+ {
+ ret = stabs_parse(module,
+ module->module.BaseOfImage - fmap->u.pe.ntheader.OptionalHeader.ImageBase,
+ stab, image_get_map_size(§_stabs),
+ stabstr, image_get_map_size(§_stabstr),
+ NULL, NULL);
+ }
+ image_unmap_section(§_stabs);
+ image_unmap_section(§_stabstr);
+ if (ret) pe_locate_with_coff_symbol_table(module);
+ }
TRACE("%s the STABS debug info\n", ret ? "successfully loaded" : "failed to load");
+
+ return ret;
+}
+
+/******************************************************************
+ * pe_load_dwarf
+ *
+ * look for dwarf information in PE header (it's also a way for the mingw compiler
+ * to provide its debugging information)
+ */
+static BOOL pe_load_dwarf(struct module* module)
+{
+ struct image_file_map* fmap = &module->format_info[DFI_PE]->u.pe_info->fmap;
+ BOOL ret = FALSE;
+
+ ret = dwarf2_parse(module,
+ module->module.BaseOfImage - fmap->u.pe.ntheader.OptionalHeader.ImageBase,
+ NULL, /* FIXME: some thunks to deal with ? */
+ fmap);
+ TRACE("%s the DWARF debug info\n", ret ? "successfully loaded" : "failed to load");
+
return ret;
}
*
* Process MSC debug information in PE file.
*/
-static BOOL pe_load_msc_debug_info(const struct process* pcs,
- struct module* module,
- void* mapping, IMAGE_NT_HEADERS* nth)
+static BOOL pe_load_msc_debug_info(const struct process* pcs, struct module* module)
{
+ struct image_file_map* fmap = &module->format_info[DFI_PE]->u.pe_info->fmap;
BOOL ret = FALSE;
const IMAGE_DATA_DIRECTORY* dir;
const IMAGE_DEBUG_DIRECTORY*dbg = NULL;
int nDbg;
+ void* mapping;
+ IMAGE_NT_HEADERS* nth;
+ if (!(mapping = pe_map_full(fmap, &nth))) return FALSE;
/* Read in debug directory */
dir = nth->OptionalHeader.DataDirectory + IMAGE_DIRECTORY_ENTRY_DEBUG;
nDbg = dir->Size / sizeof(IMAGE_DEBUG_DIRECTORY);
- if (!nDbg) return FALSE;
+ if (!nDbg) goto done;
dbg = RtlImageRvaToVa(nth, mapping, dir->VirtualAddress, NULL);
const IMAGE_SECTION_HEADER *sectp = (const IMAGE_SECTION_HEADER*)((const char*)&nth->OptionalHeader + nth->FileHeader.SizeOfOptionalHeader);
/* Debug info is embedded into PE module */
ret = pe_load_debug_directory(pcs, module, mapping, sectp,
- nth->FileHeader.NumberOfSections, dbg, nDbg);
+ nth->FileHeader.NumberOfSections, dbg, nDbg);
}
-
+done:
+ pe_unmap_full(fmap);
return ret;
}
/***********************************************************************
* pe_load_export_debug_info
*/
-static BOOL pe_load_export_debug_info(const struct process* pcs,
- struct module* module,
- void* mapping, IMAGE_NT_HEADERS* nth)
+static BOOL pe_load_export_debug_info(const struct process* pcs, struct module* module)
{
+ struct image_file_map* fmap = &module->format_info[DFI_PE]->u.pe_info->fmap;
unsigned int i;
const IMAGE_EXPORT_DIRECTORY* exports;
DWORD base = module->module.BaseOfImage;
DWORD size;
+ IMAGE_NT_HEADERS* nth;
+ void* mapping;
if (dbghelp_options & SYMOPT_NO_PUBLICS) return TRUE;
+ if (!(mapping = pe_map_full(fmap, &nth))) return FALSE;
#if 0
/* Add start of DLL (better use the (yet unimplemented) Exe SymTag for this) */
/* FIXME: module.ModuleName isn't correctly set yet if it's passed in SymLoadModule */
- symt_new_public(module, NULL, module->module.ModuleName, base, 1,
- TRUE /* FIXME */, TRUE /* FIXME */);
+ symt_new_public(module, NULL, module->module.ModuleName, base, 1);
#endif
/* Add entry point */
symt_new_public(module, NULL, "EntryPoint",
- base + nth->OptionalHeader.AddressOfEntryPoint, 1,
- TRUE, TRUE);
+ base + nth->OptionalHeader.AddressOfEntryPoint, 1);
#if 0
/* FIXME: we'd better store addresses linked to sections rather than
absolute values */
for (i = 0; i < nth->FileHeader.NumberOfSections; i++, section++)
{
symt_new_public(module, NULL, section->Name,
- RtlImageRvaToVa(nth, mapping, section->VirtualAddress, NULL),
- 1, TRUE /* FIXME */, TRUE /* FIXME */);
+ RtlImageRvaToVa(nth, mapping, section->VirtualAddress, NULL), 1);
}
#endif
if (!names[i]) continue;
symt_new_public(module, NULL,
RtlImageRvaToVa(nth, mapping, names[i], NULL),
- base + functions[ordinals[i]],
- 1, TRUE /* FIXME */, TRUE /* FIXME */);
+ base + functions[ordinals[i]], 1);
}
for (i = 0; i < exports->NumberOfFunctions; i++)
if ((ordinals[j] == i) && names[j]) break;
if (j < exports->NumberOfNames) continue;
snprintf(buffer, sizeof(buffer), "%d", i + exports->Base);
- symt_new_public(module, NULL, buffer, base + (DWORD)functions[i], 1,
- TRUE /* FIXME */, TRUE /* FIXME */);
+ symt_new_public(module, NULL, buffer, base + (DWORD)functions[i], 1);
}
}
}
/* no real debug info, only entry points */
if (module->module.SymType == SymDeferred)
module->module.SymType = SymExport;
+ pe_unmap_full(fmap);
+
return TRUE;
}
BOOL pe_load_debug_info(const struct process* pcs, struct module* module)
{
BOOL ret = FALSE;
- HANDLE hFile;
- HANDLE hMap;
- void* mapping;
- IMAGE_NT_HEADERS* nth;
-
- hFile = CreateFileW(module->module.LoadedImageName, GENERIC_READ, FILE_SHARE_READ,
- NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
- if (hFile == INVALID_HANDLE_VALUE) return ret;
- if ((hMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL)) != 0)
- {
- if ((mapping = MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0)) != NULL)
- {
- nth = RtlImageNtHeader(mapping);
- if (!(dbghelp_options & SYMOPT_PUBLICS_ONLY))
- {
- ret = pe_load_stabs(pcs, module, mapping, nth) ||
- pe_load_msc_debug_info(pcs, module, mapping, nth);
- /* if we still have no debug info (we could only get SymExport at this
- * point), then do the SymExport except if we have an ELF container,
- * in which case we'll rely on the export's on the ELF side
- */
- }
-/* FIXME shouldn't we check that? if (!module_get_debug(pcs, module))l */
- if (pe_load_export_debug_info(pcs, module, mapping, nth) && !ret)
- ret = TRUE;
- UnmapViewOfFile(mapping);
- }
- CloseHandle(hMap);
+ if (!(dbghelp_options & SYMOPT_PUBLICS_ONLY))
+ {
+ ret = pe_load_stabs(pcs, module);
+ ret = pe_load_dwarf(module) || ret;
+ ret = pe_load_msc_debug_info(pcs, module) || ret;
+ ret = ret || pe_load_coff_symbol_table(module); /* FIXME */
+ /* if we still have no debug info (we could only get SymExport at this
+ * point), then do the SymExport except if we have an ELF container,
+ * in which case we'll rely on the export's on the ELF side
+ */
}
- CloseHandle(hFile);
+ /* FIXME shouldn't we check that? if (!module_get_debug(pcs, module)) */
+ if (pe_load_export_debug_info(pcs, module) && !ret)
+ ret = TRUE;
return ret;
}
struct module* pe_load_native_module(struct process* pcs, const WCHAR* name,
HANDLE hFile, DWORD base, DWORD size)
{
- struct module* module = NULL;
- BOOL opened = FALSE;
- HANDLE hMap;
- WCHAR loaded_name[MAX_PATH];
+ struct module* module = NULL;
+ BOOL opened = FALSE;
+ struct module_format* modfmt;
+ WCHAR loaded_name[MAX_PATH];
loaded_name[0] = '\0';
if (!hFile)
{
-
assert(name);
if ((hFile = FindExecutableImageExW(name, pcs->search_path, loaded_name, NULL, NULL)) == NULL)
else if (name) strcpyW(loaded_name, name);
else if (dbghelp_options & SYMOPT_DEFERRED_LOADS)
FIXME("Trouble ahead (no module name passed in deferred mode)\n");
-
- if ((hMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL)) != NULL)
+ if (!(modfmt = HeapAlloc(GetProcessHeap(), 0, sizeof(struct module_format) + sizeof(struct pe_module_info))))
+ return NULL;
+ modfmt->u.pe_info = (struct pe_module_info*)(modfmt + 1);
+ if (pe_map_file(hFile, &modfmt->u.pe_info->fmap, DMT_PE))
{
- void* mapping;
+ if (!base) base = modfmt->u.pe_info->fmap.u.pe.ntheader.OptionalHeader.ImageBase;
+ if (!size) size = modfmt->u.pe_info->fmap.u.pe.ntheader.OptionalHeader.SizeOfImage;
- if ((mapping = MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0)) != NULL)
+ 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.ntheader.OptionalHeader.CheckSum);
+ if (module)
{
- IMAGE_NT_HEADERS* nth = RtlImageNtHeader(mapping);
-
- if (nth)
- {
- if (!base) base = nth->OptionalHeader.ImageBase;
- if (!size) size = nth->OptionalHeader.SizeOfImage;
-
- module = module_new(pcs, loaded_name, DMT_PE, FALSE, base, size,
- nth->FileHeader.TimeDateStamp,
- nth->OptionalHeader.CheckSum);
- if (module)
- {
- if (dbghelp_options & SYMOPT_DEFERRED_LOADS)
- module->module.SymType = SymDeferred;
- else
- pe_load_debug_info(pcs, module);
- }
- else
- ERR("could not load the module '%s'\n", debugstr_w(loaded_name));
- }
- UnmapViewOfFile(mapping);
+ modfmt->module = module;
+ modfmt->remove = pe_module_remove;
+ modfmt->loc_compute = NULL;
+
+ module->format_info[DFI_PE] = modfmt;
+ if (dbghelp_options & SYMOPT_DEFERRED_LOADS)
+ module->module.SymType = SymDeferred;
+ else
+ pe_load_debug_info(pcs, module);
+ }
+ else
+ {
+ ERR("could not load the module '%s'\n", debugstr_w(loaded_name));
+ pe_unmap_file(&modfmt->u.pe_info->fmap);
}
- CloseHandle(hMap);
}
+ if (!module) HeapFree(GetProcessHeap(), 0, modfmt);
+
if (opened) CloseHandle(hFile);
return module;
* pe_load_nt_header
*
*/
-BOOL pe_load_nt_header(HANDLE hProc, DWORD base, IMAGE_NT_HEADERS* nth)
+BOOL pe_load_nt_header(HANDLE hProc, DWORD64 base, IMAGE_NT_HEADERS* nth)
{
IMAGE_DOS_HEADER dos;
- return ReadProcessMemory(hProc, (char*)base, &dos, sizeof(dos), NULL) &&
+ return ReadProcessMemory(hProc, (char*)(DWORD_PTR)base, &dos, sizeof(dos), NULL) &&
dos.e_magic == IMAGE_DOS_SIGNATURE &&
- ReadProcessMemory(hProc, (char*)(base + dos.e_lfanew),
+ ReadProcessMemory(hProc, (char*)(DWORD_PTR)(base + dos.e_lfanew),
nth, sizeof(*nth), NULL) &&
nth->Signature == IMAGE_NT_SIGNATURE;
}
*
*/
struct module* pe_load_builtin_module(struct process* pcs, const WCHAR* name,
- DWORD base, DWORD size)
+ DWORD64 base, DWORD64 size)
{
struct module* module = NULL;
*size = nt->OptionalHeader.DataDirectory[dir].Size;
if (image || addr < nt->OptionalHeader.SizeOfHeaders) return (char *)base + addr;
- return RtlImageRvaToVa( nt, (HMODULE)base, addr, section );
+ return RtlImageRvaToVa( nt, base, addr, section );
}
/***********************************************************************
projects / reactos.git / blobdiff