Tera Term

[Ttssh2-commit] [8225] コモンダイアログのヘルプボタンが機能するよう修正

• 前の記事 (スレッド) [Ttssh2-commit] [8224] URL強調一通り動作するようになる
• 次の記事 (スレッド) [Ttssh2-commit] [8226] DCHテストで正しい結果となるよう修正
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 8225
          https://osdn.net/projects/ttssh2/scm/svn/commits/8225
Author:   zmatsuo
Date:     2019-09-25 23:43:54 +0900 (Wed, 25 Sep 2019)
Log Message:
-----------
コモンダイアログのヘルプボタンが機能するよう修正

- r8017 (4.104) でのエンバグ
- ttwinman.c のグローバル変数 HelpId を削除
  - vtwin.h, tekwin.h 内のプライベートなクラス変数にした

Revision Links:
--------------
    https://osdn.net/projects/ttssh2/scm/svn/commits/8017

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html
    trunk/teraterm/teraterm/filesys.cpp
    trunk/teraterm/teraterm/ftdlg.cpp
    trunk/teraterm/teraterm/tekwin.cpp
    trunk/teraterm/teraterm/tekwin.h
    trunk/teraterm/teraterm/ttwinman.c
    trunk/teraterm/teraterm/ttwinman.h
    trunk/teraterm/teraterm/vtwin.cpp
    trunk/teraterm/teraterm/vtwin.h

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2019-09-24 15:11:32 UTC (rev 8224)
+++ trunk/doc/en/html/about/history.html	2019-09-25 14:43:54 UTC (rev 8225)
@@ -59,6 +59,7 @@
     <ul>
       <li>The toolchip during resizing can not be displayed on the left and top edge of the desktop. This bug was introduced in 4.103.</li>
       <li>Eterm look-feel: When a image file is randomly selected with the wallpaper, invalid file may be selected. </li>
