February 2007 - Wine-Commits

Eric Pouech : dbghelp: Now load the . gnu_debuglink file using Unicode search paths.
by Alexandre Julliard Feb. 22, 2007

Feb. 22, 2007

Module: wine Branch: master Commit: 0c1e33bb06a04b8be9ff33f7d742a97285455c27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c1e33bb06a04b8be9ff33f7d… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Feb 21 21:56:37 2007 +0100 dbghelp: Now load the .gnu_debuglink file using Unicode search paths. --- dlls/dbghelp/elf_module.c | 57 +++++++++++++++++++++++---------------------- 1 files changed, 29 insertions(+), 28 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index e9111a0..092dbc9 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -816,43 +816,46 @@ static BOOL elf_load_debug_info_from_map(struct module* module, * is the global debug file directory, and execdir has been turned * into a relative path)." (from GDB manual) */ -static char* elf_locate_debug_link(const char* filename, const WCHAR* loaded_file, +static WCHAR* elf_locate_debug_link(const char* filename, const WCHAR* loaded_file, struct elf_file_map* fmap_link) { - static const char globalDebugDir[] = "/usr/lib/debug/"; - const size_t globalDebugDirLen = strlen(globalDebugDir); - size_t loaded_file_len; - char* p; - char* slash; - - loaded_file_len = WideCharToMultiByte(CP_UNIXCP, 0, loaded_file, -1, NULL, 0, NULL, NULL); + static const WCHAR globalDebugDirW[] = {'/','u','s','r','/','l','i','b','/','d','e','b','u','g','/'}; + static const WCHAR dotDebugW[] = {'.','d','e','b','u','g','/'}; + const size_t globalDebugDirLen = sizeof(globalDebugDirW) / sizeof(WCHAR); + size_t filename_len; + WCHAR* p; + WCHAR* slash; + + filename_len = MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, NULL, 0); p = HeapAlloc(GetProcessHeap(), 0, - globalDebugDirLen + loaded_file_len + 6 + 1 + strlen(filename) + 1); - + (globalDebugDirLen + strlenW(loaded_file) + 6 + 1 + filename_len + 1) * sizeof(WCHAR)); if (!p) return FALSE; /* we prebuild the string with "execdir" */ - WideCharToMultiByte(CP_UNIXCP, 0, loaded_file, -1, p, loaded_file_len, NULL, NULL); - slash = strrchr(p, '/'); + strcpyW(p, loaded_file); + slash = strrchrW(p, '/'); if (slash == NULL) slash = p; else slash++; /* testing execdir/filename */ - strcpy(slash, filename); - if (elf_map_fileA(p, fmap_link)) goto found; + MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, slash, filename_len); + if (elf_map_file(p, fmap_link)) goto found; + + HeapValidate(GetProcessHeap(), 0, 0); /* testing execdir/.debug/filename */ - sprintf(slash, ".debug/%s", filename); - if (elf_map_fileA(p, fmap_link)) goto found; + memcpy(slash, dotDebugW, sizeof(dotDebugW)); + MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, slash + sizeof(dotDebugW) / sizeof(WCHAR), filename_len); + if (elf_map_file(p, fmap_link)) goto found; /* testing globaldebugdir/execdir/filename */ - memmove(p + globalDebugDirLen, p, slash - p); - memcpy(p, globalDebugDir, globalDebugDirLen); + memmove(p + globalDebugDirLen, p, (slash - p) * sizeof(WCHAR)); + memcpy(p, globalDebugDirW, globalDebugDirLen * sizeof(WCHAR)); slash += globalDebugDirLen; - strcpy(slash, filename); - if (elf_map_fileA(p, fmap_link)) goto found; + MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, slash, filename_len); + if (elf_map_file(p, fmap_link)) goto found; - strcpy(p, filename); - if (elf_map_fileA(p, fmap_link)) goto found; + /* finally testing filename */ + if (elf_map_file(slash, fmap_link)) goto found; HeapFree(GetProcessHeap(), 0, p); @@ -860,7 +863,7 @@ static char* elf_locate_debug_link(const char* filename, const WCHAR* loaded_fil return NULL; found: - TRACE("Located debug information file %s at %s\n", filename, p); + TRACE("Located debug information file %s at %s\n", filename, debugstr_w(p)); return p; } @@ -884,7 +887,7 @@ static BOOL elf_debuglink_parse (struct module* module, BOOL ret = FALSE; const char* dbg_link = (char*)debuglink; struct elf_file_map fmap_link; - char* link_file; + WCHAR* link_file; link_file = elf_locate_debug_link(dbg_link, module->module.LoadedImageName, &fmap_link); @@ -895,11 +898,9 @@ static BOOL elf_debuglink_parse (struct module* module, ret = elf_load_debug_info_from_map(module, &fmap_link, pool, ht_symtab); if (ret) - MultiByteToWideChar(CP_ACP, 0, link_file, -1, - module->module.LoadedPdbName, - sizeof(module->module.LoadedPdbName)); + strcpyW(module->module.LoadedPdbName,link_file); else - WARN("Couldn't load debug information from %s\n", link_file); + WARN("Couldn't load debug information from %s\n", debugstr_w(link_file)); elf_unmap_file(&fmap_link); HeapFree(GetProcessHeap(), 0, link_file); }

