https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e99c66b8bcafdf07e432dc...
commit e99c66b8bcafdf07e432dc8c49b594f379afde02 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: Provide N_PEXT and N_SECT defines when not available.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
wine commit id 208719a7507c41b77d3db9f6b8ffbcc5a4e02f3d by Jacek Caban jacek@codeweavers.com --- dll/win32/dbghelp/stabs.c | 10 ++++++---- sdk/tools/winesync/dbghelp.cfg | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/dll/win32/dbghelp/stabs.c b/dll/win32/dbghelp/stabs.c index 07f5142893f..dcb28d21a96 100644 --- a/dll/win32/dbghelp/stabs.c +++ b/dll/win32/dbghelp/stabs.c @@ -77,6 +77,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs); #ifndef N_STAB #define N_STAB 0xe0 #endif +#ifndef N_PEXT +#define N_PEXT 0x10 +#endif #ifndef N_TYPE #define N_TYPE 0x1e #endif @@ -91,6 +94,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs); #ifndef N_ABS #define N_ABS 0x02 #endif +#ifndef N_SECT +#define N_SECT 0x0e +#endif
#define N_GSYM 0x20 #define N_FUN 0x24 @@ -1651,16 +1657,13 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, /* Always ignore these, they seem to be used only on Darwin. */ break; case N_ABS: -#ifdef N_SECT case N_SECT: -#endif /* FIXME: Other definition types (N_TEXT, N_DATA, N_BSS, ...)? */ if (callback) { BOOL is_public = (stab_ptr->n_type & N_EXT); BOOL is_global = is_public;
-#ifdef N_PEXT /* "private extern"; shared among compilation units in a shared * library, but not accessible from outside the library. */ if (stab_ptr->n_type & N_PEXT) @@ -1668,7 +1671,6 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, is_public = FALSE; is_global = TRUE; } -#endif
if (*ptr == '_') ptr++; stab_strcpy(symname, sizeof(symname), ptr); diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index 85f89bf51d8..5b6f77aa2f1 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: 3b6c268380d703079fa3c5ca06f67b6feb02487f + wine: 208719a7507c41b77d3db9f6b8ffbcc5a4e02f3d