nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-22 14:39:24 -05:00
Code Issues Projects Releases Wiki Activity

winpgnt: GUI actions to add keys encrypted.

Browse Source 
I've added a new option to the system tray menu, and a new button to
the key list window.
This commit is contained in:
Simon Tatham 2021-04-02 11:14:44 +01:00
parent af6adb5c4b
commit b0f9e3a6ad
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
windows/pageant.rc
View File

@ -45,6 +45,7 @@ BEGIN
LISTBOX 100, 10, 10, 420, 155, LISTBOX 100, 10, 10, 420, 155,
LBS_EXTENDEDSEL | LBS_HASSTRINGS | LBS_USETABSTOPS | WS_VSCROLL | WS_TABSTOP LBS_EXTENDEDSEL | LBS_HASSTRINGS | LBS_USETABSTOPS | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "&Add Key", 101, 75, 187, 60, 14 PUSHBUTTON "&Add Key", 101, 75, 187, 60, 14
PUSHBUTTON "Add Key (&encrypted)", 110, 150, 187, 100, 14
PUSHBUTTON "&Remove Key", 102, 315, 187, 60, 14 PUSHBUTTON "&Remove Key", 102, 315, 187, 60, 14
PUSHBUTTON "&Help", 103, 10, 187, 50, 14 PUSHBUTTON "&Help", 103, 10, 187, 50, 14
DEFPUSHBUTTON "&Close", IDOK, 390, 187, 50, 14 DEFPUSHBUTTON "&Close", IDOK, 390, 187, 50, 14

27
windows/winpgnt.c
View File

@ -41,11 +41,12 @@
* attempt to store information in them. Hence all these identifiers have * attempt to store information in them. Hence all these identifiers have
* the low 4 bits clear. Also, identifiers should < 0xF000. */ * the low 4 bits clear. Also, identifiers should < 0xF000. */
#define IDM_CLOSE 0x0010 #define IDM_CLOSE 0x0010
#define IDM_VIEWKEYS 0x0020 #define IDM_VIEWKEYS 0x0020
#define IDM_ADDKEY 0x0030 #define IDM_ADDKEY 0x0030
#define IDM_HELP 0x0040 #define IDM_ADDKEY_ENCRYPTED 0x0040
#define IDM_ABOUT 0x0050 #define IDM_HELP 0x0050
#define IDM_ABOUT 0x0060
#define APPNAME "Pageant" #define APPNAME "Pageant"
@ -71,7 +72,7 @@ static bool restrict_putty_acl = false;
/* CWD for "add key" file requester. */ /* CWD for "add key" file requester. */
static filereq *keypath = NULL; static filereq *keypath = NULL;
#define IDM_PUTTY 0x0060 #define IDM_PUTTY 0x0070
#define IDM_SESSIONS_BASE 0x1000 #define IDM_SESSIONS_BASE 0x1000
#define IDM_SESSIONS_MAX 0x2000 #define IDM_SESSIONS_MAX 0x2000
#define PUTTY_REGKEY "Software\\SimonTatham\\PuTTY\\Sessions" #define PUTTY_REGKEY "Software\\SimonTatham\\PuTTY\\Sessions"
@ -568,6 +569,7 @@ static INT_PTR CALLBACK KeyListProc(HWND hwnd, UINT msg,
DestroyWindow(hwnd); DestroyWindow(hwnd);
return 0; return 0;
case 101: /* add key */ case 101: /* add key */
case 110: /* add key encrypted */
if (HIWORD(wParam) == BN_CLICKED || if (HIWORD(wParam) == BN_CLICKED ||
HIWORD(wParam) == BN_DOUBLECLICKED) { HIWORD(wParam) == BN_DOUBLECLICKED) {
if (modal_passphrase_hwnd) { if (modal_passphrase_hwnd) {
@ -575,7 +577,7 @@ static INT_PTR CALLBACK KeyListProc(HWND hwnd, UINT msg,
SetForegroundWindow(modal_passphrase_hwnd); SetForegroundWindow(modal_passphrase_hwnd);
break; break;
} }
prompt_add_keyfile(false); prompt_add_keyfile(LOWORD(wParam) == 110);
} }
return 0; return 0;
case 102: /* remove key */ case 102: /* remove key */
@ -1109,8 +1111,9 @@ static LRESULT CALLBACK TrayWndProc(HWND hwnd, UINT message,
} }
break; break;
case WM_COMMAND: case WM_COMMAND:
case WM_SYSCOMMAND: case WM_SYSCOMMAND: {
switch (wParam & ~0xF) { /* low 4 bits reserved to Windows */ unsigned command = wParam & ~0xF; /* low 4 bits reserved to Windows */
switch (command) {
case IDM_PUTTY: { case IDM_PUTTY: {
TCHAR cmdline[10]; TCHAR cmdline[10];
cmdline[0] = '\0'; cmdline[0] = '\0';
@ -1147,12 +1150,13 @@ static LRESULT CALLBACK TrayWndProc(HWND hwnd, UINT message,
SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW); SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
break; break;
case IDM_ADDKEY: case IDM_ADDKEY:
case IDM_ADDKEY_ENCRYPTED:
if (modal_passphrase_hwnd) { if (modal_passphrase_hwnd) {
MessageBeep(MB_ICONERROR); MessageBeep(MB_ICONERROR);
SetForegroundWindow(modal_passphrase_hwnd); SetForegroundWindow(modal_passphrase_hwnd);
break; break;
} }
prompt_add_keyfile(false); prompt_add_keyfile(command == IDM_ADDKEY_ENCRYPTED);
break; break;
case IDM_ABOUT: case IDM_ABOUT:
if (!aboutbox) { if (!aboutbox) {
@ -1197,6 +1201,7 @@ static LRESULT CALLBACK TrayWndProc(HWND hwnd, UINT message,
} }
} }
break; break;
}
case WM_DESTROY: case WM_DESTROY:
quit_help(hwnd); quit_help(hwnd);
PostQuitMessage(0); PostQuitMessage(0);
@ -1545,6 +1550,8 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
AppendMenu(systray_menu, MF_ENABLED, IDM_VIEWKEYS, AppendMenu(systray_menu, MF_ENABLED, IDM_VIEWKEYS,
"&View Keys"); "&View Keys");
AppendMenu(systray_menu, MF_ENABLED, IDM_ADDKEY, "Add &Key"); AppendMenu(systray_menu, MF_ENABLED, IDM_ADDKEY, "Add &Key");
AppendMenu(systray_menu, MF_ENABLED, IDM_ADDKEY_ENCRYPTED,
"Add key (encrypted)");
AppendMenu(systray_menu, MF_SEPARATOR, 0, 0); AppendMenu(systray_menu, MF_SEPARATOR, 0, 0);
if (has_help()) if (has_help())
AppendMenu(systray_menu, MF_ENABLED, IDM_HELP, "&Help"); AppendMenu(systray_menu, MF_ENABLED, IDM_HELP, "&Help");