X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fmodules.c;h=cf9892f387cdd2a0ff3c5ba12172670925a78fe1;hb=9361dd4a55eb771f3f5ee093bab569cf3149393f;hp=29c4f4e23304bba312841f2a7d33ecb8a054308e;hpb=6cdc9671598070dbd55e8bbabc452e3adafc2b78;p=vlc diff --git a/src/misc/modules.c b/src/misc/modules.c index 29c4f4e233..cf9892f387 100644 --- a/src/misc/modules.c +++ b/src/misc/modules.c @@ -1,7 +1,7 @@ /***************************************************************************** * modules.c : Builtin and plugin modules management functions ***************************************************************************** - * Copyright (C) 2001-2004 VideoLAN + * Copyright (C) 2001-2004 the VideoLAN team * $Id$ * * Authors: Sam Hocevar @@ -21,9 +21,11 @@ * * 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. *****************************************************************************/ +#include + /* Some faulty libcs have a broken struct dirent when _FILE_OFFSET_BITS * is set to 64. Don't try to be cleverer. */ #ifdef _FILE_OFFSET_BITS @@ -34,14 +36,10 @@ #include /* sprintf() */ #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 @@ -54,8 +52,9 @@ # include #endif -#define HAVE_DYNAMIC_PLUGINS -#if defined(HAVE_DL_DYLD) +#if !defined(HAVE_DYNAMIC_PLUGINS) + /* no support for plugins */ +#elif defined(HAVE_DL_DYLD) # if defined(HAVE_MACH_O_DYLD_H) # include # endif @@ -76,33 +75,31 @@ # if defined(HAVE_DL_H) # include # endif -#else -# undef HAVE_DYNAMIC_PLUGINS #endif #include "vlc_error.h" #include "vlc_interface.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 "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" @@ -111,17 +108,13 @@ #include "vlc_vlm.h" -#if defined( UNDER_CE ) -# define MYCHAR wchar_t -#else -# define MYCHAR char -#endif +#include "vlc_image.h" +#include "vlc_osd.h" -#ifdef HAVE_DYNAMIC_PLUGINS -# include "modules_plugin.h" -#endif +#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" @@ -130,6 +123,11 @@ #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 *****************************************************************************/ @@ -149,9 +147,10 @@ static int LoadModule ( vlc_object_t *, char *, module_handle_t * ); static void CloseModule ( module_handle_t ); static void * GetSymbol ( module_handle_t, const char * ); static void CacheLoad ( vlc_object_t * ); -static void CacheLoadConfig ( module_t *, FILE * ); +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 ); @@ -160,6 +159,11 @@ 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. ***************************************************************************** @@ -169,9 +173,24 @@ 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_global, "libvlc", VLC_VAR_MUTEX ); + var_Get( p_this->p_libvlc_global, "libvlc", &lockval ); + vlc_mutex_lock( lockval.p_address ); + if( p_this->p_libvlc_global->p_module_bank ) + { + p_this->p_libvlc_global->p_module_bank->i_usage++; + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_this->p_libvlc_global, "libvlc" ); + return; + } + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_this->p_libvlc_global, "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 = @@ -180,13 +199,15 @@ void __module_InitBank( vlc_object_t *p_this ) /* * 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 /* Everything worked, attach the object */ - p_this->p_libvlc->p_module_bank = p_bank; - vlc_object_attach( p_bank, p_this->p_libvlc ); + p_this->p_libvlc_global->p_module_bank = p_bank; + vlc_object_attach( p_bank, p_this->p_libvlc_global ); + + module_LoadMain( p_this ); return; } @@ -212,16 +233,54 @@ 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_global, "libvlc", VLC_VAR_MUTEX ); + var_Get( p_this->p_libvlc_global, "libvlc", &lockval ); + vlc_mutex_lock( lockval.p_address ); + if( !p_this->p_libvlc_global->p_module_bank ) + { + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_this->p_libvlc_global, "libvlc" ); + return; + } + if( --p_this->p_libvlc_global->p_module_bank->i_usage ) + { + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_this->p_libvlc_global, "libvlc" ); + return; + } + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_this->p_libvlc_global, "libvlc" ); + + config_AutoSaveConfigFile( p_this ); #ifdef HAVE_DYNAMIC_PLUGINS - if( p_this->p_libvlc->p_module_bank->b_cache ) CacheSave( p_this ); +#define p_bank p_this->p_libvlc_global->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 ); + vlc_object_detach( p_this->p_libvlc_global->p_module_bank ); - while( p_this->p_libvlc->p_module_bank->i_children ) + while( p_this->p_libvlc_global->p_module_bank->i_children ) { - p_next = (module_t *)p_this->p_libvlc->p_module_bank->pp_children[0]; + p_next = (module_t *)p_this->p_libvlc_global->p_module_bank->pp_children[0]; if( DeleteModule( p_next ) ) { @@ -235,7 +294,8 @@ void __module_EndBank( vlc_object_t *p_this ) } } - vlc_object_destroy( p_this->p_libvlc->p_module_bank ); + vlc_object_destroy( p_this->p_libvlc_global->p_module_bank ); + p_this->p_libvlc_global->p_module_bank = NULL; return; } @@ -250,6 +310,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_global, "libvlc", VLC_VAR_MUTEX ); + var_Get( p_this->p_libvlc_global, "libvlc", &lockval ); + vlc_mutex_lock( lockval.p_address ); + if( p_this->p_libvlc_global->p_module_bank->b_main ) + { + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_this->p_libvlc_global, "libvlc" ); + return; + } + p_this->p_libvlc_global->p_module_bank->b_main = VLC_TRUE; + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_this->p_libvlc_global, "libvlc" ); + AllocateBuiltinModule( p_this, vlc_entry__main ); } @@ -260,6 +335,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_global, "libvlc", VLC_VAR_MUTEX ); + var_Get( p_this->p_libvlc_global, "libvlc", &lockval ); + vlc_mutex_lock( lockval.p_address ); + if( p_this->p_libvlc_global->p_module_bank->b_builtins ) + { + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_this->p_libvlc_global, "libvlc" ); + return; + } + p_this->p_libvlc_global->p_module_bank->b_builtins = VLC_TRUE; + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_this->p_libvlc_global, "libvlc" ); + msg_Dbg( p_this, "checking builtin modules" ); ALLOCATE_ALL_BUILTINS(); } @@ -272,13 +362,28 @@ 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_global, "libvlc", VLC_VAR_MUTEX ); + var_Get( p_this->p_libvlc_global, "libvlc", &lockval ); + vlc_mutex_lock( lockval.p_address ); + if( p_this->p_libvlc_global->p_module_bank->b_plugins ) + { + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_this->p_libvlc_global, "libvlc" ); + return; + } + p_this->p_libvlc_global->p_module_bank->b_plugins = VLC_TRUE; + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_this->p_libvlc_global, "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; + p_this->p_libvlc_global->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 ); + if( p_this->p_libvlc_global->p_module_bank->b_cache || + p_this->p_libvlc_global->p_module_bank->b_cache_delete ) CacheLoad( p_this ); AllocateAllPlugins( p_this ); #endif @@ -298,6 +403,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; }; @@ -311,8 +417,8 @@ 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] == '$' ) @@ -373,37 +479,20 @@ 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 */ - if( (p_module->i_cpu & p_this->p_libvlc->i_cpu) != p_module->i_cpu ) + if( (p_module->i_cpu & p_this->p_libvlc_global->i_cpu) != p_module->i_cpu ) { continue; } @@ -415,9 +504,9 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, 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 > 0 ) { @@ -461,16 +550,17 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, 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 ) ) + p_this->p_libvlc->psz_object_name ) ) { if( !b_intf ) { @@ -488,6 +578,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 && b_strict; /* Add it to the modules-to-probe list */ if( i_index == 0 ) @@ -523,8 +614,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; @@ -558,6 +649,7 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, } #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 ) { @@ -587,16 +679,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 ) { @@ -632,7 +733,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 ); @@ -650,11 +751,14 @@ 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 }; +#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; + 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 ] = @@ -662,18 +766,20 @@ static void AllocateAllPlugins( vlc_object_t *p_this ) 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 { int i_dirlen = strlen( *ppsz_path ); - i_dirlen += strlen( p_this->p_libvlc->psz_vlcpath ) + 2; + i_dirlen += strlen( p_this->p_libvlc_global->psz_vlcpath ) + 2; psz_fullpath = malloc( i_dirlen ); if( psz_fullpath == NULL ) @@ -682,10 +788,10 @@ static void AllocateAllPlugins( vlc_object_t *p_this ) } #ifdef WIN32 sprintf( psz_fullpath, "%s\\%s", - p_this->p_libvlc->psz_vlcpath, *ppsz_path ); + p_this->p_libvlc_global->psz_vlcpath, *ppsz_path ); #else sprintf( psz_fullpath, "%s/%s", - p_this->p_libvlc->psz_vlcpath, *ppsz_path ); + p_this->p_libvlc_global->psz_vlcpath, *ppsz_path ); #endif } else @@ -716,14 +822,13 @@ static void AllocatePluginDir( vlc_object_t *p_this, const char *psz_dir, { #if defined( UNDER_CE ) || defined( _MSC_VER ) #ifdef UNDER_CE - MYCHAR psz_path[MAX_PATH + 256]; + wchar_t psz_wpath[MAX_PATH + 256]; wchar_t psz_wdir[MAX_PATH]; -#else - char psz_path[MAX_PATH + 256]; #endif + char psz_path[MAX_PATH + 256]; WIN32_FIND_DATA finddata; HANDLE handle; - unsigned int rc; + int rc; #else int i_dirlen; DIR * dir; @@ -731,28 +836,33 @@ static void AllocatePluginDir( vlc_object_t *p_this, const char *psz_dir, #endif char * psz_file; - if( p_this->p_vlc->b_die || i_maxdepth < 0 ) + if( p_this->p_libvlc->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 & FILE_ATTRIBUTE_DIRECTORY) ) - { - /* Not a directory */ - return; - } + if( rc<0 || !(rc&FILE_ATTRIBUTE_DIRECTORY) ) return; /* Not a directory */ /* Parse all files in the directory */ -#ifdef UNDER_CE - swprintf( psz_path, L"%s\\*.*", psz_dir ); + swprintf( psz_wpath, L"%ls\\*", psz_wdir ); #else - sprintf( psz_path, "%s\\*.*", psz_dir ); + rc = GetFileAttributes( psz_dir ); + 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 + handle = FindFirstFile( psz_wpath, &finddata ); +#else handle = FindFirstFile( psz_path, &finddata ); +#endif if( handle == INVALID_HANDLE_VALUE ) { /* Empty directory */ @@ -764,45 +874,59 @@ static void AllocatePluginDir( vlc_object_t *p_this, const char *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 { + WIN32_FILE_ATTRIBUTE_DATA attrbuf; + int64_t i_time = 0, i_size = 0; + #ifdef UNDER_CE - char psz_filename[MAX_PATH]; - WideCharToMultiByte( CP_ACP, WC_DEFAULTCHAR, psz_path, -1, - psz_filename, MAX_PATH, NULL, NULL ); - psz_file = psz_filename; + if( GetFileAttributesEx( psz_wpath, GetFileExInfoStandard, + &attrbuf ) ) #else - psz_file = psz_path; + 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, 0, 0 ); + AllocatePluginFile( p_this, psz_file, i_time, i_size ); } } - while( !p_this->p_vlc->b_die && FindNextFile( handle, &finddata ) ); + while( !p_this->p_libvlc->b_die && FindNextFile( handle, &finddata ) ); /* Close the directory */ FindClose( handle ); @@ -817,14 +941,15 @@ static void AllocatePluginDir( vlc_object_t *p_this, const char *psz_dir, i_dirlen = strlen( psz_dir ); /* Parse the directory and try to load all files it contains. */ - while( !p_this->p_vlc->b_die && (file = readdir( dir )) ) + while( !p_this->p_libvlc->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; } @@ -899,8 +1024,20 @@ static int AllocatePluginFile( vlc_object_t * p_this, char * psz_file, } else { + module_config_t *p_item; + p_module = p_cache_entry->p_module; p_module->b_loaded = VLC_FALSE; + + /* 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 ); + } } } @@ -913,13 +1050,13 @@ static int AllocatePluginFile( vlc_object_t * p_this, char * psz_file, /* 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 ); + vlc_object_attach( p_module, p_this->p_libvlc_global->p_module_bank ); } - if( !p_this->p_libvlc->p_module_bank->b_cache ) return 0; + if( !p_this->p_libvlc_global->p_module_bank->b_cache ) return 0; /* Add entry to cache */ -#define p_bank p_this->p_libvlc->p_module_bank +#define p_bank p_this->p_libvlc_global->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) ); @@ -960,7 +1097,9 @@ static module_t * AllocatePlugin( vlc_object_t * p_this, char * psz_file ) /* We need to fill these since they may be needed by CallEntry() */ p_module->psz_filename = psz_file; p_module->handle = handle; - p_module->p_symbols = &p_this->p_libvlc->p_module_bank->symbols; +#ifndef HAVE_SHARED_LIBVLC + p_module->p_symbols = &p_this->p_libvlc_global->p_module_bank->symbols; +#endif p_module->b_loaded = VLC_TRUE; /* Initialize the module: fill p_module, default config */ @@ -974,7 +1113,6 @@ static module_t * AllocatePlugin( vlc_object_t * p_this, char * psz_file ) 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; @@ -1002,6 +1140,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 ) { @@ -1036,6 +1177,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 ) { @@ -1082,7 +1225,7 @@ static int AllocateBuiltinModule( vlc_object_t * p_this, /* msg_Dbg( p_this, "builtin \"%s\", %s", p_module->psz_object_name, p_module->psz_longname ); */ - vlc_object_attach( p_module, p_this->p_libvlc->p_module_bank ); + vlc_object_attach( p_module, p_this->p_libvlc_global->p_module_bank ); return 0; } @@ -1106,7 +1249,6 @@ static int DeleteModule( module_t * p_module ) } UndupModule( p_module ); free( p_module->psz_filename ); - free( p_module->psz_longname ); } #endif @@ -1167,7 +1309,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; } @@ -1226,17 +1368,25 @@ static int LoadModule( vlc_object_t *p_this, char *psz_file, } #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 */ - static vlc_bool_t b_kde = VLC_FALSE; # if defined(SYS_LINUX) /* XXX HACK #1 - we should NOT open modules with RTLD_GLOBAL, or we @@ -1253,18 +1403,6 @@ static int LoadModule( vlc_object_t *p_this, char *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 ) @@ -1388,7 +1526,7 @@ static void * _module_getsymbol( module_handle_t handle, return (void *)GetProcAddress( handle, psz_real ); #elif defined(HAVE_DL_WINDOWS) && defined(WIN32) - return (void *)GetProcAddress( handle, (MYCHAR*)psz_function ); + return (void *)GetProcAddress( handle, (char *)psz_function ); #elif defined(HAVE_DL_DLOPEN) return dlsym( handle, psz_function ); @@ -1405,23 +1543,19 @@ static void * _module_getsymbol( module_handle_t handle, 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++; } @@ -1438,8 +1572,7 @@ 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; @@ -1460,40 +1593,44 @@ 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_FILE COPYRIGHT_MESSAGE)]; - int *pi_cache; + 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; + psz_homedir = p_this->p_libvlc->psz_homedir; if( !psz_homedir ) { msg_Err( p_this, "psz_homedir is null" ); return; } - psz_filename = - (char *)malloc( sizeof("/" CONFIG_DIR "/" PLUGINSCACHE_FILE) + - strlen(psz_homedir) ); - - if( psz_filename ) - sprintf( psz_filename, "%s/" CONFIG_DIR "/" PLUGINSCACHE_FILE, - psz_homedir ); - if( !psz_filename ) + 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( p_this->p_libvlc_global->p_module_bank->b_cache_delete ) { - msg_Dbg( p_this, "removing plugins cache file %s", psz_filename ); +#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 = fopen( psz_filename, "r" ); + file = utf8_fopen( psz_filename, "rb" ); if( !file ) { msg_Warn( p_this, "could not open plugins cache file %s for reading", @@ -1503,38 +1640,100 @@ static void CacheLoad( vlc_object_t *p_this ) } 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_FILE COPYRIGHT_MESSAGE) - 1; + 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_FILE COPYRIGHT_MESSAGE, 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; } - pi_cache = &p_this->p_libvlc->p_module_bank->i_loaded_cache; - fread( pi_cache, sizeof(char), sizeof(*pi_cache), file ); - pp_cache = p_this->p_libvlc->p_module_bank->pp_loaded_cache = - malloc( *pi_cache * sizeof(void *) ); + /* 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; + } - for( i = 0; i < *pi_cache; i++ ) + /* 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) ) { - int32_t i_size; - int i_submodules; + msg_Warn( p_this, "This doesn't look like a valid plugins cache " + "(corrupted header)" ); + fclose( file ); + return; + } + + p_this->p_libvlc_global->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_global->p_module_bank->pp_loaded_cache = + malloc( i_cache * sizeof(void *) ); #define LOAD_IMMEDIATE(a) \ - fread( &a, sizeof(char), sizeof(a), file ) + if( fread( &a, sizeof(char), sizeof(a), file ) != sizeof(a) ) goto error #define LOAD_STRING(a) \ - { fread( &i_size, sizeof(char), sizeof(int32_t), file ); \ - if( i_size ) { \ - a = malloc( i_size ); \ - fread( a, sizeof(char), i_size, file ); \ - } else a = 0; \ - } while(0) + { 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_global->p_module_bank->i_loaded_cache++; - /* Save common info */ + /* Load common info */ LOAD_STRING( pp_cache[i]->psz_file ); LOAD_IMMEDIATE( pp_cache[i]->i_time ); LOAD_IMMEDIATE( pp_cache[i]->i_size ); @@ -1544,7 +1743,7 @@ static void CacheLoad( vlc_object_t *p_this ) pp_cache[i]->p_module = vlc_object_create( p_this, VLC_OBJECT_MODULE ); - /* Save additional infos */ + /* 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 ); @@ -1561,7 +1760,8 @@ static void CacheLoad( vlc_object_t *p_this ) LOAD_IMMEDIATE( pp_cache[i]->p_module->b_submodule ); /* Config stuff */ - CacheLoadConfig( pp_cache[i]->p_module, file ); + if( CacheLoadConfig( pp_cache[i]->p_module, file ) != VLC_SUCCESS ) + goto error; LOAD_STRING( pp_cache[i]->p_module->psz_filename ); @@ -1571,7 +1771,7 @@ static void CacheLoad( vlc_object_t *p_this ) { 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; + p_module->b_submodule = VLC_TRUE; LOAD_STRING( p_module->psz_object_name ); LOAD_STRING( p_module->psz_shortname ); @@ -1590,14 +1790,23 @@ static void CacheLoad( vlc_object_t *p_this ) } fclose( file ); + return; + + error: + + msg_Warn( p_this, "plugins cache not loaded (corrupted)" ); + /* TODO: cleanup */ + p_this->p_libvlc_global->p_module_bank->i_loaded_cache = 0; + + fclose( file ); return; } -void CacheLoadConfig( module_t *p_module, FILE *file ) +int CacheLoadConfig( module_t *p_module, FILE *file ) { int i, j, i_lines; - int32_t i_size; + int16_t i_size; /* Calculate the structure length */ LOAD_IMMEDIATE( p_module->i_config_items ); @@ -1611,7 +1820,7 @@ void CacheLoadConfig( module_t *p_module, FILE *file ) if( p_module->p_config == NULL ) { msg_Err( p_module, "config error: can't duplicate p_config" ); - return; + return VLC_ENOMEM; } /* Do the duplication job */ @@ -1623,6 +1832,7 @@ void CacheLoadConfig( module_t *p_module, FILE *file ) 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 = @@ -1630,6 +1840,10 @@ void CacheLoadConfig( module_t *p_module, FILE *file ) 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; @@ -1683,10 +1897,16 @@ void CacheLoadConfig( module_t *p_module, FILE *file ) } } - p_module->p_config[i].pf_callback = 0; + 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; } /***************************************************************************** @@ -1694,23 +1914,27 @@ void CacheLoadConfig( module_t *p_module, FILE *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; + psz_homedir = p_this->p_libvlc->psz_homedir; if( !psz_homedir ) { msg_Err( p_this, "psz_homedir is null" ); return; } psz_filename = - (char *)malloc( sizeof("/" CONFIG_DIR "/" PLUGINSCACHE_FILE) + - strlen(psz_homedir) ); - - if( psz_filename ) - sprintf( psz_filename, "%s/" CONFIG_DIR, psz_homedir ); + (char *)malloc( sizeof("/" CONFIG_DIR "/" PLUGINSCACHE_DIR "/" ) + + strlen(psz_homedir) + strlen(CacheName()) ); if( !psz_filename ) { @@ -1718,13 +1942,29 @@ static void CacheSave( vlc_object_t *p_this ) 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, "/" PLUGINSCACHE_FILE ); + 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 = fopen( psz_filename, "w" ); + file = utf8_fopen( psz_filename, "wb" ); if( !file ) { msg_Warn( p_this, "could not open plugins cache file %s for writing", @@ -1734,27 +1974,42 @@ static void CacheSave( vlc_object_t *p_this ) } free( psz_filename ); + /* Empty space for file size */ + fwrite( &i_file_size, sizeof(char), sizeof(i_file_size), file ); + /* Contains version number */ - fprintf( file, PLUGINSCACHE_FILE COPYRIGHT_MESSAGE ); + 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 ); - i_cache = p_this->p_libvlc->p_module_bank->i_cache; - pp_cache = p_this->p_libvlc->p_module_bank->pp_cache; + /* 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_global->p_module_bank->i_cache; + pp_cache = p_this->p_libvlc_global->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++ ) { - int32_t i_size; + int16_t i_size; int32_t i_submodule; -#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(int32_t), file ); \ - if( a ) fwrite( a, sizeof(char), i_size, file ); \ - } while(0) - /* Save common info */ SAVE_STRING( pp_cache[i]->psz_file ); SAVE_IMMEDIATE( pp_cache[i]->i_time ); @@ -1808,6 +2063,11 @@ static void CacheSave( vlc_object_t *p_this ) } } + /* 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; @@ -1817,7 +2077,7 @@ void CacheSaveConfig( module_t *p_module, FILE *file ) { int i, j, i_lines = 0; module_config_t *p_item; - int32_t i_size; + int16_t i_size; SAVE_IMMEDIATE( p_module->i_config_items ); SAVE_IMMEDIATE( p_module->i_bool_items ); @@ -1835,6 +2095,7 @@ void CacheSaveConfig( module_t *p_module, FILE *file ) 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 ) @@ -1859,9 +2120,25 @@ void CacheSaveConfig( module_t *p_module, FILE *file ) 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. *****************************************************************************/ @@ -1872,7 +2149,9 @@ static void CacheMerge( vlc_object_t *p_this, module_t *p_cache, 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++ ) @@ -1881,7 +2160,9 @@ static void CacheMerge( vlc_object_t *p_this, module_t *p_cache, 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; @@ -1897,8 +2178,8 @@ static module_cache_t *CacheFind( vlc_object_t *p_this, char *psz_file, 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; + pp_cache = p_this->p_libvlc_global->p_module_bank->pp_loaded_cache; + i_cache = p_this->p_libvlc_global->p_module_bank->i_loaded_cache; for( i = 0; i < i_cache; i++ ) {