X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fwin32_specific.c;h=17af95b2cdb9c91bc29a197f7617c5e855158d23;hb=a46fb0e4e14d971e7482b010bb42c6bc93df66f7;hp=3317492502082e3e959ed161a084f3995f8b792f;hpb=d3fe7f28797d4dba65ffcdd60bf932e758a48a9e;p=vlc diff --git a/src/misc/win32_specific.c b/src/misc/win32_specific.c index 3317492502..17af95b2cd 100644 --- a/src/misc/win32_specific.c +++ b/src/misc/win32_specific.c @@ -21,31 +21,31 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include /* strdup() */ -#include /* free() */ -#include -#include "vlc_playlist.h" -#include "charset.h" - -#ifdef WIN32 /* optind, getopt(), included in unistd.h */ -# include "../extras/getopt.h" +#ifdef HAVE_CONFIG_H +# include "config.h" #endif +#define UNICODE +#include +#include "../libvlc.h" +#include +#include + +#include "../extras/getopt.h" + #if !defined( UNDER_CE ) # include # include +# include #endif #include -extern void __wgetmainargs(int *argc, wchar_t ***wargv, wchar_t ***wenviron, - int expand_wildcards, int *startupinfo); - /***************************************************************************** * system_Init: initialize winsock and misc other things. *****************************************************************************/ -void system_Init( libvlc_int_t *p_this, int *pi_argc, char *ppsz_argv[] ) +void system_Init( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv[] ) { WSADATA Data; @@ -53,7 +53,6 @@ void system_Init( libvlc_int_t *p_this, int *pi_argc, char *ppsz_argv[] ) char psz_path[MAX_PATH]; char *psz_vlc; -#if defined( UNDER_CE ) wchar_t psz_wpath[MAX_PATH]; if( GetModuleFileName( NULL, psz_wpath, MAX_PATH ) ) { @@ -62,42 +61,34 @@ void system_Init( libvlc_int_t *p_this, int *pi_argc, char *ppsz_argv[] ) } else psz_path[0] = '\0'; -#else - if( ppsz_argv[0] ) - { - GetFullPathName( ppsz_argv[0], MAX_PATH, psz_path, &psz_vlc ); - } - else if( !GetModuleFileName( NULL, psz_path, MAX_PATH ) ) + if( (psz_vlc = strrchr( psz_path, '\\' )) ) *psz_vlc = '\0'; + +#ifndef HAVE_RELEASE { - psz_path[0] = '\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'; + } } #endif - if( (psz_vlc = strrchr( psz_path, '\\' )) ) *psz_vlc = '\0'; - - p_this->p_libvlc_global->psz_vlcpath = strdup( psz_path ); + vlc_global()->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 */ + + timeBeginPeriod(5); #endif /* Call mdate() once to make sure it is initialized properly */ mdate(); - /* Replace argv[1..n] with unicode for Windows NT and above */ - if( GetVersion() < 0x80000000 ) - { - wchar_t **wargv, **wenvp; - int i,i_wargc; - int si = { 0 }; - __wgetmainargs(&i_wargc, &wargv, &wenvp, 0, &si); - - for( i = 1; i < i_wargc; i++ ) - ppsz_argv[i] = FromWide( wargv[i] ); - } - /* WinSock Library Init. */ if( !WSAStartup( MAKEWORD( 2, 2 ), &Data ) ) { @@ -131,13 +122,16 @@ void system_Init( libvlc_int_t *p_this, int *pi_argc, char *ppsz_argv[] ) *****************************************************************************/ static void IPCHelperThread( vlc_object_t * ); LRESULT CALLBACK WMCOPYWNDPROC( HWND, UINT, WPARAM, LPARAM ); +typedef struct +{ + int argc; + int enqueue; + char data[0]; +} vlc_ipc_data_t; -void system_Configure( libvlc_int_t *p_this, int *pi_argc, char *ppsz_argv[] ) +void system_Configure( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv[] ) { #if !defined( UNDER_CE ) - p_this->p_libvlc_global->b_fast_mutex = config_GetInt( p_this, "fast-mutex" ); - p_this->p_libvlc_global->i_win9x_cv = config_GetInt( p_this, "win9x-cv-method" ); - /* Raise default priority of the current process */ #ifndef ABOVE_NORMAL_PRIORITY_CLASS # define ABOVE_NORMAL_PRIORITY_CLASS 0x00008000 @@ -155,6 +149,8 @@ void system_Configure( libvlc_int_t *p_this, int *pi_argc, char *ppsz_argv[] ) } } + libvlc_priv (p_this)->ipc_helper = NULL; + if( config_GetInt( p_this, "one-instance" ) || ( config_GetInt( p_this, "one-instance-when-started-from-file" ) && config_GetInt( p_this, "started-from-file" ) ) ) @@ -164,7 +160,7 @@ void system_Configure( libvlc_int_t *p_this, int *pi_argc, char *ppsz_argv[] ) msg_Info( p_this, "one instance mode ENABLED"); /* Use a named mutex to check if another instance is already running */ - if( !( hmutex = CreateMutex( 0, TRUE, _T("VLC ipc ") _T(VERSION) ) ) ) + if( !( hmutex = CreateMutex( 0, TRUE, L"VLC ipc "VERSION ) ) ) { /* Failed for some reason. Just ignore the option and go on as * normal. */ @@ -176,17 +172,21 @@ void system_Configure( libvlc_int_t *p_this, int *pi_argc, char *ppsz_argv[] ) if( GetLastError() != ERROR_ALREADY_EXISTS ) { /* We are the 1st instance. */ + static const char typename[] = "ipc helper"; vlc_object_t *p_helper = - (vlc_object_t *)vlc_object_create( p_this, sizeof(vlc_object_t) ); + vlc_custom_create( p_this, sizeof(vlc_object_t), + VLC_OBJECT_GENERIC, typename ); /* Run the helper thread */ if( vlc_thread_create( p_helper, "IPC helper", IPCHelperThread, - VLC_THREAD_PRIORITY_LOW, VLC_TRUE ) ) + VLC_THREAD_PRIORITY_LOW, true ) ) { msg_Err( p_this, "one instance mode DISABLED " "(IPC helper thread couldn't be created)" ); - + vlc_object_release (p_helper); } + else + libvlc_priv (p_this)->ipc_helper = p_helper; /* Initialization done. * Release the mutex to unblock other instances */ @@ -203,7 +203,7 @@ void system_Configure( libvlc_int_t *p_this, int *pi_argc, char *ppsz_argv[] ) /* Locate the window created by the IPC helper thread of the * 1st instance */ - if( !( ipcwindow = FindWindow( 0, _T("VLC ipc ") _T(VERSION) ) ) ) + if( !( ipcwindow = FindWindow( 0, L"VLC ipc "VERSION ) ) ) { msg_Err( p_this, "one instance mode DISABLED " "(couldn't find 1st instance of program)" ); @@ -216,27 +216,31 @@ void system_Configure( libvlc_int_t *p_this, int *pi_argc, char *ppsz_argv[] ) if( *pi_argc - 1 >= optind ) { COPYDATASTRUCT wm_data; - int i_opt, i_data; - char *p_data; + int i_opt; + vlc_ipc_data_t *p_data; + size_t i_data = sizeof (*p_data); - i_data = sizeof(int); for( i_opt = optind; i_opt < *pi_argc; i_opt++ ) { - i_data += sizeof(int); + i_data += sizeof (size_t); i_data += strlen( ppsz_argv[ i_opt ] ) + 1; } - p_data = (char *)malloc( i_data ); - *((int *)&p_data[0]) = *pi_argc - optind; - i_data = sizeof(int); + p_data = malloc( i_data ); + p_data->argc = *pi_argc - optind; + p_data->enqueue = config_GetInt( p_this, "playlist-enqueue" ); + i_data = 0; for( i_opt = optind; i_opt < *pi_argc; i_opt++ ) { - int i_len = strlen( ppsz_argv[ i_opt ] ) + 1; - *((int *)&p_data[i_data]) = i_len; - i_data += sizeof(int); - memcpy( &p_data[i_data], ppsz_argv[ i_opt ], i_len ); + size_t i_len = strlen( ppsz_argv[ i_opt ] ) + 1; + /* Windows will never switch to an architecture + * with stronger alignment requirements, right. */ + *((size_t *)(p_data->data + i_data)) = i_len; + i_data += sizeof (size_t); + memcpy( &p_data->data[i_data], ppsz_argv[ i_opt ], i_len ); i_data += i_len; } + i_data += sizeof (*p_data); /* Send our playlist items to the 1st instance */ wm_data.dwData = 0; @@ -264,8 +268,8 @@ static void IPCHelperThread( vlc_object_t *p_this ) MSG message; ipcwindow = - CreateWindow( _T("STATIC"), /* name of window class */ - _T("VLC ipc ") _T(VERSION), /* window title bar text */ + CreateWindow( L"STATIC", /* name of window class */ + L"VLC ipc "VERSION, /* window title bar text */ 0, /* window style */ 0, /* default X coordinate */ 0, /* default Y coordinate */ @@ -276,8 +280,8 @@ static void IPCHelperThread( vlc_object_t *p_this ) GetModuleHandle(NULL), /* handle of this program instance */ NULL ); /* sent to WM_CREATE */ - SetWindowLong( ipcwindow, GWL_WNDPROC, (LONG)WMCOPYWNDPROC ); - SetWindowLong( ipcwindow, GWL_USERDATA, (LONG)p_this ); + SetWindowLongPtr( ipcwindow, GWLP_WNDPROC, (LRESULT)WMCOPYWNDPROC ); + SetWindowLongPtr( ipcwindow, GWLP_USERDATA, (LONG_PTR)p_this ); /* Signal the creation of the thread and events queue */ vlc_thread_ready( p_this ); @@ -298,30 +302,27 @@ LRESULT CALLBACK WMCOPYWNDPROC( HWND hwnd, UINT uMsg, WPARAM wParam, vlc_object_t *p_this; playlist_t *p_playlist; - p_this = (vlc_object_t *)GetWindowLong( hwnd, GWL_USERDATA ); + p_this = (vlc_object_t *) + (uintptr_t)GetWindowLongPtr( hwnd, GWLP_USERDATA ); if( !p_this ) return 0; /* Add files to the playlist */ - p_playlist = (playlist_t *)vlc_object_find( p_this, - VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); + p_playlist = pl_Yield( p_this ); if( !p_playlist ) return 0; if( pwm_data->lpData ) { - int i_argc, i_data, i_opt, i_options; char **ppsz_argv; - char *p_data = (char *)pwm_data->lpData; + vlc_ipc_data_t *p_data = (vlc_ipc_data_t *)pwm_data->lpData; + size_t i_data = 0; + int i_argc = p_data->argc, i_opt, i_options; - i_argc = *((int *)&p_data[0]); ppsz_argv = (char **)malloc( i_argc * sizeof(char *) ); - i_data = sizeof(int); for( i_opt = 0; i_opt < i_argc; i_opt++ ) { - ppsz_argv[i_opt] = &p_data[i_data + sizeof(int)]; - i_data += *((int *)&p_data[i_data]); - i_data += sizeof(int); + ppsz_argv[i_opt] = p_data->data + i_data + sizeof(int); + i_data += sizeof(int) + *((int *)(p_data->data + i_data)); } for( i_opt = 0; i_opt < i_argc; i_opt++ ) @@ -334,20 +335,12 @@ LRESULT CALLBACK WMCOPYWNDPROC( HWND hwnd, UINT uMsg, WPARAM wParam, { i_options++; } - if( i_opt || config_GetInt( p_this, "playlist-enqueue" ) ) - { - playlist_AddExt( p_playlist, ppsz_argv[i_opt], - NULL, PLAYLIST_APPEND , - PLAYLIST_END, -1, - (char const **)( i_options ? &ppsz_argv[i_opt+1] : NULL ), - i_options, VLC_TRUE ); - } else { - playlist_AddExt( p_playlist, ppsz_argv[i_opt], - NULL, PLAYLIST_APPEND | PLAYLIST_GO, - PLAYLIST_END, -1, - (char const **)( i_options ? &ppsz_argv[i_opt+1] : NULL ), - i_options, VLC_TRUE ); - } + playlist_AddExt( p_playlist, ppsz_argv[i_opt], + NULL, PLAYLIST_APPEND | + ( ( i_opt || p_data->enqueue ) ? 0 : PLAYLIST_GO ), + PLAYLIST_END, -1, + (char const **)( i_options ? &ppsz_argv[i_opt+1] : NULL ), + i_options, true, pl_Unlocked ); i_opt += i_options; } @@ -366,11 +359,21 @@ LRESULT CALLBACK WMCOPYWNDPROC( HWND hwnd, UINT uMsg, WPARAM wParam, *****************************************************************************/ void system_End( libvlc_int_t *p_this ) { - if( p_this && p_this->p_libvlc_global && p_this->p_libvlc_global->psz_vlcpath ) + if( p_this && vlc_global() ) + { + free( vlc_global()->psz_vlcpath ); + vlc_global()->psz_vlcpath = NULL; + } + vlc_object_t *obj = libvlc_priv (p_this)->ipc_helper; + if (obj) { - free( p_this->p_libvlc_global->psz_vlcpath ); - p_this->p_libvlc_global->psz_vlcpath = NULL; + vlc_thread_join (obj); + vlc_object_release (obj); } +#if !defined( UNDER_CE ) + timeEndPeriod(5); +#endif + WSACleanup(); }