Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-01 03:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] dbghelp: Don't use PATH to search for libraries.

Browse source 
It should be used only for the main executable, for which we get full
path anyway.

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 5bc58410f28aefea3c3f41e056a372aff4dceac7 by Jacek Caban <jacek@codeweavers.com>
This commit is contained in:
winesync 2020-09-11 19:04:30 +02:00 committed by Jérôme Gardou
parent 9a9f849895
commit 0fd6a91bf1
3 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1435,8 +1435,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename,
load_elf.dyn_addr = dyn_addr; load_elf.dyn_addr = dyn_addr;
load_elf.elf_info = elf_info; load_elf.elf_info = elf_info;
ret = search_unix_path(filename, getenv("PATH"), elf_load_file_cb, &load_elf) ret = search_unix_path(filename, getenv("LD_LIBRARY_PATH"), elf_load_file_cb, &load_elf)
|| search_unix_path(filename, getenv("LD_LIBRARY_PATH"), elf_load_file_cb, &load_elf)
|| search_dll_path(filename, elf_load_file_cb, &load_elf); || search_dll_path(filename, elf_load_file_cb, &load_elf);
} }

10
dll/win32/dbghelp/macho_module.c
View file

@ -1572,15 +1572,9 @@ static BOOL macho_search_and_load_file(struct process* pcs, const WCHAR* filenam
load_params.load_addr = load_addr; load_params.load_addr = load_addr;
load_params.macho_info = macho_info; load_params.macho_info = macho_info;
/* If has no directories, try PATH first. */ /* Try DYLD_LIBRARY_PATH first. */
p = file_name(filename); p = file_name(filename);
if (p == filename) ret = search_unix_path(p, getenv("DYLD_LIBRARY_PATH"), macho_load_file_cb, &load_params);
{
ret = search_unix_path(filename, getenv("PATH"), macho_load_file_cb, &load_params);
}
/* Try DYLD_LIBRARY_PATH, with just the filename (no directories). */
if (!ret)
ret = search_unix_path(p, getenv("DYLD_LIBRARY_PATH"), macho_load_file_cb, &load_params);
/* Try the path as given. */ /* Try the path as given. */
if (!ret) if (!ret)

2
sdk/tools/winesync/dbghelp.cfg
View file

@ -4,4 +4,4 @@ files:
include/dbghelp.h: sdk/include/psdk/dbghelp.h include/dbghelp.h: sdk/include/psdk/dbghelp.h
include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h
tags: tags:
wine: ceae3f0207fb8f174d0a762ef7fe4f405316541f wine: 5bc58410f28aefea3c3f41e056a372aff4dceac7