Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
99ef6faf
Commit
99ef6faf
authored
Dec 08, 2020
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Don't use the main exe path as bindir on Android.
The main exe can be the JVM host process. Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
bf662e5b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
loader.c
dlls/ntdll/unix/loader.c
+3
-3
No files found.
dlls/ntdll/unix/loader.c
View file @
99ef6faf
...
...
@@ -339,7 +339,7 @@ static void set_config_dir(void)
}
}
static
void
init_paths
(
int
argc
,
char
*
argv
[],
char
*
envp
[]
)
static
void
init_paths
(
char
*
argv
[]
)
{
Dl_info
info
;
...
...
@@ -350,7 +350,7 @@ static void init_paths( int argc, char *argv[], char *envp[] )
if
(
!
(
build_dir
=
remove_tail
(
dll_dir
,
"/dlls/ntdll"
)))
{
#if
defined(__linux__
) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
#if
(defined(__linux__) && !defined(__ANDROID__)
) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
bin_dir
=
realpath_dirname
(
"/proc/self/exe"
);
#elif defined (__FreeBSD__) || defined(__DragonFly__)
bin_dir
=
realpath_dirname
(
"/proc/curproc/file"
);
...
...
@@ -1757,7 +1757,7 @@ static void check_command_line( int argc, char *argv[] )
*/
void
__wine_main
(
int
argc
,
char
*
argv
[],
char
*
envp
[]
)
{
init_paths
(
arg
c
,
argv
,
envp
);
init_paths
(
arg
v
);
if
(
!
getenv
(
"WINELOADERNOEXEC"
))
/* first time around */
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment