X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/d3a1a808f65812c591ef0de3e61a94b13aa73160..47489d8daef971352cfb1ec30c998ed7b048c97c:/pageant.c

diff --git a/pageant.c b/pageant.c
index d12e02b4..0826bf4e 100644
--- a/pageant.c
+++ b/pageant.c
@@ -59,6 +59,23 @@ static char *putty_path;
 #define PUTTY_DEFAULT     "Default%20Settings"
 static int initial_menuitems_count;
 
+/*
+ * Print a modal (Really Bad) message box and perform a fatal exit.
+ */
+void modalfatalbox(char *fmt, ...)
+{
+    va_list ap;
+    char *buf;
+
+    va_start(ap, fmt);
+    buf = dupvprintf(fmt, ap);
+    va_end(ap);
+    MessageBox(main_hwnd, buf, "Pageant Fatal Error",
+	       MB_SYSTEMMODAL | MB_ICONERROR | MB_OK);
+    sfree(buf);
+    exit(1);
+}
+
 /* Un-munge session names out of the registry. */
 static void unmungestr(char *in, char *out, int outlen)
 {
@@ -137,14 +154,6 @@ struct blob {
 };
 static int cmpkeys_ssh2_asymm(void *av, void *bv);
 
-/*
- * This function is needed to link with the DES code. We need not
- * have it do anything at all.
- */
-void logevent(char *msg)
-{
-}
-
 #define GET_32BIT(cp) \
     (((unsigned long)(unsigned char)(cp)[0] << 24) | \
     ((unsigned long)(unsigned char)(cp)[1] << 16) | \
@@ -607,7 +616,7 @@ static void add_keyfile(char *filename)
 	    agent_query(request, reqlen, &vresponse, &resplen);
 	    response = vresponse;
 	    if (resplen < 5 || response[4] != SSH_AGENT_SUCCESS)
-		MessageBox(NULL, "The already running Pageant"
+		MessageBox(NULL, "The already running Pageant "
 			   "refused to add the key.", APPNAME,
 			   MB_OK | MB_ICONERROR);
 
@@ -1241,7 +1250,8 @@ static void prompt_add_keyfile(void)
     of.lStructSize = sizeof(of);
 #endif
     of.hwndOwner = main_hwnd;
-    of.lpstrFilter = "PuTTY Private Key Files\0*.PPK\0AllFiles\0*\0\0\0";
+    of.lpstrFilter = "PuTTY Private Key Files (*.ppk)\0*.PPK\0"
+	"AllFiles\0*\0\0\0";
     of.lpstrCustomFilter = NULL;
     of.nFilterIndex = 1;
     of.lpstrFile = filelist;
@@ -1596,14 +1606,17 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 		keylist = CreateDialog(instance, MAKEINTRESOURCE(211),
 				       NULL, KeyListProc);
 		ShowWindow(keylist, SW_SHOWNORMAL);
-		/* 
-		 * Sometimes the window comes up minimised / hidden
-		 * for no obvious reason. Prevent this.
-		 */
-		SetForegroundWindow(keylist);
-		SetWindowPos(keylist, HWND_TOP, 0, 0, 0, 0,
-			     SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
 	    }
+	    /* 
+	     * Sometimes the window comes up minimised / hidden for
+	     * no obvious reason. Prevent this. This also brings it
+	     * to the front if it's already present (the user
+	     * selected View Keys because they wanted to _see_ the
+	     * thing).
+	     */
+	    SetForegroundWindow(keylist);
+	    SetWindowPos(keylist, HWND_TOP, 0, 0, 0, 0,
+			 SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
 	    break;
 	  case IDM_ADDKEY:
 	    if (passphrase_box) {
@@ -1770,10 +1783,11 @@ void spawn_cmd(char *cmdline, char * args, int show)
 {
     if (ShellExecute(NULL, _T("open"), cmdline,
 		     args, NULL, show) <= (HINSTANCE) 32) {
-	TCHAR sMsg[140];
-	sprintf(sMsg, _T("Failed to run \"%.100s\", Error: %d"), cmdline,
-		(int)GetLastError());
-	MessageBox(NULL, sMsg, APPNAME, MB_OK | MB_ICONEXCLAMATION);
+	char *msg;
+	msg = dupprintf("Failed to run \"%.100s\", Error: %d", cmdline,
+			(int)GetLastError());
+	MessageBox(NULL, msg, APPNAME, MB_OK | MB_ICONEXCLAMATION);
+	sfree(msg);
     }
 }
 
@@ -1997,8 +2011,11 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
      * Main message loop.
      */
     while (GetMessage(&msg, NULL, 0, 0) == 1) {
-	TranslateMessage(&msg);
-	DispatchMessage(&msg);
+	if (!(IsWindow(keylist) && IsDialogMessage(keylist, &msg)) &&
+	    !(IsWindow(aboutbox) && IsDialogMessage(aboutbox, &msg))) {
+	    TranslateMessage(&msg);
+	    DispatchMessage(&msg);
+	}
     }
 
     /* Clean up the system tray icon */