[DBGHELP]
authorThomas Faber <thomas.faber@reactos.org>
Wed, 23 Mar 2016 11:43:20 +0000 (11:43 +0000)
committerThomas Faber <thomas.faber@reactos.org>
Wed, 23 Mar 2016 11:43:20 +0000 (11:43 +0000)
- Properly rename SYMBOL_INFO's member to Index, as done upstream. Dedicated to Timo.

svn path=/trunk/; revision=71035

reactos/dll/win32/dbghelp/compat.h
reactos/dll/win32/dbghelp/symbol.c
reactos/dll/win32/dbghelp/type.c
reactos/include/psdk/dbghelp.h

index cff7287..99cb40d 100644 (file)
@@ -680,7 +680,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;
index 3271605..424bdec 100644 (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))
         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 ||
@@ -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)
 {
     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);
@@ -995,7 +995,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;
index 7372431..bffbf40 100644 (file)
@@ -460,7 +460,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;
index 0ffc36b..a4c4a5d 100644 (file)
@@ -1065,10 +1065,7 @@ typedef struct _SYMBOL_INFO
     ULONG       SizeOfStruct;
     ULONG       TypeIndex;
     ULONG64     Reserved[2];
-    union {
-      ULONG       info;   /* wrong, but wine needs it */
-      ULONG       Index;
-    };
+    ULONG       Index;
     ULONG       Size;
     ULONG64     ModBase;
     ULONG       Flags;