X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fmodules.c;h=f9cf9be1d96ec80d49d641418da2804b6c28cbb3;hb=cc960e5b4b61132996563818db285adf02507a62;hp=c284241f3d1b6ec563cac409dd1ae2ffde4b7d01;hpb=f8258e32b120fdd43872f68ba32816f7f31e54c7;p=vlc diff --git a/src/misc/modules.c b/src/misc/modules.c index c284241f3d..f9cf9be1d9 100644 --- a/src/misc/modules.c +++ b/src/misc/modules.c @@ -1,12 +1,13 @@ /***************************************************************************** * modules.c : Builtin and plugin modules management functions ***************************************************************************** - * Copyright (C) 2001 VideoLAN - * $Id: modules.c,v 1.135 2003/10/05 15:35:59 sam Exp $ + * Copyright (C) 2001-2004 the VideoLAN team + * $Id$ * * Authors: Sam Hocevar * Ethan C. Baldridge * Hans-Peter Jansen + * Gildas Bazin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /* Some faulty libcs have a broken struct dirent when _FILE_OFFSET_BITS @@ -34,13 +35,10 @@ #include /* strdup() */ #include +#include #ifdef HAVE_DIRENT_H # include -#elif defined( UNDER_CE ) -# include /* GetFileAttributes() */ -#else -# include "../extras/dirent.h" #endif #ifdef HAVE_SYS_TYPES_H @@ -53,83 +51,90 @@ # include #endif -#define HAVE_DYNAMIC_PLUGINS -#if defined (HAVE_MACH_O_DYLD_H) -# include -#elif defined (HAVE_IMAGE_H) /* BeOS */ -# include -#elif defined (UNDER_CE) -# include -#elif defined (WIN32) +#if !defined(HAVE_DYNAMIC_PLUGINS) + /* no support for plugins */ +#elif defined(HAVE_DL_DYLD) +# if defined(HAVE_MACH_O_DYLD_H) +# include +# endif +#elif defined(HAVE_DL_BEOS) +# if defined(HAVE_IMAGE_H) +# include +# endif +#elif defined(HAVE_DL_WINDOWS) # include -#elif defined (HAVE_DL_DLOPEN) -# if defined (HAVE_DLFCN_H) /* Linux, BSD, Hurd */ +#elif defined(HAVE_DL_DLOPEN) +# if defined(HAVE_DLFCN_H) /* Linux, BSD, Hurd */ # include # endif -# if defined (HAVE_SYS_DL_H) +# if defined(HAVE_SYS_DL_H) # include # endif -#elif defined (HAVE_DL_SHL_LOAD) -# if defined (HAVE_DL_H) +#elif defined(HAVE_DL_SHL_LOAD) +# if defined(HAVE_DL_H) # include # endif -#else -# undef HAVE_DYNAMIC_PLUGINS #endif #include "vlc_error.h" #include "vlc_interface.h" -#include "vlc_playlist.h" +#include "vlc_interaction.h" #include "intf_eject.h" -#include "stream_control.h" -#include "input_ext-intf.h" -#include "input_ext-dec.h" -#include "input_ext-plugins.h" -#include "ninput.h" +#include "vlc_playlist.h" #include "vlc_video.h" #include "video_output.h" #include "vout_synchro.h" +#include "vlc_spu.h" #include "audio_output.h" #include "aout_internal.h" #include "stream_output.h" -/*#include "announce.h"*/ -#include "osd.h" +#include "vlc_httpd.h" +#include "vlc_acl.h" +#include "vlc_tls.h" +#include "vlc_md5.h" +#include "vlc_xml.h" +#include "vlc_url.h" #include "iso_lang.h" #include "charset.h" #include "vlc_block.h" -#if defined( UNDER_CE ) -# define MYCHAR wchar_t -#else -# define MYCHAR char -#endif +#include "vlc_vlm.h" -#ifdef HAVE_DYNAMIC_PLUGINS -# include "modules_plugin.h" -#endif +#include "vlc_image.h" +#include "vlc_osd.h" + +#include "vlc_update.h" +#include "vlc_strings.h" -#if defined( UNDER_CE ) +#if defined( _MSC_VER ) && defined( UNDER_CE ) # include "modules_builtin_evc.h" #elif defined( _MSC_VER ) # include "modules_builtin_msvc.h" #else # include "modules_builtin.h" #endif +#include "network.h" + +#if defined( WIN32 ) || defined( UNDER_CE ) + /* Avoid name collisions */ +# define LoadModule(a,b,c) LoadVlcModule(a,b,c) +#endif /***************************************************************************** * Local prototypes *****************************************************************************/ #ifdef HAVE_DYNAMIC_PLUGINS -static void AllocateAllPlugins ( vlc_object_t * ); -static void AllocatePluginDir ( vlc_object_t *, const MYCHAR *, int ); -static int AllocatePluginFile ( vlc_object_t *, MYCHAR * ); +static void AllocateAllPlugins ( vlc_object_t * ); +static void AllocatePluginDir ( vlc_object_t *, const char *, int ); +static int AllocatePluginFile ( vlc_object_t *, char *, int64_t, int64_t ); +static module_t * AllocatePlugin( vlc_object_t *, char * ); #endif static int AllocateBuiltinModule( vlc_object_t *, int ( * ) ( module_t * ) ); static int DeleteModule ( module_t * ); @@ -137,13 +142,27 @@ static int DeleteModule ( module_t * ); static void DupModule ( module_t * ); static void UndupModule ( module_t * ); static int CallEntry ( module_t * ); +static int LoadModule ( vlc_object_t *, char *, module_handle_t * ); static void CloseModule ( module_handle_t ); static void * GetSymbol ( module_handle_t, const char * ); -#if defined(UNDER_CE) || defined(WIN32) +static void CacheLoad ( vlc_object_t * ); +static int CacheLoadConfig ( module_t *, FILE * ); +static void CacheSave ( vlc_object_t * ); +static void CacheSaveConfig ( module_t *, FILE * ); +static char * CacheName ( void ); +static void CacheMerge ( vlc_object_t *, module_t *, module_t * ); +static module_cache_t * CacheFind( vlc_object_t *, char *, int64_t, int64_t ); + +#if defined(HAVE_DL_WINDOWS) static char * GetWindowsError ( void ); #endif #endif + +/* Sub-version number + * (only used to avoid breakage in dev version when cache structure changes) */ +#define CACHE_SUBVERSION_NUM 1 + /***************************************************************************** * module_InitBank: create the module bank. ***************************************************************************** @@ -153,14 +172,33 @@ static char * GetWindowsError ( void ); void __module_InitBank( vlc_object_t *p_this ) { module_bank_t *p_bank; + vlc_value_t lockval; + + var_Create( p_this->p_libvlc, "libvlc", VLC_VAR_MUTEX ); + var_Get( p_this->p_libvlc, "libvlc", &lockval ); + vlc_mutex_lock( lockval.p_address ); + if( p_this->p_libvlc->p_module_bank ) + { + p_this->p_libvlc->p_module_bank->i_usage++; + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_this->p_libvlc, "libvlc" ); + return; + } + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_this->p_libvlc, "libvlc" ); p_bank = vlc_object_create( p_this, sizeof(module_bank_t) ); p_bank->psz_object_name = "module bank"; + p_bank->i_usage = 1; + p_bank->i_cache = p_bank->i_loaded_cache = 0; + p_bank->pp_cache = p_bank->pp_loaded_cache = 0; + p_bank->b_cache = p_bank->b_cache_dirty = + p_bank->b_cache_delete = VLC_FALSE; /* * Store the symbols to be exported */ -#ifdef HAVE_DYNAMIC_PLUGINS +#if defined (HAVE_DYNAMIC_PLUGINS) && !defined (HAVE_SHARED_LIBVLC) STORE_SYMBOLS( &p_bank->symbols ); #endif @@ -168,6 +206,8 @@ void __module_InitBank( vlc_object_t *p_this ) p_this->p_libvlc->p_module_bank = p_bank; vlc_object_attach( p_bank, p_this->p_libvlc ); + module_LoadMain( p_this ); + return; } @@ -192,6 +232,48 @@ void __module_ResetBank( vlc_object_t *p_this ) void __module_EndBank( vlc_object_t *p_this ) { module_t * p_next; + vlc_value_t lockval; + + var_Create( p_this->p_libvlc, "libvlc", VLC_VAR_MUTEX ); + var_Get( p_this->p_libvlc, "libvlc", &lockval ); + vlc_mutex_lock( lockval.p_address ); + if( !p_this->p_libvlc->p_module_bank ) + { + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_this->p_libvlc, "libvlc" ); + return; + } + if( --p_this->p_libvlc->p_module_bank->i_usage ) + { + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_this->p_libvlc, "libvlc" ); + return; + } + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_this->p_libvlc, "libvlc" ); + + config_AutoSaveConfigFile( p_this ); + +#ifdef HAVE_DYNAMIC_PLUGINS +#define p_bank p_this->p_libvlc->p_module_bank + if( p_bank->b_cache ) CacheSave( p_this ); + while( p_bank->i_loaded_cache-- ) + { + free( p_bank->pp_loaded_cache[p_bank->i_loaded_cache]->psz_file ); + free( p_bank->pp_loaded_cache[p_bank->i_loaded_cache] ); + } + if( p_bank->pp_loaded_cache ) + free( p_bank->pp_loaded_cache ); + + while( p_bank->i_cache-- ) + { + free( p_bank->pp_cache[p_bank->i_cache]->psz_file ); + free( p_bank->pp_cache[p_bank->i_cache] ); + } + if( p_bank->pp_cache ) + free( p_bank->pp_cache ); +#undef p_bank +#endif vlc_object_detach( p_this->p_libvlc->p_module_bank ); @@ -212,6 +294,7 @@ void __module_EndBank( vlc_object_t *p_this ) } vlc_object_destroy( p_this->p_libvlc->p_module_bank ); + p_this->p_libvlc->p_module_bank = NULL; return; } @@ -226,6 +309,21 @@ void __module_EndBank( vlc_object_t *p_this ) *****************************************************************************/ void __module_LoadMain( vlc_object_t *p_this ) { + vlc_value_t lockval; + + var_Create( p_this->p_libvlc, "libvlc", VLC_VAR_MUTEX ); + var_Get( p_this->p_libvlc, "libvlc", &lockval ); + vlc_mutex_lock( lockval.p_address ); + if( p_this->p_libvlc->p_module_bank->b_main ) + { + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_this->p_libvlc, "libvlc" ); + return; + } + p_this->p_libvlc->p_module_bank->b_main = VLC_TRUE; + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_this->p_libvlc, "libvlc" ); + AllocateBuiltinModule( p_this, vlc_entry__main ); } @@ -236,6 +334,21 @@ void __module_LoadMain( vlc_object_t *p_this ) *****************************************************************************/ void __module_LoadBuiltins( vlc_object_t * p_this ) { + vlc_value_t lockval; + + var_Create( p_this->p_libvlc, "libvlc", VLC_VAR_MUTEX ); + var_Get( p_this->p_libvlc, "libvlc", &lockval ); + vlc_mutex_lock( lockval.p_address ); + if( p_this->p_libvlc->p_module_bank->b_builtins ) + { + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_this->p_libvlc, "libvlc" ); + return; + } + p_this->p_libvlc->p_module_bank->b_builtins = VLC_TRUE; + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_this->p_libvlc, "libvlc" ); + msg_Dbg( p_this, "checking builtin modules" ); ALLOCATE_ALL_BUILTINS(); } @@ -248,7 +361,29 @@ void __module_LoadBuiltins( vlc_object_t * p_this ) void __module_LoadPlugins( vlc_object_t * p_this ) { #ifdef HAVE_DYNAMIC_PLUGINS + vlc_value_t lockval; + + var_Create( p_this->p_libvlc, "libvlc", VLC_VAR_MUTEX ); + var_Get( p_this->p_libvlc, "libvlc", &lockval ); + vlc_mutex_lock( lockval.p_address ); + if( p_this->p_libvlc->p_module_bank->b_plugins ) + { + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_this->p_libvlc, "libvlc" ); + return; + } + p_this->p_libvlc->p_module_bank->b_plugins = VLC_TRUE; + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_this->p_libvlc, "libvlc" ); + msg_Dbg( p_this, "checking plugin modules" ); + + if( config_GetInt( p_this, "plugins-cache" ) ) + p_this->p_libvlc->p_module_bank->b_cache = VLC_TRUE; + + if( p_this->p_libvlc->p_module_bank->b_cache || + p_this->p_libvlc->p_module_bank->b_cache_delete ) CacheLoad( p_this ); + AllocateAllPlugins( p_this ); #endif } @@ -259,7 +394,7 @@ void __module_LoadPlugins( vlc_object_t * p_this ) * This function returns the module that best fits the asked capabilities. *****************************************************************************/ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, - const char *psz_name ) + const char *psz_name, vlc_bool_t b_strict ) { typedef struct module_list_t module_list_t; @@ -267,6 +402,7 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, { module_t *p_module; int i_score; + vlc_bool_t b_force; module_list_t *p_next; }; @@ -280,20 +416,23 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, int i_shortcuts = 0; char *psz_shortcuts = NULL, *psz_var = NULL; + vlc_bool_t b_force_backup = p_this->b_force; - msg_Dbg( p_this, "looking for %s module", psz_capability ); /* Deal with variables */ if( psz_name && psz_name[0] == '$' ) { - psz_var = config_GetPsz( p_this, psz_name + 1 ); + vlc_value_t val; + var_Create( p_this, psz_name + 1, VLC_VAR_MODULE | VLC_VAR_DOINHERIT ); + var_Get( p_this, psz_name + 1, &val ); + psz_var = val.psz_string; psz_name = psz_var; } /* Count how many different shortcuts were asked for */ if( psz_name && *psz_name ) { - char *psz_parser; + char *psz_parser, *psz_last_shortcut; /* If the user wants none, give him none. */ if( !strcmp( psz_name, "none" ) ) @@ -303,7 +442,7 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, } i_shortcuts++; - psz_shortcuts = strdup( psz_name ); + psz_shortcuts = psz_last_shortcut = strdup( psz_name ); for( psz_parser = psz_shortcuts; *psz_parser; psz_parser++ ) { @@ -311,6 +450,22 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, { *psz_parser = '\0'; i_shortcuts++; + psz_last_shortcut = psz_parser + 1; + } + } + + /* Check if the user wants to override the "strict" mode */ + if( psz_last_shortcut ) + { + if( !strcmp(psz_last_shortcut, "none") ) + { + b_strict = VLC_TRUE; + i_shortcuts--; + } + else if( !strcmp(psz_last_shortcut, "any") ) + { + b_strict = VLC_FALSE; + i_shortcuts--; } } } @@ -323,33 +478,16 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, /* Parse the module list for capabilities and probe each of them */ for( i_which_module = 0; i_which_module < p_all->i_count; i_which_module++ ) { - module_t * p_submodule = NULL; - int i_shortcut_bonus = 0, i_submodule; + int i_shortcut_bonus = 0; p_module = (module_t *)p_all->p_values[i_which_module].p_object; /* Test that this module can do what we need */ if( strcmp( p_module->psz_capability, psz_capability ) ) { - for( i_submodule = 0; - i_submodule < p_module->i_children; - i_submodule++ ) - { - if( !strcmp( ((module_t*)p_module->pp_children[ i_submodule ]) - ->psz_capability, psz_capability ) ) - { - p_submodule = - (module_t*)p_module->pp_children[ i_submodule ]; - break; - } - } - - if( p_submodule == NULL ) - { - continue; - } - - p_module = p_submodule; + /* Don't recurse through the sub-modules because vlc_list_find() + * will list them anyway. */ + continue; } /* Test if we have the required CPU */ @@ -359,27 +497,18 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, } /* If we required a shortcut, check this plugin provides it. */ - if( i_shortcuts ) + if( i_shortcuts > 0 ) { vlc_bool_t b_trash; int i_dummy, i_short = i_shortcuts; char *psz_name = psz_shortcuts; - /* Let's drop modules with a 0 score (unless they are + /* Let's drop modules with a <= 0 score (unless they are * explicitly requested) */ - b_trash = !p_module->i_score; + b_trash = p_module->i_score <= 0; - while( i_short ) + while( i_short > 0 ) { - /* If the last given shortcut is "none" and we couldn't - * find the module in the list of provided shortcuts, - * then kick the bastard out of here!!! */ - if( (i_short == 1) && !strcmp(psz_name, "none") ) - { - b_trash = VLC_TRUE; - break; - } - for( i_dummy = 0; p_module->pp_shortcuts[i_dummy]; i_dummy++ ) { if( !strcasecmp( psz_name, @@ -407,19 +536,28 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, i_short--; } + /* If we are in "strict" mode and we couldn't + * find the module in the list of provided shortcuts, + * then kick the bastard out of here!!! */ + if( i_short == 0 && b_strict ) + { + b_trash = VLC_TRUE; + } + if( b_trash ) { continue; } } - /* If we didn't require a shortcut, trash zero-scored plugins */ - else if( !p_module->i_score ) + /* If we didn't require a shortcut, trash <= 0 scored plugins */ + else if( p_module->i_score <= 0 ) { continue; } /* Special case: test if we requested a particular intf plugin */ if( !i_shortcuts && p_module->psz_program + && !strcmp( psz_capability, "interface" ) && !strcmp( p_module->psz_program, p_this->p_vlc->psz_object_name ) ) { @@ -439,6 +577,7 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, /* Store this new module */ p_list[ i_index ].p_module = p_module; p_list[ i_index ].i_score = p_module->i_score + i_shortcut_bonus; + p_list[ i_index ].b_force = !!i_shortcut_bonus; /* Add it to the modules-to-probe list */ if( i_index == 0 ) @@ -474,8 +613,8 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, i_index++; } - msg_Dbg( p_this, "probing %i candidate%s", - i_index, i_index == 1 ? "" : "s" ); + msg_Dbg( p_this, "looking for %s module: %i candidate%s", psz_capability, + i_index, i_index == 1 ? "" : "s" ); /* Lock all candidate modules */ p_tmp = p_first; @@ -492,6 +631,24 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, p_tmp = p_first; while( p_tmp != NULL ) { +#ifdef HAVE_DYNAMIC_PLUGINS + /* Make sure the module is loaded in mem */ + module_t *p_module = p_tmp->p_module->b_submodule ? + (module_t *)p_tmp->p_module->p_parent : p_tmp->p_module; + if( !p_module->b_builtin && !p_module->b_loaded ) + { + module_t *p_new_module = + AllocatePlugin( p_this, p_module->psz_filename ); + if( p_new_module ) + { + CacheMerge( p_this, p_module, p_new_module ); + vlc_object_attach( p_new_module, p_module ); + DeleteModule( p_new_module ); + } + } +#endif + + p_this->b_force = p_tmp->b_force; if( p_tmp->p_module->pf_activate && p_tmp->p_module->pf_activate( p_this ) == VLC_SUCCESS ) { @@ -521,16 +678,25 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, } free( p_list ); + p_this->b_force = b_force_backup; if( p_module != NULL ) { - msg_Dbg( p_module, "using %s module \"%s\"", + msg_Dbg( p_this, "using %s module \"%s\"", psz_capability, p_module->psz_object_name ); } else if( p_first == NULL ) { - msg_Err( p_this, "no %s module matched \"%s\"", + if( !strcmp( psz_capability, "access_demux" ) ) + { + msg_Warn( p_this, "no %s module matched \"%s\"", + psz_capability, (psz_name && *psz_name) ? psz_name : "any" ); + } + else + { + msg_Err( p_this, "no %s module matched \"%s\"", psz_capability, (psz_name && *psz_name) ? psz_name : "any" ); + } } else if( psz_name != NULL && *psz_name ) { @@ -566,7 +732,7 @@ void __module_Unneed( vlc_object_t * p_this, module_t * p_module ) p_module->pf_deactivate( p_this ); } - msg_Dbg( p_module, "unlocking module \"%s\"", p_module->psz_object_name ); + msg_Dbg( p_this, "removing module \"%s\"", p_module->psz_object_name ); vlc_object_release( p_module ); @@ -584,28 +750,29 @@ void __module_Unneed( vlc_object_t * p_this, module_t * p_module ) static void AllocateAllPlugins( vlc_object_t *p_this ) { /* Yes, there are two NULLs because we replace one with "plugin-path". */ - char * path[] = { "modules", PLUGIN_PATH, "plugins", NULL, - NULL }; - - char ** ppsz_path = path; - char * psz_fullpath; - -#if defined( UNDER_CE ) - wchar_t psz_dir[MAX_PATH]; +#if defined( WIN32 ) || defined( UNDER_CE ) + char *path[] = { "modules", "", "plugins", 0, 0 }; +#else + char *path[] = { "modules", PLUGIN_PATH, "plugins", 0, 0 }; #endif + char **ppsz_path = path; + char *psz_fullpath; + /* If the user provided a plugin path, we add it to the list */ - path[ sizeof(path)/sizeof(char*) - 2 ] = config_GetPsz( p_this, - "plugin-path" ); + path[ sizeof(path)/sizeof(char*) - 2 ] = + config_GetPsz( p_this, "plugin-path" ); for( ; *ppsz_path != NULL ; ppsz_path++ ) { -#if defined( SYS_BEOS ) || defined( SYS_DARWIN ) \ - || ( defined( WIN32 ) && !defined( UNDER_CE ) ) + if( !(*ppsz_path)[0] ) continue; + +#if defined( SYS_BEOS ) || defined( __APPLE__ ) || defined( WIN32 ) /* Handle relative as well as absolute paths */ #ifdef WIN32 - if( !(*ppsz_path)[0] || (*ppsz_path)[1] != ':' ) + if( (*ppsz_path)[0] != '\\' && (*ppsz_path)[0] != '/' && + (*ppsz_path)[1] != ':' ) #else if( (*ppsz_path)[0] != '/' ) #endif @@ -635,12 +802,7 @@ static void AllocateAllPlugins( vlc_object_t *p_this ) msg_Dbg( p_this, "recursively browsing `%s'", psz_fullpath ); /* Don't go deeper than 5 subdirectories */ -#if defined( UNDER_CE ) - MultiByteToWideChar( CP_ACP, 0, psz_fullpath, -1, psz_dir, MAX_PATH ); - AllocatePluginDir( p_this, psz_dir, 5 ); -#else AllocatePluginDir( p_this, psz_fullpath, 5 ); -#endif free( psz_fullpath ); } @@ -654,45 +816,52 @@ static void AllocateAllPlugins( vlc_object_t *p_this ) /***************************************************************************** * AllocatePluginDir: recursively parse a directory to look for plugins *****************************************************************************/ -static void AllocatePluginDir( vlc_object_t *p_this, const MYCHAR *psz_dir, +static void AllocatePluginDir( vlc_object_t *p_this, const char *psz_dir, int i_maxdepth ) { #if defined( UNDER_CE ) || defined( _MSC_VER ) #ifdef UNDER_CE - MYCHAR psz_path[MAX_PATH + 256]; -#else - char psz_path[MAX_PATH + 256]; + wchar_t psz_wpath[MAX_PATH + 256]; + wchar_t psz_wdir[MAX_PATH]; #endif + char psz_path[MAX_PATH + 256]; WIN32_FIND_DATA finddata; HANDLE handle; - unsigned int rc; + int rc; #else int i_dirlen; DIR * dir; - char * psz_file; struct dirent * file; #endif + char * psz_file; - if( i_maxdepth < 0 ) + if( p_this->p_vlc->b_die || i_maxdepth < 0 ) { return; } #if defined( UNDER_CE ) || defined( _MSC_VER ) +#ifdef UNDER_CE + MultiByteToWideChar( CP_ACP, 0, psz_dir, -1, psz_wdir, MAX_PATH ); + + rc = GetFileAttributes( psz_wdir ); + if( rc<0 || !(rc&FILE_ATTRIBUTE_DIRECTORY) ) return; /* Not a directory */ + + /* Parse all files in the directory */ + swprintf( psz_wpath, L"%ls\\*", psz_wdir ); +#else rc = GetFileAttributes( psz_dir ); - if( !(rc & FILE_ATTRIBUTE_DIRECTORY) ) - { - /* Not a directory */ - return; - } + if( rc<0 || !(rc&FILE_ATTRIBUTE_DIRECTORY) ) return; /* Not a directory */ +#endif /* Parse all files in the directory */ + sprintf( psz_path, "%s\\*", psz_dir ); + #ifdef UNDER_CE - swprintf( psz_path, L"%s\\*.*", psz_dir ); + handle = FindFirstFile( psz_wpath, &finddata ); #else - sprintf( psz_path, "%s\\*.*", psz_dir ); -#endif handle = FindFirstFile( psz_path, &finddata ); +#endif if( handle == INVALID_HANDLE_VALUE ) { /* Empty directory */ @@ -704,36 +873,59 @@ static void AllocatePluginDir( vlc_object_t *p_this, const MYCHAR *psz_dir, { #ifdef UNDER_CE unsigned int i_len = wcslen( finddata.cFileName ); - swprintf( psz_path, L"%s\\%s", psz_dir, finddata.cFileName ); + swprintf( psz_wpath, L"%ls\\%ls", psz_wdir, finddata.cFileName ); + sprintf( psz_path, "%s\\%ls", psz_dir, finddata.cFileName ); #else unsigned int i_len = strlen( finddata.cFileName ); - /* Skip ".", ".." and anything starting with "." */ - if( !*finddata.cFileName || *finddata.cFileName == '.' ) + sprintf( psz_path, "%s\\%s", psz_dir, finddata.cFileName ); +#endif + + /* Skip ".", ".." */ + if( !*finddata.cFileName || !strcmp( finddata.cFileName, "." ) + || !strcmp( finddata.cFileName, ".." ) ) { if( !FindNextFile( handle, &finddata ) ) break; continue; } - sprintf( psz_path, "%s\\%s", psz_dir, finddata.cFileName ); -#endif +#ifdef UNDER_CE + if( GetFileAttributes( psz_wpath ) & FILE_ATTRIBUTE_DIRECTORY ) +#else if( GetFileAttributes( psz_path ) & FILE_ATTRIBUTE_DIRECTORY ) +#endif { AllocatePluginDir( p_this, psz_path, i_maxdepth - 1 ); } else if( i_len > strlen( LIBEXT ) -#ifdef UNDER_CE - ) -#else /* We only load files ending with LIBEXT */ && !strncasecmp( psz_path + strlen( psz_path) - strlen( LIBEXT ), LIBEXT, strlen( LIBEXT ) ) ) -#endif { - AllocatePluginFile( p_this, psz_path ); + WIN32_FILE_ATTRIBUTE_DATA attrbuf; + int64_t i_time = 0, i_size = 0; + +#ifdef UNDER_CE + if( GetFileAttributesEx( psz_wpath, GetFileExInfoStandard, + &attrbuf ) ) +#else + if( GetFileAttributesEx( psz_path, GetFileExInfoStandard, + &attrbuf ) ) +#endif + { + i_time = attrbuf.ftLastWriteTime.dwHighDateTime; + i_time <<= 32; + i_time |= attrbuf.ftLastWriteTime.dwLowDateTime; + i_size = attrbuf.nFileSizeHigh; + i_size <<= 32; + i_size |= attrbuf.nFileSizeLow; + } + psz_file = psz_path; + + AllocatePluginFile( p_this, psz_file, i_time, i_size ); } } - while( FindNextFile( handle, &finddata ) ); + while( !p_this->p_vlc->b_die && FindNextFile( handle, &finddata ) ); /* Close the directory */ FindClose( handle ); @@ -748,13 +940,15 @@ static void AllocatePluginDir( vlc_object_t *p_this, const MYCHAR *psz_dir, i_dirlen = strlen( psz_dir ); /* Parse the directory and try to load all files it contains. */ - while( (file = readdir( dir )) ) + while( !p_this->p_vlc->b_die && (file = readdir( dir )) ) { struct stat statbuf; unsigned int i_len; + int i_stat; - /* Skip ".", ".." and anything starting with "." */ - if( !*file->d_name || *file->d_name == '.' ) + /* Skip ".", ".." */ + if( !*file->d_name || !strcmp( file->d_name, "." ) + || !strcmp( file->d_name, ".." ) ) { continue; } @@ -767,7 +961,8 @@ static void AllocatePluginDir( vlc_object_t *p_this, const MYCHAR *psz_dir, sprintf( psz_file, "%s/%s", psz_dir, file->d_name ); #endif - if( !stat( psz_file, &statbuf ) && statbuf.st_mode & S_IFDIR ) + i_stat = stat( psz_file, &statbuf ); + if( !i_stat && statbuf.st_mode & S_IFDIR ) { AllocatePluginDir( p_this, psz_file, i_maxdepth - 1 ); } @@ -776,7 +971,15 @@ static void AllocatePluginDir( vlc_object_t *p_this, const MYCHAR *psz_dir, && !strncasecmp( file->d_name + i_len - strlen( LIBEXT ), LIBEXT, strlen( LIBEXT ) ) ) { - AllocatePluginFile( p_this, psz_file ); + int64_t i_time = 0, i_size = 0; + + if( !i_stat ) + { + i_time = statbuf.st_mtime; + i_size = statbuf.st_size; + } + + AllocatePluginFile( p_this, psz_file, i_time, i_size ); } free( psz_file ); @@ -795,139 +998,90 @@ static void AllocatePluginDir( vlc_object_t *p_this, const MYCHAR *psz_dir, * for its information data. The module can then be handled by module_Need * and module_Unneed. It can be removed by DeleteModule. *****************************************************************************/ -static int AllocatePluginFile( vlc_object_t * p_this, MYCHAR * psz_file ) +static int AllocatePluginFile( vlc_object_t * p_this, char * psz_file, + int64_t i_file_time, int64_t i_file_size ) { module_t * p_module; - module_handle_t handle; + module_cache_t *p_cache_entry = NULL; /* - * Try to dynamically load the module. This part is very platform- - * specific, and error messages should be as verbose as possible. + * Check our plugins cache first then load plugin if needed */ + p_cache_entry = + CacheFind( p_this, psz_file, i_file_time, i_file_size ); -#if defined(HAVE_DL_DYLD) - NSObjectFileImage image; - NSObjectFileImageReturnCode ret; - - ret = NSCreateObjectFileImageFromFile( psz_file, &image ); - - if( ret != NSObjectFileImageSuccess ) - { - msg_Warn( p_this, "cannot create image from `%s'", psz_file ); - return -1; - } - - /* Open the dynamic module */ - handle = NSLinkModule( image, psz_file, - NSLINKMODULE_OPTION_RETURN_ON_ERROR ); - - if( !handle ) - { - NSLinkEditErrors errors; - const char *psz_file, *psz_err; - int i_errnum; - NSLinkEditError( &errors, &i_errnum, &psz_file, &psz_err ); - msg_Warn( p_this, "cannot link module `%s' (%s)", psz_file, psz_err ); - NSDestroyObjectFileImage( image ); - return -1; - } - - /* Destroy our image, we won't need it */ - NSDestroyObjectFileImage( image ); - -#elif defined(HAVE_IMAGE_H) - handle = load_add_on( psz_file ); - if( handle < 0 ) - { - msg_Warn( p_this, "cannot load module `%s'", psz_file ); - return -1; - } - -#elif defined(UNDER_CE) - char psz_filename[MAX_PATH]; - WideCharToMultiByte( CP_ACP, WC_DEFAULTCHAR, psz_file, -1, - psz_filename, MAX_PATH, NULL, NULL ); - handle = LoadLibrary( psz_filename ); - if( handle == NULL ) + if( !p_cache_entry ) { - char *psz_error = GetWindowsError(); - msg_Warn( p_this, "cannot load module `%s' (%s)", - psz_filename, psz_error ); - free( psz_error ); + p_module = AllocatePlugin( p_this, psz_file ); } - -#elif defined(WIN32) - handle = LoadLibrary( psz_file ); - if( handle == NULL ) + else { - char *psz_error = GetWindowsError(); - msg_Warn( p_this, "cannot load module `%s' (%s)", - psz_filename, psz_error ); - free( psz_error ); - } + /* If junk dll, don't try to load it */ + if( p_cache_entry->b_junk ) + { + p_module = NULL; + } + else + { + module_config_t *p_item; -#elif defined(HAVE_DL_DLOPEN) && defined(RTLD_NOW) - /* static is OK, we are called atomically */ - static vlc_bool_t b_kde = VLC_FALSE; + p_module = p_cache_entry->p_module; + p_module->b_loaded = VLC_FALSE; -# if defined(SYS_LINUX) - /* XXX HACK #1 - we should NOT open modules with RTLD_GLOBAL, or we - * are going to get namespace collisions when two modules have common - * public symbols, but ALSA is being a pest here. */ - if( strstr( psz_file, "alsa_plugin" ) ) - { - handle = dlopen( psz_file, RTLD_NOW | RTLD_GLOBAL ); - if( handle == NULL ) - { - msg_Warn( p_this, "cannot load module `%s' (%s)", - psz_file, dlerror() ); - return -1; + /* For now we force loading if the module's config contains + * callbacks or actions. + * Could be optimized by adding an API call.*/ + for( p_item = p_module->p_config; + p_item->i_type != CONFIG_HINT_END; p_item++ ) + { + if( p_item->pf_callback || p_item->i_action ) + p_module = AllocatePlugin( p_this, psz_file ); + } } } -# endif - /* XXX HACK #2 - the ugly KDE workaround. It seems that libkdewhatever - * causes dlopen() to segfault if libstdc++ is not loaded in the caller, - * so we just load libstdc++. Bwahahaha! ph34r! -- Sam. */ - /* Update: FYI, this is Debian bug #180505, and seems to be fixed. */ - if( !b_kde && !strstr( psz_file, "kde" ) ) - { - dlopen( "libstdc++.so.6", RTLD_NOW ) - || dlopen( "libstdc++.so.5", RTLD_NOW ) - || dlopen( "libstdc++.so.4", RTLD_NOW ) - || dlopen( "libstdc++.so.3", RTLD_NOW ); - b_kde = VLC_TRUE; - } - handle = dlopen( psz_file, RTLD_NOW ); - if( handle == NULL ) + if( p_module ) { - msg_Warn( p_this, "cannot load module `%s' (%s)", - psz_file, dlerror() ); - return -1; - } + /* Everything worked fine ! + * The module is ready to be added to the list. */ + p_module->b_builtin = VLC_FALSE; -#elif defined(HAVE_DL_DLOPEN) && defined(DL_LAZY) - handle = dlopen( psz_file, DL_LAZY ); - if( handle == NULL ) - { - msg_Warn( p_this, "cannot load module `%s' (%s)", - psz_file, dlerror() ); - return -1; - } + /* msg_Dbg( p_this, "plugin \"%s\", %s", + p_module->psz_object_name, p_module->psz_longname ); */ -#elif defined(HAVE_DL_SHL_LOAD) - handle = shl_load( psz_file, BIND_IMMEDIATE | BIND_NONFATAL, NULL ); - if( handle == NULL ) - { - msg_Warn( p_this, "cannot load module `%s' (%s)", - psz_file, strerror(errno) ); - return -1; + vlc_object_attach( p_module, p_this->p_libvlc->p_module_bank ); } -#else -# error "Something is wrong in modules.c" + if( !p_this->p_libvlc->p_module_bank->b_cache ) return 0; + + /* Add entry to cache */ +#define p_bank p_this->p_libvlc->p_module_bank + p_bank->pp_cache = + realloc( p_bank->pp_cache, (p_bank->i_cache + 1) * sizeof(void *) ); + p_bank->pp_cache[p_bank->i_cache] = malloc( sizeof(module_cache_t) ); + p_bank->pp_cache[p_bank->i_cache]->psz_file = strdup( psz_file ); + p_bank->pp_cache[p_bank->i_cache]->i_time = i_file_time; + p_bank->pp_cache[p_bank->i_cache]->i_size = i_file_size; + p_bank->pp_cache[p_bank->i_cache]->b_junk = p_module ? 0 : 1; + p_bank->pp_cache[p_bank->i_cache]->p_module = p_module; + p_bank->i_cache++; + + return p_module ? 0 : -1; +} -#endif +/***************************************************************************** + * AllocatePlugin: load a module into memory and initialize it. + ***************************************************************************** + * This function loads a dynamically loadable module and allocates a structure + * for its information data. The module can then be handled by module_Need + * and module_Unneed. It can be removed by DeleteModule. + *****************************************************************************/ +static module_t * AllocatePlugin( vlc_object_t * p_this, char * psz_file ) +{ + module_t * p_module; + module_handle_t handle; + + if( LoadModule( p_this, psz_file, &handle ) ) return NULL; /* Now that we have successfully loaded the module, we can * allocate a structure for it */ @@ -936,40 +1090,33 @@ static int AllocatePluginFile( vlc_object_t * p_this, MYCHAR * psz_file ) { msg_Err( p_this, "out of memory" ); CloseModule( handle ); - return -1; + return NULL; } /* We need to fill these since they may be needed by CallEntry() */ -#ifdef UNDER_CE - p_module->psz_filename = psz_filename; -#else p_module->psz_filename = psz_file; -#endif p_module->handle = handle; +#ifndef HAVE_SHARED_LIBVLC p_module->p_symbols = &p_this->p_libvlc->p_module_bank->symbols; +#endif + p_module->b_loaded = VLC_TRUE; - /* Initialize the module: fill p_module->psz_object_name, default config */ + /* Initialize the module: fill p_module, default config */ if( CallEntry( p_module ) != 0 ) { /* We couldn't call module_init() */ vlc_object_destroy( p_module ); CloseModule( handle ); - return -1; + return NULL; } DupModule( p_module ); p_module->psz_filename = strdup( p_module->psz_filename ); - p_module->psz_longname = strdup( p_module->psz_longname ); /* Everything worked fine ! The module is ready to be added to the list. */ p_module->b_builtin = VLC_FALSE; - /* msg_Dbg( p_this, "plugin \"%s\", %s", - p_module->psz_object_name, p_module->psz_longname ); */ - - vlc_object_attach( p_module, p_this->p_libvlc->p_module_bank ); - - return 0; + return p_module; } /***************************************************************************** @@ -992,6 +1139,9 @@ static void DupModule( module_t *p_module ) * module is unloaded. */ p_module->psz_object_name = strdup( p_module->psz_object_name ); p_module->psz_capability = strdup( p_module->psz_capability ); + p_module->psz_shortname = p_module->psz_shortname ? + strdup( p_module->psz_shortname ) : NULL; + p_module->psz_longname = strdup( p_module->psz_longname ); if( p_module->psz_program != NULL ) { @@ -1026,6 +1176,8 @@ static void UndupModule( module_t *p_module ) free( p_module->psz_object_name ); free( p_module->psz_capability ); + if( p_module->psz_shortname ) free( p_module->psz_shortname ); + free( p_module->psz_longname ); if( p_module->psz_program != NULL ) { @@ -1090,13 +1242,12 @@ static int DeleteModule( module_t * p_module ) #ifdef HAVE_DYNAMIC_PLUGINS if( !p_module->b_builtin ) { - if( p_module->b_unloadable ) + if( p_module->b_loaded && p_module->b_unloadable ) { CloseModule( p_module->handle ); } UndupModule( p_module ); free( p_module->psz_filename ); - free( p_module->psz_longname ); } #endif @@ -1132,10 +1283,10 @@ static int CallEntry( module_t * p_module ) if( pf_symbol == NULL ) { -#if defined(HAVE_DL_DYLD) || defined(HAVE_IMAGE_H) +#if defined(HAVE_DL_DYLD) || defined(HAVE_DL_BEOS) msg_Warn( p_module, "cannot find symbol \"%s\" in file `%s'", psz_name, p_module->psz_filename ); -#elif defined(UNDER_CE) || defined(WIN32) +#elif defined(HAVE_DL_WINDOWS) char *psz_error = GetWindowsError(); msg_Warn( p_module, "cannot find symbol \"%s\" in file `%s' (%s)", psz_name, p_module->psz_filename, psz_error ); @@ -1149,6 +1300,7 @@ static int CallEntry( module_t * p_module ) #else # error "Something is wrong in modules.c" #endif + return -1; } /* We can now try to call the symbol */ @@ -1156,7 +1308,7 @@ static int CallEntry( module_t * p_module ) { /* With a well-written module we shouldn't have to print an * additional error message here, but just make sure. */ - msg_Err( p_module, "failed calling symbol \"%s\" in file `%s'", + msg_Err( p_module, "Failed to call symbol \"%s\" in file `%s'", psz_name, p_module->psz_filename ); return -1; } @@ -1165,6 +1317,131 @@ static int CallEntry( module_t * p_module ) return 0; } +/***************************************************************************** + * LoadModule: loads a dynamic library + ***************************************************************************** + * This function loads a dynamically linked library using a system dependant + * method. Will return 0 on success as well as the module handle. + *****************************************************************************/ +static int LoadModule( vlc_object_t *p_this, char *psz_file, + module_handle_t *p_handle ) +{ + module_handle_t handle; + +#if defined(HAVE_DL_DYLD) + NSObjectFileImage image; + NSObjectFileImageReturnCode ret; + + ret = NSCreateObjectFileImageFromFile( psz_file, &image ); + + if( ret != NSObjectFileImageSuccess ) + { + msg_Warn( p_this, "cannot create image from `%s'", psz_file ); + return -1; + } + + /* Open the dynamic module */ + handle = NSLinkModule( image, psz_file, + NSLINKMODULE_OPTION_RETURN_ON_ERROR ); + + if( !handle ) + { + NSLinkEditErrors errors; + const char *psz_file, *psz_err; + int i_errnum; + NSLinkEditError( &errors, &i_errnum, &psz_file, &psz_err ); + msg_Warn( p_this, "cannot link module `%s' (%s)", psz_file, psz_err ); + NSDestroyObjectFileImage( image ); + return -1; + } + + /* Destroy our image, we won't need it */ + NSDestroyObjectFileImage( image ); + +#elif defined(HAVE_DL_BEOS) + handle = load_add_on( psz_file ); + if( handle < 0 ) + { + msg_Warn( p_this, "cannot load module `%s'", psz_file ); + return -1; + } + +#elif defined(HAVE_DL_WINDOWS) +#ifdef UNDER_CE + { + wchar_t psz_wfile[MAX_PATH]; + MultiByteToWideChar( CP_ACP, 0, psz_file, -1, psz_wfile, MAX_PATH ); + handle = LoadLibrary( psz_wfile ); + } +#else + handle = LoadLibrary( psz_file ); +#endif + if( handle == NULL ) + { + char *psz_err = GetWindowsError(); + msg_Warn( p_this, "cannot load module `%s' (%s)", psz_file, psz_err ); + free( psz_err ); + return -1; + } + +#elif defined(HAVE_DL_DLOPEN) && defined(RTLD_NOW) + /* static is OK, we are called atomically */ + +# if defined(SYS_LINUX) + /* XXX HACK #1 - we should NOT open modules with RTLD_GLOBAL, or we + * are going to get namespace collisions when two modules have common + * public symbols, but ALSA is being a pest here. */ + if( strstr( psz_file, "alsa_plugin" ) ) + { + handle = dlopen( psz_file, RTLD_NOW | RTLD_GLOBAL ); + if( handle == NULL ) + { + msg_Warn( p_this, "cannot load module `%s' (%s)", + psz_file, dlerror() ); + return -1; + } + } +# endif + + handle = dlopen( psz_file, RTLD_NOW ); + if( handle == NULL ) + { + msg_Warn( p_this, "cannot load module `%s' (%s)", + psz_file, dlerror() ); + return -1; + } + +#elif defined(HAVE_DL_DLOPEN) +# if defined(DL_LAZY) + handle = dlopen( psz_file, DL_LAZY ); +# else + handle = dlopen( psz_file, 0 ); +# endif + if( handle == NULL ) + { + msg_Warn( p_this, "cannot load module `%s' (%s)", + psz_file, dlerror() ); + return -1; + } + +#elif defined(HAVE_DL_SHL_LOAD) + handle = shl_load( psz_file, BIND_IMMEDIATE | BIND_NONFATAL, NULL ); + if( handle == NULL ) + { + msg_Warn( p_this, "cannot load module `%s' (%s)", + psz_file, strerror(errno) ); + return -1; + } + +#else +# error "Something is wrong in modules.c" + +#endif + + *p_handle = handle; + return 0; +} + /***************************************************************************** * CloseModule: unload a dynamic library ***************************************************************************** @@ -1177,10 +1454,10 @@ static void CloseModule( module_handle_t handle ) #if defined(HAVE_DL_DYLD) NSUnLinkModule( handle, FALSE ); -#elif defined(HAVE_IMAGE_H) +#elif defined(HAVE_DL_BEOS) unload_add_on( handle ); -#elif defined(WIN32) || defined(UNDER_CE) +#elif defined(HAVE_DL_WINDOWS) FreeLibrary( handle ); #elif defined(HAVE_DL_DLOPEN) @@ -1229,7 +1506,7 @@ static void * _module_getsymbol( module_handle_t handle, NSSymbol sym = NSLookupSymbolInModule( handle, psz_function ); return NSAddressOfSymbol( sym ); -#elif defined(HAVE_IMAGE_H) +#elif defined(HAVE_DL_BEOS) void * p_symbol; if( B_OK == get_image_symbol( handle, psz_function, B_SYMBOL_TYPE_TEXT, &p_symbol ) ) @@ -1241,14 +1518,14 @@ static void * _module_getsymbol( module_handle_t handle, return NULL; } -#elif defined( UNDER_CE ) +#elif defined(HAVE_DL_WINDOWS) && defined(UNDER_CE) wchar_t psz_real[256]; MultiByteToWideChar( CP_ACP, 0, psz_function, -1, psz_real, 256 ); return (void *)GetProcAddress( handle, psz_real ); -#elif defined( WIN32 ) - return (void *)GetProcAddress( handle, (MYCHAR*)psz_function ); +#elif defined(HAVE_DL_WINDOWS) && defined(WIN32) + return (void *)GetProcAddress( handle, (char *)psz_function ); #elif defined(HAVE_DL_DLOPEN) return dlsym( handle, psz_function ); @@ -1261,27 +1538,23 @@ static void * _module_getsymbol( module_handle_t handle, #endif } -#if defined(UNDER_CE) || defined(WIN32) +#if defined(HAVE_DL_WINDOWS) static char * GetWindowsError( void ) { #if defined(UNDER_CE) - wchar_t psz_tmp[256]; - char * psz_buffer = malloc( 256 ); + wchar_t psz_tmp[MAX_PATH]; + char * psz_buffer = malloc( MAX_PATH ); #else - char * psz_tmp = malloc( 256 ); + char * psz_tmp = malloc( MAX_PATH ); #endif int i = 0, i_error = GetLastError(); FormatMessage( FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, i_error, MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR) psz_tmp, 256, NULL ); + (LPTSTR)psz_tmp, MAX_PATH, NULL ); /* Go to the end of the string */ -#if defined(UNDER_CE) - while( psz_tmp[i] && psz_tmp[i] != L'\r' && psz_tmp[i] != L'\n' ) -#else - while( psz_tmp[i] && psz_tmp[i] != '\r' && psz_tmp[i] != '\n' ) -#endif + while( psz_tmp[i] && psz_tmp[i] != _T('\r') && psz_tmp[i] != _T('\n') ) { i++; } @@ -1298,13 +1571,623 @@ static char * GetWindowsError( void ) } #if defined(UNDER_CE) - WideCharToMultiByte( CP_ACP, WC_DEFAULTCHAR, psz_tmp, -1, - psz_buffer, 256, NULL, NULL ); + wcstombs( psz_buffer, psz_tmp, MAX_PATH ); return psz_buffer; #else return psz_tmp; #endif } +#endif /* HAVE_DL_WINDOWS */ + +/***************************************************************************** + * LoadPluginsCache: loads the plugins cache file + ***************************************************************************** + * This function will load the plugin cache if present and valid. This cache + * will in turn be queried by AllocateAllPlugins() to see if it needs to + * actually load the dynamically loadable module. + * This allows us to only fully load plugins when they are actually used. + *****************************************************************************/ +static void CacheLoad( vlc_object_t *p_this ) +{ + char *psz_filename, *psz_homedir; + FILE *file; + int i, j, i_size, i_read; + char p_cachestring[sizeof(PLUGINSCACHE_DIR COPYRIGHT_MESSAGE)]; + char p_cachelang[6], p_lang[6]; + int i_cache; + module_cache_t **pp_cache = 0; + int32_t i_file_size, i_marker; + + psz_homedir = p_this->p_vlc->psz_homedir; + if( !psz_homedir ) + { + msg_Err( p_this, "psz_homedir is null" ); + return; + } + + i_size = asprintf( &psz_filename, "%s/%s/%s/%s", psz_homedir, CONFIG_DIR, + PLUGINSCACHE_DIR, CacheName() ); + if( i_size <= 0 ) + { + msg_Err( p_this, "out of memory" ); + return; + } + + if( p_this->p_libvlc->p_module_bank->b_cache_delete ) + { +#if !defined( UNDER_CE ) + unlink( psz_filename ); +#else + wchar_t psz_wf[MAX_PATH]; + MultiByteToWideChar( CP_ACP, 0, psz_filename, -1, psz_wf, MAX_PATH ); + DeleteFile( psz_wf ); +#endif + msg_Dbg( p_this, "removing plugins cache file %s", psz_filename ); + free( psz_filename ); + return; + } + + msg_Dbg( p_this, "loading plugins cache file %s", psz_filename ); + + file = utf8_fopen( psz_filename, "rb" ); + if( !file ) + { + msg_Warn( p_this, "could not open plugins cache file %s for reading", + psz_filename ); + free( psz_filename ); + return; + } + free( psz_filename ); + + /* Check the file size */ + i_read = fread( &i_file_size, sizeof(char), sizeof(i_file_size), file ); + if( i_read != sizeof(i_file_size) ) + { + msg_Warn( p_this, "This doesn't look like a valid plugins cache " + "(too short)" ); + fclose( file ); + return; + } + + fseek( file, 0, SEEK_END ); + if( ftell( file ) != i_file_size ) + { + msg_Warn( p_this, "This doesn't look like a valid plugins cache " + "(corrupted size)" ); + fclose( file ); + return; + } + fseek( file, sizeof(i_file_size), SEEK_SET ); + + /* Check the file is a plugins cache */ + i_size = sizeof(PLUGINSCACHE_DIR COPYRIGHT_MESSAGE) - 1; + i_read = fread( p_cachestring, sizeof(char), i_size, file ); + if( i_read != i_size || + memcmp( p_cachestring, PLUGINSCACHE_DIR COPYRIGHT_MESSAGE, i_size ) ) + { + msg_Warn( p_this, "This doesn't look like a valid plugins cache" ); + fclose( file ); + return; + } + + /* Check Sub-version number */ + i_read = fread( &i_marker, sizeof(char), sizeof(i_marker), file ); + if( i_read != sizeof(i_marker) || i_marker != CACHE_SUBVERSION_NUM ) + { + msg_Warn( p_this, "This doesn't look like a valid plugins cache " + "(corrupted header)" ); + fclose( file ); + return; + } + + /* Check the language hasn't changed */ + sprintf( p_lang, "%5.5s", _("C") ); i_size = 5; + i_read = fread( p_cachelang, sizeof(char), i_size, file ); + if( i_read != i_size || memcmp( p_cachelang, p_lang, i_size ) ) + { + msg_Warn( p_this, "This doesn't look like a valid plugins cache " + "(language changed)" ); + fclose( file ); + return; + } + + /* Check header marker */ + i_read = fread( &i_marker, sizeof(char), sizeof(i_marker), file ); + if( i_read != sizeof(i_marker) || + i_marker != ftell( file ) - (int)sizeof(i_marker) ) + { + msg_Warn( p_this, "This doesn't look like a valid plugins cache " + "(corrupted header)" ); + fclose( file ); + return; + } + + p_this->p_libvlc->p_module_bank->i_loaded_cache = 0; + fread( &i_cache, sizeof(char), sizeof(i_cache), file ); + if( i_cache ) + pp_cache = p_this->p_libvlc->p_module_bank->pp_loaded_cache = + malloc( i_cache * sizeof(void *) ); + +#define LOAD_IMMEDIATE(a) \ + if( fread( &a, sizeof(char), sizeof(a), file ) != sizeof(a) ) goto error +#define LOAD_STRING(a) \ + { if( fread( &i_size, sizeof(char), sizeof(i_size), file ) \ + != sizeof(i_size) ) goto error; \ + if( i_size && i_size < 16384 ) { \ + a = malloc( i_size ); \ + if( fread( a, sizeof(char), i_size, file ) != (size_t)i_size ) \ + goto error; \ + if( a[i_size-1] ) { \ + free( a ); a = 0; \ + goto error; } \ + } else a = 0; \ + } while(0) + + + for( i = 0; i < i_cache; i++ ) + { + int16_t i_size; + int i_submodules; + + pp_cache[i] = malloc( sizeof(module_cache_t) ); + p_this->p_libvlc->p_module_bank->i_loaded_cache++; + + /* Load common info */ + LOAD_STRING( pp_cache[i]->psz_file ); + LOAD_IMMEDIATE( pp_cache[i]->i_time ); + LOAD_IMMEDIATE( pp_cache[i]->i_size ); + LOAD_IMMEDIATE( pp_cache[i]->b_junk ); + + if( pp_cache[i]->b_junk ) continue; + + pp_cache[i]->p_module = vlc_object_create( p_this, VLC_OBJECT_MODULE ); + + /* Load additional infos */ + LOAD_STRING( pp_cache[i]->p_module->psz_object_name ); + LOAD_STRING( pp_cache[i]->p_module->psz_shortname ); + LOAD_STRING( pp_cache[i]->p_module->psz_longname ); + LOAD_STRING( pp_cache[i]->p_module->psz_program ); + for( j = 0; j < MODULE_SHORTCUT_MAX; j++ ) + { + LOAD_STRING( pp_cache[i]->p_module->pp_shortcuts[j] ); // FIX + } + LOAD_STRING( pp_cache[i]->p_module->psz_capability ); + LOAD_IMMEDIATE( pp_cache[i]->p_module->i_score ); + LOAD_IMMEDIATE( pp_cache[i]->p_module->i_cpu ); + LOAD_IMMEDIATE( pp_cache[i]->p_module->b_unloadable ); + LOAD_IMMEDIATE( pp_cache[i]->p_module->b_reentrant ); + LOAD_IMMEDIATE( pp_cache[i]->p_module->b_submodule ); + + /* Config stuff */ + if( CacheLoadConfig( pp_cache[i]->p_module, file ) != VLC_SUCCESS ) + goto error; + + LOAD_STRING( pp_cache[i]->p_module->psz_filename ); + + LOAD_IMMEDIATE( i_submodules ); + + while( i_submodules-- ) + { + module_t *p_module = vlc_object_create( p_this, VLC_OBJECT_MODULE); + vlc_object_attach( p_module, pp_cache[i]->p_module ); + p_module->b_submodule = VLC_TRUE; + + LOAD_STRING( p_module->psz_object_name ); + LOAD_STRING( p_module->psz_shortname ); + LOAD_STRING( p_module->psz_longname ); + LOAD_STRING( p_module->psz_program ); + for( j = 0; j < MODULE_SHORTCUT_MAX; j++ ) + { + LOAD_STRING( p_module->pp_shortcuts[j] ); // FIX + } + LOAD_STRING( p_module->psz_capability ); + LOAD_IMMEDIATE( p_module->i_score ); + LOAD_IMMEDIATE( p_module->i_cpu ); + LOAD_IMMEDIATE( p_module->b_unloadable ); + LOAD_IMMEDIATE( p_module->b_reentrant ); + } + } + + fclose( file ); + return; + + error: + + msg_Warn( p_this, "plugins cache not loaded (corrupted)" ); + + /* TODO: cleanup */ + p_this->p_libvlc->p_module_bank->i_loaded_cache = 0; + + fclose( file ); + return; +} + +int CacheLoadConfig( module_t *p_module, FILE *file ) +{ + int i, j, i_lines; + int16_t i_size; + + /* Calculate the structure length */ + LOAD_IMMEDIATE( p_module->i_config_items ); + LOAD_IMMEDIATE( p_module->i_bool_items ); + + LOAD_IMMEDIATE( i_lines ); + + /* Allocate memory */ + p_module->p_config = + (module_config_t *)malloc( sizeof(module_config_t) * (i_lines + 1)); + if( p_module->p_config == NULL ) + { + msg_Err( p_module, "config error: can't duplicate p_config" ); + return VLC_ENOMEM; + } + + /* Do the duplication job */ + for( i = 0; i < i_lines ; i++ ) + { + LOAD_IMMEDIATE( p_module->p_config[i] ); + + LOAD_STRING( p_module->p_config[i].psz_type ); + LOAD_STRING( p_module->p_config[i].psz_name ); + LOAD_STRING( p_module->p_config[i].psz_text ); + LOAD_STRING( p_module->p_config[i].psz_longtext ); + LOAD_STRING( p_module->p_config[i].psz_current ); + LOAD_STRING( p_module->p_config[i].psz_value_orig ); + + p_module->p_config[i].psz_value = + p_module->p_config[i].psz_value_orig ? + strdup( p_module->p_config[i].psz_value_orig ) : 0; + p_module->p_config[i].i_value = p_module->p_config[i].i_value_orig; + p_module->p_config[i].f_value = p_module->p_config[i].f_value_orig; + p_module->p_config[i].i_value_saved = p_module->p_config[i].i_value; + p_module->p_config[i].f_value_saved = p_module->p_config[i].f_value; + p_module->p_config[i].psz_value_saved = 0; + p_module->p_config[i].b_dirty = VLC_FALSE; + + p_module->p_config[i].p_lock = &p_module->object_lock; + + if( p_module->p_config[i].i_list ) + { + if( p_module->p_config[i].ppsz_list ) + { + p_module->p_config[i].ppsz_list = + malloc( (p_module->p_config[i].i_list+1) * sizeof(char *)); + if( p_module->p_config[i].ppsz_list ) + { + for( j = 0; j < p_module->p_config[i].i_list; j++ ) + LOAD_STRING( p_module->p_config[i].ppsz_list[j] ); + p_module->p_config[i].ppsz_list[j] = NULL; + } + } + if( p_module->p_config[i].ppsz_list_text ) + { + p_module->p_config[i].ppsz_list_text = + malloc( (p_module->p_config[i].i_list+1) * sizeof(char *)); + if( p_module->p_config[i].ppsz_list_text ) + { + for( j = 0; j < p_module->p_config[i].i_list; j++ ) + LOAD_STRING( p_module->p_config[i].ppsz_list_text[j] ); + p_module->p_config[i].ppsz_list_text[j] = NULL; + } + } + if( p_module->p_config[i].pi_list ) + { + p_module->p_config[i].pi_list = + malloc( (p_module->p_config[i].i_list + 1) * sizeof(int) ); + if( p_module->p_config[i].pi_list ) + { + for( j = 0; j < p_module->p_config[i].i_list; j++ ) + LOAD_IMMEDIATE( p_module->p_config[i].pi_list[j] ); + } + } + } + + if( p_module->p_config[i].i_action ) + { + p_module->p_config[i].ppf_action = + malloc( p_module->p_config[i].i_action * sizeof(void *) ); + p_module->p_config[i].ppsz_action_text = + malloc( p_module->p_config[i].i_action * sizeof(char *) ); + + for( j = 0; j < p_module->p_config[i].i_action; j++ ) + { + p_module->p_config[i].ppf_action[j] = 0; + LOAD_STRING( p_module->p_config[i].ppsz_action_text[j] ); + } + } + + LOAD_IMMEDIATE( p_module->p_config[i].pf_callback ); + } + + p_module->p_config[i].i_type = CONFIG_HINT_END; + + return VLC_SUCCESS; + + error: + + return VLC_EGENERIC; +} + +/***************************************************************************** + * SavePluginsCache: saves the plugins cache to a file + *****************************************************************************/ +static void CacheSave( vlc_object_t *p_this ) +{ + static char const psz_tag[] = + "Signature: 8a477f597d28d172789f06886806bc55\r\n" + "# This file is a cache directory tag created by VLC.\r\n" + "# For information about cache directory tags, see:\r\n" + "# http://www.brynosaurus.com/cachedir/\r\n"; + + char *psz_filename, *psz_homedir; + FILE *file; + int i, j, i_cache; + module_cache_t **pp_cache; + int32_t i_file_size = 0; + + psz_homedir = p_this->p_vlc->psz_homedir; + if( !psz_homedir ) + { + msg_Err( p_this, "psz_homedir is null" ); + return; + } + psz_filename = + (char *)malloc( sizeof("/" CONFIG_DIR "/" PLUGINSCACHE_DIR "/" ) + + strlen(psz_homedir) + strlen(CacheName()) ); + + if( !psz_filename ) + { + msg_Err( p_this, "out of memory" ); + return; + } + + sprintf( psz_filename, "%s/%s", psz_homedir, CONFIG_DIR ); + + config_CreateDir( p_this, psz_filename ); + + strcat( psz_filename, "/" PLUGINSCACHE_DIR ); + + config_CreateDir( p_this, psz_filename ); + + strcat( psz_filename, "/CACHEDIR.TAG" ); + + file = utf8_fopen( psz_filename, "wb" ); + if( file ) + { + fwrite( psz_tag, 1, strlen(psz_tag), file ); + fclose( file ); + } + + sprintf( psz_filename, "%s/%s/%s/%s", psz_homedir, CONFIG_DIR, + PLUGINSCACHE_DIR, CacheName() ); + + msg_Dbg( p_this, "saving plugins cache file %s", psz_filename ); + + file = utf8_fopen( psz_filename, "wb" ); + if( !file ) + { + msg_Warn( p_this, "could not open plugins cache file %s for writing", + psz_filename ); + free( psz_filename ); + return; + } + free( psz_filename ); + + /* Empty space for file size */ + fwrite( &i_file_size, sizeof(char), sizeof(i_file_size), file ); + + /* Contains version number */ + fprintf( file, "%s", PLUGINSCACHE_DIR COPYRIGHT_MESSAGE ); + + /* Sub-version number (to avoid breakage in the dev version when cache + * structure changes) */ + i_file_size = CACHE_SUBVERSION_NUM; + fwrite( &i_file_size, sizeof(char), sizeof(i_file_size), file ); + + /* Language */ + fprintf( file, "%5.5s", _("C") ); + + /* Header marker */ + i_file_size = ftell( file ); + fwrite( &i_file_size, sizeof(char), sizeof(i_file_size), file ); + + i_cache = p_this->p_libvlc->p_module_bank->i_cache; + pp_cache = p_this->p_libvlc->p_module_bank->pp_cache; + + fwrite( &i_cache, sizeof(char), sizeof(i_cache), file ); + +#define SAVE_IMMEDIATE(a) \ + fwrite( &a, sizeof(char), sizeof(a), file ) +#define SAVE_STRING(a) \ + { i_size = a ? strlen( a ) + 1 : 0; \ + fwrite( &i_size, sizeof(char), sizeof(i_size), file ); \ + if( a ) fwrite( a, sizeof(char), i_size, file ); \ + } while(0) + + for( i = 0; i < i_cache; i++ ) + { + int16_t i_size; + int32_t i_submodule; + + /* Save common info */ + SAVE_STRING( pp_cache[i]->psz_file ); + SAVE_IMMEDIATE( pp_cache[i]->i_time ); + SAVE_IMMEDIATE( pp_cache[i]->i_size ); + SAVE_IMMEDIATE( pp_cache[i]->b_junk ); + + if( pp_cache[i]->b_junk ) continue; + + /* Save additional infos */ + SAVE_STRING( pp_cache[i]->p_module->psz_object_name ); + SAVE_STRING( pp_cache[i]->p_module->psz_shortname ); + SAVE_STRING( pp_cache[i]->p_module->psz_longname ); + SAVE_STRING( pp_cache[i]->p_module->psz_program ); + for( j = 0; j < MODULE_SHORTCUT_MAX; j++ ) + { + SAVE_STRING( pp_cache[i]->p_module->pp_shortcuts[j] ); // FIX + } + SAVE_STRING( pp_cache[i]->p_module->psz_capability ); + SAVE_IMMEDIATE( pp_cache[i]->p_module->i_score ); + SAVE_IMMEDIATE( pp_cache[i]->p_module->i_cpu ); + SAVE_IMMEDIATE( pp_cache[i]->p_module->b_unloadable ); + SAVE_IMMEDIATE( pp_cache[i]->p_module->b_reentrant ); + SAVE_IMMEDIATE( pp_cache[i]->p_module->b_submodule ); + + /* Config stuff */ + CacheSaveConfig( pp_cache[i]->p_module, file ); + + SAVE_STRING( pp_cache[i]->p_module->psz_filename ); + + i_submodule = pp_cache[i]->p_module->i_children; + SAVE_IMMEDIATE( i_submodule ); + for( i_submodule = 0; i_submodule < pp_cache[i]->p_module->i_children; + i_submodule++ ) + { + module_t *p_module = + (module_t *)pp_cache[i]->p_module->pp_children[i_submodule]; + + SAVE_STRING( p_module->psz_object_name ); + SAVE_STRING( p_module->psz_shortname ); + SAVE_STRING( p_module->psz_longname ); + SAVE_STRING( p_module->psz_program ); + for( j = 0; j < MODULE_SHORTCUT_MAX; j++ ) + { + SAVE_STRING( p_module->pp_shortcuts[j] ); // FIX + } + SAVE_STRING( p_module->psz_capability ); + SAVE_IMMEDIATE( p_module->i_score ); + SAVE_IMMEDIATE( p_module->i_cpu ); + SAVE_IMMEDIATE( p_module->b_unloadable ); + SAVE_IMMEDIATE( p_module->b_reentrant ); + } + } + + /* Fill-up file size */ + i_file_size = ftell( file ); + fseek( file, 0, SEEK_SET ); + fwrite( &i_file_size, sizeof(char), sizeof(i_file_size), file ); + + fclose( file ); + + return; +} + +void CacheSaveConfig( module_t *p_module, FILE *file ) +{ + int i, j, i_lines = 0; + module_config_t *p_item; + int16_t i_size; + + SAVE_IMMEDIATE( p_module->i_config_items ); + SAVE_IMMEDIATE( p_module->i_bool_items ); + + for( p_item = p_module->p_config; p_item->i_type != CONFIG_HINT_END; + p_item++ ) i_lines++; + + SAVE_IMMEDIATE( i_lines ); + + for( i = 0; i < i_lines ; i++ ) + { + SAVE_IMMEDIATE( p_module->p_config[i] ); + + SAVE_STRING( p_module->p_config[i].psz_type ); + SAVE_STRING( p_module->p_config[i].psz_name ); + SAVE_STRING( p_module->p_config[i].psz_text ); + SAVE_STRING( p_module->p_config[i].psz_longtext ); + SAVE_STRING( p_module->p_config[i].psz_current ); + SAVE_STRING( p_module->p_config[i].psz_value_orig ); + + if( p_module->p_config[i].i_list ) + { + if( p_module->p_config[i].ppsz_list ) + { + for( j = 0; j < p_module->p_config[i].i_list; j++ ) + SAVE_STRING( p_module->p_config[i].ppsz_list[j] ); + } + + if( p_module->p_config[i].ppsz_list_text ) + { + for( j = 0; j < p_module->p_config[i].i_list; j++ ) + SAVE_STRING( p_module->p_config[i].ppsz_list_text[j] ); + } + if( p_module->p_config[i].pi_list ) + { + for( j = 0; j < p_module->p_config[i].i_list; j++ ) + SAVE_IMMEDIATE( p_module->p_config[i].pi_list[j] ); + } + } + + for( j = 0; j < p_module->p_config[i].i_action; j++ ) + SAVE_STRING( p_module->p_config[i].ppsz_action_text[j] ); + + SAVE_IMMEDIATE( p_module->p_config[i].pf_callback ); + } +} + +/***************************************************************************** + * CacheName: Return the cache file name for this platform. + *****************************************************************************/ +static char *CacheName( void ) +{ + static char psz_cachename[32]; + + /* Code int size, pointer size and endianness in the filename */ + int32_t x = 0xbe00001e; + sprintf( psz_cachename, "plugins-%.2x%.2x%.2x.dat", sizeof(int), + sizeof(void *), (unsigned int)((unsigned char *)&x)[0] ); + return psz_cachename; +} + +/***************************************************************************** + * CacheMerge: Merge a cache module descriptor with a full module descriptor. + *****************************************************************************/ +static void CacheMerge( vlc_object_t *p_this, module_t *p_cache, + module_t *p_module ) +{ + int i_submodule; + + p_cache->pf_activate = p_module->pf_activate; + p_cache->pf_deactivate = p_module->pf_deactivate; +#ifndef HAVE_SHARED_LIBVLC + p_cache->p_symbols = p_module->p_symbols; +#endif + p_cache->handle = p_module->handle; + + for( i_submodule = 0; i_submodule < p_module->i_children; i_submodule++ ) + { + module_t *p_child = (module_t*)p_module->pp_children[i_submodule]; + module_t *p_cchild = (module_t*)p_cache->pp_children[i_submodule]; + p_cchild->pf_activate = p_child->pf_activate; + p_cchild->pf_deactivate = p_child->pf_deactivate; +#ifndef HAVE_SHARED_LIBVLC + p_cchild->p_symbols = p_child->p_symbols; #endif + } + + p_cache->b_loaded = VLC_TRUE; + p_module->b_loaded = VLC_FALSE; +} + +/***************************************************************************** + * FindPluginCache: finds the cache entry corresponding to a file + *****************************************************************************/ +static module_cache_t *CacheFind( vlc_object_t *p_this, char *psz_file, + int64_t i_time, int64_t i_size ) +{ + module_cache_t **pp_cache; + int i_cache, i; + + pp_cache = p_this->p_libvlc->p_module_bank->pp_loaded_cache; + i_cache = p_this->p_libvlc->p_module_bank->i_loaded_cache; + + for( i = 0; i < i_cache; i++ ) + { + if( !strcmp( pp_cache[i]->psz_file, psz_file ) && + pp_cache[i]->i_time == i_time && + pp_cache[i]->i_size == i_size ) return pp_cache[i]; + } + + return NULL; +} #endif /* HAVE_DYNAMIC_PLUGINS */