X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fwin32_specific.c;h=17af95b2cdb9c91bc29a197f7617c5e855158d23;hb=a46fb0e4e14d971e7482b010bb42c6bc93df66f7;hp=6be6beac38f6ef3448876cc630b4d07a197b719f;hpb=99fab9089e9e1709d9c3a4bc5ced0c137ac59134;p=vlc diff --git a/src/misc/win32_specific.c b/src/misc/win32_specific.c index 6be6beac38..17af95b2cd 100644 --- a/src/misc/win32_specific.c +++ b/src/misc/win32_specific.c @@ -26,18 +26,18 @@ # include "config.h" #endif -#include +#define UNICODE +#include #include "../libvlc.h" #include #include -#ifdef WIN32 /* optind, getopt(), included in unistd.h */ -# include "../extras/getopt.h" -#endif +#include "../extras/getopt.h" #if !defined( UNDER_CE ) # include # include +# include #endif #include @@ -45,7 +45,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; @@ -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,17 +61,6 @@ 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 ) ) - { - psz_path[0] = '\0'; - } -#endif - if( (psz_vlc = strrchr( psz_path, '\\' )) ) *psz_vlc = '\0'; #ifndef HAVE_RELEASE @@ -94,6 +82,8 @@ void system_Init( libvlc_int_t *p_this, int *pi_argc, char *ppsz_argv[] ) #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 */ @@ -139,7 +129,7 @@ typedef struct 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 */ @@ -159,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" ) ) ) @@ -168,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. */ @@ -180,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 */ @@ -207,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)" ); @@ -272,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 */ @@ -284,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 ); @@ -306,14 +302,13 @@ 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 ) @@ -345,7 +340,7 @@ LRESULT CALLBACK WMCOPYWNDPROC( HWND hwnd, UINT uMsg, WPARAM wParam, ( ( 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_options, true, pl_Unlocked ); i_opt += i_options; } @@ -369,15 +364,16 @@ void system_End( libvlc_int_t *p_this ) free( vlc_global()->psz_vlcpath ); vlc_global()->psz_vlcpath = NULL; } + vlc_object_t *obj = libvlc_priv (p_this)->ipc_helper; + if (obj) + { + vlc_thread_join (obj); + vlc_object_release (obj); + } - WSACleanup(); -} +#if !defined( UNDER_CE ) + timeEndPeriod(5); +#endif -/***************************************************************************** - * system_VLCPath - * **************************************************************************/ -const char* system_VLCPath( void ) -{ - libvlc_global_data_t* libvlc_global = vlc_global(); - return libvlc_global->psz_vlcpath; + WSACleanup(); }