X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fmodules.c;h=33b0a8bfafbb2685f7812c9650df8a07931b20ae;hb=f485214f09dd284cbb85674e937fbbb0a6032a2e;hp=f00d877201125051abd02ae2201e668e75036169;hpb=5563e0d680fa72c36f9b4eb8b8f7295d4bae99a4;p=vlc diff --git a/src/misc/modules.c b/src/misc/modules.c index f00d877201..33b0a8bfaf 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,15 +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 @@ -55,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 @@ -77,13 +75,12 @@ # 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 "vlc_playlist.h" @@ -97,8 +94,12 @@ #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" @@ -107,11 +108,13 @@ #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" @@ -120,9 +123,9 @@ #endif #include "network.h" -#if defined( WIN32) || defined( UNDER_CE ) +#if defined( WIN32 ) || defined( UNDER_CE ) /* Avoid name collisions */ -# define LoadModule(a,b,c) _LoadModule(a,b,c) +# define LoadModule(a,b,c) LoadVlcModule(a,b,c) #endif /***************************************************************************** @@ -147,6 +150,7 @@ 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 ); @@ -155,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. ***************************************************************************** @@ -166,18 +175,18 @@ 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 ); + 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->p_module_bank ) + if( p_this->p_libvlc_global->p_module_bank ) { - p_this->p_libvlc->p_module_bank->i_usage++; + p_this->p_libvlc_global->p_module_bank->i_usage++; vlc_mutex_unlock( lockval.p_address ); - var_Destroy( p_this->p_libvlc, "libvlc" ); + var_Destroy( p_this->p_libvlc_global, "libvlc" ); return; } vlc_mutex_unlock( lockval.p_address ); - var_Destroy( p_this->p_libvlc, "libvlc" ); + 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"; @@ -190,13 +199,13 @@ 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 ); @@ -226,47 +235,52 @@ 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 ); + 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->p_module_bank ) + if( !p_this->p_libvlc_global->p_module_bank ) { vlc_mutex_unlock( lockval.p_address ); - var_Destroy( p_this->p_libvlc, "libvlc" ); + var_Destroy( p_this->p_libvlc_global, "libvlc" ); return; } - if( --p_this->p_libvlc->p_module_bank->i_usage ) + if( --p_this->p_libvlc_global->p_module_bank->i_usage ) { vlc_mutex_unlock( lockval.p_address ); - var_Destroy( p_this->p_libvlc, "libvlc" ); + var_Destroy( p_this->p_libvlc_global, "libvlc" ); return; } vlc_mutex_unlock( lockval.p_address ); - var_Destroy( p_this->p_libvlc, "libvlc" ); + var_Destroy( p_this->p_libvlc_global, "libvlc" ); + + config_AutoSaveConfigFile( p_this ); #ifdef HAVE_DYNAMIC_PLUGINS -#define p_bank p_this->p_libvlc->p_module_bank +#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->i_loaded_cache ) free( p_bank->pp_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->i_cache ) free( p_bank->pp_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 ) ) { @@ -280,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; } @@ -295,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 ); } @@ -305,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(); } @@ -317,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 @@ -357,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] == '$' ) @@ -432,7 +492,7 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, } /* 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; } @@ -498,8 +558,9 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, /* 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 ) { @@ -553,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; @@ -618,11 +679,11 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, } free( p_list ); - p_this->b_force = VLC_FALSE; + 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 ) @@ -633,7 +694,7 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, 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" ); } @@ -672,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 ); @@ -690,14 +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". */ -#ifdef WIN32 - char * path[] = { "modules", "", "plugins", 0, 0 }; +#if defined( WIN32 ) || defined( UNDER_CE ) + char *path[] = { "modules", "", "plugins", 0, 0 }; #else - char * path[] = { "modules", PLUGIN_PATH, "plugins", 0, 0 }; + 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 ] = @@ -707,7 +768,7 @@ static void AllocateAllPlugins( vlc_object_t *p_this ) { if( !(*ppsz_path)[0] ) continue; -#if defined( SYS_BEOS ) || defined( SYS_DARWIN ) || defined( WIN32 ) +#if defined( SYS_BEOS ) || defined( __APPLE__ ) || defined( WIN32 ) /* Handle relative as well as absolute paths */ #ifdef WIN32 @@ -718,7 +779,7 @@ static void AllocateAllPlugins( vlc_object_t *p_this ) #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 ) @@ -727,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 @@ -767,7 +828,7 @@ static void AllocatePluginDir( vlc_object_t *p_this, const char *psz_dir, char psz_path[MAX_PATH + 256]; WIN32_FIND_DATA finddata; HANDLE handle; - unsigned int rc; + int rc; #else int i_dirlen; DIR * dir; @@ -775,7 +836,7 @@ 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; } @@ -785,13 +846,13 @@ static void AllocatePluginDir( vlc_object_t *p_this, const char *psz_dir, MultiByteToWideChar( CP_ACP, 0, psz_dir, -1, psz_wdir, MAX_PATH ); rc = GetFileAttributes( psz_wdir ); - if( !(rc & FILE_ATTRIBUTE_DIRECTORY) ) return; /* Not a directory */ + 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) ) return; /* Not a directory */ + if( rc<0 || !(rc&FILE_ATTRIBUTE_DIRECTORY) ) return; /* Not a directory */ #endif /* Parse all files in the directory */ @@ -820,8 +881,9 @@ static void AllocatePluginDir( vlc_object_t *p_this, const char *psz_dir, sprintf( psz_path, "%s\\%s", psz_dir, finddata.cFileName ); #endif - /* Skip ".", ".." and anything starting with "." */ - if( !*finddata.cFileName || *finddata.cFileName == '.' ) + /* Skip ".", ".." */ + if( !*finddata.cFileName || !strcmp( finddata.cFileName, "." ) + || !strcmp( finddata.cFileName, ".." ) ) { if( !FindNextFile( handle, &finddata ) ) break; continue; @@ -841,12 +903,30 @@ static void AllocatePluginDir( vlc_object_t *p_this, const char *psz_dir, - strlen( LIBEXT ), LIBEXT, strlen( LIBEXT ) ) ) { + 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, 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 ); @@ -861,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; } @@ -969,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) ); @@ -1016,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 */ @@ -1029,6 +1112,7 @@ static module_t * AllocatePlugin( vlc_object_t * p_this, char * psz_file ) } DupModule( p_module ); + p_module->psz_filename = strdup( p_module->psz_filename ); /* Everything worked fine ! The module is ready to be added to the list. */ p_module->b_builtin = VLC_FALSE; @@ -1056,8 +1140,8 @@ 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_filename = strdup( p_module->psz_filename ); - p_module->psz_shortname = strdup( p_module->psz_shortname ); + 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 ) @@ -1093,8 +1177,7 @@ static void UndupModule( module_t *p_module ) free( p_module->psz_object_name ); free( p_module->psz_capability ); - free( p_module->psz_filename ); - free( p_module->psz_shortname ); + if( p_module->psz_shortname ) free( p_module->psz_shortname ); free( p_module->psz_longname ); if( p_module->psz_program != NULL ) @@ -1142,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; } @@ -1165,6 +1248,7 @@ static int DeleteModule( module_t * p_module ) CloseModule( p_module->handle ); } UndupModule( p_module ); + free( p_module->psz_filename ); } #endif @@ -1225,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; } @@ -1303,7 +1387,6 @@ static int LoadModule( vlc_object_t *p_this, char *psz_file, #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 @@ -1320,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 ) @@ -1472,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++; } @@ -1505,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; @@ -1527,45 +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)]; + 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; + 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 - msg_Err( p_this, "FIXME, unlink not implemented" ); + 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, "rb" ); + file = utf8_fopen( psz_filename, "rb" ); if( !file ) { msg_Warn( p_this, "could not open plugins cache file %s for reading", @@ -1596,30 +1661,66 @@ static void CacheLoad( vlc_object_t *p_this ) 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; } - p_this->p_libvlc->p_module_bank->i_loaded_cache = 0; + /* 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_global->p_module_bank->i_loaded_cache = 0; fread( &i_cache, sizeof(char), sizeof(i_cache), file ); - pp_cache = p_this->p_libvlc->p_module_bank->pp_loaded_cache = - malloc( i_cache * sizeof(void *) ); + 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) \ 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 ) { \ + 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) @@ -1630,9 +1731,9 @@ static void CacheLoad( vlc_object_t *p_this ) int i_submodules; pp_cache[i] = malloc( sizeof(module_cache_t) ); - p_this->p_libvlc->p_module_bank->i_loaded_cache++; + 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 ); @@ -1642,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 ); @@ -1696,7 +1797,7 @@ static void CacheLoad( vlc_object_t *p_this ) msg_Warn( p_this, "plugins cache not loaded (corrupted)" ); /* TODO: cleanup */ - p_this->p_libvlc->p_module_bank->i_loaded_cache = 0; + p_this->p_libvlc_global->p_module_bank->i_loaded_cache = 0; fclose( file ); return; @@ -1731,6 +1832,7 @@ int 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 = @@ -1738,6 +1840,10 @@ int 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; @@ -1808,24 +1914,27 @@ int 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 ) { @@ -1833,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, "wb" ); + file = utf8_fopen( psz_filename, "wb" ); if( !file ) { msg_Warn( p_this, "could not open plugins cache file %s for writing", @@ -1853,10 +1978,22 @@ static void CacheSave( vlc_object_t *p_this ) 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 ); - i_cache = p_this->p_libvlc->p_module_bank->i_cache; - pp_cache = p_this->p_libvlc->p_module_bank->pp_cache; + /* 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_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 ); @@ -1958,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 ) @@ -1987,6 +2125,20 @@ void CacheSaveConfig( module_t *p_module, FILE *file ) } } +/***************************************************************************** + * 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. *****************************************************************************/ @@ -1997,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++ ) @@ -2006,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; @@ -2022,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++ ) {