X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fwin32_specific.c;h=eab246b0b728472935944df8688c235e1dae45e5;hb=82921f3c8dae23178b64089b22502bb8f528e7e6;hp=deb7208d52acec803f033bf9d2bf861c7b12f1d7;hpb=d8180bb27170d1c5be7e1804144f707b0f557b14;p=vlc diff --git a/src/misc/win32_specific.c b/src/misc/win32_specific.c index deb7208d52..eab246b0b7 100644 --- a/src/misc/win32_specific.c +++ b/src/misc/win32_specific.c @@ -21,8 +21,10 @@ * 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() */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include #include "../libvlc.h" @@ -36,6 +38,7 @@ #if !defined( UNDER_CE ) # include # include +# include #endif #include @@ -43,7 +46,7 @@ /***************************************************************************** * 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; @@ -73,12 +76,27 @@ void system_Init( libvlc_int_t *p_this, int *pi_argc, char *ppsz_argv[] ) if( (psz_vlc = strrchr( psz_path, '\\' )) ) *psz_vlc = '\0'; - vlc_global( p_this )->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 */ @@ -117,8 +135,14 @@ 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 ) /* Raise default priority of the current process */ @@ -164,7 +188,7 @@ void system_Configure( libvlc_int_t *p_this, int *pi_argc, char *ppsz_argv[] ) /* 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)" ); @@ -199,27 +223,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; @@ -259,8 +287,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 ); @@ -281,30 +309,26 @@ 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 *)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++ ) @@ -317,20 +341,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, VLC_FALSE ); - } 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, VLC_FALSE ); - } + 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, false ); i_opt += i_options; } @@ -349,11 +365,15 @@ 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 && vlc_global( p_this )->psz_vlcpath ) + if( p_this && vlc_global() ) { - free( vlc_global( p_this )->psz_vlcpath ); - vlc_global( p_this )->psz_vlcpath = NULL; + free( vlc_global()->psz_vlcpath ); + vlc_global()->psz_vlcpath = NULL; } +#if !defined( UNDER_CE ) + timeEndPeriod(5); +#endif + WSACleanup(); }