https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d57c6b88f67bb6031ed88...
commit 2d57c6b88f67bb6031ed88d2c93f7c9bc082fd88 Author: winesync ros-dev@reactos.org AuthorDate: Fri Sep 11 18:46:09 2020 +0200 Commit: Jérôme Gardou jerome.gardou@reactos.org CommitDate: Wed Sep 16 10:35:51 2020 +0200
[WINESYNC] dbghelp: Clear N_PEXT flag of stab type in macho files.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
wine commit id 47f1c5a993ed34e5f1e4783360019613d0f9682a by Jacek Caban jacek@codeweavers.com --- dll/win32/dbghelp/stabs.c | 3 +++ sdk/tools/winesync/dbghelp.cfg | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/dll/win32/dbghelp/stabs.c b/dll/win32/dbghelp/stabs.c index dcb28d21a96..f7c2cd1a7c0 100644 --- a/dll/win32/dbghelp/stabs.c +++ b/dll/win32/dbghelp/stabs.c @@ -1357,7 +1357,10 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, if (stab_ptr->n_type & N_STAB) type = stab_ptr->n_type; else + { type = (stab_ptr->n_type & N_TYPE); + if (module->type == DMT_MACHO) type &= ~N_PEXT; + }
/* only symbol entries contain a typedef */ switch (type) diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index 5b6f77aa2f1..fb390dcefcf 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: 208719a7507c41b77d3db9f6b8ffbcc5a4e02f3d + wine: 47f1c5a993ed34e5f1e4783360019613d0f9682a