https://git.reactos.org/?p=reactos.git;a=commitdiff;h=345ffb9a3c7e5bd88763c2...
commit 345ffb9a3c7e5bd88763c2eab5b1f381ccf73076 Author: winesync ros-dev@reactos.org AuthorDate: Fri Sep 11 18:57:59 2020 +0200 Commit: Jérôme Gardou jerome.gardou@reactos.org CommitDate: Wed Sep 16 10:35:53 2020 +0200
[WINESYNC] dbghelp: Inline ELF magic constants.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
wine commit id 66ab2c503de6d39f1a0256d66511da05d326ac5e by Jacek Caban jacek@codeweavers.com --- dll/win32/dbghelp/elf_module.c | 5 ++--- sdk/tools/winesync/dbghelp.cfg | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/dll/win32/dbghelp/elf_module.c b/dll/win32/dbghelp/elf_module.c index 4cbb09ff789..9449c9ab618 100644 --- a/dll/win32/dbghelp/elf_module.c +++ b/dll/win32/dbghelp/elf_module.c @@ -387,7 +387,6 @@ static BOOL elf_map_shdr(struct elf_map_file_data* emfd, struct image_file_map* */ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* fmap) { - static const BYTE elf_signature[4] = { ELFMAG0, ELFMAG1, ELFMAG2, ELFMAG3 }; unsigned int i; size_t tmp, page_mask = sysinfo.dwPageSize - 1; WCHAR *dos_path; @@ -419,10 +418,10 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* return FALSE;
/* and check for an ELF header */ - if (memcmp(e_ident, elf_signature, sizeof(elf_signature))) + if (memcmp(e_ident, "\177ELF", 4)) return FALSE;
- fmap->addr_size = e_ident[EI_CLASS] == ELFCLASS64 ? 64 : 32; + fmap->addr_size = e_ident[4] == 2 /* ELFCLASS64 */ ? 64 : 32;
if (fmap->addr_size == 32) { diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index 5e791152719..9c8efd8d37a 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: 7b12b1849c711476b64b3ed6bc60805ff8f2715f + wine: 66ab2c503de6d39f1a0256d66511da05d326ac5e
-
winesync