Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-28 12:01:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[DBGHELP]

Browse source 
- Properly rename SYMBOL_INFO's member to Index, as done upstream. Dedicated to Timo.

svn path=/trunk/; revision=71035
This commit is contained in:
Thomas Faber 2016-03-23 11:43:20 +00:00
parent 69a888dc46
commit 8a1bed04bb
4 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/dbghelp/compat.h
View file

@ -680,7 +680,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
reactos/dll/win32/dbghelp/symbol.c
View file

@ -572,7 +572,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 ||
@ -731,7 +731,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);
@ -995,7 +995,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
reactos/dll/win32/dbghelp/type.c
View file

@ -460,7 +460,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;

5
reactos/include/psdk/dbghelp.h
View file

@ -1065,10 +1065,7 @@ typedef struct _SYMBOL_INFO
ULONG SizeOfStruct; ULONG SizeOfStruct;
ULONG TypeIndex; ULONG TypeIndex;
ULONG64 Reserved[2]; ULONG64 Reserved[2];
union { ULONG Index;
ULONG info; /* wrong, but wine needs it */
ULONG Index;
};
ULONG Size; ULONG Size;
ULONG64 ModBase; ULONG64 ModBase;
ULONG Flags; ULONG Flags;