1 files changed, 22 insertions, 3 deletions
diff --git a/rawshark.c b/rawshark.c
index 29cb2ba801..c488bc44fd 100644
--- a/rawshark.c
+++ b/rawshark.c
@@ -405,8 +405,8 @@ set_link_type(const char *lt_arg) {
     return FALSE;
 }
 
-int
-main(int argc, char *argv[])
+static int
+real_main(int argc, char *argv[])
 {
     GString             *comp_info_str;
     GString             *runtime_info_str;
@@ -459,7 +459,6 @@ main(int argc, char *argv[])
         get_ws_vcs_version_info(), comp_info_str->str, runtime_info_str->str);
 
 #ifdef _WIN32
-    arg_list_utf_16to8(argc, argv);
     create_app_running_mutex();
 #endif /* _WIN32 */
 
@@ -831,6 +830,26 @@ clean_exit:
     return ret;
 }
 
+#ifdef _WIN32
+int
+wmain(int argc, wchar_t *argv[])
+{
+    char **argv_utf8;
+
+    /* Convert our arg list from UTF-16LE to UTF-8. */
+    argv_utf8 = g_malloc(argc * sizeof *argv_utf8);
+    for (int i = 0; i < argc; i++)
+        argv_utf8[i] = g_utf16_to_utf8(argv[i], -1, NULL, NULL, NULL);
+    return real_main(argc, argv_utf8);
+}
+#else
+int
+main(int argc, char *argv[])
+{
+    return real_main(argc, argv);
+}
+#endif
+
 /**
  * Read data from a raw pipe.  The "raw" data consists of a libpcap
  * packet header followed by the payload.