X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcontrol%2Fntservice.c;h=4d52d14a84521928d7f30d6162925fc460c3f2c1;hb=6411526fe052a033300e73045b07c0aaee089e88;hp=656a7c1d64c3a2dbac668265efe73b656a24a909;hpb=26d3a269af4114bf78df4d5f11706f8c03c4b75a;p=vlc diff --git a/modules/control/ntservice.c b/modules/control/ntservice.c old mode 100755 new mode 100644 index 656a7c1d64..4d52d14a84 --- a/modules/control/ntservice.c +++ b/modules/control/ntservice.c @@ -1,7 +1,7 @@ /***************************************************************************** * ntservice.c: Windows NT/2K/XP service interface ***************************************************************************** - * Copyright (C) 2004 VideoLAN + * Copyright (C) 2004 the VideoLAN team * $Id$ * * Authors: Gildas Bazin @@ -18,15 +18,18 @@ * * 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. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include -#include +#include #define VLCSERVICENAME "VLC media player" @@ -38,27 +41,30 @@ static void Close ( vlc_object_t * ); #define INSTALL_TEXT N_( "Install Windows Service" ) #define INSTALL_LONGTEXT N_( \ - "If enabled the interface will install the Service and exit." ) + "Install the Service and exit." ) #define UNINSTALL_TEXT N_( "Uninstall Windows Service" ) #define UNINSTALL_LONGTEXT N_( \ - "If enabled the interface will uninstall the Service and exit." ) + "Uninstall the Service and exit." ) #define NAME_TEXT N_( "Display name of the Service" ) #define NAME_LONGTEXT N_( \ - "This allows you to change the display name of the Service." ) + "Change the display name of the Service." ) #define OPTIONS_TEXT N_("Configuration options") #define OPTIONS_LONGTEXT N_( \ - "This option allows you to specify configuration options that will be " \ + "Configuration options that will be " \ "used by the Service (eg. --foo=bar --no-foobar). It should be specified "\ "at install time so the Service is properly configured.") #define EXTRAINTF_TEXT N_("Extra interface modules") #define EXTRAINTF_LONGTEXT N_( \ - "This option allows you to select additional interfaces spawned by the " \ + "Additional interfaces spawned by the " \ "Service. It should be specified at install time so the Service is " \ "properly configured. Use a comma separated list of interface modules. " \ "(common values are: logger, sap, rc, http)") vlc_module_begin(); + set_shortname( _("NT Service")); set_description( _("Windows Service interface") ); + set_category( CAT_INTERFACE ); + set_subcategory( SUBCAT_INTERFACE_CONTROL ); add_bool( "ntservice-install", 0, NULL, INSTALL_TEXT, INSTALL_LONGTEXT, VLC_TRUE ); add_bool( "ntservice-uninstall", 0, NULL, @@ -119,6 +125,7 @@ void Close( vlc_object_t *p_this ) *****************************************************************************/ static void Run( intf_thread_t *p_intf ) { + intf_thread_t *p_extraintf; SERVICE_TABLE_ENTRY dispatchTable[] = { { VLCSERVICENAME, &ServiceDispatch }, @@ -145,13 +152,22 @@ static void Run( intf_thread_t *p_intf ) if( StartServiceCtrlDispatcher( dispatchTable ) == 0 ) { - msg_Err( p_intf, "StartServiceCtrlDispatcher failed" ); + msg_Err( p_intf, "StartServiceCtrlDispatcher failed" ); /* str review */ } free( p_intf->p_sys->psz_service ); + /* Stop and destroy the interfaces we spawned */ + while( (p_extraintf = vlc_object_find(p_intf, VLC_OBJECT_INTF, FIND_CHILD))) + { + intf_StopThread( p_extraintf ); + vlc_object_detach( p_extraintf ); + vlc_object_release( p_extraintf ); + intf_Destroy( p_extraintf ); + } + /* Make sure we exit (In case other interfaces have been spawned) */ - p_intf->p_vlc->b_die = VLC_TRUE; + vlc_object_kill( p_intf->p_libvlc ); } /***************************************************************************** @@ -164,7 +180,8 @@ static int NTServiceInstall( intf_thread_t *p_intf ) SC_HANDLE handle = OpenSCManager( NULL, NULL, SC_MANAGER_ALL_ACCESS ); if( handle == NULL ) { - msg_Err( p_intf, "could not connect to SCM database" ); + msg_Err( p_intf, + "could not connect to Services Control Manager database" ); return VLC_EGENERIC; } @@ -179,7 +196,7 @@ static int NTServiceInstall( intf_thread_t *p_intf ) strcat( psz_path, " --ntservice-extraintf " ); strcat( psz_path, psz_extra ); } - if( psz_extra ) free( psz_extra ); + free( psz_extra ); psz_extra = config_GetPsz( p_intf, "ntservice-options" ); if( psz_extra && *psz_extra ) @@ -187,7 +204,7 @@ static int NTServiceInstall( intf_thread_t *p_intf ) strcat( psz_path, " " ); strcat( psz_path, psz_extra ); } - if( psz_extra ) free( psz_extra ); + free( psz_extra ); SC_HANDLE service = CreateService( handle, p_sys->psz_service, p_sys->psz_service, @@ -228,7 +245,8 @@ static int NTServiceUninstall( intf_thread_t *p_intf ) SC_HANDLE handle = OpenSCManager( NULL, NULL, SC_MANAGER_ALL_ACCESS ); if( handle == NULL ) { - msg_Err( p_intf, "could not connect to SCM database" ); + msg_Err( p_intf, + "could not connect to Services Control Manager database" ); return VLC_EGENERIC; } @@ -300,7 +318,7 @@ static void WINAPI ServiceDispatch( DWORD numArgs, char **args ) sprintf( psz_temp, "%s,none", psz_module ); /* Try to create the interface */ - p_new_intf = intf_Create( p_intf, psz_temp ); + p_new_intf = intf_Create( p_intf, psz_temp, 0, NULL ); if( p_new_intf == NULL ) { msg_Err( p_intf, "interface \"%s\" initialization failed", @@ -310,7 +328,6 @@ static void WINAPI ServiceDispatch( DWORD numArgs, char **args ) } /* Try to run the interface */ - p_new_intf->b_block = VLC_FALSE; if( intf_RunThread( p_new_intf ) ) { vlc_object_detach( p_new_intf ); @@ -321,10 +338,7 @@ static void WINAPI ServiceDispatch( DWORD numArgs, char **args ) free( psz_temp ); } } - if( psz_modules ) - { - free( psz_modules ); - } + free( psz_modules ); /* Initialization complete - report running status */ p_sys->status.dwCurrentState = SERVICE_RUNNING;