aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Nevins <jacobn@chiark.greenend.org.uk>2007-02-13 23:01:50 +0000
committerJacob Nevins <jacobn@chiark.greenend.org.uk>2007-02-13 23:01:50 +0000
commitd68ba4b21e11928fc256caca6d8836ac986848ad (patch)
tree5b22a9bec0414af04fc6fafa0267f7dcd100f50b
parentda4606ddd56a0f716086373d351c459de4bc5d06 (diff)
downloadpuzzles-d68ba4b21e11928fc256caca6d8836ac986848ad.zip
puzzles-d68ba4b21e11928fc256caca6d8836ac986848ad.tar.gz
puzzles-d68ba4b21e11928fc256caca6d8836ac986848ad.tar.bz2
puzzles-d68ba4b21e11928fc256caca6d8836ac986848ad.tar.xz
Replicate r7285 from PuTTY: make keyboard input work in HTML Help.
[originally from svn r7286] [r7285 == 3d78bf9b261b4bfd30ae00d5ba43744c4144c934 in putty repository]
-rw-r--r--windows.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/windows.c b/windows.c
index b8eef2f..2f1a6f0 100644
--- a/windows.c
+++ b/windows.c
@@ -44,7 +44,6 @@
#ifndef NO_HTMLHELP
typedef HWND (CALLBACK *htmlhelp_t)(HWND, LPCSTR, UINT, DWORD);
-static DWORD html_help_cookie;
static htmlhelp_t htmlhelp;
static HINSTANCE hh_dll;
#endif /* NO_HTMLHELP */
@@ -1033,7 +1032,6 @@ static void init_help(void)
FreeLibrary(hh_dll);
}
if (htmlhelp) {
- htmlhelp(NULL, NULL, HH_INITIALIZE, (DWORD)&html_help_cookie);
help_path = dupstr(b);
help_type = CHM;
help_topic = thegame.htmlhelp_topic;
@@ -1144,12 +1142,9 @@ static void stop_help(frontend *fe)
*/
static void cleanup_help(void)
{
-#ifndef NO_HTMLHELP
- if (help_type == CHM) {
- assert(htmlhelp);
- htmlhelp(NULL, NULL, HH_UNINITIALIZE, html_help_cookie);
- }
-#endif /* NO_HTMLHELP */
+ /* Nothing to do currently.
+ * (If we were running HTML Help single-threaded, this is where we'd
+ * call HH_UNINITIALIZE.) */
}
static void check_window_size(frontend *fe, int *px, int *py)