Commit cf06ef64 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard

dbghelp: Fix ELF file computation on 64bit systems.

parent 4b5641ad
...@@ -102,8 +102,8 @@ const char* elf_map_section(struct image_section_map* ism) ...@@ -102,8 +102,8 @@ const char* elf_map_section(struct image_section_map* ism)
{ {
struct elf_file_map* fmap = &ism->fmap->u.elf; struct elf_file_map* fmap = &ism->fmap->u.elf;
unsigned pgsz = getpagesize(); unsigned long pgsz = getpagesize();
unsigned ofst, size; unsigned long ofst, size;
assert(ism->fmap->modtype == DMT_ELF); assert(ism->fmap->modtype == DMT_ELF);
if (ism->sidx < 0 || ism->sidx >= ism->fmap->u.elf.elfhdr.e_shnum || if (ism->sidx < 0 || ism->sidx >= ism->fmap->u.elf.elfhdr.e_shnum ||
...@@ -168,8 +168,8 @@ void elf_unmap_section(struct image_section_map* ism) ...@@ -168,8 +168,8 @@ void elf_unmap_section(struct image_section_map* ism)
if (ism->sidx >= 0 && ism->sidx < fmap->elfhdr.e_shnum && fmap->sect[ism->sidx].mapped != IMAGE_NO_MAP) if (ism->sidx >= 0 && ism->sidx < fmap->elfhdr.e_shnum && fmap->sect[ism->sidx].mapped != IMAGE_NO_MAP)
{ {
unsigned pgsz = getpagesize(); unsigned long pgsz = getpagesize();
unsigned ofst, size; unsigned long ofst, size;
ofst = fmap->sect[ism->sidx].shdr.sh_offset & ~(pgsz - 1); ofst = fmap->sect[ism->sidx].shdr.sh_offset & ~(pgsz - 1);
size = ((fmap->sect[ism->sidx].shdr.sh_offset + size = ((fmap->sect[ism->sidx].shdr.sh_offset +
...@@ -236,7 +236,7 @@ static BOOL elf_map_file(const WCHAR* filenameW, struct image_file_map* fmap) ...@@ -236,7 +236,7 @@ static BOOL elf_map_file(const WCHAR* filenameW, struct image_file_map* fmap)
struct stat statbuf; struct stat statbuf;
int i; int i;
Elf_Phdr phdr; Elf_Phdr phdr;
unsigned tmp, page_mask = getpagesize() - 1; unsigned long tmp, page_mask = getpagesize() - 1;
char* filename; char* filename;
unsigned len; unsigned len;
BOOL ret = FALSE; BOOL ret = FALSE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment