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

Add an "Add Key" option to the systray menu in Pageant

Browse Source 
[originally from svn r710]
This commit is contained in:
Simon Tatham 2000-10-12 15:26:40 +00:00
parent 95697270b5
commit 633ae5a22b
1 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
pageant.c
View File

@ -26,7 +26,8 @@
#define IDM_CLOSE 0x0010 #define IDM_CLOSE 0x0010
#define IDM_VIEWKEYS 0x0020 #define IDM_VIEWKEYS 0x0020
#define IDM_ABOUT 0x0030 #define IDM_ADDKEY 0x0030
#define IDM_ABOUT 0x0040
#define APPNAME "Pageant" #define APPNAME "Pageant"
@ -161,6 +162,9 @@ static int CALLBACK PassphraseProc(HWND hwnd, UINT msg,
switch (msg) { switch (msg) {
case WM_INITDIALOG: case WM_INITDIALOG:
SetForegroundWindow(hwnd);
SetWindowPos (hwnd, HWND_TOP, 0, 0, 0, 0,
SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
p = (struct PassphraseProcStruct *)lParam; p = (struct PassphraseProcStruct *)lParam;
passphrase = p->passphrase; passphrase = p->passphrase;
if (p->comment) if (p->comment)
@ -470,6 +474,34 @@ static void error(char *s) {
MessageBox(hwnd, s, APPNAME, MB_OK | MB_ICONERROR); MessageBox(hwnd, s, APPNAME, MB_OK | MB_ICONERROR);
} }
/*
* Prompt for a key file to add, and add it.
*/
static void prompt_add_keyfile(void) {
OPENFILENAME of;
char filename[FILENAME_MAX];
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; *filename = '\0';
of.nMaxFile = sizeof(filename);
of.lpstrFileTitle = NULL;
of.lpstrInitialDir = NULL;
of.lpstrTitle = "Select Private Key File";
of.Flags = 0;
if (GetOpenFileName(&of)) {
add_keyfile(filename);
keylist_update();
}
}
/* /*
* Dialog-box function for the key list box. * Dialog-box function for the key list box.
*/ */
@ -477,8 +509,6 @@ static int CALLBACK KeyListProc(HWND hwnd, UINT msg,
WPARAM wParam, LPARAM lParam) { WPARAM wParam, LPARAM lParam) {
enum234 e; enum234 e;
struct RSAKey *key; struct RSAKey *key;
OPENFILENAME of;
char filename[FILENAME_MAX];
switch (msg) { switch (msg) {
case WM_INITDIALOG: case WM_INITDIALOG:
@ -500,26 +530,7 @@ static int CALLBACK KeyListProc(HWND hwnd, UINT msg,
case 101: /* add key */ case 101: /* add key */
if (HIWORD(wParam) == BN_CLICKED || if (HIWORD(wParam) == BN_CLICKED ||
HIWORD(wParam) == BN_DOUBLECLICKED) { HIWORD(wParam) == BN_DOUBLECLICKED) {
memset(&of, 0, sizeof(of)); prompt_add_keyfile();
#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; *filename = '\0';
of.nMaxFile = sizeof(filename);
of.lpstrFileTitle = NULL;
of.lpstrInitialDir = NULL;
of.lpstrTitle = "Select Private Key File";
of.Flags = 0;
if (GetOpenFileName(&of)) {
add_keyfile(filename);
keylist_update();
}
} }
return 0; return 0;
case 102: /* remove key */ case 102: /* remove key */
@ -595,6 +606,9 @@ static LRESULT CALLBACK WndProc (HWND hwnd, UINT message,
SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW); SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
} }
break; break;
case IDM_ADDKEY:
prompt_add_keyfile();
break;
case IDM_ABOUT: case IDM_ABOUT:
if (!aboutbox) { if (!aboutbox) {
aboutbox = CreateDialog (instance, MAKEINTRESOURCE(213), aboutbox = CreateDialog (instance, MAKEINTRESOURCE(213),
@ -802,8 +816,9 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) {
DestroyIcon(hicon); DestroyIcon(hicon);
systray_menu = CreatePopupMenu(); systray_menu = CreatePopupMenu();
/* accelerators used: vxa */ /* accelerators used: vkxa */
AppendMenu (systray_menu, MF_ENABLED, IDM_VIEWKEYS, "&View Keys"); AppendMenu (systray_menu, MF_ENABLED, IDM_VIEWKEYS, "&View Keys");
AppendMenu (systray_menu, MF_ENABLED, IDM_ADDKEY, "Add &Key");
AppendMenu (systray_menu, MF_ENABLED, IDM_ABOUT, "&About"); AppendMenu (systray_menu, MF_ENABLED, IDM_ABOUT, "&About");
AppendMenu (systray_menu, MF_ENABLED, IDM_CLOSE, "E&xit"); AppendMenu (systray_menu, MF_ENABLED, IDM_CLOSE, "E&xit");
} }