https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de68f04b7cf0275cead0b…
commit de68f04b7cf0275cead0b10a1d7c516edd29ad43
Author: winesync <ros-dev(a)reactos.org>
AuthorDate: Fri Sep 11 13:00:07 2020 +0200
Commit: Jérôme Gardou <jerome.gardou(a)reactos.org>
CommitDate: Wed Sep 16 10:35:31 2020 +0200
[WINESYNC] dbghelp: Don't enforce child architecture in elf_map_file().
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id c2c0e4fe510f75c757e5dbdc1b727a7c9f3d6f33 by Zebediah Figura
<zfigura(a)codeweavers.com>
---
dll/win32/dbghelp/elf_module.c | 7 +------
sdk/tools/winesync/dbghelp.cfg | 2 +-
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/dll/win32/dbghelp/elf_module.c b/dll/win32/dbghelp/elf_module.c
index e047a7f1ecf..e4689a71b1e 100644
--- a/dll/win32/dbghelp/elf_module.c
+++ b/dll/win32/dbghelp/elf_module.c
@@ -346,12 +346,7 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct
image_file_map*
/* and check for an ELF header */
if (memcmp(fmap->u.elf.elfhdr.e_ident,
elf_signature, sizeof(elf_signature))) goto done;
- /* and check 32 vs 64 size according to current machine */
-#ifdef _WIN64
- if (fmap->u.elf.elfhdr.e_ident[EI_CLASS] != ELFCLASS64) goto done;
-#else
- if (fmap->u.elf.elfhdr.e_ident[EI_CLASS] != ELFCLASS32) goto done;
-#endif
+
fmap->addr_size = fmap->u.elf.elfhdr.e_ident[EI_CLASS] == ELFCLASS64 ? 64 :
32;
fmap->u.elf.sect = HeapAlloc(GetProcessHeap(), 0,
fmap->u.elf.elfhdr.e_shnum *
sizeof(fmap->u.elf.sect[0]));
diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg
index 32f984f570e..e58d3a96f88 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: 185d9ee7ebf56e0663f715e532f2ee2c27289f12
+ wine: c2c0e4fe510f75c757e5dbdc1b727a7c9f3d6f33