https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7431b80ae6bde63f2120db5bcb91b97c6b3c4b13
commit 7431b80ae6bde63f2120db5bcb91b97c6b3c4b13
Author: Jérôme Gardou <jerome.gar...@reactos.org>
AuthorDate: Fri Sep 11 12:54:01 2020 +0200
Commit: Jérôme Gardou <jerome.gar...@reactos.org>
CommitDate: Wed Sep 16 10:35:30 2020 +0200
[WINESYNC]: revert wine-staging patchset for dbghelp
---
dll/win32/dbghelp/elf_module.c | 8 +++---
...-Always-check-for-debug-symbols-in-BINDIR.patch | 31 ----------------------
2 files changed, 3 insertions(+), 36 deletions(-)
diff --git a/dll/win32/dbghelp/elf_module.c b/dll/win32/dbghelp/elf_module.c
index 066c2f5166d..e841b1b707a 100644
--- a/dll/win32/dbghelp/elf_module.c
+++ b/dll/win32/dbghelp/elf_module.c
@@ -1489,11 +1489,9 @@ 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);
- 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);
+ getenv("PATH"), elf_info) ||
+ elf_load_file_from_path(pcs, filename, load_offset, dyn_addr,
+ getenv("LD_LIBRARY_PATH"), elf_info);
if (!ret) ret = elf_load_file_from_dll_path(pcs, filename,
load_offset, dyn_addr,
elf_info);
}
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
deleted file mode 100644
index b16a465972a..00000000000
---
a/sdk/tools/winesync/dbghelp_staging/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f466d59e3eca3c1fd120203d01a746761f301207 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebast...@fds-team.de>
-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
-
