Alexandre Julliard : libwine: No longer look for libraries in the dll path on Android.

Alexandre Julliard julliard at wine.codeweavers.com
Thu Jul 24 14:52:42 CDT 2014


Module: wine
Branch: master
Commit: a6a9b05deeab21f24263de32a17b83a17c1403dc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a6a9b05deeab21f24263de32a17b83a17c1403dc

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Jul 24 09:25:15 2014 +0200

libwine: No longer look for libraries in the dll path on Android.

---

 libs/wine/loader.c | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/libs/wine/loader.c b/libs/wine/loader.c
index c2290df..3591ede 100644
--- a/libs/wine/loader.c
+++ b/libs/wine/loader.c
@@ -1014,23 +1014,6 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize
         ret = dlopen( path, flag | RTLD_FIRST );
     }
     else
-#elif defined(__ANDROID__)
-    if (!strchr( filename, '/' ) && nb_dll_paths)
-    {
-        unsigned int i;
-        char *buffer = malloc( dll_path_maxlen + strlen(filename) + 2 );
-
-        buffer[dll_path_maxlen] = '/';
-        strcpy( buffer + dll_path_maxlen + 1, filename );
-        for (i = 0; i < nb_dll_paths; i++)
-        {
-            char *path = prepend( buffer + dll_path_maxlen, dll_paths[i], strlen(dll_paths[i]) );
-            ret = dlopen( path, flag | RTLD_FIRST );
-            if (ret) break;
-        }
-        free( buffer );
-        if (ret) return ret;
-    }
 #endif
     ret = dlopen( filename, flag | RTLD_FIRST );
     s = dlerror();




More information about the wine-cvs mailing list