1 0

Eric Pouech : dbghelp: Added helper to map a Unicode file.
by Alexandre Julliard Feb. 22, 2007

Feb. 22, 2007

Module: wine Branch: master Commit: 4aab16129731db60242d7c54f82b1af60975b8a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aab16129731db60242d7c54f… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Feb 21 21:56:32 2007 +0100 dbghelp: Added helper to map a Unicode file. --- dlls/dbghelp/elf_module.c | 38 ++++++++++++++++++++++---------------- 1 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 14051b1..e9111a0 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -192,7 +192,7 @@ static inline unsigned elf_get_map_size(struct elf_file_map* fmap, int sidx) * * Maps an ELF file into memory (and checks it's a real ELF file) */ -static BOOL elf_map_file(const char* filename, struct elf_file_map* fmap) +static BOOL elf_map_fileA(const char* filename, struct elf_file_map* fmap) { static const BYTE elf_signature[4] = { ELFMAG0, ELFMAG1, ELFMAG2, ELFMAG3 }; struct stat statbuf; @@ -248,6 +248,20 @@ static BOOL elf_map_file(const char* filename, struct elf_file_map* fmap) return TRUE; } +static BOOL elf_map_file(const WCHAR* filenameW, struct elf_file_map* fmap) +{ + char* filename; + unsigned len; + BOOL ret; + + len = WideCharToMultiByte(CP_UNIXCP, 0, filenameW, -1, NULL, 0, NULL, NULL); + if (!(filename = HeapAlloc(GetProcessHeap(), 0, len))) return FALSE; + WideCharToMultiByte(CP_UNIXCP, 0, filenameW, -1, filename, len, NULL, NULL); + ret = elf_map_fileA(filename, fmap); + HeapFree(GetProcessHeap(), 0, filename); + return ret; +} + /****************************************************************** * elf_unmap_file * @@ -824,21 +838,21 @@ static char* elf_locate_debug_link(const char* filename, const WCHAR* loaded_fil /* testing execdir/filename */ strcpy(slash, filename); - if (elf_map_file(p, fmap_link)) goto found; + if (elf_map_fileA(p, fmap_link)) goto found; /* testing execdir/.debug/filename */ sprintf(slash, ".debug/%s", filename); - if (elf_map_file(p, fmap_link)) goto found; + if (elf_map_fileA(p, fmap_link)) goto found; /* testing globaldebugdir/execdir/filename */ memmove(p + globalDebugDirLen, p, slash - p); memcpy(p, globalDebugDir, globalDebugDirLen); slash += globalDebugDirLen; strcpy(slash, filename); - if (elf_map_file(p, fmap_link)) goto found; + if (elf_map_fileA(p, fmap_link)) goto found; strcpy(p, filename); - if (elf_map_file(p, fmap_link)) goto found; + if (elf_map_fileA(p, fmap_link)) goto found; HeapFree(GetProcessHeap(), 0, p); @@ -1108,12 +1122,8 @@ BOOL elf_load_debug_info(struct module* module, struct elf_file_map* fmap) if (!fmap) { - char LoadedImageName[MAX_PATH]; - fmap = &my_fmap; - WideCharToMultiByte(CP_UNIXCP, 0, module->module.LoadedImageName, -1, - LoadedImageName, MAX_PATH, NULL, NULL); - ret = elf_map_file(LoadedImageName, fmap); + ret = elf_map_file(module->module.LoadedImageName, fmap); } if (ret) ret = elf_load_debug_info_from_map(module, fmap, &pool, &ht_symtab); @@ -1132,10 +1142,8 @@ BOOL elf_fetch_file_info(const WCHAR* name, DWORD* base, DWORD* size, DWORD* checksum) { struct elf_file_map fmap; - char tmp[MAX_PATH]; - WideCharToMultiByte(CP_UNIXCP, 0, name, -1, tmp, sizeof(tmp), 0, 0); - if (!elf_map_file(tmp, &fmap)) return FALSE; + if (!elf_map_file(name, &fmap)) return FALSE; if (base) *base = fmap.elf_start; *size = fmap.elf_size; *checksum = calc_crc32(&fmap); @@ -1160,12 +1168,10 @@ static BOOL elf_load_file(struct process* pcs, const WCHAR* filename, BOOL ret = FALSE; struct elf_file_map fmap; int i; - char tmp[MAX_PATH]; TRACE("Processing elf file '%s' at %08lx\n", debugstr_w(filename), load_offset); - WideCharToMultiByte(CP_UNIXCP, 0, filename, -1, tmp, sizeof(tmp), NULL, NULL); - if (!elf_map_file(tmp, &fmap)) goto leave; + if (!elf_map_file(filename, &fmap)) goto leave; /* Next, we need to find a few of the internal ELF headers within * this thing. We need the main executable header, and the section

1 0

Eric Pouech : dbghelp: Now moving the ELF loading code to Unicode.
by Alexandre Julliard Feb. 22, 2007

Feb. 22, 2007

Module: wine Branch: master Commit: 3565d93ebeebf51892e41113994b781a72661bb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3565d93ebeebf51892e411139… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Feb 21 21:56:27 2007 +0100 dbghelp: Now moving the ELF loading code to Unicode. --- dlls/dbghelp/dbghelp_private.h | 3 + dlls/dbghelp/elf_module.c | 131 ++++++++++++++++++++++------------------ dlls/dbghelp/module.c | 5 +- 3 files changed, 79 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3565d93ebeebf51892e41…

1 0

Eric Pouech : dbghelp: Move elf_fetch_file_info to Unicode.
by Alexandre Julliard Feb. 22, 2007

Feb. 22, 2007

Module: wine Branch: master Commit: c1269392e0d1b73063ee9adde6058e2fffaff864 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1269392e0d1b73063ee9adde… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Feb 21 21:56:22 2007 +0100 dbghelp: Move elf_fetch_file_info to Unicode. --- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/elf_module.c | 9 ++++++--- dlls/dbghelp/minidump.c | 4 +--- dlls/dbghelp/path.c | 24 +++++++++--------------- 4 files changed, 17 insertions(+), 22 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 7335702..fedde7e 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -418,7 +418,7 @@ extern void* fetch_buffer(struct process* pcs, unsigned size); #define ELF_NO_MAP ((const void*)0xffffffff) typedef BOOL (*elf_enum_modules_cb)(const WCHAR*, unsigned long addr, void* user); extern BOOL elf_enum_modules(HANDLE hProc, elf_enum_modules_cb, void*); -extern BOOL elf_fetch_file_info(const char* name, DWORD* base, DWORD* size, DWORD* checksum); +extern BOOL elf_fetch_file_info(const WCHAR* name, DWORD* base, DWORD* size, DWORD* checksum); struct elf_file_map; extern BOOL elf_load_debug_info(struct module* module, struct elf_file_map* fmap); extern struct module* diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index f6f5117..02b13dc 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1128,11 +1128,14 @@ BOOL elf_load_debug_info(struct module* module, struct elf_file_map* fmap) * * Gathers some more information for an ELF module from a given file */ -BOOL elf_fetch_file_info(const char* name, DWORD* base, +BOOL elf_fetch_file_info(const WCHAR* name, DWORD* base, DWORD* size, DWORD* checksum) { struct elf_file_map fmap; - if (!elf_map_file(name, &fmap)) return FALSE; + char tmp[MAX_PATH]; + + WideCharToMultiByte(CP_UNIXCP, 0, name, -1, tmp, sizeof(tmp), 0, 0); + if (!elf_map_file(tmp, &fmap)) return FALSE; if (base) *base = fmap.elf_start; *size = fmap.elf_size; *checksum = calc_crc32(&fmap); @@ -1594,7 +1597,7 @@ BOOL elf_synchronize_module_list(struct process* pcs) return FALSE; } -BOOL elf_fetch_file_info(const char* name, DWORD* base, +BOOL elf_fetch_file_info(const WCHAR* name, DWORD* base, DWORD* size, DWORD* checksum) { return FALSE; diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index f512580..7c3ec6f 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -275,15 +275,13 @@ static BOOL fetch_elf_module_info_cb(const WCHAR* name, unsigned long base, { struct dump_context* dc = (struct dump_context*)user; DWORD rbase, size, checksum; - char tmp[MAX_PATH]; /* FIXME: there's no relevant timestamp on ELF modules */ /* NB: if we have a non-null base from the live-target use it (whenever * the ELF module is relocatable or not). If we have a null base (ELF * module isn't relocatable) then grab its base address from ELF file */ - WideCharToMultiByte(CP_UNIXCP, 0, name, -1, tmp, sizeof(tmp), 0, 0); - if (!elf_fetch_file_info(tmp, &rbase, &size, &checksum)) + if (!elf_fetch_file_info(name, &rbase, &size, &checksum)) size = checksum = 0; add_module(dc, name, base ? base : rbase, size, 0 /* FIXME */, checksum, TRUE); return TRUE; diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index 1bc59b7..bd97437 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -392,26 +392,20 @@ static BOOL CALLBACK sffip_cb(LPCWSTR buffer, void* user) } break; case DMT_ELF: + if (elf_fetch_file_info(buffer, 0, &size, &checksum)) { - char fn[MAX_PATH]; - - WideCharToMultiByte(CP_ACP, 0, buffer, -1, fn, MAX_PATH, NULL, NULL); - - if (elf_fetch_file_info(fn, 0, &size, &checksum)) - { - if (checksum != (DWORD_PTR)s->id) - { - WARN("Found %s, but wrong checksums: %08x %08lx\n", - debugstr_w(buffer), checksum, (DWORD_PTR)s->id); - return FALSE; - } - } - else + if (checksum != (DWORD_PTR)s->id) { - WARN("Couldn't read %s\n", debugstr_w(buffer)); + WARN("Found %s, but wrong checksums: %08x %08lx\n", + debugstr_w(buffer), checksum, (DWORD_PTR)s->id); return FALSE; } } + else + { + WARN("Couldn't read %s\n", debugstr_w(buffer)); + return FALSE; + } break; case DMT_PDB: {

1 0

Eric Pouech : dbghelp: Make elf_enum_modules a Unicode function.
by Alexandre Julliard Feb. 22, 2007

Feb. 22, 2007

Module: wine Branch: master Commit: 039d54a4bf4c9ee15669bbfedbcda6920ba3cfbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=039d54a4bf4c9ee15669bbfed… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Feb 21 21:56:17 2007 +0100 dbghelp: Make elf_enum_modules a Unicode function. --- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/elf_module.c | 19 +++++++++++++------ dlls/dbghelp/minidump.c | 10 +++++----- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index e4bc029..7335702 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -416,7 +416,7 @@ extern void* fetch_buffer(struct process* pcs, unsigned size); /* elf_module.c */ #define ELF_NO_MAP ((const void*)0xffffffff) -typedef BOOL (*elf_enum_modules_cb)(const char*, unsigned long addr, void* user); +typedef BOOL (*elf_enum_modules_cb)(const WCHAR*, unsigned long addr, void* user); extern BOOL elf_enum_modules(HANDLE hProc, elf_enum_modules_cb, void*); extern BOOL elf_fetch_file_info(const char* name, DWORD* base, DWORD* size, DWORD* checksum); struct elf_file_map; diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index a404a73..f6f5117 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1358,9 +1358,10 @@ static BOOL elf_enum_modules_internal(const struct process* pcs, void* lm_addr; struct link_map lm; char bufstr[256]; + WCHAR bufstrW[MAX_PATH]; if (!pcs->dbg_hdr_addr || - !ReadProcessMemory(pcs->handle, (void*)pcs->dbg_hdr_addr, + !ReadProcessMemory(pcs->handle, (void*)pcs->dbg_hdr_addr, &dbg_hdr, sizeof(dbg_hdr), NULL)) return FALSE; @@ -1380,7 +1381,8 @@ static BOOL elf_enum_modules_internal(const struct process* pcs, { bufstr[sizeof(bufstr) - 1] = '\0'; if (main_name && !bufstr[0]) strcpy(bufstr, main_name); - if (!cb(bufstr, (unsigned long)lm.l_addr, user)) break; + MultiByteToWideChar(CP_UNIXCP, 0, bufstr, -1, bufstrW, sizeof(bufstrW) / sizeof(WCHAR)); + if (!cb(bufstrW, (unsigned long)lm.l_addr, user)) break; } } return TRUE; @@ -1392,14 +1394,16 @@ struct elf_sync struct elf_info elf_info; }; -static BOOL elf_enum_sync_cb(const char* name, unsigned long addr, void* user) +static BOOL elf_enum_sync_cb(const WCHAR* name, unsigned long addr, void* user) { struct elf_sync* es = user; + char tmp[MAX_PATH]; - elf_search_and_load_file(es->pcs, name, addr, &es->elf_info); + WideCharToMultiByte(CP_UNIXCP, 0, name, -1, tmp, sizeof(tmp), 0, 0); + elf_search_and_load_file(es->pcs, tmp, addr, &es->elf_info); return TRUE; } - + /****************************************************************** * elf_synchronize_module_list * @@ -1520,10 +1524,13 @@ struct elf_load * Callback for elf_load_module, used to walk the list of loaded * modules. */ -static BOOL elf_load_cb(const char* name, unsigned long addr, void* user) +static BOOL elf_load_cb(const WCHAR* nameW, unsigned long addr, void* user) { struct elf_load* el = user; const char* p; + char name[MAX_PATH]; + + WideCharToMultiByte(CP_UNIXCP, 0, nameW, -1, name, sizeof(name), 0, 0); /* memcmp is needed for matches when bufstr contains also version information * el->name: libc.so, name: libc.so.6.0 diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 68c8f89..f512580 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -270,22 +270,22 @@ static BOOL WINAPI fetch_pe_module_info_cb(WCHAR* name, DWORD64 base, DWORD size * * Callback for accumulating in dump_context an ELF modules set */ -static BOOL fetch_elf_module_info_cb(const char* name, unsigned long base, +static BOOL fetch_elf_module_info_cb(const WCHAR* name, unsigned long base, void* user) { struct dump_context* dc = (struct dump_context*)user; DWORD rbase, size, checksum; - WCHAR tmp[MAX_PATH]; + char tmp[MAX_PATH]; /* FIXME: there's no relevant timestamp on ELF modules */ /* NB: if we have a non-null base from the live-target use it (whenever * the ELF module is relocatable or not). If we have a null base (ELF * module isn't relocatable) then grab its base address from ELF file */ - if (!elf_fetch_file_info(name, &rbase, &size, &checksum)) + WideCharToMultiByte(CP_UNIXCP, 0, name, -1, tmp, sizeof(tmp), 0, 0); + if (!elf_fetch_file_info(tmp, &rbase, &size, &checksum)) size = checksum = 0; - MultiByteToWideChar(CP_UNIXCP, 0, name, -1, tmp, sizeof(tmp) / sizeof(WCHAR)); - add_module(dc, tmp, base ? base : rbase, size, 0 /* FIXME */, checksum, TRUE); + add_module(dc, name, base ? base : rbase, size, 0 /* FIXME */, checksum, TRUE); return TRUE; }

1 0

Eric Pouech : dbghelp: Now storing module internal info for minidumps in Unicode.
by Alexandre Julliard Feb. 22, 2007

Feb. 22, 2007

Module: wine Branch: master Commit: 89bc65695ff40dfa4d9310983e7416a8223fbadc URL: http://source.winehq.org/git/wine.git/?a=commit;h=89bc65695ff40dfa4d9310983… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Feb 21 21:56:11 2007 +0100 dbghelp: Now storing module internal info for minidumps in Unicode. --- dlls/dbghelp/minidump.c | 33 +++++++++++++++++---------------- 1 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index a8e2ee0..68c8f89 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -48,7 +48,7 @@ struct dump_module ULONG size; DWORD timestamp; DWORD checksum; - char name[MAX_PATH]; + WCHAR name[MAX_PATH]; }; struct dump_context @@ -219,7 +219,7 @@ static BOOL fetch_thread_info(struct dump_context* dc, int thd_idx, * * Add a module to a dump context */ -static BOOL add_module(struct dump_context* dc, const char* name, +static BOOL add_module(struct dump_context* dc, const WCHAR* name, DWORD base, DWORD size, DWORD timestamp, DWORD checksum, BOOL is_elf) { @@ -231,11 +231,11 @@ static BOOL add_module(struct dump_context* dc, const char* name, ++dc->num_module * sizeof(*dc->module)); if (!dc->module) return FALSE; if (is_elf || - !GetModuleFileNameExA(dc->hProcess, (HMODULE)base, + !GetModuleFileNameExW(dc->hProcess, (HMODULE)base, dc->module[dc->num_module - 1].name, - sizeof(dc->module[dc->num_module - 1].name))) - lstrcpynA(dc->module[dc->num_module - 1].name, name, - sizeof(dc->module[dc->num_module - 1].name)); + sizeof(dc->module[dc->num_module - 1].name) / sizeof(WCHAR))) + lstrcpynW(dc->module[dc->num_module - 1].name, name, + sizeof(dc->module[dc->num_module - 1].name) / sizeof(WCHAR)); dc->module[dc->num_module - 1].base = base; dc->module[dc->num_module - 1].size = size; dc->module[dc->num_module - 1].timestamp = timestamp; @@ -250,14 +250,16 @@ static BOOL add_module(struct dump_context* dc, const char* name, * * Callback for accumulating in dump_context a PE modules set */ -static BOOL WINAPI fetch_pe_module_info_cb(char* name, DWORD base, DWORD size, +static BOOL WINAPI fetch_pe_module_info_cb(WCHAR* name, DWORD64 base, DWORD size, void* user) { struct dump_context* dc = (struct dump_context*)user; IMAGE_NT_HEADERS nth; + if (!validate_addr64(base)) return FALSE; + if (pe_load_nt_header(dc->hProcess, base, &nth)) - add_module((struct dump_context*)user, name, base, size, + add_module((struct dump_context*)user, name, base, size, nth.FileHeader.TimeDateStamp, nth.OptionalHeader.CheckSum, FALSE); return TRUE; @@ -272,7 +274,8 @@ static BOOL fetch_elf_module_info_cb(const char* name, unsigned long base, void* user) { struct dump_context* dc = (struct dump_context*)user; - DWORD rbase, size, checksum; + DWORD rbase, size, checksum; + WCHAR tmp[MAX_PATH]; /* FIXME: there's no relevant timestamp on ELF modules */ /* NB: if we have a non-null base from the live-target use it (whenever @@ -281,13 +284,14 @@ static BOOL fetch_elf_module_info_cb(const char* name, unsigned long base, */ if (!elf_fetch_file_info(name, &rbase, &size, &checksum)) size = checksum = 0; - add_module(dc, name, base ? base : rbase, size, 0 /* FIXME */, checksum, TRUE); + MultiByteToWideChar(CP_UNIXCP, 0, name, -1, tmp, sizeof(tmp) / sizeof(WCHAR)); + add_module(dc, tmp, base ? base : rbase, size, 0 /* FIXME */, checksum, TRUE); return TRUE; } static void fetch_module_info(struct dump_context* dc) { - EnumerateLoadedModules(dc->hProcess, fetch_pe_module_info_cb, dc); + EnumerateLoadedModulesW64(dc->hProcess, fetch_pe_module_info_cb, dc); /* Since we include ELF modules in a separate stream from the regular PE ones, * we can always include those ELF modules (they don't eat lots of space) * And it's always a good idea to have a trace of the loaded ELF modules for @@ -436,13 +440,10 @@ static void dump_modules(struct dump_context* dc, BOOL dump_elf) flags_out |= ModuleWriteTlsData; if (dc->type & MiniDumpWithCodeSegs) flags_out |= ModuleWriteCodeSegs; - ms->Length = MultiByteToWideChar(CP_ACP, 0, - dc->module[i].name, -1, - NULL, 0) * sizeof(WCHAR); + ms->Length = (lstrlenW(dc->module[i].name) + 1) * sizeof(WCHAR); if (sizeof(ULONG) + ms->Length > sizeof(tmp)) FIXME("Buffer overflow!!!\n"); - MultiByteToWideChar(CP_ACP, 0, dc->module[i].name, -1, - ms->Buffer, ms->Length/sizeof(WCHAR)); + lstrcpyW(ms->Buffer, dc->module[i].name); if (dc->cb) {

1 0

Eric Pouech : winedbg: Some enhancements by using Unicode flavors.
by Alexandre Julliard Feb. 22, 2007

Feb. 22, 2007

Module: wine Branch: master Commit: 7694da86abe4c3c8fda662af157072ed36314615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7694da86abe4c3c8fda662af1… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Feb 21 21:56:06 2007 +0100 winedbg: Some enhancements by using Unicode flavors. --- programs/winedbg/tgt_minidump.c | 42 +++++++++++++++++--------------------- 1 files changed, 19 insertions(+), 23 deletions(-) diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index 6b65747..34e5b17 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -132,7 +132,7 @@ static BOOL WINAPI tgt_process_minidump_write(HANDLE hProcess, void* addr, return FALSE; } -BOOL CALLBACK validate_file(PSTR name, void* user) +BOOL CALLBACK validate_file(PCWSTR name, void* user) { return FALSE; /* get the first file we find !! */ } @@ -149,7 +149,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) MINIDUMP_MODULE* mm; MINIDUMP_STRING* mds; char exec_name[1024]; - char name[1024]; + WCHAR nameW[1024]; unsigned len; /* fetch PID */ @@ -173,17 +173,16 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) mds = (MINIDUMP_STRING*)((char*)data->mapping + mm->ModuleNameRva); len = WideCharToMultiByte(CP_ACP, 0, mds->Buffer, mds->Length / sizeof(WCHAR), - name, sizeof(name) - 1, NULL, NULL); - name[len] = 0; - for (ptr = name + len - 1; ptr >= name; ptr--) + exec_name, sizeof(exec_name) - 1, NULL, NULL); + exec_name[len] = 0; + for (ptr = exec_name + len - 1; ptr >= exec_name; ptr--) { if (*ptr == '/' || *ptr == '\\') { - strcpy(exec_name, ptr + 1); + memmove(exec_name, ptr + 1, strlen(ptr + 1) + 1); break; } } - if (ptr < name) strcpy(exec_name, name); } } @@ -294,22 +293,21 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) if (MiniDumpReadDumpStream(data->mapping, Wine_ElfModuleListStream, &dir, &stream, &size)) { - char buffer[MAX_PATH]; + WCHAR buffer[MAX_PATH]; mml = (MINIDUMP_MODULE_LIST*)stream; for (i = 0, mm = &mml->Modules[0]; i < mml->NumberOfModules; i++, mm++) { mds = (MINIDUMP_STRING*)((char*)data->mapping + mm->ModuleNameRva); - len = WideCharToMultiByte(CP_ACP, 0, mds->Buffer, - mds->Length / sizeof(WCHAR), - name, sizeof(name) - 1, NULL, NULL); - name[len] = 0; - if (SymFindFileInPath(hProc, NULL, name, (void*)(DWORD_PTR)mm->CheckSum, - 0, 0, SSRVOPT_DWORD, buffer, validate_file, NULL)) - SymLoadModule(hProc, NULL, buffer, NULL, mm->BaseOfImage, mm->SizeOfImage); + memcpy(nameW, mds->Buffer, mds->Length); + nameW[mds->Length / sizeof(WCHAR)] = 0; + if (SymFindFileInPathW(hProc, NULL, nameW, (void*)(DWORD_PTR)mm->CheckSum, + 0, 0, SSRVOPT_DWORD, buffer, validate_file, NULL)) + SymLoadModuleExW(hProc, NULL, buffer, NULL, mm->BaseOfImage, mm->SizeOfImage, + NULL, 0); else - SymLoadModuleEx(hProc, NULL, name, NULL, mm->BaseOfImage, mm->SizeOfImage, - NULL, SLMFLAG_VIRTUAL); + SymLoadModuleExW(hProc, NULL, nameW, NULL, mm->BaseOfImage, mm->SizeOfImage, + NULL, SLMFLAG_VIRTUAL); } } if (MiniDumpReadDumpStream(data->mapping, ModuleListStream, &dir, &stream, &size)) @@ -318,12 +316,10 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) for (i = 0, mm = &mml->Modules[0]; i < mml->NumberOfModules; i++, mm++) { mds = (MINIDUMP_STRING*)((char*)data->mapping + mm->ModuleNameRva); - len = WideCharToMultiByte(CP_ACP, 0, mds->Buffer, - mds->Length / sizeof(WCHAR), - name, sizeof(name) - 1, NULL, NULL); - name[len] = 0; - SymLoadModule(hProc, NULL, name, NULL, - mm->BaseOfImage, mm->SizeOfImage); + memcpy(nameW, mds->Buffer, mds->Length); + nameW[mds->Length / sizeof(WCHAR)] = 0; + SymLoadModuleExW(hProc, NULL, nameW, NULL, mm->BaseOfImage, mm->SizeOfImage, + NULL, 0); } } if (MiniDumpReadDumpStream(data->mapping, ExceptionStream, &dir, &stream, &size))

