Install.win32: Add path for pkg-config

[vlc] / src / vlc.c

diff --git a/src/vlc.c b/src/vlc.c
index fa6810cf383527a06e27158a45a75ce38028f554..61d37bc509ac9f0e074775e5bfff5507c2cc1146 100644 (file)
--- a/src/vlc.c
+++ b/src/vlc.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * vlc.c: the vlc player
  *****************************************************************************
- * Copyright (C) 1998-2004 VideoLAN
+ * Copyright (C) 1998-2004 the VideoLAN team
  * $Id$
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -22,7 +22,7 @@
  *
  * 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 "config.h"
@@ -45,6 +45,8 @@
 static void SigHandler  ( int i_signal );
 #endif
 
+extern void rootwrap( void );
+
 /*****************************************************************************
  * main: parse command line, start interface and spawn threads.
  *****************************************************************************/
@@ -73,6 +75,8 @@ int main( int i_argc, char *ppsz_argv[] )
     }
 #endif
 
+    rootwrap ();
+    
     /* Create a libvlc structure */
     i_ret = VLC_Create();
     if( i_ret < 0 )
@@ -99,7 +103,7 @@ int main( int i_argc, char *ppsz_argv[] )
     if( i_ret < 0 )
     {
         VLC_Destroy( 0 );
-        return i_ret;
+        return i_ret == VLC_EEXITSUCCESS ? 0 : i_ret;
     }
 
     i_ret = VLC_AddIntf( 0, NULL, VLC_TRUE, VLC_TRUE );
@@ -157,6 +161,9 @@ static void SigHandler( int i_signal )
 #endif
 
 #if defined(UNDER_CE)
+#   if defined( _MSC_VER ) && defined( UNDER_CE )
+#       include "vlc_common.h"
+#   endif
 /*****************************************************************************
  * WinMain: parse command line, start interface and spawn threads. (WinCE only)
  *****************************************************************************/
@@ -166,17 +173,17 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
     char **argv, psz_cmdline[MAX_PATH];
     int argc, i_ret;
 
-    WideCharToMultiByte( CP_ACP, WC_DEFAULTCHAR, lpCmdLine, -1,
+    WideCharToMultiByte( CP_ACP, 0, lpCmdLine, -1,
                          psz_cmdline, MAX_PATH, NULL, NULL );
 
     argv = vlc_parse_cmdline( psz_cmdline, &argc );
     argv = realloc( argv, (argc + 1) * sizeof(char *) );
     if( !argv ) return -1;
 
-    if( argc ) memmove( argv + 1, argv, argc );
-    argv[0] = strdup(""); /* Fake program path */
+    if( argc ) memmove( argv + 1, argv, argc * sizeof(char *) );
+    argv[0] = ""; /* Fake program path */
 
-    i_ret = main( argc, argv );
+    i_ret = main( argc + 1, argv );
 
     /* No need to free the argv memory */
     return i_ret;