Alexandre Julliard : libwine: Clear the %fs register we got from Android to force allocating a new one.
Alexandre Julliard
julliard at winehq.org
Fri Apr 21 15:18:17 CDT 2017
Module: wine
Branch: master
Commit: 5142e56aeec8edd85906af021b9d4c886cff02d7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5142e56aeec8edd85906af021b9d4c886cff02d7
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Apr 21 19:25:39 2017 +0200
libwine: Clear the %fs register we got from Android to force allocating a new one.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
libs/wine/loader.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/libs/wine/loader.c b/libs/wine/loader.c
index b5b32cc..89ae935 100644
--- a/libs/wine/loader.c
+++ b/libs/wine/loader.c
@@ -887,7 +887,16 @@ static jstring wine_init_jni( JNIEnv *env, jobject obj, jobjectArray cmdline, jo
java_object = (*env)->NewGlobalRef( env, obj );
+#ifdef __i386__
+ {
+ unsigned short java_fs = wine_get_fs();
+ wine_set_fs( 0 );
+ wine_init( argc, argv, error, sizeof(error) );
+ wine_set_fs( java_fs );
+ }
+#else
wine_init( argc, argv, error, sizeof(error) );
+#endif
return (*env)->NewStringUTF( env, error );
}
More information about the wine-cvs
mailing list