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
6d00838e
Commit
6d00838e
authored
Apr 28, 2021
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wineandroid: Load ntdll from the architecture-specific directory.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
f2838cc1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
1 deletion
+10
-1
WineActivity.java
dlls/wineandroid.drv/WineActivity.java
+10
-1
No files found.
dlls/wineandroid.drv/WineActivity.java
View file @
6d00838e
...
...
@@ -97,6 +97,15 @@ public class WineActivity extends Activity
return
null
;
}
private
String
get_so_dir
(
String
abi
)
{
if
(
abi
.
equals
(
"x86"
))
return
"/i386-unix"
;
if
(
abi
.
equals
(
"x86_64"
))
return
"/x86_64-unix"
;
if
(
abi
.
equals
(
"armeabi-v7a"
))
return
"/arm-unix"
;
if
(
abi
.
equals
(
"arm64-v8a"
))
return
"/aarch64-unix"
;
return
""
;
}
private
void
loadWine
(
String
cmdline
)
{
copyAssetFiles
();
...
...
@@ -138,7 +147,7 @@ public class WineActivity extends Activity
createProgressDialog
(
0
,
"Setting up the Windows environment..."
);
System
.
load
(
dlldir
.
toString
()
+
"/ntdll.so"
);
System
.
load
(
dlldir
.
toString
()
+
get_so_dir
(
wine_abi
)
+
"/ntdll.so"
);
prefix
.
mkdirs
();
runWine
(
cmdline
,
env
);
...
...
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