Add gzip support to the Win32 "Save As" dialog. Don't crash in the Win32

merge dialog if we cancel. Adjust the size and location of the controls
in the Win32 open and merge file templates.

svn path=/trunk/; revision=45014

1 files changed, 44 insertions, 37 deletions

diff --git a/image/file_dlg_win32.rc b/image/file_dlg_win32.rc
index 5fc7a27441..a40fc4dc8d 100644
--- a/image/file_dlg_win32.rc
+++ b/image/file_dlg_win32.rc
@@ -2,34 +2,41 @@
 #include "richedit.h"
 #include "../ui/win32/file_dlg_win32.h"
 
-WIRESHARK_OPENFILENAME_TEMPLATE DIALOGEX 0, 0, 368, 94
+WIRESHARK_OPENFILENAME_TEMPLATE DIALOGEX 0, 0, 421, 90
 STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL
 FONT 8, "MS Shell Dlg"
 {
     // Filter button/entry
     // PUSHBUTTON "Filter:", EWFD_FILTER_BTN, 7, 4, 35, 14
-    LTEXT "Display filter:", EWFD_FILTER_LBL, 7, 7, 49, 14
-    CONTROL    "",        EWFD_FILTER_EDIT, RICHEDIT_CLASS, ES_AUTOHSCROLL, 52, 5, 88, 12, WS_EX_CLIENTEDGE
-
-    CHECKBOX "MAC name resolution", EWFD_MAC_NR_CB, 7, 32, 100, 8,  BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-    CHECKBOX "Transport name resolution", EWFD_TRANS_NR_CB, 7, 47, 100, 8,  BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-    CHECKBOX "Network name resolution", EWFD_NET_NR_CB, 7, 62, 100, 8,  BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-    CHECKBOX "Use external network name resolver", EWFD_EXTERNAL_NR_CB, 7, 77, 135, 8,  BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-
-    LTEXT "Format:", EWFD_PT_FORMAT, 164, 4, 40, 8
-    LTEXT "-", EWFD_PTX_FORMAT, 211, 4, 150, 8
-    LTEXT "Size:", EWFD_PT_SIZE, 164, 19, 40, 8
-    LTEXT "-", EWFD_PTX_SIZE, 211, 19, 150, 8
-    LTEXT "Packets:", EWFD_PT_PACKETS, 164, 34, 40, 8
-    LTEXT "-", EWFD_PTX_PACKETS, 211, 34, 150, 8
-    LTEXT "First Packet:", EWFD_PT_FIRST_PKT, 164, 49, 40, 8
-    LTEXT "-", EWFD_PTX_FIRST_PKT, 211, 49, 150, 8
-    LTEXT "Elapsed:", EWFD_PT_ELAPSED, 164, 64, 40, 8
-    LTEXT "-", EWFD_PTX_ELAPSED, 211, 64, 150, 8
+    LTEXT "Display filter:", EWFD_FILTER_LBL, 67, 2, 49, 14
+    CONTROL    "",        EWFD_FILTER_EDIT, RICHEDIT_CLASS, ES_AUTOHSCROLL, 112, 0, 88, 12, WS_EX_CLIENTEDGE
+
+    CHECKBOX "MAC name resolution", EWFD_MAC_NR_CB, 67, 30, 100, 8,  BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+    CHECKBOX "Transport name resolution", EWFD_TRANS_NR_CB, 67, 45, 100, 8,  BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+    CHECKBOX "Network name resolution", EWFD_NET_NR_CB, 67, 60, 100, 8,  BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+    CHECKBOX "Use external network name resolver", EWFD_EXTERNAL_NR_CB, 67, 75, 135, 8,  BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+
+    LTEXT "Format:", EWFD_PT_FORMAT, 224, 2, 40, 8
+    LTEXT "-", EWFD_PTX_FORMAT, 271, 2, 150, 8
+    LTEXT "Size:", EWFD_PT_SIZE, 224, 17, 40, 8
+    LTEXT "-", EWFD_PTX_SIZE, 271, 17, 150, 8
+    LTEXT "Packets:", EWFD_PT_PACKETS, 224, 32, 40, 8
+    LTEXT "-", EWFD_PTX_PACKETS, 271, 32, 150, 8
+    LTEXT "First Packet:", EWFD_PT_FIRST_PKT, 224, 47, 40, 8
+    LTEXT "-", EWFD_PTX_FIRST_PKT, 271, 47, 150, 8
+    LTEXT "Elapsed:", EWFD_PT_ELAPSED, 224, 62, 40, 8
+    LTEXT "-", EWFD_PTX_ELAPSED, 271, 62, 150, 8
     // 164/211, 79, 40/150, 8
     
 }
 
