X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/cb72236ff4e8c06f855f0498bfcca8c99a3ac14c..9b53e9b8e029b56c36654571a82d90bdc56aaa4e:/windows/winhelp.c

diff --git a/windows/winhelp.c b/windows/winhelp.c
index 29e7aa04..49a0fae6 100644
--- a/windows/winhelp.c
+++ b/windows/winhelp.c
@@ -11,15 +11,18 @@
 
 #include "putty.h"
 
+#ifndef NO_HTMLHELP
 #include <htmlhelp.h>
+#endif /* NO_HTMLHELP */
 
-typedef HWND (CALLBACK *htmlhelp_t)(HWND, LPCSTR, UINT, DWORD);
-
-static char *help_path, *chm_path;
-static int help_has_contents;
 static int requested_help;
-static DWORD html_help_cookie;
+static char *help_path;
+static int help_has_contents;
+#ifndef NO_HTMLHELP
+typedef HWND (CALLBACK *htmlhelp_t)(HWND, LPCSTR, UINT, DWORD);
+static char *chm_path;
 static htmlhelp_t htmlhelp;
+#endif /* NO_HTMLHELP */
 
 void init_help(void)
 {
@@ -45,6 +48,7 @@ void init_help(void)
     } else
 	help_has_contents = FALSE;
 
+#ifndef NO_HTMLHELP
     strcpy(r, PUTTY_CHM_FILE);
     if ( (fp = fopen(b, "r")) != NULL) {
 	chm_path = dupstr(b);
@@ -58,17 +62,17 @@ void init_help(void)
 	    if (!htmlhelp)
 		FreeLibrary(dllHH);
 	}
-	if (htmlhelp)
-	    htmlhelp(NULL, NULL, HH_INITIALIZE, (DWORD)&html_help_cookie);
-	else
+	if (!htmlhelp)
 	    chm_path = NULL;
     }
+#endif /* NO_HTMLHELP */
 }
 
 void shutdown_help(void)
 {
-    if (chm_path)
-	htmlhelp(NULL, NULL, HH_UNINITIALIZE, html_help_cookie);
+    /* Nothing to do currently.
+     * (If we were running HTML Help single-threaded, this is where we'd
+     * call HH_UNINITIALIZE.) */
 }
 
 int has_help(void)
@@ -79,7 +83,11 @@ int has_help(void)
      * unrealistic, since even Vista will have it if the user
      * specifically downloads it.
      */
-    return (help_path || chm_path);
+    return (help_path
+#ifndef NO_HTMLHELP
+	    || chm_path
+#endif /* NO_HTMLHELP */
+	   );
 }
 
 void launch_help(HWND hwnd, const char *topic)
@@ -87,6 +95,7 @@ void launch_help(HWND hwnd, const char *topic)
     if (topic) {
 	int colonpos = strcspn(topic, ":");
 
+#ifndef NO_HTMLHELP
 	if (chm_path) {
 	    char *fname;
 	    assert(topic[colonpos] != '\0');
@@ -94,15 +103,20 @@ void launch_help(HWND hwnd, const char *topic)
 			      topic + colonpos + 1);
 	    htmlhelp(hwnd, fname, HH_DISPLAY_TOPIC, 0);
 	    sfree(fname);
-	} else if (help_path) {
+	} else
+#endif /* NO_HTMLHELP */
+	if (help_path) {
 	    char *cmd = dupprintf("JI(`',`%.*s')", colonpos, topic);
 	    WinHelp(hwnd, help_path, HELP_COMMAND, (DWORD)cmd);
 	    sfree(cmd);
 	}
     } else {
+#ifndef NO_HTMLHELP
 	if (chm_path) {
 	    htmlhelp(hwnd, chm_path, HH_DISPLAY_TOPIC, 0);
-	} else if (help_path) {
+	} else
+#endif /* NO_HTMLHELP */
+	if (help_path) {
 	    WinHelp(hwnd, help_path,
 		    help_has_contents ? HELP_FINDER : HELP_CONTENTS, 0);
 	}
@@ -113,9 +127,12 @@ void launch_help(HWND hwnd, const char *topic)
 void quit_help(HWND hwnd)
 {
     if (requested_help) {
+#ifndef NO_HTMLHELP
 	if (chm_path) {
 	    htmlhelp(NULL, NULL, HH_CLOSE_ALL, 0);
-	} else if (help_path) {
+	} else
+#endif /* NO_HTMLHELP */
+	if (help_path) {
 	    WinHelp(hwnd, help_path, HELP_QUIT, 0);
 	}
 	requested_help = FALSE;