X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=windows%2Fwinhelp.c;h=64f6ad4597ac1dad4609e57e878a3ff5684bb27d;hb=5471539a6738484b48fb938c88dce547a3e4b299;hp=078b724efc8f2d3efa861ca4fd6fff97687c80f1;hpb=b85038d8a9dbe197996d58b72d70df8fda3726a4;p=PuTTY.git

diff --git a/windows/winhelp.c b/windows/winhelp.c
index 078b724e..64f6ad45 100644
--- a/windows/winhelp.c
+++ b/windows/winhelp.c
@@ -55,7 +55,7 @@ void init_help(void)
     } else
 	chm_path = NULL;
     if (chm_path) {
-	HINSTANCE dllHH = LoadLibrary("hhctrl.ocx");
+	HINSTANCE dllHH = load_system32_dll("hhctrl.ocx");
 	GET_WINDOWS_FUNCTION(dllHH, HtmlHelpA);
 	if (!p_HtmlHelpA) {
 	    chm_path = NULL;
@@ -81,7 +81,7 @@ int has_help(void)
      * unrealistic, since even Vista will have it if the user
      * specifically downloads it.
      */
-    return (help_path
+    return (help_path != NULL
 #ifndef NO_HTMLHELP
 	    || chm_path
 #endif /* NO_HTMLHELP */
@@ -105,7 +105,7 @@ void launch_help(HWND hwnd, const char *topic)
 #endif /* NO_HTMLHELP */
 	if (help_path) {
 	    char *cmd = dupprintf("JI(`',`%.*s')", colonpos, topic);
-	    WinHelp(hwnd, help_path, HELP_COMMAND, (DWORD)cmd);
+	    WinHelp(hwnd, help_path, HELP_COMMAND, (ULONG_PTR)cmd);
 	    sfree(cmd);
 	}
     } else {