-#include <windows.h>
-#include <commctrl.h>
-#include <commdlg.h>
#include <stdio.h>
#include <stdlib.h>
#include <limits.h>
#include <ctype.h>
#include <time.h>
-#include "ssh.h"
#include "putty.h"
-#include "winstuff.h"
+#include "ssh.h"
#include "win_res.h"
#include "storage.h"
#include "dialog.h"
+#include <commctrl.h>
+#include <commdlg.h>
+#include <shellapi.h>
+
#ifdef MSVC4
#define TVINSERTSTRUCT TV_INSERTSTRUCT
#define TVITEM TV_ITEM
*/
ReleaseCapture();
if (dp.ended)
- EndDialog(hwnd, dp.endresult ? 1 : 0);
+ SaneEndDialog(hwnd, dp.endresult ? 1 : 0);
break;
case WM_NOTIFY:
if (LOWORD(wParam) == IDCX_TREEVIEW &&
if (GetWindowLong(hwnd, GWL_USERDATA) == 1) {
ret = winctrl_handle_command(&dp, msg, wParam, lParam);
if (dp.ended && GetCapture() != hwnd)
- EndDialog(hwnd, dp.endresult ? 1 : 0);
+ SaneEndDialog(hwnd, dp.endresult ? 1 : 0);
} else
ret = 0;
return ret;
WinHelp(hwnd, help_path, HELP_QUIT, 0);
requested_help = FALSE;
}
- EndDialog(hwnd, 0);
+ SaneEndDialog(hwnd, 0);
return 0;
/* Grrr Explorer will maximize Dialogs! */
get_sesslist(&sesslist, TRUE);
ret =
- DialogBox(hinst, MAKEINTRESOURCE(IDD_MAINBOX), NULL,
+ SaneDialogBox(hinst, MAKEINTRESOURCE(IDD_MAINBOX), NULL,
GenericMainDlgProc);
get_sesslist(&sesslist, FALSE);
dp.data = &cfg;
dp.shortcuts['g'] = TRUE; /* the treeview: `Cate&gory' */
- ret =
- DialogBox(hinst, MAKEINTRESOURCE(IDD_MAINBOX), NULL,
+ ret = SaneDialogBox(hinst, MAKEINTRESOURCE(IDD_MAINBOX), NULL,
GenericMainDlgProc);
ctrl_free_box(ctrlbox);
winctrl_cleanup(&ctrls_base);
winctrl_cleanup(&ctrls_panel);
- sfree(dp.errtitle);
dp_cleanup(&dp);
if (!ret)
return ret;
}
-void logevent(void *frontend, char *string)
+void logevent(void *frontend, const char *string)
{
char timebuf[40];
time_t t;
"The server's host key is not cached in the registry. You\n"
"have no guarantee that the server is the computer you\n"
"think it is.\n"
- "The server's key fingerprint is:\n"
+ "The server's %s key fingerprint is:\n"
"%s\n"
"If you trust this host, hit Yes to add the key to\n"
"%s's cache and carry on connecting.\n"
"server administrator has changed the host key, or you\n"
"have actually connected to another computer pretending\n"
"to be the server.\n"
- "The new key fingerprint is:\n"
+ "The new %s key fingerprint is:\n"
"%s\n"
"If you were expecting this change and trust the new key,\n"
"hit Yes to update %s's cache and continue connecting.\n"
if (ret == 2) { /* key was different */
int mbret;
char *message, *title;
- message = dupprintf(wrongmsg, appname, fingerprint, appname);
+ message = dupprintf(wrongmsg, appname, keytype, fingerprint, appname);
title = dupprintf(mbtitle, appname);
mbret = MessageBox(NULL, message, title,
MB_ICONWARNING | MB_YESNOCANCEL);
if (ret == 1) { /* key was absent */
int mbret;
char *message, *title;
- message = dupprintf(absentmsg, fingerprint, appname);
+ message = dupprintf(absentmsg, keytype, fingerprint, appname);
title = dupprintf(mbtitle, appname);
mbret = MessageBox(NULL, message, title,
MB_ICONWARNING | MB_YESNOCANCEL);