https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c15a8e78b03b20016ef96e8e1584bdb430bc3359
commit c15a8e78b03b20016ef96e8e1584bdb430bc3359 Author: winesync <[email protected]> AuthorDate: Fri Sep 11 19:54:10 2020 +0200 Commit: Jérôme Gardou <[email protected]> CommitDate: Wed Sep 16 10:36:02 2020 +0200 [WINESYNC] dbghelp: Always check for debug symbols in BINDIR. wine-staging patch by Sebastian Lackner <[email protected]> --- dll/win32/dbghelp/elf_module.c | 1 + ...01-dbghelp__Always_check_for_debug_symbols_in_BINDIR.diff | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/dll/win32/dbghelp/elf_module.c b/dll/win32/dbghelp/elf_module.c index e44629f016e..923608f35e3 100644 --- a/dll/win32/dbghelp/elf_module.c +++ b/dll/win32/dbghelp/elf_module.c @@ -1436,6 +1436,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename, load_elf.elf_info = elf_info; ret = search_unix_path(filename, process_getenv(pcs, L"LD_LIBRARY_PATH"), elf_load_file_cb, &load_elf) + || search_unix_path(filename, BINDIR, elf_load_file_cb, &load_elf) || search_dll_path(pcs, filename, elf_load_file_cb, &load_elf); } diff --git a/sdk/tools/winesync/dbghelp_staging/0001-dbghelp__Always_check_for_debug_symbols_in_BINDIR.diff b/sdk/tools/winesync/dbghelp_staging/0001-dbghelp__Always_check_for_debug_symbols_in_BINDIR.diff new file mode 100644 index 00000000000..1fba125a79c --- /dev/null +++ b/sdk/tools/winesync/dbghelp_staging/0001-dbghelp__Always_check_for_debug_symbols_in_BINDIR.diff @@ -0,0 +1,12 @@ +diff --git a/dll/win32/dbghelp/elf_module.c b/dll/win32/dbghelp/elf_module.c +index e44629f..923608f 100644 +--- a/dll/win32/dbghelp/elf_module.c ++++ b/dll/win32/dbghelp/elf_module.c +@@ -1436,6 +1436,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename, + load_elf.elf_info = elf_info; + + ret = search_unix_path(filename, process_getenv(pcs, L"LD_LIBRARY_PATH"), elf_load_file_cb, &load_elf) ++ || search_unix_path(filename, BINDIR, elf_load_file_cb, &load_elf) + || search_dll_path(pcs, filename, elf_load_file_cb, &load_elf); + } +
