dbghelp: Use correct record in codeview_snarf_public.

Use public_vx iststead of data_vx for public symbols. Signed-off-by: Andreas Maier <staubim@quantentunnel.de> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dbghelp: Use correct record in codeview_snarf_public.
dbcf9728 · Andreas Maier · Alexandre Julliard · eb39d3db · dbcf9728 · dbcf9728
Commit dbcf9728 authored Nov 25, 2018 by Andreas Maier Committed by Alexandre Julliard Nov 26, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 19 additions and 9 deletions

msc.c dlls/dbghelp/msc.c +9 -9

mscvpdb.h include/wine/mscvpdb.h +10 -0

No files found.
--- a/dlls/dbghelp/msc.c
+++ b/dlls/dbghelp/msc.c
@@ -2067,29 +2067,29 @@ static BOOL codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BY

        switch (sym->generic.id)
        {
-	case S_PUB_V1: /* FIXME is this really a 'data_v1' structure ?? */
+        case S_PUB_V1:
            if (!(dbghelp_options & SYMOPT_NO_PUBLICS))
            {
                symt_new_public(msc_dbg->module, compiland,
-                                terminate_string(&sym->data_v1.p_name),
-                                codeview_get_address(msc_dbg, sym->data_v1.segment, sym->data_v1.offset), 1);
+                                terminate_string(&sym->public_v1.p_name),
+                                codeview_get_address(msc_dbg, sym->public_v1.segment, sym->public_v1.offset), 1);
            }
            break;
-	case S_PUB_V2: /* FIXME is this really a 'data_v2' structure ?? */
+        case S_PUB_V2:
            if (!(dbghelp_options & SYMOPT_NO_PUBLICS))
            {
                symt_new_public(msc_dbg->module, compiland,
-                                terminate_string(&sym->data_v2.p_name),
-                                codeview_get_address(msc_dbg, sym->data_v2.segment, sym->data_v2.offset), 1);
+                                terminate_string(&sym->public_v2.p_name),
+                                codeview_get_address(msc_dbg, sym->public_v2.segment, sym->public_v2.offset), 1);
            }
-	    break;
+            break;

        case S_PUB_V3:
            if (!(dbghelp_options & SYMOPT_NO_PUBLICS))
            {
                symt_new_public(msc_dbg->module, compiland,
-                                sym->data_v3.name,
-                                codeview_get_address(msc_dbg, sym->data_v3.segment, sym->data_v3.offset), 1);
+                                sym->public_v3.name,
+                                codeview_get_address(msc_dbg, sym->public_v3.segment, sym->public_v3.offset), 1);
            }
            break;
        case S_PUB_FUNC1_V3:

--- a/include/wine/mscvpdb.h
+++ b/include/wine/mscvpdb.h
@@ -1352,6 +1352,16 @@ union codeview_symbol
    {
        short int               len;
        short int               id;
+        unsigned int            offset;
+        unsigned short          segment;
+        unsigned short          symtype;
+        struct p_string         p_name;
+    } public_v1;
+
+    struct
+    {
+        short int               len;
+        short int               id;
        unsigned int            symtype;
        unsigned int            offset;
        unsigned short          segment;