1 0

Eric Pouech : dbghelp: A few fixes related to Unicode translation.
by Alexandre Julliard Feb. 22, 2007

Feb. 22, 2007

Module: wine Branch: master Commit: c0fa60f547875bd67f8344093847bec8e7919953 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0fa60f547875bd67f8344093… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Feb 21 21:56:01 2007 +0100 dbghelp: A few fixes related to Unicode translation. --- dlls/dbghelp/dbghelp.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 31dfae7..d79e281 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -191,13 +191,12 @@ BOOL WINAPI SymGetSearchPathW(HANDLE hProcess, LPWSTR szSearchPath, BOOL WINAPI SymGetSearchPath(HANDLE hProcess, LPSTR szSearchPath, DWORD SearchPathLength) { - WCHAR* buffer = HeapAlloc(GetProcessHeap(), 0, SearchPathLength); + WCHAR* buffer = HeapAlloc(GetProcessHeap(), 0, SearchPathLength * sizeof(WCHAR)); BOOL ret = FALSE; if (buffer) { - ret = SymGetSearchPathW(hProcess, buffer, - SearchPathLength * sizeof(WCHAR)); + ret = SymGetSearchPathW(hProcess, buffer, SearchPathLength); if (ret) WideCharToMultiByte(CP_ACP, 0, buffer, SearchPathLength, szSearchPath, SearchPathLength, NULL, NULL);

1 0

Eric Pouech : dbghelp: Moved the internals for registered callback to Unicode.
by Alexandre Julliard Feb. 22, 2007

Feb. 22, 2007

Module: wine Branch: master Commit: 1690cf181570c9376914158533be48012d28d58a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1690cf181570c937691415853… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Feb 21 21:55:56 2007 +0100 dbghelp: Moved the internals for registered callback to Unicode. --- dlls/dbghelp/dbghelp.c | 24 ++++++++++++------------ dlls/dbghelp/module.c | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index c47977e..31dfae7 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -500,10 +500,10 @@ BOOL pcs_callback(const struct process* pcs, ULONG action, void* data) TRACE("%p %u %p\n", pcs, action, data); if (!pcs->reg_cb) return FALSE; - if (pcs->reg_is_unicode) + if (!pcs->reg_is_unicode) { - IMAGEHLP_DEFERRED_SYMBOL_LOAD64* idsl; - IMAGEHLP_DEFERRED_SYMBOL_LOADW64 idslW; + IMAGEHLP_DEFERRED_SYMBOL_LOAD64 idsl; + IMAGEHLP_DEFERRED_SYMBOL_LOADW64* idslW; switch (action) { @@ -516,15 +516,15 @@ BOOL pcs_callback(const struct process* pcs, ULONG action, void* data) case CBA_DEFERRED_SYMBOL_LOAD_FAILURE: case CBA_DEFERRED_SYMBOL_LOAD_PARTIAL: case CBA_DEFERRED_SYMBOL_LOAD_START: - idsl = (IMAGEHLP_DEFERRED_SYMBOL_LOAD64*)(DWORD)data; - idslW.SizeOfStruct = sizeof(idslW); - idslW.BaseOfImage = idsl->BaseOfImage; - idslW.CheckSum = idsl->CheckSum; - idslW.TimeDateStamp = idsl->TimeDateStamp; - MultiByteToWideChar(CP_ACP, 0, idsl->FileName, -1, - idslW.FileName, sizeof(idslW.FileName) / sizeof(WCHAR)); - idslW.Reparse = idsl->Reparse; - data = &idslW; + idslW = (IMAGEHLP_DEFERRED_SYMBOL_LOADW64*)(DWORD)data; + idsl.SizeOfStruct = sizeof(idsl); + idsl.BaseOfImage = idslW->BaseOfImage; + idsl.CheckSum = idslW->CheckSum; + idsl.TimeDateStamp = idslW->TimeDateStamp; + WideCharToMultiByte(CP_ACP, 0, idslW->FileName, -1, + idsl.FileName, sizeof(idsl.FileName), NULL, NULL); + idsl.Reparse = idslW->Reparse; + data = &idsl; break; case CBA_DUPLICATE_SYMBOL: case CBA_EVENT: diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index da621d9..6b166b6 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -275,7 +275,7 @@ struct module* module_get_containee(const struct process* pcs, */ BOOL module_get_debug(struct module_pair* pair) { - IMAGEHLP_DEFERRED_SYMBOL_LOAD64 idsl64; + IMAGEHLP_DEFERRED_SYMBOL_LOADW64 idslW64; if (!pair->requested) return FALSE; /* for a PE builtin, always get info from container */ @@ -293,20 +293,20 @@ BOOL module_get_debug(struct module_pair* pair) ret = elf_load_debug_info(pair->effective, NULL); break; case DMT_PE: - idsl64.SizeOfStruct = sizeof(idsl64); - idsl64.BaseOfImage = pair->effective->module.BaseOfImage; - idsl64.CheckSum = pair->effective->module.CheckSum; - idsl64.TimeDateStamp = pair->effective->module.TimeDateStamp; - WideCharToMultiByte(CP_ACP, 0, pair->effective->module.ImageName, -1, - idsl64.FileName, sizeof(idsl64.FileName), NULL, NULL); - idsl64.Reparse = FALSE; - idsl64.hFile = INVALID_HANDLE_VALUE; - - pcs_callback(pair->pcs, CBA_DEFERRED_SYMBOL_LOAD_START, &idsl64); + idslW64.SizeOfStruct = sizeof(idslW64); + idslW64.BaseOfImage = pair->effective->module.BaseOfImage; + idslW64.CheckSum = pair->effective->module.CheckSum; + idslW64.TimeDateStamp = pair->effective->module.TimeDateStamp; + memcpy(idslW64.FileName, pair->effective->module.ImageName, + sizeof(idslW64.FileName)); + idslW64.Reparse = FALSE; + idslW64.hFile = INVALID_HANDLE_VALUE; + + pcs_callback(pair->pcs, CBA_DEFERRED_SYMBOL_LOAD_START, &idslW64); ret = pe_load_debug_info(pair->pcs, pair->effective); pcs_callback(pair->pcs, ret ? CBA_DEFERRED_SYMBOL_LOAD_COMPLETE : CBA_DEFERRED_SYMBOL_LOAD_FAILURE, - &idsl64); + &idslW64); break; default: ret = FALSE;

1 0

Eric Pouech : dbghelp: Get rid of temporary module_get_type_by_nameA.
by Alexandre Julliard Feb. 22, 2007

Feb. 22, 2007

Module: wine Branch: master Commit: 180127dd94e38cc7b7bd77ed13c67998d98a9aa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=180127dd94e38cc7b7bd77ed1… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Feb 21 21:55:51 2007 +0100 dbghelp: Get rid of temporary module_get_type_by_nameA. --- dlls/dbghelp/dbghelp_private.h | 2 - dlls/dbghelp/module.c | 43 ---------------------------------------- 2 files changed, 0 insertions(+), 45 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index c17c8d3..e4bc029 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -456,8 +456,6 @@ extern struct module* const struct module* inner); extern enum module_type module_get_type_by_name(const WCHAR* name); -extern enum module_type - module_get_type_by_nameA(const char* name); extern void module_reset_debug_info(struct module* module); extern BOOL module_remove(struct process* pcs, struct module* module); diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 56fff82..da621d9 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -403,36 +403,6 @@ enum module_type module_get_type_by_name(const WCHAR* name) return DMT_PE; } -/****************************************************************** - * module_get_type_by_nameA - * - * Guesses a filename type from its extension - */ -enum module_type module_get_type_by_nameA(const char* name) -{ - const char* ptr; - int len = strlen(name); - - /* check for terminating .so or .so.[digit] */ - ptr = strrchr(name, '.'); - if (ptr) - { - if (!strcmp(ptr, ".so") || - (isdigit(ptr[1]) && !ptr[2] && ptr >= name + 3 && !memcmp(ptr - 3, ".so", 3))) - return DMT_ELF; - else if (!strcasecmp(ptr, ".pdb")) - return DMT_PDB; - } - /* wine-[kp]thread is also an ELF module */ - else if (((len > 12 && name[len - 13] == '/') || len == 12) && - (!strcasecmp(name + len - 12, "wine-pthread") || - !strcasecmp(name + len - 12, "wine-kthread"))) - { - return DMT_ELF; - } - return DMT_PE; -} - /*********************************************************************** * SymLoadModule (DBGHELP.@) */ @@ -489,8 +459,6 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam { struct process* pcs; struct module* module = NULL; - char ImageName[MAX_PATH], amodname[MAX_PATH], *ModuleName; - TRACE("(%p %p %s %s %s %08x %p %08x)\n", hProcess, hFile, debugstr_w(wImageName), debugstr_w(wModuleName), @@ -505,8 +473,6 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam if (Flags & SLMFLAG_VIRTUAL) { - WideCharToMultiByte(CP_ACP,0, wImageName, -1, ImageName, MAX_PATH, - NULL, NULL); module = module_new(pcs, wImageName, module_get_type_by_name(wImageName), TRUE, (DWORD)BaseOfDll, SizeOfDll, 0, 0); if (!module) return FALSE; @@ -524,15 +490,6 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam /* this is a Wine extension to the API just to redo the synchronisation */ if (!wImageName && !hFile) return 0; - WideCharToMultiByte(CP_ACP,0, wImageName, -1, ImageName, MAX_PATH, - NULL, NULL); - - if (wModuleName) - WideCharToMultiByte(CP_ACP,0, wModuleName, -1, ModuleName = amodname, MAX_PATH, - NULL, NULL); - else - ModuleName = NULL; - if (module_is_elf_container_loaded(pcs, wImageName, wModuleName)) { /* force the loading of DLL as builtin */

1 0