Merge branch 'main' into #197_ssh_further_auth

TeraTermProject · Aug 25, 2024 · 320e266 · 320e266
2 parents 8e4c052 + b748e68
commit 320e266
Show file tree

Hide file tree

Showing 58 changed files with 967 additions and 515 deletions.
diff --git a/TTXSamples/TTXCheckUpdate/ttxcheckupdate.c b/TTXSamples/TTXCheckUpdate/ttxcheckupdate.c
@@ -203,7 +203,13 @@ static void ShowDialog(HWND hWnd)
 	result_bool = GetContent(update_info_url, agent, (void**)&json_raw_ptr, &json_raw_size);
 	free(update_info_url);
 	if (!result_bool) {
-		MessageBoxW(hWnd, L"access error?", L"Tera Term", MB_OK | MB_ICONEXCLAMATION);
+		static const TTMessageBoxInfoW info = {
+			"TTXCheckUpdate",
+			NULL, L"Tera Term",
+			"MSG_ERROR_ACCESS", L"access error?",
+			MB_OK | MB_ICONEXCLAMATION
+		};
+		TTMessageBoxW(hWnd, &info, UILanguageFileW);
 		return;
 	}
 	json_size = json_raw_size + 1;
@@ -218,7 +224,13 @@ static void ShowDialog(HWND hWnd)
 	/* jsonをパースする, versionsに情報が入る */
 	pvar->versions = ParseJson(json_ptr, &pvar->versions_count);
 	if (pvar->versions == NULL) {
-		MessageBoxW(hWnd, L"parse error?", L"Tera Term", MB_OK | MB_ICONEXCLAMATION);
+		static const TTMessageBoxInfoW info = {
+			"TTXCheckUpdate",
+			NULL, L"Tera Term",
+			"MSG_ERROR_PARSE", L"parse error?",
+			MB_OK | MB_ICONEXCLAMATION
+		};
+		TTMessageBoxW(hWnd, &info, UILanguageFileW);
 		return;
 	}
 

diff --git a/buildtools/install_cygwin.bat b/buildtools/install_cygwin.bat
@@ -1,9 +1,13 @@
-setlocal
-cd /d %~dp0
+echo %~dp0\install_cygwin.bat
+
+pushd %~dp0
+
 if "%CMAKE_COMMAND%" == "" (
    call ..\ci_scripts\find_cmake.bat
 )
-"%CMAKE_COMMAND%" -P ../buildtools/install_cygwin.cmake
-rem "%CMAKE_COMMAND%" -DREMOVE_TMP=ON -P ../buildtools/install_cygwin.cmake
-pause
+"%CMAKE_COMMAND%" -P install_cygwin.cmake
+rem "%CMAKE_COMMAND%" -DREMOVE_TMP=ON -P install_cygwin.cmake
+
+popd
 
+if not "%NOPAUSE%" == "1" pause
diff --git a/buildtools/install_innosetup.bat b/buildtools/install_innosetup.bat
@@ -1,7 +1,13 @@
-setlocal
-cd /d %~dp0
+echo %~dp0\install_innosetup.bat
+
+pushd %~dp0
+
 if "%CMAKE_COMMAND%" == "" (
    call ..\ci_scripts\find_cmake.bat
 )
+
 "%CMAKE_COMMAND%" -P install_innosetup.cmake
-pause
+
+popd
+
+if not "%NOPAUSE%" == "1" pause
diff --git a/buildtools/install_innosetup.cmake b/buildtools/install_innosetup.cmake
@@ -5,43 +5,43 @@ else()
   option(REMOVE_TMP "" OFF)
 endif()
 
-# innosetup 6.3.0
-set(INNOSETUP_EXE "innosetup-6.3.0.exe")
+# innosetup 6.3.3
+set(INNOSETUP_EXE "innosetup-6.3.3.exe")
 set(INNOSETUP_URL "https://files.jrsoftware.org/is/6/${INNOSETUP_EXE}")
-set(INNOSETUP_HASH "caaaaf91d43b2878bbb63ae90aa2f0e144b5ec85a75f19e423e4fc4ddc52e157")
+set(INNOSETUP_HASH "0bcb2a409dea17e305a27a6b09555cabe600e984f88570ab72575cd7e93c95e6")
 set(CHECK_FILE innosetup6/ISCC.exe)
-set(CHECK_HASH "5b38e41bee7f8321ad0c14a53a15368f0e433aff190c1437caca7ec41787d3bc")
+set(CHECK_HASH "bf65156e415096b4b524ea7a8646d1e5b4ff7817fe8ba5dfc142a637640ae7d3")
 
 # check innosetup
