X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/690695e0356273fb6aa1c851713831f14254590d..d7e526bfcbb8d0dd2781e13b0494908bcc5909ab:/windows/winutils.c?ds=sidebyside

diff --git a/windows/winutils.c b/windows/winutils.c
index 5bead7b2..b1ee0113 100644
--- a/windows/winutils.c
+++ b/windows/winutils.c
@@ -5,7 +5,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include <limits.h>
 
 #include "winstuff.h"
 #include "misc.h"
@@ -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 */
@@ -104,6 +103,8 @@ static VOID CALLBACK message_box_help_callback(LPHELPINFO lpHelpInfo)
 	} while (0)
 	CHECK_CTX(errors_hostkey_absent);
 	CHECK_CTX(errors_hostkey_changed);
+	CHECK_CTX(errors_cantloadkey);
+	CHECK_CTX(option_cleanup);
 #undef CHECK_CTX
 	if (context) {
 	    /* We avoid using malloc, in case we're in a situation where
@@ -125,8 +126,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;