[ros-diffs] [reactos] 19/179: [WINESYNC] dbghelp: Read the 32-bit Mach-O header.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9985483679bdc61852251…

commit 9985483679bdc618522519b2d1092f72e0dba3b2
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Fri Sep 11 13:14:04 2020 +0200
Commit:     Jérôme Gardou <jerome.gardou(a)reactos.org>
CommitDate: Wed Sep 16 10:35:33 2020 +0200

    [WINESYNC] dbghelp: Read the 32-bit Mach-O header.
    
    It is identical to the 64-bit header, except for the "reserved" field.
    
    Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id f2e38e17956197180ad730fd00a267fc25d4f238 by Zebediah Figura
<zfigura(a)codeweavers.com>
---
 dll/win32/dbghelp/image_private.h | 4 +---
 dll/win32/dbghelp/macho_module.c  | 2 +-
 sdk/tools/winesync/dbghelp.cfg    | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/dll/win32/dbghelp/image_private.h b/dll/win32/dbghelp/image_private.h
index 060e0272f1a..329236c9bf5 100644
--- a/dll/win32/dbghelp/image_private.h
+++ b/dll/win32/dbghelp/image_private.h
@@ -48,10 +48,8 @@
 #include <mach-o/loader.h>
 
 #ifdef _WIN64
-typedef struct mach_header_64       macho_mach_header;
 typedef struct section_64           macho_section;
 #else
-typedef struct mach_header          macho_mach_header;
 typedef struct section              macho_section;
 #endif
 #endif
@@ -98,7 +96,7 @@ struct image_file_map
             struct image_file_map*      dsym;   /* the debug symbols file associated with
this one */
 
 #ifdef HAVE_MACH_O_LOADER_H
-            macho_mach_header           mach_header;
+            struct mach_header          mach_header;
             const struct load_command*  load_commands;
             const struct uuid_command*  uuid;
 
diff --git a/dll/win32/dbghelp/macho_module.c b/dll/win32/dbghelp/macho_module.c
index ee35af53b17..679c2030b6a 100644
--- a/dll/win32/dbghelp/macho_module.c
+++ b/dll/win32/dbghelp/macho_module.c
@@ -1196,7 +1196,7 @@ static BOOL image_uses_split_segs(HANDLE process, unsigned long
load_addr)
         struct process *pcs = process_find_by_handle(process);
         cpu_type_t target_cpu = (pcs->is_64bit) ? CPU_TYPE_X86_64 : CPU_TYPE_X86;
         uint32_t target_magic = (pcs->is_64bit) ? MH_MAGIC_64 : MH_MAGIC;
-        macho_mach_header header;
+        struct mach_header header;
 
         if (ReadProcessMemory(process, (void*)load_addr, &header, sizeof(header),
NULL) &&
             header.magic == target_magic && header.cputype == target_cpu
&&
diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg
index c5c81db8387..bb75907c7a0 100644
--- a/sdk/tools/winesync/dbghelp.cfg
+++ b/sdk/tools/winesync/dbghelp.cfg
@@ -3,4 +3,4 @@ directories:
 files:
   include/dbghelp.h: sdk/include/psdk/dbghelp.h
 tags:
-  wine: f0ee3471f369bc3d3911647c7efa63fc503e6ce2
+  wine: f2e38e17956197180ad730fd00a267fc25d4f238