Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-30 19:14:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] dbghelp: SymFromAddr: Handle 2 or more symbols at the same address correct.

Browse source 
Signed-off-by: Andreas Maier <staubim@quantentunnel.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id d614ac46718311f49541b32ac726c17a06077ae1 by Andreas Maier <staubim@quantentunnel.de>
This commit is contained in:
winesync 2020-09-11 15:55:23 +02:00 committed by Jérôme Gardou
parent 9a139418eb
commit 667215841f
2 changed files with 36 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
dll/win32/dbghelp/symbol.c
View file

@ -874,6 +874,33 @@ static void symt_get_length(struct module* module, const struct symt* symt, ULON
*size = 0x1000; /* arbitrary value */
}
/* neede by symt_find_nearest */
int symt_get_best_at(struct module* module, int idx_sorttab)
{
ULONG64 ref_addr;
int idx_sorttab_orig = idx_sorttab;
if (module->addr_sorttab[idx_sorttab]->symt.tag == SymTagPublicSymbol)
{
symt_get_address(&module->addr_sorttab[idx_sorttab]->symt, &ref_addr);
while (idx_sorttab > 0 &&
module->addr_sorttab[idx_sorttab]->symt.tag == SymTagPublicSymbol &&
!cmp_sorttab_addr(module, idx_sorttab - 1, ref_addr))
idx_sorttab--;
if (module->addr_sorttab[idx_sorttab]->symt.tag == SymTagPublicSymbol)
{
idx_sorttab = idx_sorttab_orig;
while (idx_sorttab < module->num_sorttab - 1 &&
module->addr_sorttab[idx_sorttab]->symt.tag == SymTagPublicSymbol &&
!cmp_sorttab_addr(module, idx_sorttab + 1, ref_addr))
idx_sorttab++;
}
/* if no better symbol fond restore original */
if (module->addr_sorttab[idx_sorttab]->symt.tag == SymTagPublicSymbol)
idx_sorttab = idx_sorttab_orig;
}
return idx_sorttab;
}
/* assume addr is in module */
struct symt_ht* symt_find_nearest(struct module* module, DWORD_PTR addr)
{
@ -892,7 +919,12 @@ struct symt_ht* symt_find_nearest(struct module* module, DWORD_PTR addr)
high = module->num_sorttab;
symt_get_address(&module->addr_sorttab[0]->symt, &ref_addr);
if (addr < ref_addr) return NULL;
if (addr <= ref_addr)
{
low = symt_get_best_at(module, 0);
return module->addr_sorttab[low];
}
if (high)
{
symt_get_address(&module->addr_sorttab[high - 1]->symt, &ref_addr);
@ -915,23 +947,7 @@ struct symt_ht* symt_find_nearest(struct module* module, DWORD_PTR addr)
/* If found symbol is a public symbol, check if there are any other entries that
* might also have the same address, but would get better information
*/
if (module->addr_sorttab[low]->symt.tag == SymTagPublicSymbol)
{
symt_get_address(&module->addr_sorttab[low]->symt, &ref_addr);
if (low > 0 &&
module->addr_sorttab[low - 1]->symt.tag != SymTagPublicSymbol &&
!cmp_sorttab_addr(module, low - 1, ref_addr))
low--;
else if (low < module->num_sorttab - 1 &&
module->addr_sorttab[low + 1]->symt.tag != SymTagPublicSymbol &&
!cmp_sorttab_addr(module, low + 1, ref_addr))
low++;
}
/* finally check that we fit into the found symbol */
symt_get_address(&module->addr_sorttab[low]->symt, &ref_addr);
if (addr < ref_addr) return NULL;
symt_get_length(module, &module->addr_sorttab[low]->symt, &ref_size);
if (addr >= ref_addr + ref_size) return NULL;
low = symt_get_best_at(module, low);
return module->addr_sorttab[low];
}
@ -1260,7 +1276,7 @@ BOOL WINAPI SymFromAddr(HANDLE hProcess, DWORD64 Address,
symt_fill_sym_info(&pair, NULL, &sym->symt, Symbol);
if (Displacement)
*Displacement = Address - Symbol->Address;
*Displacement = (Address >= Symbol->Address) ? (Address - Symbol->Address) : (DWORD64)-1;
return TRUE;
}

2
sdk/tools/winesync/dbghelp.cfg
View file

@ -4,4 +4,4 @@ files:
include/dbghelp.h: sdk/include/psdk/dbghelp.h
include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h
tags:
wine: 6c3418914df3196bf5a464649ef302a5e942dd90
wine: d614ac46718311f49541b32ac726c17a06077ae1