Changeset 042e6fa3c8810a67769958f14f840280753cec9c

Timestamp:

12/02/07 08:12:11 (2 years ago)

Author:

Marian Durkovic <md@videolan.org>

git-committer:

Marian Durkovic <md@videolan.org> 1171264331 +0000

git-parent:

[1ae081bee36ca43ae68e814494800764ff8eaae8]

git-author:

Marian Durkovic <md@videolan.org> 1171264331 +0000

Message:

Move wgetmainargs into VLC's main.
Refs: #900 #920 #1031

Files:

• src/libvlc-common.c (modified) (2 diffs)
• src/misc/win32_specific.c (modified) (2 diffs)
• src/vlc.c (modified) (2 diffs)

src/libvlc-common.c

@@ -1216 +1216 @@
-        /* TODO: write an internal function of this one, to avoid
-         *       unnecessary lookups. */
-        /* FIXME: should we convert options to UTF-8 as well ?? */
-
-#ifdef WIN32
@@ -1229 +1228 @@
-#endif
-        {
+            /* FIXME: it's too late to call FromLocale here. We should
+               convert ALL arguments to UTF8 before they get parsed */
+
-            psz_target = FromLocale( ppsz_argv[ i_opt ] );
-            VLC_AddTarget( p_vlc->i_object_id, psz_target,

src/misc/win32_specific.c

@@ -40 +40 @@
-#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.
@@ -86 +83 @@
-    /* 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. */

src/vlc.c

@@ -38 +38 @@
-
-#include <vlc/vlc.h>
+
+#ifdef WIN32
+extern void __wgetmainargs(int *argc, wchar_t ***wargv, wchar_t ***wenviron,
+                           int expand_wildcards, int *startupinfo);
+#endif
-
-/*****************************************************************************
@@ -99 +104 @@
-#endif
-
+#ifdef WIN32
+    /* 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] );
+    }
+#endif
+
-    /* Initialize libvlc */
-    i_ret = VLC_Init( 0, i_argc, ppsz_argv );