diff options
| -rw-r--r-- | ui/gtk/capture_file_dlg.c | 2 | ||||
| -rw-r--r-- | ui/win32/file_dlg_win32.c | 243 | ||||
| -rw-r--r-- | ui/win32/file_dlg_win32.h | 6 |
3 files changed, 236 insertions, 15 deletions
diff --git a/ui/gtk/capture_file_dlg.c b/ui/gtk/capture_file_dlg.c index a826b3cc4c..5ee1f3a2aa 100644 --- a/ui/gtk/capture_file_dlg.c +++ b/ui/gtk/capture_file_dlg.c @@ -1482,7 +1482,7 @@ void file_export_specified_packets_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) { #if _WIN32 - win32_save_as_file(GDK_WINDOW_HWND(gtk_widget_get_window(top_level)), action_after_save, action_after_save_data); + win32_export_specified_packets_file(GDK_WINDOW_HWND(gtk_widget_get_window(top_level))); #else /* _WIN32 */ GtkWidget *main_vb, *ft_hb, *ft_lb, *ft_combo_box, *range_fr, *compressed_cb; diff --git a/ui/win32/file_dlg_win32.c b/ui/win32/file_dlg_win32.c index 07cdbaf1f0..53706ec20e 100644 --- a/ui/win32/file_dlg_win32.c +++ b/ui/win32/file_dlg_win32.c @@ -114,6 +114,7 @@ typedef enum { #if (_MSC_VER <= 1200) static UINT CALLBACK open_file_hook_proc(HWND of_hwnd, UINT ui_msg, WPARAM w_param, LPARAM l_param); static UINT CALLBACK save_as_file_hook_proc(HWND of_hwnd, UINT ui_msg, WPARAM w_param, LPARAM l_param); +static UINT CALLBACK export_specified_packets_file_hook_proc(HWND of_hwnd, UINT ui_msg, WPARAM w_param, LPARAM l_param); static UINT CALLBACK merge_file_hook_proc(HWND mf_hwnd, UINT ui_msg, WPARAM w_param, LPARAM l_param); static UINT CALLBACK export_file_hook_proc(HWND of_hwnd, UINT ui_msg, WPARAM w_param, LPARAM l_param); static UINT CALLBACK export_raw_file_hook_proc(HWND of_hwnd, UINT ui_msg, WPARAM w_param, LPARAM l_param); @@ -121,6 +122,7 @@ static UINT CALLBACK export_sslkeys_file_hook_proc(HWND of_hwnd, UINT ui_msg, WP #else static UINT_PTR CALLBACK open_file_hook_proc(HWND of_hwnd, UINT ui_msg, WPARAM w_param, LPARAM l_param); static UINT_PTR CALLBACK save_as_file_hook_proc(HWND of_hwnd, UINT ui_msg, WPARAM w_param, LPARAM l_param); +static UINT_PTR CALLBACK export_specified_packets_file_hook_proc(HWND of_hwnd, UINT ui_msg, WPARAM w_param, LPARAM l_param); static UINT_PTR CALLBACK merge_file_hook_proc(HWND mf_hwnd, UINT ui_msg, WPARAM w_param, LPARAM l_param); static UINT_PTR CALLBACK export_file_hook_proc(HWND of_hwnd, UINT ui_msg, WPARAM w_param, LPARAM l_param); static UINT_PTR CALLBACK export_raw_file_hook_proc(HWND of_hwnd, UINT ui_msg, WPARAM w_param, LPARAM l_param); @@ -332,24 +334,23 @@ win32_save_as_file(HWND h_wnd, action_after_save_e action_after_save, gpointer a } g_sf_hwnd = NULL; - /* Write out the packets (all, or only the ones from the current - range) to the file with the specified name. */ + /* Write out all the packets to the file with the specified name. */ /* GetSaveFileName() already asked the user if he wants to overwrite the old file, */ /* so if we are here, user already confirmed to overwrite - just delete the old file now. */ /* Note: Windows ws_unlink cannot delete a currently open file; Therefore the */ /* GetSaveFileName dialog has been coded to prevent doing a 'save as' to the */ /* currently open capture file. */ - /* XX: Windows Wireshark is built with GLIB >= 2.6 these */ - /* days so ws_unlink will properly convert the */ - /* UTF8 filename to UTF16 & then do a _wunlink. */ - /* XX: if the cf_save fails, it will do a GTK simple_dialog() */ - /* which is not useful while doing a Windows dialog. */ - /* (A GTK dialog box will be generated and basically will */ - /* only appear when the redisplayed Windows 'save_as-file' */ - /* dialog is dismissed. It will then need to be dismissed. */ - /* This should be fixed even though the cf_save() */ - /* presumably should rarely fail in this case. */ + /* XX: Windows Wireshark is built with GLIB >= 2.6 these */ + /* days so ws_unlink will properly convert the */ + /* UTF8 filename to UTF16 & then do a _wunlink. */ + /* XX: if the cf_save_as fails, it will do a GTK simple_dialog() */ + /* which is not useful while doing a Windows dialog. */ + /* (A GTK dialog box will be generated and basically will */ + /* only appear when the redisplayed Windows 'save_as-file' */ + /* dialog is dismissed. It will then need to be dismissed. */ + /* This should be fixed even though the cf_save_as() */ + /* presumably should rarely fail in this case. */ if ((ws_unlink(file_name8->str) != 0) && (errno == EACCES)) { /* XXX: Is MessageBox the best way to pop up an error ? How to make text bold ? */ gchar *str = g_strdup_printf("Unable to delete file: %s\nPlease choose another name !", file_name8->str); @@ -357,7 +358,7 @@ win32_save_as_file(HWND h_wnd, action_after_save_e action_after_save, gpointer a g_free(str); goto AGAIN; } - if (cf_save_as(&cfile, file_name8->str, &g_range, filetype, FALSE) != CF_OK) { + if (cf_save_as(&cfile, file_name8->str, filetype, FALSE) != CF_OK) { /* The write failed. Try again. */ AGAIN: g_array_free(savable_file_types, TRUE); @@ -413,6 +414,126 @@ win32_save_as_file(HWND h_wnd, action_after_save_e action_after_save, gpointer a void +win32_export_specified_packets_file(HWND h_wnd) { + GArray *savable_file_types; + OPENFILENAME *ofn; + TCHAR file_name16[MAX_PATH] = _T(""); + GString *file_name8; + gchar *file_last_dot; + gchar *dirname; + int ofnsize; +#if (_MSC_VER >= 1500) + OSVERSIONINFO osvi; +#endif + + savable_file_types = wtap_get_savable_file_types(cfile.cd_t, cfile.lnk_t); + if (savable_file_types == NULL) + return; /* shouldn't happen - the "Save As..." item should be disabled if we can't save the file */ + + /* see OPENFILENAME comment in win32_open_file */ +#if (_MSC_VER >= 1500) + SecureZeroMemory(&osvi, sizeof(OSVERSIONINFO)); + osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + GetVersionEx(&osvi); + if (osvi.dwMajorVersion >= 5) { + ofnsize = sizeof(OPENFILENAME); + } else { + ofnsize = OPENFILENAME_SIZE_VERSION_400; + } +#else + ofnsize = sizeof(OPENFILENAME) + 12; +#endif + ofn = g_malloc0(ofnsize); + + ofn->lStructSize = ofnsize; + ofn->hwndOwner = h_wnd; +#if (_MSC_VER <= 1200) + ofn->hInstance = (HINSTANCE) GetWindowLong(h_wnd, GWL_HINSTANCE); +#else + ofn->hInstance = (HINSTANCE) GetWindowLongPtr(h_wnd, GWLP_HINSTANCE); +#endif + ofn->lpstrFilter = build_file_save_type_list(savable_file_types); + ofn->lpstrCustomFilter = NULL; + ofn->nMaxCustFilter = 0; + ofn->nFilterIndex = 1; /* the first entry is the best match; 1-origin indexing */ + ofn->lpstrFile = file_name16; + ofn->nMaxFile = MAX_PATH; + ofn->lpstrFileTitle = NULL; + ofn->nMaxFileTitle = 0; + ofn->lpstrInitialDir = utf_8to16(get_last_open_dir()); + ofn->lpstrTitle = _T("Wireshark: Export Specified Packets"); + ofn->Flags = OFN_ENABLESIZING | OFN_ENABLETEMPLATE | OFN_EXPLORER | + OFN_NOCHANGEDIR | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY | + OFN_PATHMUSTEXIST | OFN_ENABLEHOOK | OFN_SHOWHELP; + ofn->lpstrDefExt = NULL; + ofn->lpfnHook = export_specified_packets_file_hook_proc; + ofn->lpTemplateName = _T("WIRESHARK_SAVEFILENAME_TEMPLATE"); + + if (GetSaveFileName(ofn)) { + filetype = g_array_index(savable_file_types, int, ofn->nFilterIndex - 1); + + /* append the default file extension if there's none given by the user */ + /* (we expect a file extension to be at most 5 chars + the dot) */ + file_name8 = g_string_new(utf_16to8(file_name16)); + file_last_dot = strrchr(file_name8->str,'.'); + if(file_last_dot == NULL || strlen(file_name8->str)-(file_last_dot-file_name8->str) > 5+1) { + if(wtap_default_file_extension(filetype) != NULL) { + g_string_append_printf(file_name8, ".%s", wtap_default_file_extension(filetype)); + } + } + + g_sf_hwnd = NULL; + /* Write out the specified packets to the file with the specified name. */ + + /* GetSaveFileName() already asked the user if he wants to overwrite the old file, */ + /* so if we are here, user already confirmed to overwrite - just delete the old file now. */ + /* Note: Windows ws_unlink cannot delete a currently open file; Therefore the */ + /* GetSaveFileName dialog has been coded to prevent doing a 'save as' to the */ + /* currently open capture file. */ + /* XX: Windows Wireshark is built with GLIB >= 2.6 these */ + /* days so ws_unlink will properly convert the */ + /* UTF8 filename to UTF16 & then do a _wunlink. */ + /* XX: if the cf_export_specified_packets fails, it will do a */ + /* GTK simple_dialog() which is not useful while doing a */ + /* Windows dialog. */ + /* (A GTK dialog box will be generated and basically will */ + /* only appear when the redisplayed Windows 'save_as-file' */ + /* dialog is dismissed. It will then need to be dismissed. */ + /* This should be fixed even though the */ + /* cf_export_specified_packets() presumably should rarely */ + /* fail in this case. */ + if ((ws_unlink(file_name8->str) != 0) && (errno == EACCES)) { + /* XXX: Is MessageBox the best way to pop up an error ? How to make text bold ? */ + gchar *str = g_strdup_printf("Unable to delete file: %s\nPlease choose another name !", file_name8->str); + MessageBox( NULL, utf_8to16(str), _T("Error"), MB_ICONERROR | MB_APPLMODAL | MB_OK); + g_free(str); + goto AGAIN; + } + if (cf_export_specified_packets(&cfile, file_name8->str, &g_range, filetype, FALSE) != CF_OK) { + /* The write failed. Try again. */ + AGAIN: + g_array_free(savable_file_types, TRUE); + g_string_free(file_name8, TRUE /* free_segment */); + g_free( (void *) ofn->lpstrFilter); + g_free( (void *) ofn); + win32_export_specified_packets_file(h_wnd); + return; + } + + /* Save the directory name for future file dialogs. */ + dirname = get_dirname(file_name8->str); /* Overwrites cf_name */ + set_last_open_dir(dirname); + + g_string_free(file_name8, TRUE /* free_segment */); + } + g_sf_hwnd = NULL; + g_array_free(savable_file_types, TRUE); + g_free( (void *) ofn->lpstrFilter); + g_free( (void *) ofn); +} + + +void win32_merge_file (HWND h_wnd) { OPENFILENAME *ofn; TCHAR file_name[MAX_PATH] = _T(""); @@ -1549,7 +1670,6 @@ build_file_format_list(HWND sf_hwnd) { } #endif -#define RANGE_TEXT_MAX 128 #if (_MSC_VER <= 1200) static UINT CALLBACK #else @@ -1564,6 +1684,101 @@ save_as_file_hook_proc(HWND sf_hwnd, UINT msg, WPARAM w_param, LPARAM l_param) { case WM_INITDIALOG: g_sf_hwnd = sf_hwnd; + /* Default to saving in the file's current format. */ + filetype = cfile.cd_t; + + /* Fill in the file format list */ + /*build_file_format_list(sf_hwnd);*/ + + break; + case WM_COMMAND: + cur_ctrl = (HWND) l_param; + + switch (w_param) { +#if 0 + case (CBN_SELCHANGE << 16) | EWFD_FILE_TYPE_COMBO: + index = SendMessage(cur_ctrl, CB_GETCURSEL, 0, 0); + if (index != CB_ERR) { + new_filetype = SendMessage(cur_ctrl, CB_GETITEMDATA, (WPARAM) index, 0); + if (new_filetype != CB_ERR) { + if (filetype != new_filetype) { + if (can_save_with_wiretap(new_filetype)) { + cur_ctrl = GetDlgItem(sf_hwnd, EWFD_CAPTURED_BTN); + EnableWindow(cur_ctrl, TRUE); + cur_ctrl = GetDlgItem(sf_hwnd, EWFD_DISPLAYED_BTN); + EnableWindow(cur_ctrl, TRUE); + } else { + cur_ctrl = GetDlgItem(sf_hwnd, EWFD_CAPTURED_BTN); + SendMessage(cur_ctrl, BM_SETCHECK, 0, 0); + EnableWindow(cur_ctrl, FALSE); + cur_ctrl = GetDlgItem(sf_hwnd, EWFD_DISPLAYED_BTN); + EnableWindow(cur_ctrl, FALSE); + } + filetype = new_filetype; + } + } + } + break; +#endif + default: + break; + } + break; + case WM_NOTIFY: + switch (notify->hdr.code) { + case CDN_HELP: + topic_cb(NULL, HELP_SAVE_WIN32_DIALOG); + break; + case CDN_FILEOK: { + HWND parent; + TCHAR file_name16_selected[MAX_PATH]; + char *file_name8_selected; + int selected_size; + + /* Check if trying to do 'save as' to the currently open file */ + parent = GetParent(sf_hwnd); + selected_size = CommDlg_OpenSave_GetSpec(parent, file_name16_selected, MAX_PATH); + if (selected_size > 0) { + file_name8_selected = utf_16to8(file_name16_selected); + if (files_identical(cfile.filename, file_name8_selected)) { + /* XXX: Is MessageBox the best way to pop up an error ? How to make text bold ? */ + gchar *str = g_strdup_printf( + "Capture File \"%s\" identical to loaded file !!\n\n" + "Please choose a different filename.", + file_name8_selected); + MessageBox( parent, utf_8to16(str), _T("Error"), MB_ICONERROR | MB_APPLMODAL | MB_OK); + g_free(str); + SetWindowLongPtr(sf_hwnd, DWLP_MSGRESULT, 1L); /* Don't allow ! */ + return 1; + } + } + } + break; + default: + break; + } + break; + default: + break; + } + return 0; +} + +#define RANGE_TEXT_MAX 128 +#if (_MSC_VER <= 1200) +static UINT CALLBACK +#else +static UINT_PTR CALLBACK +#endif +export_specified_packets_file_hook_proc(HWND sf_hwnd, UINT msg, WPARAM w_param, LPARAM l_param) { + HWND cur_ctrl; + OFNOTIFY *notify = (OFNOTIFY *) l_param; + /*int new_filetype, index;*/ + + switch(msg) { + case WM_INITDIALOG: + g_sf_hwnd = sf_hwnd; + /* Default to saving all packets, in the file's current format. */ filetype = cfile.cd_t; diff --git a/ui/win32/file_dlg_win32.h b/ui/win32/file_dlg_win32.h index cb62c29ee8..f34a2f5ecf 100644 --- a/ui/win32/file_dlg_win32.h +++ b/ui/win32/file_dlg_win32.h @@ -48,6 +48,12 @@ gboolean win32_open_file (HWND h_wnd); */ void win32_save_as_file(HWND h_wnd, action_after_save_e action_after_save, gpointer action_after_save_data); +/** Open the "Export Specified Packets" dialog box. + * + * @param h_wnd HWND of the parent window. + */ +void win32_export_specified_packets_file(HWND h_wnd); + /** Open the "Merge" dialog box. * * @param h_wnd HWND of the parent window. |