Make Pageant use the same SID-selection logic as the Pageant client

[u/mdw/putty] / windows / winutils.c

diff --git a/windows/winutils.c b/windows/winutils.c
index 5bead7b..40f1f4a 100644 (file)
--- a/windows/winutils.c
+++ b/windows/winutils.c
@@ -5,9 +5,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include <limits.h>
 
-#include "winstuff.h"
+#include "putty.h"
 #include "misc.h"
 
 #ifdef TESTMODE
@@ -26,7 +25,7 @@
  */
 
 struct filereq_tag {
-    TCHAR cwd[PATH_MAX];
+    TCHAR cwd[MAX_PATH];
 };
 
 /*
@@ -37,7 +36,7 @@ struct filereq_tag {
  */
 BOOL request_file(filereq *state, OPENFILENAME *of, int preserve, int save)
 {
-    TCHAR cwd[PATH_MAX]; /* process CWD */
+    TCHAR cwd[MAX_PATH]; /* process CWD */
     BOOL ret;
 
     /* Get process CWD */
@@ -95,25 +94,20 @@ void filereq_free(filereq *state)
 /* Callback function to launch context help. */
 static VOID CALLBACK message_box_help_callback(LPHELPINFO lpHelpInfo)
 {
-    if (help_path) {
-       char *context = NULL;
+    char *context = NULL;
 #define CHECK_CTX(name) \
-       do { \
-           if (lpHelpInfo->dwContextId == WINHELP_CTXID_ ## name) \
-               context = WINHELP_CTX_ ## name; \
-       } while (0)
-       CHECK_CTX(errors_hostkey_absent);
-       CHECK_CTX(errors_hostkey_changed);
+    do { \
+       if (lpHelpInfo->dwContextId == WINHELP_CTXID_ ## name) \
+           context = WINHELP_CTX_ ## name; \
+    } while (0)
+    CHECK_CTX(errors_hostkey_absent);
+    CHECK_CTX(errors_hostkey_changed);
+    CHECK_CTX(errors_cantloadkey);
+    CHECK_CTX(option_cleanup);
+    CHECK_CTX(pgp_fingerprints);
 #undef CHECK_CTX
-       if (context) {
-           /* We avoid using malloc, in case we're in a situation where
-            * it would be awkward to do so. */
-           char cmd[WINHELP_CTX_MAXLEN+10];
-           sprintf(cmd, "JI(`',`%.*s')", WINHELP_CTX_MAXLEN, context);
-           WinHelp(hwnd, help_path, HELP_COMMAND, (DWORD)cmd);
-           requested_help = TRUE;
-       }
-    }
+    if (context)
+       launch_help(hwnd, context);
 }
 
 int message_box(LPCTSTR text, LPCTSTR caption, DWORD style, DWORD helpctxid)
@@ -125,8 +119,7 @@ int message_box(LPCTSTR text, LPCTSTR caption, DWORD style, DWORD helpctxid)
      * callback function for the Help button.
      */
     mbox.cbSize = sizeof(mbox);
-    /* FIXME: assumes global hwnd and hinst are always the Right Thing;
-     * are they? */
+    /* Assumes the globals `hinst' and `hwnd' have sensible values. */
     mbox.hInstance = hinst;
     mbox.hwndOwner = hwnd;
     mbox.lpfnMsgBoxCallback = &message_box_help_callback;
@@ -135,11 +128,29 @@ int message_box(LPCTSTR text, LPCTSTR caption, DWORD style, DWORD helpctxid)
     mbox.lpszCaption = caption;
     mbox.dwContextHelpId = helpctxid;
     mbox.dwStyle = style;
-    if (helpctxid != 0 && help_path) mbox.dwStyle |= MB_HELP;
+    if (helpctxid != 0 && has_help()) mbox.dwStyle |= MB_HELP;
     return MessageBoxIndirect(&mbox);
 }
 
 /*
+ * Display the fingerprints of the PGP Master Keys to the user.
+ */
+void pgp_fingerprints(void)
+{
+    message_box("These are the fingerprints of the PuTTY PGP Master Keys. They can\n"
+               "be used to establish a trust path from this executable to another\n"
+               "one. See the manual for more information.\n"
+               "(Note: these fingerprints have nothing to do with SSH!)\n"
+               "\n"
+               "PuTTY Master Key (RSA), 1024-bit:\n"
+               "  " PGP_RSA_MASTER_KEY_FP "\n"
+               "PuTTY Master Key (DSA), 1024-bit:\n"
+               "  " PGP_DSA_MASTER_KEY_FP,
+               "PGP fingerprints", MB_ICONINFORMATION | MB_OK,
+               HELPCTXID(pgp_fingerprints));
+}
+
+/*
  * Split a complete command line into argc/argv, attempting to do
  * it exactly the same way Windows itself would do it (so that
  * console utilities, which receive argc and argv from Windows,