-if(EXISTS ${CHECK_FILE})
-  file(SHA256 ${CHECK_FILE} HASH)
-  if(${HASH} STREQUAL ${CHECK_HASH})
+if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/${CHECK_FILE})
+  file(SHA256 ${CMAKE_CURRENT_LIST_DIR}/${CHECK_FILE} HASH)
+  if(${HASH} STREQUAL ${CMAKE_CURRENT_LIST_DIR}/${CHECK_HASH})
     return()
   endif()
-  message("file ${CHECK_FILE}")
+  message("file ${CMAKE_CURRENT_LIST_DIR}/${CHECK_FILE}")
   message("actual HASH=${HASH}")
   message("expect HASH=${CHECK_HASH}")
 endif()
 
 # download
 message("download ${INNOSETUP_EXE} from ${INNOSETUP_URL}")
-file(MAKE_DIRECTORY "download/innosetup6")
+file(MAKE_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/download/innosetup6")
 file(DOWNLOAD
   ${INNOSETUP_URL}
-  download/innosetup6/${INNOSETUP_EXE}
+  ${CMAKE_CURRENT_LIST_DIR}/download/innosetup6/${INNOSETUP_EXE}
   EXPECTED_HASH SHA256=${INNOSETUP_HASH}
   SHOW_PROGRESS
   )
 
 # setup
-if(EXISTS "innosetup6")
-  file(REMOVE_RECURSE "innosetup6")
+if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/innosetup6")
+  file(REMOVE_RECURSE "${CMAKE_CURRENT_LIST_DIR}/innosetup6")
 endif()
-file(MAKE_DIRECTORY "innosetup6")
+file(MAKE_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/innosetup6")
 execute_process(
-  COMMAND ../download/innosetup6/${INNOSETUP_EXE} /dir=. /CURRENTUSER /PORTABLE=1 /VERYSILENT
-  WORKING_DIRECTORY "innosetup6"
+  COMMAND ${CMAKE_CURRENT_LIST_DIR}/download/innosetup6/${INNOSETUP_EXE} /dir=. /CURRENTUSER /PORTABLE=1 /VERYSILENT
+  WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/innosetup6"
   )
 if(REMOVE_TMP)
-  file(REMOVE_RECURSE "download/innosetup6")
+  file(REMOVE_RECURSE "${CMAKE_CURRENT_LIST_DIR}/download/innosetup6")
 endif()
diff --git a/ci_scripts/appveyor_release_bat.yml b/ci_scripts/appveyor_release_bat.yml
@@ -23,7 +23,7 @@ before_build:
   # インストール済みの MSYS2 にパッケージを追加
   # - ci_scripts/addpkg_msys2.bat
   # 自前の Cygwin をインストール
-  # - ci_scripts/install_mycygwin.bat
+  # - buildtools/install_cygwin.bat
 
 build_script:
   - ci_scripts/build_appveyor_release_bat.bat

diff --git a/ci_scripts/appveyor_vs2019_bat.yml b/ci_scripts/appveyor_vs2019_bat.yml
@@ -3,6 +3,7 @@ image: Visual Studio 2019
 environment:
   APPVEYOR_SAVE_CACHE_ON_ERROR: true
   VS_VERSION: 2019
+  NOPAUSE: 1
 
 build: off
 
@@ -21,7 +22,9 @@ before_build:
   # インストール済みの MSYS2 にパッケージを追加
   # - ci_scripts/addpkg_msys2.bat
   # 自前の Cygwin をインストール
-  # - ci_scripts/install_mycygwin.bat
+  # - bulidtools/install_cygwin.bat
+  # 自前の Inno Setup をインストール
+  - buildtools/install_innosetup.bat
 
 build_script:
   - ci_scripts/build_appveyor_release_bat.bat

diff --git a/ci_scripts/appveyor_vs2022_bat.yml b/ci_scripts/appveyor_vs2022_bat.yml
@@ -3,6 +3,7 @@ image: Visual Studio 2022
 environment:
   APPVEYOR_SAVE_CACHE_ON_ERROR: true
   VS_VERSION: 2022
+  NOPAUSE: 1
 
 build: off
 
@@ -21,7 +22,9 @@ before_build:
   # インストール済みの MSYS2 にパッケージを追加
   # - ci_scripts/addpkg_msys2.bat
   # 自前の Cygwin をインストール
-  # - ci_scripts/install_mycygwin.bat
+  # - buldtools/install_cygwin.bat
+  # 自前の Inno Setup をインストール
+  - buildtools/install_innosetup.bat
 
 build_script:
   - ci_scripts/build_appveyor_release_bat.bat

diff --git a/ci_scripts/build_appveyor.bat b/ci_scripts/build_appveyor.bat
@@ -1,7 +1,7 @@
 cd /d %~dp0..
 if exist teraterm\ttpdlg\svnversion.h del teraterm\ttpdlg\svnversion.h
 if exist buildtools\svnrev\sourcetree_info.bat del buildtools\svnrev\sourcetree_info.bat
-rem call ci_scripts\install_mycygwin.bat
+rem call buildtools\install_cygwin.bat
 cd /d %~dp0..
 call buildtools\svnrev\svnrev.bat
 call buildtools\svnrev\sourcetree_info.bat

diff --git a/ci_scripts/build_local_appveyor_mingw.cmake b/ci_scripts/build_local_appveyor_mingw.cmake
diff --git a/ci_scripts/build_local_appveyor_mingw_cmake.bat b/ci_scripts/build_local_appveyor_mingw_cmake.bat
diff --git a/ci_scripts/build_local_appveyor_vs2019.cmake b/ci_scripts/build_local_appveyor_vs2019.cmake
diff --git a/ci_scripts/build_local_appveyor_vs2019_x64.cmake b/ci_scripts/build_local_appveyor_vs2019_x64.cmake
diff --git a/ci_scripts/install_mycygwin.bat b/ci_scripts/install_mycygwin.bat
diff --git a/doc/en/html/about/history.html b/doc/en/html/about/history.html
@@ -67,13 +67,15 @@ <h3 id="teraterm_5.3">YYYY.MM.DD (Ver 5.3 not released yet)</h3>
       <li>Modified to <a href="../setup/teraterm-ssh.html#AuthBanner">display SSH authentication banner in VT window</a> regardless of receiving character code.
       <li>Keyboard setting dialog is moved to Keyboard tab of Additional setting dialog.</li>
       <li>MACRO: <a href="../macro/command/send.html">send</a> macro command check data and sends it as text or binary. added <a href="../macro/command/sendtext.html">sendtext</a> and <a href="../macro/command/sendbinary.html">sendbinary</a> macro command</li>
-      <li>Macro
+      <li>MACRO: password file using aes-256-ctr
         <ul>
           <li>added the <a href="../macro/command/setpassword2.html">setpassword2</a>, <a href="../macro/command/getpassword2.html">getpassword2</a>, <a href="../macro/command/ispassword2.html">ispassword2</a> and <a href="../macro/command/delpassword2.html">delpassword2</a> commands. The contents that is saved with setpassword2 command is protected by a password. This password file is not compatible with prior password file.</li>
         </ul>
+      <li>added the <a href="../macro/command/getttpos.html">getttpos</a> command to retrieve the display status, position, and size in the VT window of Tera Term.</li>
       </li>
       <li>Add ViewlogEditor argument on <a href="../menu/setup-additional-log.html#ViewlogEditorArg">Log Tab</a> in Additional settings.</li>
-      <li>Setup - Font was integrated into <a href="../menu/setup-additional-font.html">Font tab</a> of Additional settings.
+      <li>Setup - Font was integrated into <a href="../menu/setup-additional-font.html">Font tab</a> of Additional settings.</li>
+      <li>Returned the display position of the message box to its previous behavior (center of the parent window) before 4.103, excluding some message boxes.</li>
       <li>Add <a href="../menu/setup-additional-tcpip.html">TCP/IP tab</a> of Additional setting dialog.
         <ul>
           <li>TCP/IP dialog is moved to TCP/IP tab.</li>
@@ -110,6 +112,7 @@ <h3 id="teraterm_5.3">YYYY.MM.DD (Ver 5.3 not released yet)</h3>
       <li>MACRO: Fixed <a href="../macro/command/clipb2var.html">clipb2var</a> is not working.</li>
       <li>MACRO: Fixed ttpmacro.exe crashes when referencing unsetted string array element.</li>
       <li>Fixed doesn't remember the COM port it used on new connection dialog</li>
+      <li>Fixed COM port list was not sorted on new connection dialog.</li>
     </ul>
   </li>
 
@@ -3534,11 +3537,11 @@ <h3 id="ttssh_3.3">YYYY.MM.DD (Ver 3.3 not released yet)</h3>
     </ul>
   </li>
 
-  <!--li>Bug fixes
+  <li>Bug fixes
     <ul>
-      <li></li>
+      <li>modified to send username and password in UTF-8 at authentication to comply with RFC 4252.</li>
     </ul>
-  </li-->
+  </li>
 
   <li>Misc
     <ul>