system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 20:07:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

dbghelp: When looking up for a local variable (or parameter), pass the function pointer.

Browse source
This commit is contained in:
Eric Pouech 2006-11-24 22:17:16 +01:00 committed by Alexandre Julliard
parent 32c96adddd
commit 4bcca691d1
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
dlls/dbghelp/symbol.c
View file

@ -449,6 +449,7 @@ struct symt_thunk* symt_new_thunk(struct module* module,
/* expect sym_info->MaxNameLen to be set before being called */ /* expect sym_info->MaxNameLen to be set before being called */
static void symt_fill_sym_info(const struct module_pair* pair, static void symt_fill_sym_info(const struct module_pair* pair,
const struct symt_function* func,
const struct symt* sym, SYMBOL_INFO* sym_info) const struct symt* sym, SYMBOL_INFO* sym_info)
{ {
const char* name; const char* name;
@ -564,9 +565,9 @@ struct sym_enum
}; };
static BOOL send_symbol(const struct sym_enum* se, struct module_pair* pair, static BOOL send_symbol(const struct sym_enum* se, struct module_pair* pair,
const struct symt* sym) const struct symt_function* func, const struct symt* sym)
{ {
symt_fill_sym_info(pair, sym, se->sym_info); symt_fill_sym_info(pair, func, sym, se->sym_info);
if (se->index && se->sym_info->info != se->index) return FALSE; if (se->index && se->sym_info->info != se->index) return FALSE;
if (se->tag && se->sym_info->Tag != se->tag) 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; if (se->addr && !(se->addr >= se->sym_info->Address && se->addr < se->sym_info->Address + se->sym_info->Size)) return FALSE;
@ -589,7 +590,7 @@ static BOOL symt_enum_module(struct module_pair* pair, regex_t* regex,
{ {
se->sym_info->SizeOfStruct = sizeof(SYMBOL_INFO); se->sym_info->SizeOfStruct = sizeof(SYMBOL_INFO);
se->sym_info->MaxNameLen = sizeof(se->buffer) - sizeof(SYMBOL_INFO); se->sym_info->MaxNameLen = sizeof(se->buffer) - sizeof(SYMBOL_INFO);
if (send_symbol(se, pair, &sym->symt)) return TRUE; if (send_symbol(se, pair, NULL, &sym->symt)) return TRUE;
} }
} }
return FALSE; return FALSE;
@ -697,7 +698,7 @@ int symt_find_nearest(struct module* module, DWORD addr)
static BOOL symt_enum_locals_helper(struct module_pair* pair, static BOOL symt_enum_locals_helper(struct module_pair* pair,
regex_t* preg, const struct sym_enum* se, regex_t* preg, const struct sym_enum* se,
struct vector* v) struct symt_function* func, struct vector* v)
{ {
struct symt** plsym = NULL; struct symt** plsym = NULL;
struct symt* lsym = NULL; struct symt* lsym = NULL;
@ -713,14 +714,14 @@ static BOOL symt_enum_locals_helper(struct module_pair* pair,
struct symt_block* block = (struct symt_block*)lsym; struct symt_block* block = (struct symt_block*)lsym;
if (pc < block->address || block->address + block->size <= pc) if (pc < block->address || block->address + block->size <= pc)
continue; continue;
if (!symt_enum_locals_helper(pair, preg, se, &block->vchildren)) if (!symt_enum_locals_helper(pair, preg, se, func, &block->vchildren))
return FALSE; return FALSE;
} }
break; break;
case SymTagData: case SymTagData:
if (regexec(preg, symt_get_name(lsym), 0, NULL, 0) == 0) if (regexec(preg, symt_get_name(lsym), 0, NULL, 0) == 0)
{ {
if (send_symbol(se, pair, lsym)) return FALSE; if (send_symbol(se, pair, func, lsym)) return FALSE;
} }
break; break;
case SymTagLabel: case SymTagLabel:
@ -759,13 +760,13 @@ static BOOL symt_enum_locals(struct process* pcs, const char* mask,
compile_regex(mask ? mask : "*", -1, &preg, compile_regex(mask ? mask : "*", -1, &preg,
dbghelp_options & SYMOPT_CASE_INSENSITIVE); dbghelp_options & SYMOPT_CASE_INSENSITIVE);
ret = symt_enum_locals_helper(&pair, &preg, se, ret = symt_enum_locals_helper(&pair, &preg, se, (struct symt_function*)sym,
&((struct symt_function*)sym)->vchildren); &((struct symt_function*)sym)->vchildren);
regfree(&preg); regfree(&preg);
return ret; return ret;
} }
return send_symbol(se, &pair, &sym->symt); return send_symbol(se, &pair, NULL, &sym->symt);
} }
/****************************************************************** /******************************************************************
@ -991,7 +992,7 @@ BOOL WINAPI SymFromAddr(HANDLE hProcess, DWORD64 Address,
sym = pair.effective->addr_sorttab[idx]; sym = pair.effective->addr_sorttab[idx];
symt_fill_sym_info(&pair, &sym->symt, Symbol); symt_fill_sym_info(&pair, NULL, &sym->symt, Symbol);
*Displacement = Address - Symbol->Address; *Displacement = Address - Symbol->Address;
return TRUE; return TRUE;
} }
@ -1096,7 +1097,7 @@ static BOOL find_name(struct process* pcs, struct module* module, const char* na
if (!strcmp(sym->hash_elt.name, name)) if (!strcmp(sym->hash_elt.name, name))
{ {
symt_fill_sym_info(&pair, &sym->symt, symbol); symt_fill_sym_info(&pair, NULL, &sym->symt, symbol);
return TRUE; return TRUE;
} }
} }