Module: wine Branch: master Commit: e91c06b068a7e93d1b1802e530aa89cc876ddcc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e91c06b068a7e93d1b1802e530...
Author: Thomas Faber thomas.faber@reactos.org Date: Mon Mar 21 18:30:14 2016 +0100
dbghelp: Use documented member name in SYMBOL_INFO structure.
Signed-off-by: Thomas Faber thomas.faber@reactos.org Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/dbghelp/symbol.c | 6 +++--- dlls/dbghelp/type.c | 2 +- include/dbghelp.h | 2 +- programs/winedbg/symbol.c | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index efcf7b6..08ea834 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -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)) 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; if (!symt_get_info(pair->effective, sym, TI_GET_LENGTH, &size) && (!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) { 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->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); @@ -987,7 +987,7 @@ void copy_symbolW(SYMBOL_INFOW* siw, const SYMBOL_INFO* si) 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->Index = si->Index; siw->Size = si->Size; siw->ModBase = si->ModBase; siw->Flags = si->Flags; diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 6ccbc9a..5991366 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -471,7 +471,7 @@ BOOL WINAPI SymEnumTypes(HANDLE hProcess, ULONG64 BaseOfDll, { type = *(struct symt**)vector_at(&pair.effective->vtypes, i); 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); sym_info->Size = size; sym_info->ModBase = pair.requested->module.BaseOfImage; diff --git a/include/dbghelp.h b/include/dbghelp.h index 483ef29..2fd9ef0 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -957,7 +957,7 @@ typedef struct _SYMBOL_INFO ULONG SizeOfStruct; ULONG TypeIndex; ULONG64 Reserved[2]; - ULONG info; /* sdk states info, while MSDN says it's Index... */ + ULONG Index; ULONG Size; ULONG64 ModBase; ULONG Flags; diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index c43cba9..1040187 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -99,7 +99,7 @@ static BOOL fill_sym_lvalue(const SYMBOL_INFO* sym, ULONG_PTR base, VARIANT v;
type.module = sym->ModBase; - type.id = sym->info; + type.id = sym->Index;
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; } sgv->syms[insp].flags = sym->Flags; - sgv->syms[insp].sym_info = sym->info; + sgv->syms[insp].sym_info = sym->Index; sgv->num++;
return TRUE; @@ -614,7 +614,7 @@ enum dbg_line_status symbol_get_function_line_status(const ADDRESS64* addr) return dbg_no_line_info;
func.module = sym->ModBase; - func.id = sym->info; + func.id = sym->Index;
if (symbol_get_debug_start(&func, &start) && lin < start) return dbg_not_on_a_line_number;