diff options
| author | Gerald Combs <gerald@wireshark.org> | 2011-05-24 00:07:56 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2011-05-24 00:07:56 +0000 |
| commit | a24687ce8eba24d3065bd38c139abfd7720fbb7b (patch) | |
| tree | df105f49b2895d2f74db9545ae4235aba0e95562 /gtk/main.c | |
| parent | 058fc19f453cc7445a62036a29bc69938ceb1a2a (diff) | |
| download | wireshark-a24687ce8eba24d3065bd38c139abfd7720fbb7b.tar.gz | |
Move the Windows argument list conversion code to a common routine.
svn path=/trunk/; revision=37372
Diffstat (limited to 'gtk/main.c')
| -rw-r--r-- | gtk/main.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/gtk/main.c b/gtk/main.c index d1ea6a0e85..36c915ce0d 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -118,6 +118,7 @@ #include "../capture-wpcap.h" #include "../capture_wpcap_packet.h" #include <tchar.h> /* Needed for Unicode */ +#include <wsutil/unicode-utils.h> #include <commctrl.h> #include <shellapi.h> #endif /* _WIN32 */ @@ -2006,8 +2007,6 @@ main(int argc, char *argv[]) #ifdef _WIN32 WSADATA wsaData; - LPWSTR *wc_argv; - int wc_argc, i; #endif /* _WIN32 */ char *rf_path; @@ -2065,13 +2064,7 @@ main(int argc, char *argv[]) static const char optstring[] = OPTSTRING; #ifdef _WIN32 - /* Convert our arg list to UTF-8. */ - wc_argv = CommandLineToArgvW(GetCommandLineW(), &wc_argc); - if (wc_argv && wc_argc == argc) { - for (i = 0; i < argc; i++) { - argv[i] = g_utf16_to_utf8(wc_argv[i], -1, NULL, NULL, NULL); - } - } /* XXX else bail because something is horribly, horribly wrong? */ + arg_list_utf_16to8(argc, argv); #endif /* _WIN32 */ /* |