[ros-diffs] [reactos] 163/179: [WINESYNC] dbghelp: Don't use PATH to search for libraries.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0fd6a91bf102cc674c5fd…

commit 0fd6a91bf102cc674c5fd5ebd8df6ba58b4d47a8
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Fri Sep 11 19:04:30 2020 +0200
Commit:     Jérôme Gardou <jerome.gardou(a)reactos.org>
CommitDate: Wed Sep 16 10:35:58 2020 +0200

    [WINESYNC] dbghelp: Don't use PATH to search for libraries.
    
    It should be used only for the main executable, for which we get full
    path anyway.
    
    Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id 5bc58410f28aefea3c3f41e056a372aff4dceac7 by Jacek Caban
<jacek(a)codeweavers.com>
---
 dll/win32/dbghelp/elf_module.c   |  3 +--
 dll/win32/dbghelp/macho_module.c | 10 ++--------
 sdk/tools/winesync/dbghelp.cfg   |  2 +-
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/dll/win32/dbghelp/elf_module.c b/dll/win32/dbghelp/elf_module.c
index 72e9d2124a2..a77b034f420 100644
--- a/dll/win32/dbghelp/elf_module.c
+++ b/dll/win32/dbghelp/elf_module.c
@@ -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.elf_info    = elf_info;
 
-        ret = search_unix_path(filename, getenv("PATH"), elf_load_file_cb,
&load_elf)
-            || search_unix_path(filename, getenv("LD_LIBRARY_PATH"),
elf_load_file_cb, &load_elf)
+        ret = search_unix_path(filename, getenv("LD_LIBRARY_PATH"),
elf_load_file_cb, &load_elf)
             || search_dll_path(filename, elf_load_file_cb, &load_elf);
     }
 
diff --git a/dll/win32/dbghelp/macho_module.c b/dll/win32/dbghelp/macho_module.c
index 4baf444f9e8..3249a7ab2ac 100644
--- a/dll/win32/dbghelp/macho_module.c
+++ b/dll/win32/dbghelp/macho_module.c
@@ -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.macho_info = macho_info;
 
-    /* If has no directories, try PATH first. */
+    /* Try DYLD_LIBRARY_PATH first. */
     p = file_name(filename);
-    if (p == filename)
-    {
-        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);
+    ret = search_unix_path(p, getenv("DYLD_LIBRARY_PATH"), macho_load_file_cb,
&load_params);
 
     /* Try the path as given. */
     if (!ret)
diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg
index a10d94821ea..ce9b658b22d 100644
--- a/sdk/tools/winesync/dbghelp.cfg
+++ b/sdk/tools/winesync/dbghelp.cfg
@@ -4,4 +4,4 @@ files:
   include/dbghelp.h: sdk/include/psdk/dbghelp.h
   include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h
 tags:
-  wine: ceae3f0207fb8f174d0a762ef7fe4f405316541f
+  wine: 5bc58410f28aefea3c3f41e056a372aff4dceac7