[ros-diffs] [reactos] 138/179: [WINESYNC] dbghelp: Use local dynamic section entry declaration.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=44ef7f5ff5dcb03d0df79…

commit 44ef7f5ff5dcb03d0df79d8b08cefae9f9976aed
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Fri Sep 11 18:57:58 2020 +0200
Commit:     Jérôme Gardou <jerome.gardou(a)reactos.org>
CommitDate: Wed Sep 16 10:35:53 2020 +0200

    [WINESYNC] dbghelp: Use local dynamic section entry declaration.
    
    Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id 849cf6ed514aaa5071e61dc471dca6be1d58393f by Jacek Caban
<jacek(a)codeweavers.com>
---
 dll/win32/dbghelp/elf_module.c | 16 ++++++++++++----
 sdk/tools/winesync/dbghelp.cfg |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/dll/win32/dbghelp/elf_module.c b/dll/win32/dbghelp/elf_module.c
index 01ba4528e05..17f0ecb263b 100644
--- a/dll/win32/dbghelp/elf_module.c
+++ b/dll/win32/dbghelp/elf_module.c
@@ -1106,7 +1106,11 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const
WCHAR* filename,
 
             if (fmap->addr_size == 32)
             {
-                Elf32_Dyn dyn;
+                struct
+                {
+                    INT32  d_tag;    /* Dynamic entry type */
+                    UINT32 d_val;    /* Integer or address value */
+                } dyn;
 
                 do
                 {
@@ -1115,7 +1119,7 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const
WCHAR* filename,
                         return ret;
                     if (dyn.d_tag == DT_DEBUG)
                     {
-                        elf_info->dbg_hdr_addr = dyn.d_un.d_ptr;
+                        elf_info->dbg_hdr_addr = dyn.d_val;
                         if (load_offset == 0 && dyn_addr == 0) /* likely the case
*/
                             /* Assume this module (the Wine loader) has been
                              * loaded at its preferred address */
@@ -1128,7 +1132,11 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const
WCHAR* filename,
             }
             else
             {
-                Elf64_Dyn dyn;
+                struct
+                {
+                    INT64  d_tag;    /* Dynamic entry type */
+                    UINT64 d_val;    /* Integer or address value */
+                } dyn;
 
                 do
                 {
@@ -1137,7 +1145,7 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const
WCHAR* filename,
                         return ret;
                     if (dyn.d_tag == DT_DEBUG)
                     {
-                        elf_info->dbg_hdr_addr = dyn.d_un.d_ptr;
+                        elf_info->dbg_hdr_addr = dyn.d_val;
                         if (load_offset == 0 && dyn_addr == 0) /* likely the case
*/
                             /* Assume this module (the Wine loader) has been
                              * loaded at its preferred address */
diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg
index 6d35968ac5b..be1fdfbacd3 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: 186d610442e1db009e40945fc4725c43ea8721ab
+  wine: 849cf6ed514aaa5071e61dc471dca6be1d58393f