[ros-diffs] [tfaber] 71035: [DBGHELP] - Properly rename SYMBOL_INFO's member to Index, as done upstream. Dedicated to Timo.

Author: tfaber
Date: Wed Mar 23 11:43:20 2016
New Revision: 71035

URL: http://svn.reactos.org/svn/reactos?rev=71035&view=rev
Log:
[DBGHELP]
- Properly rename SYMBOL_INFO's member to Index, as done upstream. Dedicated to Timo.

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

Modified: trunk/reactos/dll/win32/dbghelp/compat.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/compat.h…
==============================================================================
--- trunk/reactos/dll/win32/dbghelp/compat.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/dbghelp/compat.h	[iso-8859-1] Wed Mar 23 11:43:20 2016
@@ -680,7 +680,7 @@
     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;

Modified: trunk/reactos/dll/win32/dbghelp/symbol.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/symbol.c…
==============================================================================
--- trunk/reactos/dll/win32/dbghelp/symbol.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/dbghelp/symbol.c	[iso-8859-1] Wed Mar 23 11:43:20 2016
@@ -572,7 +572,7 @@
 
     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 @@
                         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 @@
     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;

Modified: trunk/reactos/dll/win32/dbghelp/type.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/type.c?r…
==============================================================================
--- trunk/reactos/dll/win32/dbghelp/type.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/dbghelp/type.c	[iso-8859-1] Wed Mar 23 11:43:20 2016
@@ -460,7 +460,7 @@
     {
         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;

Modified: trunk/reactos/include/psdk/dbghelp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dbghelp.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/dbghelp.h	[iso-8859-1] (original)
+++ trunk/reactos/include/psdk/dbghelp.h	[iso-8859-1] Wed Mar 23 11:43:20 2016
@@ -1065,10 +1065,7 @@
     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;