Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 01:45:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC]: revert wine-staging patchset for dbghelp

Browse source
This commit is contained in:
Jérôme Gardou 2020-09-11 12:54:01 +02:00
parent 6cce4bdeba
commit 7431b80ae6
2 changed files with 3 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dll/win32/dbghelp/elf_module.c
View file

@ -1489,11 +1489,9 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename,
if (!ret && !strchrW(filename, '/')) if (!ret && !strchrW(filename, '/'))
{ {
ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr,
getenv("PATH"), elf_info); getenv("PATH"), elf_info) ||
if (!ret) ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, elf_load_file_from_path(pcs, filename, load_offset, dyn_addr,
getenv("LD_LIBRARY_PATH"), elf_info); 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, if (!ret) ret = elf_load_file_from_dll_path(pcs, filename,
load_offset, dyn_addr, elf_info); load_offset, dyn_addr, elf_info);
} }

31
sdk/tools/winesync/dbghelp_staging/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch
View file

@ -1,31 +0,0 @@
From f466d59e3eca3c1fd120203d01a746761f301207 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@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