X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/d4de2d2aba8680cc4f6db95d24377b22d9b644e8..d57a8a6d89703f218cc495b344881f632e70b68f:/pageant.c

diff --git a/pageant.c b/pageant.c
index 950889d2..62f60db2 100644
--- a/pageant.c
+++ b/pageant.c
@@ -4,8 +4,7 @@
 
 #include <windows.h>
 #include <aclapi.h>
-#include <stdio.h> /* FIXME */
-#include "putty.h" /* FIXME */
+#include <stdio.h>
 #include "ssh.h"
 #include "tree234.h"
 
@@ -25,6 +24,7 @@
 
 #define IDM_CLOSE    0x0010
 #define IDM_VIEWKEYS 0x0020
+#define IDM_ABOUT    0x0030
 
 #define APPNAME "Pageant"
 
@@ -37,9 +37,12 @@
 #define SSH_AGENTC_ADD_RSA_IDENTITY          7
 #define SSH_AGENTC_REMOVE_RSA_IDENTITY       8
 
+extern char ver[];
+
 HINSTANCE instance;
 HWND hwnd;
 HWND keylist;
+HWND aboutbox;
 HMENU systray_menu;
 
 tree234 *rsakeys;
@@ -92,6 +95,59 @@ struct PassphraseProcStruct {
 };
 
 /*
+ * Dialog-box function for the Licence box.
+ */
+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:
+            EndDialog(hwnd, 1);
+	    return 0;
+	}
+	return 0;
+      case WM_CLOSE:
+	EndDialog(hwnd, 1);
+	return 0;
+    }
+    return 0;
+}
+
+/*
+ * Dialog-box function for the About box.
+ */
+static int CALLBACK AboutProc (HWND hwnd, UINT msg,
+			       WPARAM wParam, LPARAM lParam) {
+    switch (msg) {
+      case WM_INITDIALOG:
+        SetDlgItemText (hwnd, 100, ver);
+	return 1;
+      case WM_COMMAND:
+	switch (LOWORD(wParam)) {
+	  case IDOK:
+	    aboutbox = NULL;
+	    DestroyWindow (hwnd);
+	    return 0;
+	  case 101:
+	    EnableWindow(hwnd, 0);
+	    DialogBox (instance, MAKEINTRESOURCE(214), NULL, LicenceProc);
+	    EnableWindow(hwnd, 1);
+            SetActiveWindow(hwnd);
+	    return 0;
+	}
+	return 0;
+      case WM_CLOSE:
+	aboutbox = NULL;
+	DestroyWindow (hwnd);
+	return 0;
+    }
+    return 0;
+}
+
+/*
  * Dialog-box function for the passphrase box.
  */
 static int CALLBACK PassphraseProc(HWND hwnd, UINT msg,
@@ -143,8 +199,16 @@ void keylist_update(void) {
     if (keylist) {
         SendDlgItemMessage(keylist, 100, LB_RESETCONTENT, 0, 0);
         for (key = first234(rsakeys, &e); key; key = next234(&e)) {
+            char listentry[512], *p;
+            /*
+             * Replace two spaces in the fingerprint with tabs, for
+             * nice alignment in the box.
+             */
+            rsa_fingerprint(listentry, sizeof(listentry), key);
+            p = strchr(listentry, ' '); if (p) *p = '\t';
+            p = strchr(listentry, ' '); if (p) *p = '\t';
             SendDlgItemMessage (keylist, 100, LB_ADDSTRING,
-                                0, (LPARAM) key->comment);
+                                0, (LPARAM)listentry);
         }
         SendDlgItemMessage (keylist, 100, LB_SETCURSEL, (WPARAM) -1, 0);
     }
@@ -185,7 +249,7 @@ void add_keyfile(char *filename) {
     } while (ret == -1);
     if (comment) free(comment);
     if (ret == 0) {
-        MessageBox(NULL, "Couldn't load public key.", APPNAME,
+        MessageBox(NULL, "Couldn't load private key.", APPNAME,
                    MB_OK | MB_ICONERROR);
         free(key);
         return;
@@ -327,6 +391,7 @@ void answer_msg(void *msg) {
                 ret[4] = SSH_AGENT_SUCCESS;
             } else {
                 freersakey(key);
+                free(key);
             }
         }
         break;
@@ -413,10 +478,13 @@ static int CALLBACK KeyListProc(HWND hwnd, UINT msg,
 
     switch (msg) {
       case WM_INITDIALOG:
-        for (key = first234(rsakeys, &e); key; key = next234(&e)) {
-            SendDlgItemMessage (hwnd, 100, LB_ADDSTRING,
-                                0, (LPARAM) key->comment);
-        }
+        keylist = hwnd;
+	{
+	    static int tabs[2] = {25, 175};
+	    SendDlgItemMessage (hwnd, 100, LB_SETTABSTOPS, 2,
+				(LPARAM) tabs);
+	}
+        keylist_update();
         return 0;
       case WM_COMMAND:
 	switch (LOWORD(wParam)) {
@@ -442,7 +510,7 @@ static int CALLBACK KeyListProc(HWND hwnd, UINT msg,
                 of.nMaxFile = sizeof(filename);
                 of.lpstrFileTitle = NULL;
                 of.lpstrInitialDir = NULL;
-                of.lpstrTitle = "Select Public Key File";
+                of.lpstrTitle = "Select Private Key File";
                 of.Flags = 0;
                 if (GetOpenFileName(&of)) {
                     add_keyfile(filename);
@@ -454,7 +522,7 @@ static int CALLBACK KeyListProc(HWND hwnd, UINT msg,
 	    if (HIWORD(wParam) == BN_CLICKED ||
 		HIWORD(wParam) == BN_DOUBLECLICKED) {
 		int n = SendDlgItemMessage (hwnd, 100, LB_GETCURSEL, 0, 0);
-		if (n == LB_ERR || n == 0) {
+		if (n == LB_ERR) {
 		    MessageBeep(0);
 		    break;
 		}
@@ -463,12 +531,7 @@ static int CALLBACK KeyListProc(HWND hwnd, UINT msg,
                         break;
                 del234(rsakeys, key);
                 freersakey(key); free(key);
-                SendDlgItemMessage(hwnd, 100, LB_RESETCONTENT, 0, 0);
-                for (key = first234(rsakeys, &e); key; key = next234(&e)) {
-                    SendDlgItemMessage (hwnd, 100, LB_ADDSTRING,
-                                        0, (LPARAM) key->comment);
-                }
-		SendDlgItemMessage (hwnd, 100, LB_SETCURSEL, (WPARAM) -1, 0);
+                keylist_update();
             }
             return 0;
 	}
@@ -528,6 +591,20 @@ static LRESULT CALLBACK WndProc (HWND hwnd, UINT message,
                               SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
             }
             break;
+          case IDM_ABOUT:
+            if (!aboutbox) {
+                aboutbox = CreateDialog (instance, MAKEINTRESOURCE(213),
+                                         NULL, AboutProc);
+                ShowWindow (aboutbox, SW_SHOWNORMAL);
+                /* 
+                 * Sometimes the window comes up minimised / hidden
+                 * for no obvious reason. Prevent this.
+                 */
+                SetForegroundWindow(aboutbox);
+                SetWindowPos (aboutbox, HWND_TOP, 0, 0, 0, 0,
+                              SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
+            }
+            break;
         }
         break;
       case WM_DESTROY:
@@ -711,7 +788,9 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) {
             DestroyIcon(hicon); 
 
         systray_menu = CreatePopupMenu();
+        /* accelerators used: vxa */
         AppendMenu (systray_menu, MF_ENABLED, IDM_VIEWKEYS, "&View Keys");
+        AppendMenu (systray_menu, MF_ENABLED, IDM_ABOUT, "&About");
         AppendMenu (systray_menu, MF_ENABLED, IDM_CLOSE, "E&xit");
     }