+      <!--li>\x83R\x83\x82\x83\x93\x83_\x83C\x83A\x83\x8D\x83O\x82̃w\x83\x8B\x83v\x83{\x83^\x83\x93\x82\xAA\x8B@\x94\\x82\xB7\x82\xE9\x82悤\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B4.104\x82ł̃G\x83\x93\x83o\x83O\x81B</li-->
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2019-09-24 15:11:32 UTC (rev 8224)
+++ trunk/doc/ja/html/about/history.html	2019-09-25 14:43:54 UTC (rev 8225)
@@ -59,6 +59,7 @@
     <ul>
       <li>\x83\x8A\x83T\x83C\x83Y\x92\x86\x82̏c\x89\xA1\x83T\x83C\x83Y\x83c\x81[\x83\x8B\x83`\x83b\x83v\x82\xAA\x81A\x83f\x83X\x83N\x83g\x83b\x83v\x82̍\xB6\x92[\x82Ə\xE3\x92[\x82ŕ\\x8E\xA6\x82\xB3\x82\xEA\x82Ȃ\xAD\x82Ȃ\xC1\x82Ă\xA2\x82\xBD\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B4.103\x82ł̃G\x83\x93\x83o\x83O\x81B</li>
       <li>Eterm look-feel: \x95ǎ\x86\x82ƍ\xAC\x8D\x87\x82\xB7\x82\xE9\x89摜\x83t\x83@\x83C\x83\x8B\x82\xF0\x83\x89\x83\x93\x83_\x83\x80\x82ɑI\x91\xF0\x82\xB7\x82\xE9\x8DہA\x96\xB3\x8A֌W\x82ȃt\x83@\x83C\x83\x8B\x82\xF0\x91I\x91\xF0\x82\xB7\x82邱\x82Ƃ\xAA\x82\xA0\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+      <li>\x83R\x83\x82\x83\x93\x83_\x83C\x83A\x83\x8D\x83O\x82̃w\x83\x8B\x83v\x83{\x83^\x83\x93\x82\xAA\x8B@\x94\\x82\xB7\x82\xE9\x82悤\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B4.104\x82ł̃G\x83\x93\x83o\x83O\x81B</li>
     </ul>
   </li>
 

Modified: trunk/teraterm/teraterm/filesys.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys.cpp	2019-09-24 15:11:32 UTC (rev 8224)
+++ trunk/teraterm/teraterm/filesys.cpp	2019-09-25 14:43:54 UTC (rev 8225)
@@ -43,7 +43,6 @@
 #include "ttcommon.h"
 #include "ttdde.h"
 #include "ttlib.h"
-#include "helpid.h"
 #include "dlglib.h"
 #include "vtterm.h"
 #include "win16api.h"
@@ -639,7 +638,6 @@
 	if (ts.LogHideDialog)
 		LogVar->HideDialog = 1;
 
-	HelpId = HlpFileLog;
 	/* 2007.05.24 Gentaro */
 	eLineEnd = Line_LineHead;
 

Modified: trunk/teraterm/teraterm/ftdlg.cpp
===================================================================
--- trunk/teraterm/teraterm/ftdlg.cpp	2019-09-24 15:11:32 UTC (rev 8224)
+++ trunk/teraterm/teraterm/ftdlg.cpp	2019-09-25 14:43:54 UTC (rev 8225)
@@ -43,6 +43,7 @@
 #include "tt_res.h"
 #include "ftdlg.h"
 #include "teraterml.h"
+#include "helpid.h"
 
 /////////////////////////////////////////////////////////////////////////////
 // CFileTransDlg dialog
@@ -216,7 +217,7 @@
 			ChangeButton(! Pause);
 			return TRUE;
 		case IDC_TRANSHELP:
-			::PostMessage(fv->HMainWin,WM_USER_DLGHELP2,0,0);
+			::PostMessage(fv->HMainWin,WM_USER_DLGHELP2,HlpFileSend,0);
 			return TRUE;
 		default:
 			return (TTCDialog::OnCommand(wParam,lParam));

Modified: trunk/teraterm/teraterm/tekwin.cpp
===================================================================
--- trunk/teraterm/teraterm/tekwin.cpp	2019-09-24 15:11:32 UTC (rev 8224)
+++ trunk/teraterm/teraterm/tekwin.cpp	2019-09-25 14:43:54 UTC (rev 8225)
@@ -636,6 +636,7 @@
 
 LRESULT CTEKWindow::OnDlgHelp(WPARAM wParam, LPARAM lParam)
 {
+	DWORD help_id = (wParam == 0) ? HelpId : wParam;
 	OpenHelp(HH_HELP_CONTEXT, HelpId, ts.UILanguageFile);
 	return 0;
 }
@@ -779,6 +780,9 @@
 {
 	LRESULT retval = 0;
 	if (msg == MsgDlgHelp) {
+		// HELPMSGSTRING message \x8E\x9E
+		//		wp = dialog handle
+		//		lp = initialization structure
 		OnDlgHelp(wp, lp);
 		return 0;
 	}

Modified: trunk/teraterm/teraterm/tekwin.h
===================================================================
--- trunk/teraterm/teraterm/tekwin.h	2019-09-24 15:11:32 UTC (rev 8224)
+++ trunk/teraterm/teraterm/tekwin.h	2019-09-25 14:43:54 UTC (rev 8225)
@@ -38,6 +38,7 @@
   TTEKVar tk;
   HMENU MainMenu, EditMenu, WinMenu,
     FileMenu, SetupMenu, HelpMenu;
+  LONG HelpId;
 
 public:
 	CTEKWindow(HINSTANCE hInstance);

Modified: trunk/teraterm/teraterm/ttwinman.c
===================================================================
--- trunk/teraterm/teraterm/ttwinman.c	2019-09-24 15:11:32 UTC (rev 8224)
+++ trunk/teraterm/teraterm/ttwinman.c	2019-09-25 14:43:54 UTC (rev 8225)
@@ -49,7 +49,6 @@
 
 /* 'help' button on dialog box */
 WORD MsgDlgHelp;
-LONG HelpId;
 
 TTTSet ts;
 TComVar cv;

Modified: trunk/teraterm/teraterm/ttwinman.h
===================================================================
--- trunk/teraterm/teraterm/ttwinman.h	2019-09-24 15:11:32 UTC (rev 8224)
+++ trunk/teraterm/teraterm/ttwinman.h	2019-09-25 14:43:54 UTC (rev 8225)
@@ -49,7 +49,6 @@
 
 /* 'help' button on dialog box */
 extern WORD MsgDlgHelp;
-extern LONG HelpId;
 
 extern TTTSet ts;
 extern TComVar cv;

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2019-09-24 15:11:32 UTC (rev 8224)
+++ trunk/teraterm/teraterm/vtwin.cpp	2019-09-25 14:43:54 UTC (rev 8225)
@@ -3566,6 +3566,7 @@
 	if ((ts.LogFN[0]!=0) && (LogVar==NULL) && NewFileVar(&LogVar)) {
 		LogVar->DirLen = 0;
 		strncpy_s(LogVar->FullName, sizeof(LogVar->FullName), ts.LogFN, _TRUNCATE);
+		HelpId = HlpFileLog;
 		LogStart();
 	}
 
@@ -6294,7 +6295,10 @@
 {
 	LRESULT retval = 0;
 	if (msg == MsgDlgHelp) {
-		OnDlgHelp(wp,lp);
+		// HELPMSGSTRING message \x8E\x9E
+		//		wp = dialog handle
+		//		lp = initialization structure
+		OnDlgHelp(0, 0);
 		return 0;
 	}
 	switch(msg)

Modified: trunk/teraterm/teraterm/vtwin.h
===================================================================
--- trunk/teraterm/teraterm/vtwin.h	2019-09-24 15:11:32 UTC (rev 8224)
+++ trunk/teraterm/teraterm/vtwin.h	2019-09-25 14:43:54 UTC (rev 8225)
@@ -67,6 +67,8 @@
   // TipWin
   CTipWin* TipWin;
 
+  LONG HelpId;
+
 public:
 	CVTWindow(HINSTANCE hInstance);
 	int Parse();

• 前の記事 (スレッド) [Ttssh2-commit] [8224] URL強調一通り動作するようになる
• 次の記事 (スレッド) [Ttssh2-commit] [8226] DCHテストで正しい結果となるよう修正
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]