+WIRESHARK_SAVEASFILENAME_TEMPLATE DIALOGEX 0, 0, 167, 15
+STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL
+FONT 8, "MS Shell Dlg"
+{
+    CHECKBOX "Compress with gzip", EWFD_GZIP_CB, 67, 0, 100, 8,  BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP    
+}
+
 WIRESHARK_EXPORT_SPECIFIED_PACKETS_FILENAME_TEMPLATE DIALOGEX 0, 0, 368, 128
 STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL
 FONT 8, "MS Shell Dlg"
@@ -62,29 +69,29 @@ FONT 8, "MS Shell Dlg"
     LTEXT "0", EWFD_IGNORED_DISP, 170, 105, 41, 8, SS_RIGHT
 }
 
-WIRESHARK_MERGEFILENAME_TEMPLATE DIALOGEX 0, 0, 368, 94
+WIRESHARK_MERGEFILENAME_TEMPLATE DIALOGEX 0, 0, 421, 77
 STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL
 FONT 8, "MS Shell Dlg"
 {
     // Filter button/entry
     // PUSHBUTTON "Filter:", EWFD_FILTER_BTN, 7, 4, 35, 14
-    LTEXT "Display filter:", EWFD_FILTER_LBL, 7, 7, 49, 14
-    CONTROL    "",        EWFD_FILTER_EDIT, RICHEDIT_CLASS, ES_AUTOHSCROLL, 52, 5, 88, 12, WS_EX_CLIENTEDGE
-
-    CONTROL  "Prepend packets to existing file", EWFD_MERGE_PREPEND_BTN, "Button", BS_AUTORADIOBUTTON | WS_GROUP, 7, 32, 120, 8
-    CONTROL  "Merge packets chronologically", EWFD_MERGE_CHRONO_BTN, "Button", BS_AUTORADIOBUTTON, 7, 47, 120, 8
-    CONTROL  "Append packets to existing file", EWFD_MERGE_APPEND_BTN, "Button", BS_AUTORADIOBUTTON, 7, 62, 120, 8
-
-    LTEXT "Format:", EWFD_PT_FORMAT, 164, 4, 40, 8
-    LTEXT "-", EWFD_PTX_FORMAT, 211, 4, 150, 8
-    LTEXT "Size:", EWFD_PT_SIZE, 164, 19, 40, 8
-    LTEXT "-", EWFD_PTX_SIZE, 211, 19, 150, 8
-    LTEXT "Packets:", EWFD_PT_PACKETS, 164, 34, 40, 8
-    LTEXT "-", EWFD_PTX_PACKETS, 211, 34, 150, 8
-    LTEXT "First Packet:", EWFD_PT_FIRST_PKT, 164, 49, 40, 8
-    LTEXT "-", EWFD_PTX_FIRST_PKT, 211, 49, 150, 8
-    LTEXT "Elapsed:", EWFD_PT_ELAPSED, 164, 64, 40, 8
-    LTEXT "-", EWFD_PTX_ELAPSED, 211, 64, 150, 8
+    LTEXT "Display filter:", EWFD_FILTER_LBL, 67, 2, 49, 14
+    CONTROL    "",        EWFD_FILTER_EDIT, RICHEDIT_CLASS, ES_AUTOHSCROLL, 112, 0, 88, 12, WS_EX_CLIENTEDGE
+
+    CONTROL  "Prepend packets to existing file", EWFD_MERGE_PREPEND_BTN, "Button", BS_AUTORADIOBUTTON | WS_GROUP, 67, 30, 120, 8
+    CONTROL  "Merge packets chronologically", EWFD_MERGE_CHRONO_BTN, "Button", BS_AUTORADIOBUTTON, 67, 45, 120, 8
+    CONTROL  "Append packets to existing file", EWFD_MERGE_APPEND_BTN, "Button", BS_AUTORADIOBUTTON, 67, 60, 120, 8
+
+    LTEXT "Format:", EWFD_PT_FORMAT, 224, 2, 40, 8
+    LTEXT "-", EWFD_PTX_FORMAT, 271, 2, 150, 8
+    LTEXT "Size:", EWFD_PT_SIZE, 224, 17, 40, 8
+    LTEXT "-", EWFD_PTX_SIZE, 271, 17, 150, 8
+    LTEXT "Packets:", EWFD_PT_PACKETS, 224, 32, 40, 8
+    LTEXT "-", EWFD_PTX_PACKETS, 271, 32, 150, 8
+    LTEXT "First Packet:", EWFD_PT_FIRST_PKT, 224, 47, 40, 8
+    LTEXT "-", EWFD_PTX_FIRST_PKT, 271, 47, 150, 8
+    LTEXT "Elapsed:", EWFD_PT_ELAPSED, 224, 62, 40, 8
+    LTEXT "-", EWFD_PTX_ELAPSED, 271, 62, 150, 8
     // 164/211, 79, 40/150, 8
 }