May 2006 - Wine-Commits - list.winehq.org

Eric Pouech : dbghelp: Implemented SymEnumSymbolsW.
by Alexandre Julliard May 11, 2006

May 11, 2006

Module: wine Branch: refs/heads/master Commit: 208e701a7b4775ff828a9beecf6f2a758b91b8dc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=208e701a7b4775ff828a9be… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed May 10 21:35:41 2006 +0200 dbghelp: Implemented SymEnumSymbolsW. --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/symbol.c | 47 +++++++++++++++++++++++++++++++++++++++++++++ include/dbghelp.h | 3 +++ 3 files changed, 51 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 6916dce..a59ca40 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -39,7 +39,7 @@ @ stub SymEnumSourceFilesW @ stub SymEnumSym @ stdcall SymEnumSymbols(ptr double str ptr ptr) -@ stub SymEnumSymbolsW +@ stdcall SymEnumSymbolsW(ptr double wstr ptr ptr) @ stub SymEnumSymbolsForAddr @ stub SymEnumSymbolsForAddrW @ stdcall SymEnumTypes(ptr double ptr ptr) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 7707078..add5be6 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -902,6 +902,53 @@ BOOL WINAPI SymEnumSymbols(HANDLE hProce return sym_enum(hProcess, BaseOfDll, Mask, &se); } +struct sym_enumW +{ + PSYM_ENUMERATESYMBOLS_CALLBACKW cb; + void* ctx; + PSYMBOL_INFOW sym_info; + char buffer[sizeof(SYMBOL_INFOW) + MAX_SYM_NAME]; + +}; + +static BOOL CALLBACK sym_enumW(PSYMBOL_INFO si, ULONG size, PVOID ctx) +{ + struct sym_enumW* sew = ctx; + + copy_symbolW(sew->sym_info, si); + + return (sew->cb)(sew->sym_info, size, sew->ctx); +} + +/****************************************************************** + * SymEnumSymbolsW (DBGHELP.@) + * + */ +BOOL WINAPI SymEnumSymbolsW(HANDLE hProcess, ULONG64 BaseOfDll, PCWSTR Mask, + PSYM_ENUMERATESYMBOLS_CALLBACKW EnumSymbolsCallback, + PVOID UserContext) +{ + struct sym_enumW sew; + BOOL ret = FALSE; + char* maskA = NULL; + + sew.ctx = UserContext; + sew.cb = EnumSymbolsCallback; + sew.sym_info = (PSYMBOL_INFOW)sew.buffer; + + if (Mask) + { + unsigned len = WideCharToMultiByte(CP_ACP, 0, Mask, -1, NULL, 0, NULL, NULL); + maskA = HeapAlloc(GetProcessHeap(), 0, len); + if (!maskA) return FALSE; + WideCharToMultiByte(CP_ACP, 0, Mask, -1, maskA, len, NULL, NULL); + } + ret = SymEnumSymbols(hProcess, BaseOfDll, maskA, sym_enumW, &sew); + HeapFree(GetProcessHeap(), 0, maskA); + + return ret; +} + struct sym_enumerate { void* ctx; diff --git a/include/dbghelp.h b/include/dbghelp.h index e66b088..b8a5c38 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -907,6 +907,7 @@ #define SYMSEARCH_GLOBALSONLY BOOL WINAPI SymGetTypeInfo(HANDLE, DWORD64, ULONG, IMAGEHLP_SYMBOL_TYPE_INFO, PVOID); typedef BOOL (CALLBACK *PSYM_ENUMERATESYMBOLS_CALLBACK)(PSYMBOL_INFO, ULONG, PVOID); +typedef BOOL (CALLBACK *PSYM_ENUMERATESYMBOLS_CALLBACKW)(PSYMBOL_INFOW, ULONG, PVOID); BOOL WINAPI SymEnumTypes(HANDLE, ULONG64, PSYM_ENUMERATESYMBOLS_CALLBACK, PVOID); BOOL WINAPI SymFromAddr(HANDLE, DWORD64, DWORD64*, SYMBOL_INFO*); BOOL WINAPI SymFromAddrW(HANDLE, DWORD64, DWORD64*, SYMBOL_INFOW*); @@ -923,6 +924,8 @@ BOOL WINAPI SymGetSymPrev(HANDLE, PIMAGE BOOL WINAPI SymGetSymPrev64(HANDLE, PIMAGEHLP_SYMBOL64); BOOL WINAPI SymEnumSymbols(HANDLE, ULONG64, PCSTR, PSYM_ENUMERATESYMBOLS_CALLBACK, PVOID); +BOOL WINAPI SymEnumSymbolsW(HANDLE, ULONG64, PCWSTR, PSYM_ENUMERATESYMBOLS_CALLBACKW, + PVOID); typedef BOOL (CALLBACK *PSYM_ENUMSYMBOLS_CALLBACK)(PSTR, DWORD, ULONG, PVOID); BOOL WINAPI SymEnumerateSymbols(HANDLE, DWORD, PSYM_ENUMSYMBOLS_CALLBACK, PVOID); typedef BOOL (CALLBACK *PSYM_ENUMSYMBOLS_CALLBACK64)(PSTR, DWORD64, ULONG, PVOID);

1 0

Eric Pouech : dbghelp: Improved SymSearch (now using tag, index and address ).
by Alexandre Julliard May 11, 2006

May 11, 2006

Module: wine Branch: refs/heads/master Commit: 96efcbc47b06a8d39fafb3a3ae02f028987bd00c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=96efcbc47b06a8d39fafb3a… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed May 10 21:35:37 2006 +0200 dbghelp: Improved SymSearch (now using tag, index and address). --- dlls/dbghelp/symbol.c | 58 ++++++++++++++++++++++++++----------------------- 1 files changed, 31 insertions(+), 27 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index b0ecf2a..7707078 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -562,11 +562,24 @@ struct sym_enum PSYM_ENUMERATESYMBOLS_CALLBACK cb; PVOID user; SYMBOL_INFO* sym_info; + DWORD index; + DWORD tag; + DWORD64 addr; char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME]; }; + +static BOOL send_symbol(const struct sym_enum* se, struct module_pair* pair, + const struct symt* sym) +{ + symt_fill_sym_info(pair, sym, se->sym_info); + if (se->index && se->sym_info->info != se->index) return FALSE; + if (se->tag && se->sym_info->Tag != se->tag) return FALSE; + if (se->addr && !(se->addr >= se->sym_info->Address && se->addr < se->sym_info->Address + se->sym_info->Size)) return FALSE; + return !se->cb(se->sym_info, se->sym_info->Size, se->user); +} + static BOOL symt_enum_module(struct module_pair* pair, regex_t* regex, const struct sym_enum* se) - { void* ptr; struct symt_ht* sym = NULL; @@ -581,8 +594,7 @@ static BOOL symt_enum_module(struct modu { se->sym_info->SizeOfStruct = sizeof(SYMBOL_INFO); se->sym_info->MaxNameLen = sizeof(se->buffer) - sizeof(SYMBOL_INFO); - symt_fill_sym_info(pair, &sym->symt, se->sym_info); - if (!se->cb(se->sym_info, se->sym_info->Size, se->user)) return TRUE; + if (send_symbol(se, pair, &sym->symt)) return TRUE; } } return FALSE; @@ -713,9 +725,7 @@ static BOOL symt_enum_locals_helper(stru case SymTagData: if (regexec(preg, symt_get_name(lsym), 0, NULL, 0) == 0) { - symt_fill_sym_info(pair, lsym, se->sym_info); - if (!se->cb(se->sym_info, se->sym_info->Size, se->user)) - return FALSE; + if (send_symbol(se, pair, lsym)) return FALSE; } break; case SymTagLabel: @@ -759,8 +769,7 @@ static BOOL symt_enum_locals(struct proc return ret; } - symt_fill_sym_info(&pair, &sym->symt, se->sym_info); - return se->cb(se->sym_info, se->sym_info->Size, se->user); + return send_symbol(se, &pair, &sym->symt); } /****************************************************************** @@ -885,6 +894,9 @@ BOOL WINAPI SymEnumSymbols(HANDLE hProce se.cb = EnumSymbolsCallback; se.user = UserContext; + se.index = 0; + se.tag = 0; + se.addr = 0; se.sym_info = (PSYMBOL_INFO)se.buffer; return sym_enum(hProcess, BaseOfDll, Mask, &se); @@ -1456,34 +1468,26 @@ BOOL WINAPI SymSearch(HANDLE hProcess, U PSYM_ENUMERATESYMBOLS_CALLBACK EnumSymbolsCallback, PVOID UserContext, DWORD Options) { + struct sym_enum se; + TRACE("(%p %s %lu %lu %s %s %p %p %lx)\n", hProcess, wine_dbgstr_longlong(BaseOfDll), Index, SymTag, Mask, wine_dbgstr_longlong(Address), EnumSymbolsCallback, UserContext, Options); - if (Index != 0) - { - FIXME("Unsupported searching for a given Index (%lu)\n", Index); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - if (SymTag != 0) - { - FIXME("Unsupported searching for a given SymTag (%lu)\n", SymTag); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - if (Address != 0) - { - FIXME("Unsupported searching for a given Address (%s)\n", wine_dbgstr_longlong(Address)); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } if (Options != SYMSEARCH_GLOBALSONLY) { FIXME("Unsupported searching with options (%lx)\n", Options); SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - return SymEnumSymbols(hProcess, BaseOfDll, Mask, EnumSymbolsCallback, UserContext); + + se.cb = EnumSymbolsCallback; + se.user = UserContext; + se.index = Index; + se.tag = SymTag; + se.addr = Address; + se.sym_info = (PSYMBOL_INFO)se.buffer; + + return sym_enum(hProcess, BaseOfDll, Mask, &se); }

1 0

Eric Pouech : dbghelp: Factorize and simplify a bit symbol enumeration code .
by Alexandre Julliard May 11, 2006

May 11, 2006

Module: wine Branch: refs/heads/master Commit: 5eb1c98853c86bbe91aa3721becd2d25a39bd7cf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5eb1c98853c86bbe91aa372… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed May 10 21:35:34 2006 +0200 dbghelp: Factorize and simplify a bit symbol enumeration code. --- dlls/dbghelp/symbol.c | 107 ++++++++++++++++++++++++++++--------------------- 1 files changed, 61 insertions(+), 46 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index e2a8754..b0ecf2a 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -557,11 +557,17 @@ static void symt_fill_sym_info(const str wine_dbgstr_longlong(sym_info->Address)); } +struct sym_enum +{ + PSYM_ENUMERATESYMBOLS_CALLBACK cb; + PVOID user; + SYMBOL_INFO* sym_info; + char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME]; +}; static BOOL symt_enum_module(struct module_pair* pair, regex_t* regex, - PSYM_ENUMERATESYMBOLS_CALLBACK cb, PVOID user) + const struct sym_enum* se) + { - char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME]; - SYMBOL_INFO* sym_info = (SYMBOL_INFO*)buffer; void* ptr; struct symt_ht* sym = NULL; struct hash_table_iter hti; @@ -573,10 +579,10 @@ static BOOL symt_enum_module(struct modu if (sym->hash_elt.name && regexec(regex, sym->hash_elt.name, 0, NULL, 0) == 0) { - sym_info->SizeOfStruct = sizeof(SYMBOL_INFO); - sym_info->MaxNameLen = sizeof(buffer) - sizeof(SYMBOL_INFO); - symt_fill_sym_info(pair, &sym->symt, sym_info); - if (!cb(sym_info, sym_info->Size, user)) return TRUE; + se->sym_info->SizeOfStruct = sizeof(SYMBOL_INFO); + se->sym_info->MaxNameLen = sizeof(se->buffer) - sizeof(SYMBOL_INFO); + symt_fill_sym_info(pair, &sym->symt, se->sym_info); + if (!se->cb(se->sym_info, se->sym_info->Size, se->user)) return TRUE; } } return FALSE; @@ -683,8 +689,7 @@ int symt_find_nearest(struct module* mod } static BOOL symt_enum_locals_helper(struct process* pcs, struct module_pair* pair, - regex_t* preg, PSYM_ENUMERATESYMBOLS_CALLBACK cb, - PVOID user, SYMBOL_INFO* sym_info, + regex_t* preg, const struct sym_enum* se, struct vector* v) { struct symt** plsym = NULL; @@ -701,16 +706,15 @@ static BOOL symt_enum_locals_helper(stru struct symt_block* block = (struct symt_block*)lsym; if (pc < block->address || block->address + block->size <= pc) continue; - if (!symt_enum_locals_helper(pcs, pair, preg, cb, user, - sym_info, &block->vchildren)) + if (!symt_enum_locals_helper(pcs, pair, preg, se, &block->vchildren)) return FALSE; } break; case SymTagData: if (regexec(preg, symt_get_name(lsym), 0, NULL, 0) == 0) { - symt_fill_sym_info(pair, lsym, sym_info); - if (!cb(sym_info, sym_info->Size, user)) + symt_fill_sym_info(pair, lsym, se->sym_info); + if (!se->cb(se->sym_info, se->sym_info->Size, se->user)) return FALSE; } break; @@ -726,19 +730,16 @@ static BOOL symt_enum_locals_helper(stru return TRUE; } -static BOOL symt_enum_locals(struct process* pcs, const char* mask, - PSYM_ENUMERATESYMBOLS_CALLBACK EnumSymbolsCallback, - PVOID UserContext) +static BOOL symt_enum_locals(struct process* pcs, const char* mask, + const struct sym_enum* se) { struct module_pair pair; struct symt_ht* sym; - char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME]; - SYMBOL_INFO* sym_info = (SYMBOL_INFO*)buffer; DWORD pc = pcs->ctx_frame.InstructionOffset; int idx; - sym_info->SizeOfStruct = sizeof(*sym_info); - sym_info->MaxNameLen = sizeof(buffer) - sizeof(SYMBOL_INFO); + se->sym_info->SizeOfStruct = sizeof(*se->sym_info); + se->sym_info->MaxNameLen = sizeof(se->buffer) - sizeof(SYMBOL_INFO); pair.requested = module_find_by_addr(pcs, pc, DMT_UNKNOWN); if (!module_get_debug(pcs, &pair)) return FALSE; @@ -752,15 +753,14 @@ static BOOL symt_enum_locals(struct proc compile_regex(mask ? mask : "*", -1, &preg, dbghelp_options & SYMOPT_CASE_INSENSITIVE); - ret = symt_enum_locals_helper(pcs, &pair, &preg, EnumSymbolsCallback, - UserContext, sym_info, + ret = symt_enum_locals_helper(pcs, &pair, &preg, se, &((struct symt_function*)sym)->vchildren); regfree(&preg); return ret; } - symt_fill_sym_info(&pair, &sym->symt, sym_info); - return EnumSymbolsCallback(sym_info, sym_info->Size, UserContext); + symt_fill_sym_info(&pair, &sym->symt, se->sym_info); + return se->cb(se->sym_info, se->sym_info->Size, se->user); } /****************************************************************** @@ -788,37 +788,25 @@ static void copy_symbolW(SYMBOL_INFOW* s siw->MaxNameLen = si->MaxNameLen; MultiByteToWideChar(CP_ACP, 0, si->Name, -1, siw->Name, siw->MaxNameLen); } + /****************************************************************** - * SymEnumSymbols (DBGHELP.@) + * sym_enum * - * cases BaseOfDll = 0 - * !foo fails always (despite what MSDN states) - * RE1!RE2 looks up all modules matching RE1, and in all these modules, lookup RE2 - * no ! in Mask, lookup in local Context - * cases BaseOfDll != 0 - * !foo fails always (despite what MSDN states) - * RE1!RE2 gets RE2 from BaseOfDll (whatever RE1 is) + * Core routine for most of the enumeration of symbols */ -BOOL WINAPI SymEnumSymbols(HANDLE hProcess, ULONG64 BaseOfDll, PCSTR Mask, - PSYM_ENUMERATESYMBOLS_CALLBACK EnumSymbolsCallback, - PVOID UserContext) +static BOOL sym_enum(HANDLE hProcess, ULONG64 BaseOfDll, PCSTR Mask, + const struct sym_enum* se) { struct process* pcs = process_find_by_handle(hProcess); struct module_pair pair; const char* bang; regex_t mod_regex, sym_regex; - TRACE("(%p %s %s %p %p)\n", - hProcess, wine_dbgstr_longlong(BaseOfDll), debugstr_a(Mask), - EnumSymbolsCallback, UserContext); - - if (!pcs) return FALSE; - if (BaseOfDll == 0) { /* do local variables ? */ if (!Mask || !(bang = strchr(Mask, '!'))) - return symt_enum_locals(pcs, Mask, EnumSymbolsCallback, UserContext); + return symt_enum_locals(pcs, Mask, se); if (bang == Mask) return FALSE; @@ -831,8 +819,7 @@ BOOL WINAPI SymEnumSymbols(HANDLE hProce if (pair.requested->type == DMT_PE && module_get_debug(pcs, &pair)) { if (regexec(&mod_regex, pair.requested->module.ModuleName, 0, NULL, 0) == 0 && - symt_enum_module(&pair, &sym_regex, - EnumSymbolsCallback, UserContext)) + symt_enum_module(&pair, &sym_regex, se)) break; } } @@ -847,7 +834,7 @@ BOOL WINAPI SymEnumSymbols(HANDLE hProce module_get_debug(pcs, &pair)) { if (regexec(&mod_regex, pair.requested->module.ModuleName, 0, NULL, 0) == 0 && - symt_enum_module(&pair, &sym_regex, EnumSymbolsCallback, UserContext)) + symt_enum_module(&pair, &sym_regex, se)) break; } } @@ -869,12 +856,40 @@ BOOL WINAPI SymEnumSymbols(HANDLE hProce compile_regex(Mask ? Mask : "*", -1, &sym_regex, dbghelp_options & SYMOPT_CASE_INSENSITIVE); - symt_enum_module(&pair, &sym_regex, EnumSymbolsCallback, UserContext); + symt_enum_module(&pair, &sym_regex, se); regfree(&sym_regex); return TRUE; } +/****************************************************************** + * SymEnumSymbols (DBGHELP.@) + * + * cases BaseOfDll = 0 + * !foo fails always (despite what MSDN states) + * RE1!RE2 looks up all modules matching RE1, and in all these modules, lookup RE2 + * no ! in Mask, lookup in local Context + * cases BaseOfDll != 0 + * !foo fails always (despite what MSDN states) + * RE1!RE2 gets RE2 from BaseOfDll (whatever RE1 is) + */ +BOOL WINAPI SymEnumSymbols(HANDLE hProcess, ULONG64 BaseOfDll, PCSTR Mask, + PSYM_ENUMERATESYMBOLS_CALLBACK EnumSymbolsCallback, + PVOID UserContext) +{ + struct sym_enum se; + + TRACE("(%p %s %s %p %p)\n", + hProcess, wine_dbgstr_longlong(BaseOfDll), debugstr_a(Mask), + EnumSymbolsCallback, UserContext); + + se.cb = EnumSymbolsCallback; + se.user = UserContext; + se.sym_info = (PSYMBOL_INFO)se.buffer; + + return sym_enum(hProcess, BaseOfDll, Mask, &se); +} + struct sym_enumerate { void* ctx;

1 0

Eric Pouech : dbghelp: Stubbed SymGetSourceFileTokenW.
by Alexandre Julliard May 11, 2006

May 11, 2006

Module: wine Branch: refs/heads/master Commit: 08ba9cecffde771eec78eb501592d4c6b4ae9c60 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=08ba9cecffde771eec78eb5… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed May 10 21:35:30 2006 +0200 dbghelp: Stubbed SymGetSourceFileTokenW. --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/source.c | 13 +++++++++++++ include/dbghelp.h | 1 + 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 3727474..6916dce 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -94,7 +94,7 @@ @ stub SymGetSourceFileFromToken @ stub SymGetSourceFileFromTokenW @ stdcall SymGetSourceFileToken(ptr double str ptr ptr) -@ stub SymGetSourceFileTokenW +@ stdcall SymGetSourceFileTokenW(ptr double wstr ptr ptr) @ stub SymGetSourceFileW @ stub SymGetSourceVarFromToken @ stub SymGetSourceVarFromTokenW diff --git a/dlls/dbghelp/source.c b/dlls/dbghelp/source.c index a56b7e9..1230275 100644 --- a/dlls/dbghelp/source.c +++ b/dlls/dbghelp/source.c @@ -215,3 +215,16 @@ BOOL WINAPI SymGetSourceFileToken(HANDLE SetLastError(ERROR_NOT_SUPPORTED); return FALSE; } + +/****************************************************************** + * SymGetSourceFileTokenW (DBGHELP.@) + * + */ +BOOL WINAPI SymGetSourceFileTokenW(HANDLE hProcess, ULONG64 base, + PCWSTR src, PVOID* token, DWORD* size) +{ + FIXME("%p %s %s %p %p: stub!\n", + hProcess, wine_dbgstr_longlong(base), debugstr_w(src), token, size); + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; +} diff --git a/include/dbghelp.h b/include/dbghelp.h index 03442b8..e66b088 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -965,6 +965,7 @@ ULONG WINAPI SymGetFileLineOffsets64(HAN ULONG WINAPI SymGetFileLineOffsetsW64(HANDLE, PWCH, PWCH, PDWORD64, ULONG); BOOL WINAPI SymGetSourceFile(HANDLE, ULONG64, PCSTR, PCSTR, PSTR, DWORD); BOOL WINAPI SymGetSourceFileToken(HANDLE, ULONG64, PCSTR, PVOID*, DWORD*); +BOOL WINAPI SymGetSourceFileTokenW(HANDLE, ULONG64, PCWSTR, PVOID*, DWORD*); BOOL WINAPI SymGetSourceFileFromToken(HANDLE, PVOID, PCSTR, PSTR, DWORD); BOOL WINAPI SymGetSourceVarFromToken(HANDLE, PVOID, PCSTR, PCSTR, PSTR, DWORD);

1 0

Eric Pouech : dbghelp: Implemented SymGetLineFromAddrW64.
by Alexandre Julliard May 11, 2006

May 11, 2006

Module: wine Branch: refs/heads/master Commit: 55f8a1b8fbfebeca559619e660414dd3eb610683 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=55f8a1b8fbfebeca559619e… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed May 10 21:35:26 2006 +0200 dbghelp: Implemented SymGetLineFromAddrW64. --- dlls/dbghelp/dbghelp.c | 18 ++++++++++++++++++ dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/dbghelp_private.h | 4 ++++ dlls/dbghelp/symbol.c | 36 ++++++++++++++++++++++++++++++++++++ include/dbghelp.h | 10 ++++++++++ 5 files changed, 69 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index d7e0cf3..54ec4ef 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -116,6 +116,24 @@ BOOL validate_addr64(DWORD64 addr) } /****************************************************************** + * fetch_buffer + * + * Ensures process' internal buffer is large enough. + */ +void* fetch_buffer(struct process* pcs, unsigned size) +{ + if (size > pcs->buffer_size) + { + if (pcs->buffer) + pcs->buffer = HeapReAlloc(GetProcessHeap(), 0, pcs->buffer, size); + else + pcs->buffer = HeapAlloc(GetProcessHeap(), 0, size); + pcs->buffer_size = (pcs->buffer) ? size : 0; + } + return pcs->buffer; +} + +/****************************************************************** * SymSetSearchPathW (DBGHELP.@) * */ diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 7b35397..3727474 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -70,7 +70,7 @@ @ stub SymGetHomeDirectoryW @ stdcall SymGetLineFromAddr(long long ptr ptr) @ stdcall SymGetLineFromAddr64(long double ptr ptr) -@ stub SymGetLineFromAddrW64 +@ stdcall SymGetLineFromAddrW64(long double ptr ptr) @ stub SymGetLineFromName @ stub SymGetLineFromName64 @ stdcall SymGetLineNext(long ptr) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index cfc9f92..1abb2cc 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -301,6 +301,9 @@ struct process unsigned long dbg_hdr_addr; IMAGEHLP_STACK_FRAME ctx_frame; + + unsigned buffer_size; + void* buffer; }; struct line_info @@ -327,6 +330,7 @@ extern struct process* process_find_by_h extern HANDLE hMsvcrt; extern BOOL validate_addr64(DWORD64 addr); extern BOOL pcs_callback(const struct process* pcs, ULONG action, void* data); +extern void* fetch_buffer(struct process* pcs, unsigned size); /* elf_module.c */ typedef BOOL (*elf_enum_modules_cb)(const char*, unsigned long addr, void* user); diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 1fb1c37..e2a8754 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1170,6 +1170,22 @@ static void copy_line_64_from_32(IMAGEHL } /****************************************************************** + * copy_line_W64_from_32 (internal) + * + */ +static void copy_line_W64_from_32(struct process* pcs, IMAGEHLP_LINEW64* l64, const IMAGEHLP_LINE* l32) +{ + unsigned len; + + l64->Key = l32->Key; + l64->LineNumber = l32->LineNumber; + len = MultiByteToWideChar(CP_ACP, 0, l32->FileName, -1, NULL, 0); + if ((l64->FileName = fetch_buffer(pcs, len * sizeof(WCHAR)))) + MultiByteToWideChar(CP_ACP, 0, l32->FileName, -1, l64->FileName, len); + l64->Address = l32->Address; +} + +/****************************************************************** * copy_line_32_from_64 (internal) * */ @@ -1201,6 +1217,26 @@ BOOL WINAPI SymGetLineFromAddr64(HANDLE } /****************************************************************** + * SymGetLineFromAddrW64 (DBGHELP.@) + * + */ +BOOL WINAPI SymGetLineFromAddrW64(HANDLE hProcess, DWORD64 dwAddr, + PDWORD pdwDisplacement, PIMAGEHLP_LINEW64 Line) +{ + struct process* pcs = process_find_by_handle(hProcess); + IMAGEHLP_LINE line32; + + if (!pcs) return FALSE; + if (Line->SizeOfStruct < sizeof(*Line)) return FALSE; + if (!validate_addr64(dwAddr)) return FALSE; + line32.SizeOfStruct = sizeof(line32); + if (!SymGetLineFromAddr(hProcess, (DWORD)dwAddr, pdwDisplacement, &line32)) + return FALSE; + copy_line_W64_from_32(pcs, Line, &line32); + return TRUE; +} + +/****************************************************************** * SymGetLinePrev (DBGHELP.@) * */ diff --git a/include/dbghelp.h b/include/dbghelp.h index 79f97b3..03442b8 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -217,6 +217,15 @@ typedef struct _IMAGEHLP_LINE64 DWORD64 Address; } IMAGEHLP_LINE64, *PIMAGEHLP_LINE64; +typedef struct _IMAGEHLP_LINEW64 +{ + DWORD SizeOfStruct; + PVOID Key; + DWORD LineNumber; + PWCHAR FileName; + DWORD64 Address; +} IMAGEHLP_LINEW64, *PIMAGEHLP_LINEW64; + typedef struct _SOURCEFILE { DWORD64 ModBase; @@ -945,6 +954,7 @@ BOOL WINAPI SymEnumSourceFiles(HANDLE, U PVOID); BOOL WINAPI SymGetLineFromAddr(HANDLE, DWORD, PDWORD, PIMAGEHLP_LINE); BOOL WINAPI SymGetLineFromAddr64(HANDLE, DWORD64, PDWORD, PIMAGEHLP_LINE64); +BOOL WINAPI SymGetLineFromAddrW64(HANDLE, DWORD64, PDWORD, PIMAGEHLP_LINEW64); BOOL WINAPI SymGetLinePrev(HANDLE, PIMAGEHLP_LINE); BOOL WINAPI SymGetLinePrev64(HANDLE, PIMAGEHLP_LINE64); BOOL WINAPI SymGetLineNext(HANDLE, PIMAGEHLP_LINE);

1 0

Eric Pouech : dbghelp: Implemented SymFromAddrW.
by Alexandre Julliard May 11, 2006

May 11, 2006

Module: wine Branch: refs/heads/master Commit: 7d4194f57b07c14992bc502b6e9cc3a908ac8f85 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7d4194f57b07c14992bc502… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed May 10 21:35:22 2006 +0200 dbghelp: Implemented SymFromAddrW. --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/symbol.c | 51 +++++++++++++++++++++++++++++++++++++++++++++ include/dbghelp.h | 20 ++++++++++++++++++ 3 files changed, 72 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 9ec1802..7b35397 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -56,7 +56,7 @@ @ stdcall SymFindFileInPath(long str str ptr long long long ptr ptr ptr) @ stub SymFindFileInPathW @ stdcall SymFromAddr(ptr double ptr ptr) -@ stub SymFromAddrW +@ stdcall SymFromAddrW(ptr double ptr ptr) @ stub SymFromIndex @ stub SymFromIndexW @ stdcall SymFromName(long str ptr) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 753c0b7..1fb1c37 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -36,6 +36,7 @@ #endif #include "wine/debug.h" #include "dbghelp_private.h" +#include "winnls.h" WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); WINE_DECLARE_DEBUG_CHANNEL(dbghelp_symt); @@ -763,6 +764,31 @@ static BOOL symt_enum_locals(struct proc } /****************************************************************** + * copy_symbolW + * + * Helper for transforming an ANSI symbol info into an UNICODE one. + * Assume that MaxNameLen is the same for both version (A & W). + */ +static void copy_symbolW(SYMBOL_INFOW* siw, const SYMBOL_INFO* si) +{ + siw->SizeOfStruct = si->SizeOfStruct; + siw->TypeIndex = si->TypeIndex; + siw->Reserved[0] = si->Reserved[0]; + siw->Reserved[1] = si->Reserved[1]; + siw->Index = si->info; /* FIXME: see dbghelp.h */ + siw->Size = si->Size; + siw->ModBase = si->ModBase; + siw->Flags = si->Flags; + siw->Value = si->Value; + siw->Address = si->Address; + siw->Register = si->Register; + siw->Scope = si->Scope; + siw->Tag = si->Tag; + siw->NameLen = si->NameLen; + siw->MaxNameLen = si->MaxNameLen; + MultiByteToWideChar(CP_ACP, 0, si->Name, -1, siw->Name, siw->MaxNameLen); +} +/****************************************************************** * SymEnumSymbols (DBGHELP.@) * * cases BaseOfDll = 0 @@ -901,6 +927,31 @@ BOOL WINAPI SymFromAddr(HANDLE hProcess, } /****************************************************************** + * SymFromAddrW (DBGHELP.@) + * + */ +BOOL WINAPI SymFromAddrW(HANDLE hProcess, DWORD64 Address, + DWORD64* Displacement, PSYMBOL_INFOW Symbol) +{ + PSYMBOL_INFO si; + unsigned len; + BOOL ret; + + len = sizeof(*si) + Symbol->MaxNameLen * sizeof(WCHAR); + si = HeapAlloc(GetProcessHeap(), 0, len); + if (!si) return FALSE; + + si->SizeOfStruct = sizeof(*si); + si->MaxNameLen = Symbol->MaxNameLen; + if ((ret = SymFromAddr(hProcess, Address, Displacement, si))) + { + copy_symbolW(Symbol, si); + } + HeapFree(GetProcessHeap(), 0, si); + return ret; +} + +/****************************************************************** * SymGetSymFromAddr (DBGHELP.@) * */ diff --git a/include/dbghelp.h b/include/dbghelp.h index b6ceaa8..79f97b3 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -817,6 +817,25 @@ typedef struct _SYMBOL_INFO CHAR Name[1]; } SYMBOL_INFO, *PSYMBOL_INFO; +typedef struct _SYMBOL_INFOW +{ + ULONG SizeOfStruct; + ULONG TypeIndex; + ULONG64 Reserved[2]; + ULONG Index; + ULONG Size; + ULONG64 ModBase; + ULONG Flags; + ULONG64 Value; + ULONG64 Address; + ULONG Register; + ULONG Scope; + ULONG Tag; + ULONG NameLen; + ULONG MaxNameLen; + WCHAR Name[1]; +} SYMBOL_INFOW, *PSYMBOL_INFOW; + typedef enum _IMAGEHLP_SYMBOL_TYPE_INFO { TI_GET_SYMTAG, @@ -881,6 +900,7 @@ BOOL WINAPI SymGetTypeInfo(HANDLE, DWORD typedef BOOL (CALLBACK *PSYM_ENUMERATESYMBOLS_CALLBACK)(PSYMBOL_INFO, ULONG, PVOID); BOOL WINAPI SymEnumTypes(HANDLE, ULONG64, PSYM_ENUMERATESYMBOLS_CALLBACK, PVOID); BOOL WINAPI SymFromAddr(HANDLE, DWORD64, DWORD64*, SYMBOL_INFO*); +BOOL WINAPI SymFromAddrW(HANDLE, DWORD64, DWORD64*, SYMBOL_INFOW*); BOOL WINAPI SymFromToken(HANDLE, DWORD64, DWORD, PSYMBOL_INFO); BOOL WINAPI SymFromName(HANDLE, PCSTR, PSYMBOL_INFO); BOOL WINAPI SymGetSymFromAddr(HANDLE, DWORD, PDWORD, PIMAGEHLP_SYMBOL);

1 0

Eric Pouech : dbghelp: Implemented SymGetModuleInfoW and SymGetModuleInfoW64.
by Alexandre Julliard May 11, 2006

May 11, 2006

Module: wine Branch: refs/heads/master Commit: d2d85a1b46f00764e434934db0f9a14e51c29261 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d2d85a1b46f00764e434934… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed May 10 21:35:18 2006 +0200 dbghelp: Implemented SymGetModuleInfoW and SymGetModuleInfoW64. --- dlls/dbghelp/dbghelp.spec | 4 +- dlls/dbghelp/module.c | 81 +++++++++++++++++++++++++++++++++++++++++++++ include/dbghelp.h | 2 + 3 files changed, 84 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 1f753db..9ec1802 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -83,8 +83,8 @@ @ stdcall SymGetModuleBase64(long double) @ stdcall SymGetModuleInfo(long long ptr) @ stdcall SymGetModuleInfo64(long double ptr) -@ stub SymGetModuleInfoW -@ stub SymGetModuleInfoW64 +@ stdcall SymGetModuleInfoW(long long ptr) +@ stdcall SymGetModuleInfoW64(long double ptr) @ stub SymGetOmapBlockBase @ stdcall SymGetOptions() @ stub SymGetScope diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 6cc6c06..26b847a 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -661,6 +661,39 @@ BOOL WINAPI SymGetModuleInfo(HANDLE hPr } /****************************************************************** + * SymGetModuleInfoW (DBGHELP.@) + * + */ +BOOL WINAPI SymGetModuleInfoW(HANDLE hProcess, DWORD dwAddr, + PIMAGEHLP_MODULEW ModuleInfo) +{ + IMAGEHLP_MODULE mi; + IMAGEHLP_MODULEW miw; + + if (sizeof(miw) < ModuleInfo->SizeOfStruct) FIXME("Wrong size\n"); + + mi.SizeOfStruct = sizeof(mi); + if (!SymGetModuleInfo(hProcess, dwAddr, &mi)) return FALSE; + + miw.SizeOfStruct = mi.SizeOfStruct; + miw.BaseOfImage = mi.BaseOfImage; + miw.ImageSize = mi.ImageSize; + miw.TimeDateStamp = mi.TimeDateStamp; + miw.CheckSum = mi.CheckSum; + miw.NumSyms = mi.NumSyms; + miw.SymType = mi.SymType; + MultiByteToWideChar(CP_ACP, 0, mi.ModuleName, -1, + miw.ModuleName, sizeof(miw.ModuleName) / sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, mi.ImageName, -1, + miw.ImageName, sizeof(miw.ImageName) / sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, mi.LoadedImageName, -1, + miw.LoadedImageName, sizeof(miw.LoadedImageName) / sizeof(WCHAR)); + memcpy(ModuleInfo, &miw, ModuleInfo->SizeOfStruct); + + return TRUE; +} + +/****************************************************************** * SymGetModuleInfo64 (DBGHELP.@) * */ @@ -720,6 +753,54 @@ BOOL WINAPI SymGetModuleInfo64(HANDLE h return TRUE; } +/****************************************************************** + * SymGetModuleInfoW64 (DBGHELP.@) + * + */ +BOOL WINAPI SymGetModuleInfoW64(HANDLE hProcess, DWORD64 dwAddr, + PIMAGEHLP_MODULEW64 ModuleInfo) +{ + IMAGEHLP_MODULE64 mi; + IMAGEHLP_MODULEW64 miw; + + if (sizeof(miw) < ModuleInfo->SizeOfStruct) FIXME("Wrong size\n"); + + mi.SizeOfStruct = sizeof(mi); + if (!SymGetModuleInfo64(hProcess, dwAddr, &mi)) return FALSE; + + miw.SizeOfStruct = mi.SizeOfStruct; + miw.BaseOfImage = mi.BaseOfImage; + miw.ImageSize = mi.ImageSize; + miw.TimeDateStamp = mi.TimeDateStamp; + miw.CheckSum = mi.CheckSum; + miw.NumSyms = mi.NumSyms; + miw.SymType = mi.SymType; + MultiByteToWideChar(CP_ACP, 0, mi.ModuleName, -1, + miw.ModuleName, sizeof(miw.ModuleName) / sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, mi.ImageName, -1, + miw.ImageName, sizeof(miw.ImageName) / sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, mi.LoadedImageName, -1, + miw.LoadedImageName, sizeof(miw.LoadedImageName) / sizeof(WCHAR)); + + miw.CVSig = mi.CVSig; + MultiByteToWideChar(CP_ACP, 0, mi.CVData, -1, + miw.CVData, sizeof(miw.CVData) / sizeof(WCHAR)); + miw.PdbSig = mi.PdbSig; + miw.PdbSig70 = mi.PdbSig70; + miw.PdbAge = mi.PdbAge; + miw.PdbUnmatched = mi.PdbUnmatched; + miw.DbgUnmatched = mi.DbgUnmatched; + miw.LineNumbers = mi.LineNumbers; + miw.GlobalSymbols = mi.GlobalSymbols; + miw.TypeInfo = mi.TypeInfo; + miw.SourceIndexed = mi.SourceIndexed; + miw.Publics = mi.Publics; + + memcpy(ModuleInfo, &miw, ModuleInfo->SizeOfStruct); + + return TRUE; +} + /*********************************************************************** * SymGetModuleBase (DBGHELP.@) */ diff --git a/include/dbghelp.h b/include/dbghelp.h index 45916c1..b6ceaa8 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -172,7 +172,7 @@ typedef struct _IMAGEHLP_MODULE64 BOOL Publics; } IMAGEHLP_MODULE64, *PIMAGEHLP_MODULE64; -typedef struct _IMAGEHLP_MODULE64W +typedef struct _IMAGEHLP_MODULEW64 { DWORD SizeOfStruct; DWORD64 BaseOfImage;

1 0

Eric Pouech : dbghelp: Implemented SymLoadModuleExW.
by Alexandre Julliard May 11, 2006

May 11, 2006

Module: wine Branch: refs/heads/master Commit: 922a7bd1912e8600bbfc6caf83ba5f6903f3098b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=922a7bd1912e8600bbfc6ca… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed May 10 21:35:15 2006 +0200 dbghelp: Implemented SymLoadModuleExW. --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/module.c | 34 ++++++++++++++++++++++++++++++++++ include/dbghelp.h | 2 ++ 3 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 8641f43..1f753db 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -117,7 +117,7 @@ @ stdcall SymLoadModule(long long str str long long) @ stdcall SymLoadModule64(long long str str double long) @ stdcall SymLoadModuleEx(long long str str double long ptr long) -@ stub SymLoadModuleExW +@ stdcall SymLoadModuleExW(long long wstr wstr double long ptr long) @ stdcall SymMatchFileName(str str ptr ptr) @ stub SymMatchFileNameW @ stdcall SymMatchString(str str long) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 2076ccc..6cc6c06 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -30,6 +30,7 @@ #include "psapi.h" #include "winreg.h" #include "winternl.h" #include "wine/debug.h" +#include "winnls.h" WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); @@ -463,6 +464,39 @@ DWORD64 WINAPI SymLoadModuleEx(HANDLE h } /*********************************************************************** + * SymLoadModuleExW (DBGHELP.@) + */ +DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageName, + PCWSTR wModuleName, DWORD64 BaseOfDll, DWORD DllSize, + PMODLOAD_DATA Data, DWORD Flags) +{ + LPSTR ImageName, ModuleName; + unsigned len; + BOOL ret; + + if (wImageName) + { + len = WideCharToMultiByte(CP_ACP,0, wImageName, -1, NULL, 0, NULL, NULL); + ImageName = HeapAlloc(GetProcessHeap(), 0, len); + WideCharToMultiByte(CP_ACP,0, wImageName, -1, ImageName, len, NULL, NULL); + } + else ImageName = NULL; + if (wModuleName) + { + len = WideCharToMultiByte(CP_ACP,0, wModuleName, -1, NULL, 0, NULL, NULL); + ModuleName = HeapAlloc(GetProcessHeap(), 0, len); + WideCharToMultiByte(CP_ACP,0, wModuleName, -1, ModuleName, len, NULL, NULL); + } + else ModuleName = NULL; + + ret = SymLoadModuleEx(hProcess, hFile, ImageName, ModuleName, + BaseOfDll, DllSize, Data, Flags); + HeapFree(GetProcessHeap(), 0, ImageName); + HeapFree(GetProcessHeap(), 0, ModuleName); + return ret; +} + +/*********************************************************************** * SymLoadModule64 (DBGHELP.@) */ DWORD64 WINAPI SymLoadModule64(HANDLE hProcess, HANDLE hFile, PCSTR ImageName, diff --git a/include/dbghelp.h b/include/dbghelp.h index 49f4d7e..45916c1 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -763,6 +763,8 @@ DWORD WINAPI SymLoadModule(HANDLE, HAN DWORD64 WINAPI SymLoadModule64(HANDLE, HANDLE, PCSTR, PCSTR, DWORD64, DWORD); DWORD64 WINAPI SymLoadModuleEx(HANDLE, HANDLE, PCSTR, PCSTR, DWORD64, DWORD, PMODLOAD_DATA, DWORD); +DWORD64 WINAPI SymLoadModuleExW(HANDLE, HANDLE, PCWSTR, PCWSTR, DWORD64, DWORD, + PMODLOAD_DATA, DWORD); BOOL WINAPI SymUnloadModule(HANDLE, DWORD); BOOL WINAPI SymUnloadModule64(HANDLE, DWORD64);

1 0

Eric Pouech : dbghelp: Implemented SymRegisterCallbackW64 and 64 -> 64W mapping function.
by Alexandre Julliard May 11, 2006

May 11, 2006

Module: wine Branch: refs/heads/master Commit: 4a80e63a29e1b0184eab6e72bffec70d911437c5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4a80e63a29e1b0184eab6e7… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed May 10 21:35:11 2006 +0200 dbghelp: Implemented SymRegisterCallbackW64 and 64 -> 64W mapping function. --- dlls/dbghelp/dbghelp.c | 76 ++++++++++++++++++++++++++++++++++++---- dlls/dbghelp/dbghelp.spec | 2 + dlls/dbghelp/dbghelp_private.h | 1 + include/dbghelp.h | 13 +++++++ 4 files changed, 84 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index dbd3cfb..d7e0cf3 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -479,10 +479,64 @@ static BOOL CALLBACK reg_cb64to32(HANDLE BOOL pcs_callback(const struct process* pcs, ULONG action, void* data) { TRACE("%p %lu %p\n", pcs, action, data); + if (!pcs->reg_cb) return FALSE; + if (pcs->reg_is_unicode) + { + IMAGEHLP_DEFERRED_SYMBOL_LOAD64* idsl; + IMAGEHLP_DEFERRED_SYMBOL_LOADW64 idslW; + + switch (action) + { + case CBA_DEBUG_INFO: + case CBA_DEFERRED_SYMBOL_LOAD_CANCEL: + case CBA_SET_OPTIONS: + case CBA_SYMBOLS_UNLOADED: + break; + case CBA_DEFERRED_SYMBOL_LOAD_COMPLETE: + 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; + break; + case CBA_DUPLICATE_SYMBOL: + case CBA_EVENT: + case CBA_READ_MEMORY: + default: + FIXME("No mapping for action %lu\n", action); + return FALSE; + } + } return pcs->reg_cb(pcs->handle, action, (ULONG64)(DWORD_PTR)data, pcs->reg_user); } +/****************************************************************** + * sym_register_cb + * + * Helper for registering a callback. + */ +static BOOL sym_register_cb(HANDLE hProcess, + PSYMBOL_REGISTERED_CALLBACK64 cb, + DWORD64 user, BOOL unicode) +{ + struct process* pcs = process_find_by_handle(hProcess); + + if (!pcs) return FALSE; + pcs->reg_cb = cb; + pcs->reg_is_unicode = unicode; + pcs->reg_user = user; + + return TRUE; +} + /*********************************************************************** * SymRegisterCallback (DBGHELP.@) */ @@ -491,7 +545,9 @@ BOOL WINAPI SymRegisterCallback(HANDLE h PVOID UserContext) { DWORD64 tmp = ((ULONGLONG)(DWORD)CallbackFunction << 32) | (DWORD)UserContext; - return SymRegisterCallback64(hProcess, reg_cb64to32, tmp); + TRACE("(%p, %p, %p)\n", + hProcess, CallbackFunction, UserContext); + return sym_register_cb(hProcess, reg_cb64to32, tmp, FALSE); } /*********************************************************************** @@ -501,15 +557,21 @@ BOOL WINAPI SymRegisterCallback64(HANDLE PSYMBOL_REGISTERED_CALLBACK64 CallbackFunction, ULONG64 UserContext) { - struct process* pcs = process_find_by_handle(hProcess); - TRACE("(%p, %p, %s)\n", hProcess, CallbackFunction, wine_dbgstr_longlong(UserContext)); - if (!pcs) return FALSE; - pcs->reg_cb = CallbackFunction; - pcs->reg_user = UserContext; + return sym_register_cb(hProcess, CallbackFunction, UserContext, FALSE); +} - return TRUE; +/*********************************************************************** + * SymRegisterCallbackW64 (DBGHELP.@) + */ +BOOL WINAPI SymRegisterCallbackW64(HANDLE hProcess, + PSYMBOL_REGISTERED_CALLBACK64 CallbackFunction, + ULONG64 UserContext) +{ + TRACE("(%p, %p, %s)\n", + hProcess, CallbackFunction, wine_dbgstr_longlong(UserContext)); + return sym_register_cb(hProcess, CallbackFunction, UserContext, TRUE); } /* This is imagehlp version not dbghelp !! */ diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 69d4ffa..8641f43 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -130,7 +130,7 @@ @ stub SymRefreshModuleList @ stdcall SymRegisterCallback(long ptr ptr) @ stdcall SymRegisterCallback64(long ptr double) -@ stub SymRegisterCallbackW64 +@ stdcall SymRegisterCallbackW64(long ptr double) @ stdcall SymRegisterFunctionEntryCallback(ptr ptr ptr) @ stdcall SymRegisterFunctionEntryCallback64(ptr ptr double) @ stdcall SymSearch(long double long long str double ptr ptr long) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index efc5ceb..cfc9f92 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -294,6 +294,7 @@ struct process WCHAR* search_path; PSYMBOL_REGISTERED_CALLBACK64 reg_cb; + BOOL reg_is_unicode; DWORD64 reg_user; struct module* lmodules; diff --git a/include/dbghelp.h b/include/dbghelp.h index 85e6a73..49f4d7e 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -287,6 +287,18 @@ typedef struct _IMAGEHLP_DEFERRED_SYMBOL DWORD Flags; } IMAGEHLP_DEFERRED_SYMBOL_LOAD64, *PIMAGEHLP_DEFERRED_SYMBOL_LOAD64; +typedef struct _IMAGEHLP_DEFERRED_SYMBOL_LOADW64 +{ + DWORD SizeOfStruct; + DWORD64 BaseOfImage; + DWORD CheckSum; + DWORD TimeDateStamp; + WCHAR FileName[MAX_PATH + 1]; + BOOLEAN Reparse; + HANDLE hFile; + DWORD Flags; +} IMAGEHLP_DEFERRED_SYMBOL_LOADW64, *PIMAGEHLP_DEFERRED_SYMBOL_LOADW64; + typedef struct _IMAGEHLP_DUPLICATE_SYMBOL { DWORD SizeOfStruct; @@ -889,6 +901,7 @@ typedef BOOL (CALLBACK *PSYMBOL_REGISTER BOOL WINAPI SymRegisterCallback(HANDLE, PSYMBOL_REGISTERED_CALLBACK, PVOID); typedef BOOL (CALLBACK *PSYMBOL_REGISTERED_CALLBACK64)(HANDLE, ULONG, ULONG64, ULONG64); BOOL WINAPI SymRegisterCallback64(HANDLE, PSYMBOL_REGISTERED_CALLBACK64, ULONG64); +BOOL WINAPI SymRegisterCallbackW64(HANDLE, PSYMBOL_REGISTERED_CALLBACK64, ULONG64); BOOL WINAPI SymUnDName(PIMAGEHLP_SYMBOL, PSTR, DWORD); BOOL WINAPI SymUnDName64(PIMAGEHLP_SYMBOL64, PSTR, DWORD); DWORD WINAPI UnDecorateSymbolName(LPCSTR, LPSTR, DWORD, DWORD);

1 0

Eric Pouech : dbghelp: SymInitializeW.
by Alexandre Julliard May 11, 2006

May 11, 2006

Module: wine Branch: refs/heads/master Commit: 2e7d3c386a55de1f35114c781577b5be00349b13 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2e7d3c386a55de1f35114c7… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed May 10 21:35:07 2006 +0200 dbghelp: SymInitializeW. - implemented SymInitializeW (and made SymInitialize call it) - implemented Sym{SG}etSearchPathW (and made Sym{SG}etSearchPath call them) - per process search path is now stored as unicode string --- dlls/dbghelp/dbghelp.c | 117 ++++++++++++++++++++++++++++++++-------- dlls/dbghelp/dbghelp.spec | 7 +- dlls/dbghelp/dbghelp_private.h | 2 - dlls/dbghelp/path.c | 19 ++++++ dlls/dbghelp/pe_module.c | 10 +++ include/dbghelp.h | 3 + 6 files changed, 128 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=2e7d3c386a55de1f351…

1 0