X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fwin32_specific.c;h=2fc5d2dcaba92235e63a0b8e6baa5fc1335bbdf4;hb=df291664cd0e365fa4393f6ab065efbeb120332f;hp=a54efca6cf000ae357549145aca17ef5aa271edf;hpb=fe087a38282e93addb25fa9598393e40ea233b09;p=vlc diff --git a/src/misc/win32_specific.c b/src/misc/win32_specific.c index a54efca6cf..2fc5d2dcab 100644 --- a/src/misc/win32_specific.c +++ b/src/misc/win32_specific.c @@ -19,14 +19,17 @@ * * 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 /* strdup() */ -#include /* free() */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include -#include -#include "vlc_playlist.h" +#include "../libvlc.h" +#include +#include #ifdef WIN32 /* optind, getopt(), included in unistd.h */ # include "../extras/getopt.h" @@ -35,6 +38,7 @@ #if !defined( UNDER_CE ) # include # include +# include #endif #include @@ -42,7 +46,7 @@ /***************************************************************************** * system_Init: initialize winsock and misc other things. *****************************************************************************/ -void system_Init( vlc_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; @@ -72,31 +76,43 @@ void system_Init( vlc_t *p_this, int *pi_argc, char *ppsz_argv[] ) if( (psz_vlc = strrchr( psz_path, '\\' )) ) *psz_vlc = '\0'; - p_this->p_libvlc->psz_vlcpath = strdup( psz_path ); +#ifndef HAVE_RELEASE + { + /* 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 + + 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(); /* WinSock Library Init. */ - if( !WSAStartup( MAKEWORD( 2, 0 ), &Data ) ) + if( !WSAStartup( MAKEWORD( 2, 2 ), &Data ) ) { - /* Confirm that the WinSock DLL supports 2.0.*/ - if( LOBYTE( Data.wVersion ) != 2 || HIBYTE( Data.wVersion ) != 0 ) - { + /* 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 */ @@ -104,20 +120,14 @@ void system_Init( vlc_t *p_this, int *pi_argc, char *ppsz_argv[] ) { /* 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" ); - - return; } /***************************************************************************** @@ -125,13 +135,16 @@ void system_Init( vlc_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( vlc_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->b_fast_mutex = config_GetInt( p_this, "fast-mutex" ); - p_this->p_libvlc->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 @@ -149,7 +162,9 @@ void system_Configure( vlc_t *p_this, int *pi_argc, char *ppsz_argv[] ) } } - if( config_GetInt( p_this, "one-instance" ) ) + if( config_GetInt( p_this, "one-instance" ) + || ( config_GetInt( p_this, "one-instance-when-started-from-file" ) + && config_GetInt( p_this, "started-from-file" ) ) ) { HANDLE hmutex; @@ -208,27 +223,31 @@ void system_Configure( vlc_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; @@ -302,18 +321,16 @@ LRESULT CALLBACK WMCOPYWNDPROC( HWND hwnd, UINT uMsg, WPARAM wParam, 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++ ) @@ -326,20 +343,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], - ppsz_argv[i_opt], PLAYLIST_APPEND , - PLAYLIST_END, -1, - (char const **)( i_options ? &ppsz_argv[i_opt+1] : NULL ), - i_options ); - } else { - playlist_AddExt( p_playlist, ppsz_argv[i_opt], - ppsz_argv[i_opt], PLAYLIST_APPEND | PLAYLIST_GO, - PLAYLIST_END, -1, - (char const **)( i_options ? &ppsz_argv[i_opt+1] : NULL ), - i_options ); - } + 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, VLC_TRUE, VLC_FALSE ); i_opt += i_options; } @@ -356,7 +365,17 @@ LRESULT CALLBACK WMCOPYWNDPROC( HWND hwnd, UINT uMsg, WPARAM wParam, /***************************************************************************** * system_End: terminate winsock. *****************************************************************************/ -void system_End( vlc_t *p_this ) +void system_End( libvlc_int_t *p_this ) { + if( p_this && vlc_global() ) + { + free( vlc_global()->psz_vlcpath ); + vlc_global()->psz_vlcpath = NULL; + } + +#if !defined( UNDER_CE ) + timeEndPeriod(5); +#endif + WSACleanup(); }