February 2007 - Wine-Commits

Eric Pouech : dbghelp: Implemented SymFindFileInPathW.
by Alexandre Julliard Feb. 22, 2007

Feb. 22, 2007

Module: wine Branch: master Commit: 2f0ed90c4e86de36d5fa11986de5a4c0debbb962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f0ed90c4e86de36d5fa11986… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Feb 21 21:55:46 2007 +0100 dbghelp: Implemented SymFindFileInPathW. --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/msc.c | 2 +- dlls/dbghelp/path.c | 173 +++++++++++++++++++++++---------------------- dlls/dbghelp/pe_module.c | 2 +- include/dbghelp.h | 5 +- 5 files changed, 94 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f0ed90c4e86de36d5fa1…

1 0

Eric Pouech : dbghelp: Implemented SearchTreeForFileW.
by Alexandre Julliard Feb. 22, 2007

Feb. 22, 2007

Module: wine Branch: master Commit: 9e1f9ec19e46a576f8921658ecc7fb1a7e7b032c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e1f9ec19e46a576f8921658e… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Feb 21 21:55:41 2007 +0100 dbghelp: Implemented SearchTreeForFileW. --- dlls/dbghelp/dbghelp.spec | 4 ++-- dlls/dbghelp/path.c | 26 ++++++++++++++++++++++---- include/dbghelp.h | 1 + 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 0b5a1e4..7c0433b 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -26,8 +26,8 @@ @ stdcall MapDebugInformation(long str str long) @ stdcall MiniDumpReadDumpStream(ptr long ptr ptr ptr) @ stdcall MiniDumpWriteDump(ptr long ptr long long long long) -@ stdcall SearchTreeForFile(str str str) -@ stub SearchTreeForFileW +@ stdcall SearchTreeForFile(str str ptr) +@ stdcall SearchTreeForFileW(wstr wstr ptr) @ stdcall StackWalk(long long long ptr ptr ptr ptr ptr ptr) @ stdcall StackWalk64(long long long ptr ptr ptr ptr ptr ptr) @ stub SymAddSymbol diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index fb7300f..d1273b6 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -273,14 +273,32 @@ static BOOL do_search(const char* file, char* buffer, BOOL recurse, } /*********************************************************************** + * SearchTreeForFileW (DBGHELP.@) + */ +BOOL WINAPI SearchTreeForFileW(PCWSTR root, PCWSTR file, PWSTR buffer) +{ + TRACE("(%s, %s, %p)\n", + debugstr_w(root), debugstr_w(file), buffer); + strcpyW(buffer, root); + return do_searchW(file, buffer, TRUE, NULL, NULL); +} + +/*********************************************************************** * SearchTreeForFile (DBGHELP.@) */ BOOL WINAPI SearchTreeForFile(PCSTR root, PCSTR file, PSTR buffer) { - TRACE("(%s, %s, %p)\n", - debugstr_a(root), debugstr_a(file), buffer); - strcpy(buffer, root); - return do_search(file, buffer, TRUE, NULL, NULL); + WCHAR rootW[MAX_PATH]; + WCHAR fileW[MAX_PATH]; + WCHAR bufferW[MAX_PATH]; + BOOL ret; + + MultiByteToWideChar(CP_ACP, 0, root, -1, rootW, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, file, -1, fileW, MAX_PATH); + ret = SearchTreeForFileW(rootW, fileW, bufferW); + if (ret) + WideCharToMultiByte(CP_ACP, 0, bufferW, -1, buffer, MAX_PATH, NULL, NULL); + return ret; } /****************************************************************** diff --git a/include/dbghelp.h b/include/dbghelp.h index 53c3783..2752f47 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -1020,6 +1020,7 @@ BOOL WINAPI SymSetSearchPathW(HANDLE, PCWSTR); DWORD WINAPI GetTimestampForLoadedLibrary(HMODULE); BOOL WINAPI MakeSureDirectoryPathExists(PCSTR); BOOL WINAPI SearchTreeForFile(PCSTR, PCSTR, PSTR); +BOOL WINAPI SearchTreeForFileW(PCWSTR, PCWSTR, PWSTR); typedef BOOL (CALLBACK *PENUMDIRTREE_CALLBACK)(LPCSTR, PVOID); BOOL WINAPI EnumDirTree(HANDLE, PCSTR, PCSTR, PSTR, PENUMDIRTREE_CALLBACK, void*); typedef BOOL (CALLBACK *PENUMDIRTREE_CALLBACKW)(LPCWSTR, PVOID);

1 0

Eric Pouech : dbghelp: Implemented EnumDirTreeW.
by Alexandre Julliard Feb. 22, 2007

Feb. 22, 2007

Module: wine Branch: master Commit: c0be0032dec3e3fd8327bdf1534f79796e322946 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0be0032dec3e3fd8327bdf15… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Feb 21 21:55:35 2007 +0100 dbghelp: Implemented EnumDirTreeW. --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/path.c | 84 ++++++++++++++++++++++++++++++++++++++++++-- include/dbghelp.h | 2 + 3 files changed, 83 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 174341c..0b5a1e4 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -1,7 +1,7 @@ @ stub DbgHelpCreateUserDump @ stub DbgHelpCreateUserDumpW @ stdcall EnumDirTree(long str str ptr ptr ptr) -@ stub EnumDirTreeW +@ stdcall EnumDirTreeW(long wstr wstr ptr ptr ptr) @ stdcall EnumerateLoadedModules(long ptr ptr) @ stdcall EnumerateLoadedModules64(long ptr ptr) @ stdcall EnumerateLoadedModulesW64(long ptr ptr) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index 5abb8c9..fb7300f 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -201,6 +201,43 @@ BOOL WINAPI SymMatchFileName(char* file, char* match, return mptr == match - 1; } +static BOOL do_searchW(const WCHAR* file, WCHAR* buffer, BOOL recurse, + PENUMDIRTREE_CALLBACKW cb, void* user) +{ + HANDLE h; + WIN32_FIND_DATAW fd; + unsigned pos; + BOOL found = FALSE; + static const WCHAR S_AllW[] = {'*','.','*','\0'}; + static const WCHAR S_DotW[] = {'.','\0'}; + static const WCHAR S_DotDotW[] = {'.','\0'}; + + pos = strlenW(buffer); + if (buffer[pos - 1] != '\\') buffer[pos++] = '\\'; + strcpyW(buffer + pos, S_AllW); + if ((h = FindFirstFileW(buffer, &fd)) == INVALID_HANDLE_VALUE) + return FALSE; + /* doc doesn't specify how the tree is enumerated... + * doing a depth first based on, but may be wrong + */ + do + { + if (!strcmpW(fd.cFileName, S_DotW) || !strcmpW(fd.cFileName, S_DotDotW)) continue; + + strcpyW(buffer + pos, fd.cFileName); + if (recurse && (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + found = do_searchW(file, buffer, TRUE, cb, user); + else if (SymMatchFileNameW(buffer, (WCHAR*)file, NULL, NULL)) + { + if (!cb || cb(buffer, user)) found = TRUE; + } + } while (!found && FindNextFileW(h, &fd)); + if (!found) buffer[--pos] = '\0'; + FindClose(h); + + return found; +} + static BOOL do_search(const char* file, char* buffer, BOOL recurse, PENUMDIRTREE_CALLBACK cb, void* user) { @@ -247,17 +284,56 @@ BOOL WINAPI SearchTreeForFile(PCSTR root, PCSTR file, PSTR buffer) } /****************************************************************** + * EnumDirTreeW (DBGHELP.@) + * + * + */ +BOOL WINAPI EnumDirTreeW(HANDLE hProcess, PCWSTR root, PCWSTR file, + LPWSTR buffer, PENUMDIRTREE_CALLBACKW cb, PVOID user) +{ + TRACE("(%p %s %s %p %p %p)\n", + hProcess, debugstr_w(root), debugstr_w(file), buffer, cb, user); + + strcpyW(buffer, root); + return do_searchW(file, buffer, TRUE, cb, user); +} + +/****************************************************************** * EnumDirTree (DBGHELP.@) * * */ +struct enum_dir_treeWA +{ + PENUMDIRTREE_CALLBACK cb; + void* user; + char name[MAX_PATH]; +}; + +static BOOL CALLBACK enum_dir_treeWA(LPCWSTR name, PVOID user) +{ + struct enum_dir_treeWA* edt = user; + + WideCharToMultiByte(CP_ACP, 0, name, -1, edt->name, MAX_PATH, NULL, NULL); + return edt->cb(edt->name, edt->user); +} + BOOL WINAPI EnumDirTree(HANDLE hProcess, PCSTR root, PCSTR file, LPSTR buffer, PENUMDIRTREE_CALLBACK cb, PVOID user) { - TRACE("(%p %s %s %p %p %p)\n", hProcess, root, file, buffer, cb, user); - - strcpy(buffer, root); - return do_search(file, buffer, TRUE, cb, user); + WCHAR rootW[MAX_PATH]; + WCHAR fileW[MAX_PATH]; + WCHAR bufferW[MAX_PATH]; + struct enum_dir_treeWA edt; + BOOL ret; + + edt.cb = cb; + edt.user = user; + MultiByteToWideChar(CP_ACP, 0, root, -1, rootW, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, file, -1, fileW, MAX_PATH); + if ((ret = EnumDirTreeW(hProcess, rootW, fileW, bufferW, enum_dir_treeWA, &edt))) + WideCharToMultiByte(CP_ACP, 0, bufferW, -1, buffer, MAX_PATH, NULL, NULL); + return ret; } struct sffip diff --git a/include/dbghelp.h b/include/dbghelp.h index ba293ed..53c3783 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -1022,6 +1022,8 @@ BOOL WINAPI MakeSureDirectoryPathExists(PCSTR); BOOL WINAPI SearchTreeForFile(PCSTR, PCSTR, PSTR); typedef BOOL (CALLBACK *PENUMDIRTREE_CALLBACK)(LPCSTR, PVOID); BOOL WINAPI EnumDirTree(HANDLE, PCSTR, PCSTR, PSTR, PENUMDIRTREE_CALLBACK, void*); +typedef BOOL (CALLBACK *PENUMDIRTREE_CALLBACKW)(LPCWSTR, PVOID); +BOOL WINAPI EnumDirTreeW(HANDLE, PCWSTR, PCWSTR, PWSTR, PENUMDIRTREE_CALLBACKW, void*); BOOL WINAPI SymMatchFileName(PSTR, PSTR, PSTR*, PSTR*); BOOL WINAPI SymMatchFileNameW(PWSTR, PWSTR, PWSTR*, PWSTR*); PCHAR WINAPI SymSetHomeDirectory(HANDLE, PCSTR);

1 0

Eric Pouech : dbghelp: Implemented SymMatchFileNameW.
by Alexandre Julliard Feb. 22, 2007

Feb. 22, 2007

Module: wine Branch: master Commit: 8b861202baadc4d3d4dd7a1eda6cf12cbe9e2de1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b861202baadc4d3d4dd7a1ed… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Feb 21 21:55:30 2007 +0100 dbghelp: Implemented SymMatchFileNameW. --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/path.c | 29 +++++++++++++++++++++++++++++ include/dbghelp.h | 1 + 3 files changed, 31 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index a91415e..174341c 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -119,7 +119,7 @@ @ stdcall SymLoadModuleEx(long long str str double long ptr long) @ stdcall SymLoadModuleExW(long long wstr wstr double long ptr long) @ stdcall SymMatchFileName(str str ptr ptr) -@ stub SymMatchFileNameW +@ stdcall SymMatchFileNameW(wstr wstr ptr ptr) @ stdcall SymMatchString(str str long) @ stub SymMatchStringA @ stub SymMatchStringW diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index 331764d..5abb8c9 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); static inline BOOL is_sep(char ch) {return ch == '/' || ch == '\\';} +static inline BOOL is_sepW(WCHAR ch) {return ch == '/' || ch == '\\';} static inline const char* file_name(const char* str) { @@ -146,6 +147,34 @@ BOOL WINAPI MakeSureDirectoryPathExists(LPCSTR DirPath) } /****************************************************************** + * SymMatchFileNameW (DBGHELP.@) + * + */ +BOOL WINAPI SymMatchFileNameW(WCHAR* file, WCHAR* match, + WCHAR** filestop, WCHAR** matchstop) +{ + WCHAR* fptr; + WCHAR* mptr; + + TRACE("(%s %s %p %p)\n", + debugstr_w(file), debugstr_w(match), filestop, matchstop); + + fptr = file + strlenW(file) - 1; + mptr = match + strlenW(match) - 1; + + while (fptr >= file && mptr >= match) + { + if (toupperW(*fptr) != toupperW(*mptr) && !(is_sepW(*fptr) && is_sepW(*mptr))) + break; + fptr--; mptr--; + } + if (filestop) *filestop = fptr; + if (matchstop) *matchstop = mptr; + + return mptr == match - 1; +} + +/****************************************************************** * SymMatchFileName (DBGHELP.@) * */ diff --git a/include/dbghelp.h b/include/dbghelp.h index ee3103b..ba293ed 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -1023,6 +1023,7 @@ BOOL WINAPI SearchTreeForFile(PCSTR, PCSTR, PSTR); typedef BOOL (CALLBACK *PENUMDIRTREE_CALLBACK)(LPCSTR, PVOID); BOOL WINAPI EnumDirTree(HANDLE, PCSTR, PCSTR, PSTR, PENUMDIRTREE_CALLBACK, void*); BOOL WINAPI SymMatchFileName(PSTR, PSTR, PSTR*, PSTR*); +BOOL WINAPI SymMatchFileNameW(PWSTR, PWSTR, PWSTR*, PWSTR*); PCHAR WINAPI SymSetHomeDirectory(HANDLE, PCSTR); PCHAR WINAPI SymGetHomeDirectory(DWORD, PSTR, size_t); #define hdBase 0

