On Windows, convert all of our command-line arguments from UTF-16 to

UTF-8 where we don't already do so. In Wireshark use g_utf16_to_utf8
instead of utf_16to8. This should fix bug 5520.

svn path=/trunk/; revision=35411

1 files changed, 13 insertions, 0 deletions

diff --git a/tshark.c b/tshark.c
index ac81ba007d..276872e867 100644
--- a/tshark.c
+++ b/tshark.c
@@ -96,6 +96,7 @@
 #ifdef _WIN32
 #include "capture-wpcap.h"
 #include "capture_errs.h"
+#include <shellapi.h>
 #endif /* _WIN32 */
 #include "capture_sync.h"
 #endif /* HAVE_LIBPCAP */
@@ -765,6 +766,8 @@ main(int argc, char *argv[])
 
 #ifdef _WIN32
   WSADATA              wsaData;
+  LPWSTR              *wc_argv;
+  int                  wc_argc, i;
 #endif  /* _WIN32 */
 
   char                *gpf_path, *pf_path;
@@ -816,6 +819,16 @@ 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? */
+#endif /* _WIN32 */
+
   /*
    * Get credential information for later use.
    */