diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg new file mode 100644 index 00000000000..c06d6c5981e --- /dev/null +++ b/sdk/tools/winesync/dbghelp.cfg @@ -0,0 +1,6 @@ +directories: + dlls/dbghelp: dll/win32/dbghelp +files: + include/dbghelp.h: sdk/include/psdk/dbghelp.h +tags: + wine: wine-3.9 diff --git a/sdk/tools/winesync/dbghelp_staging/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch b/sdk/tools/winesync/dbghelp_staging/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch new file mode 100644 index 00000000000..b16a465972a --- /dev/null +++ b/sdk/tools/winesync/dbghelp_staging/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch @@ -0,0 +1,31 @@ +From f466d59e3eca3c1fd120203d01a746761f301207 Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner +Date: Mon, 6 Oct 2014 05:06:06 +0200 +Subject: dbghelp: Always check for debug symbols in BINDIR. + +--- + dll/win32/dbghelp/elf_module.c | 8 +++++--- + 2 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/dll/win32/dbghelp/elf_module.c b/dll/win32/dbghelp/elf_module.c +index 6428955941c..75c0a4c2453 100644 +--- a/dll/win32/dbghelp/elf_module.c ++++ b/dll/win32/dbghelp/elf_module.c +@@ -1486,9 +1486,11 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename, + if (!ret && !strchrW(filename, '/')) + { + ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, +- getenv("PATH"), elf_info) || +- elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, +- getenv("LD_LIBRARY_PATH"), elf_info); ++ getenv("PATH"), elf_info); ++ if (!ret) ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, ++ getenv("LD_LIBRARY_PATH"), elf_info); ++ if (!ret) ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, ++ BINDIR, elf_info); + if (!ret) ret = elf_load_file_from_dll_path(pcs, filename, + load_offset, dyn_addr, elf_info); + } +-- +2.11.0 +