#ifdef WIN32
static void ShowConsole ( vlc_bool_t );
static void PauseConsole ( void );
-extern void __wgetmainargs(int *argc, wchar_t ***wargv, wchar_t ***wenviron,
- int expand_wildcards, int *startupinfo);
#endif
static int ConsoleWidth ( void );
{
int i_opt, i_options;
-#ifdef WIN32
- wchar_t **wargv, **wenvp;
- int si = { 0 };
-
- if( GetVersion() < 0x80000000 )
- {
- /* fetch unicode argv[] for Windows NT and above */
- __wgetmainargs(&i_opt, &wargv, &wenvp, 0, &si);
- }
-#endif
-
/* We assume that the remaining parameters are filenames
* and their input options */
for( i_opt = i_argc - 1; i_opt >= optind; i_opt-- )
#ifdef WIN32
if( GetVersion() < 0x80000000 )
{
- psz_target = FromWide( wargv[ i_opt ] );
- VLC_AddTarget( p_vlc->i_object_id, psz_target,
+ VLC_AddTarget( p_vlc->i_object_id, ppsz_argv[i_opt],
(char const **)( i_options ? &ppsz_argv[i_opt + 1] :
NULL ), i_options,
PLAYLIST_INSERT, 0 );
- free( psz_target );
}
else
#endif
#include <vlc/vlc.h>
#include <vlc/input.h>
#include "vlc_playlist.h"
+#include "charset.h"
#ifdef WIN32 /* optind, getopt(), included in unistd.h */
# include "../extras/getopt.h"
/* 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 ) )
{
COPYDATASTRUCT wm_data;
int i_opt, i_data;
char *p_data;
- wchar_t **wargv, **wenvp;
- int si = { 0 };
i_data = sizeof(int);
- if( GetVersion() < 0x80000000 )
+ for( i_opt = optind; i_opt < *pi_argc; i_opt++ )
{
- /* use unicode argv[] for Windows NT and above */
- __wgetmainargs(&i_opt, &wargv, &wenvp, 0, &si);
- for( i_opt = optind; i_opt < *pi_argc; i_opt++ )
- {
- i_data += sizeof(int);
- i_data += WideCharToMultiByte( CP_UTF8, 0,
- wargv[ i_opt ], -1, NULL, 0, NULL, NULL ) + 1;
- }
- p_data = (char *)malloc( i_data );
- *((int *)&p_data[0]) = *pi_argc - optind;
- i_data = sizeof(int);
- for( i_opt = optind; i_opt < *pi_argc; i_opt++ )
- {
- int i_len = WideCharToMultiByte( CP_UTF8, 0,
- wargv[ i_opt ], -1, NULL, 0, NULL, NULL ) + 1;
- *((int *)&p_data[i_data]) = i_len;
- i_data += sizeof(int);
- WideCharToMultiByte( CP_UTF8, 0, wargv[ i_opt ], -1,
- &p_data[i_data], i_len, NULL, NULL );
- i_data += i_len;
- }
-
+ i_data += sizeof(int);
+ i_data += strlen( ppsz_argv[ i_opt ] ) + 1;
}
- else
+
+ p_data = (char *)malloc( i_data );
+ *((int *)&p_data[0]) = *pi_argc - optind;
+ i_data = sizeof(int);
+ for( i_opt = optind; i_opt < *pi_argc; i_opt++ )
{
- for( i_opt = optind; i_opt < *pi_argc; i_opt++ )
- {
- i_data += sizeof(int);
- 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);
- 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 );
- i_data += i_len;
- }
+ 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 );
+ i_data += i_len;
}
/* Send our playlist items to the 1st instance */