1 0

Eric Pouech : dbghelp: Added module_get_type_by_name in Unicode form and keep the ANSI form for compatibility .
by Alexandre Julliard Feb. 22, 2007

Feb. 22, 2007

Module: wine Branch: master Commit: d707fe5ac368a4db6ee138dc8b37075f14ade69d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d707fe5ac368a4db6ee138dc8… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Feb 21 21:55:25 2007 +0100 dbghelp: Added module_get_type_by_name in Unicode form and keep the ANSI form for compatibility. --- dlls/dbghelp/dbghelp_private.h | 4 +++- dlls/dbghelp/module.c | 38 ++++++++++++++++++++++++++++++++++---- dlls/dbghelp/path.c | 2 +- 3 files changed, 38 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index e0bc12e..c17c8d3 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -455,7 +455,9 @@ extern struct module* module_get_containee(const struct process* pcs, const struct module* inner); extern enum module_type - module_get_type_by_name(const char* name); + 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 1edef49..56fff82 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); const WCHAR S_ElfW[] = {'<','e','l','f','>','\0'}; const WCHAR S_WineLoaderW[] = {'<','w','i','n','e','-','l','o','a','d','e','r','>','\0'}; static const WCHAR S_DotSoW[] = {'.','s','o','\0'}; -static const WCHAR S_PdbW[] = {'.','p','d','b','\0'}; +static const WCHAR S_DotPdbW[] = {'.','p','d','b','\0'}; static const WCHAR S_WinePThreadW[] = {'w','i','n','e','-','p','t','h','r','e','a','d','\0'}; static const WCHAR S_WineKThreadW[] = {'w','i','n','e','-','k','t','h','r','e','a','d','\0'}; @@ -378,7 +378,37 @@ static BOOL module_is_elf_container_loaded(struct process* pcs, * * Guesses a filename type from its extension */ -enum module_type module_get_type_by_name(const char* name) +enum module_type module_get_type_by_name(const WCHAR* name) +{ + const WCHAR*ptr; + int len = strlenW(name); + + /* check for terminating .so or .so.[digit] */ + ptr = strrchrW(name, '.'); + if (ptr) + { + if (!strcmpW(ptr, S_DotSoW) || + (isdigit(ptr[1]) && !ptr[2] && ptr >= name + 3 && !memcmp(ptr - 3, S_DotSoW, 3))) + return DMT_ELF; + else if (!strcmpiW(ptr, S_DotPdbW)) + return DMT_PDB; + } + /* wine-[kp]thread is also an ELF module */ + else if (((len > 12 && name[len - 13] == '/') || len == 12) && + (!strcmpiW(name + len - 12, S_WinePThreadW) || + !strcmpiW(name + len - 12, S_WineKThreadW))) + { + return DMT_ELF; + } + 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); @@ -477,7 +507,7 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam { WideCharToMultiByte(CP_ACP,0, wImageName, -1, ImageName, MAX_PATH, NULL, NULL); - module = module_new(pcs, wImageName, module_get_type_by_name(ImageName), + module = module_new(pcs, wImageName, module_get_type_by_name(wImageName), TRUE, (DWORD)BaseOfDll, SizeOfDll, 0, 0); if (!module) return FALSE; if (wModuleName) module_set_module(module, wModuleName); @@ -515,7 +545,7 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam TRACE("Assuming %s as native DLL\n", debugstr_w(wImageName)); if (!(module = pe_load_module(pcs, wImageName, hFile, BaseOfDll, SizeOfDll))) { - if (module_get_type_by_name(ImageName) == DMT_ELF && + if (module_get_type_by_name(wImageName) == DMT_ELF && (module = elf_load_module(pcs, wImageName, BaseOfDll))) goto done; FIXME("Should have successfully loaded debug information for image %s\n", diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index 7c4b2e0..331764d 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -404,7 +404,7 @@ BOOL WINAPI SymFindFileInPath(HANDLE hProcess, PCSTR inSearchPath, PCSTR full_pa s.user = user; filename = file_name(full_path); - s.kind = module_get_type_by_name(filename); + s.kind = module_get_type_by_nameA(filename); /* first check full path to file */ if (sffip_cb(full_path, &s))

1 0

Eric Pouech : dbghelp: Moved ELF module loading interfaces to Unicode.
by Alexandre Julliard Feb. 22, 2007

Feb. 22, 2007

Module: wine Branch: master Commit: 46684a9fb6d95df85494b081f98801c9b88df3e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46684a9fb6d95df85494b081f… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Feb 21 21:55:20 2007 +0100 dbghelp: Moved ELF module loading interfaces to Unicode. The core the code remains ANSI, as all the information is stored as ANSI. --- dlls/dbghelp/dbghelp_private.h | 7 +------ dlls/dbghelp/elf_module.c | 30 ++++++++++++++++++------------ dlls/dbghelp/module.c | 13 +------------ 3 files changed, 20 insertions(+), 30 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index d1c439e..e0bc12e 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -422,7 +422,7 @@ extern BOOL elf_fetch_file_info(const char* name, DWORD* base, DWORD* si struct elf_file_map; extern BOOL elf_load_debug_info(struct module* module, struct elf_file_map* fmap); extern struct module* - elf_load_module(struct process* pcs, const char* name, unsigned long); + elf_load_module(struct process* pcs, const WCHAR* name, unsigned long); extern BOOL elf_read_wine_loader_dbg_info(struct process* pcs); extern BOOL elf_synchronize_module_list(struct process* pcs); struct elf_thunk_area; @@ -449,11 +449,6 @@ extern struct module* unsigned long addr, unsigned long size, unsigned long stamp, unsigned long checksum); extern struct module* - module_newA(struct process* pcs, const char* name, - enum module_type type, BOOL virtual, - unsigned long addr, unsigned long size, - unsigned long stamp, unsigned long checksum); -extern struct module* module_get_container(const struct process* pcs, const struct module* inner); extern struct module* diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 3986281..a404a73 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1063,7 +1063,7 @@ static BOOL elf_load_debug_info_from_map(struct module* module, dbg_link = (const BYTE*) elf_map_section(fmap, debuglink_sect); if (dbg_link != ELF_NO_MAP) { - lret = elf_debuglink_parse (module, pool, ht_symtab, dbg_link); + lret = elf_debuglink_parse(module, pool, ht_symtab, dbg_link); if (!lret) WARN("Couldn't load linked debug file for %s\n", debugstr_w(module->module.ModuleName)); @@ -1111,7 +1111,7 @@ BOOL elf_load_debug_info(struct module* module, struct elf_file_map* fmap) char LoadedImageName[MAX_PATH]; fmap = &my_fmap; - WideCharToMultiByte(CP_ACP, 0, module->module.LoadedImageName, -1, + WideCharToMultiByte(CP_UNIXCP, 0, module->module.LoadedImageName, -1, LoadedImageName, MAX_PATH, NULL, NULL); ret = elf_map_file(LoadedImageName, fmap); } @@ -1209,12 +1209,14 @@ static BOOL elf_load_file(struct process* pcs, const char* filename, if (elf_info->flags & ELF_INFO_MODULE) { + WCHAR wfilename[MAX_PATH]; struct elf_module_info *elf_module_info = HeapAlloc(GetProcessHeap(), 0, sizeof(struct elf_module_info)); if (!elf_module_info) goto leave; - elf_info->module = module_newA(pcs, filename, DMT_ELF, FALSE, - (load_offset) ? load_offset : fmap.elf_start, - fmap.elf_size, 0, calc_crc32(&fmap)); + MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, wfilename, sizeof(wfilename) / sizeof(WCHAR)); + elf_info->module = module_new(pcs, wfilename, DMT_ELF, FALSE, + (load_offset) ? load_offset : fmap.elf_start, + fmap.elf_size, 0, calc_crc32(&fmap)); if (!elf_info->module) { HeapFree(GetProcessHeap(), 0, elf_module_info); @@ -1508,7 +1510,7 @@ struct elf_load { struct process* pcs; struct elf_info elf_info; - const char* name; + char name[MAX_PATH]; BOOL ret; }; @@ -1543,23 +1545,26 @@ static BOOL elf_load_cb(const char* name, unsigned long addr, void* user) * Also, find module real name and load address from * the real loaded modules list in pcs address space */ -struct module* elf_load_module(struct process* pcs, const char* name, unsigned long addr) +struct module* elf_load_module(struct process* pcs, const WCHAR* name, unsigned long addr) { struct elf_load el; - TRACE("(%p %s %08lx)\n", pcs, name, addr); + TRACE("(%p %s %08lx)\n", pcs, debugstr_w(name), addr); el.elf_info.flags = ELF_INFO_MODULE; el.ret = FALSE; if (pcs->dbg_hdr_addr) /* we're debugging a life target */ { + const WCHAR* ptr; + el.pcs = pcs; /* do only the lookup from the filename, not the path (as we lookup module * name in the process' loaded module list) */ - el.name = strrchr(name, '/'); - if (!el.name++) el.name = name; + ptr = strrchrW(name, '/'); + if (!ptr++) ptr = name; + WideCharToMultiByte(CP_UNIXCP, 0, ptr, -1, el.name, sizeof(el.name), NULL, NULL); el.ret = FALSE; if (!elf_enum_modules_internal(pcs, NULL, elf_load_cb, &el)) @@ -1567,7 +1572,8 @@ struct module* elf_load_module(struct process* pcs, const char* name, unsigned } else if (addr) { - el.ret = elf_search_and_load_file(pcs, name, addr, &el.elf_info); + WideCharToMultiByte(CP_UNIXCP, 0, name, -1, el.name, sizeof(el.name), NULL, NULL); + el.ret = elf_search_and_load_file(pcs, el.name, addr, &el.elf_info); } if (!el.ret) return NULL; assert(el.elf_info.module); @@ -1597,7 +1603,7 @@ BOOL elf_enum_modules(HANDLE hProc, elf_enum_modules_cb cb, void* user) return FALSE; } -struct module* elf_load_module(struct process* pcs, const char* name, unsigned long addr) +struct module* elf_load_module(struct process* pcs, const WCHAR* name, unsigned long addr) { return NULL; } diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 5da2135..1edef49 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -177,17 +177,6 @@ struct module* module_new(struct process* pcs, const WCHAR* name, return module; } -struct module* module_newA(struct process* pcs, const char* name, - enum module_type type, BOOL virtual, - unsigned long mod_addr, unsigned long size, - unsigned long stamp, unsigned long checksum) -{ - WCHAR wname[MAX_PATH]; - - MultiByteToWideChar(CP_ACP, 0, name, -1, wname, sizeof(wname) / sizeof(WCHAR)); - return module_new(pcs, wname, type, virtual, mod_addr, size, stamp, checksum); -} - /*********************************************************************** * module_find_by_name * @@ -527,7 +516,7 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam if (!(module = pe_load_module(pcs, wImageName, hFile, BaseOfDll, SizeOfDll))) { if (module_get_type_by_name(ImageName) == DMT_ELF && - (module = elf_load_module(pcs, ImageName, BaseOfDll))) + (module = elf_load_module(pcs, wImageName, BaseOfDll))) goto done; FIXME("Should have successfully loaded debug information for image %s\n", debugstr_w(wImageName));

1 0

Eric Pouech : dbghelp: Move PE module loading to Unicode.
by Alexandre Julliard Feb. 22, 2007

Feb. 22, 2007

Module: wine Branch: master Commit: 6a859fb0e65b91f27aabe600a8da62ec91f748c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a859fb0e65b91f27aabe600a… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Feb 21 21:55:15 2007 +0100 dbghelp: Move PE module loading to Unicode. --- dlls/dbghelp/dbghelp_private.h | 8 +++--- dlls/dbghelp/module.c | 6 ++-- dlls/dbghelp/msc.c | 6 ++-- dlls/dbghelp/pe_module.c | 48 +++++++++++++++++---------------------- 4 files changed, 31 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a859fb0e65b91f27aabe…

1 0

Eric Pouech : dbghelp: Implemented FindExecutableImage[W].
by Alexandre Julliard Feb. 22, 2007

Feb. 22, 2007

Module: wine Branch: master Commit: bcc1913354a033f751c091cace904df87e046d11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcc1913354a033f751c091cac… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Feb 21 21:55:10 2007 +0100 dbghelp: Implemented FindExecutableImage[W]. --- dlls/dbghelp/dbghelp.spec | 4 ++-- dlls/dbghelp/path.c | 35 ++++++++++++++++++++++++++++++++--- dlls/imagehlp/imagehlp.spec | 2 +- include/dbghelp.h | 2 ++ 4 files changed, 37 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 21ce93d..a91415e 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -10,8 +10,8 @@ @ stdcall FindDebugInfoFileEx(str str ptr ptr ptr) @ stub FindDebugInfoFileExW @ stdcall FindExecutableImage(str str str) -@ stub FindExecutableImageEx -@ stub FindExecutableImageExW +@ stdcall FindExecutableImageEx(str str ptr ptr ptr) +@ stdcall FindExecutableImageExW(wstr wstr ptr ptr ptr) @ stub FindFileInPath @ stub FindFileInSearchPath @ stdcall GetTimestampForLoadedLibrary(long) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index e9d9164..7c4b2e0 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -76,19 +76,48 @@ HANDLE WINAPI FindDebugInfoFileEx(PCSTR FileName, PCSTR SymbolPath, } /****************************************************************** - * FindExecutableImage (DBGHELP.@) + * FindExecutableImageExW (DBGHELP.@) * */ -HANDLE WINAPI FindExecutableImage(PCSTR FileName, PCSTR SymbolPath, PSTR ImageFilePath) +HANDLE WINAPI FindExecutableImageExW(PCWSTR FileName, PCWSTR SymbolPath, PWSTR ImageFilePath, + PFIND_EXE_FILE_CALLBACKW Callback, void* user) +{ + HANDLE h; + + if (Callback) FIXME("Unsupported callback yet\n"); + if (!SearchPathW(SymbolPath, FileName, NULL, MAX_PATH, ImageFilePath, NULL)) + return NULL; + h = CreateFileW(ImageFilePath, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + return (h == INVALID_HANDLE_VALUE) ? NULL : h; +} + +/****************************************************************** + * FindExecutableImageEx (DBGHELP.@) + * + */ +HANDLE WINAPI FindExecutableImageEx(PCSTR FileName, PCSTR SymbolPath, PSTR ImageFilePath, + PFIND_EXE_FILE_CALLBACK Callback, void* user) { HANDLE h; + + if (Callback) FIXME("Unsupported callback yet\n"); if (!SearchPathA(SymbolPath, FileName, NULL, MAX_PATH, ImageFilePath, NULL)) return NULL; - h = CreateFileA(ImageFilePath, GENERIC_READ, FILE_SHARE_READ, NULL, + h = CreateFileA(ImageFilePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); return (h == INVALID_HANDLE_VALUE) ? NULL : h; } +/****************************************************************** + * FindExecutableImage (DBGHELP.@) + * + */ +HANDLE WINAPI FindExecutableImage(PCSTR FileName, PCSTR SymbolPath, PSTR ImageFilePath) +{ + return FindExecutableImageEx(FileName, SymbolPath, ImageFilePath, NULL, NULL); +} + /*********************************************************************** * MakeSureDirectoryPathExists (DBGHELP.@) */ diff --git a/dlls/imagehlp/imagehlp.spec b/dlls/imagehlp/imagehlp.spec index 9ca6c89..7c0b2cf 100644 --- a/dlls/imagehlp/imagehlp.spec +++ b/dlls/imagehlp/imagehlp.spec @@ -6,7 +6,7 @@ @ stdcall FindDebugInfoFile(str str str) dbghelp.FindDebugInfoFile @ stdcall FindDebugInfoFileEx(str str ptr ptr ptr) dbghelp.FindDebugInfoFileEx @ stdcall FindExecutableImage(str str str) dbghelp.FindExecutableImage -@ stub FindExecutableImageEx +@ stdcall FindExecutableImageEx(str str ptr ptr ptr) dbghelp.FindExecutableImageEx @ stub FindFileInPath @ stub FindFileInSearchPath @ stdcall GetImageConfigInformation(ptr ptr) diff --git a/include/dbghelp.h b/include/dbghelp.h index 3840a1e..ee3103b 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -1005,6 +1005,8 @@ BOOL WINAPI SymFindFileInPath(HANDLE, PCSTR, PCSTR, PVOID, DWORD, DWORD, DWORD, HANDLE WINAPI FindExecutableImage(PCSTR, PCSTR, PSTR); typedef BOOL (CALLBACK *PFIND_EXE_FILE_CALLBACK)(HANDLE, PSTR, PVOID); HANDLE WINAPI FindExecutableImageEx(PCSTR, PCSTR, PSTR, PFIND_EXE_FILE_CALLBACK, PVOID); +typedef BOOL (CALLBACK *PFIND_EXE_FILE_CALLBACKW)(HANDLE, PWSTR, PVOID); +HANDLE WINAPI FindExecutableImageExW(PCWSTR, PCWSTR, PWSTR, PFIND_EXE_FILE_CALLBACKW, PVOID); PIMAGE_NT_HEADERS WINAPI ImageNtHeader(PVOID); PVOID WINAPI ImageDirectoryEntryToDataEx(PVOID, BOOLEAN, USHORT, PULONG, PIMAGE_SECTION_HEADER *);

1 0

Eric Pouech : dbghelp: Now storing module information in Unicode form.
by Alexandre Julliard Feb. 22, 2007

Feb. 22, 2007

Module: wine Branch: master Commit: 43dffcd05d84be91c055bbbd31db380fc4460d78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43dffcd05d84be91c055bbbd3… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Feb 21 21:55:04 2007 +0100 dbghelp: Now storing module information in Unicode form. --- dlls/dbghelp/dbghelp_private.h | 29 +++++-- dlls/dbghelp/elf_module.c | 42 ++++++---- dlls/dbghelp/module.c | 175 ++++++++++++++++++++-------------------- dlls/dbghelp/msc.c | 4 +- dlls/dbghelp/pe_module.c | 30 ++++--- dlls/dbghelp/source.c | 2 +- dlls/dbghelp/symbol.c | 2 +- 7 files changed, 156 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43dffcd05d84be91c055b…

1 0

Eric Pouech : dbghelp: .gnu_link support: rewrote helper functions for better later unicodification.
by Alexandre Julliard Feb. 22, 2007

Feb. 22, 2007

Module: wine Branch: master Commit: 6efc06199256b5ab0e65fdb80441bf714a8bf065 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6efc06199256b5ab0e65fdb80… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Feb 21 21:54:59 2007 +0100 dbghelp: .gnu_link support: rewrote helper functions for better later unicodification. --- dlls/dbghelp/elf_module.c | 69 ++++++++++++++++++++++++++------------------- 1 files changed, 40 insertions(+), 29 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 1350a13..e534013 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -802,26 +802,49 @@ 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 char* moduleDir) +static char* elf_locate_debug_link(const char* filename, const char* loaded_file, + struct elf_file_map* fmap_link) { - static const char globalDebugDir[] = "/usr/lib/debug"; - const size_t moduleDirLen = strlen (moduleDir); - const size_t globalDebugDirLen = strlen (globalDebugDir); - struct stat statbuf; + static const char globalDebugDir[] = "/usr/lib/debug/"; + const size_t globalDebugDirLen = strlen(globalDebugDir); + char* p; + char* slash; + + p = HeapAlloc(GetProcessHeap(), 0, + globalDebugDirLen + strlen(loaded_file) + 1 + 6 + 1 + strlen(filename) + 1); + + if (!p) return FALSE; + + /* we prebuild the string with "execdir" */ + strcpy(p, loaded_file); + slash = strrchr(p, '/'); + if (slash == NULL) slash = p; else slash++; + + /* testing execdir/filename */ + strcpy(slash, filename); + if (elf_map_file(p, fmap_link)) goto found; - char* p = HeapAlloc (GetProcessHeap(), 0, - moduleDirLen + 1 + max (6, globalDebugDirLen) + 1 + strlen (filename)+1); + /* testing execdir/.debug/filename */ + sprintf(slash, ".debug/%s", filename); + if (elf_map_file(p, fmap_link)) goto found; - sprintf (p, "%s/%s", moduleDir, filename); - if (stat(p, &statbuf) != -1 && !S_ISDIR(statbuf.st_mode)) return p; + /* 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; - sprintf (p, "%s/.debug/%s", moduleDir, filename); - if (stat(p, &statbuf) != -1 && !S_ISDIR(statbuf.st_mode)) return p; + strcpy(p, filename); + if (elf_map_file(p, fmap_link)) goto found; - sprintf (p, "%s/%s/%s", globalDebugDir, moduleDir, filename); - if (stat(p, &statbuf) != -1 && !S_ISDIR(statbuf.st_mode)) return p; + HeapFree(GetProcessHeap(), 0, p); - strcpy (p, filename); + WARN("Couldn't locate or map %s\n", filename); + return NULL; + +found: + TRACE("Located debug information file %s at %s\n", filename, p); return p; } @@ -845,19 +868,11 @@ static BOOL elf_debuglink_parse (struct module* module, BOOL ret = FALSE; const char* dbg_link = (char*)debuglink; struct elf_file_map fmap_link; - char* moduleDir; char* link_file; - char* slash; - moduleDir = HeapAlloc (GetProcessHeap(), 0, strlen (module->module.LoadedImageName) + 1); - strcpy (moduleDir, module->module.LoadedImageName); - slash = strrchr (moduleDir, '/'); - if (slash != 0) *slash = 0; + link_file = elf_locate_debug_link(dbg_link, module->module.LoadedImageName, &fmap_link); - link_file = elf_locate_debug_link (dbg_link, moduleDir); - TRACE("Located debug information file %s at %s\n", dbg_link, link_file); - - if (elf_map_file(link_file, &fmap_link)) + if (link_file) { fmap_link.crc = *(const DWORD*)(dbg_link + ((DWORD_PTR)(strlen(dbg_link) + 4) & ~3)); fmap_link.with_crc = 1; @@ -868,12 +883,8 @@ static BOOL elf_debuglink_parse (struct module* module, else WARN("Couldn't load debug information from %s\n", link_file); elf_unmap_file(&fmap_link); + HeapFree(GetProcessHeap(), 0, link_file); } - else - WARN("Couldn't map %s\n", dbg_link); - - HeapFree (GetProcessHeap(), 0, link_file); - HeapFree (GetProcessHeap(), 0, moduleDir); return ret; }

1 0