https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ee8def7d7676219b04262403fc1d1d6c85e89b39
commit ee8def7d7676219b04262403fc1d1d6c85e89b39 Author: winesync <[email protected]> AuthorDate: Fri Sep 11 19:53:58 2020 +0200 Commit: Jérôme Gardou <[email protected]> CommitDate: Wed Sep 16 10:36:01 2020 +0200 [WINESYNC] dbghelp: Ignore missing debug info in SymInitializeW. When fInvadeProcess is used, we return an error if the target process is found but its debug info is not. We should only return an error if the process is not found. This fixes a SymInitializeW popup error on Hard Reset Redux startup. Signed-off-by: Rémi Bernon <[email protected]> Signed-off-by: Alexandre Julliard <[email protected]> wine commit id 774ee4734a7d6c02f648fdf1747df837c964583d by Rémi Bernon <[email protected]> --- dll/win32/dbghelp/dbghelp.c | 8 ++++---- sdk/tools/winesync/dbghelp.cfg | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dll/win32/dbghelp/dbghelp.c b/dll/win32/dbghelp/dbghelp.c index 892ad9927cd..c67f9730125 100644 --- a/dll/win32/dbghelp/dbghelp.c +++ b/dll/win32/dbghelp/dbghelp.c @@ -378,10 +378,10 @@ static BOOL check_live_target(struct process* pcs) TRACE("got debug info address %#lx from PEB %p\n", base, pbi.PebBaseAddress); #ifndef __REACTOS__ - return elf_read_wine_loader_dbg_info(pcs, base) || macho_read_wine_loader_dbg_info(pcs, base); -#else - return TRUE; + if (!elf_read_wine_loader_dbg_info(pcs, base) && !macho_read_wine_loader_dbg_info(pcs, base)) + WARN("couldn't load process debug info at %#lx\n", base); #endif + return TRUE; } #endif @@ -485,7 +485,7 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP { if (fInvadeProcess) EnumerateLoadedModulesW64(hProcess, process_invade_cb, hProcess); - pcs->loader->synchronize_module_list(pcs); + if (pcs->loader) pcs->loader->synchronize_module_list(pcs); } else if (fInvadeProcess) #else diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index e7ba3c932be..cdf2499dfdf 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: 30f17befaf216a42a4e2cfbca3ed7bdce43e476a + wine: 774ee4734a7d6c02f648fdf1747df837c964583d
