October 2010 - Wine-commits

Eric Pouech : dbghelp: Some more 64bit base address fixes.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: 229d753bc93699bb9b9b6a540e8295c65088cbc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=229d753bc93699bb9b9b6a540… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 9 08:50:56 2010 +0200 dbghelp: Some more 64bit base address fixes. --- dlls/dbghelp/dbghelp_private.h | 4 ++-- dlls/dbghelp/elf_module.c | 4 ++-- dlls/dbghelp/macho_module.c | 4 ++-- dlls/dbghelp/minidump.c | 6 ++++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index aec5bdd..44e62f3 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -509,7 +509,7 @@ typedef BOOL (*enum_modules_cb)(const WCHAR*, unsigned long addr, void* user); /* elf_module.c */ extern BOOL elf_enum_modules(HANDLE hProc, enum_modules_cb, void*); -extern BOOL elf_fetch_file_info(const WCHAR* name, DWORD* base, DWORD* size, DWORD* checksum); +extern BOOL elf_fetch_file_info(const WCHAR* name, DWORD_PTR* base, DWORD* size, DWORD* checksum); struct image_file_map; extern BOOL elf_load_debug_info(struct module* module, struct image_file_map* fmap); extern struct module* @@ -522,7 +522,7 @@ extern int elf_is_in_thunk_area(unsigned long addr, const struct elf_th /* macho_module.c */ #define MACHO_NO_MAP ((const void*)-1) extern BOOL macho_enum_modules(HANDLE hProc, enum_modules_cb, void*); -extern BOOL macho_fetch_file_info(const WCHAR* name, DWORD* base, DWORD* size, DWORD* checksum); +extern BOOL macho_fetch_file_info(const WCHAR* name, DWORD_PTR* base, DWORD* size, DWORD* checksum); struct macho_file_map; extern BOOL macho_load_debug_info(struct module* module, struct macho_file_map* fmap); extern struct module* diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 9b1155e..395b564 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -989,7 +989,7 @@ BOOL elf_load_debug_info(struct module* module, struct image_file_map* fmap) * * Gathers some more information for an ELF module from a given file */ -BOOL elf_fetch_file_info(const WCHAR* name, DWORD* base, +BOOL elf_fetch_file_info(const WCHAR* name, DWORD_PTR* base, DWORD* size, DWORD* checksum) { struct image_file_map fmap; @@ -1502,7 +1502,7 @@ BOOL elf_synchronize_module_list(struct process* pcs) return FALSE; } -BOOL elf_fetch_file_info(const WCHAR* name, DWORD* base, +BOOL elf_fetch_file_info(const WCHAR* name, DWORD_PTR* base, DWORD* size, DWORD* checksum) { return FALSE; diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 9aac3e7..ae67188 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -903,7 +903,7 @@ BOOL macho_load_debug_info(struct module* module, struct macho_file_map* fmap) * * Gathers some more information for a Mach-O module from a given file */ -BOOL macho_fetch_file_info(const WCHAR* name, DWORD* base, +BOOL macho_fetch_file_info(const WCHAR* name, DWORD_PTR* base, DWORD* size, DWORD* checksum) { struct macho_file_map fmap; @@ -1416,7 +1416,7 @@ BOOL macho_synchronize_module_list(struct process* pcs) return FALSE; } -BOOL macho_fetch_file_info(const WCHAR* name, DWORD* base, +BOOL macho_fetch_file_info(const WCHAR* name, DWORD_PTR* base, DWORD* size, DWORD* checksum) { return FALSE; diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 3cddb72..fd7eb1a 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -283,7 +283,8 @@ static BOOL fetch_elf_module_info_cb(const WCHAR* name, unsigned long base, void* user) { struct dump_context* dc = user; - DWORD rbase, size, checksum; + DWORD_PTR rbase; + DWORD size, checksum; /* FIXME: there's no relevant timestamp on ELF modules */ /* NB: if we have a non-null base from the live-target use it (whenever @@ -305,7 +306,8 @@ static BOOL fetch_macho_module_info_cb(const WCHAR* name, unsigned long base, void* user) { struct dump_context* dc = (struct dump_context*)user; - DWORD rbase, size, checksum; + DWORD_PTR rbase; + DWORD size, checksum; /* FIXME: there's no relevant timestamp on Mach-O modules */ /* NB: if we have a non-null base from the live-target use it. If we have

1 0

Eric Pouech : dbghelp: Added a couple of missing CodeView base types ( used in 64bit compilation).
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: b164155447907390e53a02fcfef916dd29325570 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b164155447907390e53a02fcf… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 9 08:51:02 2010 +0200 dbghelp: Added a couple of missing CodeView base types (used in 64bit compilation). --- dlls/dbghelp/msc.c | 95 ++++++++++++++++++++++++++++++++---------------- include/wine/mscvpdb.h | 33 +++++++++++++++++ 2 files changed, 96 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b164155447907390e53a0…

1 0

Eric Pouech : dbghelp: A couple of fixes for 64bit msvc debug info compatibility.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: 580cab9d8bfb8b635b28ee0db0e12438be66ce6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=580cab9d8bfb8b635b28ee0db… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 9 08:51:09 2010 +0200 dbghelp: A couple of fixes for 64bit msvc debug info compatibility. --- dlls/dbghelp/msc.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 4c41ee0..baab45d 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1324,8 +1324,8 @@ static int codeview_parse_type_table(struct codeview_type_parse* ctp) /*======================================================================== * Process CodeView line number information. */ -static unsigned codeview_get_address(const struct msc_debug_info* msc_dbg, - unsigned seg, unsigned offset); +static unsigned long codeview_get_address(const struct msc_debug_info* msc_dbg, + unsigned seg, unsigned offset); static void codeview_snarf_linetab(const struct msc_debug_info* msc_dbg, const BYTE* linetab, int size, BOOL pascal_str) @@ -1338,7 +1338,7 @@ static void codeview_snarf_linetab(const struct msc_debug_info* msc_dbg, const B const unsigned short* linenos; const struct startend* start; unsigned source; - unsigned addr, func_addr0; + unsigned long addr, func_addr0; struct symt_function* func; const struct codeview_linetab_block* ltb; @@ -1379,7 +1379,7 @@ static void codeview_snarf_linetab(const struct msc_debug_info* msc_dbg, const B /* FIXME: at least labels support line numbers */ if (!func || func->symt.tag != SymTagFunction) { - WARN("--not a func at %04x:%08x %x tag=%d\n", + WARN("--not a func at %04x:%08x %lx tag=%d\n", ltb->seg, ltb->offsets[k], addr, func ? func->symt.tag : -1); func = NULL; break; @@ -1396,7 +1396,7 @@ static void codeview_snarf_linetab2(const struct msc_debug_info* msc_dbg, const const char* strimage, DWORD strsize) { unsigned i; - DWORD addr; + DWORD_PTR addr; const struct codeview_linetab2* lt2; const struct codeview_linetab2* lt2_files = NULL; const struct codeview_lt2blk_lines* lines_blk; @@ -1440,7 +1440,7 @@ static void codeview_snarf_linetab2(const struct msc_debug_info* msc_dbg, const /* FIXME: at least labels support line numbers */ if (!func || func->symt.tag != SymTagFunction) { - WARN("--not a func at %04x:%08x %x tag=%d\n", + WARN("--not a func at %04x:%08x %lx tag=%d\n", lines_blk->seg, lines_blk->start, addr, func ? func->symt.tag : -1); break; } @@ -1483,8 +1483,8 @@ static unsigned int codeview_map_offset(const struct msc_debug_info* msc_dbg, return 0; } -static unsigned codeview_get_address(const struct msc_debug_info* msc_dbg, - unsigned seg, unsigned offset) +static unsigned long codeview_get_address(const struct msc_debug_info* msc_dbg, + unsigned seg, unsigned offset) { int nsect = msc_dbg->nsect; const IMAGE_SECTION_HEADER* sectp = msc_dbg->sectp; @@ -1502,7 +1502,7 @@ static inline void codeview_add_variable(const struct msc_debug_info* msc_dbg, { if (name && *name) { - unsigned address = codeview_get_address(msc_dbg, segment, offset); + unsigned long address = codeview_get_address(msc_dbg, segment, offset); if (force || !symt_find_nearest(msc_dbg->module, address)) {

1 0

Eric Pouech : dbghelp: Only map an ELF file once.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: 2a87a89680be2fecd87e73a1fbae1f65d3749441 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a87a89680be2fecd87e73a1f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 9 08:51:15 2010 +0200 dbghelp: Only map an ELF file once. --- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/elf_module.c | 26 ++++++-------------------- dlls/dbghelp/module.c | 2 +- 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 44e62f3..63b9f39 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -511,7 +511,7 @@ typedef BOOL (*enum_modules_cb)(const WCHAR*, unsigned long addr, void* user); extern BOOL elf_enum_modules(HANDLE hProc, enum_modules_cb, void*); extern BOOL elf_fetch_file_info(const WCHAR* name, DWORD_PTR* base, DWORD* size, DWORD* checksum); struct image_file_map; -extern BOOL elf_load_debug_info(struct module* module, struct image_file_map* fmap); +extern BOOL elf_load_debug_info(struct module* module); extern struct module* elf_load_module(struct process* pcs, const WCHAR* name, unsigned long); extern BOOL elf_read_wine_loader_dbg_info(struct process* pcs); diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 395b564..514c288 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -948,12 +948,11 @@ static BOOL elf_load_debug_info_from_map(struct module* module, * * Loads ELF debugging information from the module image file. */ -BOOL elf_load_debug_info(struct module* module, struct image_file_map* fmap) +BOOL elf_load_debug_info(struct module* module) { BOOL ret = TRUE; struct pool pool; struct hash_table ht_symtab; - struct image_file_map my_fmap; struct module_format* modfmt; if (module->type != DMT_ELF || !(modfmt = module->format_info[DFI_ELF]) || !modfmt->u.elf_info) @@ -965,22 +964,9 @@ BOOL elf_load_debug_info(struct module* module, struct image_file_map* fmap) pool_init(&pool, 65536); hash_table_init(&pool, &ht_symtab, 256); - if (!fmap) - { - fmap = &my_fmap; - ret = elf_map_file(module->module.LoadedImageName, fmap); - } - if (ret) - ret = elf_load_debug_info_from_map(module, fmap, &pool, &ht_symtab); - - if (ret) - { - modfmt->u.elf_info->file_map = *fmap; - elf_reset_file_map(fmap); - } + ret = elf_load_debug_info_from_map(module, &modfmt->u.elf_info->file_map, &pool, &ht_symtab); pool_destroy(&pool); - if (fmap == &my_fmap) elf_unmap_file(fmap); return ret; } @@ -1090,14 +1076,14 @@ static BOOL elf_load_file(struct process* pcs, const WCHAR* filename, elf_module_info->elf_addr = load_offset; + elf_module_info->file_map = fmap; + elf_reset_file_map(&fmap); if (dbghelp_options & SYMOPT_DEFERRED_LOADS) { elf_info->module->module.SymType = SymDeferred; - elf_module_info->file_map = fmap; - elf_reset_file_map(&fmap); ret = TRUE; } - else ret = elf_load_debug_info(elf_info->module, &fmap); + else ret = elf_load_debug_info(elf_info->module); elf_module_info->elf_mark = 1; elf_module_info->elf_loader = 0; @@ -1523,7 +1509,7 @@ struct module* elf_load_module(struct process* pcs, const WCHAR* name, unsigned return NULL; } -BOOL elf_load_debug_info(struct module* module, struct image_file_map* fmap) +BOOL elf_load_debug_info(struct module* module) { return FALSE; } diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 89422a9..adadcb7 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -310,7 +310,7 @@ BOOL module_get_debug(struct module_pair* pair) else switch (pair->effective->type) { case DMT_ELF: - ret = elf_load_debug_info(pair->effective, NULL); + ret = elf_load_debug_info(pair->effective); break; case DMT_PE: idslW64.SizeOfStruct = sizeof(idslW64);

1 0

Eric Pouech : dbghelp: When enumerating loaded modules from r_debug structure, pass the address of the dynamic section as well.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: 2662ed10c8032e4b18569c4b2450088123f9c503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2662ed10c8032e4b18569c4b2… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 9 08:51:20 2010 +0200 dbghelp: When enumerating loaded modules from r_debug structure, pass the address of the dynamic section as well. --- dlls/dbghelp/elf_module.c | 61 +++++++++++++++++++++++++++++++------------- 1 files changed, 43 insertions(+), 18 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 514c288..41c046d 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1000,7 +1000,8 @@ BOOL elf_fetch_file_info(const WCHAR* name, DWORD_PTR* base, * 1 on success */ static BOOL elf_load_file(struct process* pcs, const WCHAR* filename, - unsigned long load_offset, struct elf_info* elf_info) + unsigned long load_offset, unsigned long dyn_addr, + struct elf_info* elf_info) { BOOL ret = FALSE; struct image_file_map fmap; @@ -1113,6 +1114,7 @@ leave: static BOOL elf_load_file_from_path(HANDLE hProcess, const WCHAR* filename, unsigned long load_offset, + unsigned long dyn_addr, const char* path, struct elf_info* elf_info) { @@ -1137,7 +1139,7 @@ static BOOL elf_load_file_from_path(HANDLE hProcess, strcpyW(fn, s); strcatW(fn, S_SlashW); strcatW(fn, filename); - ret = elf_load_file(hProcess, fn, load_offset, elf_info); + ret = elf_load_file(hProcess, fn, load_offset, dyn_addr, elf_info); HeapFree(GetProcessHeap(), 0, fn); if (ret) break; s = (t) ? (t+1) : NULL; @@ -1155,6 +1157,7 @@ static BOOL elf_load_file_from_path(HANDLE hProcess, static BOOL elf_load_file_from_dll_path(HANDLE hProcess, const WCHAR* filename, unsigned long load_offset, + unsigned long dyn_addr, struct elf_info* elf_info) { BOOL ret = FALSE; @@ -1175,7 +1178,7 @@ static BOOL elf_load_file_from_dll_path(HANDLE hProcess, MultiByteToWideChar(CP_UNIXCP, 0, path, -1, name, len); strcatW( name, S_SlashW ); strcatW( name, filename ); - ret = elf_load_file(hProcess, name, load_offset, elf_info); + ret = elf_load_file(hProcess, name, load_offset, dyn_addr, elf_info); HeapFree( GetProcessHeap(), 0, name ); } return ret; @@ -1187,7 +1190,7 @@ static BOOL elf_load_file_from_dll_path(HANDLE hProcess, * lookup a file in standard ELF locations, and if found, load it */ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename, - unsigned long load_offset, + unsigned long load_offset, unsigned long dyn_addr, struct elf_info* elf_info) { BOOL ret = FALSE; @@ -1203,20 +1206,24 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename, } if (strstrW(filename, S_libstdcPPW)) return FALSE; /* We know we can't do it */ - ret = elf_load_file(pcs, filename, load_offset, elf_info); + ret = elf_load_file(pcs, filename, load_offset, dyn_addr, elf_info); /* if relative pathname, try some absolute base dirs */ if (!ret && !strchrW(filename, '/')) { - ret = elf_load_file_from_path(pcs, filename, load_offset, + ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, getenv("PATH"), elf_info) || - elf_load_file_from_path(pcs, filename, load_offset, + elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, getenv("LD_LIBRARY_PATH"), elf_info); - if (!ret) ret = elf_load_file_from_dll_path(pcs, filename, load_offset, elf_info); + if (!ret) ret = elf_load_file_from_dll_path(pcs, filename, + load_offset, dyn_addr, elf_info); } return ret; } +typedef BOOL (*enum_elf_modules_cb)(const WCHAR*, unsigned long load_addr, + unsigned long dyn_addr, void* user); + /****************************************************************** * elf_enum_modules_internal * @@ -1224,7 +1231,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename, */ static BOOL elf_enum_modules_internal(const struct process* pcs, const WCHAR* main_name, - enum_modules_cb cb, void* user) + enum_elf_modules_cb cb, void* user) { struct r_debug dbg_hdr; void* lm_addr; @@ -1254,7 +1261,7 @@ static BOOL elf_enum_modules_internal(const struct process* pcs, bufstr[sizeof(bufstr) - 1] = '\0'; MultiByteToWideChar(CP_UNIXCP, 0, bufstr, -1, bufstrW, sizeof(bufstrW) / sizeof(WCHAR)); if (main_name && !bufstrW[0]) strcpyW(bufstrW, main_name); - if (!cb(bufstrW, (unsigned long)lm.l_addr, user)) break; + if (!cb(bufstrW, (unsigned long)lm.l_addr, (unsigned long)lm.l_ld, user)) break; } } return TRUE; @@ -1266,11 +1273,12 @@ struct elf_sync struct elf_info elf_info; }; -static BOOL elf_enum_sync_cb(const WCHAR* name, unsigned long addr, void* user) +static BOOL elf_enum_sync_cb(const WCHAR* name, unsigned long load_addr, + unsigned long dyn_addr, void* user) { struct elf_sync* es = user; - elf_search_and_load_file(es->pcs, name, addr, &es->elf_info); + elf_search_and_load_file(es->pcs, name, load_addr, dyn_addr, &es->elf_info); return TRUE; } @@ -1338,11 +1346,11 @@ static BOOL elf_search_loader(struct process* pcs, struct elf_info* elf_info) { WCHAR tmp[MAX_PATH]; MultiByteToWideChar(CP_ACP, 0, ptr, -1, tmp, sizeof(tmp) / sizeof(WCHAR)); - ret = elf_search_and_load_file(pcs, tmp, 0, elf_info); + ret = elf_search_and_load_file(pcs, tmp, 0, 0, elf_info); } else { - ret = elf_search_and_load_file(pcs, S_WineW, 0, elf_info); + ret = elf_search_and_load_file(pcs, S_WineW, 0, 0, elf_info); } return ret; } @@ -1363,6 +1371,19 @@ BOOL elf_read_wine_loader_dbg_info(struct process* pcs) return (pcs->dbg_hdr_addr = elf_info.dbg_hdr_addr) != 0; } +struct elf_enum_user +{ + enum_modules_cb cb; + void* user; +}; + +static BOOL elf_enum_modules_translate(const WCHAR* name, unsigned long load_addr, + unsigned long dyn_addr, void* user) +{ + struct elf_enum_user* eeu = user; + return eeu->cb(name, load_addr, eeu->user); +} + /****************************************************************** * elf_enum_modules * @@ -1375,13 +1396,16 @@ BOOL elf_enum_modules(HANDLE hProc, enum_modules_cb cb, void* user) struct process pcs; struct elf_info elf_info; BOOL ret; + struct elf_enum_user eeu; memset(&pcs, 0, sizeof(pcs)); pcs.handle = hProc; elf_info.flags = ELF_INFO_DEBUG_HEADER | ELF_INFO_NAME; if (!elf_search_loader(&pcs, &elf_info)) return FALSE; pcs.dbg_hdr_addr = elf_info.dbg_hdr_addr; - ret = elf_enum_modules_internal(&pcs, elf_info.module_name, cb, user); + eeu.cb = cb; + eeu.user = user; + ret = elf_enum_modules_internal(&pcs, elf_info.module_name, elf_enum_modules_translate, &eeu); HeapFree(GetProcessHeap(), 0, (char*)elf_info.module_name); return ret; } @@ -1400,7 +1424,8 @@ struct elf_load * Callback for elf_load_module, used to walk the list of loaded * modules. */ -static BOOL elf_load_cb(const WCHAR* name, unsigned long addr, void* user) +static BOOL elf_load_cb(const WCHAR* name, unsigned long load_addr, + unsigned long dyn_addr, void* user) { struct elf_load* el = user; const WCHAR* p; @@ -1412,7 +1437,7 @@ static BOOL elf_load_cb(const WCHAR* name, unsigned long addr, void* user) if (!p++) p = name; if (!memcmp(p, el->name, lstrlenW(el->name) * sizeof(WCHAR))) { - el->ret = elf_search_and_load_file(el->pcs, name, addr, &el->elf_info); + el->ret = elf_search_and_load_file(el->pcs, name, load_addr, dyn_addr, &el->elf_info); return FALSE; } return TRUE; @@ -1450,7 +1475,7 @@ struct module* elf_load_module(struct process* pcs, const WCHAR* name, unsigned else if (addr) { el.name = name; - el.ret = elf_search_and_load_file(pcs, el.name, addr, &el.elf_info); + el.ret = elf_search_and_load_file(pcs, el.name, addr, 0, &el.elf_info); } if (!el.ret) return NULL; assert(el.elf_info.module);

1 0

Eric Pouech : dbghelp: Compute ELF load address using the link_map ld' s address (and get correct relocation computation).
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: 922caac23bcce7d9264ee38c43f9ce271960aad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=922caac23bcce7d9264ee38c4… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 9 08:51:27 2010 +0200 dbghelp: Compute ELF load address using the link_map ld's address (and get correct relocation computation). --- dlls/dbghelp/elf_module.c | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 41c046d..8b03eaa 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1017,12 +1017,6 @@ static BOOL elf_load_file(struct process* pcs, const WCHAR* filename, if (!fmap.u.elf.elf_start && !load_offset) ERR("Relocatable ELF %s, but no load address. Loading at 0x0000000\n", debugstr_w(filename)); - if (fmap.u.elf.elf_start && load_offset) - { - WARN("Non-relocatable ELF %s, but load address of 0x%08lx supplied. " - "Assuming load address is corrupt\n", debugstr_w(filename), load_offset); - load_offset = 0; - } if (elf_info->flags & ELF_INFO_DEBUG_HEADER) { @@ -1042,6 +1036,9 @@ static BOOL elf_load_file(struct process* pcs, const WCHAR* filename, if (dyn.d_tag == DT_DEBUG) { elf_info->dbg_hdr_addr = dyn.d_un.d_ptr; + if (load_offset == 0 && dyn_addr == 0) /* likely the case */ + /* Assume this module (the Wine loader) has been loaded at its preferred address */ + dyn_addr = ism.fmap->u.elf.sect[ism.sidx].shdr.sh_addr; break; } ptr += sizeof(dyn); @@ -1055,12 +1052,28 @@ static BOOL elf_load_file(struct process* pcs, const WCHAR* filename, { struct elf_module_info *elf_module_info; struct module_format* modfmt; + struct image_section_map ism; + unsigned long modbase = load_offset; + + if (elf_find_section(&fmap, ".dynamic", SHT_DYNAMIC, &ism)) + { + unsigned long rva_dyn = elf_get_map_rva(&ism); + + TRACE("For module %s, got ELF (start=%lx dyn=%lx), link_map (start=%lx dyn=%lx)\n", + debugstr_w(filename), (unsigned long)fmap.u.elf.elf_start, rva_dyn, + load_offset, dyn_addr); + if (dyn_addr && load_offset + rva_dyn != dyn_addr) + { + WARN("\thave to relocate: %lx\n", dyn_addr - rva_dyn); + modbase = dyn_addr - rva_dyn; + } + } else WARN("For module %s, no .dynamic section\n", debugstr_w(filename)); + elf_end_find(&fmap); modfmt = HeapAlloc(GetProcessHeap(), 0, sizeof(struct module_format) + sizeof(struct elf_module_info)); if (!modfmt) goto leave; - elf_info->module = module_new(pcs, filename, DMT_ELF, FALSE, - (load_offset) ? load_offset : fmap.u.elf.elf_start, + elf_info->module = module_new(pcs, filename, DMT_ELF, FALSE, modbase, fmap.u.elf.elf_size, 0, calc_crc32(fmap.u.elf.fd)); if (!elf_info->module) {

1 0

Eric Pouech : dbghelp: Fix some relocation errors for debug formats out of ELF files.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: 854379bbaa2ef25d92a9e3358c0f8b9047556d3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=854379bbaa2ef25d92a9e3358… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 9 08:51:33 2010 +0200 dbghelp: Fix some relocation errors for debug formats out of ELF files. --- dlls/dbghelp/elf_module.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 8b03eaa..a0acb8f 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -636,7 +636,7 @@ static int elf_new_wine_thunks(struct module* module, const struct hash_table* h { if (ste->used) continue; - addr = module->format_info[DFI_ELF]->u.elf_info->elf_addr + ste->symp->st_value; + addr = module->reloc_delta + ste->symp->st_value; j = elf_is_in_thunk_area(ste->symp->st_value, thunks); if (j >= 0) /* thunk found */ @@ -728,7 +728,7 @@ static int elf_new_public_symbols(struct module* module, const struct hash_table while ((ste = hash_table_iter_up(&hti))) { symt_new_public(module, ste->compiland, ste->ht_elt.name, - module->format_info[DFI_ELF]->u.elf_info->elf_addr + ste->symp->st_value, + module->reloc_delta + ste->symp->st_value, ste->symp->st_size); } return TRUE; @@ -926,8 +926,7 @@ static BOOL elf_load_debug_info_from_map(struct module* module, image_unmap_section(&stab_sect); image_unmap_section(&stabstr_sect); } - lret = dwarf2_parse(module, module->format_info[DFI_ELF]->u.elf_info->elf_addr, - thunks, fmap); + lret = dwarf2_parse(module, module->reloc_delta, thunks, fmap); ret = ret || lret; } if (strstrW(module->module.ModuleName, S_ElfW) ||

1 0

Alexandre Julliard : user32/tests: Test GetIconInfoExW too since the A version is broken on Win64.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: d1df0c42eab7c35471f407068fafcb7a4f421ce4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1df0c42eab7c35471f407068… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 9 14:20:34 2010 +0200 user32/tests: Test GetIconInfoExW too since the A version is broken on Win64. --- dlls/user32/tests/cursoricon.c | 30 +++++++++++++++++++++++------- 1 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index cc00ac0..446bdf9 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -66,6 +66,9 @@ static HANDLE child_process; static BOOL (WINAPI *pGetCursorInfo)(CURSORINFO *); static BOOL (WINAPI *pGetIconInfoExA)(HICON,ICONINFOEXA *); +static BOOL (WINAPI *pGetIconInfoExW)(HICON,ICONINFOEXW *); + +static const int is_win64 = (sizeof(void *) > sizeof(int)); static LRESULT CALLBACK callback_child(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { @@ -948,14 +951,26 @@ static void test_LoadImage(void) ok(handle != NULL, "LoadImage() failed.\n"); if (pGetIconInfoExA) { - ICONINFOEXA infoex; - infoex.cbSize = sizeof(infoex); - ret = pGetIconInfoExA( handle, &infoex ); + ICONINFOEXA infoexA; + ICONINFOEXW infoexW; + infoexA.cbSize = sizeof(infoexA); + ret = pGetIconInfoExA( handle, &infoexA ); ok( ret, "GetIconInfoEx failed err %d\n", GetLastError() ); - todo_wine ok( infoex.wResID == (UINT_PTR)IDI_HAND, "GetIconInfoEx wrong resid %x\n", infoex.wResID ); - todo_wine ok( GetModuleHandleA(infoex.szModName) == GetModuleHandleA("user32.dll"), - "GetIconInfoEx wrong module %s\n", infoex.szModName ); - ok( infoex.szResName[0] == 0, "GetIconInfoEx wrong name %s\n", infoex.szResName ); + todo_wine ok( infoexA.wResID == (UINT_PTR)IDI_HAND, "GetIconInfoEx wrong resid %x\n", infoexA.wResID ); + /* the A version is broken on 64-bit, it truncates the string after the first char */ + if (is_win64 && infoexA.szModName[0] && infoexA.szModName[1] == 0) + trace( "GetIconInfoExA broken on Win64\n" ); + else + todo_wine ok( GetModuleHandleA(infoexA.szModName) == GetModuleHandleA("user32.dll"), + "GetIconInfoEx wrong module %s\n", infoexA.szModName ); + ok( infoexA.szResName[0] == 0, "GetIconInfoEx wrong name %s\n", infoexA.szResName ); + infoexW.cbSize = sizeof(infoexW); + ret = pGetIconInfoExW( handle, &infoexW ); + ok( ret, "GetIconInfoEx failed err %d\n", GetLastError() ); + todo_wine ok( infoexW.wResID == (UINT_PTR)IDI_HAND, "GetIconInfoEx wrong resid %x\n", infoexW.wResID ); + todo_wine ok( GetModuleHandleW(infoexW.szModName) == GetModuleHandleA("user32.dll"), + "GetIconInfoEx wrong module %s\n", wine_dbgstr_w(infoexW.szModName) ); + ok( infoexW.szResName[0] == 0, "GetIconInfoEx wrong name %s\n", wine_dbgstr_w(infoexW.szResName) ); } SetLastError(0xdeadbeef); DestroyIcon(handle); @@ -1794,6 +1809,7 @@ START_TEST(cursoricon) { pGetCursorInfo = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetCursorInfo" ); pGetIconInfoExA = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetIconInfoExA" ); + pGetIconInfoExW = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetIconInfoExW" ); test_argc = winetest_get_mainargs(&test_argv); if (test_argc >= 3)

1 0

Alexandre Julliard : jscript: Add a missing terminator to a string constant .
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: 58825125ced5e2dbcbf189e86fe06ec88cebcc4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=58825125ced5e2dbcbf189e86… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 9 16:10:56 2010 +0200 jscript: Add a missing terminator to a string constant. --- dlls/jscript/dispex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 368cb6e..0e823d3 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -804,7 +804,7 @@ HRESULT init_dispex_from_constr(jsdisp_t *dispex, script_ctx_t *ctx, const built dispex_prop_t *prop; HRESULT hres; - static const WCHAR constructorW[] = {'c','o','n','s','t','r','u','c','t','o','r'}; + static const WCHAR constructorW[] = {'c','o','n','s','t','r','u','c','t','o','r',0}; static const WCHAR prototypeW[] = {'p','r','o','t','o','t','y','p','e',0}; hres = find_prop_name_prot(constr, prototypeW, &prop);

1 0

Alexandre Julliard : jscript: Remove an incorrect and unnecessary error check.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: 33d091fef60ffc10f8e2b1704a848a85c19cc7aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d091fef60ffc10f8e2b1704… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 9 16:48:23 2010 +0200 jscript: Remove an incorrect and unnecessary error check. --- dlls/jscript/error.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index a8f1dcd..20911a8 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -105,8 +105,6 @@ static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, msg = NULL; }else { ret = SysAllocString(object_errorW); - if(!V_BSTR(retv)) - hres = E_OUTOFMEMORY; } }

1 0