X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=windows%2Fwinutils.c;h=31b98d18620a055e1d9bbf05fe5a25c640ad2861;hb=f2e76e07dad155a2fdc68930a2e96d6aa2682391;hp=5bead7b206c075b9477061d5b25f39f211bcb191;hpb=182a511ec3dce0b726be5df4e8e16af605ec4f6a;p=PuTTY.git diff --git a/windows/winutils.c b/windows/winutils.c index 5bead7b2..31b98d18 100644 --- a/windows/winutils.c +++ b/windows/winutils.c @@ -5,9 +5,8 @@ #include #include #include -#include -#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; + const 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,17 +128,56 @@ 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); } /* - * 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, - * will have their command lines processed in the same way as GUI - * utilities which get a whole command line and must break it - * themselves). + * 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 as of 2015 (RSA, 4096-bit):\n" + " " PGP_MASTER_KEY_FP "\n\n" + "Original PuTTY Master Key (RSA, 1024-bit):\n" + " " PGP_RSA_MASTER_KEY_FP "\n" + "Original PuTTY Master Key (DSA, 1024-bit):\n" + " " PGP_DSA_MASTER_KEY_FP, + "PGP fingerprints", MB_ICONINFORMATION | MB_OK, + HELPCTXID(pgp_fingerprints)); +} + +/* + * Handy wrapper around GetDlgItemText which doesn't make you invent + * an arbitrary length limit on the output string. Returned string is + * dynamically allocated; caller must free. + */ +char *GetDlgItemText_alloc(HWND hwnd, int id) +{ + char *ret = NULL; + int size = 0; + + do { + size = size * 4 / 3 + 512; + ret = sresize(ret, size, char); + GetDlgItemText(hwnd, id, ret, size); + } while (!memchr(ret, '\0', size-1)); + + return ret; +} + +/* + * Split a complete command line into argc/argv, attempting to do it + * exactly the same way the Visual Studio C library would do it (so + * that our console utilities, which receive argc and argv already + * broken apart by the C library, will have their command lines + * processed in the same way as the GUI utilities which get a whole + * command line and must call this function). * * Does not modify the input command line. * @@ -166,7 +198,17 @@ void split_into_argv(char *cmdline, int *argc, char ***argv, int outputargc; /* - * At first glance the rules appeared to be: + * These argument-breaking rules apply to Visual Studio 7, which + * is currently the compiler expected to be used for PuTTY. Visual + * Studio 10 has different rules, lacking the curious mod 3 + * behaviour of consecutive quotes described below; I presume they + * fixed a bug. As and when we migrate to a newer compiler, we'll + * have to adjust this to match; however, for the moment we + * faithfully imitate in our GUI utilities what our CLI utilities + * can't be prevented from doing. + * + * When I investigated this, at first glance the rules appeared to + * be: * * - Single quotes are not special characters. * @@ -323,7 +365,7 @@ void split_into_argv(char *cmdline, int *argc, char ***argv, if (quotes > 0) { /* Outside a quote segment, a quote starts one. */ - if (!quote) quotes--, quote = 1; + if (!quote) quotes--; /* Now we produce (n+1)/3 literal quotes... */ for (i = 3; i <= quotes+1; i += 3) *q++ = '"';