Commit 3cc349b0 authored by Patrick Griffis's avatar Patrick Griffis Committed by Patrick Griffis

win32: Replace usage of __wgetmainargs()

It was an internal function that has been removed with VS 2015

Use g_win32_get_command_line() or CommandLineToArgvW() directly.

https://bugzilla.gnome.org/show_bug.cgi?id=741822
parent be7de8a7
......@@ -6,21 +6,6 @@ static gint option_format_size;
static gint outstanding_asyncs;
#ifdef G_OS_WIN32
typedef struct {
int newmode;
} _startupinfo;
#ifndef _MSC_VER
extern void __wgetmainargs(int *argc,
wchar_t ***wargv,
wchar_t ***wenviron,
int expand_wildcards,
_startupinfo *startupinfo);
#endif
#endif
static void
print_result (const gchar *filename,
guint64 disk_usage,
......@@ -91,12 +76,10 @@ main (int argc, char **argv)
GFileMeasureProgressCallback progress = NULL;
GFileMeasureFlags flags = 0;
gint i;
#ifdef G_OS_WIN32
int wargc;
wchar_t **wargv, **wenvp;
_startupinfo si = { 0 };
__wgetmainargs (&wargc, &wargv, &wenvp, 0, &si);
#ifdef G_OS_WIN32
argv = g_win32_get_command_line ();
argc = g_strv_length (argv);
#endif
setlocale (LC_ALL, "");
......@@ -111,6 +94,9 @@ main (int argc, char **argv)
if (g_str_equal (argv[i], "--help"))
{
g_print ("usage: du [--progress] [--async] [-x] [-h] [-h] [--apparent-size] [--any-error] [--] files...\n");
#ifdef G_OS_WIN32
g_strfreev (argv);
#endif
return 0;
}
else if (g_str_equal (argv[i], "-x"))
......@@ -134,24 +120,20 @@ main (int argc, char **argv)
if (!argv[i])
{
g_printerr ("usage: du [--progress] [--async] [-x] [-h] [-h] [--apparent-size] [--any-error] [--] files...\n");
#ifdef G_OS_WIN32
g_strfreev (argv);
#endif
return 1;
}
#ifdef G_OS_WIN32
while (wargv[i])
{
gchar *argv_utf8 = g_utf16_to_utf8 (wargv[i], -1, NULL, NULL, NULL);
#else
while (argv[i])
{
gchar *argv_utf8 = g_strdup (argv[i]);
#endif
GFile *file = g_file_new_for_commandline_arg (argv_utf8);
GFile *file = g_file_new_for_commandline_arg (argv[i]);
if (option_use_async)
{
g_file_measure_disk_usage_async (file, flags, G_PRIORITY_DEFAULT, NULL,
progress, argv_utf8, async_ready_func, argv_utf8);
progress, argv[i], async_ready_func, argv[i]);
outstanding_asyncs++;
}
else
......@@ -161,10 +143,9 @@ main (int argc, char **argv)
guint64 num_dirs;
guint64 num_files;
g_file_measure_disk_usage (file, flags, NULL, progress, argv_utf8,
g_file_measure_disk_usage (file, flags, NULL, progress, argv[i],
&disk_usage, &num_dirs, &num_files, &error);
print_result (argv_utf8, disk_usage, num_dirs, num_files, error, '\n');
g_free (argv_utf8);
print_result (argv[i], disk_usage, num_dirs, num_files, error, '\n');
}
g_object_unref (file);
......@@ -175,5 +156,9 @@ main (int argc, char **argv)
while (outstanding_asyncs)
g_main_context_iteration (NULL, TRUE);
#ifdef G_OS_WIN32
g_strfreev (argv);
#endif
return 0;
}
......@@ -67,20 +67,6 @@ write_err_and_exit (gint fd,
* but a WinMain().
*/
/* Info peeked from mingw runtime's source code. __wgetmainargs() is a
* function to get the program's argv in wide char format.
*/
typedef struct {
int newmode;
} _startupinfo;
extern void __wgetmainargs(int *argc,
wchar_t ***wargv,
wchar_t ***wenviron,
int expand_wildcards,
_startupinfo *startupinfo);
/* Copy of protect_argv that handles wchar_t strings */
static gint
......@@ -211,8 +197,7 @@ main (int ignored_argc, char **ignored_argv)
wchar_t **new_wargv;
int argc;
char **argv;
wchar_t **wargv, **wenvp;
_startupinfo si = { 0 };
wchar_t **wargv;
char c;
#if (defined (_MSC_VER) && _MSC_VER >= 1400)
......@@ -226,7 +211,7 @@ main (int ignored_argc, char **ignored_argv)
#endif
/* Fetch the wide-char argument vector */
__wgetmainargs (&argc, &wargv, &wenvp, 0, &si);
wargv = CommandLineToArgvW (GetCommandLineW(), &argc);
g_assert (argc >= ARG_COUNT);
......@@ -382,6 +367,7 @@ main (int ignored_argc, char **ignored_argv)
read (helper_sync_fd, &c, 1);
LocalFree (wargv);
g_strfreev (argv);
return 0;
......
......@@ -509,13 +509,8 @@ g_spawn_sync (const gchar *working_directory,
* main(). wmain() has a wide character argument vector as parameter.
*
* At least currently, mingw doesn't support wmain(), so if you use
* mingw to develop the spawned program, it will have to call the
* undocumented function __wgetmainargs() to get the wide character
* argument vector and environment. See gspawn-win32-helper.c in the
* GLib sources or init.c in the mingw runtime sources for a prototype
* for that function. Alternatively, you can retrieve the Win32 system
* level wide character command line passed to the spawned program
* using the GetCommandLineW() function.
* mingw to develop the spawned program, it should call
* g_win32_get_command_line() to get arguments in UTF-8.
*
* On Windows the low-level child process creation API CreateProcess()
* doesn't use argument vectors, but a command line. The C runtime
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment