Removes trailing spaces. Removes tabs.

[vlc] / src / misc / win32_specific.c

diff --git a/src/misc/win32_specific.c b/src/misc/win32_specific.c
index 1b2860e211c259654d3a00845ff85ca3fc9a8117..ff3c5e47dd8b26f9b20e87b8baaf2b19ca75136d 100644 (file)
--- a/src/misc/win32_specific.c
+++ b/src/misc/win32_specific.c
@@ -21,12 +21,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
-#include <string.h>                                              /* strdup() */
-#include <stdlib.h>                                                /* free() */
 
 #include <vlc/vlc.h>
-#include <vlc/input.h>
-#include "vlc_playlist.h"
+#include "../libvlc.h"
+#include <vlc_playlist.h>
+#include <vlc_charset.h>
 
 #ifdef WIN32                       /* optind, getopt(), included in unistd.h */
 #   include "../extras/getopt.h"
@@ -39,9 +38,6 @@
 
 #include <winsock.h>
 
-extern void __wgetmainargs(int *argc, wchar_t ***wargv, wchar_t ***wenviron,
-                           int expand_wildcards, int *startupinfo);
-
 /*****************************************************************************
  * system_Init: initialize winsock and misc other things.
  *****************************************************************************/
@@ -75,7 +71,20 @@ void system_Init( libvlc_int_t *p_this, int *pi_argc, char *ppsz_argv[] )
 
     if( (psz_vlc = strrchr( psz_path, '\\' )) ) *psz_vlc = '\0';
 
-    p_this->p_libvlc_global->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 )
@@ -123,9 +132,6 @@ LRESULT CALLBACK WMCOPYWNDPROC( HWND, UINT, WPARAM, LPARAM );
 void system_Configure( libvlc_int_t *p_this, int *pi_argc, 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
@@ -206,54 +212,24 @@ void system_Configure( libvlc_int_t *p_this, int *pi_argc, char *ppsz_argv[] )
                 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 */
@@ -354,17 +330,17 @@ LRESULT CALLBACK WMCOPYWNDPROC( HWND hwnd, UINT uMsg, WPARAM wParam,
                 }
                 if( i_opt || config_GetInt( p_this, "playlist-enqueue" ) )
                 {
-                  playlist_PlaylistAddExt( p_playlist, ppsz_argv[i_opt],
+                  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 );
+                    i_options, VLC_TRUE, VLC_FALSE );
                 } else {
-                  playlist_PlaylistAddExt( p_playlist, ppsz_argv[i_opt],
+                  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 );
+                    i_options, VLC_TRUE, VLC_FALSE );
                 }
 
                 i_opt += i_options;
@@ -384,10 +360,10 @@ 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( p_this->p_libvlc_global->psz_vlcpath );
-        p_this->p_libvlc_global->psz_vlcpath = NULL;
+        free( vlc_global()->psz_vlcpath );
+        vlc_global()->psz_vlcpath = NULL;
     }
 
     WSACleanup();