diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-04-28 15:15:32 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2016-04-28 23:50:28 +0000 |
| commit | 91b154236bf0afb2d82d2e596528f6d35d14b4a4 (patch) | |
| tree | e3bbfcdaf159a0f916d5a84981032abf50a67f40 /ui/win32 | |
| parent | 82e39fc45f3a42a19c8037bcba88107b51a388cb (diff) | |
Win32: Pass a mutable string to CreateProcess.
CreateProcess can modify its second (lpCommandLine) argument. Don't
pass it the output of utf_8to16.
Constify the return value of utf_8to16.
Change-Id: I0d4361396e90c88a4ab2a3f2f0e058230e897fdf
Reviewed-on: https://code.wireshark.org/review/15155
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/win32')
| -rw-r--r-- | ui/win32/file_dlg_win32.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/win32/file_dlg_win32.c b/ui/win32/file_dlg_win32.c index 15eca21a30..9d9526c382 100644 --- a/ui/win32/file_dlg_win32.c +++ b/ui/win32/file_dlg_win32.c @@ -1438,7 +1438,7 @@ append_file_extension_type(GArray *sa, int et) GString* description_str = g_string_new(""); gchar sep; GSList *extensions_list, *extension; - TCHAR *str16; + const TCHAR *str16; guint16 zero = 0; /* Construct the list of patterns. */ @@ -1471,7 +1471,7 @@ append_file_extension_type(GArray *sa, int et) static TCHAR * build_file_open_type_list(void) { - TCHAR *str16; + const TCHAR *str16; int et; GArray* sa; static const guint16 zero = 0; @@ -1565,7 +1565,7 @@ append_file_type(GArray *sa, int ft) GString* description_str = g_string_new(""); gchar sep; GSList *extensions_list, *extension; - TCHAR *str16; + const TCHAR *str16; guint16 zero = 0; extensions_list = wtap_get_file_extensions_list(ft, TRUE); |