[ros-diffs] [reactos] 68/179: [WINESYNC] dbghelp: Use internal flag for loading native files.

[winesync]

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

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

    [WINESYNC] dbghelp: Use internal flag for loading native files.
    
    Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id 101820d01a1c776e4b6ff42e661ac3a1380f10c7 by Alistair Leslie-Hughes
<leslie_alistair(a)hotmail.com>
---
 dll/win32/dbghelp/dbghelp_private.h | 3 ---
 dll/win32/dbghelp/module.c          | 2 +-
 dll/win32/dbghelp/symbol.c          | 4 ++--
 sdk/tools/winesync/dbghelp.cfg      | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/dll/win32/dbghelp/dbghelp_private.h b/dll/win32/dbghelp/dbghelp_private.h
index e5b3bfce8ed..faaa1f6f2aa 100644
--- a/dll/win32/dbghelp/dbghelp_private.h
+++ b/dll/win32/dbghelp/dbghelp_private.h
@@ -129,9 +129,6 @@ void*    hash_table_iter_up(struct hash_table_iter* hti)
DECLSPEC_HIDDEN;
 extern unsigned dbghelp_options DECLSPEC_HIDDEN;
 extern BOOL     dbghelp_opt_native DECLSPEC_HIDDEN;
 
-/* some more Wine extensions */
-#define SYMOPT_WINE_WITH_NATIVE_MODULES 0x40000000
-
 enum location_kind {loc_error,          /* reg is the error code */
                     loc_unavailable,    /* location is not available */
                     loc_absolute,       /* offset is the location */
diff --git a/dll/win32/dbghelp/module.c b/dll/win32/dbghelp/module.c
index c99b957f254..4dca1cf0a9b 100644
--- a/dll/win32/dbghelp/module.c
+++ b/dll/win32/dbghelp/module.c
@@ -859,7 +859,7 @@ BOOL  WINAPI SymEnumerateModulesW64(HANDLE hProcess,
 
     for (module = pcs->lmodules; module; module = module->next)
     {
-        if (!(dbghelp_options & SYMOPT_WINE_WITH_NATIVE_MODULES) &&
+        if (!dbghelp_opt_native &&
             (module->type == DMT_ELF || module->type == DMT_MACHO))
             continue;
         if (!EnumModulesCallback(module->modulename,
diff --git a/dll/win32/dbghelp/symbol.c b/dll/win32/dbghelp/symbol.c
index 450e35faf70..8db6d403f0c 100644
--- a/dll/win32/dbghelp/symbol.c
+++ b/dll/win32/dbghelp/symbol.c
@@ -1086,7 +1086,7 @@ static BOOL sym_enum(HANDLE hProcess, ULONG64 BaseOfDll, PCWSTR
Mask,
         }
         /* not found in PE modules, retry on the ELF ones
          */
-        if (!pair.requested && (dbghelp_options &
SYMOPT_WINE_WITH_NATIVE_MODULES))
+        if (!pair.requested && dbghelp_opt_native)
         {
             for (pair.requested = pair.pcs->lmodules; pair.requested; pair.requested =
pair.requested->next)
             {
@@ -1417,7 +1417,7 @@ BOOL WINAPI SymFromName(HANDLE hProcess, PCSTR Name, PSYMBOL_INFO
Symbol)
     }
     /* not found in PE modules, retry on the ELF ones
      */
-    if (dbghelp_options & SYMOPT_WINE_WITH_NATIVE_MODULES)
+    if (dbghelp_opt_native)
     {
         for (module = pcs->lmodules; module; module = module->next)
         {
diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg
index b503937e428..bc21b3b4ddf 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: fa5e5df71db231f6fca9c7a40792c17e9bbe5027
+  wine: 101820d01a1c776e4b6ff42e661ac3a1380f10c7