system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 10:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

dbghelp: Use documented member name in SYMBOL_INFO structure.

Browse source 
Signed-off-by: Thomas Faber <thomas.faber@reactos.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Thomas Faber 2016-03-21 18:30:14 +01:00 committed by Alexandre Julliard
parent 3a0b3c5bc8
commit e91c06b068
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dlls/dbghelp/symbol.c
View file

@ -564,7 +564,7 @@ static void symt_fill_sym_info(struct module_pair* pair,
if (!symt_get_info(pair->effective, sym, TI_GET_TYPE, &sym_info->TypeIndex)) if (!symt_get_info(pair->effective, sym, TI_GET_TYPE, &sym_info->TypeIndex))
sym_info->TypeIndex = 0; sym_info->TypeIndex = 0;
sym_info->info = symt_ptr2index(pair->effective, sym); sym_info->Index = symt_ptr2index(pair->effective, sym);
sym_info->Reserved[0] = sym_info->Reserved[1] = 0; sym_info->Reserved[0] = sym_info->Reserved[1] = 0;
if (!symt_get_info(pair->effective, sym, TI_GET_LENGTH, &size) && if (!symt_get_info(pair->effective, sym, TI_GET_LENGTH, &size) &&
(!sym_info->TypeIndex || (!sym_info->TypeIndex ||
@ -723,7 +723,7 @@ static BOOL send_symbol(const struct sym_enum* se, struct module_pair* pair,
const struct symt_function* func, const struct symt* sym) const struct symt_function* func, const struct symt* sym)
{ {
symt_fill_sym_info(pair, func, 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->Index != 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;
return !se->cb(se->sym_info, se->sym_info->Size, se->user); return !se->cb(se->sym_info, se->sym_info->Size, se->user);
@ -987,7 +987,7 @@ void copy_symbolW(SYMBOL_INFOW* siw, const SYMBOL_INFO* si)
siw->TypeIndex = si->TypeIndex; siw->TypeIndex = si->TypeIndex;
siw->Reserved[0] = si->Reserved[0]; siw->Reserved[0] = si->Reserved[0];
siw->Reserved[1] = si->Reserved[1]; siw->Reserved[1] = si->Reserved[1];
siw->Index = si->info; /* FIXME: see dbghelp.h */ siw->Index = si->Index;
siw->Size = si->Size; siw->Size = si->Size;
siw->ModBase = si->ModBase; siw->ModBase = si->ModBase;
siw->Flags = si->Flags; siw->Flags = si->Flags;

2
dlls/dbghelp/type.c
View file

@ -471,7 +471,7 @@ BOOL WINAPI SymEnumTypes(HANDLE hProcess, ULONG64 BaseOfDll,
{ {
type = *(struct symt**)vector_at(&pair.effective->vtypes, i); type = *(struct symt**)vector_at(&pair.effective->vtypes, i);
sym_info->TypeIndex = symt_ptr2index(pair.effective, type); sym_info->TypeIndex = symt_ptr2index(pair.effective, type);
sym_info->info = 0; /* FIXME */ sym_info->Index = 0; /* FIXME */
symt_get_info(pair.effective, type, TI_GET_LENGTH, &size); symt_get_info(pair.effective, type, TI_GET_LENGTH, &size);
sym_info->Size = size; sym_info->Size = size;
sym_info->ModBase = pair.requested->module.BaseOfImage; sym_info->ModBase = pair.requested->module.BaseOfImage;

2
include/dbghelp.h
View file

@ -957,7 +957,7 @@ typedef struct _SYMBOL_INFO
ULONG SizeOfStruct; ULONG SizeOfStruct;
ULONG TypeIndex; ULONG TypeIndex;
ULONG64 Reserved[2]; ULONG64 Reserved[2];
ULONG info; /* sdk states info, while MSDN says it's Index... */ ULONG Index;
ULONG Size; ULONG Size;
ULONG64 ModBase; ULONG64 ModBase;
ULONG Flags; ULONG Flags;

6
programs/winedbg/symbol.c
View file

@ -99,7 +99,7 @@ static BOOL fill_sym_lvalue(const SYMBOL_INFO* sym, ULONG_PTR base,
VARIANT v; VARIANT v;
type.module = sym->ModBase; type.module = sym->ModBase;
type.id = sym->info; type.id = sym->Index;
if (!types_get_info(&type, TI_GET_VALUE, &v)) if (!types_get_info(&type, TI_GET_VALUE, &v))
{ {
@ -252,7 +252,7 @@ static BOOL CALLBACK sgv_cb(PSYMBOL_INFO sym, ULONG size, PVOID ctx)
return TRUE; return TRUE;
} }
sgv->syms[insp].flags = sym->Flags; sgv->syms[insp].flags = sym->Flags;
sgv->syms[insp].sym_info = sym->info; sgv->syms[insp].sym_info = sym->Index;
sgv->num++; sgv->num++;
return TRUE; return TRUE;
@ -614,7 +614,7 @@ enum dbg_line_status symbol_get_function_line_status(const ADDRESS64* addr)
return dbg_no_line_info; return dbg_no_line_info;
func.module = sym->ModBase; func.module = sym->ModBase;
func.id = sym->info; func.id = sym->Index;
if (symbol_get_debug_start(&func, &start) && lin < start) if (symbol_get_debug_start(&func, &start) && lin < start)
return dbg_not_on_a_line_number; return dbg_not_on_a_line_number;