[ros-diffs] [reactos] 48/179: [WINESYNC] dbghelp: Use correct record in codeview_snarf_public.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=616fb16a529069d0aab80…

commit 616fb16a529069d0aab801667533d92f85bfe215
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Fri Sep 11 15:53:06 2020 +0200
Commit:     Jérôme Gardou <jerome.gardou(a)reactos.org>
CommitDate: Wed Sep 16 10:35:38 2020 +0200

    [WINESYNC] dbghelp: Use correct record in codeview_snarf_public.
    
    Use public_vx iststead of data_vx for public symbols.
    
    Signed-off-by: Andreas Maier <staubim(a)quantentunnel.de>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id dbcf9728fa13ade68cc9d380002a5f6ae50fc0c0 by Andreas Maier
<staubim(a)quantentunnel.de>
---
 dll/win32/dbghelp/msc.c            | 18 +++++++++---------
 sdk/include/reactos/wine/mscvpdb.h | 10 ++++++++++
 sdk/tools/winesync/dbghelp.cfg     |  2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/dll/win32/dbghelp/msc.c b/dll/win32/dbghelp/msc.c
index 493c440ea7b..ae51884abc6 100644
--- a/dll/win32/dbghelp/msc.c
+++ b/dll/win32/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:
diff --git a/sdk/include/reactos/wine/mscvpdb.h b/sdk/include/reactos/wine/mscvpdb.h
index 744c17faba4..f11f4065de8 100644
--- a/sdk/include/reactos/wine/mscvpdb.h
+++ b/sdk/include/reactos/wine/mscvpdb.h
@@ -1350,6 +1350,16 @@ union codeview_symbol
         char                    name[1];
     } proc_v3;
 
+    struct
+    {
+        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;
diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg
index f53d6d3b02b..150a7377b38 100644
--- a/sdk/tools/winesync/dbghelp.cfg
+++ b/sdk/tools/winesync/dbghelp.cfg
@@ -4,4 +4,4 @@ files:
   include/dbghelp.h: sdk/include/psdk/dbghelp.h
   include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h
 tags:
-  wine: 63ef9854fb6fc91a8c956a9d91abc07e906a4a33
+  wine: dbcf9728fa13ade68cc9d380002a5f6ae50fc0c0