Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-02 12:32:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] dbghelp: Use internal flag for loading native files.

Browse source 
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 101820d01a1c776e4b6ff42e661ac3a1380f10c7 by Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
This commit is contained in:
winesync 2020-09-11 16:10:10 +02:00 committed by Jérôme Gardou
parent 006ce9607c
commit d8267536c4
4 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dll/win32/dbghelp/dbghelp_private.h
View file

@ -129,9 +129,6 @@ void* hash_table_iter_up(struct hash_table_iter* hti) DECLSPEC_HIDDEN;
extern unsigned dbghelp_options DECLSPEC_HIDDEN; extern unsigned dbghelp_options DECLSPEC_HIDDEN;
extern BOOL dbghelp_opt_native 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 */ enum location_kind {loc_error, /* reg is the error code */
loc_unavailable, /* location is not available */ loc_unavailable, /* location is not available */
loc_absolute, /* offset is the location */ loc_absolute, /* offset is the location */

2
dll/win32/dbghelp/module.c
View file

@ -859,7 +859,7 @@ BOOL WINAPI SymEnumerateModulesW64(HANDLE hProcess,
for (module = pcs->lmodules; module; module = module->next) 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)) (module->type == DMT_ELF || module->type == DMT_MACHO))
continue; continue;
if (!EnumModulesCallback(module->modulename, if (!EnumModulesCallback(module->modulename,

4
dll/win32/dbghelp/symbol.c
View file

@ -1086,7 +1086,7 @@ static BOOL sym_enum(HANDLE hProcess, ULONG64 BaseOfDll, PCWSTR Mask,
} }
/* not found in PE modules, retry on the ELF ones /* 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) 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 /* 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) for (module = pcs->lmodules; module; module = module->next)
{ {

2
sdk/tools/winesync/dbghelp.cfg
View file

@ -4,4 +4,4 @@ files:
include/dbghelp.h: sdk/include/psdk/dbghelp.h include/dbghelp.h: sdk/include/psdk/dbghelp.h
include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h
tags: tags:
wine: fa5e5df71db231f6fca9c7a40792c17e9bbe5027 wine: 101820d01a1c776e4b6ff42e661ac3a1380f10c7