From: Twaik Yont <9674930+twaik@users.noreply.github.com> Move environment setup to WineActivity using setenv() and remove the environment array parameter from wine_init(). The startup variables are now set directly in the JVM process instead of being marshaled through JNI and reconstructed on the native side. wine_init() now reads the process environment via getenv(), keeping the existing LD_LIBRARY_PATH update and WINEDEBUGLOG handling while eliminating the extra environment serialization logic. Signed-off-by: Twaik Yont <9674930+twaik@users.noreply.github.com> --- dlls/ntdll/unix/loader.c | 49 ++++++++---------------- dlls/wineandroid.drv/WineActivity.java | 53 +++++++++++++++----------- 2 files changed, 45 insertions(+), 57 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 9d70aa421f0..8d062ffdda0 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1886,12 +1886,13 @@ DECLSPEC_EXPORT jobject java_object = 0; DECLSPEC_EXPORT unsigned short java_gdt_sel = 0; /* main Wine initialisation */ -static jstring wine_init_jni( JNIEnv *env, jobject obj, jobjectArray cmdline, jobjectArray environment ) +static jstring wine_init_jni( JNIEnv *env, jobject obj, jobjectArray cmdline ) { char **argv; char *str; - char error[1024]; + char error[1024], *winedebuglog = NULL; int i, argc, length; + void (*update_func)( const char * ); /* get the command line array */ @@ -1918,39 +1919,19 @@ static jstring wine_init_jni( JNIEnv *env, jobject obj, jobjectArray cmdline, jo /* set the environment variables */ - if (environment) + // Activity always modifies LD_LIBRARY_PATH in order to load libraries + // from custom location in JVM process. + update_func = dlsym( RTLD_DEFAULT, "android_update_LD_LIBRARY_PATH" ); + if (update_func) update_func( getenv("LD_LIBRARY_PATH") ); + + winedebuglog = getenv("WINEDEBUGLOG"); + if (winedebuglog) { - int count = (*env)->GetArrayLength( env, environment ); - for (i = 0; i < count - 1; i += 2) + int fd = open( winedebuglog, O_WRONLY | O_CREAT | O_APPEND, 0666 ); + if (fd != -1) { - jobject var_obj = (*env)->GetObjectArrayElement( env, environment, i ); - jobject val_obj = (*env)->GetObjectArrayElement( env, environment, i + 1 ); - const char *var = (*env)->GetStringUTFChars( env, var_obj, NULL ); - - if (val_obj) - { - const char *val = (*env)->GetStringUTFChars( env, val_obj, NULL ); - setenv( var, val, 1 ); - if (!strcmp( var, "LD_LIBRARY_PATH" )) - { - void (*update_func)( const char * ) = dlsym( RTLD_DEFAULT, - "android_update_LD_LIBRARY_PATH" ); - if (update_func) update_func( val ); - } - else if (!strcmp( var, "WINEDEBUGLOG" )) - { - int fd = open( val, O_WRONLY | O_CREAT | O_APPEND, 0666 ); - if (fd != -1) - { - dup2( fd, 2 ); - close( fd ); - } - } - (*env)->ReleaseStringUTFChars( env, val_obj, val ); - } - else unsetenv( var ); - - (*env)->ReleaseStringUTFChars( env, var_obj, var ); + dup2( fd, 2 ); + close( fd ); } } @@ -1981,7 +1962,7 @@ jint JNI_OnLoad( JavaVM *vm, void *reserved ) { static const JNINativeMethod method = { - "wine_init", "([Ljava/lang/String;[Ljava/lang/String;)Ljava/lang/String;", wine_init_jni + "wine_init", "([Ljava/lang/String;)Ljava/lang/String;", wine_init_jni }; JNIEnv *env; diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 0dc7df5ca53..022e69e48cd 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -31,6 +31,7 @@ import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; +import android.system.ErrnoException; import android.util.Log; import android.view.InputDevice; import android.view.KeyEvent; @@ -52,9 +53,12 @@ import java.util.Locale; import java.util.Map; +import static android.system.Os.setenv; +import static android.system.Os.getenv; + public class WineActivity extends Activity { - private native String wine_init( String[] cmdline, String[] env ); + private native String wine_init( String[] cmdline ); public native void wine_desktop_changed( int width, int height ); public native void wine_config_changed( int dpi ); public native void wine_surface_changed( int hwnd, Surface surface, boolean opengl ); @@ -107,6 +111,18 @@ private String get_so_dir( String abi ) return ""; } + private void putenv( String name, String val ) + { + try + { + setenv( name, val, true ); + } + catch ( Exception e ) + { + e.printStackTrace(); + } + } + private void loadWine( String cmdline ) { copyAssetFiles(); @@ -120,14 +136,13 @@ private void loadWine( String cmdline ) String locale = Locale.getDefault().getLanguage() + "_" + Locale.getDefault().getCountry() + ".UTF-8"; - HashMap<String,String> env = new HashMap<String,String>(); - env.put( "WINELOADER", loader.toString() ); - env.put( "WINEPREFIX", prefix.toString() ); - env.put( "WINEDLLPATH", dlldir.toString() ); - env.put( "LD_LIBRARY_PATH", libdir.toString() + ":" + getPackageResourcePath() + "!/lib/" + wine_abi + ":" + getApplicationInfo().nativeLibraryDir ); - env.put( "LC_ALL", locale ); - env.put( "LANG", locale ); - env.put( "PATH", bindir.toString() + ":" + System.getenv( "PATH" )); + putenv( "WINELOADER", loader.toString() ); + putenv( "WINEPREFIX", prefix.toString() ); + putenv( "WINEDLLPATH", dlldir.toString() ); + putenv( "LD_LIBRARY_PATH", libdir.toString() + ":" + getPackageResourcePath() + "!/lib/" + wine_abi + ":" + getApplicationInfo().nativeLibraryDir ); + putenv( "LC_ALL", locale ); + putenv( "LANG", locale ); + putenv( "PATH", bindir.toString() + ":" + System.getenv( "PATH" )); if (cmdline == null) { @@ -140,8 +155,8 @@ private void loadWine( String cmdline ) if (winedebug != null) { File log = new File( getFilesDir(), "log" ); - env.put( "WINEDEBUG", winedebug ); - env.put( "WINEDEBUGLOG", log.toString() ); + putenv( "WINEDEBUG", winedebug ); + putenv( "WINEDEBUGLOG", log.toString() ); Log.i( LOGTAG, "logging to " + log.toString() ); log.delete(); } @@ -151,25 +166,17 @@ private void loadWine( String cmdline ) System.load( dlldir.toString() + get_so_dir(wine_abi) + "/ntdll.so" ); prefix.mkdirs(); - runWine( cmdline, env ); + runWine( cmdline ); } - private final void runWine( String cmdline, HashMap<String,String> environ ) + private final void runWine( String cmdline ) { - String[] env = new String[environ.size() * 2]; - int j = 0; - for (Map.Entry<String,String> entry : environ.entrySet()) - { - env[j++] = entry.getKey(); - env[j++] = entry.getValue(); - } - - String[] cmd = { environ.get( "WINELOADER" ), + String[] cmd = { getenv( "WINELOADER" ), "c:\\windows\\system32\\explorer.exe", "/desktop=shell,,android", cmdline }; - String err = wine_init( cmd, env ); + String err = wine_init( cmd ); Log.e( LOGTAG, err ); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10683