X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/89ee5268a99aac30dbdf36bc3a02074d34e653f2..97749503efe4cffb1c588588c8ff3b24bab2988b:/windlg.c diff --git a/windlg.c b/windlg.c index 84dfa655..60d19052 100644 --- a/windlg.c +++ b/windlg.c @@ -1,95 +1,39 @@ #include #include #include +#ifndef AUTO_WINSOCK +#ifdef WINSOCK_TWO +#include +#else #include +#endif +#endif #include #include #include "ssh.h" #include "putty.h" #include "win_res.h" +#include "storage.h" #define NPANELS 8 #define MAIN_NPANELS 8 #define RECONF_NPANELS 5 -static const char *const puttystr = PUTTY_REG_POS "\\Sessions"; - static char **events = NULL; static int nevents = 0, negsize = 0; static HWND logbox = NULL, abtbox = NULL; -static char hex[16] = "0123456789ABCDEF"; - -static void mungestr(char *in, char *out) { - int candot = 0; - - while (*in) { - if (*in == ' ' || *in == '\\' || *in == '*' || *in == '?' || - *in == '%' || *in < ' ' || *in > '~' || (*in == '.' && !candot)) { - *out++ = '%'; - *out++ = hex[((unsigned char)*in) >> 4]; - *out++ = hex[((unsigned char)*in) & 15]; - } else - *out++ = *in; - in++; - candot = 1; - } - *out = '\0'; - return; -} - -static void unmungestr(char *in, char *out) { - while (*in) { - if (*in == '%' && in[1] && in[2]) { - int i, j; - - i = in[1] - '0'; i -= (i > 9 ? 7 : 0); - j = in[2] - '0'; j -= (j > 9 ? 7 : 0); - - *out++ = (i<<4) + j; - in += 3; - } else - *out++ = *in++; - } - *out = '\0'; - return; -} - -static void wpps(HKEY key, LPCTSTR name, LPCTSTR value) { - RegSetValueEx(key, name, 0, REG_SZ, value, 1+strlen(value)); -} - -static void wppi(HKEY key, LPCTSTR name, int value) { - RegSetValueEx(key, name, 0, REG_DWORD, - (CONST BYTE *)&value, sizeof(value)); -} - -static void gpps(HKEY key, LPCTSTR name, LPCTSTR def, - LPTSTR val, int len) { - DWORD type, size; - size = len; - - if (key == NULL || - RegQueryValueEx(key, name, 0, &type, val, &size) != ERROR_SUCCESS || - type != REG_SZ) { +static void gpps(void *handle, char *name, char *def, char *val, int len) { + if (!read_setting_s(handle, name, val, len)) { strncpy(val, def, len); val[len-1] = '\0'; } } -static void gppi(HKEY key, LPCTSTR name, int def, int *i) { - DWORD type, val, size; - size = sizeof(val); - - if (key == NULL || - RegQueryValueEx(key, name, 0, &type, - (BYTE *)&val, &size) != ERROR_SUCCESS || - size != sizeof(val) || type != REG_DWORD) - *i = def; - else - *i = val; +static void gppi(void *handle, char *name, int def, int *i) { + *i = read_setting_i(handle, name, def); } static HINSTANCE hinst; @@ -98,36 +42,29 @@ static int readytogo; static void save_settings (char *section, int do_host) { int i; - HKEY subkey1, sesskey; char *p; + void *sesskey; - p = malloc(3*strlen(section)+1); - mungestr(section, p); - - if (RegCreateKey(HKEY_CURRENT_USER, puttystr, &subkey1)!=ERROR_SUCCESS || - RegCreateKey(subkey1, p, &sesskey) != ERROR_SUCCESS) { - sesskey = NULL; - } - - free(p); - RegCloseKey(subkey1); + sesskey = open_settings_w(section); + if (!sesskey) + return; - wppi (sesskey, "Present", 1); + write_setting_i (sesskey, "Present", 1); if (do_host) { - wpps (sesskey, "HostName", cfg.host); - wppi (sesskey, "PortNumber", cfg.port); + write_setting_s (sesskey, "HostName", cfg.host); + write_setting_i (sesskey, "PortNumber", cfg.port); p = "raw"; - for (i = 0; backends[i].backend != NULL; i++) + for (i = 0; backends[i].name != NULL; i++) if (backends[i].protocol == cfg.protocol) { p = backends[i].name; break; } - wpps (sesskey, "Protocol", p); + write_setting_s (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); + write_setting_i (sesskey, "CloseOnExit", !!cfg.close_on_exit); + write_setting_i (sesskey, "WarnOnClose", !!cfg.warn_on_close); + write_setting_s (sesskey, "TerminalType", cfg.termtype); + write_setting_s (sesskey, "TerminalSpeed", cfg.termspeed); { char buf[2*sizeof(cfg.environmt)], *p, *q; p = buf; @@ -145,45 +82,51 @@ static void save_settings (char *section, int do_host) { q++; } *p = '\0'; - wpps (sesskey, "Environment", buf); + write_setting_s (sesskey, "Environment", buf); } - wpps (sesskey, "UserName", cfg.username); - wppi (sesskey, "NoPTY", cfg.nopty); - wpps (sesskey, "Cipher", cfg.cipher == CIPHER_BLOWFISH ? "blowfish" : + write_setting_s (sesskey, "UserName", cfg.username); + write_setting_i (sesskey, "NoPTY", cfg.nopty); + write_setting_i (sesskey, "AgentFwd", cfg.agentfwd); + write_setting_s (sesskey, "RemoteCmd", cfg.remote_cmd); + write_setting_s (sesskey, "Cipher", cfg.cipher == CIPHER_BLOWFISH ? "blowfish" : cfg.cipher == CIPHER_DES ? "des" : "3des"); - wppi (sesskey, "AuthTIS", cfg.try_tis_auth); - 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, "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, "ScrollbackLines", cfg.savelines); - wppi (sesskey, "DECOriginMode", cfg.dec_om); - wppi (sesskey, "AutoWrapMode", cfg.wrap_mode); - wppi (sesskey, "LFImpliesCR", cfg.lfhascr); - wppi (sesskey, "WinNameAlways", cfg.win_name_always); - wppi (sesskey, "TermWidth", cfg.width); - 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); - wppi (sesskey, "BoldAsColour", cfg.bold_colour); + write_setting_i (sesskey, "AuthTIS", cfg.try_tis_auth); + write_setting_i (sesskey, "SshProt", cfg.sshprot); + write_setting_s (sesskey, "PublicKeyFile", cfg.keyfile); + write_setting_i (sesskey, "RFCEnviron", cfg.rfc_environ); + write_setting_i (sesskey, "BackspaceIsDelete", cfg.bksp_is_delete); + write_setting_i (sesskey, "RXVTHomeEnd", cfg.rxvt_homeend); + write_setting_i (sesskey, "LinuxFunctionKeys", cfg.funky_type); + write_setting_i (sesskey, "ApplicationCursorKeys", cfg.app_cursor); + write_setting_i (sesskey, "ApplicationKeypad", cfg.app_keypad); + write_setting_i (sesskey, "NetHackKeypad", cfg.nethack_keypad); + write_setting_i (sesskey, "AltF4", cfg.alt_f4); + write_setting_i (sesskey, "AltSpace", cfg.alt_space); + write_setting_i (sesskey, "LdiscTerm", cfg.ldisc_term); + write_setting_i (sesskey, "BlinkCur", cfg.blink_cur); + write_setting_i (sesskey, "Beep", cfg.beep); + write_setting_i (sesskey, "ScrollbackLines", cfg.savelines); + write_setting_i (sesskey, "DECOriginMode", cfg.dec_om); + write_setting_i (sesskey, "AutoWrapMode", cfg.wrap_mode); + write_setting_i (sesskey, "LFImpliesCR", cfg.lfhascr); + write_setting_i (sesskey, "WinNameAlways", cfg.win_name_always); + write_setting_i (sesskey, "TermWidth", cfg.width); + write_setting_i (sesskey, "TermHeight", cfg.height); + write_setting_s (sesskey, "Font", cfg.font); + write_setting_i (sesskey, "FontIsBold", cfg.fontisbold); + write_setting_i (sesskey, "FontCharSet", cfg.fontcharset); + write_setting_i (sesskey, "FontHeight", cfg.fontheight); + write_setting_i (sesskey, "FontVTMode", cfg.vtmode); + write_setting_i (sesskey, "TryPalette", cfg.try_palette); + write_setting_i (sesskey, "BoldAsColour", cfg.bold_colour); for (i=0; i<22; i++) { char buf[20], buf2[30]; sprintf(buf, "Colour%d", i); sprintf(buf2, "%d,%d,%d", cfg.colours[i][0], cfg.colours[i][1], cfg.colours[i][2]); - wpps (sesskey, buf, buf2); + write_setting_s (sesskey, buf, buf2); } - wppi (sesskey, "MouseIsXterm", cfg.mouse_is_xterm); + write_setting_i (sesskey, "MouseIsXterm", cfg.mouse_is_xterm); for (i=0; i<256; i+=32) { char buf[20], buf2[256]; int j; @@ -193,56 +136,33 @@ static void save_settings (char *section, int do_host) { sprintf(buf2+strlen(buf2), "%s%d", (*buf2 ? "," : ""), cfg.wordness[j]); } - wpps (sesskey, buf, buf2); + write_setting_s (sesskey, buf, buf2); } - wppi (sesskey, "KoiWinXlat", cfg.xlat_enablekoiwin); - wppi (sesskey, "88592Xlat", cfg.xlat_88592w1250); - wppi (sesskey, "CapsLockCyr", cfg.xlat_capslockcyr); - - RegCloseKey(sesskey); -} - -static void del_session (char *section) { - HKEY subkey1; - char *p; - - if (RegOpenKey(HKEY_CURRENT_USER, puttystr, &subkey1) != ERROR_SUCCESS) - return; - - p = malloc(3*strlen(section)+1); - mungestr(section, p); - RegDeleteKey(subkey1, p); - free(p); - - RegCloseKey(subkey1); + write_setting_i (sesskey, "KoiWinXlat", cfg.xlat_enablekoiwin); + write_setting_i (sesskey, "88592Xlat", cfg.xlat_88592w1250); + write_setting_i (sesskey, "CapsLockCyr", cfg.xlat_capslockcyr); + write_setting_i (sesskey, "ScrollBar", cfg.scrollbar); + write_setting_i (sesskey, "ScrollOnKey", cfg.scroll_on_key); + write_setting_i (sesskey, "LockSize", cfg.locksize); + write_setting_i (sesskey, "BCE", cfg.bce); + write_setting_i (sesskey, "BlinkText", cfg.blinktext); + + close_settings_w(sesskey); } static void load_settings (char *section, int do_host) { int i; - HKEY subkey1, sesskey; - char *p; char prot[10]; + void *sesskey; - p = malloc(3*strlen(section)+1); - mungestr(section, 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); + sesskey = open_settings_r(section); 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].backend != NULL; i++) + for (i = 0; backends[i].name != NULL; i++) if (!strcmp(prot, backends[i].name)) { cfg.protocol = backends[i].protocol; break; @@ -258,7 +178,7 @@ static void load_settings (char *section, int do_host) { 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++; @@ -266,7 +186,7 @@ static void load_settings (char *section, int do_host) { c = '\t'; if (c == '\\') c = *p++; - *p++ = c; + *q++ = c; } if (*p == ',') p++; *q++ = '\0'; @@ -275,6 +195,8 @@ static void load_settings (char *section, int do_host) { } 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); @@ -285,17 +207,21 @@ static void load_settings (char *section, int do_host) { 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); @@ -307,7 +233,7 @@ static void load_settings (char *section, int do_host) { gppi (sesskey, "FontIsBold", 0, &cfg.fontisbold); gppi (sesskey, "FontCharSet", ANSI_CHARSET, &cfg.fontcharset); gppi (sesskey, "FontHeight", 10, &cfg.fontheight); - gppi (sesskey, "FontVTMode", VT_POORMAN, (int *)&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++) { @@ -355,8 +281,31 @@ static void load_settings (char *section, int do_host) { 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); + close_settings_r(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) { @@ -385,6 +334,46 @@ static int CALLBACK LogProc (HWND hwnd, UINT msg, 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: @@ -403,14 +392,12 @@ static int CALLBACK LicenceProc (HWND hwnd, UINT msg, case WM_COMMAND: switch (LOWORD(wParam)) { case IDOK: - abtbox = NULL; - DestroyWindow (hwnd); + EndDialog(hwnd, 1); return 0; } return 0; case WM_CLOSE: - abtbox = NULL; - DestroyWindow (hwnd); + EndDialog(hwnd, 1); return 0; } return 0; @@ -438,6 +425,7 @@ static int CALLBACK AboutProc (HWND hwnd, UINT msg, DialogBox (hinst, MAKEINTRESOURCE(IDD_LICENCEBOX), NULL, LicenceProc); EnableWindow(hwnd, 1); + SetActiveWindow(hwnd); return 0; } return 0; @@ -468,6 +456,8 @@ static int GeneralPanelProc (HWND hwnd, UINT msg, return 0; } +static char savedsession[2048]; + static int CALLBACK ConnectionProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { int i; @@ -475,6 +465,7 @@ static int CALLBACK ConnectionProc (HWND hwnd, UINT msg, 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, @@ -531,9 +522,13 @@ static int CALLBACK ConnectionProc (HWND hwnd, UINT msg, 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 || @@ -614,7 +609,7 @@ static int CALLBACK ConnectionProc (HWND hwnd, UINT msg, MessageBeep(0); break; } - del_session(sessions[n]); + del_settings(sessions[n]); get_sesslist (FALSE); get_sesslist (TRUE); SendDlgItemMessage (hwnd, IDC0_SESSLIST, LB_RESETCONTENT, @@ -638,8 +633,11 @@ static int CALLBACK KeyboardProc (HWND hwnd, UINT msg, 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_KPNH, @@ -648,6 +646,7 @@ static int CALLBACK KeyboardProc (HWND hwnd, UINT msg, 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 || @@ -661,9 +660,12 @@ static int CALLBACK KeyboardProc (HWND hwnd, UINT msg, 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: @@ -693,6 +695,11 @@ static int CALLBACK KeyboardProc (HWND hwnd, UINT msg, 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); @@ -727,11 +734,12 @@ static int CALLBACK TerminalProc (HWND hwnd, UINT msg, 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)) { @@ -796,16 +804,36 @@ static int CALLBACK TerminalProc (HWND hwnd, UINT msg, 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; } @@ -930,17 +958,23 @@ static int CALLBACK TelnetProc (HWND hwnd, UINT msg, 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)) { @@ -959,6 +993,11 @@ static int CALLBACK SshProc (HWND hwnd, UINT msg, 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: @@ -972,11 +1011,51 @@ static int CALLBACK SshProc (HWND hwnd, UINT msg, 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; } @@ -1156,7 +1235,7 @@ static int CALLBACK ColourProc (HWND hwnd, UINT msg, return GeneralPanelProc (hwnd, msg, wParam, lParam); } -static int CALLBACK LanguageProc (HWND hwnd, UINT msg, +static int CALLBACK TranslationProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) { case WM_INITDIALOG: @@ -1165,6 +1244,11 @@ static int CALLBACK LanguageProc (HWND hwnd, UINT msg, 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: @@ -1182,6 +1266,16 @@ static int CALLBACK LanguageProc (HWND hwnd, UINT msg, 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); @@ -1189,7 +1283,7 @@ static int CALLBACK LanguageProc (HWND hwnd, UINT msg, static DLGPROC panelproc[NPANELS] = { ConnectionProc, KeyboardProc, TerminalProc, - TelnetProc, SshProc, SelectionProc, ColourProc, LanguageProc + TelnetProc, SshProc, SelectionProc, ColourProc, TranslationProc }; static char *panelids[NPANELS] = { MAKEINTRESOURCE(IDD_PANEL0), @@ -1204,7 +1298,7 @@ static char *panelids[NPANELS] = { static char *names[NPANELS] = { "Connection", "Keyboard", "Terminal", "Telnet", - "SSH", "Selection", "Colours", "Language" + "SSH", "Selection", "Colours", "Translation" }; static int mainp[MAIN_NPANELS] = { 0, 1, 2, 3, 4, 5, 6, 7}; @@ -1282,6 +1376,12 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg, 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; } @@ -1315,6 +1415,7 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg, DialogBox(hinst, MAKEINTRESOURCE(IDD_ABOUTBOX), GetParent(hwnd), AboutProc); EnableWindow(hwnd, 1); + SetActiveWindow(hwnd); } return GenericMainDlgProc (hwnd, msg, wParam, lParam, MAIN_NPANELS, mainp, &page); @@ -1328,29 +1429,32 @@ static int CALLBACK ReconfDlgProc (HWND hwnd, UINT msg, } void get_sesslist(int allocate) { + static char otherbuf[2048]; static char *buffer; - int buflen, bufsize, i, ret; - char otherbuf[2048]; - char *p; - HKEY subkey1; + int buflen, bufsize, i; + char *p, *ret; + void *handle; if (allocate) { - if (RegCreateKey(HKEY_CURRENT_USER, - puttystr, &subkey1) != ERROR_SUCCESS) + + if ((handle = enum_settings_start()) == NULL) return; buflen = bufsize = 0; buffer = NULL; - i = 0; do { - ret = RegEnumKey(subkey1, i++, otherbuf, sizeof(otherbuf)); - if (ret == ERROR_SUCCESS) { - bufsize = buflen + 2048; - buffer = srealloc(buffer, bufsize); - unmungestr(otherbuf, buffer+buflen); + ret = enum_settings_next(handle, otherbuf, sizeof(otherbuf)); + if (ret) { + int len = strlen(otherbuf)+1; + if (bufsize < buflen+len) { + bufsize = buflen + len + 2048; + buffer = srealloc(buffer, bufsize); + } + strcpy(buffer+buflen, otherbuf); buflen += strlen(buffer+buflen)+1; } - } while (ret == ERROR_SUCCESS); + } while (ret); + enum_settings_finish(handle); buffer = srealloc(buffer, buflen+1); buffer[buflen] = '\0'; @@ -1383,6 +1487,7 @@ int do_config (void) { int ret; get_sesslist(TRUE); + savedsession[0] = '\0'; ret = DialogBox (hinst, MAKEINTRESOURCE(IDD_MAINBOX), NULL, MainDlgProc); get_sesslist(FALSE); @@ -1397,6 +1502,9 @@ int do_reconfig (HWND hwnd) { ret = DialogBox (hinst, MAKEINTRESOURCE(IDD_RECONF), hwnd, ReconfDlgProc); if (!ret) cfg = backup_cfg; /* structure copy */ + else + force_normal(hwnd); + return ret; } @@ -1415,9 +1523,13 @@ void logevent (char *string) { events[nevents] = smalloc(1+strlen(string)); strcpy (events[nevents], string); nevents++; - if (logbox) + 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 showeventlog (HWND hwnd) { @@ -1436,67 +1548,70 @@ void showabout (HWND hwnd) { } } -void verify_ssh_host_key(char *host, char *keystr) { - char *otherstr, *mungedhost; - int len; - HKEY rkey; +void verify_ssh_host_key(char *host, int port, char *keytype, + char *keystr, char *fingerprint) { + int ret; + + 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"; - len = 1 + strlen(keystr); + + 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, port, 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, port, 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, port, keytype, keystr); } }