Tera TermRevision: 8576
https://osdn.net/projects/ttssh2/scm/svn/commits/8576
Author: zmatsuo
Date: 2020-03-07 00:21:54 +0900 (Sat, 07 Mar 2020)
Log Message:
-----------
Tera Term と htmlhelp ウィンドウを同時に閉じたときエラーが出ないよう修正
- 起動時に _HtmlHelpW(NULL, NULL, HH_INITIALIZE, ...) を追加
- 終了時の処理を WM_DESTROY から WM_CLOSE に変更
- 終了時、_HtmlHelpW(NULL, NULL, HH_CLOSE_ALL, 0) に修正
- ドキュメントによると HH_CLOSE_ALL 時は引数を 0, NULL にする
- 従来はファイル名などを渡していた
- 終了時、_HtmlHelpW(NULL, NULL, HH_UNINITIALIZE, ...) を追加
- ticket #40216
Ticket Links:
------------
https://osdn.net/projects/ttssh2/tracker/detail/40216
Modified Paths:
--------------
trunk/teraterm/teraterm/vtwin.cpp
trunk/teraterm/teraterm/vtwin.h
trunk/teraterm/ttpcmn/ttcmn.c
-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2020-03-06 15:21:41 UTC (rev 8575)
+++ trunk/teraterm/teraterm/vtwin.cpp 2020-03-06 15:21:54 UTC (rev 8576)
@@ -534,6 +534,8 @@
CommInit(&cv);
isFirstInstance = StartTeraTerm(&ts);
+ _HtmlHelpW(NULL, NULL, HH_INITIALIZE, (DWORD_PTR)&dwCookie);
+
TTXInit(&ts, &cv); /* TTPLUG */
MsgDlgHelp = RegisterWindowMessage(HELPMSGSTRING);
@@ -1707,6 +1709,8 @@
}
}
+ _HtmlHelpW(NULL, NULL, HH_CLOSE_ALL, 0);
+ _HtmlHelpW(NULL, NULL, HH_UNINITIALIZE, dwCookie);
FileTransEnd(0);
ProtoEnd();
@@ -1758,8 +1762,6 @@
}
CommClose(&cv);
- OpenHelp(HH_CLOSE_ALL, 0, ts.UILanguageFile);
-
FreeIME(HVTWin);
FreeTTSET();
#if 0 // free\x82Ɏ\xB8\x94s\x82\xB7\x82\xE9\x82܂\xC5free\x82\xB5\x91\xB1\x82\xAF\x82\xE9
Modified: trunk/teraterm/teraterm/vtwin.h
===================================================================
--- trunk/teraterm/teraterm/vtwin.h 2020-03-06 15:21:41 UTC (rev 8575)
+++ trunk/teraterm/teraterm/vtwin.h 2020-03-06 15:21:54 UTC (rev 8576)
@@ -76,7 +76,9 @@
// TipWin
CTipWin* TipWin;
+ // for html help
LONG HelpId;
+ DWORD dwCookie;
public:
CVTWindow(HINSTANCE hInstance);
Modified: trunk/teraterm/ttpcmn/ttcmn.c
===================================================================
--- trunk/teraterm/ttpcmn/ttcmn.c 2020-03-06 15:21:41 UTC (rev 8575)
+++ trunk/teraterm/ttpcmn/ttcmn.c 2020-03-06 15:21:54 UTC (rev 8576)
@@ -1170,7 +1170,7 @@
wchar_t uimsg[MAX_UIMSG];
wchar_t *HomeDirW;
- /* Get home directory */
+ /* Get home directory */
if (GetModuleFileNameA(NULL,Temp,_countof(Temp)) == 0) {
return;
}
@@ -1182,7 +1182,7 @@
// \x83w\x83\x8B\x83v\x82̃I\x81[\x83i\x81[\x82͏\xED\x82Ƀf\x83X\x83N\x83g\x83b\x83v\x82ɂȂ\xE9 (2007.5.12 maya)
HWin = GetDesktopWindow();
- if (_HtmlHelpW(HWin, HelpFN, Command, Data) == NULL && Command != HH_CLOSE_ALL) {
+ if (_HtmlHelpW(HWin, HelpFN, Command, Data) == NULL) {
// \x83w\x83\x8B\x83v\x82\xAA\x8AJ\x82\xAF\x82Ȃ\xA9\x82\xC1\x82\xBD
wchar_t buf[MAX_PATH];
get_lang_msgW("MSG_OPENHELP_ERROR", uimsg, _countof(uimsg),