/*****************************************************************************
* specific.c: Win32 specific initilization
*****************************************************************************
- * Copyright (C) 2001-2004 the VideoLAN team
+ * Copyright (C) 2001-2004, 2010 VLC authors and VideoLAN
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Gildas Bazin <gbazin@videolan.org>
*
- * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifdef HAVE_CONFIG_H
#include <vlc_common.h>
#include "../libvlc.h"
#include <vlc_playlist.h>
-#include <vlc_charset.h>
+#include <vlc_url.h>
-#include "../extras/getopt.h"
-
-#if !defined( UNDER_CE )
-# include <io.h>
-# include <fcntl.h>
-# include <mmsystem.h>
-#endif
+#include "../config/vlc_getopt.h"
+#include <mmsystem.h>
#include <winsock.h>
-/*****************************************************************************
- * system_Init: initialize winsock and misc other things.
- *****************************************************************************/
-void system_Init( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv[] )
-{
- VLC_UNUSED( p_this ); VLC_UNUSED( pi_argc ); VLC_UNUSED( ppsz_argv );
- WSADATA Data;
- MEMORY_BASIC_INFORMATION mbi;
-
- /* Get our full path */
- char psz_path[MAX_PATH];
- char *psz_vlc;
-
- wchar_t psz_wpath[MAX_PATH];
- if( VirtualQuery(system_Init, &mbi, sizeof(mbi) ) )
- {
- HMODULE hMod = (HMODULE) mbi.AllocationBase;
- if( GetModuleFileName( hMod, psz_wpath, MAX_PATH ) )
- {
- WideCharToMultiByte( CP_UTF8, 0, psz_wpath, -1,
- psz_path, MAX_PATH, NULL, NULL );
- }
- else psz_path[0] = '\0';
- }
- if( (psz_vlc = strrchr( psz_path, '\\' )) ) *psz_vlc = '\0';
+static int system_InitWSA(int hi, int lo)
+{
+ WSADATA data;
-#ifndef HAVE_RELEASE
+ if (WSAStartup(MAKEWORD(hi, lo), &data) == 0)
{
- /* remove trailing \.libs from executable dir path if seen,
- we assume we are running vlc through libtool wrapper in build dir */
- int offset = strlen(psz_path)-sizeof("\\.libs")+1;
- if( offset > 0 )
- {
- psz_vlc = psz_path+offset;
- if( ! strcmp(psz_vlc, "\\.libs") ) *psz_vlc = '\0';
- }
+ if (LOBYTE(data.wVersion) == 2 && HIBYTE(data.wVersion) == 2)
+ return 0;
+ /* Winsock DLL is not usable */
+ WSACleanup( );
}
-#endif
-
- psz_vlcpath = strdup( psz_path );
-
- /* Set the default file-translation mode */
-#if !defined( UNDER_CE )
- _fmode = _O_BINARY;
- _setmode( _fileno( stdin ), _O_BINARY ); /* Needed for pipes */
+ return -1;
+}
+/**
+ * Initializes MME timer, Winsock.
+ */
+void system_Init(void)
+{
+#if !VLC_WINSTORE_APP
timeBeginPeriod(5);
#endif
- /* Call mdate() once to make sure it is initialized properly */
- mdate();
-
- /* WinSock Library Init. */
- if( !WSAStartup( MAKEWORD( 2, 2 ), &Data ) )
- {
- /* Aah, pretty useless check, we should always have Winsock 2.2
- * since it appeared in Win98. */
- if( LOBYTE( Data.wVersion ) != 2 || HIBYTE( Data.wVersion ) != 2 )
- /* We could not find a suitable WinSock DLL. */
- WSACleanup( );
- else
- /* Everything went ok. */
- return;
- }
-
- /* Let's try with WinSock 1.1 */
- if( !WSAStartup( MAKEWORD( 1, 1 ), &Data ) )
- {
- /* Confirm that the WinSock DLL supports 1.1.*/
- if( LOBYTE( Data.wVersion ) != 1 || HIBYTE( Data.wVersion ) != 1 )
- /* We could not find a suitable WinSock DLL. */
- WSACleanup( );
- else
- /* Everything went ok. */
- return;
- }
-
- fprintf( stderr, "error: can't initialize WinSocks\n" );
+ if (system_InitWSA(2, 2) && system_InitWSA(1, 1))
+ fputs("Error: cannot initialize Winsocks\n", stderr);
}
/*****************************************************************************
typedef struct
{
- int argc;
- int enqueue;
- char data[];
+ int argc;
+ int enqueue;
+ char data[];
} vlc_ipc_data_t;
-void system_Configure( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv[] )
+void system_Configure( libvlc_int_t *p_this, int i_argc, const char *const ppsz_argv[] )
{
-#if !defined( UNDER_CE )
+#if !VLC_WINSTORE_APP
/* Raise default priority of the current process */
#ifndef ABOVE_NORMAL_PRIORITY_CLASS
# define ABOVE_NORMAL_PRIORITY_CLASS 0x00008000
if( GetLastError() != ERROR_ALREADY_EXISTS )
{
/* We are the 1st instance. */
- static const char typename[] = "ipc helper";
p_helper =
- vlc_custom_create( p_this, sizeof(vlc_object_t),
- VLC_OBJECT_GENERIC, typename );
+ vlc_custom_create( p_this, sizeof(*p_helper), "ipc helper" );
/* Run the helper thread */
hIPCHelperReady = CreateEvent( NULL, FALSE, FALSE, NULL );
vlc_object_release (p_helper);
p_helper = NULL;
}
- vlc_object_attach (p_helper, p_this);
CloseHandle( hIPCHelperReady );
/* Initialization done.
/* We assume that the remaining parameters are filenames
* and their input options */
- if( *pi_argc - 1 >= optind )
+ if( i_argc > 0 )
{
COPYDATASTRUCT wm_data;
int i_opt;
vlc_ipc_data_t *p_data;
size_t i_data = sizeof (*p_data);
- for( i_opt = optind; i_opt < *pi_argc; i_opt++ )
+ for( i_opt = 0; i_opt < i_argc; i_opt++ )
{
i_data += sizeof (size_t);
i_data += strlen( ppsz_argv[ i_opt ] ) + 1;
}
p_data = malloc( i_data );
- p_data->argc = *pi_argc - optind;
+ p_data->argc = i_argc;
p_data->enqueue = var_InheritBool( p_this, "playlist-enqueue" );
i_data = 0;
- for( i_opt = optind; i_opt < *pi_argc; i_opt++ )
+ for( i_opt = 0; i_opt < i_argc; i_opt++ )
{
size_t i_len = strlen( ppsz_argv[ i_opt ] ) + 1;
/* Windows will never switch to an architecture
ReleaseMutex( hmutex );
/* Bye bye */
- system_End( p_this );
+ system_End( );
exit( 0 );
}
}
-
#endif
}
+#if !VLC_WINSTORE_APP
static unsigned __stdcall IPCHelperThread( void *data )
{
vlc_object_t *p_this = data;
if( !p_this ) return 0;
/* Add files to the playlist */
- p_playlist = pl_Hold( p_this );
- if( !p_playlist ) return 0;
+ p_playlist = pl_Get( p_this );
if( pwm_data->lpData )
{
ppsz_argv = (char **)malloc( i_argc * sizeof(char *) );
for( i_opt = 0; i_opt < i_argc; i_opt++ )
{
- ppsz_argv[i_opt] = p_data->data + i_data + sizeof(int);
- i_data += sizeof(int) + *((int *)(p_data->data + i_data));
+ ppsz_argv[i_opt] = p_data->data + i_data + sizeof(size_t);
+ i_data += sizeof(size_t) + *((size_t *)(p_data->data + i_data));
}
for( i_opt = 0; i_opt < i_argc; i_opt++ )
/* Count the input options */
while( i_opt + i_options + 1 < i_argc &&
- *ppsz_argv[ i_opt + i_options + 1 ] == ':' )
+ *ppsz_argv[ i_opt + i_options + 1 ] == ':' )
{
i_options++;
}
- playlist_AddExt( p_playlist, ppsz_argv[i_opt],
- NULL, PLAYLIST_APPEND |
+
+#warning URI conversion must be done in calling process instead!
+ /* FIXME: This breaks relative paths if calling vlc.exe is
+ * started from a different working directory. */
+ char *psz_URI = NULL;
+ if( strstr( ppsz_argv[i_opt], "://" ) == NULL )
+ psz_URI = vlc_path2uri( ppsz_argv[i_opt], NULL );
+ playlist_AddExt( p_playlist,
+ (psz_URI != NULL) ? psz_URI : ppsz_argv[i_opt],
+ NULL, PLAYLIST_APPEND |
( ( i_opt || p_data->enqueue ) ? 0 : PLAYLIST_GO ),
- PLAYLIST_END, -1,
- i_options,
- (char const **)( i_options ? &ppsz_argv[i_opt+1] : NULL ),
- VLC_INPUT_OPTION_TRUSTED,
- true, pl_Unlocked );
+ PLAYLIST_END, -1,
+ i_options,
+ (char const **)( i_options ? &ppsz_argv[i_opt+1] : NULL ),
+ VLC_INPUT_OPTION_TRUSTED,
+ true, pl_Unlocked );
i_opt += i_options;
+ free( psz_URI );
}
free( ppsz_argv );
}
-
- vlc_object_release( p_playlist );
}
return DefWindowProc( hwnd, uMsg, wParam, lParam );
}
+#endif
-/*****************************************************************************
- * system_End: terminate winsock.
- *****************************************************************************/
-void system_End( libvlc_int_t *p_this )
+/**
+ * Cleans up after system_Init() and system_Configure().
+ */
+void system_End(void)
{
+#if !VLC_WINSTORE_APP
HWND ipcwindow;
- if( p_this )
- {
- free( psz_vlcpath );
- psz_vlcpath = NULL;
- }
- if (p_helper && p_helper->p_parent == VLC_OBJECT(p_this) )
+ /* FIXME: thread-safety... */
+ if (p_helper)
{
- /* this is the first instance (in a one-instance system)
- * it is the owner of the helper thread
- */
if( ( ipcwindow = FindWindow( 0, L"VLC ipc "VERSION ) ) != 0 )
{
SendMessage( ipcwindow, WM_QUIT, 0, 0 );
}
-
- /* FIXME: thread-safety... */
- vlc_object_detach (p_helper);
vlc_object_release (p_helper);
p_helper = NULL;
}
-#if !defined( UNDER_CE )
timeEndPeriod(5);
#endif
+ /* XXX: In theory, we should not call this if WSAStartup() failed. */
WSACleanup();
}
projects / vlc / blobdiff