#include <windows.h>
#include <commctrl.h>
#include <commdlg.h>
+#ifndef AUTO_WINSOCK
+#ifdef WINSOCK_TWO
+#include <winsock2.h>
+#else
#include <winsock.h>
+#endif
+#endif
#include <stdio.h>
#include <stdlib.h>
-#include "putty.h"
#include "ssh.h"
+#include "putty.h"
#include "win_res.h"
+#include "storage.h"
-#define NPANELS 7
-#define MAIN_NPANELS 7
-#define RECONF_NPANELS 4
+#define NPANELS 8
+#define MAIN_NPANELS 8
+#define RECONF_NPANELS 5
static const char *const puttystr = PUTTY_REG_POS "\\Sessions";
-static void get_sesslist(int allocate);
+static char **events = NULL;
+static int nevents = 0, negsize = 0;
-static char **negots = NULL;
-static int nnegots = 0, negsize = 0;
static HWND logbox = NULL, abtbox = NULL;
static char hex[16] = "0123456789ABCDEF";
}
static void unmungestr(char *in, char *out) {
- int candot = 0;
-
while (*in) {
if (*in == '%' && in[1] && in[2]) {
int i, j;
*i = val;
}
-typedef struct {
- void *posn;
- void *temp;
- char dataspace[2048];
-} DTemplate;
-
static HINSTANCE hinst;
-static char **sessions;
-static int nsessions;
+static int readytogo;
static void save_settings (char *section, int do_host) {
int i;
if (RegCreateKey(HKEY_CURRENT_USER, puttystr, &subkey1)!=ERROR_SUCCESS ||
RegCreateKey(subkey1, p, &sesskey) != ERROR_SUCCESS) {
- free(p);
sesskey = NULL;
}
if (do_host) {
wpps (sesskey, "HostName", cfg.host);
wppi (sesskey, "PortNumber", cfg.port);
- wpps (sesskey, "Protocol",
- cfg.protocol == PROT_SSH ? "ssh" : "telnet");
+ p = "raw";
+ for (i = 0; backends[i].name != NULL; i++)
+ if (backends[i].protocol == cfg.protocol) {
+ p = backends[i].name;
+ break;
+ }
+ wpps (sesskey, "Protocol", p);
}
wppi (sesskey, "CloseOnExit", !!cfg.close_on_exit);
+ wppi (sesskey, "WarnOnClose", !!cfg.warn_on_close);
wpps (sesskey, "TerminalType", cfg.termtype);
wpps (sesskey, "TerminalSpeed", cfg.termspeed);
{
}
wpps (sesskey, "UserName", cfg.username);
wppi (sesskey, "NoPTY", cfg.nopty);
+ wppi (sesskey, "AgentFwd", cfg.agentfwd);
+ wpps (sesskey, "RemoteCmd", cfg.remote_cmd);
+ wpps (sesskey, "Cipher", cfg.cipher == CIPHER_BLOWFISH ? "blowfish" :
+ cfg.cipher == CIPHER_DES ? "des" : "3des");
+ wppi (sesskey, "AuthTIS", cfg.try_tis_auth);
+ wppi (sesskey, "SshProt", cfg.sshprot);
+ wpps (sesskey, "PublicKeyFile", cfg.keyfile);
wppi (sesskey, "RFCEnviron", cfg.rfc_environ);
wppi (sesskey, "BackspaceIsDelete", cfg.bksp_is_delete);
wppi (sesskey, "RXVTHomeEnd", cfg.rxvt_homeend);
- wppi (sesskey, "LinuxFunctionKeys", cfg.linux_funkeys);
+ wppi (sesskey, "LinuxFunctionKeys", cfg.funky_type);
wppi (sesskey, "ApplicationCursorKeys", cfg.app_cursor);
wppi (sesskey, "ApplicationKeypad", cfg.app_keypad);
+ wppi (sesskey, "NetHackKeypad", cfg.nethack_keypad);
+ wppi (sesskey, "AltF4", cfg.alt_f4);
+ wppi (sesskey, "AltSpace", cfg.alt_space);
+ wppi (sesskey, "LdiscTerm", cfg.ldisc_term);
+ wppi (sesskey, "BlinkCur", cfg.blink_cur);
+ wppi (sesskey, "Beep", cfg.beep);
wppi (sesskey, "ScrollbackLines", cfg.savelines);
wppi (sesskey, "DECOriginMode", cfg.dec_om);
wppi (sesskey, "AutoWrapMode", cfg.wrap_mode);
wppi (sesskey, "TermHeight", cfg.height);
wpps (sesskey, "Font", cfg.font);
wppi (sesskey, "FontIsBold", cfg.fontisbold);
+ wppi (sesskey, "FontCharSet", cfg.fontcharset);
wppi (sesskey, "FontHeight", cfg.fontheight);
wppi (sesskey, "FontVTMode", cfg.vtmode);
wppi (sesskey, "TryPalette", cfg.try_palette);
}
wpps (sesskey, buf, buf2);
}
+ wppi (sesskey, "KoiWinXlat", cfg.xlat_enablekoiwin);
+ wppi (sesskey, "88592Xlat", cfg.xlat_88592w1250);
+ wppi (sesskey, "CapsLockCyr", cfg.xlat_capslockcyr);
+ wppi (sesskey, "ScrollBar", cfg.scrollbar);
+ wppi (sesskey, "ScrollOnKey", cfg.scroll_on_key);
+ wppi (sesskey, "LockSize", cfg.locksize);
+ wppi (sesskey, "BCE", cfg.bce);
+ wppi (sesskey, "BlinkText", cfg.blinktext);
RegCloseKey(sesskey);
}
int i;
HKEY subkey1, sesskey;
char *p;
+ char prot[10];
p = malloc(3*strlen(section)+1);
mungestr(section, p);
-
- if (RegOpenKey(HKEY_CURRENT_USER, puttystr, &subkey1) != ERROR_SUCCESS ||
- RegOpenKey(subkey1, p, &sesskey) != ERROR_SUCCESS) {
- free(p);
+
+ if (RegOpenKey(HKEY_CURRENT_USER, puttystr, &subkey1) != ERROR_SUCCESS) {
sesskey = NULL;
+ } else {
+ if (RegOpenKey(subkey1, p, &sesskey) != ERROR_SUCCESS) {
+ sesskey = NULL;
+ }
+ RegCloseKey(subkey1);
}
free(p);
- RegCloseKey(subkey1);
- if (do_host) {
- char prot[10];
- gpps (sesskey, "HostName", "", cfg.host, sizeof(cfg.host));
- gppi (sesskey, "PortNumber", 23, &cfg.port);
- gpps (sesskey, "Protocol", "telnet", prot, 10);
- if (!strcmp(prot, "ssh"))
- cfg.protocol = PROT_SSH;
- else
- cfg.protocol = PROT_TELNET;
- } else {
- cfg.port = 23;
- *cfg.host = '\0';
- }
+ gpps (sesskey, "HostName", "", cfg.host, sizeof(cfg.host));
+ gppi (sesskey, "PortNumber", default_port, &cfg.port);
+
+ gpps (sesskey, "Protocol", "default", prot, 10);
+ cfg.protocol = default_protocol;
+ for (i = 0; backends[i].name != NULL; i++)
+ if (!strcmp(prot, backends[i].name)) {
+ cfg.protocol = backends[i].protocol;
+ break;
+ }
+
gppi (sesskey, "CloseOnExit", 1, &cfg.close_on_exit);
+ gppi (sesskey, "WarnOnClose", 1, &cfg.warn_on_close);
gpps (sesskey, "TerminalType", "xterm", cfg.termtype,
sizeof(cfg.termtype));
gpps (sesskey, "TerminalSpeed", "38400,38400", cfg.termspeed,
char buf[2*sizeof(cfg.environmt)], *p, *q;
gpps (sesskey, "Environment", "", buf, sizeof(buf));
p = buf;
- q = cfg.environmt;
+ q = cfg.environmt;
while (*p) {
while (*p && *p != ',') {
int c = *p++;
c = '\t';
if (c == '\\')
c = *p++;
- *p++ = c;
+ *q++ = c;
}
if (*p == ',') p++;
*q++ = '\0';
}
gpps (sesskey, "UserName", "", cfg.username, sizeof(cfg.username));
gppi (sesskey, "NoPTY", 0, &cfg.nopty);
+ gppi (sesskey, "AgentFwd", 0, &cfg.agentfwd);
+ gpps (sesskey, "RemoteCmd", "", cfg.remote_cmd, sizeof(cfg.remote_cmd));
+ {
+ char cipher[10];
+ gpps (sesskey, "Cipher", "3des", cipher, 10);
+ if (!strcmp(cipher, "blowfish"))
+ cfg.cipher = CIPHER_BLOWFISH;
+ else if (!strcmp(cipher, "des"))
+ cfg.cipher = CIPHER_DES;
+ else
+ cfg.cipher = CIPHER_3DES;
+ }
+ gppi (sesskey, "SshProt", 1, &cfg.sshprot);
+ gppi (sesskey, "AuthTIS", 0, &cfg.try_tis_auth);
+ gpps (sesskey, "PublicKeyFile", "", cfg.keyfile, sizeof(cfg.keyfile));
gppi (sesskey, "RFCEnviron", 0, &cfg.rfc_environ);
gppi (sesskey, "BackspaceIsDelete", 1, &cfg.bksp_is_delete);
gppi (sesskey, "RXVTHomeEnd", 0, &cfg.rxvt_homeend);
- gppi (sesskey, "LinuxFunctionKeys", 0, &cfg.linux_funkeys);
+ gppi (sesskey, "LinuxFunctionKeys", 0, &cfg.funky_type);
gppi (sesskey, "ApplicationCursorKeys", 0, &cfg.app_cursor);
gppi (sesskey, "ApplicationKeypad", 0, &cfg.app_keypad);
+ gppi (sesskey, "NetHackKeypad", 0, &cfg.nethack_keypad);
+ gppi (sesskey, "AltF4", 1, &cfg.alt_f4);
+ gppi (sesskey, "AltSpace", 0, &cfg.alt_space);
+ gppi (sesskey, "LdiscTerm", 0, &cfg.ldisc_term);
+ gppi (sesskey, "BlinkCur", 0, &cfg.blink_cur);
+ gppi (sesskey, "Beep", 1, &cfg.beep);
gppi (sesskey, "ScrollbackLines", 200, &cfg.savelines);
gppi (sesskey, "DECOriginMode", 0, &cfg.dec_om);
gppi (sesskey, "AutoWrapMode", 1, &cfg.wrap_mode);
gppi (sesskey, "TermHeight", 24, &cfg.height);
gpps (sesskey, "Font", "Courier", cfg.font, sizeof(cfg.font));
gppi (sesskey, "FontIsBold", 0, &cfg.fontisbold);
+ gppi (sesskey, "FontCharSet", ANSI_CHARSET, &cfg.fontcharset);
gppi (sesskey, "FontHeight", 10, &cfg.fontheight);
- gppi (sesskey, "FontVTMode", VT_POORMAN, &cfg.vtmode);
+ gppi (sesskey, "FontVTMode", VT_OEMANSI, (int *)&cfg.vtmode);
gppi (sesskey, "TryPalette", 0, &cfg.try_palette);
gppi (sesskey, "BoldAsColour", 1, &cfg.bold_colour);
for (i=0; i<22; i++) {
"85,255,255", "187,187,187", "255,255,255"
};
char buf[20], buf2[30];
+ int c0, c1, c2;
sprintf(buf, "Colour%d", i);
gpps (sesskey, buf, defaults[i], buf2, sizeof(buf2));
- sscanf(buf2, "%d,%d,%d", &cfg.colours[i][0],
- &cfg.colours[i][1], &cfg.colours[i][2]);
+ if(sscanf(buf2, "%d,%d,%d", &c0, &c1, &c2) == 3) {
+ cfg.colours[i][0] = c0;
+ cfg.colours[i][1] = c1;
+ cfg.colours[i][2] = c2;
+ }
}
gppi (sesskey, "MouseIsXterm", 0, &cfg.mouse_is_xterm);
for (i=0; i<256; i+=32) {
cfg.wordness[j] = atoi(q);
}
}
+ gppi (sesskey, "KoiWinXlat", 0, &cfg.xlat_enablekoiwin);
+ gppi (sesskey, "88592Xlat", 0, &cfg.xlat_88592w1250);
+ gppi (sesskey, "CapsLockCyr", 0, &cfg.xlat_capslockcyr);
+ gppi (sesskey, "ScrollBar", 1, &cfg.scrollbar);
+ gppi (sesskey, "ScrollOnKey", 0, &cfg.scroll_on_key);
+ gppi (sesskey, "LockSize", 0, &cfg.locksize);
+ gppi (sesskey, "BCE", 0, &cfg.bce);
+ gppi (sesskey, "BlinkText", 0, &cfg.blinktext);
+
RegCloseKey(sesskey);
}
+static void force_normal(HWND hwnd)
+{
+static int recurse = 0;
+
+ WINDOWPLACEMENT wp;
+
+ if(recurse) return;
+ recurse = 1;
+
+ wp.length = sizeof(wp);
+ if (GetWindowPlacement(hwnd, &wp))
+ {
+ wp.showCmd = SW_SHOWNORMAL;
+ SetWindowPlacement(hwnd, &wp);
+ }
+ recurse = 0;
+}
+
static void MyGetDlgItemInt (HWND hwnd, int id, int *result) {
BOOL ok;
int n;
switch (msg) {
case WM_INITDIALOG:
- for (i=0; i<nnegots; i++)
+ for (i=0; i<nevents; i++)
SendDlgItemMessage (hwnd, IDN_LIST, LB_ADDSTRING,
- 0, (LPARAM)negots[i]);
+ 0, (LPARAM)events[i]);
return 1;
/* case WM_CTLCOLORDLG: */
/* return (int) GetStockObject (LTGRAY_BRUSH); */
logbox = NULL;
DestroyWindow (hwnd);
return 0;
+ case IDN_COPY:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED) {
+ int selcount;
+ int *selitems;
+ selcount = SendDlgItemMessage(hwnd, IDN_LIST,
+ LB_GETSELCOUNT, 0, 0);
+ selitems = malloc(selcount * sizeof(int));
+ if (selitems) {
+ int count = SendDlgItemMessage(hwnd, IDN_LIST,
+ LB_GETSELITEMS,
+ selcount, (LPARAM)selitems);
+ int i;
+ int size;
+ char *clipdata;
+ static unsigned char sel_nl[] = SEL_NL;
+
+ size = 0;
+ for (i = 0; i < count; i++)
+ size += strlen(events[selitems[i]]) + sizeof(sel_nl);
+
+ clipdata = malloc(size);
+ if (clipdata) {
+ char *p = clipdata;
+ for (i = 0; i < count; i++) {
+ char *q = events[selitems[i]];
+ int qlen = strlen(q);
+ memcpy(p, q, qlen);
+ p += qlen;
+ memcpy(p, sel_nl, sizeof(sel_nl));
+ p += sizeof(sel_nl);
+ }
+ write_clip(clipdata, size);
+ term_deselect();
+ free(clipdata);
+ }
+ free(selitems);
+ }
+ }
+ return 0;
}
return 0;
case WM_CLOSE:
return 0;
}
+static int CALLBACK LicenceProc (HWND hwnd, UINT msg,
+ WPARAM wParam, LPARAM lParam) {
+ switch (msg) {
+ case WM_INITDIALOG:
+ return 1;
+ case WM_COMMAND:
+ switch (LOWORD(wParam)) {
+ case IDOK:
+ abtbox = NULL;
+ DestroyWindow (hwnd);
+ return 0;
+ }
+ return 0;
+ case WM_CLOSE:
+ abtbox = NULL;
+ DestroyWindow (hwnd);
+ return 0;
+ }
+ return 0;
+}
+
static int CALLBACK AboutProc (HWND hwnd, UINT msg,
WPARAM wParam, LPARAM lParam) {
switch (msg) {
case IDA_LICENCE:
EnableWindow(hwnd, 0);
DialogBox (hinst, MAKEINTRESOURCE(IDD_LICENCEBOX),
- NULL, AboutProc);
+ NULL, LicenceProc);
EnableWindow(hwnd, 1);
+ SetActiveWindow(hwnd);
return 0;
}
return 0;
return 0;
}
+static char savedsession[2048];
+
static int CALLBACK ConnectionProc (HWND hwnd, UINT msg,
WPARAM wParam, LPARAM lParam) {
int i;
switch (msg) {
case WM_INITDIALOG:
SetDlgItemText (hwnd, IDC0_HOST, cfg.host);
+ SetDlgItemText (hwnd, IDC0_SESSEDIT, savedsession);
SetDlgItemInt (hwnd, IDC0_PORT, cfg.port, FALSE);
for (i = 0; i < nsessions; i++)
SendDlgItemMessage (hwnd, IDC0_SESSLIST, LB_ADDSTRING,
0, (LPARAM) (sessions[i]));
- CheckRadioButton (hwnd, IDC0_PROTTELNET, IDC0_PROTSSH,
- cfg.protocol==PROT_SSH ? IDC0_PROTSSH : IDC0_PROTTELNET);
+ CheckRadioButton (hwnd, IDC0_PROTRAW, IDC0_PROTSSH,
+ cfg.protocol==PROT_SSH ? IDC0_PROTSSH :
+ cfg.protocol==PROT_TELNET ? IDC0_PROTTELNET : IDC0_PROTRAW );
CheckDlgButton (hwnd, IDC0_CLOSEEXIT, cfg.close_on_exit);
+ CheckDlgButton (hwnd, IDC0_CLOSEWARN, cfg.warn_on_close);
break;
+ case WM_LBUTTONUP:
+ /*
+ * Button release should trigger WM_OK if there was a
+ * previous double click on the session list.
+ */
+ ReleaseCapture();
+ if (readytogo)
+ SendMessage (GetParent(hwnd), WM_COMMAND, IDOK, 0);
+ break;
case WM_COMMAND:
switch (LOWORD(wParam)) {
case IDC0_PROTTELNET:
case IDC0_PROTSSH:
+ case IDC0_PROTRAW:
if (HIWORD(wParam) == BN_CLICKED ||
HIWORD(wParam) == BN_DOUBLECLICKED) {
int i = IsDlgButtonChecked (hwnd, IDC0_PROTSSH);
- cfg.protocol = i ? PROT_SSH : PROT_TELNET;
+ int j = IsDlgButtonChecked (hwnd, IDC0_PROTTELNET);
+ cfg.protocol = i ? PROT_SSH : j ? PROT_TELNET : PROT_RAW ;
if ((cfg.protocol == PROT_SSH && cfg.port == 23) ||
(cfg.protocol == PROT_TELNET && cfg.port == 22)) {
cfg.port = i ? 22 : 23;
HIWORD(wParam) == BN_DOUBLECLICKED)
cfg.close_on_exit = IsDlgButtonChecked (hwnd, IDC0_CLOSEEXIT);
break;
+ case IDC0_CLOSEWARN:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.warn_on_close = IsDlgButtonChecked (hwnd, IDC0_CLOSEWARN);
+ break;
case IDC0_SESSEDIT:
- if (HIWORD(wParam) == EN_CHANGE)
+ if (HIWORD(wParam) == EN_CHANGE) {
SendDlgItemMessage (hwnd, IDC0_SESSLIST, LB_SETCURSEL,
(WPARAM) -1, 0);
+ GetDlgItemText (hwnd, IDC0_SESSEDIT,
+ savedsession, sizeof(savedsession)-1);
+ savedsession[sizeof(savedsession)-1] = '\0';
+ }
break;
case IDC0_SESSSAVE:
if (HIWORD(wParam) == BN_CLICKED ||
!!strcmp(sessions[n], "Default Settings"));
SetDlgItemText (hwnd, IDC0_HOST, cfg.host);
SetDlgItemInt (hwnd, IDC0_PORT, cfg.port, FALSE);
- CheckRadioButton (hwnd, IDC0_PROTTELNET, IDC0_PROTSSH,
+ CheckRadioButton (hwnd, IDC0_PROTRAW, IDC0_PROTSSH,
(cfg.protocol==PROT_SSH ? IDC0_PROTSSH :
- IDC0_PROTTELNET));
+ cfg.protocol==PROT_TELNET ? IDC0_PROTTELNET : IDC0_PROTRAW));
CheckDlgButton (hwnd, IDC0_CLOSEEXIT, cfg.close_on_exit);
+ CheckDlgButton (hwnd, IDC0_CLOSEWARN, cfg.warn_on_close);
SendDlgItemMessage (hwnd, IDC0_SESSLIST, LB_SETCURSEL,
(WPARAM) -1, 0);
}
* Unless it's Default Settings or some other
* host-less set of saved settings.
*/
- if (*cfg.host)
- SendMessage (GetParent(hwnd), WM_COMMAND, IDOK, 0);
+ if (*cfg.host) {
+ readytogo = TRUE;
+ SetCapture(hwnd);
+ }
}
break;
case IDC0_SESSDEL:
cfg.bksp_is_delete ? IDC1_DEL127 : IDC1_DEL008);
CheckRadioButton (hwnd, IDC1_HOMETILDE, IDC1_HOMERXVT,
cfg.rxvt_homeend ? IDC1_HOMERXVT : IDC1_HOMETILDE);
- CheckRadioButton (hwnd, IDC1_FUNCTILDE, IDC1_FUNCLINUX,
- cfg.linux_funkeys ? IDC1_FUNCLINUX : IDC1_FUNCTILDE);
+ CheckRadioButton (hwnd, IDC1_FUNCTILDE, IDC1_FUNCXTERM,
+ cfg.funky_type ?
+ (cfg.funky_type==2 ? IDC1_FUNCXTERM
+ : IDC1_FUNCLINUX )
+ : IDC1_FUNCTILDE);
CheckRadioButton (hwnd, IDC1_CURNORMAL, IDC1_CURAPPLIC,
cfg.app_cursor ? IDC1_CURAPPLIC : IDC1_CURNORMAL);
- CheckRadioButton (hwnd, IDC1_KPNORMAL, IDC1_KPAPPLIC,
+ CheckRadioButton (hwnd, IDC1_KPNORMAL, IDC1_KPNH,
+ cfg.nethack_keypad ? IDC1_KPNH :
cfg.app_keypad ? IDC1_KPAPPLIC : IDC1_KPNORMAL);
+ CheckDlgButton (hwnd, IDC1_ALTF4, cfg.alt_f4);
+ CheckDlgButton (hwnd, IDC1_ALTSPACE, cfg.alt_space);
+ CheckDlgButton (hwnd, IDC1_LDISCTERM, cfg.ldisc_term);
+ CheckDlgButton (hwnd, IDC1_SCROLLKEY, cfg.scroll_on_key);
break;
case WM_COMMAND:
if (HIWORD(wParam) == BN_CLICKED ||
case IDC1_HOMERXVT:
cfg.rxvt_homeend = IsDlgButtonChecked (hwnd, IDC1_HOMERXVT);
break;
+ case IDC1_FUNCXTERM:
+ cfg.funky_type = 2;
+ break;
case IDC1_FUNCTILDE:
case IDC1_FUNCLINUX:
- cfg.linux_funkeys = IsDlgButtonChecked (hwnd, IDC1_FUNCLINUX);
+ cfg.funky_type = IsDlgButtonChecked (hwnd, IDC1_FUNCLINUX);
break;
case IDC1_KPNORMAL:
case IDC1_KPAPPLIC:
cfg.app_keypad = IsDlgButtonChecked (hwnd, IDC1_KPAPPLIC);
+ cfg.nethack_keypad = FALSE;
+ break;
+ case IDC1_KPNH:
+ cfg.app_keypad = FALSE;
+ cfg.nethack_keypad = TRUE;
break;
case IDC1_CURNORMAL:
case IDC1_CURAPPLIC:
cfg.app_cursor = IsDlgButtonChecked (hwnd, IDC1_CURAPPLIC);
break;
+ case IDC1_ALTF4:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.alt_f4 = IsDlgButtonChecked (hwnd, IDC1_ALTF4);
+ break;
+ case IDC1_ALTSPACE:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.alt_space = IsDlgButtonChecked (hwnd, IDC1_ALTSPACE);
+ break;
+ case IDC1_LDISCTERM:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.ldisc_term = IsDlgButtonChecked (hwnd, IDC1_LDISCTERM);
+ break;
+ case IDC1_SCROLLKEY:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.scroll_on_key = IsDlgButtonChecked (hwnd, IDC1_SCROLLKEY);
+ break;
}
}
return GeneralPanelProc (hwnd, msg, wParam, lParam);
SetDlgItemInt (hwnd, IDC2_SAVEEDIT, cfg.savelines, FALSE);
fmtfont (fontstatic);
SetDlgItemText (hwnd, IDC2_FONTSTATIC, fontstatic);
- CheckRadioButton (hwnd, IDC2_VTXWINDOWS, IDC2_VTPOORMAN,
- cfg.vtmode == VT_XWINDOWS ? IDC2_VTXWINDOWS :
- cfg.vtmode == VT_OEMANSI ? IDC2_VTOEMANSI :
- cfg.vtmode == VT_OEMONLY ? IDC2_VTOEMONLY :
- IDC2_VTPOORMAN);
+ CheckDlgButton (hwnd, IDC1_BLINKCUR, cfg.blink_cur);
+ CheckDlgButton (hwnd, IDC1_BEEP, cfg.beep);
+ CheckDlgButton (hwnd, IDC2_SCROLLBAR, cfg.scrollbar);
+ CheckDlgButton (hwnd, IDC2_LOCKSIZE, cfg.locksize);
+ CheckDlgButton (hwnd, IDC2_BCE, cfg.bce);
+ CheckDlgButton (hwnd, IDC2_BLINKTEXT, cfg.blinktext);
break;
case WM_COMMAND:
switch (LOWORD(wParam)) {
lf.lfWidth = lf.lfEscapement = lf.lfOrientation = 0;
lf.lfItalic = lf.lfUnderline = lf.lfStrikeOut = 0;
lf.lfWeight = (cfg.fontisbold ? FW_BOLD : 0);
- lf.lfCharSet = ANSI_CHARSET;
+ lf.lfCharSet = cfg.fontcharset;
lf.lfOutPrecision = OUT_DEFAULT_PRECIS;
lf.lfClipPrecision = CLIP_DEFAULT_PRECIS;
lf.lfQuality = DEFAULT_QUALITY;
strncpy (cfg.font, lf.lfFaceName, sizeof(cfg.font)-1);
cfg.font[sizeof(cfg.font)-1] = '\0';
cfg.fontisbold = (lf.lfWeight == FW_BOLD);
+ cfg.fontcharset = lf.lfCharSet;
cfg.fontheight = lf.lfHeight;
fmtfont (fontstatic);
SetDlgItemText (hwnd, IDC2_FONTSTATIC, fontstatic);
}
break;
- case IDC2_VTXWINDOWS:
- case IDC2_VTOEMANSI:
- case IDC2_VTOEMONLY:
- case IDC2_VTPOORMAN:
- cfg.vtmode =
- (IsDlgButtonChecked (hwnd, IDC2_VTXWINDOWS) ? VT_XWINDOWS :
- IsDlgButtonChecked (hwnd, IDC2_VTOEMANSI) ? VT_OEMANSI :
- IsDlgButtonChecked (hwnd, IDC2_VTOEMONLY) ? VT_OEMONLY :
- VT_POORMAN);
- break;
+ case IDC1_BLINKCUR:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.blink_cur = IsDlgButtonChecked (hwnd, IDC1_BLINKCUR);
+ break;
+ case IDC1_BEEP:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.beep = IsDlgButtonChecked (hwnd, IDC1_BEEP);
+ break;
+ case IDC2_SCROLLBAR:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.scrollbar = IsDlgButtonChecked (hwnd, IDC2_SCROLLBAR);
+ break;
+ case IDC2_LOCKSIZE:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.locksize = IsDlgButtonChecked (hwnd, IDC2_LOCKSIZE);
+ break;
+ case IDC2_BLINKTEXT:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.blinktext = IsDlgButtonChecked (hwnd, IDC2_BLINKTEXT);
+ break;
+ case IDC2_BCE:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.bce = IsDlgButtonChecked (hwnd, IDC2_BCE);
+ break;
}
break;
}
static int CALLBACK SshProc (HWND hwnd, UINT msg,
WPARAM wParam, LPARAM lParam) {
+ OPENFILENAME of;
+ char filename[sizeof(cfg.keyfile)];
+
switch (msg) {
case WM_INITDIALOG:
SetDlgItemText (hwnd, IDC3_TTEDIT, cfg.termtype);
SetDlgItemText (hwnd, IDC3_LOGEDIT, cfg.username);
CheckDlgButton (hwnd, IDC3_NOPTY, cfg.nopty);
+ CheckDlgButton (hwnd, IDC3_AGENTFWD, cfg.agentfwd);
+ CheckRadioButton (hwnd, IDC3_CIPHER3DES, IDC3_CIPHERDES,
+ cfg.cipher == CIPHER_BLOWFISH ? IDC3_CIPHERBLOWF :
+ cfg.cipher == CIPHER_DES ? IDC3_CIPHERDES :
+ IDC3_CIPHER3DES);
+ CheckRadioButton (hwnd, IDC3_SSHPROT1, IDC3_SSHPROT2,
+ cfg.sshprot == 1 ? IDC3_SSHPROT1 : IDC3_SSHPROT2);
+ CheckDlgButton (hwnd, IDC3_AUTHTIS, cfg.try_tis_auth);
+ SetDlgItemText (hwnd, IDC3_PKEDIT, cfg.keyfile);
break;
case WM_COMMAND:
switch (LOWORD(wParam)) {
HIWORD(wParam) == BN_DOUBLECLICKED)
cfg.nopty = IsDlgButtonChecked (hwnd, IDC3_NOPTY);
break;
+ case IDC3_AGENTFWD:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.agentfwd = IsDlgButtonChecked (hwnd, IDC3_AGENTFWD);
+ break;
+ case IDC3_CIPHER3DES:
+ case IDC3_CIPHERBLOWF:
+ case IDC3_CIPHERDES:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED) {
+ if (IsDlgButtonChecked (hwnd, IDC3_CIPHER3DES))
+ cfg.cipher = CIPHER_3DES;
+ else if (IsDlgButtonChecked (hwnd, IDC3_CIPHERBLOWF))
+ cfg.cipher = CIPHER_BLOWFISH;
+ else if (IsDlgButtonChecked (hwnd, IDC3_CIPHERDES))
+ cfg.cipher = CIPHER_DES;
+ }
+ break;
+ case IDC3_SSHPROT1:
+ case IDC3_SSHPROT2:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED) {
+ if (IsDlgButtonChecked (hwnd, IDC3_SSHPROT1))
+ cfg.sshprot = 1;
+ else if (IsDlgButtonChecked (hwnd, IDC3_SSHPROT2))
+ cfg.sshprot = 2;
+ }
+ break;
+ case IDC3_AUTHTIS:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.try_tis_auth = IsDlgButtonChecked (hwnd, IDC3_AUTHTIS);
+ break;
+ case IDC3_PKEDIT:
+ if (HIWORD(wParam) == EN_CHANGE)
+ GetDlgItemText (hwnd, IDC3_PKEDIT, cfg.keyfile,
+ sizeof(cfg.keyfile)-1);
+ break;
+ case IDC3_PKBUTTON:
+ /*
+ * FIXME: this crashes. Find out why.
+ */
+ memset(&of, 0, sizeof(of));
+#ifdef OPENFILENAME_SIZE_VERSION_400
+ of.lStructSize = OPENFILENAME_SIZE_VERSION_400;
+#else
+ of.lStructSize = sizeof(of);
+#endif
+ of.hwndOwner = hwnd;
+ of.lpstrFilter = "All Files\0*\0\0\0";
+ of.lpstrCustomFilter = NULL;
+ of.nFilterIndex = 1;
+ of.lpstrFile = filename; strcpy(filename, cfg.keyfile);
+ of.nMaxFile = sizeof(filename);
+ of.lpstrFileTitle = NULL;
+ of.lpstrInitialDir = NULL;
+ of.lpstrTitle = "Select Public Key File";
+ of.Flags = 0;
+ if (GetOpenFileName(&of)) {
+ strcpy(cfg.keyfile, filename);
+ SetDlgItemText (hwnd, IDC3_PKEDIT, cfg.keyfile);
+ }
+ break;
}
break;
}
i = (i < 3 ? i*2 : i == 3 ? 5 : i*2-2);
cc.lStructSize = sizeof(cc);
cc.hwndOwner = hwnd;
- cc.hInstance = hinst;
+ cc.hInstance = (HWND)hinst;
cc.lpCustColors = custom;
cc.rgbResult = RGB (cfg.colours[i][0], cfg.colours[i][1],
cfg.colours[i][2]);
return GeneralPanelProc (hwnd, msg, wParam, lParam);
}
-static DTemplate negot, main, reconf, panels[NPANELS];
+static int CALLBACK TranslationProc (HWND hwnd, UINT msg,
+ WPARAM wParam, LPARAM lParam) {
+ switch (msg) {
+ case WM_INITDIALOG:
+ CheckRadioButton (hwnd, IDC6_NOXLAT, IDC6_88592WIN1250,
+ cfg.xlat_88592w1250 ? IDC6_88592WIN1250 :
+ cfg.xlat_enablekoiwin ? IDC6_KOI8WIN1251 :
+ IDC6_NOXLAT);
+ CheckDlgButton (hwnd, IDC6_CAPSLOCKCYR, cfg.xlat_capslockcyr);
+ CheckRadioButton (hwnd, IDC2_VTXWINDOWS, IDC2_VTPOORMAN,
+ cfg.vtmode == VT_XWINDOWS ? IDC2_VTXWINDOWS :
+ cfg.vtmode == VT_OEMANSI ? IDC2_VTOEMANSI :
+ cfg.vtmode == VT_OEMONLY ? IDC2_VTOEMONLY :
+ IDC2_VTPOORMAN);
+ case WM_COMMAND:
+ switch (LOWORD(wParam)) {
+ case IDC6_NOXLAT:
+ case IDC6_KOI8WIN1251:
+ case IDC6_88592WIN1250:
+ cfg.xlat_enablekoiwin =
+ IsDlgButtonChecked (hwnd, IDC6_KOI8WIN1251);
+ cfg.xlat_88592w1250 =
+ IsDlgButtonChecked (hwnd, IDC6_88592WIN1250);
+ break;
+ case IDC6_CAPSLOCKCYR:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED) {
+ cfg.xlat_capslockcyr =
+ IsDlgButtonChecked (hwnd, IDC6_CAPSLOCKCYR);
+ }
+ break;
+ case IDC2_VTXWINDOWS:
+ case IDC2_VTOEMANSI:
+ case IDC2_VTOEMONLY:
+ case IDC2_VTPOORMAN:
+ cfg.vtmode =
+ (IsDlgButtonChecked (hwnd, IDC2_VTXWINDOWS) ? VT_XWINDOWS :
+ IsDlgButtonChecked (hwnd, IDC2_VTOEMANSI) ? VT_OEMANSI :
+ IsDlgButtonChecked (hwnd, IDC2_VTOEMONLY) ? VT_OEMONLY :
+ VT_POORMAN);
+ break;
+ }
+ }
+ return GeneralPanelProc (hwnd, msg, wParam, lParam);
+}
+
static DLGPROC panelproc[NPANELS] = {
ConnectionProc, KeyboardProc, TerminalProc,
- TelnetProc, SshProc, SelectionProc, ColourProc
+ TelnetProc, SshProc, SelectionProc, ColourProc, TranslationProc
};
static char *panelids[NPANELS] = {
MAKEINTRESOURCE(IDD_PANEL0),
MAKEINTRESOURCE(IDD_PANEL3),
MAKEINTRESOURCE(IDD_PANEL35),
MAKEINTRESOURCE(IDD_PANEL4),
- MAKEINTRESOURCE(IDD_PANEL5)
+ MAKEINTRESOURCE(IDD_PANEL5),
+ MAKEINTRESOURCE(IDD_PANEL6)
};
+
static char *names[NPANELS] = {
- "Connection", "Keyboard", "Terminal", "Telnet", "SSH", "Selection", "Colours"
+ "Connection", "Keyboard", "Terminal", "Telnet",
+ "SSH", "Selection", "Colours", "Translation"
};
-static int mainp[MAIN_NPANELS] = { 0, 1, 2, 3, 4, 5, 6 };
-static int reconfp[RECONF_NPANELS] = { 1, 2, 5, 6 };
+static int mainp[MAIN_NPANELS] = { 0, 1, 2, 3, 4, 5, 6, 7};
+static int reconfp[RECONF_NPANELS] = { 1, 2, 5, 6, 7};
static int GenericMainDlgProc (HWND hwnd, UINT msg,
WPARAM wParam, LPARAM lParam,
case WM_CLOSE:
EndDialog (hwnd, 0);
return 0;
+
+ /* Grrr Explorer will maximize Dialogs! */
+ case WM_SIZE:
+ if (wParam == SIZE_MAXIMIZED)
+ force_normal(hwnd);
+ return 0;
}
return 0;
}
DialogBox(hinst, MAKEINTRESOURCE(IDD_ABOUTBOX),
GetParent(hwnd), AboutProc);
EnableWindow(hwnd, 1);
+ SetActiveWindow(hwnd);
}
return GenericMainDlgProc (hwnd, msg, wParam, lParam,
MAIN_NPANELS, mainp, &page);
RECONF_NPANELS, reconfp, &page);
}
-static void get_sesslist(int allocate) {
+void get_sesslist(int allocate) {
static char *buffer;
int buflen, bufsize, i, ret;
char otherbuf[2048];
int ret;
get_sesslist(TRUE);
+ savedsession[0] = '\0';
ret = DialogBox (hinst, MAKEINTRESOURCE(IDD_MAINBOX), NULL, MainDlgProc);
get_sesslist(FALSE);
ret = DialogBox (hinst, MAKEINTRESOURCE(IDD_RECONF), hwnd, ReconfDlgProc);
if (!ret)
cfg = backup_cfg; /* structure copy */
+ else
+ force_normal(hwnd);
+
return ret;
}
load_settings ("Default Settings", FALSE);
}
-void lognegot (char *string) {
- if (nnegots >= negsize) {
+void logevent (char *string) {
+ if (nevents >= negsize) {
negsize += 64;
- negots = srealloc (negots, negsize * sizeof(*negots));
+ events = srealloc (events, negsize * sizeof(*events));
}
- negots[nnegots] = smalloc(1+strlen(string));
- strcpy (negots[nnegots], string);
- nnegots++;
- if (logbox)
+ events[nevents] = smalloc(1+strlen(string));
+ strcpy (events[nevents], string);
+ nevents++;
+ if (logbox) {
+ int count;
SendDlgItemMessage (logbox, IDN_LIST, LB_ADDSTRING,
0, (LPARAM)string);
+ count = SendDlgItemMessage (logbox, IDN_LIST, LB_GETCOUNT, 0, 0);
+ SendDlgItemMessage (logbox, IDN_LIST, LB_SETTOPINDEX, count-1, 0);
+ }
}
-void shownegot (HWND hwnd) {
+void showeventlog (HWND hwnd) {
if (!logbox) {
logbox = CreateDialog (hinst, MAKEINTRESOURCE(IDD_LOGBOX),
hwnd, LogProc);
}
}
-void verify_ssh_host_key(char *host, struct RSAKey *key) {
- char *keystr, *otherstr, *mungedhost;
- int len;
- HKEY rkey;
+void verify_ssh_host_key(char *host, char *keytype,
+ char *keystr, char *fingerprint) {
+ int ret;
- /*
- * Format the key into a string.
- */
- len = rsastr_len(key);
- keystr = malloc(len);
- if (!keystr)
- fatalbox("Out of memory");
- rsastr_fmt(keystr, key);
+ static const char absentmsg[] =
+ "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"
+ "%s\n"
+ "If you trust this host, hit Yes to add the key to\n"
+ "PuTTY's cache and carry on connecting.\n"
+ "If you do not trust this host, hit No to abandon the\n"
+ "connection.\n";
+
+ static const char wrongmsg[] =
+ "WARNING - POTENTIAL SECURITY BREACH!\n"
+ "\n"
+ "The server's host key does not match the one PuTTY has\n"
+ "cached in the registry. This means that either the\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"
+ "%s\n"
+ "If you were expecting this change and trust the new key,\n"
+ "hit Yes to update PuTTY's cache and continue connecting.\n"
+ "If you want to carry on connecting but without updating\n"
+ "the cache, hit No.\n"
+ "If you want to abandon the connection completely, hit\n"
+ "Cancel. Hitting Cancel is the ONLY guaranteed safe\n"
+ "choice.\n";
+
+ static const char mbtitle[] = "PuTTY Security Alert";
+
+
+ char message[160+ /* sensible fingerprint max size */
+ (sizeof(absentmsg) > sizeof(wrongmsg) ?
+ sizeof(absentmsg) : sizeof(wrongmsg))];
/*
- * Now read a saved key in from the registry and see what it
- * says.
+ * Verify the key against the registry.
*/
- otherstr = malloc(len);
- mungedhost = malloc(3*strlen(host)+1);
- if (!otherstr || !mungedhost)
- fatalbox("Out of memory");
-
- mungestr(host, mungedhost);
-
- if (RegCreateKey(HKEY_CURRENT_USER, PUTTY_REG_POS "\\SshHostKeys",
- &rkey) != ERROR_SUCCESS) {
- if (MessageBox(NULL, "PuTTY was unable to open the host key cache\n"
- "in the registry. There is thus no way to tell\n"
- "if the remote host is what you think it is.\n"
- "Connect anyway?", "PuTTY Problem",
- MB_ICONWARNING | MB_YESNO) == IDNO)
- exit(0);
- } else {
- DWORD readlen = len;
- DWORD type;
- int ret;
-
- ret = RegQueryValueEx(rkey, mungedhost, NULL,
- &type, otherstr, &readlen);
-
- if (ret == ERROR_MORE_DATA ||
- (ret == ERROR_SUCCESS && type == REG_SZ &&
- strcmp(otherstr, keystr))) {
- if (MessageBox(NULL,
- "This host's host key is different from the\n"
- "one cached in the registry! Someone may be\n"
- "impersonating this host for malicious reasons;\n"
- "alternatively, the host key may have changed\n"
- "due to sloppy system administration.\n"
- "Replace key in registry and connect?",
- "PuTTY: Security Warning",
- MB_ICONWARNING | MB_YESNO) == IDNO)
- exit(0);
- RegSetValueEx(rkey, mungedhost, 0, REG_SZ, keystr,
- strlen(keystr)+1);
- } else if (ret != ERROR_SUCCESS || type != REG_SZ) {
- if (MessageBox(NULL,
- "This host's host key is not cached in the\n"
- "registry. Do you want to add it to the cache\n"
- "and carry on connecting?",
- "PuTTY: New Host",
- MB_ICONWARNING | MB_YESNO) == IDNO)
- exit(0);
- RegSetValueEx(rkey, mungedhost, 0, REG_SZ, keystr,
- strlen(keystr)+1);
- }
-
- RegCloseKey(rkey);
+ ret = verify_host_key(host, keytype, keystr);
+
+ if (ret == 0) /* success - key matched OK */
+ return;
+ if (ret == 2) { /* key was different */
+ int mbret;
+ sprintf(message, wrongmsg, fingerprint);
+ mbret = MessageBox(NULL, message, mbtitle,
+ MB_ICONWARNING | MB_YESNOCANCEL);
+ if (mbret == IDYES)
+ store_host_key(host, keytype, keystr);
+ if (mbret == IDCANCEL)
+ exit(0);
+ }
+ if (ret == 1) { /* key was absent */
+ int mbret;
+ sprintf(message, absentmsg, fingerprint);
+ mbret = MessageBox(NULL, message, mbtitle,
+ MB_ICONWARNING | MB_YESNO);
+ if (mbret == IDNO)
+ exit(0);
+ store_host_key(host, keytype, keystr);
}
}
projects / u / mdw / putty / blobdiff