https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7a5f84b3a8c8b4f64f043f...
commit 7a5f84b3a8c8b4f64f043f5acd5d54d114ac1415 Author: winesync ros-dev@reactos.org AuthorDate: Fri Sep 11 19:00:43 2020 +0200 Commit: Jérôme Gardou jerome.gardou@reactos.org CommitDate: Wed Sep 16 10:35:55 2020 +0200
[WINESYNC] dbghelp: Don't use _NSGetExecutablePath in macho_search_loader.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
wine commit id dab78486d3d0063e32e99fb795311b74eb632d3a by Jacek Caban jacek@codeweavers.com --- dll/win32/dbghelp/macho_module.c | 13 ------------- sdk/tools/winesync/dbghelp.cfg | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/dll/win32/dbghelp/macho_module.c b/dll/win32/dbghelp/macho_module.c index e33313ec639..795b8500d9d 100644 --- a/dll/win32/dbghelp/macho_module.c +++ b/dll/win32/dbghelp/macho_module.c @@ -55,7 +55,6 @@ #ifdef HAVE_MACH_O_LOADER_H
#include <mach-o/nlist.h> -#include <mach-o/dyld.h>
struct dyld_image_info32 { @@ -1923,18 +1922,6 @@ static BOOL macho_search_loader(struct process* pcs, struct macho_info* macho_in } }
- /* If we couldn't get the executable path from the target process, try our - own. It will almost always be the same. */ - if (!got_path) - { - len = sizeof(path); - if (!_NSGetExecutablePath(path, &len)) - { - got_path = TRUE; - TRACE("using own executable path: %s\n", debugstr_a(path)); - } - } - if (got_path) { WCHAR* pathW; diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index b1cbcf02a21..93502e635a9 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: e341bd7fe4f2572597ee10cbed5bb2a76ddcc03a + wine: dab78486d3d0063e32e99fb795311b74eb632d3a