MSDN says DIALOG resources are obsolete. Use DIALOGEXes instead. We aren't

adding extra controls to the save dialog any more so remove its template.

svn path=/trunk/; revision=43676

2 files changed, 9 insertions, 15 deletions

diff --git a/image/file_dlg_win32.rc b/image/file_dlg_win32.rc
index 8e4e095b6b..01e1463ea9 100644
--- a/image/file_dlg_win32.rc
+++ b/image/file_dlg_win32.rc
@@ -2,7 +2,7 @@
 #include "richedit.h"
 #include "../ui/win32/file_dlg_win32.h"
 
-WIRESHARK_OPENFILENAME_TEMPLATE DIALOG 0, 0, 368, 94
+WIRESHARK_OPENFILENAME_TEMPLATE DIALOGEX 0, 0, 368, 94
 STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL
 FONT 8, "MS Shell Dlg"
 {
@@ -30,13 +30,7 @@ FONT 8, "MS Shell Dlg"
     LTEXT "-", EWFD_PTX_ELAPSED, 211, 79, 150, 8
 }
 
-WIRESHARK_SAVEFILENAME_TEMPLATE DIALOG 0, 0, 368, 40
-STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL
-FONT 8, "MS Shell Dlg"
-{
-}
-
-WIRESHARK_EXPORT_SPECIFIED_PACKETS_FILENAME_TEMPLATE DIALOG 0, 0, 368, 128
+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"
 {
@@ -68,7 +62,7 @@ FONT 8, "MS Shell Dlg"
     LTEXT "0", EWFD_IGNORED_DISP, 170, 105, 41, 8, SS_RIGHT
 }
 
-WIRESHARK_MERGEFILENAME_TEMPLATE DIALOG 0, 0, 368, 94
+WIRESHARK_MERGEFILENAME_TEMPLATE DIALOGEX 0, 0, 368, 94
 STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL
 FONT 8, "MS Shell Dlg"
 {
@@ -95,7 +89,7 @@ FONT 8, "MS Shell Dlg"
     LTEXT "-", EWFD_PTX_ELAPSED, 211, 79, 150, 8
 }
 
-WIRESHARK_EXPORTFILENAME_TEMPLATE DIALOG 0, 0, 319, 109
+WIRESHARK_EXPORTFILENAME_TEMPLATE DIALOGEX 0, 0, 319, 109
 STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL
 FONT 8, "MS Shell Dlg"
 {
@@ -139,14 +133,14 @@ FONT 8, "MS Shell Dlg"
 }
 
 
-WIRESHARK_EXPORTRAWFILENAME_TEMPLATE DIALOG 0, 0, 200, 18
+WIRESHARK_EXPORTRAWFILENAME_TEMPLATE DIALOGEX 0, 0, 200, 18
 STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL
 FONT 8, "MS Shell Dlg"
 {
     LTEXT    "-", EWFD_EXPORTRAW_ST, 5, 5, 180, 8
 }
 
-WIRESHARK_EXPORTSSLKEYSFILENAME_TEMPLATE DIALOG 0, 0, 200, 18
+WIRESHARK_EXPORTSSLKEYSFILENAME_TEMPLATE DIALOGEX 0, 0, 200, 18
 STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL
 FONT 8, "MS Shell Dlg"
 {
diff --git a/ui/win32/file_dlg_win32.c b/ui/win32/file_dlg_win32.c
index d3e975cd39..df5866094e 100644
--- a/ui/win32/file_dlg_win32.c
+++ b/ui/win32/file_dlg_win32.c
@@ -428,12 +428,12 @@ win32_save_as_file(HWND h_wnd, capture_file *cf,
         ofn->nMaxFileTitle = 0;
         ofn->lpstrInitialDir = utf_8to16(get_last_open_dir());
         ofn->lpstrTitle = _T("Wireshark: Save file as");
-        ofn->Flags = OFN_ENABLESIZING  | OFN_ENABLETEMPLATE  | OFN_EXPLORER     |
+        ofn->Flags = OFN_ENABLESIZING  | OFN_EXPLORER        |
                      OFN_NOCHANGEDIR   | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY |
                      OFN_PATHMUSTEXIST | OFN_ENABLEHOOK      | OFN_SHOWHELP;
         ofn->lpstrDefExt = NULL;
         ofn->lpfnHook = save_as_file_hook_proc;
-        ofn->lpTemplateName = _T("WIRESHARK_SAVEFILENAME_TEMPLATE");
+        ofn->lpTemplateName = NULL;
 
         if (!GetSaveFileName(ofn)) {
             /* User cancelled or closed the dialog, or an error occurred. */
@@ -485,7 +485,7 @@ win32_save_as_file(HWND h_wnd, capture_file *cf,
         case CANCELLED:
             /* The user said "forget it".  Just return. */
             return FALSE; /* No save, no comments discarded */
-        }      
+        }
 
         /*
          * Append the default file extension if there's none given by