From scmnotify ＠ osdn.net  Fri Mar  1 16:40:49 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Fri, 01 Mar 2019 16:40:49 +0900
Subject: [Ttssh2-commit] [7453] unfrozen
Message-ID: <1551426049.292977.17900.nullmailer@users.osdn.me>

Revision: 7453
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7453
Author:   maya
Date:     2019-03-01 16:40:48 +0900 (Fri, 01 Mar 2019)
Log Message:
-----------
unfrozen

Modified Paths:
--------------
    trunk/installer/teraterm.iss

-------------- next part --------------
Modified: trunk/installer/teraterm.iss
===================================================================
--- trunk/installer/teraterm.iss	2019-02-28 12:38:28 UTC (rev 7452)
+++ trunk/installer/teraterm.iss	2019-03-01 07:40:48 UTC (rev 7453)
@@ -1,30 +1,30 @@
 #define AppName "Tera Term"
 #define AppVer "4.102"
-;#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
+#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
 
 [InnoIDE_PreCompile]
 Name: makechm.bat
-;Name: build.bat
-Name: build.bat; Parameters: rebuild
+Name: build.bat
+;Name: build.bat; Parameters: rebuild
 
 [InnoIDE_PostCompile]
-Name: makearchive.bat; Parameters: release
+;Name: makearchive.bat; Parameters: release
 
 [PreCompile]
 Name: makechm.bat
-;Name: build.bat
-Name: build.bat; Parameters: rebuild
+Name: build.bat
+;Name: build.bat; Parameters: rebuild
 
 [PostCompile]
-Name: makearchive.bat; Parameters: release
+;Name: makearchive.bat; Parameters: release
 
 [_ISToolPreCompile]
 Name: makechm.bat
-;Name: build.bat
-Name: build.bat; Parameters: rebuild
+Name: build.bat
+;Name: build.bat; Parameters: rebuild
 
 [_ISToolPostCompile]
-Name: makearchive.bat; Parameters: release
+;Name: makearchive.bat; Parameters: release
 
 [Setup]
 AppCopyright=(C) 2004-2019 TeraTerm Project

From scmnotify ＠ osdn.net  Fri Mar  1 19:20:16 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Fri, 01 Mar 2019 19:20:16 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0NTRdIFRFUkFURVJNLklOSSDjga7kv50=?=
 =?utf-8?b?5a2Y5pmC44GrIENpcGhlck9yZGVyL01hY09yZGVyIOOBruacq+WwvuOBqw==?=
 =?utf-8?b?44K044Of44GM5YWl44KL44Gu44KS5L+u5q2jICMzOTAwMQ==?=
Message-ID: <1551435616.228805.134675.nullmailer@users.osdn.me>

Revision: 7454
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7454
Author:   doda
Date:     2019-03-01 19:20:15 +0900 (Fri, 01 Mar 2019)
Log Message:
-----------
TERATERM.INI の保存時に CipherOrder/MacOrder の末尾にゴミが入るのを修正 #39001

使っていない方式(SSH_CIPHER_IDEA等)のダミーエントリを書き込んでいた。
ダミーエントリは disabled_line のエントリと同じ値なので、通常は既に
存在するとして無視されるが、設定に disabled_line のエントリが含まれて
いない場合にダミーエントリがすべて設定に追加されていた。

足りない設定を追加する時にも重複チェックを行う事によって対処。

Ticket Links:
------------
    http://sourceforge.jp/projects/ttssh2/tracker/detail/39001

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html
    trunk/ttssh2/ttxssh/ttxssh.c

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2019-03-01 07:40:48 UTC (rev 7453)
+++ trunk/doc/en/html/about/history.html	2019-03-01 10:20:15 UTC (rev 7454)
@@ -31,6 +31,15 @@
 
 <h2 id="teraterm">Tera Term</h2>
 
+<h3 id="teraterm_4.103">2019.xx.xx (Ver 4.103)</h3>
+<ul class="history">
+  <li>Misc
+    <ul>
+      <li>upgraded TTSSH to <a href="#ttssh_2.89">2.89</a>.</li>
+    </ul>
+  </li>
+</ul>
+
 <h3 id="teraterm_4.102">2019.02.28 (Ver 4.102)</h3>
 <ul class="history">
   <li>Changes
@@ -3092,6 +3101,15 @@
 
 <h2 id="ttssh">TTSSH</h2>
 
+<h3 id="ttssh_2.89">2019.xx.xx (Ver 2.89)</h3>
+<ul class="history">
+  <li>Bug fixes
+    <ul>
+      <li>garbage data is added to the CipherOrder and MacOrder settings when saving settings.</li>
+    </ul>
+  </li>
+</ul>
+
 <h3 id="ttssh_2.88">2019.02.28 (Ver 2.88)</h3>
 <ul class="history">
   <li>Changes

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2019-03-01 07:40:48 UTC (rev 7453)
+++ trunk/doc/ja/html/about/history.html	2019-03-01 10:20:15 UTC (rev 7454)
@@ -31,6 +31,15 @@
 
 <h2 id="teraterm">Tera Term</h2>
 
+<h3 id="teraterm_4.103">2019.xx.xx (Ver 4.103)</h3>
+<ul class="history">
+  <li>\x82\xBB\x82̑\xBC
+    <ul>
+      <li><a href="#ttssh_2.89">TTSSH(2.89)</a>\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li>
+    </ul>
+  </li>
+</ul>
+
 <h3 id="teraterm_4.102">2019.02.28 (Ver 4.102)</h3>
 <ul class="history">
   <li>\x95ύX
@@ -3098,6 +3107,15 @@
 
 <h2 id="ttssh">TTSSH</h2>
 
+<h3 id="ttssh_2.89">2019.xx.xx (Ver 2.89)</h3>
+<ul class="history">
+  <li>\x83o\x83O\x8FC\x90\xB3
+    <ul>
+      <li>\x90ݒ\xE8\x82̕ۑ\xB6\x8E\x9E\x81ACipherOrder, MacOrder \x90ݒ\xE8\x82ɃS\x83~\x82\xAA\x95t\x89\xC1\x82\xB3\x82\xEA\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+    </ul>
+  </li>
+</ul>
+
 <h3 id="ttssh_2.88">2019.02.28 (Ver 2.88)</h3>
 <ul class="history">
   <li>\x95ύX

Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c	2019-03-01 07:40:48 UTC (rev 7453)
+++ trunk/ttssh2/ttxssh/ttxssh.c	2019-03-01 10:20:15 UTC (rev 7454)
@@ -264,6 +264,7 @@
 
 		if (!listed[num]) {
 			buf[i] = num + '0';
+			listed[num] = 1;
 			i++;
 		}
 	}

From scmnotify ＠ osdn.net  Fri Mar  1 19:20:20 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Fri, 01 Mar 2019 19:20:20 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0NTVdIOacquS9v+eUqOOBruaal+WPtw==?=
 =?utf-8?b?5YyW5pa55byP5YiG44Gu6aCY5Z+f44KC56K65L+d44GZ44KL44KI44GG44Gr?=
 =?utf-8?b?44GX44Gf44CC?=
Message-ID: <1551435620.795700.134735.nullmailer@users.osdn.me>

Revision: 7455
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7455
Author:   doda
Date:     2019-03-01 19:20:20 +0900 (Fri, 01 Mar 2019)
Log Message:
-----------
未使用の暗号化方式分の領域も確保するようにした。

バグ等で未使用方式分のデータが追加された場合への対策として。

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/ttxssh.h

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/ttxssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.h	2019-03-01 10:20:15 UTC (rev 7454)
+++ trunk/ttssh2/ttxssh/ttxssh.h	2019-03-01 10:20:20 UTC (rev 7455)
@@ -141,7 +141,7 @@
 	   cipher. The first digit is the most preferred cipher, and so on.
 	   The digit SSH_CIPHER_NONE signifies that any ciphers after it are
 	   disabled. */
-	char CipherOrder[SSH_CIPHER_MAX+1];
+	char CipherOrder[SSH_CIPHER_MAX+2];
 
 	char KnownHostsFiles[2048];
 	int DefaultAuthMethod;

From scmnotify ＠ osdn.net  Sun Mar  3 01:18:47 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sun, 03 Mar 2019 01:18:47 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0NTZdIGNtYWtl44KS5L2/55So44GX44Gf?=
 =?utf-8?b?44OT44Or44OJ44KS6L+95YqgKGV4cGVyaW1lbnRhbCk=?=
Message-ID: <1551543527.548353.116696.nullmailer@users.osdn.me>

Revision: 7456
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7456
Author:   zmatsuo
Date:     2019-03-03 01:18:47 +0900 (Sun, 03 Mar 2019)
Log Message:
-----------
cmakeを使用したビルドを追加(experimental)

Modified Paths:
--------------
    trunk/doc/convtext.bat

Added Paths:
-----------
    trunk/CMakeLists.txt
    trunk/TTProxy/CMakeLists.txt
    trunk/TTXKanjiMenu/CMakeLists.txt
    trunk/TTXSamples/CMakeLists.txt
    trunk/TTXSamples/TTXAdditionalTitle/CMakeLists.txt
    trunk/TTXSamples/TTXAlwaysOnTop/CMakeLists.txt
    trunk/TTXSamples/TTXCallSysMenu/CMakeLists.txt
    trunk/TTXSamples/TTXCommandLineOpt/CMakeLists.txt
    trunk/TTXSamples/TTXCopyIniFile/CMakeLists.txt
    trunk/TTXSamples/TTXFixedWinSize/CMakeLists.txt
    trunk/TTXSamples/TTXKcodeChange/CMakeLists.txt
    trunk/TTXSamples/TTXOutputBuffering/CMakeLists.txt
    trunk/TTXSamples/TTXRecurringCommand/CMakeLists.txt
    trunk/TTXSamples/TTXResizeMenu/CMakeLists.txt
    trunk/TTXSamples/TTXResizeWin/CMakeLists.txt
    trunk/TTXSamples/TTXShowCommandLine/CMakeLists.txt
    trunk/TTXSamples/TTXViewMode/CMakeLists.txt
    trunk/TTXSamples/TTXttyrec/CMakeLists.txt
    trunk/TTXSamples/ttxtest/CMakeLists.txt
    trunk/doc/Markdown_1.0.1/
    trunk/doc/Markdown_1.0.1/License.text
    trunk/doc/Markdown_1.0.1/Markdown Readme.text
    trunk/doc/Markdown_1.0.1/Markdown.pl
    trunk/doc/ja/html/reference/build_with_cmake.md
    trunk/libs/.gitignore
    trunk/libs/SFMT.cmake
    trunk/libs/VSToolchain.cmake
    trunk/libs/build_library_with_cmake.md
    trunk/libs/buildall.cmake
    trunk/libs/buildall_cmake.bat
    trunk/libs/getcmake.bat
    trunk/libs/getcmake.ps1
    trunk/libs/lib_SFMT.cmake
    trunk/libs/lib_oniguruma.cmake
    trunk/libs/lib_openssl.cmake
    trunk/libs/lib_zlib.cmake
    trunk/libs/oniguruma.cmake
    trunk/libs/openssl.cmake
    trunk/libs/putty.cmake
    trunk/libs/script_support.cmake
    trunk/libs/zlib.cmake
    trunk/mingw.toolchain.cmake
    trunk/teraterm/CMakeLists.txt
    trunk/teraterm/keycode/CMakeLists.txt
    trunk/teraterm/svnrev/CMakeLists.txt
    trunk/teraterm/teraterm/CMakeLists.txt
    trunk/teraterm/ttpcmn/CMakeLists.txt
    trunk/teraterm/ttpdlg/CMakeLists.txt
    trunk/teraterm/ttpdlg/svnversion.h.in
    trunk/teraterm/ttpfile/CMakeLists.txt
    trunk/teraterm/ttpmacro/CMakeLists.txt
    trunk/teraterm/ttpset/CMakeLists.txt
    trunk/teraterm/ttptek/CMakeLists.txt
    trunk/ttpmenu/CMakeLists.txt
    trunk/ttssh2/CMakeLists.txt
    trunk/ttssh2/matcher/CMakeLists.txt
    trunk/ttssh2/putty/CMakeLists.txt
    trunk/ttssh2/puttyrev/CMakeLists.txt
    trunk/ttssh2/ttssh/CMakeLists.txt
    trunk/ttssh2/ttxssh/CMakeLists.txt
    trunk/version_info.h.in

-------------- next part --------------
Added: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	                        (rev 0)
+++ trunk/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,87 @@
+
+cmake_minimum_required(VERSION 3.6)
+
+project(teraterm_all)
+
+option(ENABLE_TTXSAMPLES "TTXSamples" ON)
+option(USE_UNICODE_API "unicode" OFF)
+
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+set(CMAKE_CONFIGURATION_TYPES "Debug;Release")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+
+# _WIN32_WINNT_WIN10 0x0a00
+set(_WIN32_WINNT "0x0a00")
+if(MSVC)
+  # https://www.leeholmes.com/blog/2017/02/27/differences-between-visual-studio-2012-2013-and-2015/
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_WIN32_WINNT=${_WIN32_WINNT}")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D_WIN32_WINNT=${_WIN32_WINNT}")
+  string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
+  string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
+  string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
+  string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_CRT_SECURE_NO_DEPRECATE /W3")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D_CRT_SECURE_NO_DEPRECATE /W3")
+  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GF /Gy")
+  set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /GF /Gy")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP")
+  if(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /ZI")
+    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /ZI")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO")
+  endif()
+elseif(MINGW)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WIN32_WINNT=${_WIN32_WINNT}")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_WIN32_WINNT=${_WIN32_WINNT}")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra "
+    "-Wno-unused-parameter -static -ffunction-sections -fdata-sections ${C_ONLY_FLAGS}")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra "
+    "-Wno-unused-parameter -static -ffunction-sections -fdata-sections")
+  if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static-libgcc -static-libstdc++")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++")
+  endif()
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -s -Wl,--gc-sections")
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -static-libgcc -s -Wl,--gc-sections")
+endif()
+
+### create version_info.h
+if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
+  # git-svn
+  find_package(Git)
+  if(Git_FOUND)
+    execute_process(
+      COMMAND ${GIT_EXECUTABLE} svn log --oneline -1
+      OUTPUT_VARIABLE ov)
+    string(REGEX MATCH "[0-9]+" SVNVERSION ${ov})
+  endif()
+elseif(EXISTS "${CMAKE_SOURCE_DIR}/.svn")
+  # svn
+  find_package(Subversion)
+  if(SUBVERSION_FOUND)
+    Subversion_WC_INFO(${CMAKE_SOURCE_DIR} TT)
+    set(SVNVERSION "${TT_WC_REVISION}")
+  endif()
+else()
+  # build without svn,git?
+  #set(SVNVERSION "0000")
+endif()
+configure_file(
+  version_info.h.in
+  version_info.h
+  @ONLY)
+message("revision=\"${SVNVERSION}\"")
+
+####
+add_subdirectory(teraterm)
+add_subdirectory(ttpmenu)
+add_subdirectory(TTProxy)
+add_subdirectory(ttssh2)
+add_subdirectory(TTXKanjiMenu)
+if(${ENABLE_TTXSAMPLES})
+  add_subdirectory(TTXSamples)
+endif()

Added: trunk/TTProxy/CMakeLists.txt
===================================================================
--- trunk/TTProxy/CMakeLists.txt	                        (rev 0)
+++ trunk/TTProxy/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,111 @@
+project(ttproxy)
+
+if(USE_UNICODE_API)
+  add_definitions(-DUNICODE -D_UNICODE)
+endif()
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+include(${CMAKE_CURRENT_SOURCE_DIR}/../libs/lib_openssl.cmake)
+
+set(COMMON_SRC
+  ../teraterm/common/ttlib.h
+  ../teraterm/common/ttlib.c
+  ../teraterm/common/i18n.h
+  ../teraterm/common/ttplugin.h
+  ../teraterm/common/tttypes.h
+  ../teraterm/common/tt-version.h
+  ../teraterm/common/codeconv.h
+  ../teraterm/common/codeconv.cpp
+  ../teraterm/common/dlglib.h
+  ../teraterm/common/dlglib.c
+  ../teraterm/teraterm/ttdialog.h
+  ../teraterm/teraterm/ttfileio.h
+  ../teraterm/teraterm/ttsetup.h
+  ../teraterm/teraterm/ttwsk.h
+  )
+source_group(
+  "common"
+  FILES
+  ${COMMON_SRC}
+  )
+
+set(YCL_SRC
+  YCL/include/YCL/Array.h
+  YCL/include/YCL/ComboBoxCtrl.h
+  YCL/include/YCL/common.h
+  YCL/include/YCL/Dialog.h
+  YCL/include/YCL/DynamicLinkLibrary.h
+  YCL/include/YCL/EditBoxCtrl.h
+  YCL/include/YCL/Enumeration.h
+  YCL/include/YCL/FileVersion.h
+  YCL/include/YCL/HASHCODE.h
+  YCL/include/YCL/Hashtable.h
+  YCL/include/YCL/IniFile.h
+  YCL/include/YCL/Integer.h
+  YCL/include/YCL/Object.h
+  YCL/include/YCL/Pointer.h
+  YCL/include/YCL/Resource.h
+  YCL/include/YCL/String.h
+  YCL/include/YCL/StringBuffer.h
+  YCL/include/YCL/StringUtil.h
+  YCL/include/YCL/ValueCtrl.h
+  YCL/include/YCL/Vector.h
+  YCL/include/YCL/Window.h
+  )
+source_group(
+  "YCL"
+  FILES
+  ${YCL_SRC}
+  )
+
+set(SRC
+  Hooker.h
+  Logger.h
+  ProxyWSockHook.h
+  resource.h
+  SSLLIB.h
+  SSLSocket.h
+  StdAfx.cpp
+  StdAfx.h
+  TTProxy.cpp
+  TTProxy.h
+  TTProxy.rc
+  TTX.def
+  )
+
+include_directories(
+  ../teraterm/teraterm
+  ../teraterm/common
+  YCL/include
+  ${OPENSSL_INCLUDE_DIRS}
+  .
+  )
+
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-uTTXBind ＠ 8")
+
+add_library(
+  ttproxy SHARED
+  ${SRC}
+  ${COMMON_SRC}
+  ${YCL_SRC}
+  )
+
+if(MINGW)
+  set_target_properties(
+    ttproxy
+    PROPERTIES
+    PREFIX ""
+    OUTPUT_NAME "TTXProxy"
+    )
+endif()
+
+target_link_libraries(
+  ttproxy
+  ttpcmn
+  #
+  ws2_32
+  version
+  gdi32
+  comdlg32
+  )

Added: trunk/TTXKanjiMenu/CMakeLists.txt
===================================================================
--- trunk/TTXKanjiMenu/CMakeLists.txt	                        (rev 0)
+++ trunk/TTXKanjiMenu/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,34 @@
+project(ttxkanjimenu)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+if(USE_UNICODE_API)
+  add_definitions(-DUNICODE -D_UNICODE)
+endif()
+
+set(SRC
+  resource.h
+  ttxkanjimenu.c
+  ttxkanjimenu.rc
+  )
+
+include_directories(
+  ../teraterm/teraterm
+  ../teraterm/common
+  ../libs/openssl/inc32
+  .
+  )
+
+add_library(
+  ttxkanjimenu SHARED
+  ${SRC}
+  )
+
+target_link_libraries(
+  ttxkanjimenu
+  ttpcmn
+  #
+  ws2_32
+  )
+
+

Added: trunk/TTXSamples/CMakeLists.txt
===================================================================
--- trunk/TTXSamples/CMakeLists.txt	                        (rev 0)
+++ trunk/TTXSamples/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,48 @@
+
+add_subdirectory(TTXAdditionalTitle)
+set_target_properties(TTXAdditionalTitle PROPERTIES FOLDER TTXSamples)
+
+add_subdirectory(TTXAlwaysOnTop)
+set_target_properties(TTXAlwaysOnTop PROPERTIES FOLDER TTXSamples)
+
+add_subdirectory(TTXCallSysMenu)
+set_target_properties(TTXCallSysMenu PROPERTIES FOLDER TTXSamples)
+
+add_subdirectory(TTXCommandLineOpt)
+set_target_properties(TTXCommandLineOpt PROPERTIES FOLDER TTXSamples)
+
+add_subdirectory(TTXCopyIniFile)
+set_target_properties(TTXCopyIniFile PROPERTIES FOLDER TTXSamples)
+
+add_subdirectory(TTXFixedWinSize)
+set_target_properties(TTXFixedWinSize PROPERTIES FOLDER TTXSamples)
+
+add_subdirectory(TTXKcodeChange)
+set_target_properties(TTXKcodeChange PROPERTIES FOLDER TTXSamples)
+
+add_subdirectory(TTXOutputBuffering)
+set_target_properties(TTXOutputBuffering PROPERTIES FOLDER TTXSamples)
+
+add_subdirectory(TTXRecurringCommand)
+set_target_properties(TTXRecurringCommand PROPERTIES FOLDER TTXSamples)
+
+add_subdirectory(TTXResizeMenu)
+set_target_properties(TTXResizeMenu PROPERTIES FOLDER TTXSamples)
+
+add_subdirectory(TTXResizeWin)
+set_target_properties(TTXResizeWin PROPERTIES FOLDER TTXSamples)
+
+add_subdirectory(TTXShowCommandLine)
+set_target_properties(TTXShowCommandLine PROPERTIES FOLDER TTXSamples)
+
+add_subdirectory(TTXtest)
+set_target_properties(TTXtest PROPERTIES FOLDER TTXSamples)
+
+add_subdirectory(TTXttyrec)
+set_target_properties(TTXttyrec PROPERTIES FOLDER TTXSamples)
+set_target_properties(TTXttyplay PROPERTIES FOLDER TTXSamples)
+
+add_subdirectory(TTXViewMode)
+set_target_properties(TTXViewMode PROPERTIES FOLDER TTXSamples)
+
+

Added: trunk/TTXSamples/TTXAdditionalTitle/CMakeLists.txt
===================================================================
--- trunk/TTXSamples/TTXAdditionalTitle/CMakeLists.txt	                        (rev 0)
+++ trunk/TTXSamples/TTXAdditionalTitle/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,26 @@
+project(TTXAdditionalTitle)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+set(SRC
+  TTXAdditionalTitle.c
+  ReadMe.txt
+  ReadMe-ja.txt
+  )
+
+include_directories(
+  ../../teraterm/teraterm
+  ../../teraterm/common
+  )
+
+add_library(
+  TTXAdditionalTitle SHARED
+  ${SRC}
+  )
+
+target_link_libraries(
+  TTXAdditionalTitle
+  ttpcmn
+  )
+
+

Added: trunk/TTXSamples/TTXAlwaysOnTop/CMakeLists.txt
===================================================================
--- trunk/TTXSamples/TTXAlwaysOnTop/CMakeLists.txt	                        (rev 0)
+++ trunk/TTXSamples/TTXAlwaysOnTop/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,30 @@
+project(TTXAlwaysOnTop)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+if(USE_UNICODE_API)
+  add_definitions(-DUNICODE -D_UNICODE)
+endif()
+
+set(SRC
+  TTXAlwaysOnTop.c
+  ReadMe.txt
+  ReadMe-ja.txt
+  )
+
+include_directories(
+  ../../teraterm/teraterm
+  ../../teraterm/common
+  )
+
+add_library(
+  TTXAlwaysOnTop SHARED
+  ${SRC}
+  )
+
+target_link_libraries(
+  TTXAlwaysOnTop
+  ttpcmn
+  )
+
+

Added: trunk/TTXSamples/TTXCallSysMenu/CMakeLists.txt
===================================================================
--- trunk/TTXSamples/TTXCallSysMenu/CMakeLists.txt	                        (rev 0)
+++ trunk/TTXSamples/TTXCallSysMenu/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,19 @@
+project(TTXCallSysMenu)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+set(SRC
+  TTXCallSysMenu.c
+  ReadMe.txt
+  ReadMe-ja.txt
+  )
+
+include_directories(
+  ../../teraterm/teraterm
+  ../../teraterm/common
+  )
+
+add_library(
+  TTXCallSysMenu SHARED
+  ${SRC}
+  )

Added: trunk/TTXSamples/TTXCommandLineOpt/CMakeLists.txt
===================================================================
--- trunk/TTXSamples/TTXCommandLineOpt/CMakeLists.txt	                        (rev 0)
+++ trunk/TTXSamples/TTXCommandLineOpt/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,26 @@
+project(TTXCommandLineOpt)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+set(SRC
+  TTXCommandLineOpt.c
+  ReadMe.txt
+  ReadMe-ja.txt
+  )
+
+include_directories(
+  ../../teraterm/teraterm
+  ../../teraterm/common
+  )
+
+add_library(
+  TTXCommandLineOpt SHARED
+  ${SRC}
+  )
+
+target_link_libraries(
+  TTXCommandLineOpt
+  ttpcmn
+  )
+
+

Added: trunk/TTXSamples/TTXCopyIniFile/CMakeLists.txt
===================================================================
--- trunk/TTXSamples/TTXCopyIniFile/CMakeLists.txt	                        (rev 0)
+++ trunk/TTXSamples/TTXCopyIniFile/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,21 @@
+project(TTXCopyIniFile)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+set(SRC
+  TTXCopyIniFile.c
+  ReadMe.txt
+  ReadMe-ja.txt
+  )
+
+include_directories(
+  ../../teraterm/teraterm
+  ../../teraterm/common
+  )
+
+add_library(
+  TTXCopyIniFile SHARED
+  ${SRC}
+  )
+
+

Added: trunk/TTXSamples/TTXFixedWinSize/CMakeLists.txt
===================================================================
--- trunk/TTXSamples/TTXFixedWinSize/CMakeLists.txt	                        (rev 0)
+++ trunk/TTXSamples/TTXFixedWinSize/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,21 @@
+project(TTXFixedWinSize)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+set(SRC
+  TTXFixedWinSize.c
+  ReadMe.txt
+  ReadMe-ja.txt
+  )
+
+include_directories(
+  ../../teraterm/teraterm
+  ../../teraterm/common
+  )
+
+add_library(
+  TTXFixedWinSize SHARED
+  ${SRC}
+  )
+
+

Added: trunk/TTXSamples/TTXKcodeChange/CMakeLists.txt
===================================================================
--- trunk/TTXSamples/TTXKcodeChange/CMakeLists.txt	                        (rev 0)
+++ trunk/TTXSamples/TTXKcodeChange/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,21 @@
+project(TTXKcodeChange)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+set(SRC
+  TTXKcodeChange.c
+  ReadMe.txt
+  ReadMe-ja.txt
+  )
+
+include_directories(
+  ../../teraterm/teraterm
+  ../../teraterm/common
+  )
+
+add_library(
+  TTXKcodeChange SHARED
+  ${SRC}
+  )
+
+

Added: trunk/TTXSamples/TTXOutputBuffering/CMakeLists.txt
===================================================================
--- trunk/TTXSamples/TTXOutputBuffering/CMakeLists.txt	                        (rev 0)
+++ trunk/TTXSamples/TTXOutputBuffering/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,21 @@
+project(TTXOutputBuffering)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+set(SRC
+  TTXOutputBuffering.c
+  ReadMe.txt
+  ReadMe-ja.txt
+  )
+
+include_directories(
+  ../../teraterm/teraterm
+  ../../teraterm/common
+  )
+
+add_library(
+  TTXOutputBuffering SHARED
+  ${SRC}
+  )
+
+

Added: trunk/TTXSamples/TTXRecurringCommand/CMakeLists.txt
===================================================================
--- trunk/TTXSamples/TTXRecurringCommand/CMakeLists.txt	                        (rev 0)
+++ trunk/TTXSamples/TTXRecurringCommand/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,42 @@
+project(TTXRecurringCommand)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+if(USE_UNICODE_API)
+  add_definitions(-DUNICODE -D_UNICODE)
+endif()
+
+set(COMMON_SRC
+  ../../teraterm/common/dlglib.h
+  )
+
+source_group(
+  "common"
+  FILES
+  ${COMMON_SRC}
+  )
+
+set(SRC
+  TTXRecurringCommand.c
+  TTXRecurringCommand.rc
+  ReadMe.txt
+  ReadMe-ja.txt
+  )
+
+include_directories(
+  ../../teraterm/teraterm
+  ../../teraterm/common
+  )
+
+add_library(
+  TTXRecurringCommand SHARED
+  ${SRC}
+  ${COMMON_SRC}
+  )
+
+target_link_libraries(
+  TTXRecurringCommand
+  ttpcmn
+  #
+  gdi32
+  )

Added: trunk/TTXSamples/TTXResizeMenu/CMakeLists.txt
===================================================================
--- trunk/TTXSamples/TTXResizeMenu/CMakeLists.txt	                        (rev 0)
+++ trunk/TTXSamples/TTXResizeMenu/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,31 @@
+project(TTXResizeMenu)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+set(SRC
+  TTXResizeMenu.c
+  ReadMe.txt
+  ReadMe-ja.txt
+  )
+
+include_directories(
+  ../../teraterm/teraterm
+  ../../teraterm/common
+  )
+
+if (MSVC)
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DELAYLOAD:user32.dll")
+endif()
+
+add_library(
+  TTXResizeMenu SHARED
+  ${SRC}
+  )
+
+target_link_libraries(
+  TTXResizeMenu
+  ttpcmn
+  delayimp
+  )
+
+

Added: trunk/TTXSamples/TTXResizeWin/CMakeLists.txt
===================================================================
--- trunk/TTXSamples/TTXResizeWin/CMakeLists.txt	                        (rev 0)
+++ trunk/TTXSamples/TTXResizeWin/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,21 @@
+project(TTXResizeWin)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+set(SRC
+  TTXResizeWin.c
+  ReadMe.txt
+  ReadMe-ja.txt
+  )
+
+include_directories(
+  ../../teraterm/teraterm
+  ../../teraterm/common
+  )
+
+add_library(
+  TTXResizeWin SHARED
+  ${SRC}
+  )
+
+

Added: trunk/TTXSamples/TTXShowCommandLine/CMakeLists.txt
===================================================================
--- trunk/TTXSamples/TTXShowCommandLine/CMakeLists.txt	                        (rev 0)
+++ trunk/TTXSamples/TTXShowCommandLine/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,21 @@
+project(TTXShowCommandLine)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+set(SRC
+  TTXShowCommandLine.c
+  ReadMe.txt
+  ReadMe-ja.txt
+  )
+
+include_directories(
+  ../../teraterm/teraterm
+  ../../teraterm/common
+  )
+
+add_library(
+  TTXShowCommandLine SHARED
+  ${SRC}
+  )
+
+

Added: trunk/TTXSamples/TTXViewMode/CMakeLists.txt
===================================================================
--- trunk/TTXSamples/TTXViewMode/CMakeLists.txt	                        (rev 0)
+++ trunk/TTXSamples/TTXViewMode/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,22 @@
+project(TTXViewMode)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+set(SRC
+  resource.h
+  TTXViewMode.c
+  TTXViewMode.h
+  TTXViewMode.rc
+  ReadMe.txt
+  ReadMe-ja.txt
+  )
+
+include_directories(
+  ../../teraterm/teraterm
+  ../../teraterm/common
+  )
+
+add_library(
+  TTXViewMode SHARED
+  ${SRC}
+  )

Added: trunk/TTXSamples/TTXttyrec/CMakeLists.txt
===================================================================
--- trunk/TTXSamples/TTXttyrec/CMakeLists.txt	                        (rev 0)
+++ trunk/TTXSamples/TTXttyrec/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,45 @@
+project(TTXttyrec)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+include_directories(
+  ../../teraterm/teraterm
+  ../../teraterm/common
+  )
+
+add_library(
+  TTXttyplay SHARED
+  TTXttyplay.c
+  gettimeofday.c
+  gettimeofday.h
+  ReadMe.txt
+  ReadMe-ja.txt
+  )
+
+target_link_libraries(
+  TTXttyplay
+  ttpcmn
+  #
+  comdlg32
+  )
+
+add_library(
+  TTXttyrec SHARED
+  TTXttyrec.c
+  gettimeofday.c
+  gettimeofday.h
+  ReadMe.txt
+  ReadMe-ja.txt
+  )
+
+target_link_libraries(
+  TTXttyrec
+  ttpcmn
+  comdlg32
+  )
+
+set_target_properties(
+  TTXttyrec TTXttyplay
+  PROPERTIES
+  PREFIX ""
+  )

Added: trunk/TTXSamples/ttxtest/CMakeLists.txt
===================================================================
--- trunk/TTXSamples/ttxtest/CMakeLists.txt	                        (rev 0)
+++ trunk/TTXSamples/ttxtest/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,13 @@
+project(TTXtest)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+include_directories(
+  ../../teraterm/teraterm
+  ../../teraterm/common
+  )
+
+add_library(
+  TTXtest SHARED
+  TTXtest.c
+  )

Added: trunk/doc/Markdown_1.0.1/License.text
===================================================================
--- trunk/doc/Markdown_1.0.1/License.text	                        (rev 0)
+++ trunk/doc/Markdown_1.0.1/License.text	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,30 @@
+Copyright (c) 2004, John Gruber  
+<http://daringfireball.net/>  
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+
+* Neither the name "Markdown" nor the names of its contributors may
+  be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+This software is provided by the copyright holders and contributors "as
+is" and any express or implied warranties, including, but not limited
+to, the implied warranties of merchantability and fitness for a
+particular purpose are disclaimed. In no event shall the copyright owner
+or contributors be liable for any direct, indirect, incidental, special,
+exemplary, or consequential damages (including, but not limited to,
+procurement of substitute goods or services; loss of use, data, or
+profits; or business interruption) however caused and on any theory of
+liability, whether in contract, strict liability, or tort (including
+negligence or otherwise) arising in any way out of the use of this
+software, even if advised of the possibility of such damage.

Added: trunk/doc/Markdown_1.0.1/Markdown Readme.text
===================================================================
--- trunk/doc/Markdown_1.0.1/Markdown Readme.text	                        (rev 0)
+++ trunk/doc/Markdown_1.0.1/Markdown Readme.text	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,341 @@
+Markdown
+========
+
+Version 1.0.1 - Tue 14 Dec 2004
+
+by John Gruber  
+<http://daringfireball.net/>
+
+
+Introduction
+------------
+
+Markdown is a text-to-HTML conversion tool for web writers. Markdown
+allows you to write using an easy-to-read, easy-to-write plain text
+format, then convert it to structurally valid XHTML (or HTML).
+
+Thus, "Markdown" is two things: a plain text markup syntax, and a
+software tool, written in Perl, that converts the plain text markup 
+to HTML.
+
+Markdown works both as a Movable Type plug-in and as a standalone Perl
+script -- which means it can also be used as a text filter in BBEdit
+(or any other application that supporst filters written in Perl).
+
+Full documentation of Markdown's syntax and configuration options is
+available on the web: <http://daringfireball.net/projects/markdown/>.
+(Note: this readme file is formatted in Markdown.)
+
+
+
+Installation and Requirements
+-----------------------------
+
+Markdown requires Perl 5.6.0 or later. Welcome to the 21st Century.
+Markdown also requires the standard Perl library module `Digest::MD5`. 
+
+
+### Movable Type ###
+
+Markdown works with Movable Type version 2.6 or later (including 
+MT 3.0 or later).
+
+1.  Copy the "Markdown.pl" file into your Movable Type "plugins"
+    directory. The "plugins" directory should be in the same directory
+    as "mt.cgi"; if the "plugins" directory doesn't already exist, use
+    your FTP program to create it. Your installation should look like
+    this:
+
+        (mt home)/plugins/Markdown.pl
+
+2.  Once installed, Markdown will appear as an option in Movable Type's
+    Text Formatting pop-up menu. This is selectable on a per-post basis.
+    Markdown translates your posts to HTML when you publish; the posts
+    themselves are stored in your MT database in Markdown format.
+
+3.  If you also install SmartyPants 1.5 (or later), Markdown will offer
+    a second text formatting option: "Markdown with SmartyPants". This
+    option is the same as the regular "Markdown" formatter, except that
+    automatically uses SmartyPants to create typographically correct
+    curly quotes, em-dashes, and ellipses. See the SmartyPants web page
+    for more information: <http://daringfireball.net/projects/smartypants/>
+
+4.  To make Markdown (or "Markdown with SmartyPants") your default
+    text formatting option for new posts, go to Weblog Config ->
+    Preferences.
+
+Note that by default, Markdown produces XHTML output. To configure
+Markdown to produce HTML 4 output, see "Configuration", below.
+
+
+### Blosxom ###
+
+Markdown works with Blosxom version 2.x.
+
+1.  Rename the "Markdown.pl" plug-in to "Markdown" (case is
+    important). Movable Type requires plug-ins to have a ".pl"
+    extension; Blosxom forbids it.
+
+2.  Copy the "Markdown" plug-in file to your Blosxom plug-ins folder.
+    If you're not sure where your Blosxom plug-ins folder is, see the
+    Blosxom documentation for information.
+
+3.  That's it. The entries in your weblog will now automatically be
+    processed by Markdown.
+
+4.  If you'd like to apply Markdown formatting only to certain posts,
+    rather than all of them, see Jason Clark's instructions for using
+    Markdown in conjunction with Blosxom's Meta plugin:
+    
+    <http://jclark.org/weblog/WebDev/Blosxom/Markdown.html>
+
+
+### BBEdit ###
+
+Markdown works with BBEdit 6.1 or later on Mac OS X. (It also works
+with BBEdit 5.1 or later and MacPerl 5.6.1 on Mac OS 8.6 or later.)
+
+1.  Copy the "Markdown.pl" file to appropriate filters folder in your
+    "BBEdit Support" folder. On Mac OS X, this should be:
+
+        BBEdit Support/Unix Support/Unix Filters/
+
+    See the BBEdit documentation for more details on the location of
+    these folders.
+
+    You can rename "Markdown.pl" to whatever you wish.
+
+2.  That's it. To use Markdown, select some text in a BBEdit document,
+    then choose Markdown from the Filters sub-menu in the "#!" menu, or
+    the Filters floating palette
+
+
+
+Configuration
+-------------
+
+By default, Markdown produces XHTML output for tags with empty elements.
+E.g.:
+
+    <br />
+
+Markdown can be configured to produce HTML-style tags; e.g.:
+
+    <br>
+
+
+### Movable Type ###
+
+You need to use a special `MTMarkdownOptions` container tag in each
+Movable Type template where you want HTML 4-style output:
+
+    <MTMarkdownOptions output='html4'>
+        ... put your entry content here ...
+    </MTMarkdownOptions>
+
+The easiest way to use MTMarkdownOptions is probably to put the
+opening tag right after your `<body>` tag, and the closing tag right
+before `</body>`.
+
+To suppress Markdown processing in a particular template, i.e. to
+publish the raw Markdown-formatted text without translation into
+(X)HTML, set the `output` attribute to 'raw':
+
+    <MTMarkdownOptions output='raw'>
+        ... put your entry content here ...
+    </MTMarkdownOptions>
+
+
+### Command-Line ###
+
+Use the `--html4tags` command-line switch to produce HTML output from a
+Unix-style command line. E.g.:
+
+    % perl Markdown.pl --html4tags foo.text
+
+Type `perldoc Markdown.pl`, or read the POD documentation within the
+Markdown.pl source code for more information.
+
+
+
+Bugs
+----
+
+To file bug reports or feature requests please send email to:
+<markdown ＠ daringfireball.net>.
+
+
+
+Version History
+---------------
+
+1.0.1 (14 Dec 2004):
+
++	Changed the syntax rules for code blocks and spans. Previously,
+	backslash escapes for special Markdown characters were processed
+	everywhere other than within inline HTML tags. Now, the contents
+	of code blocks and spans are no longer processed for backslash
+	escapes. This means that code blocks and spans are now treated
+	literally, with no special rules to worry about regarding
+	backslashes.
+
+	**NOTE**: This changes the syntax from all previous versions of
+	Markdown. Code blocks and spans involving backslash characters
+	will now generate different output than before.
+
++	Tweaked the rules for link definitions so that they must occur
+	within three spaces of the left margin. Thus if you indent a link
+	definition by four spaces or a tab, it will now be a code block.
+	
+		   [a]: /url/  "Indented 3 spaces, this is a link def"
+
+		    [b]: /url/  "Indented 4 spaces, this is a code block"
+	
+	**IMPORTANT**: This may affect existing Markdown content if it
+	contains link definitions indented by 4 or more spaces.
+
++	Added `>`, `+`, and `-` to the list of backslash-escapable
+	characters. These should have been done when these characters
+	were added as unordered list item markers.
+
++	Trailing spaces and tabs following HTML comments and `<hr/>` tags
+	are now ignored.
+
++	Inline links using `<` and `>` URL delimiters weren't working:
+
+		like [this](<http://example.com/>)
+
++	Added a bit of tolerance for trailing spaces and tabs after
+	Markdown hr's.
+
++	Fixed bug where auto-links were being processed within code spans:
+
+		like this: `<http://example.com/>`
+
++	Sort-of fixed a bug where lines in the middle of hard-wrapped
+	paragraphs, which lines look like the start of a list item,
+	would accidentally trigger the creation of a list. E.g. a
+	paragraph that looked like this:
+
+		I recommend upgrading to version
+		8. Oops, now this line is treated
+		as a sub-list.
+
+	This is fixed for top-level lists, but it can still happen for
+	sub-lists. E.g., the following list item will not be parsed
+	properly:
+
+		+	I recommend upgrading to version
+			8. Oops, now this line is treated
+			as a sub-list.
+
+	Given Markdown's list-creation rules, I'm not sure this can
+	be fixed.
+
++	Standalone HTML comments are now handled; previously, they'd get
+	wrapped in a spurious `<p>` tag.
+
++	Fix for horizontal rules preceded by 2 or 3 spaces.
+
++	`<hr>` HTML tags in must occur within three spaces of left
+	margin. (With 4 spaces or a tab, they should be code blocks, but
+	weren't before this fix.)
+
++	Capitalized "With" in "Markdown With SmartyPants" for
+	consistency with the same string label in SmartyPants.pl.
+	(This fix is specific to the MT plug-in interface.)
+
++	Auto-linked email address can now optionally contain
+	a 'mailto:' protocol. I.e. these are equivalent:
+
+		<mailto:user ＠ example.com>
+		<user ＠ example.com>
+
++	Fixed annoying bug where nested lists would wind up with
+	spurious (and invalid) `<p>` tags.
+
++	You can now write empty links:
+
+		[like this]()
+
+	and they'll be turned into anchor tags with empty href attributes.
+	This should have worked before, but didn't.
+
++	`***this***` and `___this___` are now turned into
+
+		<strong><em>this</em></strong>
+
+	Instead of
+
+		<strong><em>this</strong></em>
+
+	which isn't valid. (Thanks to Michel Fortin for the fix.)
+
++	Added a new substitution in `_EncodeCode()`: s/\$/&#036;/g; This
+	is only for the benefit of Blosxom users, because Blosxom
+	(sometimes?) interpolates Perl scalars in your article bodies.
+
++	Fixed problem for links defined with urls that include parens, e.g.:
+
+		[1]: http://sources.wikipedia.org/wiki/Middle_East_Policy_(Chomsky)
+
+	"Chomsky" was being erroneously treated as the URL's title.
+
++	At some point during 1.0's beta cycle, I changed every sub's
+	argument fetching from this idiom:
+
+		my $text = shift;
+
+	to:
+
+		my $text = shift || return '';
+
+	The idea was to keep Markdown from doing any work in a sub
+	if the input was empty. This introduced a bug, though:
+	if the input to any function was the single-character string
+	"0", it would also evaluate as false and return immediately.
+	How silly. Now fixed.
+
+
+
+Donations
+---------
+
+Donations to support Markdown's development are happily accepted. See:
+<http://daringfireball.net/projects/markdown/> for details.
+
+
+
+Copyright and License
+---------------------
+
+Copyright (c) 2003-2004 John Gruber   
+<http://daringfireball.net/>   
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+
+* Neither the name "Markdown" nor the names of its contributors may
+  be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+This software is provided by the copyright holders and contributors "as
+is" and any express or implied warranties, including, but not limited
+to, the implied warranties of merchantability and fitness for a
+particular purpose are disclaimed. In no event shall the copyright owner
+or contributors be liable for any direct, indirect, incidental, special,
+exemplary, or consequential damages (including, but not limited to,
+procurement of substitute goods or services; loss of use, data, or
+profits; or business interruption) however caused and on any theory of
+liability, whether in contract, strict liability, or tort (including
+negligence or otherwise) arising in any way out of the use of this
+software, even if advised of the possibility of such damage.

Added: trunk/doc/Markdown_1.0.1/Markdown.pl
===================================================================
--- trunk/doc/Markdown_1.0.1/Markdown.pl	                        (rev 0)
+++ trunk/doc/Markdown_1.0.1/Markdown.pl	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,1450 @@
+#!/usr/bin/perl
+
+#
+# Markdown -- A text-to-HTML conversion tool for web writers
+#
+# Copyright (c) 2004 John Gruber
+# <http://daringfireball.net/projects/markdown/>
+#
+
+
+package Markdown;
+require 5.006_000;
+use strict;
+use warnings;
+
+use Digest::MD5 qw(md5_hex);
+use vars qw($VERSION);
+$VERSION = '1.0.1';
+# Tue 14 Dec 2004
+
+## Disabled; causes problems under Perl 5.6.1:
+use utf8;
+#binmode( STDOUT, ":utf8" );  # c.f.: http://acis.openlib.org/dev/perl-unicode-struggle.html
+
+
+#
+# Global default settings:
+#
+my $g_empty_element_suffix = " />";     # Change to ">" for HTML output
+my $g_tab_width = 4;
+
+
+#
+# Globals:
+#
+
+# Regex to match balanced [brackets]. See Friedl's
+# "Mastering Regular Expressions", 2nd Ed., pp. 328-331.
+my $g_nested_brackets;
+$g_nested_brackets = qr{
+	(?> 								# Atomic matching
+	   [^\[\]]+							# Anything other than brackets
+	 | 
+	   \[
+		 (??{ $g_nested_brackets })		# Recursive set of nested brackets
+	   \]
+	)*
+}x;
+
+
+# Table of hash values for escaped characters:
+my %g_escape_table;
+foreach my $char (split //, '\\`*_{}[]()>#+-.!') {
+	$g_escape_table{$char} = md5_hex($char);
+}
+
+
+# Global hashes, used by various utility routines
+my %g_urls;
+my %g_titles;
+my %g_html_blocks;
+
+# Used to track when we're inside an ordered or unordered list
+# (see _ProcessListItems() for details):
+my $g_list_level = 0;
+
+
+#### Blosxom plug-in interface ##########################################
+
+# Set $g_blosxom_use_meta to 1 to use Blosxom's meta plug-in to determine
+# which posts Markdown should process, using a "meta-markup: markdown"
+# header. If it's set to 0 (the default), Markdown will process all
+# entries.
+my $g_blosxom_use_meta = 0;
+
+sub start { 1; }
+sub story {
+	my($pkg, $path, $filename, $story_ref, $title_ref, $body_ref) = @_;
+
+	if ( (! $g_blosxom_use_meta) or
+	     (defined($meta::markup) and ($meta::markup =~ /^\s*markdown\s*$/i))
+	     ){
+			$$body_ref  = Markdown($$body_ref);
+     }
+     1;
+}
+
+
+#### Movable Type plug-in interface #####################################
+eval {require MT};  # Test to see if we're running in MT.
+unless ($@) {
+    require MT;
+    import  MT;
+    require MT::Template::Context;
+    import  MT::Template::Context;
+
+	eval {require MT::Plugin};  # Test to see if we're running >= MT 3.0.
+	unless ($@) {
+		require MT::Plugin;
+		import  MT::Plugin;
+		my $plugin = new MT::Plugin({
+			name => "Markdown",
+			description => "A plain-text-to-HTML formatting plugin. (Version: $VERSION)",
+			doc_link => 'http://daringfireball.net/projects/markdown/'
+		});
+		MT->add_plugin( $plugin );
+	}
+
+	MT::Template::Context->add_container_tag(MarkdownOptions => sub {
+		my $ctx	 = shift;
+		my $args = shift;
+		my $builder = $ctx->stash('builder');
+		my $tokens = $ctx->stash('tokens');
+
+		if (defined ($args->{'output'}) ) {
+			$ctx->stash('markdown_output', lc $args->{'output'});
+		}
+
+		defined (my $str = $builder->build($ctx, $tokens) )
+			or return $ctx->error($builder->errstr);
+		$str;		# return value
+	});
+
+	MT->add_text_filter('markdown' => {
+		label     => 'Markdown',
+		docs      => 'http://daringfireball.net/projects/markdown/',
+		on_format => sub {
+			my $text = shift;
+			my $ctx  = shift;
+			my $raw  = 0;
+		    if (defined $ctx) {
+		    	my $output = $ctx->stash('markdown_output'); 
+				if (defined $output  &&  $output =~ m/^html/i) {
+					$g_empty_element_suffix = ">";
+					$ctx->stash('markdown_output', '');
+				}
+				elsif (defined $output  &&  $output eq 'raw') {
+					$raw = 1;
+					$ctx->stash('markdown_output', '');
+				}
+				else {
+					$raw = 0;
+					$g_empty_element_suffix = " />";
+				}
+			}
+			$text = $raw ? $text : Markdown($text);
+			$text;
+		},
+	});
+
+	# If SmartyPants is loaded, add a combo Markdown/SmartyPants text filter:
+	my $smartypants;
+
+	{
+		no warnings "once";
+		$smartypants = $MT::Template::Context::Global_filters{'smarty_pants'};
+	}
+
+	if ($smartypants) {
+		MT->add_text_filter('markdown_with_smartypants' => {
+			label     => 'Markdown With SmartyPants',
+			docs      => 'http://daringfireball.net/projects/markdown/',
+			on_format => sub {
+				my $text = shift;
+				my $ctx  = shift;
+				if (defined $ctx) {
+					my $output = $ctx->stash('markdown_output'); 
+					if (defined $output  &&  $output eq 'html') {
+						$g_empty_element_suffix = ">";
+					}
+					else {
+						$g_empty_element_suffix = " />";
+					}
+				}
+				$text = Markdown($text);
+				$text = $smartypants->($text, '1');
+			},
+		});
+	}
+}
+else {
+#### BBEdit/command-line text filter interface ##########################
+# Needs to be hidden from MT (and Blosxom when running in static mode).
+
+    # We're only using $blosxom::version once; tell Perl not to warn us:
+	no warnings 'once';
+    unless ( defined($blosxom::version) ) {
+		use warnings;
+
+		#### Check for command-line switches: #################
+		my %cli_opts;
+		use Getopt::Long;
+		Getopt::Long::Configure('pass_through');
+		GetOptions(\%cli_opts,
+			'version',
+			'shortversion',
+			'html4tags',
+		);
+		if ($cli_opts{'version'}) {		# Version info
+			print "\nThis is Markdown, version $VERSION.\n";
+			print "Copyright 2004 John Gruber\n";
+			print "http://daringfireball.net/projects/markdown/\n\n";
+			exit 0;
+		}
+		if ($cli_opts{'shortversion'}) {		# Just the version number string.
+			print $VERSION;
+			exit 0;
+		}
+		if ($cli_opts{'html4tags'}) {			# Use HTML tag style instead of XHTML
+			$g_empty_element_suffix = ">";
+		}
+
+
+		#### Process incoming text: ###########################
+		my $text;
+		{
+			local $/;               # Slurp the whole file
+			$text = <>;
+		}
+        print Markdown($text);
+    }
+}
+
+
+
+sub Markdown {
+#
+# Main function. The order in which other subs are called here is
+# essential. Link and image substitutions need to happen before
+# _EscapeSpecialChars(), so that any *'s or _'s in the <a>
+# and <img> tags get encoded.
+#
+	my $text = shift;
+
+	# Clear the global hashes. If we don't clear these, you get conflicts
+	# from other articles when generating a page which contains more than
+	# one article (e.g. an index page that shows the N most recent
+	# articles):
+	%g_urls = ();
+	%g_titles = ();
+	%g_html_blocks = ();
+
+
+	# Standardize line endings:
+	$text =~ s{\r\n}{\n}g; 	# DOS to Unix
+	$text =~ s{\r}{\n}g; 	# Mac to Unix
+
+	# Make sure $text ends with a couple of newlines:
+	$text .= "\n\n";
+
+	# Convert all tabs to spaces.
+	$text = _Detab($text);
+
+	# Strip any lines consisting only of spaces and tabs.
+	# This makes subsequent regexen easier to write, because we can
+	# match consecutive blank lines with /\n+/ instead of something
+	# contorted like /[ \t]*\n+/ .
+	$text =~ s/^[ \t]+$//mg;
+
+	# Turn block-level HTML blocks into hash entries
+	$text = _HashHTMLBlocks($text);
+
+	# Strip link definitions, store in hashes.
+	$text = _StripLinkDefinitions($text);
+
+	$text = _RunBlockGamut($text);
+
+	$text = _UnescapeSpecialChars($text);
+
+	return $text . "\n";
+}
+
+
+sub _StripLinkDefinitions {
+#
+# Strips link definitions from text, stores the URLs and titles in
+# hash references.
+#
+	my $text = shift;
+	my $less_than_tab = $g_tab_width - 1;
+
+	# Link defs are in the form: ^[id]: url "optional title"
+	while ($text =~ s{
+						^[ ]{0,$less_than_tab}\[(.+)\]:	# id = $1
+						  [ \t]*
+						  \n?				# maybe *one* newline
+						  [ \t]*
+						<?(\S+?)>?			# url = $2
+						  [ \t]*
+						  \n?				# maybe one newline
+						  [ \t]*
+						(?:
+							(?<=\s)			# lookbehind for whitespace
+							["(]
+							(.+?)			# title = $3
+							[")]
+							[ \t]*
+						)?	# title is optional
+						(?:\n+|\Z)
+					}
+					{}mx) {
+		$g_urls{lc $1} = _EncodeAmpsAndAngles( $2 );	# Link IDs are case-insensitive
+		if ($3) {
+			$g_titles{lc $1} = $3;
+			$g_titles{lc $1} =~ s/"/&quot;/g;
+		}
+	}
+
+	return $text;
+}
+
+
+sub _HashHTMLBlocks {
+	my $text = shift;
+	my $less_than_tab = $g_tab_width - 1;
+
+	# Hashify HTML blocks:
+	# We only want to do this for block-level HTML tags, such as headers,
+	# lists, and tables. That's because we still want to wrap <p>s around
+	# "paragraphs" that are wrapped in non-block-level tags, such as anchors,
+	# phrase emphasis, and spans. The list of tags we're looking for is
+	# hard-coded:
+	my $block_tags_a = qr/p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|ins|del/;
+	my $block_tags_b = qr/p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math/;
+
+	# First, look for nested blocks, e.g.:
+	# 	<div>
+	# 		<div>
+	# 		tags for inner block must be indented.
+	# 		</div>
+	# 	</div>
+	#
+	# The outermost tags must start at the left margin for this to match, and
+	# the inner nested divs must be indented.
+	# We need to do this before the next, more liberal match, because the next
+	# match will start at the first `<div>` and stop at the first `</div>`.
+	$text =~ s{
+				(						# save in $1
+					^					# start of line  (with /m)
+					<($block_tags_a)	# start tag = $2
+					\b					# word break
+					(.*\n)*?			# any number of lines, minimally matching
+					</\2>				# the matching end tag
+					[ \t]*				# trailing spaces/tabs
+					(?=\n+|\Z)	# followed by a newline or end of document
+				)
+			}{
+				my $key = md5_hex($1);
+				$g_html_blocks{$key} = $1;
+				"\n\n" . $key . "\n\n";
+			}egmx;
+
+
+	#
+	# Now match more liberally, simply from `\n<tag>` to `</tag>\n`
+	#
+	$text =~ s{
+				(						# save in $1
+					^					# start of line  (with /m)
+					<($block_tags_b)	# start tag = $2
+					\b					# word break
+					(.*\n)*?			# any number of lines, minimally matching
+					.*</\2>				# the matching end tag
+					[ \t]*				# trailing spaces/tabs
+					(?=\n+|\Z)	# followed by a newline or end of document
+				)
+			}{
+				my $key = md5_hex($1);
+				$g_html_blocks{$key} = $1;
+				"\n\n" . $key . "\n\n";
+			}egmx;
+	# Special case just for <hr />. It was easier to make a special case than
+	# to make the other regex more complicated.	
+	$text =~ s{
+				(?:
+					(?<=\n\n)		# Starting after a blank line
+					|				# or
+					\A\n?			# the beginning of the doc
+				)
+				(						# save in $1
+					[ ]{0,$less_than_tab}
+					<(hr)				# start tag = $2
+					\b					# word break
+					([^<>])*?			# 
+					/?>					# the matching end tag
+					[ \t]*
+					(?=\n{2,}|\Z)		# followed by a blank line or end of document
+				)
+			}{
+				my $key = md5_hex($1);
+				$g_html_blocks{$key} = $1;
+				"\n\n" . $key . "\n\n";
+			}egx;
+
+	# Special case for standalone HTML comments:
+	$text =~ s{
+				(?:
+					(?<=\n\n)		# Starting after a blank line
+					|				# or
+					\A\n?			# the beginning of the doc
+				)
+				(						# save in $1
+					[ ]{0,$less_than_tab}
+					(?s:
+						<!
+						(--.*?--\s*)+
+						>
+					)
+					[ \t]*
+					(?=\n{2,}|\Z)		# followed by a blank line or end of document
+				)
+			}{
+				my $key = md5_hex($1);
+				$g_html_blocks{$key} = $1;
+				"\n\n" . $key . "\n\n";
+			}egx;
+
+
+	return $text;
+}
+
+
+sub _RunBlockGamut {
+#
+# These are all the transformations that form block-level
+# tags like paragraphs, headers, and list items.
+#
+	my $text = shift;
+
+	$text = _DoHeaders($text);
+
+	# Do Horizontal Rules:
+	$text =~ s{^[ ]{0,2}([ ]?\*[ ]?){3,}[ \t]*$}{\n<hr$g_empty_element_suffix\n}gmx;
+	$text =~ s{^[ ]{0,2}([ ]? -[ ]?){3,}[ \t]*$}{\n<hr$g_empty_element_suffix\n}gmx;
+	$text =~ s{^[ ]{0,2}([ ]? _[ ]?){3,}[ \t]*$}{\n<hr$g_empty_element_suffix\n}gmx;
+
+	$text = _DoLists($text);
+
+	$text = _DoCodeBlocks($text);
+
+	$text = _DoBlockQuotes($text);
+
+	# We already ran _HashHTMLBlocks() before, in Markdown(), but that
+	# was to escape raw HTML in the original Markdown source. This time,
+	# we're escaping the markup we've just created, so that we don't wrap
+	# <p> tags around block-level tags.
+	$text = _HashHTMLBlocks($text);
+
+	$text = _FormParagraphs($text);
+
+	return $text;
+}
+
+
+sub _RunSpanGamut {
+#
+# These are all the transformations that occur *within* block-level
+# tags like paragraphs, headers, and list items.
+#
+	my $text = shift;
+
+	$text = _DoCodeSpans($text);
+
+	$text = _EscapeSpecialChars($text);
+
+	# Process anchor and image tags. Images must come first,
+	# because ![foo][f] looks like an anchor.
+	$text = _DoImages($text);
+	$text = _DoAnchors($text);
+
+	# Make links out of things like `<http://example.com/>`
+	# Must come after _DoAnchors(), because you can use < and >
+	# delimiters in inline links like [this](<url>).
+	$text = _DoAutoLinks($text);
+
+	$text = _EncodeAmpsAndAngles($text);
+
+	$text = _DoItalicsAndBold($text);
+
+	# Do hard breaks:
+	$text =~ s/ {2,}\n/ <br$g_empty_element_suffix\n/g;
+
+	return $text;
+}
+
+
+sub _EscapeSpecialChars {
+	my $text = shift;
+	my $tokens ||= _TokenizeHTML($text);
+
+	$text = '';   # rebuild $text from the tokens
+# 	my $in_pre = 0;	 # Keep track of when we're inside <pre> or <code> tags.
+# 	my $tags_to_skip = qr!<(/?)(?:pre|code|kbd|script|math)[\s>]!;
+
+	foreach my $cur_token (@$tokens) {
+		if ($cur_token->[0] eq "tag") {
+			# Within tags, encode * and _ so they don't conflict
+			# with their use in Markdown for italics and strong.
+			# We're replacing each such character with its
+			# corresponding MD5 checksum value; this is likely
+			# overkill, but it should prevent us from colliding
+			# with the escape values by accident.
+			$cur_token->[1] =~  s! \* !$g_escape_table{'*'}!gx;
+			$cur_token->[1] =~  s! _  !$g_escape_table{'_'}!gx;
+			$text .= $cur_token->[1];
+		} else {
+			my $t = $cur_token->[1];
+			$t = _EncodeBackslashEscapes($t);
+			$text .= $t;
+		}
+	}
+	return $text;
+}
+
+
+sub _DoAnchors {
+#
+# Turn Markdown link shortcuts into XHTML <a> tags.
+#
+	my $text = shift;
+
+	#
+	# First, handle reference-style links: [link text] [id]
+	#
+	$text =~ s{
+		(					# wrap whole match in $1
+		  \[
+		    ($g_nested_brackets)	# link text = $2
+		  \]
+
+		  [ ]?				# one optional space
+		  (?:\n[ ]*)?		# one optional newline followed by spaces
+
+		  \[
+		    (.*?)		# id = $3
+		  \]
+		)
+	}{
+		my $result;
+		my $whole_match = $1;
+		my $link_text   = $2;
+		my $link_id     = lc $3;
+
+		if ($link_id eq "") {
+			$link_id = lc $link_text;     # for shortcut links like [this][].
+		}
+
+		if (defined $g_urls{$link_id}) {
+			my $url = $g_urls{$link_id};
+			$url =~ s! \* !$g_escape_table{'*'}!gx;		# We've got to encode these to avoid
+			$url =~ s!  _ !$g_escape_table{'_'}!gx;		# conflicting with italics/bold.
+			$result = "<a href=\"$url\"";
+			if ( defined $g_titles{$link_id} ) {
+				my $title = $g_titles{$link_id};
+				$title =~ s! \* !$g_escape_table{'*'}!gx;
+				$title =~ s!  _ !$g_escape_table{'_'}!gx;
+				$result .=  " title=\"$title\"";
+			}
+			$result .= ">$link_text</a>";
+		}
+		else {
+			$result = $whole_match;
+		}
+		$result;
+	}xsge;
+
+	#
+	# Next, inline-style links: [link text](url "optional title")
+	#
+	$text =~ s{
+		(				# wrap whole match in $1
+		  \[
+		    ($g_nested_brackets)	# link text = $2
+		  \]
+		  \(			# literal paren
+		  	[ \t]*
+			<?(.*?)>?	# href = $3
+		  	[ \t]*
+			(			# $4
+			  (['"])	# quote char = $5
+			  (.*?)		# Title = $6
+			  \5		# matching quote
+			)?			# title is optional
+		  \)
+		)
+	}{
+		my $result;
+		my $whole_match = $1;
+		my $link_text   = $2;
+		my $url	  		= $3;
+		my $title		= $6;
+
+		$url =~ s! \* !$g_escape_table{'*'}!gx;		# We've got to encode these to avoid
+		$url =~ s!  _ !$g_escape_table{'_'}!gx;		# conflicting with italics/bold.
+		$result = "<a href=\"$url\"";
+
+		if (defined $title) {
+			$title =~ s/"/&quot;/g;
+			$title =~ s! \* !$g_escape_table{'*'}!gx;
+			$title =~ s!  _ !$g_escape_table{'_'}!gx;
+			$result .=  " title=\"$title\"";
+		}
+
+		$result .= ">$link_text</a>";
+
+		$result;
+	}xsge;
+
+	return $text;
+}
+
+
+sub _DoImages {
+#
+# Turn Markdown image shortcuts into <img> tags.
+#
+	my $text = shift;
+
+	#
+	# First, handle reference-style labeled images: ![alt text][id]
+	#
+	$text =~ s{
+		(				# wrap whole match in $1
+		  !\[
+		    (.*?)		# alt text = $2
+		  \]
+
+		  [ ]?				# one optional space
+		  (?:\n[ ]*)?		# one optional newline followed by spaces
+
+		  \[
+		    (.*?)		# id = $3
+		  \]
+
+		)
+	}{
+		my $result;
+		my $whole_match = $1;
+		my $alt_text    = $2;
+		my $link_id     = lc $3;
+
+		if ($link_id eq "") {
+			$link_id = lc $alt_text;     # for shortcut links like ![this][].
+		}
+
+		$alt_text =~ s/"/&quot;/g;
+		if (defined $g_urls{$link_id}) {
+			my $url = $g_urls{$link_id};
+			$url =~ s! \* !$g_escape_table{'*'}!gx;		# We've got to encode these to avoid
+			$url =~ s!  _ !$g_escape_table{'_'}!gx;		# conflicting with italics/bold.
+			$result = "<img src=\"$url\" alt=\"$alt_text\"";
+			if (defined $g_titles{$link_id}) {
+				my $title = $g_titles{$link_id};
+				$title =~ s! \* !$g_escape_table{'*'}!gx;
+				$title =~ s!  _ !$g_escape_table{'_'}!gx;
+				$result .=  " title=\"$title\"";
+			}
+			$result .= $g_empty_element_suffix;
+		}
+		else {
+			# If there's no such link ID, leave intact:
+			$result = $whole_match;
+		}
+
+		$result;
+	}xsge;
+
+	#
+	# Next, handle inline images:  ![alt text](url "optional title")
+	# Don't forget: encode * and _
+
+	$text =~ s{
+		(				# wrap whole match in $1
+		  !\[
+		    (.*?)		# alt text = $2
+		  \]
+		  \(			# literal paren
+		  	[ \t]*
+			<?(\S+?)>?	# src url = $3
+		  	[ \t]*
+			(			# $4
+			  (['"])	# quote char = $5
+			  (.*?)		# title = $6
+			  \5		# matching quote
+			  [ \t]*
+			)?			# title is optional
+		  \)
+		)
+	}{
+		my $result;
+		my $whole_match = $1;
+		my $alt_text    = $2;
+		my $url	  		= $3;
+		my $title		= '';
+		if (defined($6)) {
+			$title		= $6;
+		}
+
+		$alt_text =~ s/"/&quot;/g;
+		$title    =~ s/"/&quot;/g;
+		$url =~ s! \* !$g_escape_table{'*'}!gx;		# We've got to encode these to avoid
+		$url =~ s!  _ !$g_escape_table{'_'}!gx;		# conflicting with italics/bold.
+		$result = "<img src=\"$url\" alt=\"$alt_text\"";
+		if (defined $title) {
+			$title =~ s! \* !$g_escape_table{'*'}!gx;
+			$title =~ s!  _ !$g_escape_table{'_'}!gx;
+			$result .=  " title=\"$title\"";
+		}
+		$result .= $g_empty_element_suffix;
+
+		$result;
+	}xsge;
+
+	return $text;
+}
+
+
+sub _DoHeaders {
+	my $text = shift;
+
+	# Setext-style headers:
+	#	  Header 1
+	#	  ========
+	#  
+	#	  Header 2
+	#	  --------
+	#
+	$text =~ s{ ^(.+)[ \t]*\n=+[ \t]*\n+ }{
+		"<h1>"  .  _RunSpanGamut($1)  .  "</h1>\n\n";
+	}egmx;
+
+	$text =~ s{ ^(.+)[ \t]*\n-+[ \t]*\n+ }{
+		"<h2>"  .  _RunSpanGamut($1)  .  "</h2>\n\n";
+	}egmx;
+
+
+	# atx-style headers:
+	#	# Header 1
+	#	## Header 2
+	#	## Header 2 with closing hashes ##
+	#	...
+	#	###### Header 6
+	#
+	$text =~ s{
+			^(\#{1,6})	# $1 = string of #'s
+			[ \t]*
+			(.+?)		# $2 = Header text
+			[ \t]*
+			\#*			# optional closing #'s (not counted)
+			\n+
+		}{
+			my $h_level = length($1);
+			"<h$h_level>"  .  _RunSpanGamut($2)  .  "</h$h_level>\n\n";
+		}egmx;
+
+	return $text;
+}
+
+
+sub _DoLists {
+#
+# Form HTML ordered (numbered) and unordered (bulleted) lists.
+#
+	my $text = shift;
+	my $less_than_tab = $g_tab_width - 1;
+
+	# Re-usable patterns to match list item bullets and number markers:
+	my $marker_ul  = qr/[*+-]/;
+	my $marker_ol  = qr/\d+[.]/;
+	my $marker_any = qr/(?:$marker_ul|$marker_ol)/;
+
+	# Re-usable pattern to match any entirel ul or ol list:
+	my $whole_list = qr{
+		(								# $1 = whole list
+		  (								# $2
+			[ ]{0,$less_than_tab}
+			(${marker_any})				# $3 = first list item marker
+			[ \t]+
+		  )
+		  (?s:.+?)
+		  (								# $4
+			  \z
+			|
+			  \n{2,}
+			  (?=\S)
+			  (?!						# Negative lookahead for another list item marker
+				[ \t]*
+				${marker_any}[ \t]+
+			  )
+		  )
+		)
+	}mx;
+
+	# We use a different prefix before nested lists than top-level lists.
+	# See extended comment in _ProcessListItems().
+	#
+	# Note: There's a bit of duplication here. My original implementation
+	# created a scalar regex pattern as the conditional result of the test on
+	# $g_list_level, and then only ran the $text =~ s{...}{...}egmx
+	# substitution once, using the scalar as the pattern. This worked,
+	# everywhere except when running under MT on my hosting account at Pair
+	# Networks. There, this caused all rebuilds to be killed by the reaper (or
+	# perhaps they crashed, but that seems incredibly unlikely given that the
+	# same script on the same server ran fine *except* under MT. I've spent
+	# more time trying to figure out why this is happening than I'd like to
+	# admit. My only guess, backed up by the fact that this workaround works,
+	# is that Perl optimizes the substition when it can figure out that the
+	# pattern will never change, and when this optimization isn't on, we run
+	# afoul of the reaper. Thus, the slightly redundant code to that uses two
+	# static s/// patterns rather than one conditional pattern.
+
+	if ($g_list_level) {
+		$text =~ s{
+				^
+				$whole_list
+			}{
+				my $list = $1;
+				my $list_type = ($3 =~ m/$marker_ul/) ? "ul" : "ol";
+				# Turn double returns into triple returns, so that we can make a
+				# paragraph for the last item in a list, if necessary:
+				$list =~ s/\n{2,}/\n\n\n/g;
+				my $result = _ProcessListItems($list, $marker_any);
+				$result = "<$list_type>\n" . $result . "</$list_type>\n";
+				$result;
+			}egmx;
+	}
+	else {
+		$text =~ s{
+				(?:(?<=\n\n)|\A\n?)
+				$whole_list
+			}{
+				my $list = $1;
+				my $list_type = ($3 =~ m/$marker_ul/) ? "ul" : "ol";
+				# Turn double returns into triple returns, so that we can make a
+				# paragraph for the last item in a list, if necessary:
+				$list =~ s/\n{2,}/\n\n\n/g;
+				my $result = _ProcessListItems($list, $marker_any);
+				$result = "<$list_type>\n" . $result . "</$list_type>\n";
+				$result;
+			}egmx;
+	}
+
+
+	return $text;
+}
+
+
+sub _ProcessListItems {
+#
+#	Process the contents of a single ordered or unordered list, splitting it
+#	into individual list items.
+#
+
+	my $list_str = shift;
+	my $marker_any = shift;
+
+
+	# The $g_list_level global keeps track of when we're inside a list.
+	# Each time we enter a list, we increment it; when we leave a list,
+	# we decrement. If it's zero, we're not in a list anymore.
+	#
+	# We do this because when we're not inside a list, we want to treat
+	# something like this:
+	#
+	#		I recommend upgrading to version
+	#		8. Oops, now this line is treated
+	#		as a sub-list.
+	#
+	# As a single paragraph, despite the fact that the second line starts
+	# with a digit-period-space sequence.
+	#
+	# Whereas when we're inside a list (or sub-list), that line will be
+	# treated as the start of a sub-list. What a kludge, huh? This is
+	# an aspect of Markdown's syntax that's hard to parse perfectly
+	# without resorting to mind-reading. Perhaps the solution is to
+	# change the syntax rules such that sub-lists must start with a
+	# starting cardinal number; e.g. "1." or "a.".
+
+	$g_list_level++;
+
+	# trim trailing blank lines:
+	$list_str =~ s/\n{2,}\z/\n/;
+
+
+	$list_str =~ s{
+		(\n)?							# leading line = $1
+		(^[ \t]*)						# leading whitespace = $2
+		($marker_any) [ \t]+			# list marker = $3
+		((?s:.+?)						# list item text   = $4
+		(\n{1,2}))
+		(?= \n* (\z | \2 ($marker_any) [ \t]+))
+	}{
+		my $item = $4;
+		my $leading_line = $1;
+		my $leading_space = $2;
+
+		if ($leading_line or ($item =~ m/\n{2,}/)) {
+			$item = _RunBlockGamut(_Outdent($item));
+		}
+		else {
+			# Recursion for sub-lists:
+			$item = _DoLists(_Outdent($item));
+			chomp $item;
+			$item = _RunSpanGamut($item);
+		}
+
+		"<li>" . $item . "</li>\n";
+	}egmx;
+
+	$g_list_level--;
+	return $list_str;
+}
+
+
+
+sub _DoCodeBlocks {
+#
+#	Process Markdown `<pre><code>` blocks.
+#	
+
+	my $text = shift;
+
+	$text =~ s{
+			(?:\n\n|\A)
+			(	            # $1 = the code block -- one or more lines, starting with a space/tab
+			  (?:
+			    (?:[ ]{$g_tab_width} | \t)  # Lines must start with a tab or a tab-width of spaces
+			    .*\n+
+			  )+
+			)
+			((?=^[ ]{0,$g_tab_width}\S)|\Z)	# Lookahead for non-space at line-start, or end of doc
+		}{
+			my $codeblock = $1;
+			my $result; # return value
+
+			$codeblock = _EncodeCode(_Outdent($codeblock));
+			$codeblock = _Detab($codeblock);
+			$codeblock =~ s/\A\n+//; # trim leading newlines
+			$codeblock =~ s/\s+\z//; # trim trailing whitespace
+
+			$result = "\n\n<pre><code>" . $codeblock . "\n</code></pre>\n\n";
+
+			$result;
+		}egmx;
+
+	return $text;
+}
+
+
+sub _DoCodeSpans {
+#
+# 	*	Backtick quotes are used for <code></code> spans.
+# 
+# 	*	You can use multiple backticks as the delimiters if you want to
+# 		include literal backticks in the code span. So, this input:
+#     
+#         Just type ``foo `bar` baz`` at the prompt.
+#     
+#     	Will translate to:
+#     
+#         <p>Just type <code>foo `bar` baz</code> at the prompt.</p>
+#     
+#		There's no arbitrary limit to the number of backticks you
+#		can use as delimters. If you need three consecutive backticks
+#		in your code, use four for delimiters, etc.
+#
+#	*	You can use spaces to get literal backticks at the edges:
+#     
+#         ... type `` `bar` `` ...
+#     
+#     	Turns to:
+#     
+#         ... type <code>`bar`</code> ...
+#
+
+	my $text = shift;
+
+	$text =~ s@
+			(`+)		# $1 = Opening run of `
+			(.+?)		# $2 = The code block
+			(?<!`)
+			\1			# Matching closer
+			(?!`)
+		@
+ 			my $c = "$2";
+ 			$c =~ s/^[ \t]*//g; # leading whitespace
+ 			$c =~ s/[ \t]*$//g; # trailing whitespace
+ 			$c = _EncodeCode($c);
+			"<code>$c</code>";
+		@egsx;
+
+	return $text;
+}
+
+
+sub _EncodeCode {
+#
+# Encode/escape certain characters inside Markdown code runs.
+# The point is that in code, these characters are literals,
+# and lose their special Markdown meanings.
+#
+    local $_ = shift;
+
+	# Encode all ampersands; HTML entities are not
+	# entities within a Markdown code span.
+	s/&/&amp;/g;
+
+	# Encode $'s, but only if we're running under Blosxom.
+	# (Blosxom interpolates Perl variables in article bodies.)
+	{
+		no warnings 'once';
+    	if (defined($blosxom::version)) {
+    		s/\$/&#036;/g;	
+    	}
+    }
+
+
+	# Do the angle bracket song and dance:
+	s! <  !&lt;!gx;
+	s! >  !&gt;!gx;
+
+	# Now, escape characters that are magic in Markdown:
+	s! \* !$g_escape_table{'*'}!gx;
+	s! _  !$g_escape_table{'_'}!gx;
+	s! {  !$g_escape_table{'{'}!gx;
+	s! }  !$g_escape_table{'}'}!gx;
+	s! \[ !$g_escape_table{'['}!gx;
+	s! \] !$g_escape_table{']'}!gx;
+	s! \\ !$g_escape_table{'\\'}!gx;
+
+	return $_;
+}
+
+
+sub _DoItalicsAndBold {
+	my $text = shift;
+
+	# <strong> must go first:
+	$text =~ s{ (\*\*|__) (?=\S) (.+?[*_]*) (?<=\S) \1 }
+		{<strong>$2</strong>}gsx;
+
+	$text =~ s{ (\*|_) (?=\S) (.+?) (?<=\S) \1 }
+		{<em>$2</em>}gsx;
+
+	return $text;
+}
+
+
+sub _DoBlockQuotes {
+	my $text = shift;
+
+	$text =~ s{
+		  (								# Wrap whole match in $1
+			(
+			  ^[ \t]*>[ \t]?			# '>' at the start of a line
+			    .+\n					# rest of the first line
+			  (.+\n)*					# subsequent consecutive lines
+			  \n*						# blanks
+			)+
+		  )
+		}{
+			my $bq = $1;
+			$bq =~ s/^[ \t]*>[ \t]?//gm;	# trim one level of quoting
+			$bq =~ s/^[ \t]+$//mg;			# trim whitespace-only lines
+			$bq = _RunBlockGamut($bq);		# recurse
+
+			$bq =~ s/^/  /g;
+			# These leading spaces screw with <pre> content, so we need to fix that:
+			$bq =~ s{
+					(\s*<pre>.+?</pre>)
+				}{
+					my $pre = $1;
+					$pre =~ s/^  //mg;
+					$pre;
+				}egsx;
+
+			"<blockquote>\n$bq\n</blockquote>\n\n";
+		}egmx;
+
+
+	return $text;
+}
+
+
+sub _FormParagraphs {
+#
+#	Params:
+#		$text - string to process with html <p> tags
+#
+	my $text = shift;
+
+	# Strip leading and trailing lines:
+	$text =~ s/\A\n+//;
+	$text =~ s/\n+\z//;
+
+	my @grafs = split(/\n{2,}/, $text);
+
+	#
+	# Wrap <p> tags.
+	#
+	foreach (@grafs) {
+		unless (defined( $g_html_blocks{$_} )) {
+			$_ = _RunSpanGamut($_);
+			s/^([ \t]*)/<p>/;
+			$_ .= "</p>";
+		}
+	}
+
+	#
+	# Unhashify HTML blocks
+	#
+	foreach (@grafs) {
+		if (defined( $g_html_blocks{$_} )) {
+			$_ = $g_html_blocks{$_};
+		}
+	}
+
+	return join "\n\n", @grafs;
+}
+
+
+sub _EncodeAmpsAndAngles {
+# Smart processing for ampersands and angle brackets that need to be encoded.
+
+	my $text = shift;
+
+	# Ampersand-encoding based entirely on Nat Irons's Amputator MT plugin:
+	#   http://bumppo.net/projects/amputator/
+ 	$text =~ s/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/&amp;/g;
+
+	# Encode naked <'s
+ 	$text =~ s{<(?![a-z/?\$!])}{&lt;}gi;
+
+	return $text;
+}
+
+
+sub _EncodeBackslashEscapes {
+#
+#   Parameter:  String.
+#   Returns:    The string, with after processing the following backslash
+#               escape sequences.
+#
+    local $_ = shift;
+
+    s! \\\\  !$g_escape_table{'\\'}!gx;		# Must process escaped backslashes first.
+    s! \\`   !$g_escape_table{'`'}!gx;
+    s! \\\*  !$g_escape_table{'*'}!gx;
+    s! \\_   !$g_escape_table{'_'}!gx;
+    s! \\\{  !$g_escape_table{'{'}!gx;
+    s! \\\}  !$g_escape_table{'}'}!gx;
+    s! \\\[  !$g_escape_table{'['}!gx;
+    s! \\\]  !$g_escape_table{']'}!gx;
+    s! \\\(  !$g_escape_table{'('}!gx;
+    s! \\\)  !$g_escape_table{')'}!gx;
+    s! \\>   !$g_escape_table{'>'}!gx;
+    s! \\\#  !$g_escape_table{'#'}!gx;
+    s! \\\+  !$g_escape_table{'+'}!gx;
+    s! \\\-  !$g_escape_table{'-'}!gx;
+    s! \\\.  !$g_escape_table{'.'}!gx;
+    s{ \\!  }{$g_escape_table{'!'}}gx;
+
+    return $_;
+}
+
+
+sub _DoAutoLinks {
+	my $text = shift;
+
+	$text =~ s{<((https?|ftp):[^'">\s]+)>}{<a href="$1">$1</a>}gi;
+
+	# Email addresses: <address ＠ domain.foo>
+	$text =~ s{
+		<
+        (?:mailto:)?
+		(
+			[-.\w]+
+			\@
+			[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+
+		)
+		>
+	}{
+		_EncodeEmailAddress( _UnescapeSpecialChars($1) );
+	}egix;
+
+	return $text;
+}
+
+
+sub _EncodeEmailAddress {
+#
+#	Input: an email address, e.g. "foo ＠ example.com"
+#
+#	Output: the email address as a mailto link, with each character
+#		of the address encoded as either a decimal or hex entity, in
+#		the hopes of foiling most address harvesting spam bots. E.g.:
+#
+#	  <a href="&#x6D;&#97;&#105;&#108;&#x74;&#111;:&#102;&#111;&#111;&#64;&#101;
+#       x&#x61;&#109;&#x70;&#108;&#x65;&#x2E;&#99;&#111;&#109;">&#102;&#111;&#111;
+#       &#64;&#101;x&#x61;&#109;&#x70;&#108;&#x65;&#x2E;&#99;&#111;&#109;</a>
+#
+#	Based on a filter by Matthew Wickline, posted to the BBEdit-Talk
+#	mailing list: <http://tinyurl.com/yu7ue>
+#
+
+	my $addr = shift;
+
+	srand;
+	my @encode = (
+		sub { '&#' .                 ord(shift)   . ';' },
+		sub { '&#x' . sprintf( "%X", ord(shift) ) . ';' },
+		sub {                            shift          },
+	);
+
+	$addr = "mailto:" . $addr;
+
+	$addr =~ s{(.)}{
+		my $char = $1;
+		if ( $char eq '@' ) {
+			# this *must* be encoded. I insist.
+			$char = $encode[int rand 1]->($char);
+		} elsif ( $char ne ':' ) {
+			# leave ':' alone (to spot mailto: later)
+			my $r = rand;
+			# roughly 10% raw, 45% hex, 45% dec
+			$char = (
+				$r > .9   ?  $encode[2]->($char)  :
+				$r < .45  ?  $encode[1]->($char)  :
+							 $encode[0]->($char)
+			);
+		}
+		$char;
+	}gex;
+
+	$addr = qq{<a href="$addr">$addr</a>};
+	$addr =~ s{">.+?:}{">}; # strip the mailto: from the visible part
+
+	return $addr;
+}
+
+
+sub _UnescapeSpecialChars {
+#
+# Swap back in all the special characters we've hidden.
+#
+	my $text = shift;
+
+	while( my($char, $hash) = each(%g_escape_table) ) {
+		$text =~ s/$hash/$char/g;
+	}
+    return $text;
+}
+
+
+sub _TokenizeHTML {
+#
+#   Parameter:  String containing HTML markup.
+#   Returns:    Reference to an array of the tokens comprising the input
+#               string. Each token is either a tag (possibly with nested,
+#               tags contained therein, such as <a href="<MTFoo>">, or a
+#               run of text between tags. Each element of the array is a
+#               two-element array; the first is either 'tag' or 'text';
+#               the second is the actual value.
+#
+#
+#   Derived from the _tokenize() subroutine from Brad Choate's MTRegex plugin.
+#       <http://www.bradchoate.com/past/mtregex.php>
+#
+
+    my $str = shift;
+    my $pos = 0;
+    my $len = length $str;
+    my @tokens;
+
+    my $depth = 6;
+    my $nested_tags = join('|', ('(?:<[a-z/!$](?:[^<>]') x $depth) . (')*>)' x  $depth);
+    my $match = qr/(?s: <! ( -- .*? -- \s* )+ > ) |  # comment
+                   (?s: <\? .*? \?> ) |              # processing instruction
+                   $nested_tags/ix;                   # nested tags
+
+    while ($str =~ m/($match)/g) {
+        my $whole_tag = $1;
+        my $sec_start = pos $str;
+        my $tag_start = $sec_start - length $whole_tag;
+        if ($pos < $tag_start) {
+            push @tokens, ['text', substr($str, $pos, $tag_start - $pos)];
+        }
+        push @tokens, ['tag', $whole_tag];
+        $pos = pos $str;
+    }
+    push @tokens, ['text', substr($str, $pos, $len - $pos)] if $pos < $len;
+    \@tokens;
+}
+
+
+sub _Outdent {
+#
+# Remove one level of line-leading tabs or spaces
+#
+	my $text = shift;
+
+	$text =~ s/^(\t|[ ]{1,$g_tab_width})//gm;
+	return $text;
+}
+
+
+sub _Detab {
+#
+# Cribbed from a post by Bart Lateur:
+# <http://www.nntp.perl.org/group/perl.macperl.anyperl/154>
+#
+	my $text = shift;
+
+	$text =~ s{(.*?)\t}{$1.(' ' x ($g_tab_width - length($1) % $g_tab_width))}ge;
+	return $text;
+}
+
+
+1;
+
+__END__
+
+
+=pod
+
+=head1 NAME
+
+B<Markdown>
+
+
+=head1 SYNOPSIS
+
+B<Markdown.pl> [ B<--html4tags> ] [ B<--version> ] [ B<-shortversion> ]
+    [ I<file> ... ]
+
+
+=head1 DESCRIPTION
+
+Markdown is a text-to-HTML filter; it translates an easy-to-read /
+easy-to-write structured text format into HTML. Markdown's text format
+is most similar to that of plain text email, and supports features such
+as headers, *emphasis*, code blocks, blockquotes, and links.
+
+Markdown's syntax is designed not as a generic markup language, but
+specifically to serve as a front-end to (X)HTML. You can  use span-level
+HTML tags anywhere in a Markdown document, and you can use block level
+HTML tags (like <div> and <table> as well).
+
+For more information about Markdown's syntax, see:
+
+    http://daringfireball.net/projects/markdown/
+
+
+=head1 OPTIONS
+
+Use "--" to end switch parsing. For example, to open a file named "-z", use:
+
+	Markdown.pl -- -z
+
+=over 4
+
+
+=item B<--html4tags>
+
+Use HTML 4 style for empty element tags, e.g.:
+
+    <br>
+
+instead of Markdown's default XHTML style tags, e.g.:
+
+    <br />
+
+
+=item B<-v>, B<--version>
+
+Display Markdown's version number and copyright information.
+
+
+=item B<-s>, B<--shortversion>
+
+Display the short-form version number.
+
+
+=back
+
+
+
+=head1 BUGS
+
+To file bug reports or feature requests (other than topics listed in the
+Caveats section above) please send email to:
+
+    support ＠ daringfireball.net
+
+Please include with your report: (1) the example input; (2) the output
+you expected; (3) the output Markdown actually produced.
+
+
+=head1 VERSION HISTORY
+
+See the readme file for detailed release notes for this version.
+
+1.0.1 - 14 Dec 2004
+
+1.0 - 28 Aug 2004
+
+
+=head1 AUTHOR
+
+    John Gruber
+    http://daringfireball.net
+
+    PHP port and other contributions by Michel Fortin
+    http://michelf.com
+
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (c) 2003-2004 John Gruber   
+<http://daringfireball.net/>   
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+
+* Neither the name "Markdown" nor the names of its contributors may
+  be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+This software is provided by the copyright holders and contributors "as
+is" and any express or implied warranties, including, but not limited
+to, the implied warranties of merchantability and fitness for a
+particular purpose are disclaimed. In no event shall the copyright owner
+or contributors be liable for any direct, indirect, incidental, special,
+exemplary, or consequential damages (including, but not limited to,
+procurement of substitute goods or services; loss of use, data, or
+profits; or business interruption) however caused and on any theory of
+liability, whether in contract, strict liability, or tort (including
+negligence or otherwise) arising in any way out of the use of this
+software, even if advised of the possibility of such damage.
+
+=cut

Modified: trunk/doc/convtext.bat
===================================================================
--- trunk/doc/convtext.bat	2019-03-01 10:20:20 UTC (rev 7455)
+++ trunk/doc/convtext.bat	2019-03-02 16:18:47 UTC (rev 7456)
@@ -16,3 +16,7 @@
 %TOSJIS% -i ..\cygterm\COPYING          -o %REF_J%\CygTerm+-LICENSE.txt  -l unix
 %ZLIBCP% -i ..\libs\zlib\README         -o %REF_E%\zlib-LICENSE.txt      -l unix
 %ZLIBCP% -i ..\libs\zlib\README         -o %REF_J%\zlib-LICENSE.txt      -l unix
+
+sed -e '1s/^\xef\xbb\xbf//' < ja/html/reference/build_with_cmake.md > ja/html/reference/build_with_cmake_without_bom.md
+perl Markdown_1.0.1/Markdown.pl ja/html/reference/build_with_cmake_without_bom.md > ja/html/reference/build_with_cmake_utf8.html
+%TOSJIS% -i ja/html/reference/build_with_cmake_utf8.html -o ja/html/reference/build_with_cmake.html  -c utf8

Added: trunk/doc/ja/html/reference/build_with_cmake.md
===================================================================
--- trunk/doc/ja/html/reference/build_with_cmake.md	                        (rev 0)
+++ trunk/doc/ja/html/reference/build_with_cmake.md	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,32 @@
+# cmakeを使ったビルド
+
+- 実験的に cmake を使用してビルドすることができます
+- cmake https://cmake.org/
+
+## cmakeのバージョン
+
+- Visual Studio 2005 をサポートしている cmake の最後のバージョンは 3.11.4 です
+- 2005 以外の Visual Studio を使用する場合は特に制限はありません
+- Visual Studio 2017 インストーラーで、オプションを選べば cmake をインストールできます
+
+## ライブラリのビルド
+
+- teraterm が使用するライブラリをビルドして準備しておきます
+- `lib/build_library_with_cmake.md` を参照してください
+- ライブラリは `develop.txt` を参照してください
+
+## teratermのビルド
+
+- ソースツリーのトップから、次のようにコマンドを実行します  
+    ```
+    mkdir build_vs2005
+    cd build_vs2005
+    "c:\Program Files (x86)\CMake-3.11.4\bin\cmake.exe" .. -G "Visual Studio 8 2005"
+    ```
+    - パスが通っていれば cmake はフルパスで書く必要はありません
+    - `-G` オプションの後ろは使用する Visual Studio のバージョンに合わせて調整します
+- sln ファイルが生成されるので Visual Studio で開くことができます
+- cmakeを使ってビルドする場合は次のコマンドを実行します  
+    ```
+    cmake --build . --config release
+    ```

Added: trunk/libs/.gitignore
===================================================================
--- trunk/libs/.gitignore	                        (rev 0)
+++ trunk/libs/.gitignore	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1 @@
+*/

Added: trunk/libs/SFMT.cmake
===================================================================
--- trunk/libs/SFMT.cmake	                        (rev 0)
+++ trunk/libs/SFMT.cmake	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,171 @@
+# cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -P SFMT.cmake
+# cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -DCMAKE_CONFIGURATION_TYPE=Release -P SFMT.cmake
+
+####
+if(("${CMAKE_BUILD_TYPE}" STREQUAL "") AND ("${CMAKE_CONFIGURATION_TYPE}" STREQUAL ""))
+  if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+	# multi-configuration
+	execute_process(
+	  COMMAND ${CMAKE_COMMAND}
+	  -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+	  -DCMAKE_CONFIGURATION_TYPE=Release
+	  -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
+	  -P SFMT.cmake
+	  )
+	execute_process(
+	  COMMAND ${CMAKE_COMMAND}
+	  -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+	  -DCMAKE_CONFIGURATION_TYPE=Debug
+	  -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
+	  -P SFMT.cmake
+	  )
+	return()
+  elseif("$ENV{MSYSTEM}" MATCHES "MINGW")
+	# mingw on msys2
+	if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+	  set(CMAKE_BUILD_TYPE Release)
+	endif()
+  elseif("${CMAKE_GENERATOR}" MATCHES "Unix Makefiles")
+	# mingw
+	# single-configuration
+	if("${CMAKE_TOOLCHAIN_FILE}" STREQUAL "")
+	  set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/../mingw.toolchain.cmake")
+	endif()
+	if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+	  set(CMAKE_BUILD_TYPE Release)
+	endif()
+  elseif("${CMAKE_GENERATOR}" MATCHES "NMake Makefiles")
+	# VS nmake
+	# single-configuration
+	if("${CMAKE_TOOLCHAIN_FILE}" STREQUAL "")
+	  set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/VSToolchain.cmake")
+	endif()
+	if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+	  set(CMAKE_BUILD_TYPE Release)
+	endif()
+  else()
+	# single-configuration
+	if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+	  set(CMAKE_BUILD_TYPE Release)
+	endif()
+  endif()
+endif()
+
+include(script_support.cmake)
+
+set(SRC_DIR_BASE "SFMT-src-1.5.1")
+set(SRC_ARC "SFMT-1.5.1.zip")
+set(SRC_URL "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/SFMT-src-1.5.1.zip")
+set(SRC_ARC_HASH_SHA256 630d1dfa6b690c30472f75fa97ca90ba62f9c13c5add6c264fdac2c1d3a878f4)
+
+set(DOWN_DIR "${CMAKE_SOURCE_DIR}/download/SFMT")
+set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/SFMT/src")
+set(SRC_DIR "${CMAKE_SOURCE_DIR}/build/SFMT/src/${SRC_DIR_BASE}")
+set(BUILD_DIR "${CMAKE_SOURCE_DIR}/build/SFMT/build_${TOOLSET}")
+set(INSTALL_DIR "${CMAKE_SOURCE_DIR}/SFMT_${TOOLSET}")
+if(("${CMAKE_GENERATOR}" MATCHES "Win64") OR ("$ENV{MSYSTEM_CHOST}" STREQUAL "x86_64-w64-mingw32"))
+  set(BUILD_DIR "${BUILD_DIR}_x64")
+  set(INSTALL_DIR "${INSTALL_DIR}_x64")
+endif()
+
+########################################
+
+if(NOT EXISTS ${SRC_DIR}/README.txt)
+
+  file(DOWNLOAD
+	${SRC_URL}
+	${DOWN_DIR}/${SRC_ARC}
+    EXPECTED_HASH SHA256=${SRC_ARC_HASH_SHA256}
+    SHOW_PROGRESS
+    )
+
+  file(MAKE_DIRECTORY ${EXTRACT_DIR})
+
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E tar "xvf" ${DOWN_DIR}/${SRC_ARC}
+    WORKING_DIRECTORY ${EXTRACT_DIR}
+    )
+
+endif()
+
+########################################
+
+if(NOT EXISTS ${SRC_DIR}/CMakeLists.txt)
+  file(WRITE "${SRC_DIR}/CMakeLists.txt"
+	"cmake_minimum_required(VERSION 2.4.4)\n"
+	"project(SFMT C)\n"
+	"\n"
+	"if(MSVC)\n"
+	"  set(CMAKE_DEBUG_POSTFIX \"d\")\n"
+	"endif()\n"
+	"\n"
+	"add_library(\n"
+	"  sfmt STATIC\n"
+	"  SFMT.c\n"
+	"  )\n"
+	"\n"
+	"install(\n"
+	"  TARGETS sfmt\n"
+	"  ARCHIVE DESTINATION \${CMAKE_INSTALL_PREFIX}/lib\n"
+	"  )\n"
+	"install(\n"
+	"  FILES SFMT.h SFMT-params.h SFMT-params19937.h\n"
+	"  DESTINATION \${CMAKE_INSTALL_PREFIX}/include\n"
+	"  )\n"
+	)
+endif()
+
+########################################
+
+file(MAKE_DIRECTORY "${BUILD_DIR}")
+
+if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+
+  ######################################## multi configuration
+
+  execute_process(
+	COMMAND ${CMAKE_COMMAND} ${SRC_DIR} -G ${CMAKE_GENERATOR}
+	-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+	-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
+	${TOOLCHAINFILE}
+	WORKING_DIRECTORY ${BUILD_DIR}
+	RESULT_VARIABLE rv
+	)
+  if(NOT rv STREQUAL "0")
+	message(FATAL_ERROR "cmake generate fail ${rv}")
+  endif()
+
+  execute_process(
+	COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_CONFIGURATION_TYPE} --target install
+	WORKING_DIRECTORY ${BUILD_DIR}
+	RESULT_VARIABLE rv
+	)
+  if(NOT rv STREQUAL "0")
+	message(FATAL_ERROR "cmake install fail ${rv}")
+  endif()
+
+else()
+  ######################################## single configuration
+  
+  execute_process(
+	COMMAND ${CMAKE_COMMAND} ${SRC_DIR} -G ${CMAKE_GENERATOR}
+	-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+	-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+	-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
+	WORKING_DIRECTORY ${BUILD_DIR}
+	RESULT_VARIABLE rv
+	)
+  if(NOT rv STREQUAL "0")
+	message(FATAL_ERROR "cmake build fail ${rv}")
+  endif()
+  
+  execute_process(
+	COMMAND ${CMAKE_COMMAND} --build . --target install
+	WORKING_DIRECTORY ${BUILD_DIR}
+	RESULT_VARIABLE rv
+	)
+  if(NOT rv STREQUAL "0")
+	message(FATAL_ERROR "cmake install fail ${rv}")
+  endif()
+
+endif()

Added: trunk/libs/VSToolchain.cmake
===================================================================
--- trunk/libs/VSToolchain.cmake	                        (rev 0)
+++ trunk/libs/VSToolchain.cmake	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,5 @@
+# write to CMakeCache.txt
+set(CMAKE_C_FLAGS_DEBUG "/DWIN32 /D_WINDOWS /W3 /MTd /Zi /Ob0 /Od /RTC1" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS_DEBUG "/DWIN32 /D_WINDOWS /W3 /MTd /Zi /Ob0 /Od /RTC1" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_RELEASE "/DWIN32 /D_WINDOWS /W3 /MT /O2 /Ob2 /DNDEBUG" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS_RELEASE "/DWIN32 /D_WINDOWS /W3 /MT /O2 /Ob2 /DNDEBUG" CACHE STRING "" FORCE)

Added: trunk/libs/build_library_with_cmake.md
===================================================================
--- trunk/libs/build_library_with_cmake.md	                        (rev 0)
+++ trunk/libs/build_library_with_cmake.md	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,76 @@
+
+# libフォルダ
+
+- teratermが利用する外部のライブラリをビルドするためのフォルダ
+- コンパイラ向けに各々ビルド
+- 1度ビルドしてライブラリを生成しておく
+
+# 準備
+
+## Visual Studio
+
+- cmake
+	- PATHが通してあればok
+	- cygwinのcmakeはつかえない(Visual Studioをサポートしていない)
+	- Visual Studio 2005 を使う場合は cmake 3.11.4 を使用する必要がある
+- perl
+	- OpenSSL のコンパイル、ドキュメントファイルの文字コード・改行コード変換に必要
+	- ActivePerl 5.8 以上、または cygwin perl
+	- PATHが通っていなければ自動で探す
+
+## MinGW 共通 (experimental)
+
+- Cygwin,MSYS2,linux(wsl)上のMinGWでビルド可能
+- 各環境で動作するcmake,make,(MinGW)gcc,perlが必要
+
+# ビルド手順
+
+必要なアーカイブを自動的にダウンロードするので、
+インターネットが利用できる環境でビルドする必要がある
+
+## Visual Studioの場合
+
+### batファイルを使用する場合
+
+- 自動的にビルド
+- buildall_cmake.bat を実行
+- コンパイルに使用する Visual Studioを選ぶ
+- VS2005の場合はcmake 3.11.4 をダウンロードして
+  libs\cmake-3.11.4-win32-x86 にインストールする
+
+### cmakeを使用する場合
+
+- cmakeを使える状態にしてcmakeを実行
+	- `cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -P buildall.cmake`
+	- `cmake -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64" -P buildall.cmake`
+- Visual Studio 2005の場合は、cmakeのバージョン3.11.4以前を使用する
+	- cmake が libs\cmake-3.11.4-win32-x86 にインストールしてある場合  
+	  `"libs\cmake-3.11.4-win32-x86\bin\cmake.exe" -DCMAKE_GENERATOR="Visual Studio 8 2005" -P buildall.cmake`
+
+## MinGW 共通
+
+- 各々の環境のcmakeを使って
+  `cmake -DCMAKE_GENERATOR="Unix Makefiles" -P buildall.cmake` を実行
+
+# 各フォルダについて
+
+## 生成されるライブラリフォルダ
+
+- 次のフォルダにライブラリの`*.h`,`*.lib`が生成される
+	- oniguruma_{compiler}
+	- openssl_{compiler}
+	- putty
+	- SFMT_{compiler}
+	- zlib_{compiler}
+
+## download アーカイブダウンロードフォルダ
+
+- ダウンロードしたアーカイブファイルが置かれる
+- 自動でダウンロードされる
+- ダウンロードされていると再利用する
+- ビルド後、参照する必要がなければ削除できる
+
+## build ビルドフォルダ
+
+- build/oniguruma_{compiler}/ などの下でビルドされる
+- ビルド後、参照する必要がなければ削除できる

Added: trunk/libs/buildall.cmake
===================================================================
--- trunk/libs/buildall.cmake	                        (rev 0)
+++ trunk/libs/buildall.cmake	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,23 @@
+# cmake -DCMAKE_GENERATOR="Vsual Studio 15 2017" -P buildall.cmake
+# cmake -DCMAKE_GENERATOR="Unix Makefiles" -P buildall.cmake -DCMAKE_TOOLCHAIN_FILE=../mingw.toolchain.cmake
+
+if("${CMAKE_GENERATOR}" STREQUAL "")
+  message(FATAL_ERROR "set CMAKE_GENERATOR!")
+endif()
+
+# build
+execute_process(
+  COMMAND ${CMAKE_COMMAND} -DCMAKE_GENERATOR=${CMAKE_GENERATOR} -P oniguruma.cmake
+  )
+execute_process(
+  COMMAND ${CMAKE_COMMAND} -DCMAKE_GENERATOR=${CMAKE_GENERATOR} -P zlib.cmake
+  )
+execute_process(
+  COMMAND ${CMAKE_COMMAND} -P putty.cmake
+  )
+execute_process(
+  COMMAND ${CMAKE_COMMAND} -DCMAKE_GENERATOR=${CMAKE_GENERATOR} -P SFMT.cmake
+  )
+execute_process(
+  COMMAND ${CMAKE_COMMAND} -DCMAKE_GENERATOR=${CMAKE_GENERATOR} -P openssl.cmake
+  )

Added: trunk/libs/buildall_cmake.bat
===================================================================
--- trunk/libs/buildall_cmake.bat	                        (rev 0)
+++ trunk/libs/buildall_cmake.bat	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,75 @@
+ ＠ echo off
+setlocal
+cd /d %~dp0
+
+set CMAKE="cmake.exe2"
+set opt=
+
+:retry_vs
+echo 1. Visual Studio 15 2017
+echo 2. Visual Studio 14 2015
+echo 3. Visual Studio 12 2013
+echo 4. Visual Studio 11 2012
+echo 5. Visual Studio 10 2010
+echo 6. Visual Studio 9 2008
+echo 7. Visual Studio 8 2005
+rem echo 9. Visual Studio NMake (experimental)
+rem echo z. Cygwin MinGW Release + Unix Makefiles (experimental)
+set /p no="select no "
+
+echo %no%
+if "%no%" == "1" set GENERATOR="Visual Studio 15 2017" & goto build_all
+if "%no%" == "2" set GENERATOR="Visual Studio 14 2015" & goto build_all
+if "%no%" == "3" set GENERATOR="Visual Studio 12 2013" & goto build_all
+if "%no%" == "4" set GENERATOR="Visual Studio 11 2012" & goto build_all
+if "%no%" == "5" set GENERATOR="Visual Studio 10 2010" & goto build_all
+if "%no%" == "6" set GENERATOR="Visual Studio 9 2008" & goto build_all
+if "%no%" == "7" set GENERATOR="Visual Studio 8 2005" & call :cmake_3_11_4 & goto build_all_2
+if "%no%" == "9" set GENERATOR="NMake Makefiles" & set OPT=-DCMAKE_BUILD_TYPE=Release & goto build_all
+if "%no%" == "z" set GENERATOR="Unix Makefiles" & set OPT=-DCMAKE_TOOLCHAIN_FILE=../mingw.toolchain.cmake & goto build_all
+echo ? retry
+goto retry_vs
+
+:build_all
+where %CMAKE%
+if %errorlevel% == 0 goto build_all_2
+set CMAKE="C:\Program Files\CMake\bin\cmake.exe"
+if exist %CMAKE% echo %CMAKE% \x82\xF0\x8Eg\x97p & goto build_all_2
+echo cmake\x82\xAA\x8C\xA9\x82‚\xA9\x82\xE8\x82܂\xB9\x82\xF1
+pause
+exit
+
+:build_all_2
+set C=%CMAKE% -DCMAKE_GENERATOR=%GENERATOR% %OPT% -P buildall.cmake
+echo %C%
+title %C%
+pause
+%C%
+
+:finish
+echo build complete
+endlocal
+pause
+exit
+
+:cmake_3_11_4
+set CMAKE=%~dp0cmake-3.11.4-win32-x86\bin\cmake.exe
+echo 1. \x8E\xA9\x95\xAA\x82\xCCcmake.exe\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9(PATH\x82\xF0\x92ʂ\xB5\x82Ă\xA0\x82\xE9)
+echo 2. VS2005\x82ł\xE0\x8Eg\x97p\x82ł\xAB\x82\xE9cmake\x8Eg\x97p\x82\xB7\x82\xE9
+echo    (\x95K\x97v\x82Ȃ玩\x93\xAE\x82Ń_\x83E\x83\x93\x83\x8D\x81[\x83h\x82\xB5\x82āA\x82\xB1\x82̃t\x83H\x83\x8B\x83_\x82ɃC\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB7\x82\xE9)
+if exist %CMAKE% echo    \x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x8Dς\xDD(%CMAKE%)
+
+set /p no="select no "
+echo %no%
+if "%no%" == "2" goto download
+
+set CMAKE="cmake.exe"
+where %CMAKE%
+goto finish_cmake
+
+:download
+if exist %CMAKE% goto finish_cmake
+call getcmake.bat
+
+:finish_cmake
+exit /b

Added: trunk/libs/getcmake.bat
===================================================================
--- trunk/libs/getcmake.bat	                        (rev 0)
+++ trunk/libs/getcmake.bat	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,8 @@
+ ＠ echo off
+setlocal
+cd /d %~dp0
+echo cmake\x82\xF0\x83_\x83E\x83\x93\x83\x8D\x81[\x83h\x82\xB5\x82\xC4lib/cmake\x82ɓW\x8AJ\x82\xB5\x82܂\xB7
+pause
+powershell -NoProfile -ExecutionPolicy Unrestricted .\getcmake.ps1
+endlocal
+pause

Added: trunk/libs/getcmake.ps1
===================================================================
--- trunk/libs/getcmake.ps1	                        (rev 0)
+++ trunk/libs/getcmake.ps1	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,33 @@
+$CMAKE_URL = "https://cmake.org/files/v3.11/cmake-3.11.4-win32-x86.zip"
+$CMAKE_ZIP = ($CMAKE_URL -split "/")[-1]
+$CMAKE_DIR = [System.IO.Path]::GetFileNameWithoutExtension($CMAKE_ZIP)
+
+$CMAKE_ZIP = "download\cmake\" + $CMAKE_ZIP
+
+echo $CMAKE_URL
+echo $CMAKE_ZIP
+echo $CMAKE_DIR
+
+# TLS1.2 \x82\xF0\x97L\x8C\xF8\x82ɂ\xB7\x82\xE9 (cmake.org\x82\xCD TLS1.2)
+# [Net.ServicePointManager]::SecurityProtocol
+# \x82\xF0\x8E\xC0\x8Ds\x82\xB5\x82\xC4 "Ssl3, Tls" \x82Əo\x82\xBD\x8Fꍇ\x81ATLS1.2\x82͖\xB3\x8C\xF8\x82ƂȂ\xC1\x82Ă\xA2\x82\xE9
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12;
+
+# \x93W\x8AJ\x8Dς݃t\x83H\x83\x8B\x83_\x82\xAA\x82\xA0\x82\xE9?
+if((Test-Path $CMAKE_DIR) -eq $true) {
+	# \x8D폜\x82\xB7\x82\xE9
+	Remove-Item -Recurse -Force $CMAKE_DIR
+	# \x8FI\x97\xB9\x82\xB7\x82\xE9
+	#exit
+}
+
+# \x83_\x83E\x83\x93\x83\x8D\x81[\x83h\x82\xB7\x82\xE9
+if((Test-Path $CMAKE_ZIP) -eq $false) {
+	if((Test-Path "download\cmake") -ne $true) {
+		mkdir "download\cmake"
+	}
+	wget $CMAKE_URL -Outfile $CMAKE_ZIP
+}
+
+# \x93W\x8AJ\x82\xB7\x82\xE9
+Expand-Archive $CMAKE_ZIP -DestinationPath .

Added: trunk/libs/lib_SFMT.cmake
===================================================================
--- trunk/libs/lib_SFMT.cmake	                        (rev 0)
+++ trunk/libs/lib_SFMT.cmake	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,15 @@
+
+include(${CMAKE_CURRENT_LIST_DIR}/script_support.cmake)
+
+set(SFMT_ROOT ${CMAKE_CURRENT_LIST_DIR}/SFMT_${TOOLSET})
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  set(SFMT_ROOT "${SFMT_ROOT}_x64")
+endif()
+
+set(SFMT_INCLUDE_DIRS
+  "${SFMT_ROOT}/include"
+  )
+
+set(SFMT_LIBRARY_DIRS
+  "${SFMT_ROOT}/lib"
+  )

Added: trunk/libs/lib_oniguruma.cmake
===================================================================
--- trunk/libs/lib_oniguruma.cmake	                        (rev 0)
+++ trunk/libs/lib_oniguruma.cmake	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,13 @@
+
+include(${CMAKE_CURRENT_LIST_DIR}/script_support.cmake)
+
+set(ONIGURUMA_ROOT ${CMAKE_CURRENT_LIST_DIR}/oniguruma_${TOOLSET})
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  set(ONIGURUMA_ROOT "${ONIGURUMA_ROOT}_x64")
+endif()
+
+#set(ONIGURUMA_DIR "${ONIGURUMA_ROOT}/lib/cmake/oniguruma")
+#find_package(ONIGURUMA REQUIRED)
+set(ONIGURUMA_INCLUDE_DIRS ${ONIGURUMA_ROOT}/include)
+set(ONIGURUMA_LIBRARY_DIRS ${ONIGURUMA_ROOT}/lib)
+

Added: trunk/libs/lib_openssl.cmake
===================================================================
--- trunk/libs/lib_openssl.cmake	                        (rev 0)
+++ trunk/libs/lib_openssl.cmake	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,27 @@
+
+include(${CMAKE_CURRENT_LIST_DIR}/script_support.cmake)
+
+set(OPENSSL_ROOT ${CMAKE_CURRENT_LIST_DIR}/openssl_${TOOLSET})
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  set(OPENSSL_ROOT "${OPENSSL_ROOT}_x64")
+endif()
+
+if(MINGW)
+  set(OPENSSL_INCLUDE_DIRS
+	${OPENSSL_ROOT}/include
+	)
+
+  set(OPENSSL_LIB
+	${OPENSSL_ROOT}/lib/libcrypto.a
+  )
+else()
+  set(OPENSSL_INCLUDE_DIRS
+	"$<$<CONFIG:Debug>:${OPENSSL_ROOT}_debug/include>"
+	"$<$<CONFIG:Release>:${OPENSSL_ROOT}/include>"
+	)
+
+  set(OPENSSL_LIB
+	debug ${OPENSSL_ROOT}_debug/lib/libeay32.lib
+	optimized ${OPENSSL_ROOT}/lib/libeay32.lib
+	)
+endif()

Added: trunk/libs/lib_zlib.cmake
===================================================================
--- trunk/libs/lib_zlib.cmake	                        (rev 0)
+++ trunk/libs/lib_zlib.cmake	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,10 @@
+
+include(${CMAKE_CURRENT_LIST_DIR}/script_support.cmake)
+
+set(ZLIB_ROOT ${CMAKE_CURRENT_LIST_DIR}/zlib_${TOOLSET})
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  set(ZLIB_ROOT "${ZLIB_ROOT}_x64")
+endif()
+
+set(ZLIB_INCLUDE_DIRS ${ZLIB_ROOT}/include)
+set(ZLIB_LIBRARY_DIRS ${ZLIB_ROOT}/lib)

Added: trunk/libs/oniguruma.cmake
===================================================================
--- trunk/libs/oniguruma.cmake	                        (rev 0)
+++ trunk/libs/oniguruma.cmake	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,147 @@
+# cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -P oniguruma.cmake
+# cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -DCMAKE_CONFIGURATION_TYPE=Release -P oniguruma.cmake
+
+####
+if(("${CMAKE_BUILD_TYPE}" STREQUAL "") AND ("${CMAKE_CONFIGURATION_TYPE}" STREQUAL ""))
+  if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+	# multi-configuration
+	execute_process(
+	  COMMAND ${CMAKE_COMMAND}
+	  -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+	  -DCMAKE_CONFIGURATION_TYPE=Release
+	  -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
+	  -P oniguruma.cmake
+	  )
+	execute_process(
+	  COMMAND ${CMAKE_COMMAND}
+	  -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+	  -DCMAKE_CONFIGURATION_TYPE=Debug
+	  -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
+	  -P oniguruma.cmake
+	  )
+	return()
+  elseif("$ENV{MSYSTEM}" MATCHES "MINGW")
+	# mingw on msys2
+	if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+	  set(CMAKE_BUILD_TYPE Release)
+	endif()
+  elseif("${CMAKE_GENERATOR}" MATCHES "Unix Makefiles")
+	# mingw
+	# single-configuration
+	if("${CMAKE_TOOLCHAIN_FILE}" STREQUAL "")
+	  set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/../mingw.toolchain.cmake")
+	endif()
+	if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+	  set(CMAKE_BUILD_TYPE Release)
+	endif()
+  elseif("${CMAKE_GENERATOR}" MATCHES "NMake Makefiles")
+	# VS nmake
+	# single-configuration
+	if("${CMAKE_TOOLCHAIN_FILE}" STREQUAL "")
+	  set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/VSToolchain.cmake")
+	endif()
+	if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+	  set(CMAKE_BUILD_TYPE Release)
+	endif()
+  else()
+	# single-configuration
+	if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+	  set(CMAKE_BUILD_TYPE Release)
+	endif()
+  endif()
+endif()
+
+include(script_support.cmake)
+
+set(SRC_DIR_BASE "onig-6.9.0")
+set(SRC_ARC "onig-6.9.0.tar.gz")
+set(SRC_URL "https://github.com/kkos/oniguruma/releases/download/v6.9.0/onig-6.9.0.tar.gz")
+set(SRC_ARC_HASH_SHA1 8e3e39e8e92f040939922ddc367a56c12bd4c4c3)
+
+set(DOWN_DIR "${CMAKE_SOURCE_DIR}/download/oniguruma")
+set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/oniguruma/src")
+set(SRC_DIR "${CMAKE_SOURCE_DIR}/build/oniguruma/src/${SRC_DIR_BASE}")
+set(BUILD_DIR "${CMAKE_SOURCE_DIR}/build/oniguruma/build_${TOOLSET}")
+set(INSTALL_DIR "${CMAKE_SOURCE_DIR}/oniguruma_${TOOLSET}")
+if(("${CMAKE_GENERATOR}" MATCHES "Win64") OR ("$ENV{MSYSTEM_CHOST}" STREQUAL "x86_64-w64-mingw32"))
+  set(BUILD_DIR "${BUILD_DIR}_x64")
+  set(INSTALL_DIR "${INSTALL_DIR}_x64")
+endif()
+
+########################################
+
+if(NOT EXISTS ${SRC_DIR}/README.md)
+
+  file(DOWNLOAD
+	${SRC_URL}
+	${DOWN_DIR}/${SRC_ARC}
+    EXPECTED_HASH SHA1=${SRC_ARC_HASH_SHA1}
+    SHOW_PROGRESS
+    )
+
+  file(MAKE_DIRECTORY ${EXTRACT_DIR})
+
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E tar "xvf" ${DOWN_DIR}/${SRC_ARC}
+    WORKING_DIRECTORY ${EXTRACT_DIR}
+    )
+
+endif()
+
+########################################
+
+file(MAKE_DIRECTORY "${BUILD_DIR}")
+
+if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+
+  ######################################## multi configuration
+
+  execute_process(
+	COMMAND ${CMAKE_COMMAND} ${SRC_DIR} -G ${CMAKE_GENERATOR}
+	-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+	-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
+	${TOOLCHAINFILE}
+	-DCMAKE_DEBUG_POSTFIX=d
+	-DBUILD_SHARED_LIBS=OFF
+	WORKING_DIRECTORY ${BUILD_DIR}
+	RESULT_VARIABLE rv
+	)
+  if(NOT rv STREQUAL "0")
+	message(FATAL_ERROR "cmake generate fail ${rv}")
+  endif()
+
+  execute_process(
+	COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_CONFIGURATION_TYPE} --target install
+	WORKING_DIRECTORY ${BUILD_DIR}
+	RESULT_VARIABLE rv
+	)
+  if(NOT rv STREQUAL "0")
+	message(FATAL_ERROR "cmake install fail ${rv}")
+  endif()
+
+else()
+  ######################################## single configuration
+  
+  execute_process(
+	COMMAND ${CMAKE_COMMAND} ${SRC_DIR} -G ${CMAKE_GENERATOR}
+	-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+	-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+	-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
+	-DBUILD_SHARED_LIBS=OFF
+	WORKING_DIRECTORY ${BUILD_DIR}
+	RESULT_VARIABLE rv
+	)
+  if(NOT rv STREQUAL "0")
+	message(FATAL_ERROR "cmake build fail ${rv}")
+  endif()
+  
+  execute_process(
+	COMMAND ${CMAKE_COMMAND} --build . --target install
+	WORKING_DIRECTORY ${BUILD_DIR}
+	RESULT_VARIABLE rv
+	)
+  if(NOT rv STREQUAL "0")
+	message(FATAL_ERROR "cmake install fail ${rv}")
+  endif()
+
+endif()

Added: trunk/libs/openssl.cmake
===================================================================
--- trunk/libs/openssl.cmake	                        (rev 0)
+++ trunk/libs/openssl.cmake	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,304 @@
+# cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -P openssl.cmake
+# cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -DCMAKE_CONFIGURATION_TYPE=Release -P openssl.cmake
+
+####
+if(("${CMAKE_BUILD_TYPE}" STREQUAL "") AND ("${CMAKE_CONFIGURATION_TYPE}" STREQUAL ""))
+  if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+    # multi-configuration
+    execute_process(
+      COMMAND ${CMAKE_COMMAND}
+      -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+      -DCMAKE_CONFIGURATION_TYPE=Release
+      -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
+      -P openssl.cmake
+      )
+    execute_process(
+      COMMAND ${CMAKE_COMMAND}
+      -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+      -DCMAKE_CONFIGURATION_TYPE=Debug
+      -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
+      -P openssl.cmake
+      )
+    return()
+  elseif("$ENV{MSYSTEM}" MATCHES "MINGW32")
+    # mingw on msys2
+    # single-configuration
+    if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+      set(CMAKE_BUILD_TYPE Release)
+    endif()
+  elseif("${CMAKE_GENERATOR}" MATCHES "Unix Makefiles")
+    # mingw
+    # single-configuration
+    if("${CMAKE_TOOLCHAIN_FILE}" STREQUAL "")
+      set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/../mingw.toolchain.cmake")
+    endif()
+    if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+      set(CMAKE_BUILD_TYPE Release)
+    endif()
+  elseif("${CMAKE_GENERATOR}" MATCHES "NMake Makefiles")
+    # VS nmake
+    # single-configuration
+    if("${CMAKE_TOOLCHAIN_FILE}" STREQUAL "")
+      set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/VSToolchain.cmake")
+    endif()
+    if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+      set(CMAKE_BUILD_TYPE Release)
+    endif()
+  else()
+    # single-configuration
+    if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+      set(CMAKE_BUILD_TYPE Release)
+    endif()
+  endif()
+endif()
+
+include(script_support.cmake)
+
+set(SRC_DIR_BASE "openssl-1.0.2q")
+set(SRC_ARC "openssl-1.0.2q.tar.gz")
+set(SRC_URL "https://www.openssl.org/source/openssl-1.0.2q.tar.gz")
+set(SRC_ARC_HASH_SHA256 5744cfcbcec2b1b48629f7354203bc1e5e9b5466998bbccc5b5fcde3b18eb684)
+
+set(DOWN_DIR "${CMAKE_SOURCE_DIR}/download/openssl")
+
+set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/openssl/src_${TOOLSET}")
+set(INSTALL_DIR "${CMAKE_SOURCE_DIR}/openssl_${TOOLSET}")
+if(("${CMAKE_GENERATOR}" MATCHES "Win64") OR ("$ENV{MSYSTEM_CHOST}" STREQUAL "x86_64-w64-mingw32"))
+  set(EXTRACT_DIR "${EXTRACT_DIR}_x64")
+  set(INSTALL_DIR "${INSTALL_DIR}_x64")
+endif()
+if((${CMAKE_GENERATOR} MATCHES "Visual Studio") AND ("${CMAKE_CONFIGURATION_TYPE}" STREQUAL "Debug"))
+  set(EXTRACT_DIR "${EXTRACT_DIR}_debug")
+  set(INSTALL_DIR "${INSTALL_DIR}_debug")
+endif()
+set(SRC_DIR "${EXTRACT_DIR}/${SRC_DIR_BASE}")
+
+########################################
+
+file(DOWNLOAD
+  ${SRC_URL}
+  ${DOWN_DIR}/${SRC_ARC}
+  EXPECTED_HASH SHA256=${SRC_ARC_HASH_SHA256}
+  SHOW_PROGRESS
+  )
+
+########################################
+
+if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux")
+  find_program(
+    PERL perl
+    )
+else()
+  # CYGWIN / Active Perl
+  find_program(
+    PERL perl.exe
+    HINTS c:/Perl64/bin
+    HINTS c:/Perl/bin
+    HINTS c:/cygwin/usr/bin
+    HINTS c:/cygwin64/usr/bin
+    )
+endif()
+
+if(${PERL} STREQUAL "PERL-NOTFOUND")
+  message(FATAL_ERROR "perl not found")
+endif()
+
+########################################
+
+if(NOT EXISTS ${SRC_DIR}/README)
+
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTRACT_DIR}
+    )
+
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E tar "xvf" ${DOWN_DIR}/${SRC_ARC}
+    WORKING_DIRECTORY ${EXTRACT_DIR}
+    )
+
+endif()
+
+########################################
+
+if((${CMAKE_GENERATOR} MATCHES "Visual Studio") OR
+    (${CMAKE_GENERATOR} MATCHES "NMake Makefiles"))
+  ######################################## VS
+  if(${CMAKE_GENERATOR} MATCHES "NMake Makefiles")
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017")
+    find_program(
+      VCVARS32 vcvarsall.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build"
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC/Auxiliary/Build"
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/VC/Auxiliary/Build"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 14 2015")
+    find_program(
+      VCVARS32 vcvars32.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 12 2013")
+    find_program(
+      VCVARS32 vcvars32.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/bin"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 11 2012")
+    find_program(
+      VCVARS32 vcvars32.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio 11.0/VC/bin"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 10 2010")
+    find_program(
+      VCVARS32 vcvars32.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio 10.0/VC/bin"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 9 2008")
+    find_program(
+      VCVARS32 vcvars32.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio 9.0/VC/bin"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 8 2005")
+    find_program(
+      VCVARS32 vcvars32.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio 8/VC/bin"
+      )
+  else()
+    message(FATAL_ERROR "CMAKE_GENERATOR ${CMAKE_GENERATOR} not supported")
+  endif()
+  if(VCVARS32-NOTFOUND)
+    message(FATAL_ERROR "vcvars32.bat not found")
+  endif()
+
+  if(${CMAKE_GENERATOR} MATCHES "Win64")
+    set(CONFIG_TARGET "VC-WIN64A")
+    set(DO_MS "ms\\do_win64a.bat")
+  else()
+    set(CONFIG_TARGET "VC-WIN32")
+    set(DO_MS "ms\\do_ms.bat")
+  endif()
+  if(("${CMAKE_BUILD_TYPE}" STREQUAL "Release") OR ("${CMAKE_CONFIGURATION_TYPE}" STREQUAL "Release"))
+  else()
+    set(CONFIG_TARGET "debug-${CONFIG_TARGET}")
+  endif()
+
+  file(WRITE "${SRC_DIR}/build_cmake.bat"
+    "cd %~dp0\n"
+    "setlocal\n"
+    )
+  file(TO_NATIVE_PATH ${PERL} PERL_N)
+  file(TO_NATIVE_PATH ${INSTALL_DIR} INSTALL_DIR_N)
+  file(TO_NATIVE_PATH ${VCVARS32} VCVARS32_N)
+  string(REGEX REPLACE [[^(.*)\\.*$]] [[\1]] PERL_N_PATH ${PERL_N})
+  file(APPEND "${SRC_DIR}/build_cmake.bat"
+    "del crypto\\buildinf.h\n"
+    "setlocal\n"
+    "set PATH=${PERL_N_PATH}\n"
+    "perl Configure no-asm ${CONFIG_TARGET} --prefix=${INSTALL_DIR_N}\n"
+    "call ${DO_MS}\n"
+    "endlocal\n"
+    )
+  if(${CMAKE_GENERATOR} MATCHES "Visual Studio 8 2005")
+    ## Visual Studio 2005 特別処理
+    # include,libパスの設定
+    file(APPEND "${SRC_DIR}/build_cmake.bat"
+      "set SDK=C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\n"
+      "set INCLUDE=%SDK%\\Include;%INCLUDE%\n"
+      "set LIB=%SDK%\\lib;%LIB%\n"
+      )
+  endif()
+  if(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017 Win64")
+    file(APPEND "${SRC_DIR}/build_cmake.bat"
+      "call \"${VCVARS32_N}\" x86_amd64 10.0.17134.0\n"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017")
+    file(APPEND "${SRC_DIR}/build_cmake.bat"
+      "call \"${VCVARS32_N}\" x86 10.0.17134.0\n"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio")
+    file(APPEND "${SRC_DIR}/build_cmake.bat"
+      "call \"${VCVARS32_N}\"\n"
+      )
+  endif()
+  file(APPEND "${SRC_DIR}/build_cmake.bat"
+    "set PATH=${PERL_N_PATH};%PATH%\n"
+    "nmake -f ms\\nt.mak install ${NMAKE_OPTION}\n"
+    )
+
+  set(BUILD_CMAKE_BAT "${SRC_DIR}/build_cmake.bat")
+  file(TO_NATIVE_PATH ${BUILD_CMAKE_BAT} BUILD_CMAKE_BAT_N)
+  execute_process(
+    COMMAND cmd /c ${BUILD_CMAKE_BAT_N}
+    WORKING_DIRECTORY ${SRC_DIR}
+    RESULT_VARIABLE rv
+    )
+  if(NOT rv STREQUAL "0")
+    message(FATAL_ERROR "cmake build fail ${rv}")
+  endif()
+else()
+  ######################################## MinGW
+  execute_process(
+    COMMAND "uname" -s
+    OUTPUT_VARIABLE ov)
+  string(REGEX MATCH "[A-Za-z0-9]+" UNAME_S ${ov})
+  if("${UNAME_S}" STREQUAL "CYGWIN")
+    find_program(
+      MAKE make.exe
+      HINTS c:/cygwin/usr/bin
+      HINTS c:/cygwin64/usr/bin
+      )
+  elseif(("${UNAME_S}" STREQUAL "MINGW32") OR ("${UNAME_S}" STREQUAL "MINGW64"))
+    find_program(
+      MAKE make
+      )
+  elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux")
+    find_program(
+      MAKE make
+      )
+  else()
+    message(FATAL_ERROR "unsported")
+  endif()
+  set(ENV{PATH} "/usr/bin;/bin")
+  if("${UNAME_S}" STREQUAL "MINGW32")
+    set(CMAKE_C_COMPILER "cc")
+    set(PATH "/mingw32/bin:/usr/local/bin:/usr/bin:/bin")
+  elseif("${UNAME_S}" STREQUAL "MINGW64")
+    set(CMAKE_C_COMPILER "cc")
+    set(PATH "/mingw64/bin:/usr/local/bin:/usr/bin:/bin")
+  else()
+    include(${CMAKE_SOURCE_DIR}/../mingw.toolchain.cmake)
+    set(ENV{PREFIX} i686-w64-mingw32)
+    set(ENV{CC} ${CMAKE_C_COMPILER})
+    set(ENV{AR} "i686-w64-mingw32-ar")
+    set(ENV{RANLIB} "i686-w64-mingw32-ranlib")
+    set(PATH "/usr/bin:/bin")
+  endif()
+  if("${UNAME_S}" STREQUAL "MINGW64")
+    set(CONFIG_NAME "mingw64")
+  else()
+    set(CONFIG_NAME "mingw")
+  endif()
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E env "PATH=/usr/bin:/bin" ${PERL} ./Configure ${CONFIG_NAME} --prefix=${INSTALL_DIR}
+    WORKING_DIRECTORY ${SRC_DIR}
+    RESULT_VARIABLE rv
+    )
+  if(NOT rv STREQUAL "0")
+    message(FATAL_ERROR "cmake configure fail ${rv}")
+  endif()
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E env "PATH=${PATH}" ${MAKE} CC=${CMAKE_C_COMPILER}
+    WORKING_DIRECTORY ${SRC_DIR}
+    RESULT_VARIABLE rv
+    )
+  if(NOT rv STREQUAL "0")
+    message(FATAL_ERROR "cmake build fail ${rv}")
+  endif()
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E env "PATH=${PATH}" ${MAKE} install
+    WORKING_DIRECTORY ${SRC_DIR}
+    RESULT_VARIABLE rv
+    )
+  if(NOT rv STREQUAL "0")
+    message(FATAL_ERROR "cmake install fail ${rv}")
+  endif()
+endif()
+

Added: trunk/libs/putty.cmake
===================================================================
--- trunk/libs/putty.cmake	                        (rev 0)
+++ trunk/libs/putty.cmake	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,33 @@
+# cmake -P putty.cmake
+
+set(SRC_DIR_BASE "putty-0.70")
+set(SRC_ARC "putty-0.70.tar.gz")
+set(SRC_URL "https://the.earth.li/~sgtatham/putty/0.70/putty-0.70.tar.gz")
+set(SRC_ARC_HASH_SHA256 bb8aa49d6e96c5a8e18a057f3150a1695ed99a24eef699e783651d1f24e7b0be)
+
+set(DOWN_DIR "${CMAKE_SOURCE_DIR}/download/putty")
+set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/putty/src")
+set(SRC_DIR "${CMAKE_SOURCE_DIR}/build/putty/src/${SRC_DIR_BASE}")
+set(INSTALL_DIR "${CMAKE_SOURCE_DIR}/putty")
+
+if(NOT EXISTS ${INSTALL_DIR}/README)
+
+  file(DOWNLOAD
+	${SRC_URL}
+	${DOWN_DIR}/${SRC_ARC}
+    EXPECTED_HASH SHA256=${SRC_ARC_HASH_SHA256}
+    SHOW_PROGRESS
+    )
+
+  file(MAKE_DIRECTORY ${EXTRACT_DIR})
+
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E tar "xvf" ${DOWN_DIR}/${SRC_ARC}
+    WORKING_DIRECTORY ${EXTRACT_DIR}
+    )
+
+  file(REMOVE_RECURSE ${INSTALL_DIR})
+  file(RENAME ${SRC_DIR} ${INSTALL_DIR})
+  file(REMOVE_RECURSE ${EXTRACT_DIR})
+
+endif()

Added: trunk/libs/script_support.cmake
===================================================================
--- trunk/libs/script_support.cmake	                        (rev 0)
+++ trunk/libs/script_support.cmake	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,31 @@
+# TOOLSET	ツールセット名
+if(${CMAKE_GENERATOR} MATCHES "Visual Studio")
+  if(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017")
+	set(MSVC_TOOLSET_VERSION 141)
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 14 2015")
+	set(MSVC_TOOLSET_VERSION 140)
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 12 2013")
+	set(MSVC_TOOLSET_VERSION 120)
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 11 2012")
+	set(MSVC_TOOLSET_VERSION 110)
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 10 2010")
+	set(MSVC_TOOLSET_VERSION 100)
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 9 2008")
+	set(MSVC_TOOLSET_VERSION 90)
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 8 2005")
+	set(MSVC_TOOLSET_VERSION 80)
+  else()
+	set(MSVC_TOOLSET_VERSION "Unknown")
+	message(FATAL_ERROR "unknown Visual Studio ${CMAKE_GENERATOR}")
+  endif()
+  set(TOOLSET "VS_${MSVC_TOOLSET_VERSION}")
+elseif((${CMAKE_GENERATOR} MATCHES "Unix Makefiles") OR
+	(${CMAKE_GENERATOR} MATCHES "MSYS Makefiles") OR
+	(${CMAKE_GENERATOR} MATCHES "MinGW Makefiles") OR
+	(${CMAKE_GENERATOR} MATCHES "Ninja"))
+  set(TOOLSET "mingw")
+elseif(${CMAKE_GENERATOR} MATCHES "NMake Makefiles")
+  set(TOOLSET "VS_NMake")
+else()
+	message(FATAL_ERROR "unknown GENERATOR ${CMAKE_GENERATOR}")
+endif()

Added: trunk/libs/zlib.cmake
===================================================================
--- trunk/libs/zlib.cmake	                        (rev 0)
+++ trunk/libs/zlib.cmake	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,144 @@
+# cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -P zlib.cmake
+# cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -DCMAKE_CONFIGURATION_TYPE=Release -P zlib.cmake
+
+####
+if(("${CMAKE_BUILD_TYPE}" STREQUAL "") AND ("${CMAKE_CONFIGURATION_TYPE}" STREQUAL ""))
+  if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+	# multi-configuration
+	execute_process(
+	  COMMAND ${CMAKE_COMMAND}
+	  -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+	  -DCMAKE_CONFIGURATION_TYPE=Release
+	  -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
+	  -P zlib.cmake
+	  )
+	execute_process(
+	  COMMAND ${CMAKE_COMMAND}
+	  -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+	  -DCMAKE_CONFIGURATION_TYPE=Debug
+	  -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
+	  -P zlib.cmake
+	  )
+	return()
+  elseif("$ENV{MSYSTEM}" MATCHES "MINGW")
+	# mingw on msys2
+	if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+	  set(CMAKE_BUILD_TYPE Release)
+	endif()
+  elseif("${CMAKE_GENERATOR}" MATCHES "Unix Makefiles")
+	# mingw
+	# single-configuration
+	if("${CMAKE_TOOLCHAIN_FILE}" STREQUAL "")
+	  set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/../mingw.toolchain.cmake")
+	endif()
+	if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+	  set(CMAKE_BUILD_TYPE Release)
+	endif()
+  elseif("${CMAKE_GENERATOR}" MATCHES "NMake Makefiles")
+	# VS nmake
+	# single-configuration
+	if("${CMAKE_TOOLCHAIN_FILE}" STREQUAL "")
+	  set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/VSToolchain.cmake")
+	endif()
+	if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+	  set(CMAKE_BUILD_TYPE Release)
+	endif()
+  else()
+	# single-configuration
+	if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+	  set(CMAKE_BUILD_TYPE Release)
+	endif()
+  endif()
+endif()
+
+include(script_support.cmake)
+
+set(SRC_DIR_BASE "zlib-1.2.11")
+set(SRC_ARC "zlib-1.2.11.tar.xz")
+set(SRC_URL "https://zlib.net/zlib-1.2.11.tar.xz")
+set(SRC_ARC_HASH_SHA256 4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066)
+
+set(DOWN_DIR "${CMAKE_SOURCE_DIR}/download/zlib")
+set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/zlib/src")
+set(SRC_DIR "${CMAKE_SOURCE_DIR}/build/zlib/src/${SRC_DIR_BASE}")
+set(BUILD_DIR "${CMAKE_SOURCE_DIR}/build/zlib/build_${TOOLSET}")
+set(INSTALL_DIR "${CMAKE_SOURCE_DIR}/zlib_${TOOLSET}")
+if(("${CMAKE_GENERATOR}" MATCHES "Win64") OR ("$ENV{MSYSTEM_CHOST}" STREQUAL "x86_64-w64-mingw32"))
+  set(BUILD_DIR "${BUILD_DIR}_x64")
+  set(INSTALL_DIR "${INSTALL_DIR}_x64")
+endif()
+
+########################################
+
+if(NOT EXISTS ${SRC_DIR}/README)
+
+  file(DOWNLOAD
+	${SRC_URL}
+	${DOWN_DIR}/${SRC_ARC}
+    EXPECTED_HASH SHA256=${SRC_ARC_HASH_SHA256}
+    SHOW_PROGRESS
+    )
+
+  file(MAKE_DIRECTORY ${EXTRACT_DIR})
+
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E tar "xvf" ${DOWN_DIR}/${SRC_ARC}
+    WORKING_DIRECTORY ${EXTRACT_DIR}
+    )
+
+endif()
+
+########################################
+
+file(MAKE_DIRECTORY "${BUILD_DIR}")
+
+if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+
+  ######################################## multi configuration
+
+  execute_process(
+	COMMAND ${CMAKE_COMMAND} ${SRC_DIR} -G ${CMAKE_GENERATOR}
+	-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+	-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
+	${TOOLCHAINFILE}
+	WORKING_DIRECTORY ${BUILD_DIR}
+	RESULT_VARIABLE rv
+	)
+  if(NOT rv STREQUAL "0")
+	message(FATAL_ERROR "cmake generate fail ${rv}")
+  endif()
+
+  execute_process(
+	COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_CONFIGURATION_TYPE} --target install
+	WORKING_DIRECTORY ${BUILD_DIR}
+	RESULT_VARIABLE rv
+	)
+  if(NOT rv STREQUAL "0")
+	message(FATAL_ERROR "cmake install fail ${rv}")
+  endif()
+
+else()
+  ######################################## single configuration
+  
+  execute_process(
+	COMMAND ${CMAKE_COMMAND} ${SRC_DIR} -G ${CMAKE_GENERATOR}
+	-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+	-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+	-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
+	WORKING_DIRECTORY ${BUILD_DIR}
+	RESULT_VARIABLE rv
+	)
+  if(NOT rv STREQUAL "0")
+	message(FATAL_ERROR "cmake build fail ${rv}")
+  endif()
+  
+  execute_process(
+	COMMAND ${CMAKE_COMMAND} --build . --target install
+	WORKING_DIRECTORY ${BUILD_DIR}
+	RESULT_VARIABLE rv
+	)
+  if(NOT rv STREQUAL "0")
+	message(FATAL_ERROR "cmake install fail ${rv}")
+  endif()
+
+endif()

Added: trunk/mingw.toolchain.cmake
===================================================================
--- trunk/mingw.toolchain.cmake	                        (rev 0)
+++ trunk/mingw.toolchain.cmake	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,35 @@
+# how to build:
+# mkdir build; cd build
+# cmake .. -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=../mingw.toolchain.cmake
+# cmake --build .
+
+# target
+set(CMAKE_SYSTEM_NAME Windows)
+
+# option
+option(USE_CLANG "use clang compiler" OFF)
+
+# mingw on msys
+#set(CMAKE_SYSROOT /mingw32/i686-w64-mingw32)
+#set(CMAKE_FIND_ROOT_PATH /mingw32/i686-w64-mingw32)
+
+# mingw
+set(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32)
+#set(CMAKE_SYSROOT /usr/i686-w64-mingw32)
+
+if(USE_CLANG)
+  set(CMAKE_C_COMPILER i686-w64-mingw32-clang)
+  set(CMAKE_CXX_COMPILER i686-w64-mingw32-clang++)
+else()
+  set(CMAKE_C_COMPILER i686-w64-mingw32-gcc)
+  set(CMAKE_CXX_COMPILER i686-w64-mingw32-g++)
+endif()
+set(CMAKE_RC_COMPILER i686-w64-mingw32-windres)
+
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+
+set(CMAKE_TOOLCHAIN_FILE ${CMAKE_TOOLCHAIN_FILE} CACHE PATH "toolchain file")
+

Added: trunk/teraterm/CMakeLists.txt
===================================================================
--- trunk/teraterm/CMakeLists.txt	                        (rev 0)
+++ trunk/teraterm/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,43 @@
+
+add_subdirectory(ttpcmn)
+set_target_properties(
+  ttpcmn
+  PROPERTIES FOLDER teraterm)
+
+add_subdirectory(ttpdlg)
+set_target_properties(
+  ttpdlg
+  PROPERTIES FOLDER teraterm)
+
+add_subdirectory(ttpfile)
+set_target_properties(
+  ttpfile
+  PROPERTIES FOLDER teraterm)
+
+add_subdirectory(ttpset)
+set_target_properties(
+  ttpset
+  PROPERTIES FOLDER teraterm)
+
+add_subdirectory(ttpmacro)
+set_target_properties(
+  ttpmacro
+  PROPERTIES FOLDER teraterm)
+
+add_subdirectory(ttptek)
+set_target_properties(
+  ttptek
+  PROPERTIES FOLDER teraterm)
+
+add_subdirectory(teraterm)
+set_target_properties(
+  teraterm
+  PROPERTIES FOLDER teraterm)
+
+add_subdirectory(keycode)
+set_target_properties(
+  keycode
+  PROPERTIES FOLDER teraterm)
+
+# ttpdlg内でconfig時 svnversion.h を生成
+#add_subdirectory(svnrev)

Added: trunk/teraterm/keycode/CMakeLists.txt
===================================================================
--- trunk/teraterm/keycode/CMakeLists.txt	                        (rev 0)
+++ trunk/teraterm/keycode/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,30 @@
+project(keycode)
+
+if(USE_UNICODE_API)
+  add_definitions(-DUNICODE -D_UNICODE)
+endif()
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+set(SRC
+  keycode.c
+  keycode.ico
+  keycode-version.rc
+  keycode.rc
+  kc_res.h
+  )
+
+include_directories(
+  ../common
+  ../ttpfile
+  .
+  )
+
+add_executable(
+  keycode WIN32
+  ${SRC}
+  )
+
+target_link_libraries(
+  keycode
+  )

Added: trunk/teraterm/svnrev/CMakeLists.txt
===================================================================
--- trunk/teraterm/svnrev/CMakeLists.txt	                        (rev 0)
+++ trunk/teraterm/svnrev/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,23 @@
+project(svnrev)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+set(SRC
+  svnrev.cpp
+  svnrev.h
+  )
+
+include_directories(
+  ../common
+  ../ttpfile
+  .
+  )
+
+add_executable(
+  svnrev
+  ${SRC}
+  )
+
+target_link_libraries(
+  svnrev
+  )

Added: trunk/teraterm/teraterm/CMakeLists.txt
===================================================================
--- trunk/teraterm/teraterm/CMakeLists.txt	                        (rev 0)
+++ trunk/teraterm/teraterm/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,174 @@
+project(teraterm)
+
+include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_SFMT.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake)
+
+if(USE_UNICODE_API)
+  add_definitions(-DUNICODE -D_UNICODE)
+endif()
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+set(COMMON_SRC
+  ../common/tt_res.h
+  ../common/ttcommon.h
+  ../common/ttddecmnd.h
+  ../common/tttypes.h
+  ../common/tektypes.h
+  ../common/ttftypes.h
+  ../common/ttplugin.h
+  ../common/tt-version.h
+  ../common/teraterm.h
+  ../common/ttlib.c
+  ../common/ttlib.h
+  ../common/dlglib.c
+  ../common/dlglib.h
+  ../common/win16api.h
+  ../common/win16api.c
+  ../common/codemap.h
+  ../common/compat_w95.h
+  ../common/i18n.h
+  ../ttpcmn/language.h
+  )
+
+source_group(
+  "common"
+  FILES
+  ${COMMON_SRC}
+  )
+
+set(SRC
+  addsetting.cpp
+  addsetting.h
+  buffer.c
+  buffer.h
+  clipboar.c
+  clipboar.h
+  commlib.c
+  commlib.h
+  dnddlg.cpp
+  dnddlg.h
+  filesys.cpp
+  filesys.h
+  ftdlg.cpp
+  ftdlg.h
+  keyboard.c
+  keyboard.h
+  prnabort.cpp
+  prnabort.h
+  protodlg.cpp
+  protodlg.h
+  sizetip.c
+  sizetip.h
+  teklib.c
+  teklib.h
+  tekwin.cpp
+  tekwin.h
+  telnet.c
+  telnet.h
+  teraapp.h
+  teraprn.cpp
+  teraprn.h
+  teraterm.cpp
+  ttdde.c
+  ttdde.h
+  ttdialog.c
+  ttdialog.h
+  ttermpro.rc
+  ttfileio.c
+  ttfileio.h
+  ttime.c
+  ttime.h
+  ttplug.c
+  ttplug.h
+  ttsetup.c
+  ttsetup.h
+  tt-version.rc
+  ttwinman.c
+  ttwinman.h
+  ttwsk.c
+  ttwsk.h
+  vtdisp.c
+  vtdisp.h
+  vtterm.c
+  vtterm.h
+  vtwin.cpp
+  vtwin.h
+  winjump.c
+  winjump.h
+  WSAAsyncGetAddrInfo.c
+  WSAAsyncGetAddrInfo.h
+  #
+  uni2sjis.map
+  unisym2decsp.map
+  uni_combining.map
+  #
+  teraterm.manifest
+  #
+  ${COMMON_SRC}
+  )
+
+include_directories(
+  ../common
+  ../ttpfile
+  ${SFMT_INCLUDE_DIRS}
+  ${ONIGURUMA_INCLUDE_DIRS}
+  .
+  ${CMAKE_CURRENT_BINARY_DIR}
+  )
+
+link_directories(
+  ${ONIGURUMA_LIBRARY_DIRS}
+  ${SFMT_LIBRARY_DIRS}
+  )
+
+set(CMAKE_MFC_FLAG 1)
+
+if (MSVC)
+  set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:nafxcw.lib /NODEFAULTLIB:LIBCMT.lib")
+  set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:nafxcwd.lib /NODEFAULTLIB:LIBCMTD.lib")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DELAYLOAD:imagehlp.dll /DELAYLOAD:user32.dll /DELAYLOAD:shell32.dll")
+endif()
+
+add_executable(
+  teraterm WIN32
+  ${SRC}
+  )
+
+set_target_properties(
+  teraterm
+  PROPERTIES
+  OUTPUT_NAME "ttermpro"
+  )
+
+target_link_libraries(
+  teraterm
+  ttpcmn
+  ttpdlg
+  ttpfile
+  ttpset
+  ttptek
+  optimized nafxcw.lib
+  debug nafxcwd.lib
+  optimized LIBCMT.lib
+  debug LIBCMTD.lib
+  optimized onig.lib
+  debug onigd.lib
+  #
+  gdi32
+  comctl32
+  ws2_32
+  imm32
+  imagehlp
+  delayimp
+  oleaut32
+  uuid
+  )
+
+add_dependencies(
+  teraterm
+  ttpcmn
+  ttpdlg
+  ttpfile
+  ttpset
+  ttptek
+  )

Added: trunk/teraterm/ttpcmn/CMakeLists.txt
===================================================================
--- trunk/teraterm/ttpcmn/CMakeLists.txt	                        (rev 0)
+++ trunk/teraterm/ttpcmn/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,73 @@
+project(ttpcmn)
+
+if(USE_UNICODE_API)
+  add_definitions(-DUNICODE -D_UNICODE)
+endif()
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+set(COMMON_SRC
+  ../common/teraterm.h
+  ../common/tttypes.h
+  ../common/i18n.c
+  ../common/i18n.h
+  ../common/ttlib.c
+  ../common/ttlib.h
+  ../common/servicenames.c
+  ../common/servicenames.h
+  ../common/tt-version.h
+  ../common/ttftypes.h
+  ../common/ttcommon.h
+  ../common/tt_res.h
+  ../common/codeconv.h
+  ../common/codeconv.cpp
+  )
+
+source_group(
+  "common"
+  FILES
+  ${COMMON_SRC}
+  )
+
+set(SRC
+  ttpcmn.def
+  cmn_res.h
+  language.c
+  language.h
+  ttcmn.c
+  ttpcmn-version.rc
+  ttpcmn.rc
+  ${COMMON_SRC}
+  )
+
+include_directories(
+  ../common
+  ../ttpfile
+  .
+  )
+
+if (MSVC)
+  set(CMAKE_SHARED_LINKER_FLAGS
+    "${CMAKE_SHARED_LINKER_FLAGS} /DELAYLOAD:setupapi.dll /DELAYLOAD:user32.dll")
+endif()
+
+add_library(
+  ttpcmn
+  SHARED
+  ${SRC}
+  )
+
+if(MINGW)
+  set_target_properties(
+    ttpcmn
+    PROPERTIES PREFIX ""
+    SUFFIX ".dll"
+    )
+endif()
+
+target_link_libraries(
+  ttpcmn
+  ole32
+  setupapi
+  delayimp
+  )

Added: trunk/teraterm/ttpdlg/CMakeLists.txt
===================================================================
--- trunk/teraterm/ttpdlg/CMakeLists.txt	                        (rev 0)
+++ trunk/teraterm/ttpdlg/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,78 @@
+project(ttpdlg)
+
+include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+if(MINGW)
+  set(CMAKE_RC_FLAGS "${CMAKE_RC_FLAGS} -I ${CMAKE_CURRENT_SOURCE_DIR}/../common")
+else()
+  set(CMAKE_RC_FLAGS "${CMAKE_RC_FLAGS} /i ${CMAKE_CURRENT_SOURCE_DIR}/../common")
+endif()
+
+set(COMMON_SRC
+  ../common/dlglib.c
+  ../common/dlglib.h
+  ../common/ttlib.c
+  ../common/ttlib.h
+  ../common/teraterm.ico
+  )
+
+source_group(
+  "common"
+  FILES
+  ${COMMON_SRC}
+  )
+
+set(SRC
+  dlg_res.h
+  ttdlg.c
+  ttpdlg.def
+  ttpdlg.rc
+  ttpdlg-version.rc
+  ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h
+  ${COMMON_SRC}
+  )
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}/../common
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${ONIGURUMA_INCLUDE_DIRS}
+  )
+
+link_directories(
+  ${ONIGURUMA_LIBRARY_DIRS}
+  )
+
+add_library(
+  ttpdlg SHARED
+  ${SRC}
+  )
+
+if(MINGW)
+  set_target_properties(
+    ttpdlg
+    PROPERTIES PREFIX ""
+    SUFFIX ".dll"
+    )
+endif()
+
+target_link_libraries(
+  ttpdlg
+  ttpcmn
+  optimized onig.lib
+  debug onigd.lib
+  )
+
+add_dependencies(
+  ttpdlg
+  ttpcmn
+  )
+
+configure_file(
+  svnversion.h.in
+  svnversion.h @ONLY)
+
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/svnversion.h")
+  file(REMOVE "${CMAKE_CURRENT_SOURCE_DIR}/svnversion.h")
+endif()

Added: trunk/teraterm/ttpdlg/svnversion.h.in
===================================================================
--- trunk/teraterm/ttpdlg/svnversion.h.in	                        (rev 0)
+++ trunk/teraterm/ttpdlg/svnversion.h.in	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1 @@
+#cmakedefine SVNVERSION @SVNVERSION@

Added: trunk/teraterm/ttpfile/CMakeLists.txt
===================================================================
--- trunk/teraterm/ttpfile/CMakeLists.txt	                        (rev 0)
+++ trunk/teraterm/ttpfile/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,71 @@
+project(ttpfile)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+set(COMMON_SRC
+  ../common/dlglib.c
+  ../common/dlglib.h
+  ../common/ttlib.c
+  ../common/ttlib.h
+  ../common/win16api.h
+  ../common/win16api.c
+  )
+
+source_group(
+  "common"
+  FILES
+  ${COMMON_SRC}
+  )
+
+set(SRC
+  bplus.c
+  bplus.h
+  ftlib.c
+  ftlib.h
+  kermit.c
+  kermit.h
+  quickvan.c
+  quickvan.h
+  ttfile.c
+  xmodem.c
+  xmodem.h
+  ymodem.c
+  ymodem.h
+  zmodem.c
+  zmodem.h
+  file_res.h
+  ttpfile-version.rc
+  ttpfile.rc
+  ttpfile.def
+  ${COMMON_SRC}
+  )
+
+include_directories(
+  ../common
+  )
+
+add_library(
+  ttpfile SHARED
+  ${SRC}
+  )
+
+if(MINGW)
+  set_target_properties(
+    ttpfile
+    PROPERTIES PREFIX ""
+    SUFFIX ".dll"
+    )
+endif()
+
+target_link_libraries(
+  ttpfile
+  ttpcmn
+  #
+  gdi32
+  comdlg32
+  )
+
+add_dependencies(
+  ttpfile
+  ttpcmn
+  )

Added: trunk/teraterm/ttpmacro/CMakeLists.txt
===================================================================
--- trunk/teraterm/ttpmacro/CMakeLists.txt	                        (rev 0)
+++ trunk/teraterm/ttpmacro/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,127 @@
+project(ttpmacro)
+
+include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_SFMT.cmake)
+
+if(USE_UNICODE_API)
+  add_definitions(-DUNICODE -D_UNICODE)
+endif()
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+set(COMMON_SRC
+  ../common/teraterm.h
+  ../common/ttcommon.h
+  ../common/ttddecmnd.h
+  ../common/tttypes.h
+  ../common/tt-version.h
+  ../common/i18n.c
+  ../common/i18n.h
+  ../common/ttlib.c
+  ../common/ttlib.h
+  ../common/compat_w95.h
+  ../common/win16api.h
+  ../common/win16api.c
+  ../common/codeconv.h
+  ../common/codeconv.cpp
+  )
+
+source_group(
+  "common"
+  FILES
+  ${COMMON_SRC}
+  )
+
+set(SRC
+  ttm_res.h
+  errdlg.cpp
+  errdlg.h
+  inpdlg.cpp
+  inpdlg.h
+  ListDlg.cpp
+  ListDlg.h
+  msgdlg.cpp
+  msgdlg.h
+  statdlg.cpp
+  statdlg.h
+  stdafx.h
+  ttl.c
+  ttl.h
+  ttm_res.h
+  ttmacro.cpp
+  ttmacro.h
+  ttmbuff.c
+  ttmbuff.h
+  ttmdde.c
+  ttmdde.h
+  ttmdef.h
+  ttmdlg.cpp
+  ttmdlg.h
+  ttmenc.c
+  ttmenc.h
+  ttmlib.c
+  ttmlib.h
+  ttmmain.cpp
+  ttmmain.h
+  ttmmsg.h
+  ttmonig.h
+  ttmparse.c
+  ttmparse.h
+  wait4all.c
+  wait4all.h
+
+  ttpmacro.rc
+  ttm-version.rc
+  fileread.h
+  fileread.cpp
+  ${COMMON_SRC}
+  )
+
+include_directories(
+  ${ONIGURUMA_INCLUDE_DIRS}
+  ${SFMT_INCLUDE_DIRS}
+  ${CMAKE_CURRENT_SOURCE_DIR}/../common
+  )
+
+link_directories(
+  ${ONIGURUMA_LIBRARY_DIRS}
+  ${SFMT_LIBRARY_DIRS}
+  )
+
+set(CMAKE_MFC_FLAG 1)
+
+if (MSVC)
+  set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:nafxcw.lib /NODEFAULTLIB:LIBCMT.lib")
+  set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:nafxcwd.lib /NODEFAULTLIB:LIBCMTD.lib")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DELAYLOAD:iphlpapi.dll /DELAYLOAD:user32.dll")
+endif()
+
+add_executable(
+  ttpmacro WIN32
+  ${SRC}
+  )
+
+target_link_libraries(
+  ttpmacro
+  ttpcmn
+  optimized nafxcw.lib
+  debug nafxcwd.lib
+  optimized LIBCMT.lib
+  debug LIBCMTD.lib
+  optimized onig.lib
+  debug onigd.lib
+  optimized sfmt.lib
+  debug sfmtd.lib
+  #
+  iphlpapi
+  delayimp
+  ws2_32
+  comctl32
+  gdi32
+  comdlg32
+  )
+
+add_dependencies(
+  ttpmacro
+  ttpcmn
+  )

Added: trunk/teraterm/ttpset/CMakeLists.txt
===================================================================
--- trunk/teraterm/ttpset/CMakeLists.txt	                        (rev 0)
+++ trunk/teraterm/ttpset/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,52 @@
+project(ttpset)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+set(COMMON_SRC
+  ../common/tttypes.h
+  ../common/ttlib.c
+  ../common/ttlib.h
+  ../common/servicenames.h
+  )
+
+source_group(
+  "common"
+  FILES
+  ${COMMON_SRC}
+  )
+
+set(SRC
+  ttset.c
+  ttpset-version.rc
+  ttpset.def
+  ${COMMON_SRC}
+  )
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}/../common
+  )
+
+add_library(
+  ttpset SHARED
+  ${SRC}
+  )
+
+if(MINGW)
+  set_target_properties(
+    ttpset
+    PROPERTIES PREFIX ""
+    SUFFIX ".dll"
+    )
+endif()
+
+target_link_libraries(
+  ttpset
+  ttpcmn
+  #
+  gdi32
+  )
+
+add_dependencies(
+  ttpset
+  ttpcmn
+  )

Added: trunk/teraterm/ttptek/CMakeLists.txt
===================================================================
--- trunk/teraterm/ttptek/CMakeLists.txt	                        (rev 0)
+++ trunk/teraterm/ttptek/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,69 @@
+project(ttptek)
+
+include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_SFMT.cmake)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+set(COMMON_SRC
+  ../common/tttypes.h
+  ../common/i18n.c
+  ../common/i18n.h
+  ../common/ttlib.c
+  ../common/ttlib.h
+  )
+source_group(
+  "common"
+  FILES
+  ${COMMON_SRC}
+  )
+
+set(SRC
+  tek_res.h
+  tekesc.c
+  tekesc.h
+  ttptek.def
+  ttptek.rc
+  ttptek-version.rc
+#  tttek.h
+  tttek.c
+  ${COMMON_SRC}
+  )
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}/../common
+  ${ONIGURUMA_INCLUDE}
+  ${SFMT_INCLUDE_DIR}
+  )
+
+link_directories(
+  ${SFMT_LIBRARY_DIRS}
+  )
+
+add_library(
+  ttptek SHARED
+  ${SRC}
+  )
+
+if(MINGW)
+  set_target_properties(
+    ttptek
+    PROPERTIES PREFIX ""
+    SUFFIX ".dll"
+    )
+endif()
+
+target_link_libraries(
+  ttptek
+  ttpcmn
+  debug sfmtd.lib
+  optimized sfmt.lib
+  #
+  iphlpapi
+  gdi32
+  )
+
+add_dependencies(
+  ttptek
+  ttpcmn
+  )

Added: trunk/ttpmenu/CMakeLists.txt
===================================================================
--- trunk/ttpmenu/CMakeLists.txt	                        (rev 0)
+++ trunk/ttpmenu/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,50 @@
+project(ttpmenu)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+set(COMMON_SRC
+  ../teraterm/common/ttlib.c
+  ../teraterm/common/ttlib.h
+  ../teraterm/common/i18n.c
+  ../teraterm/common/i18n.h
+  )
+
+source_group(
+  "common"
+  FILES
+  ${COMMON_SRC}
+  )
+
+set(SRC
+  resource.h
+  registry.cpp
+  ttpmenu.cpp
+  winmisc.cpp
+  left.ico
+  right.ico
+  teraterm.ico
+  ttpmenu.rc
+  )
+
+
+include_directories(
+  ../teraterm/common
+  .
+  )
+
+add_executable(
+  ttpmenu WIN32
+  ${SRC}
+  ${COMMON_SRC}
+  )
+
+target_link_libraries(
+  ttpmenu
+  version
+  comctl32
+  user32
+  gdi32
+  comdlg32
+  )
+
+

Added: trunk/ttssh2/CMakeLists.txt
===================================================================
--- trunk/ttssh2/CMakeLists.txt	                        (rev 0)
+++ trunk/ttssh2/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,16 @@
+add_subdirectory(ttxssh)
+set_target_properties(ttxssh PROPERTIES FOLDER ttssh2)
+
+add_subdirectory(ttssh)
+set_target_properties(ttssh PROPERTIES FOLDER ttssh2)
+
+add_subdirectory(matcher)
+set_target_properties(matcher PROPERTIES FOLDER ttssh2)
+
+# config時に cmake で puttyversion.h を生成するようにした
+#add_subdirectory(puttyrev)
+#set_target_properties(puttyrev PROPERTIES FOLDER ttssh2)
+
+add_subdirectory(putty)
+set_target_properties(libputty PROPERTIES FOLDER ttssh2)
+

Added: trunk/ttssh2/matcher/CMakeLists.txt
===================================================================
--- trunk/ttssh2/matcher/CMakeLists.txt	                        (rev 0)
+++ trunk/ttssh2/matcher/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,13 @@
+project(matcher)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+set(SRC
+  matcher.c
+  test.c
+  )
+
+add_executable(
+  matcher
+  ${SRC}
+  )

Added: trunk/ttssh2/putty/CMakeLists.txt
===================================================================
--- trunk/ttssh2/putty/CMakeLists.txt	                        (rev 0)
+++ trunk/ttssh2/putty/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,30 @@
+project(libputty)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+if(MINGW)
+  add_definitions("-D_WINDOWS")
+endif()
+
+set(SRC
+  ../../libs/putty/conf.c
+  ../../libs/putty/misc.c
+  ../../libs/putty/tree234.c
+  ../../libs/putty/version.c
+  ../../libs/putty/windows/winmisc.c
+  ../../libs/putty/windows/winpgntc.c
+  ../../libs/putty/windows/winsecur.c
+  libputty.c
+  libputty.h
+  )
+
+include_directories(
+  ../../libs/putty
+  ../../libs/putty/windows
+  .
+  )
+
+add_library(
+  libputty
+  ${SRC}
+  )

Added: trunk/ttssh2/puttyrev/CMakeLists.txt
===================================================================
--- trunk/ttssh2/puttyrev/CMakeLists.txt	                        (rev 0)
+++ trunk/ttssh2/puttyrev/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,13 @@
+project(puttyrev)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+set(SRC
+  puttyrev.h
+  puttyrev.cpp
+  )
+
+add_executable(
+  puttyrev
+  ${SRC}
+  )

Added: trunk/ttssh2/ttssh/CMakeLists.txt
===================================================================
--- trunk/ttssh2/ttssh/CMakeLists.txt	                        (rev 0)
+++ trunk/ttssh2/ttssh/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,15 @@
+project(ttssh)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+set(SRC
+  resource.h
+  ttsecure.ico
+  ttssh.c
+  ttssh.rc
+  )
+
+add_executable(
+  ttssh WIN32
+  ${SRC}
+  )

Added: trunk/ttssh2/ttxssh/CMakeLists.txt
===================================================================
--- trunk/ttssh2/ttxssh/CMakeLists.txt	                        (rev 0)
+++ trunk/ttssh2/ttxssh/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,150 @@
+project(ttxssh)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_zlib.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_openssl.cmake)
+
+if(USE_UNICODE_API)
+  add_definitions(-DUNICODE -D_UNICODE)
+endif()
+
+set(COMMON_SRC
+  ../../teraterm/teraterm/WSAAsyncGetAddrInfo.c
+  ../../teraterm/common/ttcommon.h
+  ../../teraterm/common/i18n.h
+  ../../teraterm/common/ttlib.h
+  ../../teraterm/common/dlglib.h
+  ../../teraterm/common/servicenames.h
+  ../../teraterm/common/codeconv.cpp
+  ../../teraterm/common/codeconv.h
+  )
+
+source_group(
+  "common"
+  FILES
+  ${COMMON_SRC}
+  )
+
+set(SRC
+  ${CMAKE_CURRENT_BINARY_DIR}/puttyversion.h
+  ../matcher/matcher.c
+  arc4random.c
+  arc4random.h
+  auth.c
+  auth.h
+  buffer.c
+  buffer.h
+  chacha.c
+  chacha.h
+  cipher.h
+  cipher-ctr.c
+  config.h
+  crypt.c
+  crypt.h
+  dns.c
+  dns.h
+  ed25519.c
+  ed25519_bcrypt_pbkdf.c
+  ed25519_blf.h
+  ed25519_blocks.c
+  ed25519_blowfish.c
+  ed25519_crypto_api.h
+  ed25519_fe25519.c
+  ed25519_fe25519.h
+  ed25519_ge25519.c
+  ed25519_ge25519.h
+  ed25519_hash.c
+  ed25519_sc25519.c
+  ed25519_sc25519.h
+  ed25519_verify.c
+  fwd.c
+  fwd.h
+  fwd-socks.c
+  fwd-socks.h
+  fwdui.c
+  fwdui.h
+  hosts.c
+  hosts.h
+  kex.c
+  kex.h
+  key.c
+  key.h
+  keyfiles.c
+  keyfiles.h
+  pkt.c
+  pkt.h
+  resource.h
+  sftp.c
+  sftp.h
+  ssh.c
+  ssh.h
+  ttxssh.c
+  ttxssh.def
+  ttxssh.h
+  ttxssh.rc
+  ttxssh-version.h
+  ttxssh-version.rc
+  util.c
+  util.h
+  x11util.c
+  x11util.h
+  ${COMMON_SRC}
+  )
+
+
+include_directories(
+  ../../teraterm/teraterm
+  ../../teraterm/common
+  ../matcher
+  ../putty
+  ${OPENSSL_INCLUDE_DIRS}
+  ${ZLIB_INCLUDE_DIRS}
+  )
+
+link_directories(
+  ${ZLIB_LIBRARY_DIRS}
+  )
+
+if (MSVC)
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DELAYLOAD:dnsapi.dll")
+endif()
+
+add_library(
+  ttxssh SHARED
+  ${SRC}
+  )
+
+target_link_libraries(
+  ttxssh
+  libputty
+  ttpcmn
+  debug zlibstaticd
+  optimized zlibstatic
+  ${OPENSSL_LIB}
+  #
+  ws2_32
+  dnsapi
+  gdi32
+  comdlg32
+  delayimp
+  )
+
+### create puttyversion.h
+
+file(READ "${CMAKE_SOURCE_DIR}/libs/putty/windows/putty.iss" iis)
+
+string(REGEX MATCH "VersionInfoTextVersion=([^\n]+)\n" _ ${iis})
+set(version_str ${CMAKE_MATCH_1})
+if("${version_str}" STREQUAL "")
+  string(REGEX MATCH "AppVerName=([^\n]+)\n" _ ${iis})
+  set(version_str ${CMAKE_MATCH_1})
+endif()
+if("${version_str}" STREQUAL "")
+  set(version_str "unknown")
+endif()
+message("putty version=\"${version_str}\"")
+FILE(
+  WRITE ${CMAKE_CURRENT_BINARY_DIR}/puttyversion.h
+  "#define PUTTYVERSION \"${version_str}\"\n"
+  )

Added: trunk/version_info.h.in
===================================================================
--- trunk/version_info.h.in	                        (rev 0)
+++ trunk/version_info.h.in	2019-03-02 16:18:47 UTC (rev 7456)
@@ -0,0 +1,42 @@
+
+#cmakedefine USE_UNICODE_API
+#cmakedefine SVNVERSION @SVNVERSION@
+
+// infos when generated
+#cmakedefine MSVC
+#cmakedefine MINGW
+// CMAKE_GENERATOR
+//  @CMAKE_GENERATOR@
+// CMAKE_COMMAND
+//  @CMAKE_COMMAND@
+// CMAKE_C_COMPILER
+//  @CMAKE_C_COMPILER@
+// CMAKE_CXX_COMPILER
+//  @CMAKE_CXX_COMPILER@
+// CMAKE_C_FLAGS
+//  @CMAKE_C_FLAGS@
+// CMAKE_C_FLAGS_RELEASE
+//  @CMAKE_C_FLAGS_RELEASE@
+// CMAKE_C_FLAGS_DEBUG
+//  @CMAKE_C_FLAGS_DEBUG@
+// CMAKE_CXX_FLAGS
+//  @CMAKE_CXX_FLAGS@
+// CMAKE_CXX_FLAGS_RELEASE
+//  @CMAKE_CXX_FLAGS_RELEASE@
+// CMAKE_CXX_FLAGS_DEBUG
+//  @CMAKE_CXX_FLAGS_DEBUG@
+// CMAKE_EXE_LINKER_FLAGS
+//  @CMAKE_EXE_LINKER_FLAGS@
+// CMAKE_EXE_LINKER_FLAGS_RELEASE
+//  @CMAKE_EXE_LINKER_FLAGS_RELEASE@
+// CMAKE_EXE_LINKER_FLAGS_DEBUG
+//  @CMAKE_EXE_LINKER_FLAGS_DEBUG@
+// CMAKE_SHARED_LINKER_FLAGS
+//  @CMAKE_SHARED_LINKER_FLAGS@
+// CMAKE_SHARED_LINKER_FLAGS_RELEASE
+//  @CMAKE_SHARED_LINKER_FLAGS_RELEASE@
+// CMAKE_SHARED_LINKER_FLAGS_DEBUG
+//  @CMAKE_SHARED_LINKER_FLAGS_DEBUG@
+//
+// see CMakeCache.txt for more details
+

From scmnotify ＠ osdn.net  Sun Mar  3 01:19:00 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sun, 03 Mar 2019 01:19:00 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0NTddIHR0ZXJtcHJvLmV4ZSDjgajlkIw=?=
 =?utf-8?b?5LiA44OV44Kp44Or44OA44GuIFRTUEVDSUFMMS5UVEYg44KS6Kqt44G/6L68?=
 =?utf-8?b?44KB44KL44KI44GG44Gr44GX44Gf?=
Message-ID: <1551543540.852423.116856.nullmailer@users.osdn.me>

Revision: 7457
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7457
Author:   zmatsuo
Date:     2019-03-03 01:19:00 +0900 (Sun, 03 Mar 2019)
Log Message:
-----------
ttermpro.exe と同一フォルダの TSPECIAL1.TTF を読み込めるようにした
GetProcAddress()を一括して行う仕組みを作った(dllutil.cpp,h)
TCHAR考慮

Modified Paths:
--------------
    trunk/teraterm/teraterm/CMakeLists.txt
    trunk/teraterm/teraterm/teraterm.cpp
    trunk/teraterm/teraterm/ttermpro.vcproj
    trunk/teraterm/teraterm/vtdisp.c
    trunk/teraterm/teraterm/vtwin.cpp

Added Paths:
-----------
    trunk/teraterm/common/compat_win.cpp
    trunk/teraterm/common/compat_win.h
    trunk/teraterm/common/dllutil.cpp
    trunk/teraterm/common/dllutil.h

-------------- next part --------------
Added: trunk/teraterm/common/compat_win.cpp
===================================================================
--- trunk/teraterm/common/compat_win.cpp	                        (rev 0)
+++ trunk/teraterm/common/compat_win.cpp	2019-03-02 16:19:00 UTC (rev 7457)
@@ -0,0 +1,81 @@
+/*
+ * (C) 2019 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* compat_win */
+
+#include <windows.h>
+#include <tchar.h>
+#include "compat_win.h"
+
+#include "dllutil.h"
+
+BOOL (WINAPI *pAlphaBlend)(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION);
+BOOL (WINAPI *pEnumDisplayMonitors)(HDC,LPCRECT,MONITORENUMPROC,LPARAM);
+DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT dpiContext);
+UINT (WINAPI *pGetDpiForWindow)(HWND hwnd);
+BOOL (WINAPI *pSetLayeredWindowAttributes)(HWND hwnd, COLORREF crKey, BYTE bAlpha, DWORD dwFlags);
+int (WINAPI *pAddFontResourceExA)(LPCSTR name, DWORD fl, PVOID res);
+int (WINAPI *pAddFontResourceExW)(LPCWSTR name, DWORD fl, PVOID res);
+BOOL (WINAPI *pRemoveFontResourceExA)(LPCSTR name, DWORD fl, PVOID pdv);
+BOOL (WINAPI *pRemoveFontResourceExW)(LPCWSTR name, DWORD fl, PVOID pdv);
+
+static const APIInfo Lists_user32[] = {
+	{ "SetLayeredWindowAttributes", (void **)&pSetLayeredWindowAttributes },
+	{ "SetThreadDpiAwarenessContext", (void **)&pSetThreadDpiAwarenessContext },
+	{ "GetDpiForWindow", (void **)&pGetDpiForWindow },
+	{ NULL },
+};
+
+static const APIInfo Lists_msimg32[] = {
+	{ "AlphaBlend", (void **)&pAlphaBlend },
+	{ NULL },
+};
+
+static const APIInfo Lists_gdi32[] = {
+	{ "AddFontResourceExA", (void **)&pAddFontResourceExA },
+	{ "RemoveFontResourceExA", (void **)&pRemoveFontResourceExA },
+	{ "AddFontResourceExW", (void **)&pAddFontResourceExW },
+	{ "RemoveFontResourceExW", (void **)&pRemoveFontResourceExW },
+	{ NULL },
+};
+
+static const DllInfo DllInfos[] = {
+	{ _T("user32.dll"), DLL_LOAD_LIBRARY_SYSTEM, DLL_ACCEPT_NOT_EXIST, Lists_user32 },
+	{ _T("msimg32.dll"), DLL_LOAD_LIBRARY_SYSTEM, DLL_ACCEPT_NOT_EXIST, Lists_msimg32 },
+	{ _T("gdi32.dll"), DLL_LOAD_LIBRARY_SYSTEM, DLL_ACCEPT_NOT_EXIST, Lists_gdi32 },
+	{ NULL },
+};
+
+void WinCompatInit()
+{
+	static BOOL done = FALSE;
+	if (done) return;
+	done = TRUE;
+
+	DLLGetApiAddressFromLists(DllInfos);
+}

Added: trunk/teraterm/common/compat_win.h
===================================================================
--- trunk/teraterm/common/compat_win.h	                        (rev 0)
+++ trunk/teraterm/common/compat_win.h	2019-03-02 16:19:00 UTC (rev 7457)
@@ -0,0 +1,72 @@
+/*
+ * (C) 2018 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* compat_win */
+
+#pragma once
+
+#include <windows.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if !defined(DPI_AWARENESS_CONTEXT_SYSTEM_AWARE)
+#define DPI_AWARENESS_CONTEXT_SYSTEM_AWARE          ((DPI_AWARENESS_CONTEXT)-2)
+#define DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE     ((DPI_AWARENESS_CONTEXT)-3)
+#define DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2  ((DPI_AWARENESS_CONTEXT)-4)
+DECLARE_HANDLE(DPI_AWARENESS_CONTEXT);
+#endif
+
+#if !defined(WM_DPICHANGED)
+#define WM_DPICHANGED                   0x02E0
+#endif
+
+extern BOOL (WINAPI *pAlphaBlend)(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION);
+extern BOOL (WINAPI *pEnumDisplayMonitors)(HDC,LPCRECT,MONITORENUMPROC,LPARAM);
+extern DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT dpiContext);
+extern UINT (WINAPI *pGetDpiForWindow)(HWND hwnd);
+extern BOOL (WINAPI *pSetLayeredWindowAttributes)(HWND hwnd, COLORREF crKey, BYTE bAlpha, DWORD dwFlags);
+extern int (WINAPI *pAddFontResourceExA)(LPCSTR name, DWORD fl, PVOID res);
+extern int (WINAPI *pAddFontResourceExW)(LPCWSTR name, DWORD fl, PVOID res);
+extern BOOL (WINAPI *pRemoveFontResourceExA)(LPCSTR name, DWORD fl, PVOID pdv);
+extern BOOL (WINAPI *pRemoveFontResourceExW)(LPCWSTR name, DWORD fl, PVOID pdv);
+
+#ifdef UNICODE
+#define pAddFontResourceEx		pAddFontResourceExW
+#define pRemoveFontResourceEx	pRemoveFontResourceExW
+#else
+#define pAddFontResourceEx		pAddFontResourceExA
+#define pRemoveFontResourceEx	pRemoveFontResourceExA
+#endif // !UNICODE
+
+void WinCompatInit();
+
+#ifdef __cplusplus
+}
+#endif

Added: trunk/teraterm/common/dllutil.cpp
===================================================================
--- trunk/teraterm/common/dllutil.cpp	                        (rev 0)
+++ trunk/teraterm/common/dllutil.cpp	2019-03-02 16:19:00 UTC (rev 7457)
@@ -0,0 +1,284 @@
+/*
+ * (C) 2019 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <windows.h>
+#include <tchar.h>
+#include <assert.h>
+#include <crtdbg.h>
+
+#include "dllutil.h"
+
+#ifdef _DEBUG
+#define malloc(l)     _malloc_dbg((l), _NORMAL_BLOCK, __FILE__, __LINE__)
+#define free(p)       _free_dbg((p), _NORMAL_BLOCK)
+#define _strdup(s)	  _strdup_dbg((s), _NORMAL_BLOCK, __FILE__, __LINE__)
+#endif
+
+typedef struct {
+	const TCHAR *dllName;
+	DLLLoadFlag LoadFlag;
+	HMODULE handle;
+	int refCount;
+} HandleList_t;
+
+static HandleList_t *HandleList;
+static int HandleListCount;
+
+static HMODULE GetHandle(const TCHAR *dllName, DLLLoadFlag LoadFlag)
+{
+	TCHAR dllPath[MAX_PATH];
+	HMODULE module;
+	int i;
+	HandleList_t *p;
+	int r;
+
+	if (LoadFlag == DLL_GET_MODULE_HANDLE) {
+		module = GetModuleHandle(dllName);
+		assert(module != NULL);
+		return module;
+	}
+
+	// \x88ȑO\x82Ƀ\x8D\x81[\x83h\x82\xB5\x82\xBD?
+	p = HandleList;
+	for (i = 0; i < HandleListCount; i++) {
+		if (_tcscmp(p->dllName, dllName) == 0) {
+			p->refCount++;
+			return p->handle;
+		}
+		p++;
+	}
+
+	// \x90V\x82\xBD\x82Ƀ\x8D\x81[\x83h\x82\xB7\x82\xE9
+	dllPath[0] = 0;
+	switch (LoadFlag) {
+	case DLL_LOAD_LIBRARY_SYSTEM:
+		r = GetSystemDirectory(dllPath, _countof(dllPath));
+		assert(r != 0);
+		if (r == 0) return NULL;
+		break;
+	case DLL_LOAD_LIBRARY_CURRENT:
+		r = GetModuleFileName(NULL, dllPath, _countof(dllPath));
+		assert(r != 0);
+		if (r == 0) return NULL;
+		*_tcsrchr(dllPath, _T('\\')) = 0;
+		break;
+	default:
+		return NULL;
+	}
+	_tcscat_s(dllPath, _countof(dllPath), _T("\\"));
+	_tcscat_s(dllPath, _countof(dllPath), dllName);
+	module = LoadLibrary(dllPath);
+	if (module == NULL) {
+		// \x91\xB6\x8D݂\xB5\x82Ȃ\xA2,dll\x82\xB6\x82\xE1\x82Ȃ\xA2?
+		return NULL;
+	}
+
+	// \x83\x8A\x83X\x83g\x82ɒlj\xC1
+	HandleListCount++;
+	HandleList = (HandleList_t *)realloc(HandleList, sizeof(HandleList_t)*HandleListCount);
+	p = &HandleList[i];
+	p->dllName = _tcsdup(dllName);
+	p->handle = module;
+	p->LoadFlag = LoadFlag;
+	p->refCount = 1;
+	return module;
+}
+
+static void FreeHandle(const TCHAR *dllName, DLLLoadFlag LoadFlag)
+{
+	int i;
+	HandleList_t *p;
+
+	if (LoadFlag == DLL_GET_MODULE_HANDLE) {
+		// \x82\xBB\x82̂܂ܒu\x82\xA2\x82Ă\xA8\x82\xAD
+		return;
+	}
+
+	// \x83\x8A\x83X\x83g\x82\xA9\x82\xE7\x8D폜\x82\xB7\x82\xE9
+	p = HandleList;
+	for (i = 0; i < HandleListCount; i++) {
+		if (_tcscmp(p->dllName, dllName) != 0) {
+			continue;
+		}
+
+		// \x8C\xA9\x82‚\xA9\x82\xC1\x82\xBD
+		p->refCount--;
+		if (p->refCount > 0) {
+			continue;
+		}
+
+		// free
+		FreeLibrary(p->handle);
+		free((void *)p->dllName);
+		memcpy(p, p+1, sizeof(*p) + (HandleListCount - i - 1));
+		HandleListCount--;
+		HandleList = (HandleList_t *)realloc(HandleList, sizeof(HandleList_t)*HandleListCount);
+		return;
+	}
+	// \x83\x8A\x83X\x83g\x82Ɍ\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA9\x82\xC1\x82\xBD
+}
+
+/**
+ * DLL\x93\xE0\x82̊֐\x94\x82ւ̃A\x83h\x83\x8C\x83X\x82\xF0\x8E擾\x82\xB7\x82\xE9
+ * @param[in,out]	pFunc		\x8A֐\x94\x82ւ̃A\x83h\x83\x8C\x83X
+ *								\x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA2\x8E\x9E\x82\xCDNULL\x82\xAA\x91\xE3\x93\xFC\x82\xB3\x82\xEA\x82\xE9
+ * @param[in] 		FuncFlag	\x8A֐\x94\x82\xAA\x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA2\x82Ƃ\xAB\x82̓\xAE\x8D\xEC
+ *					DLL_ACCEPT_NOT_EXIST	\x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xAD\x82Ă\xE0ok
+ *					DLL_ERROR_NOT_EXIST		\x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA2\x8Fꍇ\x83G\x83\x89\x81[
+ * @retval	NO_ERROR				\x83G\x83\x89\x81[\x82Ȃ\xB5
+ * @retval	ERROR_FILE_NOT_FOUND	DLL\x82\xAA\x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA2(\x95s\x90\xB3\x82ȃt\x83@\x83C\x83\x8B)
+ * @retval	ERROR_PROC_NOT_FOUND	\x8A֐\x94\x83G\x83\x93\x83g\x83\x8A\x82\xAA\x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA2
+ */
+DWORD DLLGetApiAddress(const TCHAR *dllPath, DLLLoadFlag LoadFlag,
+					   const char *ApiName, void **pFunc)
+{
+	HMODULE hDll = GetHandle(dllPath, LoadFlag);
+	if (hDll == NULL) {
+		*pFunc = NULL;
+		return ERROR_FILE_NOT_FOUND;
+	} else {
+		*pFunc = GetProcAddress(hDll, ApiName);
+		if (*pFunc == NULL) {
+			return ERROR_PROC_NOT_FOUND;
+		}
+		return NO_ERROR; // = 0
+	}
+}
+
+/**
+ * DLL\x93\xE0\x82̕\xA1\x90\x94\x82̊֐\x94\x82ւ̃A\x83h\x83\x8C\x83X\x82\xF0\x8E擾\x82\xB7\x82\xE9
+ * @param[in] FuncFlag	\x8A֐\x94\x82\xAA\x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA2\x82Ƃ\xAB\x82̓\xAE\x8D\xEC
+ *				DLL_ACCEPT_NOT_EXIST	\x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xAD\x82Ă\xE0ok
+ *				DLL_ERROR_NOT_EXIST		\x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA2\x8Fꍇ\x83G\x83\x89\x81[
+ * @retval	NO_ERROR				\x83G\x83\x89\x81[\x82Ȃ\xB5
+ * @retval	ERROR_FILE_NOT_FOUND	DLL\x82\xAA\x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA2(\x95s\x90\xB3\x82ȃt\x83@\x83C\x83\x8B)
+ * @retval	ERROR_PROC_NOT_FOUND	\x8A֐\x94\x83G\x83\x93\x83g\x83\x8A\x82\xAA\x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA2
+ */
+DWORD DLLGetApiAddressFromList(const TCHAR *dllPath, DLLLoadFlag LoadFlag,
+							   DLLFuncFlag FuncFlag, const APIInfo *ApiInfo)
+{
+	HMODULE hDll = GetHandle(dllPath, LoadFlag);
+	if (hDll == NULL) {
+		while(ApiInfo->ApiName != NULL) {
+			void **func = ApiInfo->func;
+			*func = NULL;
+			ApiInfo++;
+		}
+		return ERROR_FILE_NOT_FOUND;
+	} else {
+		BOOL exist_all = TRUE;
+		const APIInfo *p = ApiInfo;
+
+		// \x83A\x83h\x83\x8C\x83X\x8E擾
+		while(p->ApiName != NULL) {
+			void **func = p->func;
+			*func = (void *)GetProcAddress(hDll, p->ApiName);
+			if (*func == NULL) {
+				exist_all = FALSE;
+			}
+			p++;
+		}
+
+		// \x82\xB7\x82ׂČ\xA9\x82‚\xA9\x82\xC1\x82\xBD or \x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA2API\x82\xAA\x82\xA0\x82\xC1\x82Ă\xE0ok
+		if (exist_all || FuncFlag == DLL_ACCEPT_NOT_EXIST) {
+			return NO_ERROR;
+		}
+
+		// \x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA2API\x82\xAA\x82\xA0\x82\xC1\x82\xBD\x82̂ŃG\x83\x89\x81[
+		p = ApiInfo;
+		while(p->ApiName != NULL) {
+			void **func = p->func;
+			*func = NULL;
+			p++;
+		}
+		FreeHandle(dllPath, LoadFlag);
+		return ERROR_PROC_NOT_FOUND;
+	}
+}
+
+void DLLGetApiAddressFromLists(const DllInfo *dllInfos)
+{
+	while (dllInfos->DllName != NULL) {
+		DLLGetApiAddressFromList(dllInfos->DllName,
+								 dllInfos->LoadFlag,
+								 dllInfos->FuncFlag,
+								 dllInfos->APIInfoPtr);
+		dllInfos++;
+	}
+}
+
+static void SetupLoadLibraryPath(void)
+{
+	BOOL (WINAPI *pSetDefaultDllDirectories)(DWORD);
+	BOOL (WINAPI *pSetDllDirectoryA)(LPCSTR);
+	const TCHAR *kernel32 = _T("kernel32.dll");
+
+#if !defined(LOAD_LIBRARY_SEARCH_SYSTEM32)
+#define LOAD_LIBRARY_SEARCH_SYSTEM32        0x00000800
+#endif
+
+	// SetDefaultDllDirectories() \x82\xAA\x8Eg\x82\xA6\x82\xE9\x8Fꍇ\x82́A
+	// \x8C\x9F\x8D\xF5\x83p\x83X\x82\xF0 %WINDOWS%\system32 \x82݂̂ɐݒ肷\x82\xE9
+	DLLGetApiAddress(kernel32, DLL_GET_MODULE_HANDLE,
+					 "SetDefaultDllDirectories", (void **)&pSetDefaultDllDirectories);
+	if (pSetDefaultDllDirectories != NULL) {
+		pSetDefaultDllDirectories(LOAD_LIBRARY_SEARCH_SYSTEM32);
+		return;
+	}
+
+	// SetDefaultDllDirectories() \x82\xAA\x8Eg\x82\xA6\x82Ȃ\xAD\x82Ă\xE0
+	// SetDllDirectory() \x82\xAA\x8Eg\x82\xA6\x82\xE9\x8Fꍇ\x82\xCD
+	// \x83J\x83\x8C\x83\x93\x83g\x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82\xBE\x82\xAF\x82ł\xE0\x8C\x9F\x8D\xF5\x83p\x83X\x82\xA9\x82\xE7\x82͂\xB8\x82\xB5\x82Ă\xA8\x82\xAD\x81B
+	DLLGetApiAddress(kernel32, DLL_GET_MODULE_HANDLE,
+					 "SetDllDirectoryA", (void **)&pSetDllDirectoryA);
+	if (pSetDllDirectoryA != NULL) {
+		pSetDllDirectoryA("");
+	}
+}
+
+void DLLInit()
+{
+	HandleList = NULL;
+	HandleListCount = 0;
+	SetupLoadLibraryPath();
+}
+
+void DLLExit()
+{
+	int i;
+	for (i = 0; i < HandleListCount; i++) {
+		HandleList_t *p = &HandleList[i];
+		if (p->LoadFlag != DLL_GET_MODULE_HANDLE) {
+			FreeLibrary(p->handle);
+		}
+		free((void *)p->dllName);
+	}
+	free(HandleList);
+	HandleList = NULL;
+	HandleListCount = 0;
+}

Added: trunk/teraterm/common/dllutil.h
===================================================================
--- trunk/teraterm/common/dllutil.h	                        (rev 0)
+++ trunk/teraterm/common/dllutil.h	2019-03-02 16:19:00 UTC (rev 7457)
@@ -0,0 +1,66 @@
+/*
+ * (C) 2019 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum {
+	DLL_GET_MODULE_HANDLE,
+	DLL_LOAD_LIBRARY_SYSTEM,
+	DLL_LOAD_LIBRARY_CURRENT,
+} DLLLoadFlag;
+
+typedef enum {
+	DLL_ACCEPT_NOT_EXIST,
+	DLL_ERROR_NOT_EXIST,
+} DLLFuncFlag;
+
+typedef struct {
+	const char *ApiName;
+	void **func;
+} APIInfo;
+
+typedef struct {
+	const TCHAR *DllName;
+	DLLLoadFlag LoadFlag;
+	DLLFuncFlag FuncFlag;
+	const APIInfo *APIInfoPtr;
+} DllInfo;
+
+void DLLInit();
+void DLLExit();
+void DLLGetApiAddressFromLists(const DllInfo *dllInfos);
+DWORD DLLGetApiAddressFromList(const TCHAR *dllPath, DLLLoadFlag LoadFlag,
+							   DLLFuncFlag FuncFlag, const APIInfo *ApiInfo);
+DWORD DLLGetApiAddress(const TCHAR *dllPath, DLLLoadFlag LoadFlag,
+					   const char *ApiName, void **pFunc);
+
+#ifdef __cplusplus
+}
+#endif

Modified: trunk/teraterm/teraterm/CMakeLists.txt
===================================================================
--- trunk/teraterm/teraterm/CMakeLists.txt	2019-03-02 16:18:47 UTC (rev 7456)
+++ trunk/teraterm/teraterm/CMakeLists.txt	2019-03-02 16:19:00 UTC (rev 7457)
@@ -26,7 +26,11 @@
   ../common/win16api.c
   ../common/codemap.h
   ../common/compat_w95.h
+  ../common/compat_win.h
+  ../common/compat_win.cpp
   ../common/i18n.h
+  ../common/dllutil.cpp
+  ../common/dllutil.h
   ../ttpcmn/language.h
   )
 

Modified: trunk/teraterm/teraterm/teraterm.cpp
===================================================================
--- trunk/teraterm/teraterm/teraterm.cpp	2019-03-02 16:18:47 UTC (rev 7456)
+++ trunk/teraterm/teraterm/teraterm.cpp	2019-03-02 16:19:00 UTC (rev 7457)
@@ -45,15 +45,19 @@
 #include "tekwin.h"
 #include "ttdde.h"
 #include "keyboard.h"
+#include "dllutil.h"
+#include "compat_win.h"
 
 #include "teraapp.h"
 
 #include "compat_w95.h"
 
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
+#if 0
+//#ifdef _DEBUG
+//#define new DEBUG_NEW
+//#undef THIS_FILE
+//static char THIS_FILE[] = __FILE__;
+#define new ::new(_NORMAL_BLOCK, __FILE__, __LINE__)
 #endif
 
 BEGIN_MESSAGE_MAP(CTeraApp, CWinApp)
@@ -61,28 +65,95 @@
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
-CTeraApp::CTeraApp()
+typedef struct {
+	const TCHAR *FaceName;
+	bool found;
+} EnumFontInfo;
+
+static int CALLBACK EnumFontExProc(
+	ENUMLOGFONT* lpelf, NEWTEXTMETRIC* lpntm,
+	int nFontType, LPARAM lParam)
 {
-	typedef BOOL (WINAPI *pSetDllDir)(LPCSTR);
-	typedef BOOL (WINAPI *pSetDefDllDir)(DWORD);
+	EnumFontInfo *info = (EnumFontInfo *)lParam;
+	if (nFontType == DEVICE_FONTTYPE) {
+		// \x90ڑ\xB1\x82\xB3\x82ꂽ\x83f\x83o\x83C\x83X(\x83v\x83\x8A\x83\x93\x83^\x82Ȃ\xC7)\x93\xE0\x82̃t\x83H\x83\x93\x83g
+		return 1;
+	}
+	const TCHAR *FaceName = lpelf->elfLogFont.lfFaceName;
+	if (_tcscmp(info->FaceName, FaceName) == 0) {
+		info->found = true;
+		return 0;
+	}
+	return 1;
+}
 
-	HMODULE module;
-	pSetDllDir setDllDir;
-	pSetDefDllDir setDefDllDir;
+BOOL isExistFont(const TCHAR *FaceName)
+{
+	HDC hDC = GetDC(NULL);
+	LOGFONT lf;
+	memset(&lf, 0, sizeof(lf));
+	lf.lfCharSet = DEFAULT_CHARSET;// SHIFTJIS_CHARSET;
+	lf.lfPitchAndFamily = 0;
 
-	if ((module = GetModuleHandle("kernel32.dll")) != NULL) {
-		if ((setDefDllDir = (pSetDefDllDir)GetProcAddress(module, "SetDefaultDllDirectories")) != NULL) {
-			// SetDefaultDllDirectories() \x82\xAA\x8Eg\x82\xA6\x82\xE9\x8Fꍇ\x82́A\x8C\x9F\x8D\xF5\x83p\x83X\x82\xF0 %WINDOWS%\system32 \x82݂̂ɐݒ肷\x82\xE9
-			(*setDefDllDir)((DWORD)0x00000800); // LOAD_LIBRARY_SEARCH_SYSTEM32
+	EnumFontInfo info;
+	info.FaceName = FaceName;
+	info.found = false;
+	EnumFontFamiliesEx(hDC, &lf, (FONTENUMPROC)EnumFontExProc, (LPARAM)&info, 0);
+	ReleaseDC(NULL, hDC);
+	return info.found;
+}
+
+static BOOL AddFontFlag;
+static TCHAR TSpecialFont[MAX_PATH];
+
+static void LoadSpecialFont()
+{
+	if (!isExistFont(_T("Tera Special"))) {
+		int r;
+
+		if (GetModuleFileName(NULL, TSpecialFont,_countof(TSpecialFont)) == 0) {
+			AddFontFlag = FALSE;
+			return;
 		}
-		else if ((setDllDir = (pSetDllDir)GetProcAddress(module, "SetDllDirectoryA")) != NULL) {
-			// SetDefaultDllDirectories() \x82\xAA\x8Eg\x82\xA6\x82Ȃ\xAD\x82Ă\xE0\x81ASetDllDirectory() \x82\xAA\x8Eg\x82\xA6\x82\xE9\x8Fꍇ\x82\xCD
-			// \x83J\x83\x8C\x83\x93\x83g\x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82\xBE\x82\xAF\x82ł\xE0\x8C\x9F\x8D\xF5\x83p\x83X\x82\xA9\x82\xE7\x82͂\xB8\x82\xB5\x82Ă\xA8\x82\xAD\x81B
-			(*setDllDir)("");
+		*_tcsrchr(TSpecialFont, _T('\\')) = 0;
+		_tcscat_s(TSpecialFont, _T("\\TSPECIAL1.TTF"));
+
+		if (pAddFontResourceEx != NULL) {
+			// teraterm.exe\x82݂̂ŗL\x8C\xF8\x82ȃt\x83H\x83\x93\x83g\x82ƂȂ\xE9\x81B
+			// remove\x82\xB5\x82Ȃ\xAD\x82Ă\xE0\x8FI\x97\xB9\x82\xB7\x82\xE9\x82\xC6OS\x82\xA9\x82\xE7\x82Ȃ\xAD\x82Ȃ\xE9
+			r = pAddFontResourceEx(TSpecialFont, FR_PRIVATE, NULL);
+		} else {
+			// \x83V\x83X\x83e\x83\x80\x91S\x91̂Ŏg\x82\xA6\x82\xE9\x83t\x83H\x83\x93\x83g\x82ƂȂ\xE9
+			// remove\x82\xB5\x82Ȃ\xA2\x82\xC6OS\x82\xAA\x92͂񂾂܂܂ƂȂ\xE9
+			r = AddFontResource(TSpecialFont);
 		}
+		if (r != 0) {
+			AddFontFlag = TRUE;
+		}
 	}
 }
 
+static void UnloadSpecialFont()
+{
+	if (AddFontFlag) {
+		if (pRemoveFontResourceEx != NULL) {
+			pRemoveFontResourceEx(TSpecialFont, FR_PRIVATE, NULL);
+		} else {
+			RemoveFontResource(TSpecialFont);
+		}
+	}
+}
+
+CTeraApp::CTeraApp()
+{
+#ifdef _DEBUG
+	::_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
+#endif
+
+	DLLInit();
+	WinCompatInit();
+}
+
 // CTeraApp instance
 CTeraApp theApp;
 
@@ -93,6 +164,7 @@
 // CTeraApp initialization
 BOOL CTeraApp::InitInstance()
 {
+	LoadSpecialFont();
 	hInst = m_hInstance;
 	m_pMainWnd = new CVTWindow();
 	pVTWin = m_pMainWnd;
@@ -101,6 +173,8 @@
 
 int CTeraApp::ExitInstance()
 {
+	UnloadSpecialFont();
+	DLLExit();
 	return CWinApp::ExitInstance();
 }
 

Modified: trunk/teraterm/teraterm/ttermpro.vcproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.vcproj	2019-03-02 16:18:47 UTC (rev 7456)
+++ trunk/teraterm/teraterm/ttermpro.vcproj	2019-03-02 16:19:00 UTC (rev 7457)
@@ -389,6 +389,14 @@
 				RelativePath="..\common\win16api.c"
 				>
 			</File>
+			<File
+				RelativePath="..\common\compat_win.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\common\dllutil.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"

Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c	2019-03-02 16:18:47 UTC (rev 7456)
+++ trunk/teraterm/teraterm/vtdisp.c	2019-03-02 16:19:00 UTC (rev 7457)
@@ -36,6 +36,7 @@
 #include "ttime.h"
 #include "ttdialog.h"
 #include "ttcommon.h"
+#include "compat_win.h"
 
 #include "vtdisp.h"
 
@@ -192,17 +193,8 @@
   int  pattern;
 }WallpaperInfo;
 
-typedef struct _BGBLENDFUNCTION
-{
-    BYTE     BlendOp;
-    BYTE     BlendFlags;
-    BYTE     SourceConstantAlpha;
-    BYTE     AlphaFormat;
-}BGBLENDFUNCTION;
+static BOOL (WINAPI *BGAlphaBlend)(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION);
 
-BOOL (WINAPI *BGAlphaBlend)(HDC,int,int,int,int,HDC,int,int,int,int,BGBLENDFUNCTION);
-BOOL (WINAPI *BGEnumDisplayMonitors)(HDC,LPCRECT,MONITORENUMPROC,LPARAM);
-
 static HBITMAP GetBitmapHandle(char *File);
 
 
@@ -530,7 +522,7 @@
   return TRUE;
 }
 
-BOOL WINAPI AlphaBlendWithoutAPI(HDC hdcDest,int dx,int dy,int width,int height,HDC hdcSrc,int sx,int sy,int sw,int sh,BGBLENDFUNCTION bf)
+static BOOL WINAPI AlphaBlendWithoutAPI(HDC hdcDest,int dx,int dy,int width,int height,HDC hdcSrc,int sx,int sy,int sw,int sh,BLENDFUNCTION bf)
 {
   HDC hdcDestWork,hdcSrcWork;
   int i,invAlpha,alpha;
@@ -1204,9 +1196,9 @@
   lws.src        = src;
   lws.hdcDest    = hdcDest;
 
-  if(BGEnumDisplayMonitors)
+  if(pEnumDisplayMonitors != NULL)
   {
-    (*BGEnumDisplayMonitors)(NULL,NULL,BGLoadWallpaperEnumFunc,(LPARAM)&lws);
+    (*pEnumDisplayMonitors)(NULL,NULL,BGLoadWallpaperEnumFunc,(LPARAM)&lws);
   }else{
     RECT rectMonitor;
 
@@ -1273,7 +1265,7 @@
 
   if(!BGInSizeMove)
   {
-    BGBLENDFUNCTION bf;
+    BLENDFUNCTION bf;
     HDC hdcSrc = NULL;
 
     //\x94w\x8Ci HDC
@@ -1473,7 +1465,6 @@
 void BGInitialize(void)
 {
   char path[MAX_PATH],config_file[MAX_PATH],tempPath[MAX_PATH];
-  char msimg32_dll[MAX_PATH],user32_dll[MAX_PATH];
 
   // VTColor \x82\xF0\x93ǂݍ\x9E\x82\xDD
   BGVTColor[0] = ts.VTColor[0];
@@ -1619,21 +1610,15 @@
 
   // AlphaBlend \x82̃A\x83h\x83\x8C\x83X\x82\xF0\x93ǂݍ\x9E\x82\xDD
   if(BGUseAlphaBlendAPI) {
-    GetSystemDirectory(msimg32_dll, sizeof(msimg32_dll));
-    strncat_s(msimg32_dll, sizeof(msimg32_dll), "\\msimg32.dll", _TRUNCATE);
-    (FARPROC)BGAlphaBlend = GetProcAddressWithDllName(msimg32_dll,"AlphaBlend");
+	if(pAlphaBlend != NULL)
+	  BGAlphaBlend = pAlphaBlend;
+	else
+	  BGAlphaBlend = AlphaBlendWithoutAPI;
   }
   else {
     BGAlphaBlend = NULL;
   }
 
-  if(!BGAlphaBlend)
-    BGAlphaBlend = AlphaBlendWithoutAPI;
-
-  //EnumDisplayMonitors \x82\xF0\x92T\x82\xB7
-  GetSystemDirectory(user32_dll, sizeof(user32_dll));
-  strncat_s(user32_dll, sizeof(user32_dll), "\\user32.dll", _TRUNCATE);
-  (FARPROC)BGEnumDisplayMonitors = GetProcAddressWithDllName(user32_dll,"EnumDisplayMonitors");
 }
 
 void BGExchangeColor() {
@@ -2810,7 +2795,7 @@
     {
       if(BGReverseTextAlpha < 255)
       {
-        BGBLENDFUNCTION bf;
+        BLENDFUNCTION bf;
         HBRUSH hbr;
 
         hbr = CreateSolidBrush(GetBkColor(hdcBGBuffer));

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2019-03-02 16:18:47 UTC (rev 7456)
+++ trunk/teraterm/teraterm/vtwin.cpp	2019-03-02 16:19:00 UTC (rev 7457)
@@ -78,6 +78,7 @@
 #include "winjump.h"
 #include "sizetip.h"
 #include "dnddlg.h"
+#include "compat_win.h"
 
 #include "initguid.h"
 //#include "Usbiodef.h"
@@ -260,38 +261,6 @@
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
-typedef BOOL(WINAPI *_SetLayeredWindowAttributes)(HWND, COLORREF, BYTE, DWORD);
-static _SetLayeredWindowAttributes g_pSetLayeredWindowAttributes = NULL;
-
-static void MySetLayeredWindowAttributes_init()
-{
-	static HMODULE g_hmodUser32 = NULL;
-	char user32_dll[MAX_PATH];
-
-	GetSystemDirectory(user32_dll, sizeof(user32_dll));
-	strncat_s(user32_dll, sizeof(user32_dll), "\\user32.dll", _TRUNCATE);
-	if (g_hmodUser32 == NULL) {
-		g_hmodUser32 = LoadLibrary(user32_dll);
-		if (g_hmodUser32 == NULL) {
-			return;
-		}
-
-		g_pSetLayeredWindowAttributes =
-			(_SetLayeredWindowAttributes)GetProcAddress(g_hmodUser32, "SetLayeredWindowAttributes");
-	}
-}
-
-static BOOL MySetLayeredWindowAttributes(HWND hwnd, COLORREF crKey, BYTE bAlpha, DWORD dwFlags)
-{
-	if (g_pSetLayeredWindowAttributes == NULL) {
-		return FALSE;
-	}
-
-	return g_pSetLayeredWindowAttributes(hwnd, crKey,
-	                                     bAlpha, dwFlags);
-}
-
-
 // Tera Term\x8BN\x93\xAE\x8E\x9E\x82\xC6URL\x95\xB6\x8E\x9A\x97\xF1mouse over\x8E\x9E\x82ɌĂ΂\xEA\x82\xE9 (2005.4.2 yutaka)
 void SetMouseCursor(char *cursor)
 {
@@ -322,6 +291,9 @@
  */
 void CVTWindow::SetWindowAlpha(BYTE alpha)
 {
+	if (pSetLayeredWindowAttributes == NULL) {
+		return;	// \x83\x8C\x83C\x83\x84\x81[\x83h\x83E\x83C\x83\x93\x83h\x83E\x82̃T\x83|\x81[\x83g\x82Ȃ\xB5
+	}
 	if (Alpha == alpha) {
 		return;	// \x95ω\xBB\x82Ȃ\xB5\x82Ȃ牽\x82\xE0\x82\xB5\x82Ȃ\xA2
 	}
@@ -336,7 +308,7 @@
 	// \x8CĂяo\x82\xB5\x8C\xB3\x82ŁA\x92l\x82\xAA\x95ύX\x82\xB3\x82ꂽ\x82Ƃ\xAB\x82̂ݐݒ\xE8\x82𔽉f\x82\xB7\x82\xE9\x81B(2007.10.19 maya)
 	if (alpha < 255) {
 		::SetWindowLongPtr(HVTWin, GWL_EXSTYLE, lp | WS_EX_LAYERED);
-		MySetLayeredWindowAttributes(HVTWin, 0, alpha, LWA_ALPHA);
+		pSetLayeredWindowAttributes(HVTWin, 0, alpha, LWA_ALPHA);
 	}
 	else {
 		// \x83A\x83\x8B\x83t\x83@\x92l\x82\xAA 255 \x82̏ꍇ\x81A\x93\xA7\x96\xBE\x89\xBB\x91\xAE\x90\xAB\x82\xF0\x8D폜\x82\xB5\x82čĕ`\x89悷\x82\xE9\x81B(2007.10.22 maya)
@@ -684,10 +656,6 @@
 	int fuLoad = LR_DEFAULTCOLOR;
 	BOOL isFirstInstance;
 
-#ifdef _DEBUG
-  ::_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
-#endif
-
 	// \x97\xE1\x8AO\x83n\x83\x93\x83h\x83\x89\x82̃t\x83b\x83N (2007.9.30 yutaka)
 	SetUnhandledExceptionFilter(ApplicationFaultHandler);
 
@@ -786,7 +754,6 @@
 	FirstPaint = TRUE;
 	ScrollLock = FALSE;  // \x8F\x89\x8A\xFA\x92l\x82͖\xB3\x8C\xF8 (2006.11.14 yutaka)
 	Alpha = 255;
-	MySetLayeredWindowAttributes_init();
 
 	/* Initialize scroll buffer */
 	InitBuffer();
@@ -2583,7 +2550,7 @@
 {
 	int line, i;
 
-	if (g_pSetLayeredWindowAttributes != NULL) {
+	if (pSetLayeredWindowAttributes != NULL) {
 		BOOL InTitleBar;
 		POINT point = pt;
 		GetPositionOnWindow(HVTWin, &point,

From scmnotify ＠ osdn.net  Sun Mar  3 16:40:17 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sun, 03 Mar 2019 16:40:17 +0900
Subject: [Ttssh2-commit] [7458] ticket #39007
Message-ID: <1551598817.741701.56017.nullmailer@users.osdn.me>

Revision: 7458
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7458
Author:   zmatsuo
Date:     2019-03-03 16:40:17 +0900 (Sun, 03 Mar 2019)
Log Message:
-----------
ticket #39007
キャレットON時IMEに候補ウィンドウ位置を通知するようにした(従来と同様。ただし、IME ON時のみ)
候補ウィンドウ位置設定時に候補ウィンドウのフォントの設定を行わないようにした。

Ticket Links:
------------
    http://sourceforge.jp/projects/ttssh2/tracker/detail/39007

Modified Paths:
--------------
    trunk/teraterm/teraterm/ttime.c
    trunk/teraterm/teraterm/ttime.h
    trunk/teraterm/teraterm/vtdisp.c

-------------- next part --------------
Modified: trunk/teraterm/teraterm/ttime.c
===================================================================
--- trunk/teraterm/teraterm/ttime.c	2019-03-02 16:19:00 UTC (rev 7457)
+++ trunk/teraterm/teraterm/ttime.c	2019-03-03 07:40:17 UTC (rev 7458)
@@ -186,15 +186,20 @@
   else
     cf.dwStyle = CFS_DEFAULT;
   (*PImmSetCompositionWindow)(hIMC,&cf);
-
-  // Set font for the conversion window
-  (*PImmSetCompositionFont)(hIMC,&lfIME);
   (*PImmReleaseContext)(HVTWin,hIMC);
 }
 
-void SetConversionLogFont(PLOGFONT lf)
+void SetConversionLogFont(HWND HWin, PLOGFONT lf)
 {
+  HIMC	hIMC;
+  if (HIMEDLL == NULL) return;
+
   memcpy(&lfIME,lf,sizeof(LOGFONT));
+
+  hIMC = (*PImmGetContext)(HVTWin);
+  // Set font for the conversion window
+  (*PImmSetCompositionFont)(hIMC,&lfIME);
+  (*PImmReleaseContext)(HVTWin,hIMC);
 }
 
 HGLOBAL GetConvString(UINT wParam, LPARAM lParam)

Modified: trunk/teraterm/teraterm/ttime.h
===================================================================
--- trunk/teraterm/teraterm/ttime.h	2019-03-02 16:19:00 UTC (rev 7457)
+++ trunk/teraterm/teraterm/ttime.h	2019-03-03 07:40:17 UTC (rev 7458)
@@ -38,7 +38,7 @@
 void FreeIME();
 BOOL CanUseIME();
 void SetConversionWindow(HWND HWin, int X, int Y);
-void SetConversionLogFont(PLOGFONT lf);
+void SetConversionLogFont(HWND HWin, PLOGFONT lf);
 BOOL GetIMEOpenStatus(void);
 void SetIMEOpenStatus(BOOL stat);
 

Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c	2019-03-02 16:19:00 UTC (rev 7457)
+++ trunk/teraterm/teraterm/vtdisp.c	2019-03-03 07:40:17 UTC (rev 7458)
@@ -1981,7 +1981,7 @@
   VTFont[0] = CreateFontIndirect(&VTlf);
 
   /* set IME font */
-  SetConversionLogFont(&VTlf);
+  SetConversionLogFont(HVTWin, &VTlf);
 
   TmpDC = GetDC(HVTWin);
 
@@ -2063,7 +2063,7 @@
 		if (ts.UseIME>0)
 		{
 			if (ts.IMEInline>0)
-				SetConversionLogFont(&VTlf);
+				SetConversionLogFont(HVTWin, &VTlf);
 			else
 				SetConversionWindow(HVTWin,-1,0);
 		}
@@ -2219,6 +2219,15 @@
 
 		CaretX = (CursorX-WinOrgX)*FontWidth;
 		CaretY = (CursorY-WinOrgY)*FontHeight;
+
+		if (IMEstat) {
+			// IME ON \x82̏ꍇ\x82݂̂̏\x88\x97\x9D
+			// \x95\xB6\x8E\x9A\x93\xFC\x97͂\xF0\x8AJ\x8En(\x95ϊ\xB7\x83E\x83B\x83\x93\x83h\x83E\x82\xAA\x95\\x8E\xA6\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9)\x8F\xF3\x91Ԃ\xC5
+			// \x83z\x83X\x83g\x82\xA9\x82\xE7\x82̃G\x83R\x81[\x82\xF0\x8E\xF3\x90M\x82\xB5\x82\xC4caret\x88ʒu\x82\xAA\x95ω\xBB\x82\xB5\x82\xBD\x8Fꍇ\x81A
+			// \x95ϊ\xB7\x83E\x83B\x83\x93\x83h\x83E\x82̈ʒu\x82\xF0\x8DX\x90V\x82\xB7\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE9
+			SetConversionWindow(HVTWin,CaretX,CaretY);
+		}
+
 		if (ts.CursorShape!=IdVCur) {
 			if (ts.CursorShape==IdHCur) {
 				CaretY = CaretY+FontHeight-CurWidth;

From scmnotify ＠ osdn.net  Mon Mar  4 01:03:33 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 04 Mar 2019 01:03:33 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0NTldIElNReOBruWAmeijnOOCpuOCow==?=
 =?utf-8?b?44Oz44OJ44Km44Gu5L2N572u6Kit5a6a44KS5pyA5bCP6ZmQ44Gr44GX44Gf?=
Message-ID: <1551629013.415816.17458.nullmailer@users.osdn.me>

Revision: 7459
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7459
Author:   zmatsuo
Date:     2019-03-04 01:03:33 +0900 (Mon, 04 Mar 2019)
Log Message:
-----------
IMEの候補ウィンドウの位置設定を最小限にした

Modified Paths:
--------------
    trunk/doc/ja/html/about/history.html
    trunk/teraterm/teraterm/vtdisp.c
    trunk/teraterm/teraterm/vtdisp.h
    trunk/teraterm/teraterm/vtwin.cpp
    trunk/teraterm/teraterm/vtwin.h

-------------- next part --------------
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2019-03-03 07:40:17 UTC (rev 7458)
+++ trunk/doc/ja/html/about/history.html	2019-03-03 16:03:33 UTC (rev 7459)
@@ -33,6 +33,12 @@
 
 <h3 id="teraterm_4.103">2019.xx.xx (Ver 4.103)</h3>
 <ul class="history">
+  <li>\x83o\x83O\x8FC\x90\xB3
+    <ul>
+      <li>IME\x82̕ϊ\xB7\x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82̕\\x8E\xA6\x88ʒu\x82\xF0\x83J\x81[\x83\\x83\x8B\x88ʒu\x82ɒǏ]\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B(4.102\x82̍\x82\x91\xAC\x89\xBB\x82̉e\x8B\xBF)</li>
+    </ul>
+  </li>
+
   <li>\x82\xBB\x82̑\xBC
     <ul>
       <li><a href="#ttssh_2.89">TTSSH(2.89)</a>\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li>

Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c	2019-03-03 07:40:17 UTC (rev 7458)
+++ trunk/teraterm/teraterm/vtdisp.c	2019-03-03 16:03:33 UTC (rev 7459)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2005-2018 TeraTerm Project
+ * (C) 2005-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -111,7 +111,8 @@
 // caret variables
 static int CaretStatus;
 static BOOL CaretEnabled = TRUE;
-BOOL IMEstat;		/* IME Status  TRUE=IME ON */
+BOOL IMEstat;				/* IME Status  TRUE=IME ON */
+BOOL IMEShowingCandidate;	/* \x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x95\\x8E\xA6\x8F\xF3\x8B\xB5 TRUE=\x95\\x8E\xA6\x92\x86 */
 
 // ---- device context and status flags
 static HDC VTDC = NULL; /* Device context for VT window */
@@ -2220,9 +2221,9 @@
 		CaretX = (CursorX-WinOrgX)*FontWidth;
 		CaretY = (CursorY-WinOrgY)*FontHeight;
 
-		if (IMEstat) {
-			// IME ON \x82̏ꍇ\x82݂̂̏\x88\x97\x9D
-			// \x95\xB6\x8E\x9A\x93\xFC\x97͂\xF0\x8AJ\x8En(\x95ϊ\xB7\x83E\x83B\x83\x93\x83h\x83E\x82\xAA\x95\\x8E\xA6\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9)\x8F\xF3\x91Ԃ\xC5
+		if (IMEstat && IMEShowingCandidate) {
+			// IME ON && \x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x95\\x8E\xA6\x92\x86\x82̏ꍇ\x82݂̂̏\x88\x97\x9D
+			// \x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82\xAA\x95\\x8E\xA6\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x8F\xF3\x91Ԃ\xC5
 			// \x83z\x83X\x83g\x82\xA9\x82\xE7\x82̃G\x83R\x81[\x82\xF0\x8E\xF3\x90M\x82\xB5\x82\xC4caret\x88ʒu\x82\xAA\x95ω\xBB\x82\xB5\x82\xBD\x8Fꍇ\x81A
 			// \x95ϊ\xB7\x83E\x83B\x83\x93\x83h\x83E\x82̈ʒu\x82\xF0\x8DX\x90V\x82\xB7\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE9
 			SetConversionWindow(HVTWin,CaretX,CaretY);

Modified: trunk/teraterm/teraterm/vtdisp.h
===================================================================
--- trunk/teraterm/teraterm/vtdisp.h	2019-03-03 07:40:17 UTC (rev 7458)
+++ trunk/teraterm/teraterm/vtdisp.h	2019-03-03 16:03:33 UTC (rev 7459)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2008-2017 TeraTerm Project
+ * (C) 2008-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -128,6 +128,7 @@
 extern TCharAttr DefCharAttr;
 
 extern BOOL IMEstat;
+extern BOOL IMEShowingCandidate;
 
 #define SCROLL_BOTTOM	1
 #define SCROLL_LINEDOWN	2

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2019-03-03 07:40:17 UTC (rev 7458)
+++ trunk/teraterm/teraterm/vtwin.cpp	2019-03-03 16:03:33 UTC (rev 7459)
@@ -161,6 +161,7 @@
 	ON_WM_VSCROLL()
 	ON_WM_DEVICECHANGE()
 	ON_MESSAGE(WM_IME_STARTCOMPOSITION,OnIMEStartComposition)
+	ON_MESSAGE(WM_IME_ENDCOMPOSITION,OnIMEEndComposition)
 	ON_MESSAGE(WM_IME_COMPOSITION,OnIMEComposition)
 	ON_MESSAGE(WM_INPUTLANGCHANGE,OnIMEInputChange)
 	ON_MESSAGE(WM_IME_NOTIFY,OnIMENotify)
@@ -3199,6 +3200,8 @@
 
 LRESULT CVTWindow::OnIMEStartComposition(WPARAM wParam, LPARAM lParam)
 {
+	IMEShowingCandidate = TRUE;
+
 	// \x88ʒu\x82\xF0\x92ʒm\x82\xB7\x82\xE9
 	int CaretX = (CursorX-WinOrgX)*FontWidth;
 	int CaretY = (CursorY-WinOrgY)*FontHeight;
@@ -3207,6 +3210,12 @@
 	return CFrameWnd::DefWindowProc(WM_IME_STARTCOMPOSITION,wParam,lParam);
 }
 
+LRESULT CVTWindow::OnIMEEndComposition(WPARAM wParam, LPARAM lParam)
+{
+	IMEShowingCandidate = FALSE;
+	return CFrameWnd::DefWindowProc(WM_IME_ENDCOMPOSITION,wParam,lParam);
+}
+
 LRESULT CVTWindow::OnIMEComposition(WPARAM wParam, LPARAM lParam)
 {
 	HGLOBAL hstr;
@@ -3274,7 +3283,10 @@
 
 LONG CVTWindow::OnIMENotify(UINT wParam, LONG lParam)
 {
-	if (wParam == IMN_SETOPENSTATUS) {
+	switch (wParam) {
+	case IMN_SETOPENSTATUS: {
+		// \x93\xFC\x97̓R\x83\x93\x83e\x83L\x83X\x83g\x82̊J\x95\xF3\x91Ԃ\xAA\x8DX\x90V\x82\xB3\x82\xEA\x82\xE9(IME On/OFF)
+
 		// IME\x82\xCCOn/Off\x82\xF0\x8E擾\x82\xB7\x82\xE9
 		IMEstat = GetIMEOpenStatus();
 
@@ -3285,8 +3297,32 @@
 
 		// \x95`\x89\xE6
 		ChangeCaret();
+
+		break;
 	}
 
+	// \x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82̕\\x8E\xA6\x8F󋵒ʒm
+	// IME_OPENCANDIDATE / IMN_CLOSECANDIDATE \x83T\x83|\x81[\x83g\x8F\xF3\x8B\xB5
+	//
+	//  IME								status
+	//  --------------------------------+----------
+	//  MS IME \x93\xFA\x96{\x8C\xEA(Windows 10 1809)	suport
+	//  Google \x93\xFA\x96{\x8C\xEA\x93\xFC\x97\xCD(2.24.3250.0)	not support
+	//
+	// WM_IME_STARTCOMPOSITION, WM_IME_ENDCOMPOSITION\x82݂̂Ŕ\xBB\x92\xE8\x89”\\x82\xBE\x82\xAA
+	// \x94O\x82ׂ̈\xB1\x82̃\x81\x83b\x83Z\x81[\x83W\x82\xE0\x8F\x88\x97\x9D\x82\xB7\x82\xE9
+	case IMN_OPENCANDIDATE:
+		// \x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8AJ\x82\xB1\x82\xA4\x82Ƃ\xB5\x82Ă\xA2\x82\xE9
+		IMEShowingCandidate = TRUE;
+		break;
+	case IMN_CLOSECANDIDATE:
+		// \x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x95‚\xB6\x82悤\x82Ƃ\xB5\x82Ă\xA2\x82\xE9
+		IMEShowingCandidate = FALSE;
+		break;
+	default:
+		break;
+	}
+
 	return CFrameWnd::DefWindowProc(WM_IME_NOTIFY,wParam,lParam);
 }
 

Modified: trunk/teraterm/teraterm/vtwin.h
===================================================================
--- trunk/teraterm/teraterm/vtwin.h	2019-03-03 07:40:17 UTC (rev 7458)
+++ trunk/teraterm/teraterm/vtwin.h	2019-03-03 16:03:33 UTC (rev 7459)
@@ -136,6 +136,7 @@
 	afx_msg LONG  OnExitSizeMove(UINT wParam, LONG lParam);
 //-->
 	afx_msg LRESULT OnIMEStartComposition(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnIMEEndComposition(WPARAM wParam, LPARAM lParam);
 	afx_msg LONG OnIMEComposition(UINT wParam, LONG lParam);
 	afx_msg LONG OnIMEInputChange(UINT wParam, LONG lParam);
 	afx_msg LONG OnIMENotify(UINT wParam, LONG lParam);

From scmnotify ＠ osdn.net  Tue Mar  5 16:51:04 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Tue, 05 Mar 2019 16:51:04 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0NjBdIOWkieabtOWxpeattOS/ruatow==?=
Message-ID: <1551772264.366219.53802.nullmailer@users.osdn.me>

Revision: 7460
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7460
Author:   maya
Date:     2019-03-05 16:51:03 +0900 (Tue, 05 Mar 2019)
Log Message:
-----------
変更履歴修正

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2019-03-03 16:03:33 UTC (rev 7459)
+++ trunk/doc/en/html/about/history.html	2019-03-05 07:51:03 UTC (rev 7460)
@@ -33,6 +33,12 @@
 
 <h3 id="teraterm_4.103">2019.xx.xx (Ver 4.103)</h3>
 <ul class="history">
+  <li>Bug fixes
+    <ul>
+      <li><!--IME\x82̕ϊ\xB7\x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82̕\\x8E\xA6\x88ʒu\x82\xAA\x83J\x81[\x83\\x83\x8B\x88ʒu\x82ɒǏ]\x82\xB5\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B-->This bus was introduced in 4.102.</li>
+    </ul>
+  </li>
+
   <li>Misc
     <ul>
       <li>upgraded TTSSH to <a href="#ttssh_2.89">2.89</a>.</li>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2019-03-03 16:03:33 UTC (rev 7459)
+++ trunk/doc/ja/html/about/history.html	2019-03-05 07:51:03 UTC (rev 7460)
@@ -35,7 +35,7 @@
 <ul class="history">
   <li>\x83o\x83O\x8FC\x90\xB3
     <ul>
-      <li>IME\x82̕ϊ\xB7\x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82̕\\x8E\xA6\x88ʒu\x82\xF0\x83J\x81[\x83\\x83\x8B\x88ʒu\x82ɒǏ]\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B(4.102\x82̍\x82\x91\xAC\x89\xBB\x82̉e\x8B\xBF)</li>
+      <li>IME\x82̕ϊ\xB7\x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82̕\\x8E\xA6\x88ʒu\x82\xAA\x83J\x81[\x83\\x83\x8B\x88ʒu\x82ɒǏ]\x82\xB5\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B4.102\x82ł̃G\x83\x93\x83o\x83O\x81B</li>
     </ul>
   </li>
 

From scmnotify ＠ osdn.net  Wed Mar  6 01:22:05 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Wed, 06 Mar 2019 01:22:05 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0NjFdIOS4gOmDqOOBrnVuaWNvZGXjgYw=?=
 =?utf-8?b?44GG44G+44GP6KGo56S644Gn44GN44Gq44GP44Gq44Gj44Gf44Gf44KB5a++?=
 =?utf-8?b?562W?=
Message-ID: <1551802925.579787.141888.nullmailer@users.osdn.me>

Revision: 7461
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7461
Author:   zmatsuo
Date:     2019-03-06 01:22:05 +0900 (Wed, 06 Mar 2019)
Log Message:
-----------
一部のunicodeがうまく表示できなくなったため対策
U+2014 EM DASH
U+2016 DOUBLE VERTICAL LINE
U+203E OVERLINE
U+2212 MINUS SIGN
U+301C WAVE DASH

Modified Paths:
--------------
    trunk/teraterm/teraterm/vtterm.c

-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2019-03-05 07:51:03 UTC (rev 7460)
+++ trunk/teraterm/teraterm/vtterm.c	2019-03-05 16:22:05 UTC (rev 7461)
@@ -5486,6 +5486,10 @@
 
 	// Unicode -> \x93\xE0\x95\x94\x83R\x81[\x83h(ts.CodePage)\x82֕ϊ\xB7\x82\xB5\x82ďo\x97\xCD
 	ret = WideCharToMultiByte(ts.CodePage, 0, &wchar, 1, mbchar, 2, NULL, NULL);
+	if (ret == 1 && mbchar[0] == '?' && code != '?') {
+		// \x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD\x82Ƃ\xAB\x81Aret=1, '?' \x82\xF0\x95Ԃ\xB5\x82Ă\xAD\x82\xE9
+		ret = 0;
+	}
 	switch (ret) {
 	case 0:
 		if (ts.CodePage == 932) {

From scmnotify ＠ osdn.net  Sun Mar 10 02:32:42 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sun, 10 Mar 2019 02:32:42 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0NjJdIHVuaWNvZGXplqLpgKPjgpJjb2Rl?=
 =?utf-8?b?Y29udi5j44Gr6ZuG44KB44Gf?=
Message-ID: <1552152762.933780.90560.nullmailer@users.osdn.me>

Revision: 7462
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7462
Author:   zmatsuo
Date:     2019-03-10 02:32:42 +0900 (Sun, 10 Mar 2019)
Log Message:
-----------
unicode関連をcodeconv.cに集めた
CP932へ/からの変換を関数に分離(UTF32ToCP932(), UTF32ToCP932())
unicodeからDEC特殊文字変換を関数に分離(UTF32ToDecSp())
SJIS2UTF8() (内部コードからUTF-8へ出力)を language.c から ttcmn.c に移動
_WideCharToMultiByte(), _MultiByteToWideChar() の変換した文字数の戻り値修正
UTF32ToMBCP()追加
UTF32_CP932()追加
MBCPToUTF32()追加
WideCharToUTF8(), WideCharToCP932() の仕様を変更
変換テーブルとWindows APIをつかったコード変換の優先順位を変更できるようにした

Modified Paths:
--------------
    trunk/teraterm/common/codeconv.cpp
    trunk/teraterm/common/codeconv.h
    trunk/teraterm/teraterm/CMakeLists.txt
    trunk/teraterm/teraterm/vtterm.c
    trunk/teraterm/ttpcmn/language.c
    trunk/teraterm/ttpcmn/language.h
    trunk/teraterm/ttpcmn/ttcmn.c

-------------- next part --------------
Modified: trunk/teraterm/common/codeconv.cpp
===================================================================
--- trunk/teraterm/common/codeconv.cpp	2019-03-05 16:22:05 UTC (rev 7461)
+++ trunk/teraterm/common/codeconv.cpp	2019-03-09 17:32:42 UTC (rev 7462)
@@ -26,14 +26,21 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+/* unicode\x8A֘A\x82̕\xB6\x8E\x9A\x83R\x81[\x83h\x95ϊ\xB7 */
+
 #include <windows.h>
 #include <string.h>
+#include <assert.h>
 #include <crtdbg.h>
 #if (defined(_MSC_VER) && (_MSC_VER >= 1600)) || !defined(_MSC_VER)
 #include <stdint.h>
 #endif
+#include "codemap.h"
 #include "codeconv.h"
 
+// cp932\x95ϊ\xB7\x8E\x9E\x81AWindows API \x82\xE6\x82\xE8 Tera Term \x82̕ϊ\xB7\x83e\x81[\x83u\x83\x8B\x82\xF0\x97D\x90悷\x82\xE9
+//#define PRIORITY_CP932_TABLE
+
 #if defined(_MSC_VER) && (_MSC_VER < 1600)
 typedef unsigned char	uint8_t;
 typedef unsigned short  uint16_t;
@@ -47,12 +54,158 @@
 #define _wcsdup(s)    _wcsdup_dbg((s), _NORMAL_BLOCK, __FILE__, __LINE__)
 #endif
 
+/*
+ *	\x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA2\x8Fꍇ\x82\xCD 0 \x82\xF0\x95Ԃ\xB7
+ */
+static unsigned short _ConvertUnicode(unsigned short code, const codemap_t *table, int tmax)
+{
+	int low, mid, high;
+	unsigned short result;
+
+	low = 0;
+	high = tmax - 1;
+	result = 0; // convert error
+
+	// binary search
+	while (low < high) {
+		mid = (low + high) / 2;
+		if (table[mid].from_code < code) {
+			low = mid + 1;
+		} else {
+			high = mid;
+		}
+	}
+
+	if (table[low].from_code == code) {
+		result = table[low].to_code;
+	}
+
+	return (result);
+}
+
+static int IsHighSurrogate(wchar_t u16)
+{
+	return 0xd800 <= u16 && u16 < 0xdc00;
+}
+
+static int IsLowSurrogate(wchar_t u16)
+{
+	return 0xdc00 <= u16 && u16 < 0xe000;
+}
+
 /**
- * UTF-32 \x82\xA9\x82\xE7 UTF-8 \x82֕ϊ\xB7\x82\xB7\x82\xE9
+ *	1\x95\xB6\x8E\x9A\x82Ƃ\xB5\x82Ĉ\xB5\x82\xA4\x82\xBD\x82߂ɁA\x95K\x97v\x82ȃL\x83\x83\x83\x89\x83N\x83^\x90\x94\x82𓾂\xE9
+ *	@retval	0	\x95\xB6\x8E\x9A\x82Ƃ\xB5\x82Ĉ\xB5\x82\xA6\x82Ȃ\xA2(\x95\xB6\x8E\x9A\x83R\x81[\x83h\x82\xAA\x82\xA8\x82\xA9\x82\xB5\x82\xA2)
+ *	@retval	1	1\x83L\x83\x83\x83\x89\x83N\x83^\x82\xC51\x95\xB6\x8E\x9A\x82Ƃ\xB5\x82Ĉ\xB5\x82\xA6\x82\xE9
+ *	@retval	2	2\x83L\x83\x83\x83\x89\x83N\x83^\x82\xC51\x95\xB6\x8E\x9A\x82Ƃ\xB5\x82Ĉ\xB5\x82\xA6\x82\xE9
+ */
+#if 0
+static size_t UTF16GetCharCount(const wchar_t *wstr_ptr, size_t wstr_len)
+{
+	wchar_t u16;
+	assert(wstr_ptr != NULL);
+	if (wstr_len == 0) {
+		return 0;
+	}
+	u16 = *wstr_ptr++;
+	if (IsHighSurrogate(u16)) {
+		if (wstr_len >= 2) {
+			const wchar_t u16_lo = *wstr_ptr++;
+			if (IsLowSurrogate(u16_lo)) {
+				return 2;
+			} else {
+				return 0;
+			}
+		} else {
+			return 0;
+		}
+	} else if (IsLowSurrogate(u16)) {
+		return 0;
+	}
+	return 1;
+}
+#endif
+
+/**
+ *	code page \x82\xCC mulit byte \x95\xB6\x8E\x9A\x82\xF0 UTF-32\x82֕ϊ\xB7\x82\xB7\x82\xE9
+ *	@param KCode	\x83}\x83\x8B\x83`\x83o\x83C\x83g\x82̕\xB6\x8E\x9A\x83R\x81[\x83h(0x0000-0xffff)
+ *	@param CoePage	\x83}\x83\x8B\x83`\x83o\x83C\x83g\x82̃R\x81[\x83h\x83y\x81[\x83W
+ *	@retval			unicode(UTF-32\x95\xB6\x8E\x9A\x83R\x81[\x83h)
+ */
+unsigned int MBCPToUTF32(unsigned short KCode, int CodePage)
+{
+	unsigned int c;
+
+	if (CodePage == 932) {
+		c = CP932ToUTF32(KCode);
+	} else {
+		char buf[3];
+		wchar_t wchar;
+		int ret;
+		int len = 0;
+		if (KCode < 0x100) {
+			buf[0] = KCode & 0xff;
+			len = 1;
+		} else {
+			buf[0] = KCode >> 8;
+			buf[1] = KCode & 0xff;
+			len = 2;
+		}
+		ret = MultiByteToWideChar(CodePage, MB_ERR_INVALID_CHARS, buf, len, &wchar, 1);
+		if (ret <= 0) {
+			c = 0;
+		} else {
+			c = (unsigned int)wchar;
+		}
+	}
+	return c;
+}
+
+/**
+ *	wchar_t\x95\xB6\x8E\x9A\x97񂩂\xE7unicode(UTF-32)\x82\xF01\x95\xB6\x8E\x9A\x8E\xE6\x82\xE8\x8Fo\x82\xB7
+ *	@retval	0	\x95\xB6\x8E\x9A\x82Ƃ\xB5\x82Ĉ\xB5\x82\xA6\x82Ȃ\xA2(\x95\xB6\x8E\x9A\x83R\x81[\x83h\x82\xAA\x82\xA8\x82\xA9\x82\xB5\x82\xA2)
+ *	@retval	1	1\x83L\x83\x83\x83\x89\x83N\x83^\x82\xC51\x95\xB6\x8E\x9A\x82Ƃ\xB5\x82Ĉ\xB5\x82\xA6\x82\xE9
+ *	@retval	2	2\x83L\x83\x83\x83\x89\x83N\x83^\x82\xC51\x95\xB6\x8E\x9A\x82Ƃ\xB5\x82Ĉ\xB5\x82\xA6\x82\xE9
+ */
+size_t UTF16ToUTF32(const wchar_t *wstr_ptr, size_t wstr_len, unsigned int *u32)
+{
+	assert(wstr_ptr != NULL);
+	if (wstr_len == 0) {
+		*u32 = 0;
+		return 0;
+	}
+	const wchar_t u16 = *wstr_ptr++;
+	// \x83T\x83\x8D\x83Q\x81[\x83g high?
+	if (IsHighSurrogate(u16)) {
+		if (wstr_len >= 2) {
+			const wchar_t u16_lo = *wstr_ptr++;
+			if (IsLowSurrogate(u16_lo)) {
+				// \x83T\x83\x8D\x83Q\x81[\x83g\x83y\x83A \x83f\x83R\x81[\x83h
+				*u32 = 0x10000 + (u16 - 0xd800) * 0x400 + (u16_lo - 0xdc00);
+				return 2;
+			} else {
+				*u32 = 0;
+				return 0;
+			}
+		} else {
+			*u32 = 0;
+			return 0;
+		}
+	} else if (IsLowSurrogate(u16)) {
+		*u32 = 0;
+		return 0;
+	} else {
+		*u32 = u16;
+		return 1;
+	}
+}
+
+/**
+ * UTF-32\x95\xB6\x8E\x9A \x82\xA9\x82\xE7 UTF-8 \x82֕ϊ\xB7\x82\xB7\x82\xE9
  * @param[in]		u32		\x95ϊ\xB7\x82\xB7\x82\xE9UTF-32
  * @param[in,out]	u8_ptr	\x95ϊ\xB7\x8C\xE3UTF-8\x95\xB6\x8E\x9A\x97\xF1\x8Fo\x97͐\xE6(NULL\x82̂Ƃ\xAB\x8Fo\x97͂\xB5\x82Ȃ\xA2)
  * @param[in]		u8_len	UTF-8\x8Fo\x97͐敶\x8E\x9A\x90\x94(\x83o\x83b\x83t\x83@\x92\xB7,byte\x90\x94)
- * @retval			\x8Eg\x97p\x82\xB5\x82\xBDutf8\x95\xB6\x8E\x9A\x90\x94(byte\x90\x94\x81j
+ * @retval			\x8Fo\x97͂\xB5\x82\xBDutf8\x95\xB6\x8E\x9A\x90\x94(byte\x90\x94\x81j
  *					0=\x83G\x83\x89\x81[
  */
 size_t UTF32ToUTF8(uint32_t u32, char *u8_ptr_, size_t u8_len)
@@ -113,7 +266,7 @@
  * @param[in]	u8_len	UTF-8\x95\xB6\x8E\x9A\x97񒷂\xB3
  * @param[out]	u32		\x95ϊ\xB7\x82\xB5\x82\xBDUTF-32\x95\xB6\x8E\x9A
  * @retval		\x8Eg\x97p\x82\xB5\x82\xBDUTF-8\x95\xB6\x8E\x9A\x90\x94(byte\x90\x94\x81j
- *				0=\x83G\x83\x89\x81[
+ *				0=\x83G\x83\x89\x81[(\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD)
  */
 size_t UTF8ToUTF32(const char *u8_ptr_, size_t u8_len, uint32_t *u32_)
 {
@@ -191,33 +344,286 @@
 	return u8_in;
 }
 
-// WideCharToMultiByte\x82\xCCUTF8\x93\xC1\x89\xBB\x94\xC5
-int WideCharToUTF8(const wchar_t *wstr_ptr, int wstr_len, char *u8_ptr, int u8_len)
+/**
+ * UTF-32 \x82\xA9\x82\xE7 UTF-16 \x82֕ϊ\xB7\x82\xB7\x82\xE9
+ * @param[in]		u32			\x95ϊ\xB7\x82\xB7\x82\xE9UTF-32
+ * @param[in,out]	wstr_ptr	\x95ϊ\xB7\x8C\xE3UTF-16\x95\xB6\x8E\x9A\x97\xF1\x8Fo\x97͐\xE6(NULL\x82̂Ƃ\xAB\x8Fo\x97͂\xB5\x82Ȃ\xA2)
+ * @param[in]		wstr_len	UTF-16\x8Fo\x97͐敶\x8E\x9A\x90\x94(\x95\xB6\x8E\x9A\x90\x94,sizeof(wchar_t)*wstr_len bytes)
+ * @retval			\x8Fo\x97͂\xB5\x82\xBDUTF-16\x95\xB6\x8E\x9A\x90\x94(sizeof(wchar_t)\x94{\x82\xB7\x82\xE9\x82\xC6byte\x90\x94)
+ *					0=\x83G\x83\x89\x81[(\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD)
+ */
+size_t UTF32ToUTF16(uint32_t u32, wchar_t *wstr_ptr, size_t wstr_len)
 {
-	int u8_out_sum = 0;
-	if (u8_ptr == NULL) {
-		u8_len = 4;
+	size_t u16_out;
+	if (u32 < 0x10000) {
+		if (wstr_len >= 1) {
+			if (wstr_ptr != NULL) {
+				*wstr_ptr++ = (uint16_t)u32;
+			}
+			u16_out = 1;
+		} else {
+			u16_out = 0;
+		}
+	} else if (u32 <= 0x10ffff) {
+		if (wstr_len >= 2) {
+			if (wstr_ptr != NULL) {
+				// \x83T\x83\x8D\x83Q\x81[\x83g \x83G\x83\x93\x83R\x81[\x83h
+				*wstr_ptr++ = uint16_t((u32 - 0x10000) / 0x400) + 0xd800;
+				*wstr_ptr++ = uint16_t((u32 - 0x10000) % 0x400) + 0xdc00;
+			}
+			u16_out = 2;
+		} else {
+			u16_out = 0;
+		}
 	} else {
-		if (u8_len == 0) {
-			return 0;
+		u16_out = 0;
+	}
+	return u16_out;
+}
+
+/**
+ * UTF-32\x95\xB6\x8E\x9A\x82\xF0CP932\x95\xB6\x8E\x9A(Shift_JIS) 1\x95\xB6\x8E\x9A\x82֕ϊ\xB7\x82\xB7\x82\xE9
+ * @retval		\x8Eg\x97p\x82\xB5\x82\xBDCP932\x95\xB6\x8E\x9A
+ *				0=\x83G\x83\x89\x81[(\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD)
+ */
+unsigned short UTF32_CP932(unsigned int u32)
+{
+#include "../teraterm/uni2sjis.map"		// mapUnicodeToSJIS[]
+	char mbstr[2];
+	unsigned short mb;
+	DWORD mblen;
+	wchar_t u16_str[2];
+	size_t u16_len;
+
+	if (u32 < 0x80) {
+		return (unsigned short)u32;
+	}
+
+#if defined(PRIORITY_CP932_TABLE)
+	if (u32 < 0x10000) {
+		wchar_t u16 = (wchar_t)u32;
+		// Tera Term\x82̕ϊ\xB7\x83e\x81[\x83u\x83\x8B\x82\xC5 Unicode -> Shift_JIS\x82֕ϊ\xB7
+		mb = _ConvertUnicode(u16, mapUnicodeToSJIS, _countof(mapUnicodeToSJIS));
+		if (mb != 0) {
+			// \x95ϊ\xB7\x82ł\xAB\x82\xBD
+			return mb;
 		}
 	}
-	if (wstr_len < 0) {
+#endif
+	u16_len = UTF32ToUTF16(u32, u16_str, 2);
+	if (u16_len == 0) {
+		return 0;
+	}
+	mblen = WideCharToMultiByte(932, 0, u16_str, (int)u16_len, mbstr, 2, NULL, NULL);
+	switch (mblen) {
+	case 0:
+	case 1:
+	default:
+		if (mblen == 0 || mbstr[0] == '?') {
+			goto next_convert;
+		} else {
+			mb = (unsigned char)mbstr[0];
+			return mb;
+		}
+	case 2:
+		if (mbstr[0] == '?' && mbstr[1] == '?') {
+			// 2byte\x8Fo\x97\xCD && "??" \x82̏ꍇ\x82͕ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD
+			goto next_convert;
+		}
+		mb = (((unsigned char)mbstr[0]) << 8) | (unsigned char)mbstr[1];
+		return mb;
+	}
+
+next_convert:
+#if !defined(PRIORITY_CP932_TABLE)
+	if (u32 < 0x10000) {
+		wchar_t u16 = (wchar_t)u32;
+		// Tera Term\x82̕ϊ\xB7\x83e\x81[\x83u\x83\x8B\x82\xC5 Unicode -> Shift_JIS\x82֕ϊ\xB7
+		mb = _ConvertUnicode(u16, mapUnicodeToSJIS, _countof(mapUnicodeToSJIS));
+		if (mb != 0) {
+			// \x95ϊ\xB7\x82ł\xAB\x82\xBD
+			return mb;
+		}
+	}
+#endif
+	return 0;
+}
+
+/**
+ * CP932\x95\xB6\x8E\x9A(Shift_JIS) 1\x95\xB6\x8E\x9A\x82\xA9\x82\xE7UTF-32\x82֕ϊ\xB7\x82\xB7\x82\xE9
+ * @param[in]		cp932		CP932\x95\xB6\x8E\x9A
+ * @retval			\x95ϊ\xB7\x82\xB5\x82\xBDUTF-32\x95\xB6\x8E\x9A\x90\x94
+ *					0=\x83G\x83\x89\x81[(\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD)
+ */
+unsigned int CP932ToUTF32(unsigned short cp932)
+{
+#include "../ttpcmn/sjis2uni.map"		// mapSJISToUnicode[]
+	wchar_t wchar;
+	int ret;
+	unsigned int u32;
+	unsigned char buf[2];
+	int len = 0;
+
+#if defined(PRIORITY_CP932_TABLE)
+	u32 = _ConvertUnicode(cp932, mapSJISToUnicode, sizeof(mapSJISToUnicode)/sizeof(mapSJISToUnicode[0]));
+	if (u32 != 0) {
+		return u32;
+	}
+#endif
+	if (cp932 < 0x100) {
+		buf[0] = cp932 & 0xff;
+		len = 1;
+	} else {
+		buf[0] = cp932 >> 8;
+		buf[1] = cp932 & 0xff;
+		len = 2;
+	}
+	ret = MultiByteToWideChar(932, MB_ERR_INVALID_CHARS, (char *)buf, len, &wchar, 1);
+	if (ret <= 0) {
+		// MultiByteToWideChar()\x82\xAA\x95ϊ\xB7\x8E\xB8\x94s
+#if !defined(PRIORITY_CP932_TABLE)
+		u32 = _ConvertUnicode(cp932, mapSJISToUnicode, sizeof(mapSJISToUnicode)/sizeof(mapSJISToUnicode[0]));
+		// \x83e\x81[\x83u\x83\x8B\x82ɂ\xE0\x82Ȃ\xA9\x82\xC1\x82\xBD\x8Fꍇ c = 0(\x95ϊ\xB7\x8E\xB8\x94s\x8E\x9E)
+#else
+		u32 = 0;
+#endif
+	} else {
+		u32 = (unsigned int)wchar;
+	}
+
+	return u32;
+}
+
+/**
+ * Unicode\x82\xA9\x82\xE7DEC\x93\xC1\x8Eꕶ\x8E\x9A\x82֕ϊ\xB7
+ * @param	u32			UTF-32\x95\xB6\x8E\x9A\x83R\x81[\x83h
+ * @return	\x89\xBA\x88\xCA8bit	DEC\x93\xC1\x8Eꕶ\x8E\x9A\x83R\x81[\x83h
+ *			\x8F\xE3\x88\xCA8bit	\x95\xB6\x8E\x9A\x83R\x81[\x83h\x8E\xED\x95\xCA (1,2,4)
+ *						file://../../doc/ja/html/setup/teraterm-term.html \x8EQ\x8F\xC6
+ *			0			\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD
+ */
+unsigned short UTF32ToDecSp(unsigned int u32)
+{
+#include "../teraterm/unisym2decsp.map"		// mapUnicodeSymbolToDecSp[]
+	unsigned short cset;
+	if (u32 > 0x10000) {
+		cset = 0;
+	} else {
+		const unsigned short u16 = (unsigned short)u32;
+		cset = _ConvertUnicode(u16, mapUnicodeSymbolToDecSp, _countof(mapUnicodeSymbolToDecSp));
+	}
+	return cset;
+}
+
+/**
+ * UTF-32 \x82\xA9\x82\xE7 CP932 \x82֕ϊ\xB7\x82\xB7\x82\xE9
+ * @param[in]		u32			\x95ϊ\xB7\x82\xB7\x82\xE9UTF-32
+ * @param[in,out]	mb_ptr		\x95ϊ\xB7\x8C\xE3CP932\x95\xB6\x8E\x9A\x97\xF1\x8Fo\x97͐\xE6(NULL\x82̂Ƃ\xAB\x8Fo\x97͂\xB5\x82Ȃ\xA2)
+ * @param[in]		mb_len		CP932\x8Fo\x97͐敶\x8E\x9A\x90\x94(\x95\xB6\x8E\x9A\x90\x94,sizeof(wchar_t)*wstr_len bytes)
+ * @retval			\x8Fo\x97͂\xB5\x82\xBDCP932\x95\xB6\x8E\x9A\x90\x94(byte\x90\x94)
+ *					0=\x83G\x83\x89\x81[(\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD)
+ */
+size_t UTF32ToCP932(uint32_t u32, char *mb_ptr, size_t mb_len)
+{
+	size_t cp932_out;
+	const uint16_t cp932 = UTF32_CP932(u32);
+	if (cp932 == 0 && u32 != 0) {
+		return 0;
+	}
+	if (mb_ptr == NULL) {
+		mb_len = 2;
+	}
+	if (cp932 < 0x100) {
+		if (mb_len >= 1) {
+			if (mb_ptr != NULL) {
+				*mb_ptr = cp932 & 0xff;
+			}
+			cp932_out = 1;
+		} else {
+			cp932_out = 0;
+		}
+	} else {
+		if (mb_len >= 2) {
+			if (mb_ptr != NULL) {
+				mb_ptr[0] = (cp932 >> 8) & 0xff;
+				mb_ptr[1] = cp932 & 0xff;
+			}
+			cp932_out = 2;
+		} else {
+			cp932_out = 0;
+		}
+	}
+	return cp932_out;
+}
+
+size_t UTF32ToMBCP(unsigned int u32, int code_page, char *mb_ptr, size_t mb_len)
+{
+	wchar_t u16_str[2];
+	size_t u16_len;
+	u16_len = UTF32ToUTF16(u32, u16_str, 2);
+	if (u16_len == 0) {
+		return 0;
+	}
+	mb_len = WideCharToMultiByte(code_page, 0, u16_str, u16_len, mb_ptr, mb_len, NULL, NULL);
+	if (mb_len == 1 && mb_ptr[0] == '?' && u32 != '?') {
+		// \x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD\x82Ƃ\xAB\x81A\x96߂\xE8\x92l=1, \x95\xB6\x8E\x9A[0]='?' \x82\xF0\x95Ԃ\xB5\x82Ă\xAD\x82\xE9
+		mb_len = 0;
+	}
+	return mb_len;
+}
+
+/**
+ *	wchar_t(UTF-16)\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x83}\x83\x8B\x83`\x83o\x83C\x83g\x82ɕϊ\xB7\x82\xB7\x82\xE9
+ *
+ *	@param[in]		*wstr_ptr	wchar_t\x95\xB6\x8E\x9A\x97\xF1
+ *	@param[in,out]	*wstr_len	wchar_t\x95\xB6\x8E\x9A\x97\xF1\x92\xB7
+ *								NULL\x82܂\xBD\x82\xCD0\x82̂Ƃ\xAB\x8E\xA9\x93\xAE\x81AL'\0'\x82Ń^\x81[\x83~\x83l\x81[\x83g\x82\xB7\x82邱\x82\xC6)
+ *								NULL\x88ȊO\x82̂Ƃ\xAB\x93\xFC\x97͂\xB5\x82\xBD\x95\xB6\x8E\x9A\x90\x94\x82\xF0\x95Ԃ\xB7
+ *	@param[in]		*mb_ptr		\x95ϊ\xB7\x82\xB5\x82\xBD\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x8E\xFB\x94[\x82\xB7\x82\xE9\x83|\x83C\x83\x93\x83^
+ *								(NULL\x82̂Ƃ\xAB\x95ϊ\xB7\x82\xB9\x82\xB8\x82ɕ\xB6\x8E\x9A\x90\x94\x82\xF0\x83J\x83E\x83\x93\x83g\x82\xB7\x82\xE9)
+ *	@param[in,out]	*mb_len		\x95ϊ\xB7\x82\xB5\x82\xBD\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x8E\xFB\x94[\x82ł\xAB\x82\xE9\x83T\x83C\x83Y,byte\x90\x94,
+ *								mb_ptr\x82\xAANULL\x82̂Ƃ\xAB\x8Fo\x97͉”\\x83T\x83C\x83Y\x82͕s\x97v
+ *								\x95ϊ\xB7\x82\xB5\x82\xBD\x83}\x83\x8B\x83`\x83o\x83C\x83g\x95\xB6\x8E\x9A\x97\xF1\x82̒\xB7\x82\xB3\x82\xF0\x95Ԃ\xB7
+ *								L'\0'\x82\xF0\x95ϊ\xB7\x82\xB5\x82\xBD\x82\xE7'\0'\x82\xE0\x8A܂\xDE
+ *								mb_ptr\x82\xAANULL\x82̂Ƃ\xAB\x82ł\xE0\x92\xB7\x82\xB3\x82͕Ԃ\xB7
+ *	@param[in]		UTF32ToMB	UTF32\x82\xF0\x83}\x83\x8B\x83`\x83o\x83C\x83g\x82ɕϊ\xB7\x82\xB7\x82\xE9\x8A֐\x94\x82ւ̃|\x83C\x83\x93\x83^
+ */
+static void WideCharToMB(const wchar_t *wstr_ptr, size_t *wstr_len_,
+						 char *mb_ptr, size_t *mb_len_,
+						 size_t (*UTF32ToMB)(uint32_t u32, char *mb_ptr, size_t mb_len))
+{
+	size_t wstr_len;
+	size_t mb_len;
+	size_t mb_out_sum = 0;
+	size_t wstr_in = 0;
+
+	assert(wstr_ptr != NULL);
+	if (mb_ptr == NULL) {
+		// \x95ϊ\xB7\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x8F\x91\x82\xAB\x8Fo\x82\xB3\x82Ȃ\xA2
+		mb_len = 4;		// 1\x95\xB6\x8E\x9A4byte\x82ɂ͎\xFB\x82܂\xE9\x82͂\xB8
+	} else {
+		mb_len = *mb_len_;
+	}
+	if (wstr_len_ == NULL || *wstr_len_ == 0) {
 		wstr_len = (int)wcslen(wstr_ptr) + 1;
+	} else {
+		wstr_len = *wstr_len_;
 	}
 
-	while(u8_len > 0 && wstr_len > 0) {
+	while(mb_len > 0 && wstr_len > 0) {
 		const wchar_t u16 = *wstr_ptr++;
 		uint32_t u32 = u16;
-		size_t u8_out;
+		size_t mb_out;
 		wstr_len--;
+		wstr_in++;
 		// \x83T\x83\x8D\x83Q\x81[\x83g high?
-		if (0xd800 <= u16 && u16 < 0xdc00) {
+		if (IsHighSurrogate(u16)) {
 			if (wstr_len >= 1) {
 				const wchar_t u16_lo = *wstr_ptr++;
 				wstr_len--;
+				wstr_in++;
 				// \x83T\x83\x8D\x83Q\x81[\x83g low?
-				if (0xdc00 <= u16_lo && u16_lo < 0xe000) {
+				if (IsLowSurrogate(u16_lo)) {
 					// \x83T\x83\x8D\x83Q\x81[\x83g\x83y\x83A \x83f\x83R\x81[\x83h
 					u32 = 0x10000 + (u16 - 0xd800) * 0x400 + (u16_lo - 0xdc00);
 				} else {
@@ -224,34 +630,75 @@
 					goto unknown_code;
 				}
 			} else {
-			unknown_code:
-				if (u8_ptr != NULL) {
-					*u8_ptr++ = '?';
-				}
-				u8_out = 1;
-				goto loop_next;
+				goto unknown_code;
 			}
 		}
-		u8_out = UTF32ToUTF8(u32, u8_ptr, u8_len);
-		if (u8_out == 0) {
-			goto unknown_code;
+		mb_out = UTF32ToMB(u32, mb_ptr, mb_len);
+		if (mb_out == 0) {
+		unknown_code:
+			if (mb_ptr != NULL) {
+				// \x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD\x8Fꍇ
+				*mb_ptr++ = '?';
+			}
+			mb_out = 1;
 		}
-	loop_next:
-		u8_out_sum += u8_out;
-		if (u8_ptr != NULL) {
-			u8_ptr += u8_out;
-			u8_len -= u8_out;
+		mb_out_sum += mb_out;
+		if (mb_ptr != NULL) {
+			mb_ptr += mb_out;
+			mb_len -= mb_out;
 		}
 	}
-	return u8_out_sum;
+
+	if (wstr_len_ != NULL) {
+		*wstr_len_ = wstr_in;
+	}
+	*mb_len_ = mb_out_sum;
 }
 
+// WideCharToMultiByte\x82\xCCUTF8\x93\xC1\x89\xBB\x94\xC5
+void WideCharToUTF8(const wchar_t *wstr_ptr, size_t *wstr_len, char *u8_ptr, size_t *u8_len)
+{
+	WideCharToMB(wstr_ptr, wstr_len, u8_ptr, u8_len, UTF32ToUTF8);
+}
+
+void WideCharToCP932(const wchar_t *wstr_ptr, size_t *wstr_len, char *cp932_ptr, size_t *cp932_len)
+{
+	WideCharToMB(wstr_ptr, wstr_len,
+				 cp932_ptr, cp932_len,
+				 UTF32ToCP932);
+}
+
+void WideCharToMBCP(const wchar_t *wstr_ptr, size_t *wstr_len, char *mb_ptr, size_t *mb_len,
+				  int code_page)
+{
+	size_t (*utf32_to_mb)(uint32_t u32, char *mb_ptr, size_t mb_len);
+	switch (code_page) {
+	case CP_UTF8:
+		utf32_to_mb = UTF32ToUTF8;
+		break;
+	case 932:
+		utf32_to_mb = UTF32ToCP932;
+		break;
+	default:
+		*mb_len = 0;
+		return;
+	}
+
+	WideCharToMB(wstr_ptr, wstr_len,
+				 mb_ptr, mb_len,
+				 utf32_to_mb);
+}
+
 // MultiByteToWideChar\x82\xCCUTF8\x93\xC1\x89\xBB\x94\xC5
-int UTF8ToWideChar(const char *u8_ptr, int u8_len, wchar_t *wstr_ptr, int wstr_len)
+int UTF8ToWideChar(const char *u8_ptr, int u8_len_, wchar_t *wstr_ptr, int wstr_len_)
 {
+	size_t u8_len;
+	size_t wstr_len = wstr_len_;
 	size_t u16_out_sum = 0;
-	if (u8_len < 0) {
+	if (u8_len_ < 0) {
 		u8_len = strlen(u8_ptr) + 1;
+	} else {
+		u8_len = u8_len_;
 	}
 	if (wstr_ptr == NULL) {
 		wstr_len = 1;
@@ -295,16 +742,18 @@
 		}
 		u16_out_sum += u16_out;
 	}
-	return u16_out_sum;
+	return (int)u16_out_sum;
 }
 
 /**
  *	wchar_t\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x83}\x83\x8B\x83`\x83o\x83C\x83g\x95\xB6\x8E\x9A\x97\xF1\x82֕ϊ\xB7
  *	@param[in]	*wstr_ptr	wchar_t\x95\xB6\x8E\x9A\x97\xF1
- *	@param[in]	wstr_len	wchar_t\x95\xB6\x8E\x9A\x97\xF1\x92\xB7(0\x82̂Ƃ\xAB\x8E\xA9\x93\xAE)
+ *	@param[in]	wstr_len	wchar_t\x95\xB6\x8E\x9A\x97\xF1\x92\xB7(0\x82̂Ƃ\xAB\x8E\xA9\x93\xAE\x81A\x8E\xA9\x93\xAE\x82̂Ƃ\xAB\x82\xCDL'\0'\x82Ń^\x81[\x83~\x83l\x81[\x83g\x82\xB7\x82邱\x82\xC6)
  *	@param[in]	code_page	\x95ϊ\xB7\x90\xE6\x83R\x81[\x83h\x83y\x81[\x83W
- *	@param[out]	*mb_len_	mb\x95\xB6\x8E\x9A\x97\xF1\x92\xB7(NULL\x82̂Ƃ\xAB\x93\xE0\x95\x94\x83G\x83\x89\x81[)
+ *	@param[out]	*mb_len_	\x95ϊ\xB7\x82\xB5\x82\xBD\x95\xB6\x8E\x9A\x97\xF1\x92\xB7,byte\x90\x94,L'\0'\x82\xF0\x95ϊ\xB7\x82\xB5\x82\xBD\x82\xE7'\0'\x82\xE0\x8A܂\xDE
+ *							(NULL\x82̂Ƃ\xAB\x95\xB6\x8E\x9A\x97񒷂\xF0\x95Ԃ\xB3\x82Ȃ\xA2)
  *	@retval		mb\x95\xB6\x8E\x9A\x97\xF1\x82ւ̃|\x83C\x83\x93\x83^(NULL\x82̎\x9E\x95ϊ\xB7\x83G\x83\x89\x81[)
+ *				\x8Eg\x97p\x8C\xE3 free() \x82\xB7\x82邱\x82\xC6
  */
 char *_WideCharToMultiByte(const wchar_t *wstr_ptr, size_t wstr_len, int code_page, size_t *mb_len_)
 {
@@ -317,9 +766,11 @@
 		wstr_len = wcslen(wstr_ptr) + 1;
 	}
     int len;
-	if (code_page == CP_UTF8) {
-		len = WideCharToUTF8(wstr_ptr, (DWORD)wstr_len,
-							 NULL, 0);
+	if (code_page == CP_UTF8 || code_page == 932) {
+		size_t wl = wstr_len;
+		size_t ml;
+		WideCharToMBCP(wstr_ptr, &wl, NULL, &ml, code_page);
+		len = ml;
 	} else {
 		len = ::WideCharToMultiByte(code_page, flags,
 									wstr_ptr, (DWORD)wstr_len,
@@ -333,9 +784,11 @@
 	if (mb_ptr == NULL) {
 		return NULL;
 	}
-	if (code_page == CP_UTF8) {
-		len = WideCharToUTF8(wstr_ptr, (DWORD)wstr_len,
-							 mb_ptr, len);
+	if (code_page == CP_UTF8 || code_page == 932) {
+		size_t wl = wstr_len;
+		size_t ml = len;
+		WideCharToMBCP(wstr_ptr, &wl, mb_ptr, &ml, code_page);
+		len = ml;
 	} else {
 		len = ::WideCharToMultiByte(code_page, flags,
 									wstr_ptr, (DWORD)wstr_len,
@@ -347,7 +800,8 @@
 		return NULL;
 	}
 	if (mb_len_ != NULL) {
-		*mb_len_ = len - 1;
+		// \x95ϊ\xB7\x82\xB5\x82\xBD\x95\xB6\x8E\x9A\x97\xF1\x90\x94(byte\x90\x94)\x82\xF0\x95Ԃ\xB7
+		*mb_len_ = len;
 	}
     return mb_ptr;
 }
@@ -355,10 +809,12 @@
 /**
  *	\x83}\x83\x8B\x83`\x83o\x83C\x83g\x95\xB6\x8E\x9A\x97\xF1\x82\xF0wchar_t\x95\xB6\x8E\x9A\x97\xF1\x82֕ϊ\xB7
  *	@param[in]	*str_ptr	mb(char)\x95\xB6\x8E\x9A\x97\xF1
- *	@param[in]	str_len		mb(char)\x95\xB6\x8E\x9A\x97\xF1\x92\xB7(0\x82̂Ƃ\xAB\x8E\xA9\x93\xAE)
+ *	@param[in]	str_len		mb(char)\x95\xB6\x8E\x9A\x97\xF1\x92\xB7(0\x82̂Ƃ\xAB\x8E\xA9\x93\xAE\x81A\x8E\xA9\x93\xAE\x82̂Ƃ\xAB\x82\xCD'\0'\x82Ń^\x81[\x83~\x83l\x81[\x83g\x82\xB7\x82邱\x82\xC6)
  *	@param[in]	code_page	\x95ϊ\xB7\x8C\xB3\x83R\x81[\x83h\x83y\x81[\x83W
- *	@param[out]	*w_len_		wchar_t\x95\xB6\x8E\x9A\x97\xF1\x92\xB7
- *	@retval		mb\x95\xB6\x8E\x9A\x97\xF1\x82ւ̃|\x83C\x83\x93\x83^(NULL\x82̎\x9E\x95ϊ\xB7\x83G\x83\x89\x81[)
+ *	@param[out]	*w_len_		wchar_t\x95\xB6\x8E\x9A\x97\xF1\x92\xB7,wchar_t\x90\x94,'\0'\x82\xF0\x95ϊ\xB7\x82\xB5\x82\xBD\x82\xE7L'\0'\x82\xE0\x8A܂\xDE
+ *							(NULL\x82̂Ƃ\xAB\x95\xB6\x8E\x9A\x97񒷂\xF0\x95Ԃ\xB3\x82Ȃ\xA2)
+ *	@retval		wchar_t\x95\xB6\x8E\x9A\x97\xF1\x82ւ̃|\x83C\x83\x93\x83^(NULL\x82̎\x9E\x95ϊ\xB7\x83G\x83\x89\x81[)
+ *				\x8Eg\x97p\x8C\xE3 free() \x82\xB7\x82邱\x82\xC6
  */
 wchar_t *_MultiByteToWideChar(const char *str_ptr, size_t str_len, int code_page, size_t *w_len_)
 {
@@ -402,7 +858,8 @@
 		return NULL;
 	}
 	if (w_len_ != NULL) {
-		*w_len_ = len - 1;
+		// \x95ϊ\xB7\x82\xB5\x82\xBD\x95\xB6\x8E\x9A\x97\xF1\x90\x94(wchar_t\x90\x94)\x82\xF0\x95Ԃ\xB7
+		*w_len_ = len;
 	}
 	return wstr_ptr;
 }

Modified: trunk/teraterm/common/codeconv.h
===================================================================
--- trunk/teraterm/common/codeconv.h	2019-03-05 16:22:05 UTC (rev 7461)
+++ trunk/teraterm/common/codeconv.h	2019-03-09 17:32:42 UTC (rev 7462)
@@ -35,12 +35,24 @@
 #endif
 
 
-// 1char
+// simple code convert
+unsigned int CP932ToUTF32(unsigned short cp932);
+unsigned short UTF32ToDecSp(unsigned int u32);
+unsigned int MBCPToUTF32(unsigned short KCode, int CodePage);
+unsigned short UTF32_CP932(unsigned int u32);
+
+// 1char ToUTF32
+size_t UTF8ToUTF32(const char *u8_ptr_, size_t u8_len, unsigned int *u32_);
+size_t UTF16ToUTF32(const wchar_t *wstr_ptr, size_t wstr_len, unsigned int *u32);
+// 1char UTF32To
+size_t UTF32ToUTF16(unsigned int u32, wchar_t *wstr_ptr, size_t wstr_len);
 size_t UTF32ToUTF8(unsigned int u32, char *u8_ptr, size_t u8_len);
-size_t UTF8ToUTF32(const char *u8_ptr_, size_t u8_len, unsigned int *u32_);
+size_t UTF32ToCP932(unsigned int u32, char *mb_ptr, size_t mb_len);
+size_t UTF32ToMBCP(unsigned int u32, int code_page, char *mb_ptr, size_t mb_len);
 
 // MultiByteToWideChar() wrappers
-int WideCharToUTF8(const wchar_t *wstr_ptr, int wstr_len, char *u8_ptr, int u8_len);
+void WideCharToUTF8(const wchar_t *wstr_ptr, size_t *wstr_len, char *u8_ptr, size_t *u8_len);
+void WideCharToCP932(const wchar_t *wstr_ptr, size_t *wstr_len, char *cp932_ptr, size_t *cp932_len);
 int UTF8ToWideChar(const char *u8_ptr, int u8_len, wchar_t *wstr_ptr, int wstr_len);
 
 // API wrappers

Modified: trunk/teraterm/teraterm/CMakeLists.txt
===================================================================
--- trunk/teraterm/teraterm/CMakeLists.txt	2019-03-05 16:22:05 UTC (rev 7461)
+++ trunk/teraterm/teraterm/CMakeLists.txt	2019-03-09 17:32:42 UTC (rev 7462)
@@ -31,7 +31,12 @@
   ../common/i18n.h
   ../common/dllutil.cpp
   ../common/dllutil.h
-  ../ttpcmn/language.h
+  ../common/codeconv.h
+  ../common/codeconv.cpp
+  #
+  ../teraterm/unisym2decsp.map
+  ../teraterm/uni2sjis.map
+  ../ttpcmn/sjis2uni.map
   )
 
 source_group(
@@ -102,8 +107,6 @@
   WSAAsyncGetAddrInfo.c
   WSAAsyncGetAddrInfo.h
   #
-  uni2sjis.map
-  unisym2decsp.map
   uni_combining.map
   #
   teraterm.manifest

Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2019-03-05 16:22:05 UTC (rev 7461)
+++ trunk/teraterm/teraterm/vtterm.c	2019-03-09 17:32:42 UTC (rev 7462)
@@ -52,7 +52,8 @@
 #include "telnet.h"
 #include "ttime.h"
 #include "clipboar.h"
-#include "../ttpcmn/language.h"
+#include "codeconv.h"
+#include "codeconv.h"
 
 #include "vtterm.h"
 
@@ -5408,13 +5409,6 @@
 }
 
 //
-// UTF-8
-//
-#include "uni2sjis.map"
-#include "unisym2decsp.map"
-
-
-//
 // Unicode Combining Character Support
 //
 #include "uni_combining.map"
@@ -5467,17 +5461,22 @@
 	return (index);
 }
 
-// unicode(UTF-16,wchar_t)\x82\xF0\x83o\x83b\x83t\x83@\x82֏\x91\x82\xAB\x8D\x9E\x82\xDE
+// unicode(UTF-32,wchar_t)\x82\xF0\x83o\x83b\x83t\x83@\x82֏\x91\x82\xAB\x8D\x9E\x82\xDE
 static void UnicodeToCP932(unsigned int code)
 {
-	wchar_t wchar = (wchar_t)code;
+	wchar_t wchar;
 	int ret;
 	char mbchar[2];
 	unsigned short cset;
 
+	if (code >= 0x10000) {
+		goto unknown;
+	}
+	wchar = (wchar_t)code;
+
 	// Unicode\x82\xA9\x82\xE7DEC\x93\xC1\x8Eꕶ\x8E\x9A\x82ւ̃}\x83b\x83s\x83\x93\x83O
 	if (ts.UnicodeDecSpMapping) {
-		cset = ConvertUnicode(wchar, mapUnicodeSymbolToDecSp, MAPSIZE(mapUnicodeSymbolToDecSp));
+		cset = UTF32ToDecSp(wchar);
 		if (((cset >> 8) & ts.UnicodeDecSpMapping) != 0) {
 			PutDecSp(cset & 0xff);
 			return;
@@ -5485,7 +5484,24 @@
 	}
 
 	// Unicode -> \x93\xE0\x95\x94\x83R\x81[\x83h(ts.CodePage)\x82֕ϊ\xB7\x82\xB5\x82ďo\x97\xCD
-	ret = WideCharToMultiByte(ts.CodePage, 0, &wchar, 1, mbchar, 2, NULL, NULL);
+	if (ts.CodePage == 932) {
+		ret = (int)UTF16ToCP932(&wchar, 1, &cset);
+		if (ret == 0) {
+			// \x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD
+			;
+		} else if (cset < 0x100) {
+			// 1byte\x95\xB6\x8E\x9A
+			mbchar[0] = (char)cset;
+			ret = 1;
+		} else {
+			// 2byte\x95\xB6\x8E\x9A
+			mbchar[0] = (char)(cset >> 8);
+			mbchar[1] = (char)(cset & 0xff);
+			ret = 2;
+		}
+	} else {
+		ret = WideCharToMultiByte(ts.CodePage, 0, &wchar, 1, mbchar, 2, NULL, NULL);
+	}
 	if (ret == 1 && mbchar[0] == '?' && code != '?') {
 		// \x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD\x82Ƃ\xAB\x81Aret=1, '?' \x82\xF0\x95Ԃ\xB5\x82Ă\xAD\x82\xE9
 		ret = 0;
@@ -5492,17 +5508,7 @@
 	}
 	switch (ret) {
 	case 0:
-		if (ts.CodePage == 932) {
-			// CP932
-			// U+301C\x82Ȃǂ͕ϊ\xB7\x82ł\xAB\x82Ȃ\xA2\x81BUnicode -> Shift_JIS\x82֕ϊ\xB7\x82\xB5\x82Ă݂\xE9\x81B
-			cset = ConvertUnicode(code, mapUnicodeToSJIS, MAPSIZE(mapUnicodeToSJIS));
-			if (cset != 0) {
-				Kanji = cset & 0xff00;
-				PutKanji(cset & 0x00ff);
-				return;
-			}
-		}
-
+	unknown:
 		PutChar('?');
 		if (ts.UnknownUnicodeCharaAsWide) {
 			PutChar('?');

Modified: trunk/teraterm/ttpcmn/language.c
===================================================================
--- trunk/teraterm/ttpcmn/language.c	2019-03-05 16:22:05 UTC (rev 7461)
+++ trunk/teraterm/ttpcmn/language.c	2019-03-09 17:32:42 UTC (rev 7462)
@@ -35,9 +35,8 @@
 #include <locale.h>
 
 #include "language.h"
-#include "codeconv.h"
-#include "sjis2uni.map"
 
+// export\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9
 unsigned short ConvertUnicode(unsigned short code, const codemap_t *table, int tmax)
 {
 	int low, mid, high;
@@ -64,69 +63,6 @@
 	return (result);
 }
 
-// \x93\xE0\x95\x94\x83R\x81[\x83h(CodePage)\x82\xF0UTF8\x82֕ϊ\xB7\x82\xB7\x82\xE9
-unsigned int PASCAL SJIS2UTF8(WORD KCode, int *byte, int CodePage)
-{
-	wchar_t wchar;
-	int ret;
-	unsigned int code;
-	unsigned int c, c1, c2, c3;
-	unsigned char buf[3];
-	unsigned char KCode_h;
-	int len = 0;
-
-	// \x93\xE0\x95\x94\x83R\x81[\x83h(CodePage)\x82\xA9\x82\xE7UTF-16LE\x82֕ϊ\xB7\x82\xB7\x82\xE9
-	KCode_h = (unsigned char)(KCode >> 8);
-	if (KCode_h != 0) {
-		buf[len++] = KCode_h;
-	}
-	buf[len++] = KCode & 0xff;
-	ret = MultiByteToWideChar(CodePage, MB_ERR_INVALID_CHARS, buf, len, &wchar, 1);
-	if (ret <= 0) {
-		// \x95ϊ\xB7\x8E\xB8\x94s
-		unsigned short cset = 0;
-		if (CodePage == 932) {
-			// CP932
-			cset = ConvertUnicode(KCode, mapSJISToUnicode, sizeof(mapSJISToUnicode)/sizeof(mapSJISToUnicode[0]));
-		}
-		if (cset == 0) {
-			c = 0xfffd; // U+FFFD: Replacement Character
-		} else {
-			c = cset;
-		}
-	} else {
-		c = (unsigned int)wchar;
-	}
-
-	// UTF-16LE\x82\xA9\x82\xE7UTF-8\x82֕ϊ\xB7\x82\xB7\x82\xE9
-	if (c <= 0x0000007f) {
-		// 0x00000000 <= c <= 0x0000007f
-		code = (c & 0xff);
-		*byte = 1;
-
-	} else if (c <= 0x000007ff) {
-		// 0x00000080 <= c <= 0x000007ff
-		c1 = ((c >> 6) & 0x1f) | 0xc0;
-		c2 = (c & 0x3f) | 0x80;
-		code = (c1 << 8) | c2;
-		*byte = 2;
-
-	} else if (c <= 0x0000ffff) {
-		// 0x00000800 <= c <= 0x0000ffff
-		c1 = ((c >> 12) & 0xf) | 0xe0;
-		c2 = ((c >> 6) & 0x3f) | 0x80;
-		c3 = ((c) & 0x3f) | 0x80;
-		code = (c1 << 16) | (c2 << 8) | c3;
-		*byte = 3;
-	} else {
-		code = KCode;
-		*byte = 2;
-	}
-
-	return (code);
-}
-
-
 // Japanese SJIS -> JIS
 WORD PASCAL SJIS2JIS(WORD KCode)
 {

Modified: trunk/teraterm/ttpcmn/language.h
===================================================================
--- trunk/teraterm/ttpcmn/language.h	2019-03-05 16:22:05 UTC (rev 7461)
+++ trunk/teraterm/ttpcmn/language.h	2019-03-09 17:32:42 UTC (rev 7462)
@@ -35,13 +35,11 @@
 #endif
 
 /* proto types */
-unsigned int PASCAL SJIS2UTF8(WORD KCode, int *byte, int CodePage);
 WORD PASCAL SJIS2JIS(WORD KCode);
 WORD PASCAL SJIS2EUC(WORD KCode);
 WORD PASCAL JIS2SJIS(WORD KCode);
 BYTE PASCAL RussConv(int cin, int cout, BYTE b);
 void PASCAL RussConvStr(int cin, int cout, PCHAR Str, int count);
-unsigned short ConvertUnicode(unsigned short code, const codemap_t *table, int tmax);
 
 #ifdef __cplusplus
 }

Modified: trunk/teraterm/ttpcmn/ttcmn.c
===================================================================
--- trunk/teraterm/ttpcmn/ttcmn.c	2019-03-05 16:22:05 UTC (rev 7461)
+++ trunk/teraterm/ttpcmn/ttcmn.c	2019-03-09 17:32:42 UTC (rev 7462)
@@ -1582,25 +1582,52 @@
 	return i;
 }
 
+// \x93\xE0\x95\x94\x83R\x81[\x83h(CodePage)\x82\xF0UTF-32(UTF-16LE)\x82֕ϊ\xB7\x82\xB7\x82\xE9
+static unsigned int SJIS2UTF32(WORD KCode, int CodePage)
+{
+	unsigned int c;
+
+	// \x93\xE0\x95\x94\x83R\x81[\x83h(CodePage)\x82\xA9\x82\xE7UTF-16LE\x82֕ϊ\xB7\x82\xB7\x82\xE9
+	if (CodePage == 932) {
+		c = CP932ToUTF32(KCode);
+	} else {
+		unsigned char buf[3];
+		wchar_t wchar;
+		int ret;
+		int len = 0;
+		if (KCode < 0x100) {
+			buf[0] = KCode & 0xff;
+			len = 1;
+		} else {
+			buf[0] = KCode >> 8;
+			buf[1] = KCode & 0xff;
+			len = 2;
+		}
+		ret = MultiByteToWideChar(CodePage, MB_ERR_INVALID_CHARS, buf, len, &wchar, 1);
+		if (ret <= 0) {
+			c = 0;
+		} else {
+			c = (unsigned int)wchar;
+		}
+	}
+	if (c <= 0) {
+		// \x95ϊ\xB7\x8E\xB8\x94s
+		c = 0xfffd; // U+FFFD: Replacement Character
+	}
+
+	return c;
+}
+
+// \x93\xE0\x95\x94\x83R\x81[\x83h(CodePage)\x82\xF0UTF-8\x82֏o\x97͂\xB7\x82\xE9
 static int OutputTextUTF8(WORD K, char *TempStr, PComVar cv)
 {
+	int CodePage = *cv->CodePage;
 	unsigned int code;
 	int outlen;
-	int TempLen = 0;
 
-	code = SJIS2UTF8(K, &outlen, *cv->CodePage);
-	switch (outlen) {
-	  case 4:
-		TempStr[TempLen++] = (code >> 24) & 0xff;
-	  case 3:
-		TempStr[TempLen++] = (code >> 16) & 0xff;
-	  case 2:
-		TempStr[TempLen++] = (code >> 8) & 0xff;
-	  case 1:
-		TempStr[TempLen++] = code & 0xff;
-	}
-
-	return TempLen;
+	code = SJIS2UTF32(K, CodePage);
+	outlen = UTF32ToUTF8(code, TempStr, 4);
+	return outlen;
 }
 
 //

From scmnotify ＠ osdn.net  Sun Mar 10 02:32:55 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sun, 10 Mar 2019 02:32:55 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0NjNdIFVURjMyVG9NQkNQKCnjgYvjgolV?=
 =?utf-8?b?VEYzMlRvQ1A5MzIoKeOCkuWRvOOBs+WHuuOBmeOCiOOBhuOBq+OBl+OBnw==?=
Message-ID: <1552152775.665757.90774.nullmailer@users.osdn.me>

Revision: 7463
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7463
Author:   zmatsuo
Date:     2019-03-10 02:32:55 +0900 (Sun, 10 Mar 2019)
Log Message:
-----------
UTF32ToMBCP()からUTF32ToCP932()を呼び出すようにした

Modified Paths:
--------------
    trunk/teraterm/common/codeconv.cpp

-------------- next part --------------
Modified: trunk/teraterm/common/codeconv.cpp
===================================================================
--- trunk/teraterm/common/codeconv.cpp	2019-03-09 17:32:42 UTC (rev 7462)
+++ trunk/teraterm/common/codeconv.cpp	2019-03-09 17:32:55 UTC (rev 7463)
@@ -558,18 +558,22 @@
 
 size_t UTF32ToMBCP(unsigned int u32, int code_page, char *mb_ptr, size_t mb_len)
 {
-	wchar_t u16_str[2];
-	size_t u16_len;
-	u16_len = UTF32ToUTF16(u32, u16_str, 2);
-	if (u16_len == 0) {
-		return 0;
+	if (code_page == 932) {
+		return UTF32ToCP932(u32, mb_ptr, mb_len);
+	} else {
+		wchar_t u16_str[2];
+		size_t u16_len;
+		u16_len = UTF32ToUTF16(u32, u16_str, 2);
+		if (u16_len == 0) {
+			return 0;
+		}
+		mb_len = WideCharToMultiByte(code_page, 0, u16_str, u16_len, mb_ptr, mb_len, NULL, NULL);
+		if (u32 != '?' && mb_len == 1 && mb_ptr[0] == '?') {
+			// \x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD\x82Ƃ\xAB\x81A\x96߂\xE8\x92l=1, \x95\xB6\x8E\x9A[0]='?' \x82\xF0\x95Ԃ\xB5\x82Ă\xAD\x82\xE9
+			mb_len = 0;
+		}
+		return mb_len;
 	}
-	mb_len = WideCharToMultiByte(code_page, 0, u16_str, u16_len, mb_ptr, mb_len, NULL, NULL);
-	if (mb_len == 1 && mb_ptr[0] == '?' && u32 != '?') {
-		// \x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD\x82Ƃ\xAB\x81A\x96߂\xE8\x92l=1, \x95\xB6\x8E\x9A[0]='?' \x82\xF0\x95Ԃ\xB5\x82Ă\xAD\x82\xE9
-		mb_len = 0;
-	}
-	return mb_len;
 }
 
 /**

From scmnotify ＠ osdn.net  Sun Mar 10 02:33:06 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sun, 10 Mar 2019 02:33:06 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B7464=5D_UTF32ToMBCP=28=29=2C_MBCPToU?=
 =?utf-8?b?VEYzMigp44KS5L2/55So44GZ44KL44KI44GG6Kq/5pW0?=
Message-ID: <1552152786.538730.91057.nullmailer@users.osdn.me>

Revision: 7464
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7464
Author:   zmatsuo
Date:     2019-03-10 02:33:06 +0900 (Sun, 10 Mar 2019)
Log Message:
-----------
UTF32ToMBCP(), MBCPToUTF32()を使用するよう調整

Modified Paths:
--------------
    trunk/teraterm/teraterm/vtterm.c
    trunk/teraterm/ttpcmn/ttcmn.c

-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2019-03-09 17:32:55 UTC (rev 7463)
+++ trunk/teraterm/teraterm/vtterm.c	2019-03-09 17:33:06 UTC (rev 7464)
@@ -5461,22 +5461,16 @@
 	return (index);
 }
 
-// unicode(UTF-32,wchar_t)\x82\xF0\x83o\x83b\x83t\x83@\x82֏\x91\x82\xAB\x8D\x9E\x82\xDE
+// unicode(UTF-32)\x82\xF0\x83o\x83b\x83t\x83@(t.CodePage)\x82֏\x91\x82\xAB\x8D\x9E\x82\xDE
 static void UnicodeToCP932(unsigned int code)
 {
-	wchar_t wchar;
-	int ret;
+	size_t mblen;
 	char mbchar[2];
-	unsigned short cset;
 
-	if (code >= 0x10000) {
-		goto unknown;
-	}
-	wchar = (wchar_t)code;
-
 	// Unicode\x82\xA9\x82\xE7DEC\x93\xC1\x8Eꕶ\x8E\x9A\x82ւ̃}\x83b\x83s\x83\x93\x83O
 	if (ts.UnicodeDecSpMapping) {
-		cset = UTF32ToDecSp(wchar);
+		unsigned short cset;
+		cset = UTF32ToDecSp(code);
 		if (((cset >> 8) & ts.UnicodeDecSpMapping) != 0) {
 			PutDecSp(cset & 0xff);
 			return;
@@ -5484,31 +5478,18 @@
 	}
 
 	// Unicode -> \x93\xE0\x95\x94\x83R\x81[\x83h(ts.CodePage)\x82֕ϊ\xB7\x82\xB5\x82ďo\x97\xCD
-	if (ts.CodePage == 932) {
-		ret = (int)UTF16ToCP932(&wchar, 1, &cset);
-		if (ret == 0) {
-			// \x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD
-			;
-		} else if (cset < 0x100) {
-			// 1byte\x95\xB6\x8E\x9A
-			mbchar[0] = (char)cset;
-			ret = 1;
-		} else {
-			// 2byte\x95\xB6\x8E\x9A
-			mbchar[0] = (char)(cset >> 8);
-			mbchar[1] = (char)(cset & 0xff);
-			ret = 2;
-		}
-	} else {
-		ret = WideCharToMultiByte(ts.CodePage, 0, &wchar, 1, mbchar, 2, NULL, NULL);
+	mblen = UTF32ToMBCP(code, ts.CodePage, mbchar, 2);
+#if 1	// U+203e OVERLINE \x93\xC1\x95ʏ\x88\x97\x9D
+	if (code == 0x203e && ts.CodePage == 932) {
+		// U+203e\x82\xCD0x7e'~'\x82ɕϊ\xB7\x82\xB3\x82\xEA\x82\xE9
+		// \x96\xB3\x97\x9D\x82\xE2\x82芿\x8E\x9A\x8Fo\x97͂\xB7\x82\xE9
+		mbchar[0] = 0;			// \x82\xB1\x82\xCC0\x82̂\xBD\x82߁A\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82ɕ\xB6\x8E\x9A\x97񂪂\xA4\x82܂\xAD\x93\xFC\x82\xE7\x82Ȃ\xA2
+		mbchar[1] = 0x7e;
+		mblen = 2;
 	}
-	if (ret == 1 && mbchar[0] == '?' && code != '?') {
-		// \x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD\x82Ƃ\xAB\x81Aret=1, '?' \x82\xF0\x95Ԃ\xB5\x82Ă\xAD\x82\xE9
-		ret = 0;
-	}
-	switch (ret) {
+#endif
+	switch (mblen) {
 	case 0:
-	unknown:
 		PutChar('?');
 		if (ts.UnknownUnicodeCharaAsWide) {
 			PutChar('?');

Modified: trunk/teraterm/ttpcmn/ttcmn.c
===================================================================
--- trunk/teraterm/ttpcmn/ttcmn.c	2019-03-09 17:32:55 UTC (rev 7463)
+++ trunk/teraterm/ttpcmn/ttcmn.c	2019-03-09 17:33:06 UTC (rev 7464)
@@ -1582,42 +1582,6 @@
 	return i;
 }
 
-// \x93\xE0\x95\x94\x83R\x81[\x83h(CodePage)\x82\xF0UTF-32(UTF-16LE)\x82֕ϊ\xB7\x82\xB7\x82\xE9
-static unsigned int SJIS2UTF32(WORD KCode, int CodePage)
-{
-	unsigned int c;
-
-	// \x93\xE0\x95\x94\x83R\x81[\x83h(CodePage)\x82\xA9\x82\xE7UTF-16LE\x82֕ϊ\xB7\x82\xB7\x82\xE9
-	if (CodePage == 932) {
-		c = CP932ToUTF32(KCode);
-	} else {
-		unsigned char buf[3];
-		wchar_t wchar;
-		int ret;
-		int len = 0;
-		if (KCode < 0x100) {
-			buf[0] = KCode & 0xff;
-			len = 1;
-		} else {
-			buf[0] = KCode >> 8;
-			buf[1] = KCode & 0xff;
-			len = 2;
-		}
-		ret = MultiByteToWideChar(CodePage, MB_ERR_INVALID_CHARS, buf, len, &wchar, 1);
-		if (ret <= 0) {
-			c = 0;
-		} else {
-			c = (unsigned int)wchar;
-		}
-	}
-	if (c <= 0) {
-		// \x95ϊ\xB7\x8E\xB8\x94s
-		c = 0xfffd; // U+FFFD: Replacement Character
-	}
-
-	return c;
-}
-
 // \x93\xE0\x95\x94\x83R\x81[\x83h(CodePage)\x82\xF0UTF-8\x82֏o\x97͂\xB7\x82\xE9
 static int OutputTextUTF8(WORD K, char *TempStr, PComVar cv)
 {
@@ -1625,7 +1589,11 @@
 	unsigned int code;
 	int outlen;
 
-	code = SJIS2UTF32(K, CodePage);
+	code = MBCPToUTF32(K, CodePage);
+	if (code == 0) {
+		// \x95ϊ\xB7\x8E\xB8\x94s
+		code = 0xfffd; // U+FFFD: Replacement Character
+	}
 	outlen = UTF32ToUTF8(code, TempStr, 4);
 	return outlen;
 }

From scmnotify ＠ osdn.net  Sun Mar 10 02:33:17 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sun, 10 Mar 2019 02:33:17 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0NjVdIOacquS9v+eUqOmWouaVsOWJig==?=
 =?utf-8?b?6Zmk44CBQ1BfQUNQ6ICD5oWu?=
Message-ID: <1552152797.088658.91347.nullmailer@users.osdn.me>

Revision: 7465
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7465
Author:   zmatsuo
Date:     2019-03-10 02:33:16 +0900 (Sun, 10 Mar 2019)
Log Message:
-----------
未使用関数削除、CP_ACP考慮

Modified Paths:
--------------
    trunk/teraterm/common/codeconv.cpp

-------------- next part --------------
Modified: trunk/teraterm/common/codeconv.cpp
===================================================================
--- trunk/teraterm/common/codeconv.cpp	2019-03-09 17:33:06 UTC (rev 7464)
+++ trunk/teraterm/common/codeconv.cpp	2019-03-09 17:33:16 UTC (rev 7465)
@@ -94,39 +94,72 @@
 }
 
 /**
- *	1\x95\xB6\x8E\x9A\x82Ƃ\xB5\x82Ĉ\xB5\x82\xA4\x82\xBD\x82߂ɁA\x95K\x97v\x82ȃL\x83\x83\x83\x89\x83N\x83^\x90\x94\x82𓾂\xE9
- *	@retval	0	\x95\xB6\x8E\x9A\x82Ƃ\xB5\x82Ĉ\xB5\x82\xA6\x82Ȃ\xA2(\x95\xB6\x8E\x9A\x83R\x81[\x83h\x82\xAA\x82\xA8\x82\xA9\x82\xB5\x82\xA2)
- *	@retval	1	1\x83L\x83\x83\x83\x89\x83N\x83^\x82\xC51\x95\xB6\x8E\x9A\x82Ƃ\xB5\x82Ĉ\xB5\x82\xA6\x82\xE9
- *	@retval	2	2\x83L\x83\x83\x83\x89\x83N\x83^\x82\xC51\x95\xB6\x8E\x9A\x82Ƃ\xB5\x82Ĉ\xB5\x82\xA6\x82\xE9
+ * CP932\x95\xB6\x8E\x9A(Shift_JIS) 1\x95\xB6\x8E\x9A\x82\xA9\x82\xE7UTF-32\x82֕ϊ\xB7\x82\xB7\x82\xE9
+ * @param[in]		cp932		CP932\x95\xB6\x8E\x9A
+ * @retval			\x95ϊ\xB7\x82\xB5\x82\xBDUTF-32\x95\xB6\x8E\x9A\x90\x94
+ *					0=\x83G\x83\x89\x81[(\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD)
  */
-#if 0
-static size_t UTF16GetCharCount(const wchar_t *wstr_ptr, size_t wstr_len)
+unsigned int CP932ToUTF32(unsigned short cp932)
 {
-	wchar_t u16;
-	assert(wstr_ptr != NULL);
-	if (wstr_len == 0) {
-		return 0;
+#include "../ttpcmn/sjis2uni.map"		// mapSJISToUnicode[]
+	wchar_t wchar;
+	int ret;
+	unsigned int u32;
+	unsigned char buf[2];
+	int len = 0;
+
+#if defined(PRIORITY_CP932_TABLE)
+	u32 = _ConvertUnicode(cp932, mapSJISToUnicode, sizeof(mapSJISToUnicode)/sizeof(mapSJISToUnicode[0]));
+	if (u32 != 0) {
+		return u32;
 	}
-	u16 = *wstr_ptr++;
-	if (IsHighSurrogate(u16)) {
-		if (wstr_len >= 2) {
-			const wchar_t u16_lo = *wstr_ptr++;
-			if (IsLowSurrogate(u16_lo)) {
-				return 2;
-			} else {
-				return 0;
-			}
-		} else {
-			return 0;
-		}
-	} else if (IsLowSurrogate(u16)) {
-		return 0;
+#endif
+	if (cp932 < 0x100) {
+		buf[0] = cp932 & 0xff;
+		len = 1;
+	} else {
+		buf[0] = cp932 >> 8;
+		buf[1] = cp932 & 0xff;
+		len = 2;
 	}
-	return 1;
-}
+	ret = MultiByteToWideChar(932, MB_ERR_INVALID_CHARS, (char *)buf, len, &wchar, 1);
+	if (ret <= 0) {
+		// MultiByteToWideChar()\x82\xAA\x95ϊ\xB7\x8E\xB8\x94s
+#if !defined(PRIORITY_CP932_TABLE)
+		u32 = _ConvertUnicode(cp932, mapSJISToUnicode, sizeof(mapSJISToUnicode)/sizeof(mapSJISToUnicode[0]));
+		// \x83e\x81[\x83u\x83\x8B\x82ɂ\xE0\x82Ȃ\xA9\x82\xC1\x82\xBD\x8Fꍇ c = 0(\x95ϊ\xB7\x8E\xB8\x94s\x8E\x9E)
+#else
+		u32 = 0;
 #endif
+	} else {
+		u32 = (unsigned int)wchar;
+	}
 
+	return u32;
+}
+
 /**
+ * Unicode\x82\xA9\x82\xE7DEC\x93\xC1\x8Eꕶ\x8E\x9A\x82֕ϊ\xB7
+ * @param	u32			UTF-32\x95\xB6\x8E\x9A\x83R\x81[\x83h
+ * @return	\x89\xBA\x88\xCA8bit	DEC\x93\xC1\x8Eꕶ\x8E\x9A\x83R\x81[\x83h
+ *			\x8F\xE3\x88\xCA8bit	\x95\xB6\x8E\x9A\x83R\x81[\x83h\x8E\xED\x95\xCA (1,2,4)
+ *						file://../../doc/ja/html/setup/teraterm-term.html \x8EQ\x8F\xC6
+ *			0			\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD
+ */
+unsigned short UTF32ToDecSp(unsigned int u32)
+{
+#include "../teraterm/unisym2decsp.map"		// mapUnicodeSymbolToDecSp[]
+	unsigned short cset;
+	if (u32 > 0x10000) {
+		cset = 0;
+	} else {
+		const unsigned short u16 = (unsigned short)u32;
+		cset = _ConvertUnicode(u16, mapUnicodeSymbolToDecSp, _countof(mapUnicodeSymbolToDecSp));
+	}
+	return cset;
+}
+
+/**
  *	code page \x82\xCC mulit byte \x95\xB6\x8E\x9A\x82\xF0 UTF-32\x82֕ϊ\xB7\x82\xB7\x82\xE9
  *	@param KCode	\x83}\x83\x8B\x83`\x83o\x83C\x83g\x82̕\xB6\x8E\x9A\x83R\x81[\x83h(0x0000-0xffff)
  *	@param CoePage	\x83}\x83\x8B\x83`\x83o\x83C\x83g\x82̃R\x81[\x83h\x83y\x81[\x83W
@@ -162,6 +195,158 @@
 }
 
 /**
+ * UTF-32\x95\xB6\x8E\x9A\x82\xF0CP932\x95\xB6\x8E\x9A(Shift_JIS) 1\x95\xB6\x8E\x9A\x82֕ϊ\xB7\x82\xB7\x82\xE9
+ * @retval		\x8Eg\x97p\x82\xB5\x82\xBDCP932\x95\xB6\x8E\x9A
+ *				0=\x83G\x83\x89\x81[(\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD)
+ */
+unsigned short UTF32_CP932(unsigned int u32)
+{
+#include "../teraterm/uni2sjis.map"		// mapUnicodeToSJIS[]
+	char mbstr[2];
+	unsigned short mb;
+	DWORD mblen;
+	wchar_t u16_str[2];
+	size_t u16_len;
+
+	if (u32 < 0x80) {
+		return (unsigned short)u32;
+	}
+
+#if defined(PRIORITY_CP932_TABLE)
+	if (u32 < 0x10000) {
+		wchar_t u16 = (wchar_t)u32;
+		// Tera Term\x82̕ϊ\xB7\x83e\x81[\x83u\x83\x8B\x82\xC5 Unicode -> Shift_JIS\x82֕ϊ\xB7
+		mb = _ConvertUnicode(u16, mapUnicodeToSJIS, _countof(mapUnicodeToSJIS));
+		if (mb != 0) {
+			// \x95ϊ\xB7\x82ł\xAB\x82\xBD
+			return mb;
+		}
+	}
+#endif
+	u16_len = UTF32ToUTF16(u32, u16_str, 2);
+	if (u16_len == 0) {
+		return 0;
+	}
+	mblen = WideCharToMultiByte(932, 0, u16_str, (int)u16_len, mbstr, 2, NULL, NULL);
+	switch (mblen) {
+	case 0:
+	case 1:
+	default:
+		if (mblen == 0 || mbstr[0] == '?') {
+			goto next_convert;
+		} else {
+			mb = (unsigned char)mbstr[0];
+			return mb;
+		}
+	case 2:
+		if (mbstr[0] == '?' && mbstr[1] == '?') {
+			// 2byte\x8Fo\x97\xCD && "??" \x82̏ꍇ\x82͕ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD
+			goto next_convert;
+		}
+		mb = (((unsigned char)mbstr[0]) << 8) | (unsigned char)mbstr[1];
+		return mb;
+	}
+
+next_convert:
+#if !defined(PRIORITY_CP932_TABLE)
+	if (u32 < 0x10000) {
+		wchar_t u16 = (wchar_t)u32;
+		// Tera Term\x82̕ϊ\xB7\x83e\x81[\x83u\x83\x8B\x82\xC5 Unicode -> Shift_JIS\x82֕ϊ\xB7
+		mb = _ConvertUnicode(u16, mapUnicodeToSJIS, _countof(mapUnicodeToSJIS));
+		if (mb != 0) {
+			// \x95ϊ\xB7\x82ł\xAB\x82\xBD
+			return mb;
+		}
+	}
+#endif
+	return 0;
+}
+
+/**
+ * UTF-8\x95\xB6\x8E\x9A\x97񂩂\xE7UTF-32\x82\xF01\x95\xB6\x8E\x9A\x8E\xE6\x82\xE8\x8Fo\x82\xB7
+ * @param[in]	u8_ptr	UTF-8\x95\xB6\x8E\x9A\x97\xF1\x82ւ̃|\x83C\x83\x93\x83^
+ * @param[in]	u8_len	UTF-8\x95\xB6\x8E\x9A\x97񒷂\xB3
+ * @param[out]	u32		\x95ϊ\xB7\x82\xB5\x82\xBDUTF-32\x95\xB6\x8E\x9A
+ * @retval		\x8Eg\x97p\x82\xB5\x82\xBDUTF-8\x95\xB6\x8E\x9A\x90\x94(byte\x90\x94\x81j
+ *				0=\x83G\x83\x89\x81[(\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD)
+ */
+size_t UTF8ToUTF32(const char *u8_ptr_, size_t u8_len, uint32_t *u32_)
+{
+	uint8_t *u8_ptr = (uint8_t *)u8_ptr_;
+	uint32_t u32;
+	size_t u8_in;
+	const uint8_t c1 = *u8_ptr++;
+    if (c1 <= 0x7f) {
+		// 1byte
+		if (u8_len >= 1) {
+			u32 = (uint32_t)c1;
+			u8_in = 1;
+		} else {
+			goto error;
+		}
+	} else if (0xc2 <= c1 && c1 <= 0xdf) {
+		// 2byte
+		if (u8_len >= 2) {
+			const uint8_t c2 = *u8_ptr++;
+			if (((c1 & 0x1e) != 0) &&
+				((c2 & 0xc0) == 0x80))
+			{
+				u32 = (uint32_t)((c1 & 0x1f) << 6) + (c2 & 0x3f);
+				u8_in = 2;
+			} else {
+				goto error;
+			}
+		} else {
+			goto error;
+		}
+	} else if (0xe0 <= c1 && c1 <= 0xef) {
+		// 3byte
+		if (u8_len >= 3) {
+			const uint8_t c2 = *u8_ptr++;
+			const uint8_t c3 = *u8_ptr++;
+			if ((((c1 & 0x0f) != 0) || ((c2 & 0x20) != 0)) &&
+				((c2 & 0xc0) == 0x80) &&
+				((c3 & 0xc0) == 0x80) )
+			{
+				u32 = (uint32_t)((c1 & 0x0f) << 12) + ((c2 & 0x3f) << 6);
+				u32 += (c3 & 0x3f);
+				u8_in = 3;
+			} else {
+				goto error;
+			}
+		} else {
+			goto error;
+		}
+	} else if (0xf0 <= c1 && c1 <= 0xf7 && u8_len >= 4) {
+		// 4byte
+		if (u8_len >= 4) {
+			const uint8_t c2 = *u8_ptr++;
+			const uint8_t c3 = *u8_ptr++;
+			const uint8_t c4 = *u8_ptr++;
+			if ((((c1 & 0x07) != 0) || ((c2 & 0x30) != 0)) &&
+				((c2 & 0xc0) == 0x80) &&
+				((c3 & 0xc0) == 0x80) &&
+				((c4 & 0xc0) == 0x80) )
+			{
+				u32 = (uint32_t)((c1 & 0x07) << 18) + ((c2 & 0x3f) << 12);
+				u32 += ((c3 & 0x3f) << 6) + (c4 & 0x3f);
+				u8_in = 4;
+			} else {
+				goto error;
+			}
+		} else {
+			goto error;
+		}
+    } else {
+	error:
+		u32 = 0;
+		u8_in = 0;
+	}
+	*u32_ = u32;
+	return u8_in;
+}
+
+/**
  *	wchar_t\x95\xB6\x8E\x9A\x97񂩂\xE7unicode(UTF-32)\x82\xF01\x95\xB6\x8E\x9A\x8E\xE6\x82\xE8\x8Fo\x82\xB7
  *	@retval	0	\x95\xB6\x8E\x9A\x82Ƃ\xB5\x82Ĉ\xB5\x82\xA6\x82Ȃ\xA2(\x95\xB6\x8E\x9A\x83R\x81[\x83h\x82\xAA\x82\xA8\x82\xA9\x82\xB5\x82\xA2)
  *	@retval	1	1\x83L\x83\x83\x83\x89\x83N\x83^\x82\xC51\x95\xB6\x8E\x9A\x82Ƃ\xB5\x82Ĉ\xB5\x82\xA6\x82\xE9
@@ -261,90 +446,6 @@
 }
 
 /**
- * UTF-8\x95\xB6\x8E\x9A\x97񂩂\xE7UTF-32\x82\xF01\x95\xB6\x8E\x9A\x8E\xE6\x82\xE8\x8Fo\x82\xB7
- * @param[in]	u8_ptr	UTF-8\x95\xB6\x8E\x9A\x97\xF1\x82ւ̃|\x83C\x83\x93\x83^
- * @param[in]	u8_len	UTF-8\x95\xB6\x8E\x9A\x97񒷂\xB3
- * @param[out]	u32		\x95ϊ\xB7\x82\xB5\x82\xBDUTF-32\x95\xB6\x8E\x9A
- * @retval		\x8Eg\x97p\x82\xB5\x82\xBDUTF-8\x95\xB6\x8E\x9A\x90\x94(byte\x90\x94\x81j
- *				0=\x83G\x83\x89\x81[(\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD)
- */
-size_t UTF8ToUTF32(const char *u8_ptr_, size_t u8_len, uint32_t *u32_)
-{
-	uint8_t *u8_ptr = (uint8_t *)u8_ptr_;
-	uint32_t u32;
-	size_t u8_in;
-	const uint8_t c1 = *u8_ptr++;
-    if (c1 <= 0x7f) {
-		// 1byte
-		if (u8_len >= 1) {
-			u32 = (uint32_t)c1;
-			u8_in = 1;
-		} else {
-			goto error;
-		}
-	} else if (0xc2 <= c1 && c1 <= 0xdf) {
-		// 2byte
-		if (u8_len >= 2) {
-			const uint8_t c2 = *u8_ptr++;
-			if (((c1 & 0x1e) != 0) &&
-				((c2 & 0xc0) == 0x80))
-			{
-				u32 = (uint32_t)((c1 & 0x1f) << 6) + (c2 & 0x3f);
-				u8_in = 2;
-			} else {
-				goto error;
-			}
-		} else {
-			goto error;
-		}
-	} else if (0xe0 <= c1 && c1 <= 0xef) {
-		// 3byte
-		if (u8_len >= 3) {
-			const uint8_t c2 = *u8_ptr++;
-			const uint8_t c3 = *u8_ptr++;
-			if ((((c1 & 0x0f) != 0) || ((c2 & 0x20) != 0)) &&
-				((c2 & 0xc0) == 0x80) &&
-				((c3 & 0xc0) == 0x80) )
-			{
-				u32 = (uint32_t)((c1 & 0x0f) << 12) + ((c2 & 0x3f) << 6);
-				u32 += (c3 & 0x3f);
-				u8_in = 3;
-			} else {
-				goto error;
-			}
-		} else {
-			goto error;
-		}
-	} else if (0xf0 <= c1 && c1 <= 0xf7 && u8_len >= 4) {
-		// 4byte
-		if (u8_len >= 4) {
-			const uint8_t c2 = *u8_ptr++;
-			const uint8_t c3 = *u8_ptr++;
-			const uint8_t c4 = *u8_ptr++;
-			if ((((c1 & 0x07) != 0) || ((c2 & 0x30) != 0)) &&
-				((c2 & 0xc0) == 0x80) &&
-				((c3 & 0xc0) == 0x80) &&
-				((c4 & 0xc0) == 0x80) )
-			{
-				u32 = (uint32_t)((c1 & 0x07) << 18) + ((c2 & 0x3f) << 12);
-				u32 += ((c3 & 0x3f) << 6) + (c4 & 0x3f);
-				u8_in = 4;
-			} else {
-				goto error;
-			}
-		} else {
-			goto error;
-		}
-    } else {
-	error:
-		u32 = 0;
-		u8_in = 0;
-	}
-	*u32_ = u32;
-	return u8_in;
-}
-
-/**
  * UTF-32 \x82\xA9\x82\xE7 UTF-16 \x82֕ϊ\xB7\x82\xB7\x82\xE9
  * @param[in]		u32			\x95ϊ\xB7\x82\xB7\x82\xE9UTF-32
  * @param[in,out]	wstr_ptr	\x95ϊ\xB7\x8C\xE3UTF-16\x95\xB6\x8E\x9A\x97\xF1\x8Fo\x97͐\xE6(NULL\x82̂Ƃ\xAB\x8Fo\x97͂\xB5\x82Ȃ\xA2)
@@ -382,140 +483,6 @@
 }
 
 /**
- * UTF-32\x95\xB6\x8E\x9A\x82\xF0CP932\x95\xB6\x8E\x9A(Shift_JIS) 1\x95\xB6\x8E\x9A\x82֕ϊ\xB7\x82\xB7\x82\xE9
- * @retval		\x8Eg\x97p\x82\xB5\x82\xBDCP932\x95\xB6\x8E\x9A
- *				0=\x83G\x83\x89\x81[(\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD)
- */
-unsigned short UTF32_CP932(unsigned int u32)
-{
-#include "../teraterm/uni2sjis.map"		// mapUnicodeToSJIS[]
-	char mbstr[2];
-	unsigned short mb;
-	DWORD mblen;
-	wchar_t u16_str[2];
-	size_t u16_len;
-
-	if (u32 < 0x80) {
-		return (unsigned short)u32;
-	}
-
-#if defined(PRIORITY_CP932_TABLE)
-	if (u32 < 0x10000) {
-		wchar_t u16 = (wchar_t)u32;
-		// Tera Term\x82̕ϊ\xB7\x83e\x81[\x83u\x83\x8B\x82\xC5 Unicode -> Shift_JIS\x82֕ϊ\xB7
-		mb = _ConvertUnicode(u16, mapUnicodeToSJIS, _countof(mapUnicodeToSJIS));
-		if (mb != 0) {
-			// \x95ϊ\xB7\x82ł\xAB\x82\xBD
-			return mb;
-		}
-	}
-#endif
-	u16_len = UTF32ToUTF16(u32, u16_str, 2);
-	if (u16_len == 0) {
-		return 0;
-	}
-	mblen = WideCharToMultiByte(932, 0, u16_str, (int)u16_len, mbstr, 2, NULL, NULL);
-	switch (mblen) {
-	case 0:
-	case 1:
-	default:
-		if (mblen == 0 || mbstr[0] == '?') {
-			goto next_convert;
-		} else {
-			mb = (unsigned char)mbstr[0];
-			return mb;
-		}
-	case 2:
-		if (mbstr[0] == '?' && mbstr[1] == '?') {
-			// 2byte\x8Fo\x97\xCD && "??" \x82̏ꍇ\x82͕ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD
-			goto next_convert;
-		}
-		mb = (((unsigned char)mbstr[0]) << 8) | (unsigned char)mbstr[1];
-		return mb;
-	}
-
-next_convert:
-#if !defined(PRIORITY_CP932_TABLE)
-	if (u32 < 0x10000) {
-		wchar_t u16 = (wchar_t)u32;
-		// Tera Term\x82̕ϊ\xB7\x83e\x81[\x83u\x83\x8B\x82\xC5 Unicode -> Shift_JIS\x82֕ϊ\xB7
-		mb = _ConvertUnicode(u16, mapUnicodeToSJIS, _countof(mapUnicodeToSJIS));
-		if (mb != 0) {
-			// \x95ϊ\xB7\x82ł\xAB\x82\xBD
-			return mb;
-		}
-	}
-#endif
-	return 0;
-}
-
-/**
- * CP932\x95\xB6\x8E\x9A(Shift_JIS) 1\x95\xB6\x8E\x9A\x82\xA9\x82\xE7UTF-32\x82֕ϊ\xB7\x82\xB7\x82\xE9
- * @param[in]		cp932		CP932\x95\xB6\x8E\x9A
- * @retval			\x95ϊ\xB7\x82\xB5\x82\xBDUTF-32\x95\xB6\x8E\x9A\x90\x94
- *					0=\x83G\x83\x89\x81[(\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD)
- */
-unsigned int CP932ToUTF32(unsigned short cp932)
-{
-#include "../ttpcmn/sjis2uni.map"		// mapSJISToUnicode[]
-	wchar_t wchar;
-	int ret;
-	unsigned int u32;
-	unsigned char buf[2];
-	int len = 0;
-
-#if defined(PRIORITY_CP932_TABLE)
-	u32 = _ConvertUnicode(cp932, mapSJISToUnicode, sizeof(mapSJISToUnicode)/sizeof(mapSJISToUnicode[0]));
-	if (u32 != 0) {
-		return u32;
-	}
-#endif
-	if (cp932 < 0x100) {
-		buf[0] = cp932 & 0xff;
-		len = 1;
-	} else {
-		buf[0] = cp932 >> 8;
-		buf[1] = cp932 & 0xff;
-		len = 2;
-	}
-	ret = MultiByteToWideChar(932, MB_ERR_INVALID_CHARS, (char *)buf, len, &wchar, 1);
-	if (ret <= 0) {
-		// MultiByteToWideChar()\x82\xAA\x95ϊ\xB7\x8E\xB8\x94s
-#if !defined(PRIORITY_CP932_TABLE)
-		u32 = _ConvertUnicode(cp932, mapSJISToUnicode, sizeof(mapSJISToUnicode)/sizeof(mapSJISToUnicode[0]));
-		// \x83e\x81[\x83u\x83\x8B\x82ɂ\xE0\x82Ȃ\xA9\x82\xC1\x82\xBD\x8Fꍇ c = 0(\x95ϊ\xB7\x8E\xB8\x94s\x8E\x9E)
-#else
-		u32 = 0;
-#endif
-	} else {
-		u32 = (unsigned int)wchar;
-	}
-
-	return u32;
-}
-
-/**
- * Unicode\x82\xA9\x82\xE7DEC\x93\xC1\x8Eꕶ\x8E\x9A\x82֕ϊ\xB7
- * @param	u32			UTF-32\x95\xB6\x8E\x9A\x83R\x81[\x83h
- * @return	\x89\xBA\x88\xCA8bit	DEC\x93\xC1\x8Eꕶ\x8E\x9A\x83R\x81[\x83h
- *			\x8F\xE3\x88\xCA8bit	\x95\xB6\x8E\x9A\x83R\x81[\x83h\x8E\xED\x95\xCA (1,2,4)
- *						file://../../doc/ja/html/setup/teraterm-term.html \x8EQ\x8F\xC6
- *			0			\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD
- */
-unsigned short UTF32ToDecSp(unsigned int u32)
-{
-#include "../teraterm/unisym2decsp.map"		// mapUnicodeSymbolToDecSp[]
-	unsigned short cset;
-	if (u32 > 0x10000) {
-		cset = 0;
-	} else {
-		const unsigned short u16 = (unsigned short)u32;
-		cset = _ConvertUnicode(u16, mapUnicodeSymbolToDecSp, _countof(mapUnicodeSymbolToDecSp));
-	}
-	return cset;
-}
-
-/**
  * UTF-32 \x82\xA9\x82\xE7 CP932 \x82֕ϊ\xB7\x82\xB7\x82\xE9
  * @param[in]		u32			\x95ϊ\xB7\x82\xB7\x82\xE9UTF-32
  * @param[in,out]	mb_ptr		\x95ϊ\xB7\x8C\xE3CP932\x95\xB6\x8E\x9A\x97\xF1\x8Fo\x97͐\xE6(NULL\x82̂Ƃ\xAB\x8Fo\x97͂\xB5\x82Ȃ\xA2)
@@ -556,8 +523,20 @@
 	return cp932_out;
 }
 
+/**
+ * UTF-32 \x82\xA9\x82\xE7 MultiByte\x95\xB6\x8E\x9A(code_page) \x82֕ϊ\xB7\x82\xB7\x82\xE9
+ * @param[in]		u32			\x95ϊ\xB7\x8C\xB3UTF-32
+ * @param[in]		code_page	\x95ϊ\xB7\x90\xE6codepage
+ * @param[in,out]	mb_ptr		\x95ϊ\xB7\x90敶\x8E\x9A\x97\xF1\x8Fo\x97͐\xE6(NULL\x82̂Ƃ\xAB\x8Fo\x97͂\xB5\x82Ȃ\xA2)
+ * @param[in]		mb_len		CP932\x8Fo\x97͐敶\x8E\x9A\x90\x94(\x95\xB6\x8E\x9A\x90\x94,sizeof(wchar_t)*wstr_len bytes)
+ * @retval			\x8Fo\x97͂\xB5\x82\xBDCP932\x95\xB6\x8E\x9A\x90\x94(byte\x90\x94)
+ *					0=\x83G\x83\x89\x81[(\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD)
+ */
 size_t UTF32ToMBCP(unsigned int u32, int code_page, char *mb_ptr, size_t mb_len)
 {
+	if (code_page == CP_ACP) {
+		code_page = (int)GetACP();
+	}
 	if (code_page == 932) {
 		return UTF32ToCP932(u32, mb_ptr, mb_len);
 	} else {
@@ -568,7 +547,7 @@
 			return 0;
 		}
 		mb_len = WideCharToMultiByte(code_page, 0, u16_str, u16_len, mb_ptr, mb_len, NULL, NULL);
-		if (u32 != '?' && mb_len == 1 && mb_ptr[0] == '?') {
+		if (mb_ptr != NULL && u32 != '?' && mb_len == 1 && mb_ptr[0] == '?') {
 			// \x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD\x82Ƃ\xAB\x81A\x96߂\xE8\x92l=1, \x95\xB6\x8E\x9A[0]='?' \x82\xF0\x95Ԃ\xB5\x82Ă\xAD\x82\xE9
 			mb_len = 0;
 		}
@@ -577,7 +556,7 @@
 }
 
 /**
- *	wchar_t(UTF-16)\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x83}\x83\x8B\x83`\x83o\x83C\x83g\x82ɕϊ\xB7\x82\xB7\x82\xE9
+ *	wchar_t(UTF-16)\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x83}\x83\x8B\x83`\x83o\x83C\x83g\x95\xB6\x8E\x9A\x97\xF1\x82ɕϊ\xB7\x82\xB7\x82\xE9
  *
  *	@param[in]		*wstr_ptr	wchar_t\x95\xB6\x8E\x9A\x97\xF1
  *	@param[in,out]	*wstr_len	wchar_t\x95\xB6\x8E\x9A\x97\xF1\x92\xB7
@@ -667,15 +646,16 @@
 
 void WideCharToCP932(const wchar_t *wstr_ptr, size_t *wstr_len, char *cp932_ptr, size_t *cp932_len)
 {
-	WideCharToMB(wstr_ptr, wstr_len,
-				 cp932_ptr, cp932_len,
-				 UTF32ToCP932);
+	WideCharToMB(wstr_ptr, wstr_len, cp932_ptr, cp932_len, UTF32ToCP932);
 }
 
 void WideCharToMBCP(const wchar_t *wstr_ptr, size_t *wstr_len, char *mb_ptr, size_t *mb_len,
-				  int code_page)
+					int code_page)
 {
 	size_t (*utf32_to_mb)(uint32_t u32, char *mb_ptr, size_t mb_len);
+	if (code_page == CP_ACP) {
+		code_page = (int)GetACP();
+	}
 	switch (code_page) {
 	case CP_UTF8:
 		utf32_to_mb = UTF32ToUTF8;
@@ -763,6 +743,9 @@
 {
 	const DWORD flags = 0;
 	char *mb_ptr;
+	if (code_page == CP_ACP) {
+		code_page = (int)GetACP();
+	}
 	if (mb_len_ != NULL) {
 		*mb_len_ = 0;
 	}
@@ -823,6 +806,9 @@
 wchar_t *_MultiByteToWideChar(const char *str_ptr, size_t str_len, int code_page, size_t *w_len_)
 {
 	DWORD flags = MB_ERR_INVALID_CHARS;
+	if (code_page == CP_ACP) {
+		code_page = (int)GetACP();
+	}
 	if (code_page == CP_UTF8) {
 		// CP_UTF8 When this is set, dwFlags must be zero.
 		flags = 0;

From scmnotify ＠ osdn.net  Sun Mar 10 02:33:27 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sun, 10 Mar 2019 02:33:27 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0NjZdIOaWsOOBl+OBhE1CQ1BUb1VURjMy?=
 =?utf-8?b?KCnov73liqDjgIHlvpPmnaXjga7plqLmlbDjga8gTUJDUF9VVEYzMigpIA==?=
 =?utf-8?b?44Gr44Oq44ON44O844Og?=
Message-ID: <1552152807.542268.91683.nullmailer@users.osdn.me>

Revision: 7466
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7466
Author:   zmatsuo
Date:     2019-03-10 02:33:27 +0900 (Sun, 10 Mar 2019)
Log Message:
-----------
新しいMBCPToUTF32()追加、従来の関数は MBCP_UTF32() にリネーム

Modified Paths:
--------------
    trunk/teraterm/common/codeconv.cpp
    trunk/teraterm/common/codeconv.h
    trunk/teraterm/ttpcmn/ttcmn.c

-------------- next part --------------
Modified: trunk/teraterm/common/codeconv.cpp
===================================================================
--- trunk/teraterm/common/codeconv.cpp	2019-03-09 17:33:16 UTC (rev 7465)
+++ trunk/teraterm/common/codeconv.cpp	2019-03-09 17:33:27 UTC (rev 7466)
@@ -96,7 +96,7 @@
 /**
  * CP932\x95\xB6\x8E\x9A(Shift_JIS) 1\x95\xB6\x8E\x9A\x82\xA9\x82\xE7UTF-32\x82֕ϊ\xB7\x82\xB7\x82\xE9
  * @param[in]		cp932		CP932\x95\xB6\x8E\x9A
- * @retval			\x95ϊ\xB7\x82\xB5\x82\xBDUTF-32\x95\xB6\x8E\x9A\x90\x94
+ * @retval			\x95ϊ\xB7\x82\xB5\x82\xBDUTF-32\x95\xB6\x8E\x9A
  *					0=\x83G\x83\x89\x81[(\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD)
  */
 unsigned int CP932ToUTF32(unsigned short cp932)
@@ -161,30 +161,33 @@
 
 /**
  *	code page \x82\xCC mulit byte \x95\xB6\x8E\x9A\x82\xF0 UTF-32\x82֕ϊ\xB7\x82\xB7\x82\xE9
- *	@param KCode	\x83}\x83\x8B\x83`\x83o\x83C\x83g\x82̕\xB6\x8E\x9A\x83R\x81[\x83h(0x0000-0xffff)
- *	@param CoePage	\x83}\x83\x8B\x83`\x83o\x83C\x83g\x82̃R\x81[\x83h\x83y\x81[\x83W
- *	@retval			unicode(UTF-32\x95\xB6\x8E\x9A\x83R\x81[\x83h)
+ *	@param mb_code		\x83}\x83\x8B\x83`\x83o\x83C\x83g\x82̕\xB6\x8E\x9A\x83R\x81[\x83h(0x0000-0xffff)
+ *	@param code_page	\x83}\x83\x8B\x83`\x83o\x83C\x83g\x82̃R\x81[\x83h\x83y\x81[\x83W
+ *	@retval				unicode(UTF-32\x95\xB6\x8E\x9A\x83R\x81[\x83h)
  */
-unsigned int MBCPToUTF32(unsigned short KCode, int CodePage)
+unsigned int MBCP_UTF32(unsigned short mb_code, int code_page)
 {
 	unsigned int c;
 
-	if (CodePage == 932) {
-		c = CP932ToUTF32(KCode);
+	if (code_page == CP_ACP) {
+		code_page = (int)GetACP();
+	}
+	if (code_page == 932) {
+		c = CP932ToUTF32(mb_code);
 	} else {
-		char buf[3];
+		char buf[2];
 		wchar_t wchar;
 		int ret;
 		int len = 0;
-		if (KCode < 0x100) {
-			buf[0] = KCode & 0xff;
+		if (mb_code < 0x100) {
+			buf[0] = mb_code & 0xff;
 			len = 1;
 		} else {
-			buf[0] = KCode >> 8;
-			buf[1] = KCode & 0xff;
+			buf[0] = mb_code >> 8;
+			buf[1] = mb_code & 0xff;
 			len = 2;
 		}
-		ret = MultiByteToWideChar(CodePage, MB_ERR_INVALID_CHARS, buf, len, &wchar, 1);
+		ret = MultiByteToWideChar(code_page, MB_ERR_INVALID_CHARS, buf, len, &wchar, 1);
 		if (ret <= 0) {
 			c = 0;
 		} else {
@@ -386,6 +389,51 @@
 }
 
 /**
+ *	\x83}\x83\x8B\x83`\x83o\x83C\x83g\x95\xB6\x8E\x9A(code_page) \x82\xA9\x82\xE7unicode(UTF-32)\x82\xF01\x95\xB6\x8E\x9A\x8E\xE6\x82\xE8\x8Fo\x82\xB7
+ *	@retval	0	\x95\xB6\x8E\x9A\x82Ƃ\xB5\x82Ĉ\xB5\x82\xA6\x82Ȃ\xA2(\x95\xB6\x8E\x9A\x83R\x81[\x83h\x82\xAA\x82\xA8\x82\xA9\x82\xB5\x82\xA2)
+ *	@retval	1	1\x83L\x83\x83\x83\x89\x83N\x83^\x82\xC51\x95\xB6\x8E\x9A\x82Ƃ\xB5\x82Ĉ\xB5\x82\xA6\x82\xE9
+ *	@retval	2	2\x83L\x83\x83\x83\x89\x83N\x83^\x82\xC51\x95\xB6\x8E\x9A\x82Ƃ\xB5\x82Ĉ\xB5\x82\xA6\x82\xE9
+ */
+size_t MBCPToUTF32(const char *mb_ptr, size_t mb_len, int code_page, unsigned int *u32)
+{
+	size_t input_len;
+	wchar_t u16_str[2];
+	size_t u16_len;
+
+	assert(mb_ptr != NULL);
+	if (mb_len == 0) {
+		*u32 = 0;
+		return 0;
+	}
+	if (code_page == CP_ACP) {
+		code_page = (int)GetACP();
+	}
+
+	input_len = 1;
+	while(1) {
+		u16_len = ::MultiByteToWideChar(code_page, MB_ERR_INVALID_CHARS,
+										mb_ptr, (int)input_len,
+										u16_str, 2);
+		if (u16_len != 0) {
+			size_t r = UTF16ToUTF32(u16_str, u16_len, u32);
+			assert(r != 0);
+			if (r == 0) {
+				// \x82Ȃ\xA2\x82͂\xB8
+				return 0;
+			} else {
+				return input_len;
+			}
+		}
+
+		input_len++;
+		if (input_len > mb_len) {
+			*u32 = 0;
+			return 0;
+		}
+	}
+}
+
+/**
  * UTF-32\x95\xB6\x8E\x9A \x82\xA9\x82\xE7 UTF-8 \x82֕ϊ\xB7\x82\xB7\x82\xE9
  * @param[in]		u32		\x95ϊ\xB7\x82\xB7\x82\xE9UTF-32
  * @param[in,out]	u8_ptr	\x95ϊ\xB7\x8C\xE3UTF-8\x95\xB6\x8E\x9A\x97\xF1\x8Fo\x97͐\xE6(NULL\x82̂Ƃ\xAB\x8Fo\x97͂\xB5\x82Ȃ\xA2)
@@ -397,7 +445,7 @@
 {
 	size_t out_len = 0;
 	uint8_t *u8_ptr = (uint8_t *)u8_ptr_;
-	if (u8_ptr != NULL) {
+	if (u8_ptr == NULL) {
 		u8_len = 4;
 	}
 

Modified: trunk/teraterm/common/codeconv.h
===================================================================
--- trunk/teraterm/common/codeconv.h	2019-03-09 17:33:16 UTC (rev 7465)
+++ trunk/teraterm/common/codeconv.h	2019-03-09 17:33:27 UTC (rev 7466)
@@ -34,16 +34,17 @@
 extern "C" {
 #endif
 
-
 // simple code convert
 unsigned int CP932ToUTF32(unsigned short cp932);
 unsigned short UTF32ToDecSp(unsigned int u32);
-unsigned int MBCPToUTF32(unsigned short KCode, int CodePage);
+unsigned int MBCP_UTF32(unsigned short mb_code, int code_page);
 unsigned short UTF32_CP932(unsigned int u32);
 
 // 1char ToUTF32
 size_t UTF8ToUTF32(const char *u8_ptr_, size_t u8_len, unsigned int *u32_);
 size_t UTF16ToUTF32(const wchar_t *wstr_ptr, size_t wstr_len, unsigned int *u32);
+size_t MBCPToUTF32(const char *mb_ptr, size_t mb_len, int code_page, unsigned int *u32);
+
 // 1char UTF32To
 size_t UTF32ToUTF16(unsigned int u32, wchar_t *wstr_ptr, size_t wstr_len);
 size_t UTF32ToUTF8(unsigned int u32, char *u8_ptr, size_t u8_len);

Modified: trunk/teraterm/ttpcmn/ttcmn.c
===================================================================
--- trunk/teraterm/ttpcmn/ttcmn.c	2019-03-09 17:33:16 UTC (rev 7465)
+++ trunk/teraterm/ttpcmn/ttcmn.c	2019-03-09 17:33:27 UTC (rev 7466)
@@ -1589,7 +1589,7 @@
 	unsigned int code;
 	int outlen;
 
-	code = MBCPToUTF32(K, CodePage);
+	code = MBCP_UTF32(K, CodePage);
 	if (code == 0) {
 		// \x95ϊ\xB7\x8E\xB8\x94s
 		code = 0xfffd; // U+FFFD: Replacement Character

From scmnotify ＠ osdn.net  Sun Mar 10 02:33:37 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sun, 10 Mar 2019 02:33:37 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0NjddIFZTMjAwNeODl+ODreOCuOOCpw==?=
 =?utf-8?b?44Kv44OI44OV44Kh44Kk44Or5L+d5a6I?=
Message-ID: <1552152817.989407.91769.nullmailer@users.osdn.me>

Revision: 7467
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7467
Author:   zmatsuo
Date:     2019-03-10 02:33:37 +0900 (Sun, 10 Mar 2019)
Log Message:
-----------
VS2005プロジェクトファイル保守

Modified Paths:
--------------
    trunk/teraterm/teraterm/ttermpro.vcproj

-------------- next part --------------
Modified: trunk/teraterm/teraterm/ttermpro.vcproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.vcproj	2019-03-09 17:33:27 UTC (rev 7466)
+++ trunk/teraterm/teraterm/ttermpro.vcproj	2019-03-09 17:33:37 UTC (rev 7467)
@@ -397,6 +397,10 @@
 				RelativePath="..\common\dllutil.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\common\codeconv.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"

From scmnotify ＠ osdn.net  Sun Mar 10 23:32:02 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sun, 10 Mar 2019 23:32:02 +0900
Subject: [Ttssh2-commit] [7468] Merge branch 'trunk' into cmake
Message-ID: <1552228322.430485.4016.nullmailer@users.osdn.me>

Revision: 7468
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7468
Author:   zmatsuo
Date:     2019-03-10 23:32:02 +0900 (Sun, 10 Mar 2019)
Log Message:
-----------
Merge branch 'trunk' into cmake

# Conflicts:
#	installer/release/lang/Japanese.lng
#	teraterm/teraterm/addsetting.cpp
#	teraterm/teraterm/vtwin.cpp
#	teraterm/teraterm/vtwin.h
#	teraterm/ttpdlg/ttdlg.c
#	teraterm/ttpdlg/ttpdlg.rc
#	ttssh2/ttxssh/ttxssh.c

Modified Paths:
--------------
    branches/cmake/doc/en/html/about/copyright.html
    branches/cmake/doc/en/html/about/history.html
    branches/cmake/doc/en/html/index.html
    branches/cmake/doc/en/html/macro/syntax/index.html
    branches/cmake/doc/en/html/menu/setup-additional.html
    branches/cmake/doc/en/html/menu/setup-sshkeygenerator.html
    branches/cmake/doc/en/html/menu/setup-terminal_ja.html
    branches/cmake/doc/en/html/menu/setup-terminal_ko.html
    branches/cmake/doc/en/html/menu/setup-terminal_utf8.html
    branches/cmake/doc/en/html/reference/develop.txt
    branches/cmake/doc/en/html/setup/teraterm-ini.html
    branches/cmake/doc/en/html/usage/mouse.html
    branches/cmake/doc/en/teraterm.hhc
    branches/cmake/doc/en/teraterm.hhp
    branches/cmake/doc/ja/html/about/copyright.html
    branches/cmake/doc/ja/html/about/history.html
    branches/cmake/doc/ja/html/index.html
    branches/cmake/doc/ja/html/macro/syntax/index.html
    branches/cmake/doc/ja/html/menu/setup-additional.html
    branches/cmake/doc/ja/html/menu/setup-sshkeygenerator.html
    branches/cmake/doc/ja/html/menu/setup-terminal.html
    branches/cmake/doc/ja/html/menu/setup-terminal_ko.html
    branches/cmake/doc/ja/html/menu/setup-terminal_utf8.html
    branches/cmake/doc/ja/html/reference/develop.txt
    branches/cmake/doc/ja/html/setup/teraterm-ini.html
    branches/cmake/doc/ja/html/usage/mouse.html
    branches/cmake/doc/ja/html/usage/unicode.html
    branches/cmake/doc/ja/teraterm.hhc
    branches/cmake/doc/ja/teraterm.hhp
    branches/cmake/installer/release/TERATERM.INI
    branches/cmake/installer/release/lang/English.lng
    branches/cmake/installer/release/lang/French.lng
    branches/cmake/installer/release/lang/German.lng
    branches/cmake/installer/release/lang/Japanese.lng
    branches/cmake/installer/release/lang/Korean.lng
    branches/cmake/installer/release/lang/Russian.lng
    branches/cmake/installer/release/lang/Simplified Chinese.lng
    branches/cmake/installer/release/lang/Traditional Chinese.lng
    branches/cmake/installer/release/license.txt
    branches/cmake/installer/teraterm.iss
    branches/cmake/teraterm/common/helpid.h
    branches/cmake/teraterm/common/tt-version.h
    branches/cmake/teraterm/common/ttlib.h
    branches/cmake/teraterm/keycode/keycode-version.rc
    branches/cmake/teraterm/teraterm/tt-version.rc
    branches/cmake/teraterm/teraterm/ttermpro.rc
    branches/cmake/teraterm/teraterm/ttime.c
    branches/cmake/teraterm/teraterm/vtdisp.c
    branches/cmake/teraterm/teraterm/vtdisp.h
    branches/cmake/teraterm/teraterm/vtterm.c
    branches/cmake/teraterm/teraterm/vtwin.cpp
    branches/cmake/teraterm/teraterm/vtwin.h
    branches/cmake/teraterm/ttpcmn/ttpcmn-version.rc
    branches/cmake/teraterm/ttpdlg/dlg_res.h
    branches/cmake/teraterm/ttpdlg/ttdlg.c
    branches/cmake/teraterm/ttpdlg/ttpdlg-version.rc
    branches/cmake/teraterm/ttpdlg/ttpdlg.rc
    branches/cmake/teraterm/ttpfile/ttpfile-version.rc
    branches/cmake/teraterm/ttpmacro/ttm-version.rc
    branches/cmake/teraterm/ttpmacro/ttpmacro.v10.vcxproj
    branches/cmake/teraterm/ttpmacro/ttpmacro.v11.vcxproj
    branches/cmake/teraterm/ttpmacro/ttpmacro.v9.vcproj
    branches/cmake/teraterm/ttpmacro/ttpmacro.vcproj
    branches/cmake/teraterm/ttpset/ttpset-version.rc
    branches/cmake/teraterm/ttpset/ttset.c
    branches/cmake/teraterm/ttptek/ttptek-version.rc
    branches/cmake/ttssh2/ttxssh/ssh.c
    branches/cmake/ttssh2/ttxssh/ttxssh-version.h
    branches/cmake/ttssh2/ttxssh/ttxssh-version.rc
    branches/cmake/ttssh2/ttxssh/ttxssh.c
    branches/cmake/ttssh2/ttxssh/ttxssh.h
    branches/cmake/ttssh2/ttxssh/ttxssh.rc

Added Paths:
-----------
    branches/cmake/doc/en/html/macro/syntax/file.html
    branches/cmake/doc/ja/html/macro/syntax/file.html

-------------- next part --------------
Modified: branches/cmake/doc/en/html/about/copyright.html
===================================================================
--- branches/cmake/doc/en/html/about/copyright.html	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/doc/en/html/about/copyright.html	2019-03-10 14:32:02 UTC (rev 7468)
@@ -41,7 +41,7 @@
 <h3 id="license_teraterm">License</h3>
 <pre>
 Copyright (C) 1994-1998 T. Teranishi
-(C) 2004-2018 TeraTerm Project
+(C) 2004-2019 TeraTerm Project
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -128,7 +128,7 @@
 <h3 id="license_ttssh">License</h3>
 <pre>
 (C)1998-2001 Robert O'Callahan
-(C) 2004-2018 TeraTerm Project
+(C) 2004-2019 TeraTerm Project
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

Modified: branches/cmake/doc/en/html/about/history.html
===================================================================
--- branches/cmake/doc/en/html/about/history.html	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/doc/en/html/about/history.html	2019-03-10 14:32:02 UTC (rev 7468)
@@ -31,23 +31,40 @@
 
 <h2 id="teraterm">Tera Term</h2>
 
-<h3 id="teraterm_4.102">2019.xx.xx (Ver 4.102)</h3>
+<h3 id="teraterm_4.103">2019.xx.xx (Ver 4.103)</h3>
 <ul class="history">
-  <!-- li>Changes
+  <li>Misc
     <ul>
-      <li></li>
+      <li>upgraded TTSSH to <a href="#ttssh_2.89">2.89</a>.</li>
     </ul>
-  </li -->
+  </li>
+</ul>
 
-  <!-- li>Bug fixes
+<h3 id="teraterm_4.102">2019.02.28 (Ver 4.102)</h3>
+<ul class="history">
+  <li>Changes
     <ul>
-      <li></li>
+      <li>The AlphaBlend VT window can be configured as a different value for each active and inative.</li>
+      <li>The value of transparency can be temporarily changed by moving the mouse wheel on the title bar of the VT window.</li>
+      <li>The internal implemention of the VT window was speeded up.</li>
+      <li>UTF-8: Four bytes character can not be shown yet but can be decoded, the impact range of character corruption was be minimized.</li>
+      <li>The language code(CodePage) of the "<a href="../menu/setup-terminal.html">Terminal ([Setup] menu)</a>" dialog(<a href="../usage/unicode.html">Unicode usage</a>).</li>
+      <li>MACRO: The macro file can support UTF-8 and UTF-16(with BOM) encoding.</li>
+      <li>MACRO: The <a href="../macro/command/getfileattr.html">getfileattr</a> command can be based on the current directory same as other command.</li>
+      <li>MARCO: The <a href="../macro/command/fileopen.html">fileopen</a> command can cause an error when a file is not found with read only mode.</li>
     </ul>
-  </li -->
+  </li>
 
+  <li>Bug fixes
+    <ul>
+      <li>When the AlphaBlend window is enabled, an application fault occurs on Windows 10.</li>
+    </ul>
+  </li>
+
   <li>Misc
     <ul>
       <li>upgraded TTSSH to <a href="#ttssh_2.88">2.88</a>.</li>
+      <li>upgraded Oniguruma to 6.9.1.</li>
     </ul>
   </li>
 </ul>
@@ -3084,13 +3101,35 @@
 
 <h2 id="ttssh">TTSSH</h2>
 
-<h3 id="ttssh_2.88">2019.xx.xx (Ver 2.88)</h3>
+<h3 id="ttssh_2.89">2019.xx.xx (Ver 2.89)</h3>
 <ul class="history">
+  <li>Bug fixes
+    <ul>
+      <li>garbage data is added to the CipherOrder and MacOrder settings when saving settings.</li>
+    </ul>
+  </li>
+</ul>
+
+<h3 id="ttssh_2.88">2019.02.28 (Ver 2.88)</h3>
+<ul class="history">
   <li>Changes
     <ul>
       <li>added <a href="../commandline/ttssh.html#ssh-N">/ssh-N commandline option</a> to disable a shell session when starting a connection.</li>
+      <li>Default state of <a href="../menu/setup-sshkeygenerator.html#kdf">bcrypt KDF checkbox</a> on <a href="../menu/setup-sshkeygenerator.html">SSH Key generator dialog</a> is changed to on.</li>
     </ul>
   </li>
+
+  <li>Bug fixes
+    <ul>
+      <li>Can't change password on SSH Change Password dialog when old password is empty string.</li>
+    </ul>
+  </li>
+
+  <li>Misc
+    <ul>
+      <li>upgraded OpenSSL to 1.0.2r.</li>
+    </ul>
+  </li>
 </ul>
 
 <h3 id="ttssh_2.87">2018.11.30 (Ver 2.87)</h3>

Modified: branches/cmake/doc/en/html/index.html
===================================================================
--- branches/cmake/doc/en/html/index.html	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/doc/en/html/index.html	2019-03-10 14:32:02 UTC (rev 7468)
@@ -13,7 +13,7 @@
 
 <p class="center">
 Copyright (C) 1994-1998 T. Teranishi<BR>
-(C) 2004-2018 TeraTerm Project<BR>
+(C) 2004-2019 TeraTerm Project<BR>
 All Rights Reserved.<BR>
 </p>
 

Added: branches/cmake/doc/en/html/macro/syntax/file.html
===================================================================
--- branches/cmake/doc/en/html/macro/syntax/file.html	                        (rev 0)
+++ branches/cmake/doc/en/html/macro/syntax/file.html	2019-03-10 14:32:02 UTC (rev 7468)
@@ -0,0 +1,82 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+  "http://www.w3.org/TR/html4/strict.dtd">
+<HTML>
+<HEAD>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<TITLE>TTL file</TITLE>
+<META http-equiv="Content-Style-Type" content="text/css">
+<link rel="stylesheet" href="../../style.css" type="text/css">
+</HEAD>
+<BODY>
+
+<h1>Encoding</h1>
+
+<p>
+The Unicode (UTF-8, UTF-16BE, UTF-16LE) can be supported from Tera Term 4.102.
+</p>
+
+<p>
+The TTL file was processed as ANSI CodePage in previous version.
+</p>
+
+<h2>Supporting encoding</h2>
+
+<table>
+  <tr>
+    <th>encoding</th>
+    <th>support</th>
+  </tr>
+  <tr>
+    <td>Usually (ANSI CodePage)</td>
+    <td>Support</td>
+  </tr>
+  <tr>
+    <td>UTF-8 (with BOM)</td>
+    <td>Support<td>
+  </tr>
+  <tr>
+    <td>UTF-8 (without BOM)</td>
+    <td>Support<td>
+  </tr>
+  <tr>
+    <td>UTF-16BE (without BOM)</td>
+    <td>Not support<td>
+  </tr>
+  <tr>
+    <td>UTF-16LE (without BOM)</td>
+    <td>Not support<td>
+  </tr>
+  <tr>
+    <td>UTF-16 (with BE BOM)</td>
+    <td>Support<td>
+  </tr>
+  <tr>
+    <td>UTF-16 (with LE BOM)</td>
+    <td>Support<td>
+  </tr>
+  <tr>
+    <td>UTF-16 (without BOM = UTF-16BE)</td>
+    <td>Not support<td>
+  </tr>
+</table>
+
+<h2>Encoding determination</h2>
+
+<p>
+Tera Term determines the encoding as follows.
+</p>
+
+<dl>
+  <dt>When BOM exists</dt>
+  <dd>Tera Term determines one of UTF-8, UTF-16BE and UTF-16LE from BOM type, next reading the file.</dd>
+
+  <dt>When BOM does not exist</dt>
+  <dd>
+    <ul>
+      <li>Reading the file as UTF-8.</li>
+      <li>Reading the file as CP_ACP (same as before 4.102) when the file can not be decoded as UTF-8.</li>
+    </ul>
+  </dd>
+</dl>
+</body>
+</html>

Modified: branches/cmake/doc/en/html/macro/syntax/index.html
===================================================================
--- branches/cmake/doc/en/html/macro/syntax/index.html	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/doc/en/html/macro/syntax/index.html	2019-03-10 14:32:02 UTC (rev 7468)
@@ -16,6 +16,7 @@
 </p>
 
 <UL>
+ <LI><A HREF="file.html">TTL file</A></LI>
  <LI><A HREF="types.html">Types</A></LI>
  <LI><A HREF="formats.html">Formats of constants</A></LI>
  <LI><A HREF="identifiers.html">Identifiers and reserved words</A></LI>

Modified: branches/cmake/doc/en/html/menu/setup-additional.html
===================================================================
--- branches/cmake/doc/en/html/menu/setup-additional.html	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/doc/en/html/menu/setup-additional.html	2019-03-10 14:32:02 UTC (rev 7468)
@@ -258,10 +258,11 @@
 
     <h2 id="TabVisual">"Visual" tab</h2>
     <dl>
-      <dt id="AlphaBlend">AlphaBlend</dt>
+      <dt id="AlphaBlendActive">Window Transparency / Active</dt>
+      <dt id="AlphaBlend">Window Transparency / Inactive</dt>
       <dd>
-	You can setup the value of transparency. The range of transparency
-	is from 0 to 255. The more transparency reduces the value, the more
+	You can set up the value of transparency when the window is active (on focus) and not active (non-focus).
+	The range of transparency is from 0 to 255. The more transparency reduces the value, the more
 	window transparency is blinding.
       </dd>
 

Modified: branches/cmake/doc/en/html/menu/setup-sshkeygenerator.html
===================================================================
--- branches/cmake/doc/en/html/menu/setup-sshkeygenerator.html	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/doc/en/html/menu/setup-sshkeygenerator.html	2019-03-10 14:32:02 UTC (rev 7468)
@@ -18,55 +18,55 @@
     </p>
 
     <dl>
-      <dt>Key type</dt>
+      <dt id="type">Key type</dt>
       <dd>Specify the type of key to generate.
         <dl>
-          <dt>RSA1</dt>
+          <dt id="rsa1">RSA1</dt>
           <dd>Generate SSH1 RSA key.</dd>
 
-          <dt>RSA</dt>
+          <dt id="rsa">RSA</dt>
           <dd>Generate SSH2 RSA key.</dd>
 
-          <dt>DSA</dt>
+          <dt id="dsa">DSA</dt>
           <dd>Generate SSH2 DSA key.<br />
           The DSA key does not have 1024 bits is invalid, so the key can not be generated because the key will not be used for some servers.<br />
           If the key bits is over 1024, the security level can not be stronger. Please use the RSA and ECDSA key algorithm if your security level is higher.</dd>
 
-          <dt>ECDSA-256</dt>
+          <dt id="ecdsa256">ECDSA-256</dt>
           <dd>Generate SSH2 ECDSA(256bit) key.</dd>
 
-          <dt>ECDSA-384</dt>
+          <dt id="ecdsa384">ECDSA-384</dt>
           <dd>Generate SSH2 ECDSA(384bit) key.</dd>
 
-          <dt>ECDSA-521</dt>
+          <dt id="ecdsa521">ECDSA-521</dt>
           <dd>Generate SSH2 ECDSA(521bit) key.</dd>
           
-          <dt>ED25519</dt>
+          <dt id="ed25519">ED25519</dt>
           <dd>Generate SSH2 ED25519 key.</dd>
         </dl>
       </dd>
 
-      <dt>Key Bits</dt>
+      <dt id="bits">Key Bits</dt>
       <dd>Specify the key length to generate. </dd>
 
-      <dt>bcrypt KDF</dt>
+      <dt id="kdf">bcrypt KDF</dt>
       <dd>Specify the bcrypt KDF format of the private key.</dd>
 
-      <dt>Generate</dt>
+      <dt id="generate">Generate</dt>
       <dd>Generate the key.</dd>
 
-      <dt>Key passphrase</dt>
+      <dt id="passphrase">Key passphrase</dt>
       <dd>Specify passphrase of private key.</dd>
 
-      <dt>Confirm passphrase</dt>
+      <dt id="confirm_pass">Confirm passphrase</dt>
       <dd>Confirm passphrase of private key.
           Please input the same passphrase as Key passphrase.
       </dd>
 
-      <dt>Save public key</dt>
+      <dt id="save_public">Save public key</dt>
       <dd>Save public key.<dd>
 
-      <dt>Save private key</dt>
+      <dt id="save_private">Save private key</dt>
       <dd>Save private key<br />
       The private key is encrypted by the AES-128 algorithm. 
       The key is encrypted by the 3DES into the Tera Term 4.76(TTSSH 2.63) before.</dd>

Modified: branches/cmake/doc/en/html/menu/setup-terminal_ja.html
===================================================================
--- branches/cmake/doc/en/html/menu/setup-terminal_ja.html	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/doc/en/html/menu/setup-terminal_ja.html	2019-03-10 14:32:02 UTC (rev 7468)
@@ -159,11 +159,6 @@
 	Refer to <a href="../usage/unicode.html">Unicode</a> for details.
       </dd>
 
-      <dt id="CodePage">CodePage</dt>
-      <dd>
-	Codepage setting.
-	Refer to <a href="../usage/unicode.html">Unicode</a> for details.
-      </dd>
     </dl>
   </body>
 </html>

Modified: branches/cmake/doc/en/html/menu/setup-terminal_ko.html
===================================================================
--- branches/cmake/doc/en/html/menu/setup-terminal_ko.html	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/doc/en/html/menu/setup-terminal_ko.html	2019-03-10 14:32:02 UTC (rev 7468)
@@ -125,11 +125,6 @@
 	Refer to <a href="../usage/unicode.html">Unicode</a> for details.
       </dd>
 
-      <dt id="CodePage">CodePage</dt>
-      <dd>
-	Codepage setting.
-	Refer to <a href="../usage/unicode.html">Unicode</a> for details.
-      </dd>
     </dl>
   </body>
 </html>

Modified: branches/cmake/doc/en/html/menu/setup-terminal_utf8.html
===================================================================
--- branches/cmake/doc/en/html/menu/setup-terminal_utf8.html	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/doc/en/html/menu/setup-terminal_utf8.html	2019-03-10 14:32:02 UTC (rev 7468)
@@ -125,11 +125,6 @@
 	Refer to <a href="../usage/unicode.html">Unicode</a> for details.
       </dd>
 
-      <dt id="CodePage">CodePage</dt>
-      <dd>
-	Codepage setting.
-	Refer to <a href="../usage/unicode.html">Unicode</a> for details.
-      </dd>
     </dl>
   </body>
 </html>

Modified: branches/cmake/doc/en/html/reference/develop.txt
===================================================================
--- branches/cmake/doc/en/html/reference/develop.txt	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/doc/en/html/reference/develop.txt	2019-03-10 14:32:02 UTC (rev 7468)
@@ -44,8 +44,8 @@
 
 
 * Libraries
-- Oniguruma 6.9.0 (https://github.com/kkos/oniguruma)
-- OpenSSL 1.0.2q (http://www.openssl.org/)
+- Oniguruma 6.9.1 (https://github.com/kkos/oniguruma)
+- OpenSSL 1.0.2r (http://www.openssl.org/)
 - zlib 1.2.11 (http://www.zlib.net/)
 - PuTTY 0.70 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
 - SFMT 1.5.1 (http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index.html)

Modified: branches/cmake/doc/en/html/setup/teraterm-ini.html
===================================================================
--- branches/cmake/doc/en/html/setup/teraterm-ini.html	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/doc/en/html/setup/teraterm-ini.html	2019-03-10 14:32:02 UTC (rev 7468)
@@ -112,8 +112,8 @@
 	<tr>
 		<td id="AlphaBlend"><a href="../menu/setup-additional.html#AlphaBlend">AlphaBlend</a></td>
 		<td style="width:250px;">255</td>
-		<td style="width:250px;">&lt;-</td>
-		<td></td>
+		<td style="width:250px;">*</td>
+		<td>* the value of <a href="#AlphaBlend">AlphaBlend</a> setting is used.</td>
 	</tr>
 	<tr>
 		<td id="AlternateScreenBuffer"><a href="teraterm-term.html#AltScr">AlternateScreenBuffer</a></td>
@@ -284,12 +284,6 @@
 		<td></td>
 	</tr>
 	<tr>
-		<td id="CodePage">CodePage</td>
-		<td style="width:250px;">*</td>
-		<td style="width:250px;">932</td>
-		<td>* by the installer</td>
-	</tr>
-	<tr>
 		<td id="ComPort"><a href="../menu/setup-serialport.html#ComPort">ComPort</a></td>
 		<td style="width:250px;">1</td>
 		<td style="width:250px;">&lt;-</td>

Modified: branches/cmake/doc/en/html/usage/mouse.html
===================================================================
--- branches/cmake/doc/en/html/usage/mouse.html	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/doc/en/html/usage/mouse.html	2019-03-10 14:32:02 UTC (rev 7468)
@@ -16,9 +16,13 @@
 </h2>
 
 <dl>
-<dt>Wheel mouse</dt>
-<dd>This package supports wheel mouse button. Also, a user can send cursor key sequences as the mouse wheel rotating when the application cursor mode is enabled by starting vi or less command.</dd>
+<dt>Mouse wheel</dt>
+<dd>This package supports mouse wheel button. Also, a user can send cursor key sequences as the mouse wheel rotating when the application cursor mode is enabled by starting vi or less command.</dd>
 
+<dt>Mouse wheel on title bar</dt>
+<dd>The value of transparency can be temporarily changed by moving the mouse wheel on the title bar (NOTE: This value can not be recorded).<br />
+    When active status of the window is changed, <a href="../menu/setup-additional.html#AlphaBlendActive">the value of transparency</a> switches to set value.</dd>
+
 <dt>Dragging with the left button</dt>
 <dd>Selects text, and copies it to the clipboard.</dd>
 

Modified: branches/cmake/doc/en/teraterm.hhc
===================================================================
--- branches/cmake/doc/en/teraterm.hhc	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/doc/en/teraterm.hhc	2019-03-10 14:32:02 UTC (rev 7468)
@@ -620,6 +620,11 @@
 			</OBJECT>
 		<UL>
 			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="TTL file">
+				<param name="Local" value="html\macro\syntax\file.html">
+				<param name="ImageNumber" value="11">
+				</OBJECT>
+			<LI> <OBJECT type="text/sitemap">
 				<param name="Name" value="Types">
 				<param name="Local" value="html\macro\syntax\types.html">
 				<param name="ImageNumber" value="11">

Modified: branches/cmake/doc/en/teraterm.hhp
===================================================================
--- branches/cmake/doc/en/teraterm.hhp	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/doc/en/teraterm.hhp	2019-03-10 14:32:02 UTC (rev 7468)
@@ -182,6 +182,7 @@
 HlpMacroCommandline=html\macro\commandline.html
 HlpMacroAssoc=html\macro\howtoassoc.html
 HlpMacroSyntax=html\macro\syntax\index.html
+HlpMacroSyntaxFile=html\macro\syntax\file.html
 HlpMacroSyntaxType=html\macro\syntax\types.html
 HlpMacroSyntaxFormat=html\macro\syntax\formats.html
 HlpMacroSyntaxIdent=html\macro\syntax\identifiers.html

Modified: branches/cmake/doc/ja/html/about/copyright.html
===================================================================
--- branches/cmake/doc/ja/html/about/copyright.html	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/doc/ja/html/about/copyright.html	2019-03-10 14:32:02 UTC (rev 7468)
@@ -41,7 +41,7 @@
 <h3 id="license_teraterm">\x83\x89\x83C\x83Z\x83\x93\x83X</h3>
 <pre>
 Copyright (C) 1994-1998 T. Teranishi
-(C) 2004-2018 TeraTerm Project
+(C) 2004-2019 TeraTerm Project
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -121,7 +121,7 @@
 <h3 id="license_ttssh">\x83\x89\x83C\x83Z\x83\x93\x83X</h3>
 <pre>
 (C)1998-2001 Robert O'Callahan
-(C) 2004-2018 TeraTerm Project
+(C) 2004-2019 TeraTerm Project
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

Modified: branches/cmake/doc/ja/html/about/history.html
===================================================================
--- branches/cmake/doc/ja/html/about/history.html	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/doc/ja/html/about/history.html	2019-03-10 14:32:02 UTC (rev 7468)
@@ -31,23 +31,40 @@
 
 <h2 id="teraterm">Tera Term</h2>
 
-<h3 id="teraterm_4.102">2019.xx.xx (Ver 4.102)</h3>
+<h3 id="teraterm_4.103">2019.xx.xx (Ver 4.103)</h3>
 <ul class="history">
-  <!-- li>\x95ύX
+  <li>\x82\xBB\x82̑\xBC
     <ul>
-      <li></li>
+      <li><a href="#ttssh_2.89">TTSSH(2.89)</a>\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li>
     </ul>
-  </li -->
+  </li>
+</ul>
 
-  <!-- li>\x83o\x83O\x8FC\x90\xB3
+<h3 id="teraterm_4.102">2019.02.28 (Ver 4.102)</h3>
+<ul class="history">
+  <li>\x95ύX
     <ul>
-      <li></li>
+      <li>VT \x83E\x83B\x83\x93\x83h\x83E\x82̓\xA7\x89ߐݒ\xE8\x82\xF0\x81A\x83A\x83N\x83e\x83B\x83u/\x94\xF1\x83A\x83N\x83e\x83B\x83u\x8E\x9E\x82̊e\x81X\x82ŕʂ̒l\x82\xF0\x90ݒ\xE8\x82ł\xAB\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+      <li>VT \x83E\x83B\x83\x93\x83h\x83E\x82̃^\x83C\x83g\x83\x8B\x83o\x81[\x8F\xE3\x82Ń}\x83E\x83X\x83z\x83C\x81[\x83\x8B\x82𑀍삷\x82邱\x82ƂŁA\x83E\x83B\x83\x93\x83h\x83E\x82̓\xA7\x89ߒl\x82\xF0\x88ꎞ\x93I\x82ɕύX\x82ł\xAB\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+      <li>VT \x83E\x83B\x83\x93\x83h\x83E\x82̓\xE0\x95\x94\x8F\x88\x97\x9D\x82\xF0\x8D\x82\x91\xAC\x89\xBB\x82\xB5\x82\xBD\x81B</li>
+      <li>UTF-8 \x82\xC5 4 \x83o\x83C\x83g\x82ɂȂ镶\x8E\x9A\x82\xF0\x81i\x95\\x8E\xA6\x82ł\xAB\x82Ȃ\xA2\x82\xAA\x81j\x90\xB3\x82\xB5\x82\xAD\x83f\x83R\x81[\x83h\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x81A\x95\xB6\x8E\x9A\x89\xBB\x82\xAF\x82\xB7\x82\xE9\x94͈͂\xAA\x8Dŏ\xAC\x8C\xC0\x82ɂȂ\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+      <li>"<a href="../menu/setup-terminal.html">Terminal setup[\x92[\x96\x96\x82̐ݒ\xE8]</a>" \x83_\x83C\x83A\x83\x8D\x83O\x82̌\xBE\x8C\xEA\x83R\x81[\x83h(CodePage)\x90ݒ\xE8\x82\xF0\x8D폜\x82\xB5\x82\xBD\x81B(<a href="../usage/unicode.html">Unicode\x90ݒ\xE8</a>)</li>
+      <li>\x83}\x83N\x83\x8D\x83t\x83@\x83C\x83\x8B\x82̃G\x83\x93\x83R\x81[\x83f\x83B\x83\x93\x83O\x82Ƃ\xB5\x82\xC4 UTF-8, UTF-16(with BOM)\x82ɑΉ\x9E\x82\xB5\x82\xBD\x81B</li>
+      <li><a href="../macro/command/getfileattr.html">getfileattr</a> \x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82ŁA\x91\xBC\x82̃R\x83}\x83\x93\x83h\x82Ɠ\xAF\x97l\x82ɃJ\x83\x8C\x83\x93\x83g\x83t\x83H\x83\x8B\x83_\x82\xF0\x8A\x82Ƃ\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+      <li><a href="../macro/command/fileopen.html">fileopen</a> \x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82ŁA\x93ǂݎ\xE6\x82\xE8\x90\xEA\x97p\x83\x82\x81[\x83h\x8E\x9E\x82Ƀt\x83@\x83C\x83\x8B\x82\xAA\x82Ȃ\xA2\x8Fꍇ\x82̓G\x83\x89\x81[\x82ƂȂ\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
     </ul>
-  </li -->
+  </li>
 
+  <li>\x83o\x83O\x8FC\x90\xB3
+    <ul>
+      <li>\x83E\x83B\x83\x93\x83h\x83E\x82̓\xA7\x89ߐݒ肪\x97L\x8C\xF8\x82\xBE\x82\xC6 Windows 10 \x82ŗ\x8E\x82\xBF\x82\xE9\x96\xE2\x91\xE8\x82ɑΉ\x9E\x82\xB5\x82\xBD\x81B</li>
+    </ul>
+  </li>
+
   <li>\x82\xBB\x82̑\xBC
     <ul>
       <li><a href="#ttssh_2.88">TTSSH(2.88)</a>\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li>
+      <li>Oniguruma 6.9.1\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li>
     </ul>
   </li>
 </ul>
@@ -3090,13 +3107,35 @@
 
 <h2 id="ttssh">TTSSH</h2>
 
-<h3 id="ttssh_2.88">2019.xx.xx (Ver 2.88)</h3>
+<h3 id="ttssh_2.89">2019.xx.xx (Ver 2.89)</h3>
 <ul class="history">
+  <li>\x83o\x83O\x8FC\x90\xB3
+    <ul>
+      <li>\x90ݒ\xE8\x82̕ۑ\xB6\x8E\x9E\x81ACipherOrder, MacOrder \x90ݒ\xE8\x82ɃS\x83~\x82\xAA\x95t\x89\xC1\x82\xB3\x82\xEA\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+    </ul>
+  </li>
+</ul>
+
+<h3 id="ttssh_2.88">2019.02.28 (Ver 2.88)</h3>
+<ul class="history">
   <li>\x95ύX
     <ul>
       <li>\x90ڑ\xB1\x8AJ\x8En\x8E\x9E\x82ɃV\x83F\x83\x8B\x83Z\x83b\x83V\x83\x87\x83\x93\x82\xF0\x8AJ\x8En\x82\xB5\x82Ȃ\xA2\x88ׂ\xCC <a href="../commandline/ttssh.html#ssh-N">/ssh-N</a> \x83R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x83I\x83v\x83V\x83\x87\x83\x93\x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B</li>
+      <li><a href="../menu/setup-sshkeygenerator.html">SSH\x8C\xAE\x90\xB6\x90\xAC\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCC <a href="../menu/setup-sshkeygenerator.html#kdf">bcrypt KDF \x83`\x83F\x83b\x83N\x83{\x83b\x83N\x83X</a>\x82̃f\x83t\x83H\x83\x8B\x83g\x82\xF0 on \x82ɕύX\x82\xB5\x82\xBD\x81B</li>
     </ul>
   </li>
+
+  <li>\x83o\x83O\x8FC\x90\xB3
+    <ul>
+      <li>\x8B\x8C\x83p\x83X\x83\x8F\x81[\x83h\x82\xAA\x8B󕶎\x9A\x97\xF1\x82̎\x9E\x81ASSH \x83p\x83X\x83\x8F\x81[\x83h\x95ύX\x83_\x83C\x83A\x83\x8D\x83O\x82Ńp\x83X\x83\x8F\x81[\x83h\x82\xAA\x95ύX\x8Fo\x97\x88\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+    </ul>
+  </li>
+
+  <li>\x82\xBB\x82̑\xBC
+    <ul>
+      <li>OpenSSL 1.0.2r\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li>
+    </ul>
+  </li>
 </ul>
 
 <h3 id="ttssh_2.87">2018.11.30 (Ver 2.87)</h3>

Modified: branches/cmake/doc/ja/html/index.html
===================================================================
--- branches/cmake/doc/ja/html/index.html	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/doc/ja/html/index.html	2019-03-10 14:32:02 UTC (rev 7468)
@@ -13,7 +13,7 @@
 
 <p class="center">
 Copyright (C) 1994-1998 T. Teranishi<BR>
-(C) 2004-2018 TeraTerm Project<BR>
+(C) 2004-2019 TeraTerm Project<BR>
 All Rights Reserved.<BR>
 </p>
 

Added: branches/cmake/doc/ja/html/macro/syntax/file.html
===================================================================
--- branches/cmake/doc/ja/html/macro/syntax/file.html	                        (rev 0)
+++ branches/cmake/doc/ja/html/macro/syntax/file.html	2019-03-10 14:32:02 UTC (rev 7468)
@@ -0,0 +1,82 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+  "http://www.w3.org/TR/html4/strict.dtd">
+<HTML>
+<HEAD>
+<meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
+<TITLE>TTL\x83t\x83@\x83C\x83\x8B</TITLE>
+<META http-equiv="Content-Style-Type" content="text/css">
+<link rel="stylesheet" href="../../style.css" type="text/css">
+</HEAD>
+<BODY>
+
+<h1>\x83G\x83\x93\x83R\x81[\x83f\x83B\x83\x93\x83O</h1>
+
+<p>
+Tera Term 4.102\x82\xE6\x82\xE8\x81AUnicode (UTF-8, UTF-16BE, UTF-16LE) \x82ɑΉ\x9E\x82\xB5\x82܂\xB5\x82\xBD\x81B
+</p>
+
+<p>
+\x8F]\x97\x88\x82\xCDANSI CodePage\x82Ƃ\xB5\x82ď\x88\x97\x9D\x82\xB5\x82Ă\xA2\x82܂\xB5\x82\xBD\x81B
+</p>
+
+<h2>\x83T\x83|\x81[\x83g\x82\xB7\x82\xE9\x83G\x83\x93\x83R\x81[\x83f\x83B\x83\x93\x83O</h2>
+
+<table>
+  <tr>
+    <th>encoding</th>
+    <th>support</th>
+  </tr>
+  <tr>
+    <td>\x8F]\x97\x88\x82ǂ\xA8\x82\xE8 (ANSI CodePage)</td>
+    <td>Support</td>
+  </tr>
+  <tr>
+    <td>UTF-8 (with BOM)</td>
+    <td>Support<td>
+  </tr>
+  <tr>
+    <td>UTF-8 (without BOM)</td>
+    <td>Support<td>
+  </tr>
+  <tr>
+    <td>UTF-16BE (without BOM)</td>
+    <td>Not support<td>
+  </tr>
+  <tr>
+    <td>UTF-16LE (without BOM)</td>
+    <td>Not support<td>
+  </tr>
+  <tr>
+    <td>UTF-16 (with BE BOM)</td>
+    <td>Support<td>
+  </tr>
+  <tr>
+    <td>UTF-16 (with LE BOM)</td>
+    <td>Support<td>
+  </tr>
+  <tr>
+    <td>UTF-16 (without BOM = UTF-16BE)</td>
+    <td>Not support<td>
+  </tr>
+</table>
+
+<h2>\x83G\x83\x93\x83R\x81[\x83f\x83B\x83\x93\x83O\x82̔\xBB\x92\xE8</h2>
+
+<p>
+Tera Term\x82͎\x9F\x82̂悤\x82ɔ\xBB\x92肵\x82܂\xB7\x81B
+</p>
+
+<dl>
+  <dt>BOM\x82\xAA\x82\xA0\x82\xE9\x8Fꍇ</dt>
+  <dd>BOM\x82̎\xED\x95ʂ\xA9\x82\xE7UTF-8, UTF-16BE, UTF-16LE\x82𔻒肵\x82ēǂݍ\x9E\x82\xDE</dd>
+
+  <dt>BOM\x82\xAA\x82Ȃ\xA2\x8Fꍇ</dt>
+  <dd>
+    <ul>
+      <li>UTF-8\x82Ƃ\xB5\x82ēǂݍ\x9E\x82\xDE</li>
+      <li>UTF-8\x82Ƃ\xB5\x82ăf\x83R\x81[\x83h\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD\x8Fꍇ\x82\xCDCP_ACP(4.102\x88ȑO\x82Ɠ\xAF\x82\xB6)\x82Ƃ\xB5\x82ēǂݍ\x9E\x82\xDE</li>
+    </ul>
+  </dd>
+</dl>
+</body>
+</html>

Modified: branches/cmake/doc/ja/html/macro/syntax/index.html
===================================================================
--- branches/cmake/doc/ja/html/macro/syntax/index.html	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/doc/ja/html/macro/syntax/index.html	2019-03-10 14:32:02 UTC (rev 7468)
@@ -16,6 +16,7 @@
 </p>
 
 <UL>
+ <LI><A HREF="file.html">TTL\x83t\x83@\x83C\x83\x8B</A></LI>
  <LI><A HREF="types.html">\x83f\x81[\x83^\x8C^</A></LI>
  <LI><A HREF="formats.html">\x92萔\x82̌`\x8E\xAE</A></LI>
  <LI><A HREF="identifiers.html">\x96\xBC\x91O\x82̌`\x8E\xAE</A></LI>

Modified: branches/cmake/doc/ja/html/menu/setup-additional.html
===================================================================
--- branches/cmake/doc/ja/html/menu/setup-additional.html	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/doc/ja/html/menu/setup-additional.html	2019-03-10 14:32:02 UTC (rev 7468)
@@ -255,10 +255,11 @@
 
     <h2 id="TabVisual">"Visual" \x83^\x83u</h2>
     <dl>
-      <dt id="AlphaBlend">AlphaBlend</dt>
+      <dt id="AlphaBlendActive">Window Transparency / Active</dt>
+      <dt id="AlphaBlend">Window Transparency / Inactive</dt>
       <dd>
-	\x93\xA7\x96\xBE\x93x\x82\xCD0\x81`255\x82͈̔͂Ŏw\x92肷\x82邱\x82Ƃ\xAA\x82ł\xAB\x81A
-	\x92l\x82\xF0\x8F\xAC\x82\xB3\x82\xAD\x82\xB7\x82\xE9\x82قǓ\xA7\x96\xBE\x93x\x82͋\xAD\x82\xAD\x82Ȃ\xE8\x82܂\xB7\x81B
+	VT \x83E\x83B\x83\x93\x83h\x83E\x82\xAA\x83A\x83N\x83e\x83B\x83u(\x83t\x83H\x81[\x83J\x83X\x82\xAA\x82\xA0\x82\xE9)\x8E\x9E\x81A\x82\xA8\x82\xE6\x82є\xF1\x83A\x83N\x83e\x83B\x83u(\x83t\x83H\x81[\x83J\x83X\x82\xAA\x82Ȃ\xA2)\x8E\x9E\x82̓\xA7\x96\xBE\x93x\x82\xF0\x90ݒ\xE8\x82ł\xAB\x82܂\xB7\x81B
+	\x92l\x82\xCD0\x81`255\x82͈̔͂Ŏw\x92肷\x82邱\x82Ƃ\xAA\x82ł\xAB\x81A\x92l\x82\xF0\x8F\xAC\x82\xB3\x82\xAD\x82\xB7\x82\xE9\x82قǓ\xA7\x96\xBE\x93x\x82͋\xAD\x82\xAD\x82Ȃ\xE8\x82܂\xB7\x81B
       </dd>
 
       <dt>Eterm lookfeel</dt>

Modified: branches/cmake/doc/ja/html/menu/setup-sshkeygenerator.html
===================================================================
--- branches/cmake/doc/ja/html/menu/setup-sshkeygenerator.html	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/doc/ja/html/menu/setup-sshkeygenerator.html	2019-03-10 14:32:02 UTC (rev 7468)
@@ -18,56 +18,56 @@
     </p>
 
     <dl>
-      <dt>Key type</dt>
+      <dt id="type">Key type</dt>
       <dd>\x90\xB6\x90\xAC\x82\xB7\x82錮\x82̎\xED\x97ނ\xF0\x8Ew\x92肵\x82܂\xB7\x81B
         <dl>
-          <dt>RSA1</dt>
+          <dt id="rsa1">RSA1</dt>
           <dd>SSH1\x97p RSA\x8C\xAE\x82𐶐\xAC\x82\xB5\x82܂\xB7\x81B</dd>
 
-          <dt>RSA</dt>
+          <dt id="rsa">RSA</dt>
           <dd>SSH2\x97p RSA\x8C\xAE\x82𐶐\xAC\x82\xB5\x82܂\xB7\x81B</dd>
 
-          <dt>DSA</dt>
+          <dt id="dsa">DSA</dt>
           <dd>SSH2\x97p DSA\x8C\xAE\x82𐶐\xAC\x82\xB5\x82܂\xB7\x81B<br />
           \x8C\xAE\x92\xB7\x82\xAA1024\x83r\x83b\x83g\x88ȊO\x82\xCCDSA\x8C\xAE\x82́ASSH\x83v\x83\x8D\x83g\x83R\x83\x8B\x82Ƃ\xB5\x82Ĕ񐳋K\x82̌\xAE\x82ł\xA0\x82\xE8\x81A\x83T\x81[\x83o\x82ɂ\xE6\x82\xC1\x82Ă͎g\x82\xA6\x82Ȃ\xA2\x89”\\x90\xAB\x82\xAA\x82\xA0\x82\xE8\x82܂\xB7\x82̂ō쐬\x82ł\xAB\x82܂\xB9\x82\xF1\x81B<br />
           DSA\x8C\xAE\x82̌\xAE\x92\xB7\x82\xF01024\x83r\x83b\x83g\x82\xE6\x82\xE8\x91傫\x82\xAD\x82\xB5\x82Ă\xE0\x81A\x83Z\x83L\x83\x85\x83\x8A\x83e\x83B\x82\xF0\x8D\x82\x82߂鎖\x82ɂ͂Ȃ\xE8\x82܂\xB9\x82\xF1\x81B \x82\xE6\x82苭\x93x\x82̍\x82\x82\xA2\x8C\xAE\x82\xF0\x8Eg\x82\xA2\x82\xBD\x82\xA2\x8Fꍇ\x82́ARSA\x8C\xAE\x82\xE2ECDSA\x8C\xAE\x82\xF0\x8Eg\x97p\x82\xB5\x82ĉ\xBA\x82\xB3\x82\xA2\x81B</dd>
 
-          <dt>ECDSA-256</dt>
+          <dt id="ecdsa256">ECDSA-256</dt>
           <dd>SSH2\x97p ECDSA(256bit)\x8C\xAE\x82𐶐\xAC\x82\xB5\x82܂\xB7\x81B</dd>
 
-          <dt>ECDSA-384</dt>
+          <dt id="ecdsa384">ECDSA-384</dt>
           <dd>SSH2\x97p ECDSA(384bit)\x8C\xAE\x82𐶐\xAC\x82\xB5\x82܂\xB7\x81B</dd>
 
-          <dt>ECDSA-521</dt>
+          <dt id="ecdsa521">ECDSA-521</dt>
           <dd>SSH2\x97p ECDSA(521bit)\x8C\xAE\x82𐶐\xAC\x82\xB5\x82܂\xB7\x81B</dd>
 
-          <dt>ED25519</dt>
+          <dt id="ed25519">ED25519</dt>
           <dd>SSH2\x97p ED25519\x8C\xAE\x82𐶐\xAC\x82\xB5\x82܂\xB7\x81B</dd>
         </dl>
       </dd>
 
-      <dt>Key Bits</dt>
+      <dt id="bits">Key Bits</dt>
       <dd>\x90\xB6\x90\xAC\x82\xB7\x82錮\x82̌\xAE\x92\xB7\x82\xF0\x8Ew\x92肵\x82܂\xB7\x81B</dd>
 
-      <dt>bcrypt KDF</dt>
+      <dt id="kdf">bcrypt KDF</dt>
       <dd>\x94閧\x8C\xAE\x83t\x83H\x81[\x83}\x83b\x83g\x82Ƃ\xB5\x82\xC4 bcrypt KDF \x82\xF0\x8Ew\x92肵\x82܂\xB7\x81B</dd>
 
-      <dt>Generate</dt>
+      <dt id="generate">Generate</dt>
       <dd>\x8C\xAE\x82𐶐\xAC\x82\xB5\x82܂\xB7\x81B</dd>
 
-      <dt>Key passphrase</dt>
+      <dt id="passphrase">Key passphrase</dt>
       <dd>\x90\xB6\x90\xAC\x82\xB5\x82\xBD\x94閧\x8C\xAE\x82ɕt\x82\xAF\x82\xE9\x83p\x83X\x83t\x83\x8C\x81[\x83Y\x82\xF0\x8Ew\x92肵\x82܂\xB7\x81B</dd>
 
-      <dt>Confirm passphrase</dt>
+      <dt id="confirm_pass">Confirm passphrase</dt>
       <dd>
         \x94閧\x8C\xAE\x82ɕt\x82\xAF\x82\xE9\x83p\x83X\x83t\x83\x8C\x81[\x83Y\x82̊m\x94F\x82\xF0\x82\xB5\x82܂\xB7\x81B
         Key passphrase\x82Ɠ\xAF\x82\xB6\x82\xE0\x82̂\xF0\x93\xFC\x97͂\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
       </dd>
 
-      <dt>Save public key</dt>
+      <dt id="save_pulic">Save public key</dt>
       <dd>\x90\xB6\x90\xAC\x82\xB5\x82\xBD\x8C\xF6\x8AJ\x8C\xAE\x82\xF0\x95ۑ\xB6\x82\xB5\x82܂\xB7\x81B</dd>
 
-      <dt>Save private key</dt>
+      <dt id="save_private">Save private key</dt>
       <dd>\x90\xB6\x90\xAC\x82\xB5\x82\xBD\x94閧\x8C\xAE\x82\xF0\x95ۑ\xB6\x82\xB5\x82܂\xB7\x81B<br />
       \x94閧\x8C\xAE\x82\xCD AES-128 \x82ňÍ\x86\x89\xBB\x82\xB3\x82\xEA\x82܂\xB7\x81B(Tera Term 4.76(TTSSH 2.63) \x82܂ł\xCD 3DES \x82ňÍ\x86\x89\xBB\x82\xB3\x82\xEA\x82܂\xB5\x82\xBD)</dd>
     <dl>

Modified: branches/cmake/doc/ja/html/menu/setup-terminal.html
===================================================================
--- branches/cmake/doc/ja/html/menu/setup-terminal.html	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/doc/ja/html/menu/setup-terminal.html	2019-03-10 14:32:02 UTC (rev 7468)
@@ -160,11 +160,6 @@
 	\x8Fڍׂ\xCD<a href="../usage/unicode.html">Unicode\x90ݒ\xE8</a>\x82\xF0\x8EQ\x8FƁB
       </dd>
 
-      <dt id="CodePage">CodePage</dt>
-      <dd>
-	\x83R\x81[\x83h\x83y\x81[\x83W\x81B
-	\x8Fڍׂ\xCD<a href="../usage/unicode.html">Unicode\x90ݒ\xE8</a>\x82\xF0\x8EQ\x8FƁB
-      </dd>
     </dl>
   </body>
 </html>

Modified: branches/cmake/doc/ja/html/menu/setup-terminal_ko.html
===================================================================
--- branches/cmake/doc/ja/html/menu/setup-terminal_ko.html	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/doc/ja/html/menu/setup-terminal_ko.html	2019-03-10 14:32:02 UTC (rev 7468)
@@ -126,11 +126,6 @@
 	\x8Fڍׂ\xCD<a href="../usage/unicode.html">Unicode\x90ݒ\xE8</a>\x82\xF0\x8EQ\x8FƁB
       </dd>
 
-      <dt id="CodePage">CodePage</dt>
-      <dd>
-	\x83R\x81[\x83h\x83y\x81[\x83W\x81B
-	\x8Fڍׂ\xCD<a href="../usage/unicode.html">Unicode\x90ݒ\xE8</a>\x82\xF0\x8EQ\x8FƁB
-      </dd>
     </dl>
   </body>
 </html>

Modified: branches/cmake/doc/ja/html/menu/setup-terminal_utf8.html
===================================================================
--- branches/cmake/doc/ja/html/menu/setup-terminal_utf8.html	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/doc/ja/html/menu/setup-terminal_utf8.html	2019-03-10 14:32:02 UTC (rev 7468)
@@ -126,11 +126,6 @@
 	\x8Fڍׂ\xCD<a href="../usage/unicode.html">Unicode\x90ݒ\xE8</a>\x82\xF0\x8EQ\x8FƁB
       </dd>
 
-      <dt id="CodePage">CodePage</dt>
-      <dd>
-	\x83R\x81[\x83h\x83y\x81[\x83W\x81B
-	\x8Fڍׂ\xCD<a href="../usage/unicode.html">Unicode\x90ݒ\xE8</a>\x82\xF0\x8EQ\x8FƁB
-      </dd>
     </dl>
   </body>
 </html>

Modified: branches/cmake/doc/ja/html/reference/develop.txt
===================================================================
--- branches/cmake/doc/ja/html/reference/develop.txt	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/doc/ja/html/reference/develop.txt	2019-03-10 14:32:02 UTC (rev 7468)
@@ -48,8 +48,8 @@
 
 
 \x81\xA1 \x83\x89\x83C\x83u\x83\x89\x83\x8A
-- Oniguruma 6.9.0 (https://github.com/kkos/oniguruma)
-- OpenSSL 1.0.2q (http://www.openssl.org/)
+- Oniguruma 6.9.1 (https://github.com/kkos/oniguruma)
+- OpenSSL 1.0.2r (http://www.openssl.org/)
 - zlib 1.2.11 (http://www.zlib.net/)
 - PuTTY 0.70 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
 - SFMT 1.5.1 (http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index-jp.html)

Modified: branches/cmake/doc/ja/html/setup/teraterm-ini.html
===================================================================
--- branches/cmake/doc/ja/html/setup/teraterm-ini.html	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/doc/ja/html/setup/teraterm-ini.html	2019-03-10 14:32:02 UTC (rev 7468)
@@ -110,6 +110,12 @@
 		<td></td>
 	</tr>
 	<tr>
+		<td id="AlphaBlendActive"><a href="../menu/setup-additional.html#AlphaBlendActive">AlphaBlendActive</a></td>
+		<td style="width:250px;">255</td>
+		<td style="width:250px;">\x81\xA6</td>
+		<td>\x81\xA6<a href="#AlphaBlend">AlphaBlend</a>\x82̐ݒ\xE8\x92l\x82\xAA\x8Eg\x82\xED\x82\xEA\x82\xE9</td>
+	</tr>
+	<tr>
 		<td id="AlphaBlend"><a href="../menu/setup-additional.html#AlphaBlend">AlphaBlend</a></td>
 		<td style="width:250px;">255</td>
 		<td style="width:250px;">&lt;-</td>
@@ -284,12 +290,6 @@
 		<td></td>
 	</tr>
 	<tr>
-		<td id="CodePage">CodePage</td>
-		<td style="width:250px;">\x81\xA6</td>
-		<td style="width:250px;">932</td>
-		<td>\x81\xA6\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82ɂ\xE6\x82\xE9</td>
-	</tr>
-	<tr>
 		<td id="ComPort"><a href="../menu/setup-serialport.html#ComPort">ComPort</a></td>
 		<td style="width:250px;">1</td>
 		<td style="width:250px;">&lt;-</td>

Modified: branches/cmake/doc/ja/html/usage/mouse.html
===================================================================
--- branches/cmake/doc/ja/html/usage/mouse.html	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/doc/ja/html/usage/mouse.html	2019-03-10 14:32:02 UTC (rev 7468)
@@ -16,9 +16,13 @@
 </h2>
 
 <dl>
-<dt>\x83z\x83C\x81[\x83\x8B\x83}\x83E\x83X</dt>
-<dd>\x83I\x83\x8A\x83W\x83i\x83\x8B\x82\xCCTera Term\x82ł̓z\x83C\x81[\x83\x8B\x83}\x83E\x83X\x82\xAA\x8C\xF8\x82\xAB\x82܂\xB9\x82񂪁A\x96{\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82ł̓z\x83C\x81[\x83\x8B\x83{\x83^\x83\x93\x82\xF0\x8Eg\x82\xC1\x82ăX\x83N\x83\x8D\x81[\x83\x8B\x83o\x81[\x82\xF0\x8F㉺\x82\xB3\x82\xB9\x82邱\x82Ƃ\xAA\x82ł\xAB\x82܂\xB7\x81B\x82܂\xBD\x81A\x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x83J\x81[\x83\\x83\x8B\x83\x82\x81[\x83h\x8E\x9E(vi\x82\xE2less\x93\x99\x82\xF0\x8Eg\x97p\x8E\x9E)\x82ɂ́A\x83z\x83C\x81[\x83\x8B\x82̉\xF1\x93]\x82\xF0\x8F㉺\x82̃J\x81[\x83\\x83\x8B\x83L\x81[\x82Ƃ\xB5\x82đ\x97\x90M\x82\xB7\x82鎖\x82\xAA\x82ł\xAB\x82܂\xB7\x81B</dd>
+<dt>\x83}\x83E\x83X\x83z\x83C\x81[\x83\x8B</dt>
+<dd>\x83z\x83C\x81[\x83\x8B\x82̉\xF1\x93]\x82ŃX\x83N\x83\x8D\x81[\x83\x8B\x83o\x81[\x82\xF0\x8F㉺\x82\xB3\x82\xB9\x82邱\x82Ƃ\xAA\x82ł\xAB\x82܂\xB7\x81B\x82܂\xBD\x81A\x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x83J\x81[\x83\\x83\x8B\x83\x82\x81[\x83h\x8E\x9E(vi\x82\xE2less\x93\x99\x82\xF0\x8Eg\x97p\x8E\x9E)\x82ɂ́A\x83z\x83C\x81[\x83\x8B\x82̉\xF1\x93]\x82\xF0\x8F㉺\x82̃J\x81[\x83\\x83\x8B\x83L\x81[\x82Ƃ\xB5\x82đ\x97\x90M\x82\xB7\x82鎖\x82\xAA\x82ł\xAB\x82܂\xB7\x81B</dd>
 
+<dt>\x83^\x83C\x83g\x83\x8B\x83o\x81[\x8F\xE3\x82Ń}\x83E\x83X\x83z\x83C\x81[\x83\x8B</dt>
+<dd>\x83E\x83B\x83\x93\x83h\x83E\x82̃^\x83C\x83g\x83\x8B\x83o\x81[\x8F\xE3\x82Ńz\x83C\x81[\x83\x8B\x82\xF0\x89\xF1\x93]\x82\xB3\x82\xB9\x82\xE9\x82ƁA\x83E\x83B\x83\x93\x83h\x83E\x82̓\xA7\x89ߒl\x82\xF0\x88ꎞ\x93I\x82ɕύX\x82\xB7\x82邱\x82Ƃ\xAA\x82ł\xAB\x82܂\xB7\x81i\x82\xB1\x82̒l\x82͕ۑ\xB6\x82ł\xAB\x82܂\xB9\x82\xF1\x81j\x81B<br />
+    \x83E\x83B\x83\x93\x83h\x83E\x82̃A\x83N\x83e\x83B\x83u\x8F\xF3\x91Ԃ\xAA\x95ύX\x82\xB3\x82\xEA\x82\xE9\x82ƁA<a href="../menu/setup-additional.html#AlphaBlendActive">\x90ݒ\xE8</a>\x82\xB3\x82ꂽ\x93\xA7\x89ߒl\x82ɖ߂\xE8\x82܂\xB7\x81B</dd>
+
 <dt>\x8D\xB6\x83{\x83^\x83\x93\x82Ńh\x83\x89\x83b\x83O</dt>
 <dd>\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x91I\x91\xF0\x82\xB5\x81A\x82\xBB\x82\xEA\x82\xF0\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82ɃR\x83s\x81[\x82\xB7\x82\xE9\x81B</dd>
 

Modified: branches/cmake/doc/ja/html/usage/unicode.html
===================================================================
--- branches/cmake/doc/ja/html/usage/unicode.html	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/doc/ja/html/usage/unicode.html	2019-03-10 14:32:02 UTC (rev 7468)
@@ -97,7 +97,7 @@
 
 \x83\x8D\x83P\x81[\x83\x8B\x82\xA8\x82\xE6\x82уt\x83H\x83\x93\x83g\x82\xAA\x90\xB3\x82\xB5\x82\xAD\x90ݒ肳\x82\xEA\x82Ă\xA2\x82\xEA\x82΁A\x89p\x8C\xEA\x94\xC5Windows\x82œ\xFA\x96{\x8C\xEA\x82\xF0\x95\\x8E\xA6\x82\xB5\x82\xBD\x82\xE8\x81A
 \x93\xFA\x96{\x8C\xEA\x94\xC5Windows\x82Ŋ؍\x91\x8C\xEA\x82\xF0\x95\\x8E\xA6\x82\xB5\x82\xBD\x82肷\x82鎖\x82\xE0\x89”\\x82ł\xB7\x81B<br>
-\x82\xBD\x82\xBE\x82\xB5\x91\xBD\x8D\x91\x8C\xEA\x91Ή\x9E\x82\xB5\x82Ă\xA2\x82Ȃ\xA2\x82̂ŁA\x88\xEA\x82‚\xCCTera Term\x83E\x83B\x83\x93\x83h\x83E\x82œ\xFA\x96{\x8C\xEA\x82Ɗ؍\x91\x8C\xEA\x82𓯎\x9E\x82\xC9
+\x82\xBD\x82\xBE\x82\xB5\x91\xBD\x8C\xBE\x8C\xEA\x91Ή\x9E\x82\xB5\x82Ă\xA2\x82Ȃ\xA2\x82̂ŁA\x88\xEA\x82‚\xCCTera Term\x83E\x83B\x83\x93\x83h\x83E\x82œ\xFA\x96{\x8C\xEA\x82Ɗ؍\x91\x8C\xEA\x82𓯎\x9E\x82\xC9
 \x95\\x8E\xA6\x82\xB5\x82\xBD\x82肷\x82鎖\x82͏o\x97\x88\x82܂\xB9\x82\xF1\x81B
 </p>
 

Modified: branches/cmake/doc/ja/teraterm.hhc
===================================================================
--- branches/cmake/doc/ja/teraterm.hhc	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/doc/ja/teraterm.hhc	2019-03-10 14:32:02 UTC (rev 7468)
@@ -629,6 +629,11 @@
 			</OBJECT>
 		<UL>
 			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="TTL\x83t\x83@\x83C\x83\x8B">
+				<param name="Local" value="html\macro\syntax\file.html">
+				<param name="ImageNumber" value="11">
+				</OBJECT>
+			<LI> <OBJECT type="text/sitemap">
 				<param name="Name" value="\x83f\x81[\x83^\x8C^">
 				<param name="Local" value="html\macro\syntax\types.html">
 				<param name="ImageNumber" value="11">

Modified: branches/cmake/doc/ja/teraterm.hhp
===================================================================
--- branches/cmake/doc/ja/teraterm.hhp	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/doc/ja/teraterm.hhp	2019-03-10 14:32:02 UTC (rev 7468)
@@ -192,6 +192,7 @@
 HlpMacroCommandline=html\macro\commandline.html
 HlpMacroAssoc=html\macro\howtoassoc.html
 HlpMacroSyntax=html\macro\syntax\index.html
+HlpMacroSyntaxFile=html\macro\syntax\file.html
 HlpMacroSyntaxType=html\macro\syntax\types.html
 HlpMacroSyntaxFormat=html\macro\syntax\formats.html
 HlpMacroSyntaxIdent=html\macro\syntax\identifiers.html

Modified: branches/cmake/installer/release/TERATERM.INI
===================================================================
--- branches/cmake/installer/release/TERATERM.INI	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/installer/release/TERATERM.INI	2019-03-10 14:32:02 UTC (rev 7468)
@@ -109,6 +109,7 @@
 
 ; Translucent window (0 - 255: transparency value)
 AlphaBlend=255
+AlphaBlendActive=255
 
 ; Cygwin install path
 CygwinDirectory=

Modified: branches/cmake/installer/release/lang/English.lng
===================================================================
--- branches/cmake/installer/release/lang/English.lng	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/installer/release/lang/English.lng	2019-03-10 14:32:02 UTC (rev 7468)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2018-08-27)
+; Updated by TeraTerm Project (2019-02-28)
 
 [Tera Term]
 ;DLG_SYSTEM_FONT=System,14,0
@@ -224,7 +224,9 @@
 DLG_TAB_COPYPASTE_PASTEDELAY=P&aste delay per line
 DLG_TAB_COPYPASTE_PASTEDELAY2=ms
 
-DLG_TAB_VISUAL_ALPHA=&Alpha blend
+DLG_TAB_VISUAL_ALPHA=Window Transparency
+DLG_TAB_VISUAL_ALPHA_ACTIVE=&Active
+DLG_TAB_VISUAL_ALPHA_INACTIVE=Ina&ctive
 DLG_TAB_VISUAL_ETERM=&Eterm lookfeel(*)
 DLG_TAB_VISUAL_BGIMG=Background &Image
 DLG_TAB_VISUAL_BGIMG_BRIGHTNESS=Image Brigh&tness
@@ -394,7 +396,6 @@
 DLG_TERM_KIN=Kanji-i&n:
 DLG_TERM_KOUT=Kanji-&out:
 DLG_TERM_LOCALE=lo&cale:
-DLG_TERM_CODEPAGE=Code&Page:
 DLG_TERM_RUSSCHARSET=Character set
 DLG_TERM_RUSSHOST=H&ost:
 DLG_TERM_RUSSCLIENT=&Client:

Modified: branches/cmake/installer/release/lang/French.lng
===================================================================
--- branches/cmake/installer/release/lang/French.lng	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/installer/release/lang/French.lng	2019-03-10 14:32:02 UTC (rev 7468)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2018-08-27)
+; Updated by TeraTerm Project (2019-02-28)
 ; Last translated (French language) by Francois MOCQ (2010-07-21)
 
 [Tera Term]
@@ -226,6 +226,8 @@
 DLG_TAB_COPYPASTE_PASTEDELAY2=ms
 
 DLG_TAB_VISUAL_ALPHA=M\xE9lange alpha
+DLG_TAB_VISUAL_ALPHA_ACTIVE=&Active
+DLG_TAB_VISUAL_ALPHA_INACTIVE=Ina&ctive
 DLG_TAB_VISUAL_ETERM=Apparence Eterm(*)
 DLG_TAB_VISUAL_BGIMG=Background &Image
 DLG_TAB_VISUAL_BGIMG_BRIGHTNESS=Image Brigh&tness
@@ -395,7 +397,6 @@
 DLG_TERM_KIN=Kanji-i&n:
 DLG_TERM_KOUT=Kanji-&out:
 DLG_TERM_LOCALE=lo&cal:
-DLG_TERM_CODEPAGE=Page de Code:
 DLG_TERM_RUSSCHARSET=Jeu de caract\xE8res
 DLG_TERM_RUSSHOST=H\xF4te:
 DLG_TERM_RUSSCLIENT=&Client:

Modified: branches/cmake/installer/release/lang/German.lng
===================================================================
--- branches/cmake/installer/release/lang/German.lng	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/installer/release/lang/German.lng	2019-03-10 14:32:02 UTC (rev 7468)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2018-08-27)
+; Updated by TeraTerm Project (2019-02-28)
 ; Last translated (German language) by Frederik Schwarzer (2010-05-17)
 
 [Tera Term]
@@ -226,6 +226,8 @@
 DLG_TAB_COPYPASTE_PASTEDELAY2=ms
 
 DLG_TAB_VISUAL_ALPHA=&Transparenz
+DLG_TAB_VISUAL_ALPHA_ACTIVE=&Active
+DLG_TAB_VISUAL_ALPHA_INACTIVE=Ina&ctive
 DLG_TAB_VISUAL_ETERM=&Eterm-Aussehen(*)
 DLG_TAB_VISUAL_BGIMG=Background &Image
 DLG_TAB_VISUAL_BGIMG_BRIGHTNESS=Image Brigh&tness
@@ -395,7 +397,6 @@
 DLG_TERM_KIN=Kanji-i&n:
 DLG_TERM_KOUT=Kanji-&out:
 DLG_TERM_LOCALE=locale:
-DLG_TERM_CODEPAGE=CodePage:
 DLG_TERM_RUSSCHARSET=Zeichensatz
 DLG_TERM_RUSSHOST=H&ost:
 DLG_TERM_RUSSCLIENT=&Client:

Modified: branches/cmake/installer/release/lang/Japanese.lng
===================================================================
--- branches/cmake/installer/release/lang/Japanese.lng	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/installer/release/lang/Japanese.lng	2019-03-10 14:32:02 UTC (rev 7468)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2018-08-28)
+; Updated by TeraTerm Project (2019-02-28)
 
 [Tera Term]
 ;DLG_SYSTEM_FONT=\x82l\x82r \x82o\x83S\x83V\x83b\x83N,12,128
@@ -224,9 +224,9 @@
 DLG_TAB_COPYPASTE_PASTEDELAY=\x93\\x82\xE8\x95t\x82\xAF\x82̍s\x8AԒx\x89\x84(&A)
 DLG_TAB_COPYPASTE_PASTEDELAY2=\x83~\x83\x8A\x95b
 
-DLG_TAB_VISUAL_ALPHA=\x93\xA7\x89߃E\x83B\x83\x93\x83h\x83E
-DLG_TAB_VISUAL_ALPHA_ACTIVE_LABEL=\x83A\x83N\x83e\x83B\x83u(&A)
-DLG_TAB_VISUAL_ALPHA_INACTIVE_LABEL=\x94\xF1\x83A\x83N\x83e\x83B\x83u(&C)
+DLG_TAB_VISUAL_ALPHA=\x94\xBC\x93\xA7\x96\xBE\x93x
+DLG_TAB_VISUAL_ALPHA_ACTIVE=\x83A\x83N\x83e\x83C\x83u\x8E\x9E(&A)
+DLG_TAB_VISUAL_ALPHA_INACTIVE=\x94\xF1\x83A\x83N\x83e\x83B\x83u\x8E\x9E(&C)
 DLG_TAB_VISUAL_ETERM=&Eterm\x95\x97\x82ɂ\xB7\x82\xE9(*)
 DLG_TAB_VISUAL_BGIMG=\x94w\x8Ci\x89摜(&I)
 DLG_TAB_VISUAL_BGIMG_BRIGHTNESS=\x89摜\x82̖\xBE\x82邳(&T)
@@ -396,7 +396,6 @@
 DLG_TERM_KIN=\x8A\xBF\x8E\x9A\x83C\x83\x93(&N):
 DLG_TERM_KOUT=\x8A\xBF\x8E\x9A\x83A\x83E\x83g(&O):
 DLG_TERM_LOCALE=\x83\x8D\x83P\x81[\x83\x8B(&C):
-DLG_TERM_CODEPAGE=\x8C\xBE\x8C\xEA\x83R\x81[\x83h(&P):
 DLG_TERM_RUSSCHARSET=\x95\xB6\x8E\x9A\x83Z\x83b\x83g
 DLG_TERM_RUSSHOST=\x83z\x83X\x83g(&O):
 DLG_TERM_RUSSCLIENT=\x83N\x83\x89\x83C\x83A\x83\x93\x83g(&C):

Modified: branches/cmake/installer/release/lang/Korean.lng
===================================================================
--- branches/cmake/installer/release/lang/Korean.lng	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/installer/release/lang/Korean.lng	2019-03-10 14:32:02 UTC (rev 7468)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2018-08-27)
+; Updated by TeraTerm Project (2019-02-28)
 ; Last translated (Korean language) by Daehong Kim (2013-07-25)
 
 [Tera Term]
@@ -225,7 +225,9 @@
 DLG_TAB_COPYPASTE_PASTEDELAY=\xC1ٴ\xE7 \xBAٿ\xA9\xB3ֱ\xE2 \xC1\xF6\xBF\xAC(&A)
 DLG_TAB_COPYPASTE_PASTEDELAY2=ms
 
-DLG_TAB_VISUAL_ALPHA=\xC5\xF5\xB8\x{DD75}(&A)
+DLG_TAB_VISUAL_ALPHA=\xC5\xF5\xB8\x{DD75}
+DLG_TAB_VISUAL_ALPHA_ACTIVE=&Active
+DLG_TAB_VISUAL_ALPHA_INACTIVE=Ina&ctive
 DLG_TAB_VISUAL_ETERM=Eterm \xB4\xC0\xB3\xA6(*)(&E)
 DLG_TAB_VISUAL_BGIMG=\xB9\xE8\xB0\xE6\xB1׸\xB2(&I)
 DLG_TAB_VISUAL_BGIMG_BRIGHTNESS=Image Brigh&tness
@@ -395,7 +397,6 @@
 DLG_TERM_KIN=Kanji-i&n:
 DLG_TERM_KOUT=Kanji-&out:
 DLG_TERM_LOCALE=lo&cale:
-DLG_TERM_CODEPAGE=\xC4ڵ\xE5 \xC6\xE4\xC0\xCC\xC1\xF6(&P):
 DLG_TERM_RUSSCHARSET=\xB9\xAE\xC0ڼ\xBCƮ
 DLG_TERM_RUSSHOST=ȣ\xBD\xBAƮ(&O):
 DLG_TERM_RUSSCLIENT=Ŭ\xB6\xF3\xC0̾\xF0Ʈ(&C):

Modified: branches/cmake/installer/release/lang/Russian.lng
===================================================================
--- branches/cmake/installer/release/lang/Russian.lng	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/installer/release/lang/Russian.lng	2019-03-10 14:32:02 UTC (rev 7468)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2018-08-27)
+; Updated by TeraTerm Project (2019-02-28)
 ; Last translated (Russian language) by Ryumik Sergey (2017-07-19)
 
 [Tera Term]
@@ -226,6 +226,8 @@
 DLG_TAB_COPYPASTE_PASTEDELAY2=\xEC\xF1
 
 DLG_TAB_VISUAL_ALPHA=&\xCF\xF0\xEE\xE7\xF0\xE0\xF7\xED\xFB\xE9
+DLG_TAB_VISUAL_ALPHA_ACTIVE=&Active
+DLG_TAB_VISUAL_ALPHA_INACTIVE=Ina&ctive
 DLG_TAB_VISUAL_ETERM=&\xD1\xF2\xE8\xEB\xFC Eterm (*)
 DLG_TAB_VISUAL_BGIMG=&\xD4\xEE\xED\xEE\xE2\xFB\xE9 \xF0\xE8\xF1\xF3\xED\xEE\xEA
 DLG_TAB_VISUAL_BGIMG_BRIGHTNESS=&\xDF\xF0\xEA\xEE\xF1\xF2\xFC \xE8\xE7\xEE\xE1\xF0\xE0\xE6\xE5\xED\xE8\xFF
@@ -395,7 +397,6 @@
 DLG_TERM_KIN=Kanji-i&n:
 DLG_TERM_KOUT=Kanji-&out:
 DLG_TERM_LOCALE=&\xD0\xE0\xF1\xEF\xEE\xEB\xEE\xE6\xE5\xED\xE8\xE5:
-DLG_TERM_CODEPAGE=&\xCA\xEE\xE4\xEE\xE2\xE0\xFF \xF1\xF2\xF0.:
 DLG_TERM_RUSSCHARSET=\xCA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0
 DLG_TERM_RUSSHOST=&\xD5\xEE\xF1\xF2:
 DLG_TERM_RUSSCLIENT=&\xCA\xEB\xE8\xE5\xED\xF2:

Modified: branches/cmake/installer/release/lang/Simplified Chinese.lng
===================================================================
--- branches/cmake/installer/release/lang/Simplified Chinese.lng	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/installer/release/lang/Simplified Chinese.lng	2019-03-10 14:32:02 UTC (rev 7468)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2018-08-27)
+; Updated by TeraTerm Project (2019-02-28)
 ; Last translated (Simplified Chinese language) by LiShaohui (2017-04-11)
 
 [Tera Term]
@@ -225,7 +225,9 @@
 DLG_TAB_COPYPASTE_PASTEDELAY=ճ\xCC\xF9\xD0м\xE4\xD1\xD3ʱ(&A)
 DLG_TAB_COPYPASTE_PASTEDELAY2=\xBA\xC1\xC3\xEB
 
-DLG_TAB_VISUAL_ALPHA=͸\xC3\xF7\xB6\xC8(&A)
+DLG_TAB_VISUAL_ALPHA=͸\xC3\xF7\xB6\xC8
+DLG_TAB_VISUAL_ALPHA_ACTIVE=&Active
+DLG_TAB_VISUAL_ALPHA_INACTIVE=Ina&ctive
 DLG_TAB_VISUAL_ETERM=&Eterm \xB7\xE7\xB8\xF1 (*)
 DLG_TAB_VISUAL_BGIMG=\xB1\xB3\xBE\xB0ͼ\xCF\xF1(&I)
 DLG_TAB_VISUAL_BGIMG_BRIGHTNESS=ͼ\xCF\xF1\xC1\xC1\xB6\xC8(&T)
@@ -395,7 +397,6 @@
 DLG_TERM_KIN=\xBA\xBA\xD7\xD6\xCA\xE4\xC8\xEB(&N)\xA3\xBA
 DLG_TERM_KOUT=\xBA\xBA\xD7\xD6\xCA\xE4\xB3\xF6(&O)\xA3\xBA
 DLG_TERM_LOCALE=\xB5\xD8\xC7\xF8(&C)\xA3\xBA
-DLG_TERM_CODEPAGE=\xB1\xE0\xC2\xEB(&P)\xA3\xBA
 DLG_TERM_RUSSCHARSET=\xD7ַ\xFB\xBC\xAF
 DLG_TERM_RUSSHOST=\xD6\xF7\xBB\xFA\xB6\xCB(&O)\xA3\xBA
 DLG_TERM_RUSSCLIENT=\xBFͻ\xA7\xB6\xCB(&C)\xA3\xBA

Modified: branches/cmake/installer/release/lang/Traditional Chinese.lng
===================================================================
--- branches/cmake/installer/release/lang/Traditional Chinese.lng	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/installer/release/lang/Traditional Chinese.lng	2019-03-10 14:32:02 UTC (rev 7468)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2018-08-27)
+; Updated by TeraTerm Project (2019-02-28)
 ; Last translated (Traditional Chinese language) by kikiqqp (2014-09-20)
 
 [Tera Term]
@@ -225,7 +225,9 @@
 DLG_TAB_COPYPASTE_PASTEDELAY=\xB6K\xA4W\xAEɹj\xA6橵\xAE\xC9(&A)
 DLG_TAB_COPYPASTE_PASTEDELAY2=\xB2@\xAC\xED
 
-DLG_TAB_VISUAL_ALPHA=\xB3z\xA9\xFA\xAB\xD7(&A)
+DLG_TAB_VISUAL_ALPHA=\xB3z\xA9\xFA\xAB\xD7
+DLG_TAB_VISUAL_ALPHA_ACTIVE=&Active
+DLG_TAB_VISUAL_ALPHA_INACTIVE=Ina&ctive
 DLG_TAB_VISUAL_ETERM=&Eterm \xAD\xB7\xAE\xE6 (*)
 DLG_TAB_VISUAL_BGIMG=\xADI\xB4\xBA\xB9Ϲ\xB3(&I)
 DLG_TAB_VISUAL_BGIMG_BRIGHTNESS=Image Brigh&tness
@@ -395,7 +397,6 @@
 DLG_TERM_KIN=\xA4\xA4\xA4\xE5\xBF\xE9\xA4J(&N)\xA1G
 DLG_TERM_KOUT=\xA4\xA4\xA4\xE5\xBF\xE9\xA5X(&O)\xA1G
 DLG_TERM_LOCALE=\xA6a\xB0\xCF(&C)\xA1G
-DLG_TERM_CODEPAGE=\xBDs\xBDX(&P)\xA1G
 DLG_TERM_RUSSCHARSET=\xA6r\xB2Ŷ\xB0
 DLG_TERM_RUSSHOST=\xA5D\xBE\xF7\xBA\xDD(&O)\xA1G
 DLG_TERM_RUSSCLIENT=\xABȤ\xE1\xBA\xDD(&C)\xA1G

Modified: branches/cmake/installer/release/license.txt
===================================================================
--- branches/cmake/installer/release/license.txt	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/installer/release/license.txt	2019-03-10 14:32:02 UTC (rev 7468)
@@ -1,7 +1,7 @@
 License of Tera Term
 
 Copyright (C) 1994-1998 T. Teranishi
-(C) 2004-2018 TeraTerm Project
+(C) 2004-2019 TeraTerm Project
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -30,7 +30,7 @@
 License of TTSSH
 
 (C)1998-2001 Robert O'Callahan
-(C) 2004-2018 TeraTerm Project
+(C) 2004-2019 TeraTerm Project
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

Modified: branches/cmake/installer/teraterm.iss
===================================================================
--- branches/cmake/installer/teraterm.iss	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/installer/teraterm.iss	2019-03-10 14:32:02 UTC (rev 7468)
@@ -1,5 +1,5 @@
 #define AppName "Tera Term"
-#define AppVer "4.101"
+#define AppVer "4.102"
 #define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
 
 [InnoIDE_PreCompile]
@@ -27,7 +27,7 @@
 ;Name: makearchive.bat; Parameters: release
 
 [Setup]
-AppCopyright=(C) 2004-2018 TeraTerm Project
+AppCopyright=(C) 2004-2019 TeraTerm Project
 AppPublisher=TeraTerm Project
 AppPublisherURL=https://ttssh2.osdn.jp/
 AppSupportURL=https://ttssh2.osdn.jp/

Modified: branches/cmake/teraterm/common/helpid.h
===================================================================
--- branches/cmake/teraterm/common/helpid.h	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/teraterm/common/helpid.h	2019-03-10 14:32:02 UTC (rev 7468)
@@ -217,6 +217,7 @@
 #define HlpMacroAssoc                   90003
 #define HlpMacroSyntax                  91000
 #define HlpMacroSyntaxType              91001
+#define HlpMacroSyntaxFile              91007
 #define HlpMacroSyntaxFormat            91002
 #define HlpMacroSyntaxIdent             91003
 #define HlpMacroSyntaxVar               91004

Modified: branches/cmake/teraterm/common/tt-version.h
===================================================================
--- branches/cmake/teraterm/common/tt-version.h	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/teraterm/common/tt-version.h	2019-03-10 14:32:02 UTC (rev 7468)
@@ -29,7 +29,7 @@
 #pragma once
 
 #define TT_VERSION_MAJOR             4
-#define TT_VERSION_MINOR             101
+#define TT_VERSION_MINOR             102
 #define TT_TOSTR(x)                  TT_TOSTR2(x)
 #define TT_TOSTR2(x)                 #x
 #define TT_VERSION_STR(sep)          TT_TOSTR(TT_VERSION_MAJOR) sep TT_TOSTR(TT_VERSION_MINOR)

Modified: branches/cmake/teraterm/common/ttlib.h
===================================================================
--- branches/cmake/teraterm/common/ttlib.h	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/teraterm/common/ttlib.h	2019-03-10 14:32:02 UTC (rev 7468)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1994-1999 T. Teranishi
+ * Copyright (C) 1994-1998 T. Teranishi
  * (C) 2006-2019 TeraTerm Project
  * All rights reserved.
  *

Modified: branches/cmake/teraterm/keycode/keycode-version.rc
===================================================================
--- branches/cmake/teraterm/keycode/keycode-version.rc	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/teraterm/keycode/keycode-version.rc	2019-03-10 14:32:02 UTC (rev 7468)
@@ -26,7 +26,7 @@
             VALUE "FileDescription", "Keycode Checker"
             VALUE "FileVersion", TT_RES_VERSION_STR
             VALUE "InternalName", "KEYCODE"
-            VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2018 TeraTerm Project"
+            VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2019 TeraTerm Project"
             VALUE "OriginalFilename", "KEYCODE.EXE"
             VALUE "ProductName", "Tera Term"
             VALUE "ProductVersion", TT_RES_VERSION_STR

Modified: branches/cmake/teraterm/teraterm/tt-version.rc
===================================================================
--- branches/cmake/teraterm/teraterm/tt-version.rc	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/teraterm/teraterm/tt-version.rc	2019-03-10 14:32:02 UTC (rev 7468)
@@ -26,7 +26,7 @@
             VALUE "FileDescription", "Tera Term"
             VALUE "FileVersion", TT_RES_VERSION_STR
             VALUE "InternalName", "TTERMPRO"
-            VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2018 TeraTerm Project"
+            VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2019 TeraTerm Project"
             VALUE "OriginalFilename", "TTERMPRO.EXE"
             VALUE "ProductName", "Tera Term"
             VALUE "ProductVersion", TT_RES_VERSION_STR

Modified: branches/cmake/teraterm/teraterm/ttermpro.rc
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.rc	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/teraterm/teraterm/ttermpro.rc	2019-03-10 14:32:02 UTC (rev 7468)
@@ -146,11 +146,11 @@
 STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_SYSMENU
 FONT 8, "Tahoma", 0, 0, 0x0
 BEGIN
-    LTEXT           "Transparent Window",IDC_ALPHABLEND,5,5,78,8
-    LTEXT           "&Active",IDC_ALPHA_BLEND_ACTIVE_LABEL,14,19,50,8
-    EDITTEXT        IDC_ALPHA_BLEND_ACTIVE,69,18,19,12,ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "Ina&ctive",IDC_ALPHA_BLEND_INACTIVE_LABEL,14,33,49,8
-    EDITTEXT        IDC_ALPHA_BLEND_INACTIVE,69,32,19,12,ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "Window Transparency",IDC_ALPHABLEND,5,5,78,8
+    LTEXT           "&Active",IDC_ALPHA_BLEND_ACTIVE_LABEL,14,17,54,8
+    EDITTEXT        IDC_ALPHA_BLEND_ACTIVE,69,16,19,12,ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "Ina&ctive",IDC_ALPHA_BLEND_INACTIVE_LABEL,14,31,54,8
+    EDITTEXT        IDC_ALPHA_BLEND_INACTIVE,69,30,19,12,ES_AUTOHSCROLL | ES_NUMBER
     GROUPBOX        "",IDC_STATIC,97,2,155,54
     CONTROL         "&Eterm lookfeel(*)",IDC_ETERM_LOOKFEEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,99,8,66,12
     LTEXT           "Image Brightness",IDC_BGIMG_BRIGHTNESS,166,19,56,8

Modified: branches/cmake/teraterm/teraterm/ttime.c
===================================================================
--- branches/cmake/teraterm/teraterm/ttime.c	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/teraterm/teraterm/ttime.c	2019-03-10 14:32:02 UTC (rev 7468)
@@ -251,6 +251,7 @@
 	HIMC hIMC;
 	BOOL stat;
 
+	if (HIMEDLL==NULL) return FALSE;
 	hIMC = (*PImmGetContext)(HVTWin);
 	stat = (*PImmGetOpenStatus)(hIMC);
 	(*PImmReleaseContext)(HVTWin, hIMC);
@@ -262,6 +263,7 @@
 void SetIMEOpenStatus(BOOL stat) {
 	HIMC hIMC;
 
+	if (HIMEDLL==NULL) return;
 	hIMC = (*PImmGetContext)(HVTWin);
 	(*PImmSetOpenStatus)(hIMC, stat);
 	(*PImmReleaseContext)(HVTWin, hIMC);

Modified: branches/cmake/teraterm/teraterm/vtdisp.c
===================================================================
--- branches/cmake/teraterm/teraterm/vtdisp.c	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/teraterm/teraterm/vtdisp.c	2019-03-10 14:32:02 UTC (rev 7468)
@@ -113,6 +113,7 @@
 // caret variables
 static int CaretStatus;
 static BOOL CaretEnabled = TRUE;
+BOOL IMEstat;		/* IME Status  TRUE=IME ON */
 
 // ---- device context and status flags
 static HDC VTDC = NULL; /* Device context for VT window */
@@ -2170,40 +2171,31 @@
 void CaretOn()
 // Turn on the cursor
 {
-	int CaretX, CaretY, H;
-	HIMC hImc;
-	HBITMAP color;
-	int ime_on;
-
 	if (ts.KillFocusCursor == 0 && !Active)
 		return;
 
-	/* IME\x82\xCCon/off\x8F\xF3\x91Ԃ\xF0\x8C\xA9\x82āA\x83J\x81[\x83\\x83\x8B\x82̐F\x82\xF0\x95ύX\x82\xB7\x82\xE9\x81B
-	 * WM_INPUTLANGCHANGE, WM_IME_NOTIFY \x82ł̓J\x81[\x83\\x83\x8B\x82̍ĕ`\x89\xE6\x82̂ݍs\x82\xA4\x81B
-	 * (2010.5.20 yutaka)
-	 */
-	hImc = ImmGetContext(HVTWin);
-	ime_on = ImmGetOpenStatus(hImc);
-	ImmReleaseContext(HVTWin, hImc);
-	if ((ts.WindowFlag & WF_IMECURSORCHANGE) != 0 && ime_on) {
-		color = (HBITMAP)1;
-	} else {
-		color = NULL;
-	}
+	if (! CaretEnabled) return;
 
-	CaretX = (CursorX-WinOrgX)*FontWidth;
-	CaretY = (CursorY-WinOrgY)*FontHeight;
+	if (Active) {
+		int CaretX, CaretY, H;
+		HBITMAP color;
 
-	if ((ts.Language==IdJapanese || ts.Language==IdKorean || ts.Language==IdUtf8) &&
-	    CanUseIME() && (ts.IMEInline>0))
-	{
-		/* set IME conversion window pos. & font */
-		SetConversionWindow(HVTWin,CaretX,CaretY);
-	}
+		/* IME\x82\xCCon/off\x8F\xF3\x91Ԃ\xF0\x8C\xA9\x82āA\x83J\x81[\x83\\x83\x8B\x82̐F\x82\xF0\x95ύX\x82\xB7\x82\xE9\x81B
+		 * WM_INPUTLANGCHANGE, WM_IME_NOTIFY \x82ł̓J\x81[\x83\\x83\x8B\x82̍ĕ`\x89\xE6\x82̂ݍs\x82\xA4\x81B
+		 * (2010.5.20 yutaka)
+		 */
+		if ((ts.WindowFlag & WF_IMECURSORCHANGE) == 0) {
+			color = 0;
+		} else {
+			if (IMEstat) {
+				color = (HBITMAP)1;
+			} else {
+				color = 0;
+			}
+		}
 
-	if (! CaretEnabled) return;
-
-	if (Active) {
+		CaretX = (CursorX-WinOrgX)*FontWidth;
+		CaretY = (CursorY-WinOrgY)*FontHeight;
 		if (ts.CursorShape!=IdVCur) {
 			if (ts.CursorShape==IdHCur) {
 				CaretY = CaretY+FontHeight-CurWidth;

Modified: branches/cmake/teraterm/teraterm/vtdisp.h
===================================================================
--- branches/cmake/teraterm/teraterm/vtdisp.h	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/teraterm/teraterm/vtdisp.h	2019-03-10 14:32:02 UTC (rev 7468)
@@ -128,6 +128,8 @@
 extern int PageStart, BuffEnd;
 extern TCharAttr DefCharAttr;
 
+extern BOOL IMEstat;
+
 #define SCROLL_BOTTOM	1
 #define SCROLL_LINEDOWN	2
 #define SCROLL_LINEUP	3

Modified: branches/cmake/teraterm/teraterm/vtterm.c
===================================================================
--- branches/cmake/teraterm/teraterm/vtterm.c	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/teraterm/teraterm/vtterm.c	2019-03-10 14:32:02 UTC (rev 7468)
@@ -198,16 +198,13 @@
 static int NewKeyId, NewKeyLen;
 
 /* Mouse Report */
-int MouseReportMode;
-int MouseReportExtMode;
-unsigned int DecLocatorFlag;
-int LastX, LastY;
-int ButtonStat;
-int FilterTop, FilterBottom, FilterLeft, FilterRight;
+static int MouseReportMode;
+static int MouseReportExtMode;
+static unsigned int DecLocatorFlag;
+static int LastX, LastY;
+static int ButtonStat;
+static int FilterTop, FilterBottom, FilterLeft, FilterRight;
 
-/* IME Status */
-BOOL IMEstat;
-
 /* Beep over-used */
 static DWORD BeepStartTime = 0;
 static DWORD BeepSuppressTime = 0;
@@ -5525,11 +5522,11 @@
 }
 
 // UTF-8\x82Ŏ\xF3\x90M\x83f\x81[\x83^\x82\xF0\x8F\x88\x97\x9D\x82\xB7\x82\xE9
-BOOL ParseFirstUTF8(BYTE b, int proc_combining)
 // returns TRUE if b is processed
 //  (actually allways returns TRUE)
+static BOOL ParseFirstUTF8(BYTE b, int proc_combining)
 {
-	static BYTE buf[3];
+	static BYTE buf[4];
 	static int count = 0;
 	static int can_combining = 0;
 	static unsigned int first_code;
@@ -5592,7 +5589,7 @@
 		return TRUE;
 	}
 
-	if ((buf[0] & 0xe0) == 0xe0 &&
+	if ((buf[0] & 0xf0) == 0xe0 &&
 		(buf[1] & 0xc0) == 0x80 &&
 		(buf[2] & 0xc0) == 0x80) { // 3\x83o\x83C\x83g\x83R\x81[\x83h\x82̏ꍇ
 
@@ -5649,12 +5646,31 @@
 skip:
 		count = 0;
 
+	}
+
+	if (count < 4) {
+		return TRUE;
+	}
+
+	if ((buf[0] & 0xf1) == 0xf0 &&
+		(buf[1] & 0xc0) == 0x80 &&
+		(buf[2] & 0xc0) == 0x80 &&
+		(buf[2] & 0xc0) == 0x80)
+	{	// 4\x83o\x83C\x83g\x83R\x81[\x83h\x82̏ꍇ
+		code = ((buf[0] & 0x07) << 18);
+		code |= ((buf[1] & 0x3f) << 12);
+		code |= ((buf[2] & 0x3f) << 6);
+		code |= (buf[3] & 0x3f);
+
+		UnicodeToCP932(code);
+		count = 0;
+		return TRUE;
 	} else {
 		ParseASCII(buf[0]);
 		ParseASCII(buf[1]);
 		ParseASCII(buf[2]);
+		ParseASCII(buf[3]);
 		count = 0;
-
 	}
 
 	return TRUE;

Modified: branches/cmake/teraterm/teraterm/vtwin.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/vtwin.cpp	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/teraterm/teraterm/vtwin.cpp	2019-03-10 14:32:02 UTC (rev 7468)
@@ -179,6 +179,7 @@
 	ON_WM_TIMER()
 	ON_WM_VSCROLL()
 	ON_WM_DEVICECHANGE()
+	ON_MESSAGE(WM_IME_STARTCOMPOSITION,OnIMEStartComposition)
 	ON_MESSAGE(WM_IME_COMPOSITION,OnIMEComposition)
 	ON_MESSAGE(WM_INPUTLANGCHANGE,OnIMEInputChange)
 	ON_MESSAGE(WM_IME_NOTIFY,OnIMENotify)
@@ -3096,6 +3097,17 @@
 }
 //-->
 
+
+LRESULT CVTWindow::OnIMEStartComposition(WPARAM wParam, LPARAM lParam)
+{
+	// \x88ʒu\x82\xF0\x92ʒm\x82\xB7\x82\xE9
+	int CaretX = (CursorX-WinOrgX)*FontWidth;
+	int CaretY = (CursorY-WinOrgY)*FontHeight;
+	SetConversionWindow(HVTWin,CaretX,CaretY);
+
+	return CFrameWnd::DefWindowProc(WM_IME_STARTCOMPOSITION,wParam,lParam);
+}
+
 LRESULT CVTWindow::OnIMEComposition(WPARAM wParam, LPARAM lParam)
 {
 	HGLOBAL hstr;
@@ -3164,6 +3176,15 @@
 LRESULT CVTWindow::OnIMENotify(WPARAM wParam, LPARAM lParam)
 {
 	if (wParam == IMN_SETOPENSTATUS) {
+		// IME\x82\xCCOn/Off\x82\xF0\x8E擾\x82\xB7\x82\xE9
+		IMEstat = GetIMEOpenStatus();
+
+		// \x8F\xF3\x91Ԃ\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9IME\x82̂\xBD\x82߂Ɉʒu\x82\xF0\x92ʒm\x82\xB7\x82\xE9
+		int CaretX = (CursorX-WinOrgX)*FontWidth;
+		int CaretY = (CursorY-WinOrgY)*FontHeight;
+		SetConversionWindow(HVTWin,CaretX,CaretY);
+
+		// \x95`\x89\xE6
 		ChangeCaret();
 	}
 

Modified: branches/cmake/teraterm/teraterm/vtwin.h
===================================================================
--- branches/cmake/teraterm/teraterm/vtwin.h	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/teraterm/teraterm/vtwin.h	2019-03-10 14:32:02 UTC (rev 7468)
@@ -135,6 +135,7 @@
 	afx_msg LRESULT OnEnterSizeMove(WPARAM wParam, LPARAM lParam);
 	afx_msg LRESULT OnExitSizeMove(WPARAM wParam, LPARAM lParam);
 //-->
+	afx_msg LRESULT OnIMEStartComposition(WPARAM wParam, LPARAM lParam);
 	afx_msg LRESULT OnIMEComposition(WPARAM wParam, LPARAM lParam);
 	afx_msg LRESULT OnIMEInputChange(WPARAM wParam, LPARAM lParam);
 	afx_msg LRESULT OnIMENotify(WPARAM wParam, LPARAM lParam);

Modified: branches/cmake/teraterm/ttpcmn/ttpcmn-version.rc
===================================================================
--- branches/cmake/teraterm/ttpcmn/ttpcmn-version.rc	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/teraterm/ttpcmn/ttpcmn-version.rc	2019-03-10 14:32:02 UTC (rev 7468)
@@ -28,7 +28,7 @@
             VALUE "FileDescription", "Tera Term Common Routines"
             VALUE "FileVersion", TT_RES_VERSION_STR
             VALUE "InternalName", "TTPCMN"
-            VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2018 TeraTerm Project"
+            VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2019 TeraTerm Project"
             VALUE "OriginalFilename", "ttpcmn.dll"
             VALUE "ProductName", "Tera Term"
             VALUE "ProductVersion", TT_RES_VERSION_STR

Modified: branches/cmake/teraterm/ttpdlg/dlg_res.h
===================================================================
--- branches/cmake/teraterm/ttpdlg/dlg_res.h	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/teraterm/ttpdlg/dlg_res.h	2019-03-10 14:32:02 UTC (rev 7468)
@@ -120,11 +120,7 @@
 #define IDC_HOSTTCPPROTOCOLLABEL        1019
 #define IDC_HOSTTCPPROTOCOL             1020
 #define IDC_LOCALE_BOX                  1022
-#define IDC_EDIT1                       1024
 #define IDC_LOCALE_EDIT                 1024
-#define IDC_CODEPAGE_LABEL              1025
-#define IDC_EDIT2                       1026
-#define IDC_CODEPAGE_EDIT               1026
 #define IDC_TT_VERSION                  1027
 #define IDC_AUTHOR_URL                  1028
 #define IDC_FORUM_LABEL                 1029

Modified: branches/cmake/teraterm/ttpdlg/ttdlg.c
===================================================================
--- branches/cmake/teraterm/ttpdlg/ttdlg.c	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/teraterm/ttpdlg/ttdlg.c	2019-03-10 14:32:02 UTC (rev 7468)
@@ -160,7 +160,6 @@
 					{ IDC_TERMKINTEXT, "DLG_TERM_KIN" },
 					{ IDC_TERMKOUTTEXT, "DLG_TERM_KOUT" },
 					{ IDC_LOCALE_LABEL, "DLG_TERM_LOCALE" },
-					{ IDC_CODEPAGE_LABEL, "DLG_TERM_CODEPAGE" },
 				};
 				SetDlgTexts(Dialog, TextInfosJp, _countof(TextInfosJp), UILanguageFile);
 			}
@@ -178,7 +177,6 @@
 					{ IDC_TERMKANJILABEL, "DLG_TERMK_KANJI" },
 					{ IDC_TERMKANJISENDLABEL, "DLG_TERMK_KANJISEND" },
 					{ IDC_LOCALE_LABEL, "DLG_TERM_LOCALE" },
-					{ IDC_CODEPAGE_LABEL, "DLG_TERM_CODEPAGE" },
 				};
 				SetDlgTexts(Dialog, TextInfosKo, _countof(TextInfosKo), UILanguageFile);
 			}
@@ -248,8 +246,6 @@
 				// \x83\x8D\x83P\x81[\x83\x8B\x97p\x83e\x83L\x83X\x83g\x83{\x83b\x83N\x83X
 				SetDlgItemTextA(Dialog, IDC_LOCALE_EDIT, ts->Locale);
 				SendDlgItemMessage(Dialog, IDC_LOCALE_EDIT, EM_LIMITTEXT, sizeof(ts->Locale), 0);
-
-				SetDlgItemInt(Dialog, IDC_CODEPAGE_EDIT, ts->CodePage, FALSE);
 			}
 			else if (ts->Language==IdRussian) {
 				SetDropDownList(Dialog,IDC_TERMRUSSHOST,RussList,ts->RussHost);
@@ -263,8 +259,6 @@
 				// \x83\x8D\x83P\x81[\x83\x8B\x97p\x83e\x83L\x83X\x83g\x83{\x83b\x83N\x83X
 				SetDlgItemTextA(Dialog, IDC_LOCALE_EDIT, ts->Locale);
 				SendDlgItemMessage(Dialog, IDC_LOCALE_EDIT, EM_LIMITTEXT, sizeof(ts->Locale), 0);
-
-				SetDlgItemInt(Dialog, IDC_CODEPAGE_EDIT, ts->CodePage, FALSE);
 			}
 			else if (ts->Language==IdUtf8) {
 				SetDropDownList(Dialog, IDC_TERMKANJI, Utf8List, KanjiCode2List(ts->Language,ts->KanjiCode));
@@ -273,8 +267,6 @@
 				// \x83\x8D\x83P\x81[\x83\x8B\x97p\x83e\x83L\x83X\x83g\x83{\x83b\x83N\x83X
 				SetDlgItemTextA(Dialog, IDC_LOCALE_EDIT, ts->Locale);
 				SendDlgItemMessage(Dialog, IDC_LOCALE_EDIT, EM_LIMITTEXT, sizeof(ts->Locale), 0);
-
-				SetDlgItemInt(Dialog, IDC_CODEPAGE_EDIT, ts->CodePage, FALSE);
 			}
 			return TRUE;
 
@@ -336,8 +328,6 @@
 						GetRB(Dialog,&ts->AutoWinSwitch,IDC_TERMAUTOSWITCH,IDC_TERMAUTOSWITCH);
 
 						if (ts->Language==IdJapanese) {
-							BOOL ret;
-
 							if ((w = (WORD)GetCurSel(Dialog, IDC_TERMKANJI)) > 0) {
 								ts->KanjiCode = w;
 							}
@@ -354,7 +344,6 @@
 							}
 
 							GetDlgItemTextA(Dialog, IDC_LOCALE_EDIT, ts->Locale, sizeof(ts->Locale));
-							ts->CodePage = GetDlgItemInt(Dialog, IDC_CODEPAGE_EDIT, &ret, FALSE);
 						}
 						else if (ts->Language==IdRussian) {
 							if ((w = (WORD)GetCurSel(Dialog, IDC_TERMRUSSHOST)) > 0) {
@@ -369,8 +358,6 @@
 						}
 						else if (ts->Language==IdKorean || // HKS
 						         ts->Language==IdUtf8) {
-							BOOL ret;
-
 							if ((w = (WORD)GetCurSel(Dialog, IDC_TERMKANJI)) > 0) {
 								ts->KanjiCode = List2KanjiCode(ts->Language, w);
 							}
@@ -384,7 +371,6 @@
 							ts->KanjiOut = 0;
 
 							GetDlgItemTextA(Dialog, IDC_LOCALE_EDIT, ts->Locale, sizeof(ts->Locale));
-							ts->CodePage = GetDlgItemInt(Dialog, IDC_CODEPAGE_EDIT, &ret, FALSE);
 						}
 
 					}

Modified: branches/cmake/teraterm/ttpdlg/ttpdlg-version.rc
===================================================================
--- branches/cmake/teraterm/ttpdlg/ttpdlg-version.rc	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/teraterm/ttpdlg/ttpdlg-version.rc	2019-03-10 14:32:02 UTC (rev 7468)
@@ -26,7 +26,7 @@
             VALUE "FileDescription", "Tera Term Dialog Routines"
             VALUE "FileVersion", TT_RES_VERSION_STR
             VALUE "InternalName", "TTPDLG"
-            VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2018 TeraTerm Project"
+            VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2019 TeraTerm Project"
             VALUE "OriginalFilename", "TTPDLG.dll"
             VALUE "ProductName", "Tera Term"
             VALUE "ProductVersion", TT_RES_VERSION_STR

Modified: branches/cmake/teraterm/ttpdlg/ttpdlg.rc
===================================================================
--- branches/cmake/teraterm/ttpdlg/ttpdlg.rc	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/teraterm/ttpdlg/ttpdlg.rc	2019-03-10 14:32:02 UTC (rev 7468)
@@ -84,8 +84,6 @@
     PUSHBUTTON      "&Help",IDC_TERMHELP,198,54,40,14
     RTEXT           "lo&cale:",IDC_LOCALE_LABEL,12,129,44,8
     EDITTEXT        IDC_LOCALE_EDIT,59,127,63,13,ES_AUTOHSCROLL
-    RTEXT           "Code&Page:",IDC_CODEPAGE_LABEL,128,129,50,8
-    EDITTEXT        IDC_CODEPAGE_EDIT,180,127,40,14,ES_AUTOHSCROLL | ES_NUMBER
 END
 
 IDD_TERMDLGJ DIALOGEX 20, 20, 245, 158
@@ -125,8 +123,6 @@
     PUSHBUTTON      "&Help",IDC_TERMHELP,198,54,40,14
     RTEXT           "lo&cale:",IDC_LOCALE_LABEL,12,142,44,8
     EDITTEXT        IDC_LOCALE_EDIT,59,140,63,13,ES_AUTOHSCROLL
-    RTEXT           "Code&Page:",IDC_CODEPAGE_LABEL,128,142,50,8
-    EDITTEXT        IDC_CODEPAGE_EDIT,180,140,40,14,ES_AUTOHSCROLL | ES_NUMBER
 END
 
 IDD_SERIALDLG DIALOGEX 20, 20, 190, 143
@@ -235,7 +231,7 @@
                     "Static",SS_LEFTNOWORDWRAP | WS_GROUP,39,59,134,8
     DEFPUSHBUTTON   "OK",IDOK,169,6,32,16,WS_GROUP
     CONTROL         "All Rights Reserved.",IDC_RIGHTS_LABEL,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,39,75,76,8
-    CONTROL         "(C) 2004-2018 TeraTerm Project",IDC_PROJECT_LABEL,
+    CONTROL         "(C) 2004-2019 TeraTerm Project",IDC_PROJECT_LABEL,
                     "Static",SS_LEFTNOWORDWRAP | WS_GROUP,39,67,122,9
     LTEXT           "Includes:",IDC_INLUCDE_LABEL,39,26,31,8
     LTEXT           "Version",IDC_TT_VERSION,39,12,127,8

Modified: branches/cmake/teraterm/ttpfile/ttpfile-version.rc
===================================================================
--- branches/cmake/teraterm/ttpfile/ttpfile-version.rc	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/teraterm/ttpfile/ttpfile-version.rc	2019-03-10 14:32:02 UTC (rev 7468)
@@ -26,7 +26,7 @@
             VALUE "FileDescription", "Tera Term File Transfer Routines"
             VALUE "FileVersion", TT_RES_VERSION_STR
             VALUE "InternalName", "TTPFILE"
-            VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2018 TeraTerm Project"
+            VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2019 TeraTerm Project"
             VALUE "OriginalFilename", "TTPFILE.dll"
             VALUE "ProductName", "Tera Term"
             VALUE "ProductVersion", TT_RES_VERSION_STR

Modified: branches/cmake/teraterm/ttpmacro/ttm-version.rc
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttm-version.rc	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/teraterm/ttpmacro/ttm-version.rc	2019-03-10 14:32:02 UTC (rev 7468)
@@ -26,7 +26,7 @@
             VALUE "FileDescription", "Tera Term Macro Interpreter"
             VALUE "FileVersion", TT_RES_VERSION_STR
             VALUE "InternalName", "TTPMACRO"
-            VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2018 TeraTerm Project"
+            VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2019 TeraTerm Project"
             VALUE "OriginalFilename", "TTPMACRO.EXE"
             VALUE "ProductName", "Tera Term"
             VALUE "ProductVersion", TT_RES_VERSION_STR

Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.v10.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.v10.vcxproj	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.v10.vcxproj	2019-03-10 14:32:02 UTC (rev 7468)
@@ -78,7 +78,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>onig_s.lib;SFMT.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>nafxcw.lib;LIBCMT.lib;onig_s.lib;SFMT.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>iphlpapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -85,6 +85,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
+      <IgnoreSpecificDefaultLibraries>nafxcw.lib;LIBCMT.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -114,7 +115,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>onig_sd.lib;SFMTd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;onig_sd.lib;SFMTd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>iphlpapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -121,6 +122,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
+      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.v11.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.v11.vcxproj	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.v11.vcxproj	2019-03-10 14:32:02 UTC (rev 7468)
@@ -79,7 +79,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>onig_s.lib;SFMT.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>nafxcw.lib;LIBCMT.lib;onig_s.lib;SFMT.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>iphlpapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -86,6 +86,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
+      <IgnoreSpecificDefaultLibraries>nafxcw.lib;LIBCMT.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -114,7 +115,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>onig_sd.lib;SFMTd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;onig_sd.lib;SFMTd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>iphlpapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -121,6 +122,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
+      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.v9.vcproj
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.v9.vcproj	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.v9.vcproj	2019-03-10 14:32:02 UTC (rev 7468)
@@ -73,10 +73,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="onig_s.lib SFMT.lib iphlpapi.lib"
+				AdditionalDependencies="nafxcw.lib LIBCMT.lib onig_s.lib SFMT.lib iphlpapi.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir)"
+				IgnoreDefaultLibraryNames="nafxcw.lib;LIBCMT.lib"
 				DelayLoadDLLs="iphlpapi.dll;user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -161,10 +162,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="onig_sd.lib SFMTd.lib iphlpapi.lib"
+				AdditionalDependencies="nafxcwd.lib LIBCMTD.lib onig_sd.lib SFMTd.lib iphlpapi.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir)"
+				IgnoreDefaultLibraryNames="nafxcwd.lib;LIBCMTD.lib"
 				DelayLoadDLLs="iphlpapi.dll;user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"

Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.vcproj
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.vcproj	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.vcproj	2019-03-10 14:32:02 UTC (rev 7468)
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="shift_jis"?>
+
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
@@ -72,10 +73,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="onig_s.lib SFMT.lib iphlpapi.lib"
+				AdditionalDependencies="nafxcw.lib LIBCMT.lib onig_s.lib SFMT.lib iphlpapi.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir)"
+				IgnoreDefaultLibraryNames="nafxcw.lib;LIBCMT.lib"
 				DelayLoadDLLs="iphlpapi.dll;user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -161,10 +163,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="onig_sd.lib SFMTd.lib iphlpapi.lib"
+				AdditionalDependencies="nafxcwd.lib LIBCMTD.lib onig_sd.lib SFMTd.lib iphlpapi.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir)"
+				IgnoreDefaultLibraryNames="nafxcw.lib;LIBCMT.lib"
 				DelayLoadDLLs="iphlpapi.dll;user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"

Modified: branches/cmake/teraterm/ttpset/ttpset-version.rc
===================================================================
--- branches/cmake/teraterm/ttpset/ttpset-version.rc	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/teraterm/ttpset/ttpset-version.rc	2019-03-10 14:32:02 UTC (rev 7468)
@@ -26,7 +26,7 @@
             VALUE "FileDescription", "Tera Term Setting Routines"
             VALUE "FileVersion", TT_RES_VERSION_STR
             VALUE "InternalName", "TTPSEt"
-            VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2018 TeraTerm Project"
+            VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2019 TeraTerm Project"
             VALUE "OriginalFilename", "ttpset.dll"
             VALUE "ProductName", "Tera Term"
             VALUE "ProductVersion", TT_RES_VERSION_STR

Modified: branches/cmake/teraterm/ttpset/ttset.c
===================================================================
--- branches/cmake/teraterm/ttpset/ttset.c	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/teraterm/ttpset/ttset.c	2019-03-10 14:32:02 UTC (rev 7468)
@@ -1569,7 +1569,7 @@
 	ts->AlphaBlendInactive = max(0, ts->AlphaBlendInactive);
 	ts->AlphaBlendInactive = min(255, ts->AlphaBlendInactive);
 	ts->AlphaBlendActive =
-		GetPrivateProfileInt(Section, "AlphaBlendActive", 255, FName);
+		GetPrivateProfileInt(Section, "AlphaBlendActive", ts->AlphaBlendInactive, FName);
 	ts->AlphaBlendActive = max(0, ts->AlphaBlendActive);
 	ts->AlphaBlendActive = min(255, ts->AlphaBlendActive);
 

Modified: branches/cmake/teraterm/ttptek/ttptek-version.rc
===================================================================
--- branches/cmake/teraterm/ttptek/ttptek-version.rc	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/teraterm/ttptek/ttptek-version.rc	2019-03-10 14:32:02 UTC (rev 7468)
@@ -28,7 +28,7 @@
             VALUE "FileDescription", "Tera Term Tek Emulation Routines"
             VALUE "FileVersion", TT_RES_VERSION_STR
             VALUE "InternalName", "TTPTEK"
-            VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2018 TeraTerm Project"
+            VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2019 TeraTerm Project"
             VALUE "OriginalFilename", "ttptek.dll"
             VALUE "ProductName", "Tera Term"
             VALUE "ProductVersion", TT_RES_VERSION_STR

Modified: branches/cmake/ttssh2/ttxssh/ssh.c
===================================================================
--- branches/cmake/ttssh2/ttxssh/ssh.c	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/ttssh2/ttxssh/ssh.c	2019-03-10 14:32:02 UTC (rev 7468)
@@ -7549,9 +7549,10 @@
 				return FALSE;
 			}
 
-			if (old_passwd[0] == 0 || new_passwd[0] == 0) {
+			if (new_passwd[0] == 0) {
 				// \x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x8AJ\x82\xA2\x82Ă\xB7\x82\xAE\x82\xC9 Return \x82\xF0\x89\x9F\x82\xB5\x82Ă\xB5\x82܂\xC1\x82\xBD\x8E\x9E\x82̑΍\xF4\x82ׁ̈A
-				// \x82Ƃ肠\x82\xA6\x82\xB8\x8B\xF3\x83p\x83X\x83\x8F\x81[\x83h\x82\xF0\x82͂\xB6\x82\xA2\x82Ă\xA8\x82\xAD\x81B
+				// \x82Ƃ肠\x82\xA6\x82\xB8\x90V\x83p\x83X\x83\x8F\x81[\x83h\x82\xAA\x8B\xF3\x82̏ꍇ\x82\xF0\x82͂\xB6\x82\xA2\x82Ă\xA8\x82\xAD\x81B
+				// c.f. Ticket: #38970
 				return FALSE;
 			}
 

Modified: branches/cmake/ttssh2/ttxssh/ttxssh-version.h
===================================================================
--- branches/cmake/ttssh2/ttxssh/ttxssh-version.h	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/ttssh2/ttxssh/ttxssh-version.h	2019-03-10 14:32:02 UTC (rev 7468)
@@ -31,6 +31,6 @@
 #include "tt-version.h"
 
 #define TTSSH_VERSION_MAJOR             2
-#define TTSSH_VERSION_MINOR             87
+#define TTSSH_VERSION_MINOR             88
 #define TTSSH_VERSION_STR(sep)          TT_TOSTR(TTSSH_VERSION_MAJOR) sep TT_TOSTR(TTSSH_VERSION_MINOR)
 #define TTSSH_RES_VERSION_STR           TTSSH_VERSION_STR(", ") ", 0, 0"

Modified: branches/cmake/ttssh2/ttxssh/ttxssh-version.rc
===================================================================
--- branches/cmake/ttssh2/ttxssh/ttxssh-version.rc	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/ttssh2/ttxssh/ttxssh-version.rc	2019-03-10 14:32:02 UTC (rev 7468)
@@ -26,7 +26,7 @@
             VALUE "FileDescription", "Tera Term Secure Shell Extension"
             VALUE "FileVersion", TTSSH_RES_VERSION_STR
             VALUE "InternalName", "TTXSSH"
-            VALUE "LegalCopyright", "(C)1998-2001 Robert O'Callahan, (C) 2000-2003 Jun-ya KATO, (C) 2004-2018 TeraTerm Project"
+            VALUE "LegalCopyright", "(C)1998-2001 Robert O'Callahan, (C) 2000-2003 Jun-ya KATO, (C) 2004-2019 TeraTerm Project"
             VALUE "OriginalFilename", "TTXSSH.dll"
             VALUE "ProductName", "TTSSH"
             VALUE "ProductVersion", TTSSH_RES_VERSION_STR

Modified: branches/cmake/ttssh2/ttxssh/ttxssh.c
===================================================================
--- branches/cmake/ttssh2/ttxssh/ttxssh.c	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/ttssh2/ttxssh/ttxssh.c	2019-03-10 14:32:02 UTC (rev 7468)
@@ -299,6 +299,7 @@
 
 		if (!listed[num]) {
 			buf[i] = num + '0';
+			listed[num] = 1;
 			i++;
 		}
 	}
@@ -4584,6 +4585,13 @@
 			SetDlgItemInt(dlg, IDC_BCRYPT_KDF_ROUNDS, DEFAULT_ROUNDS, FALSE);
 			SendDlgItemMessage(dlg, IDC_BCRYPT_KDF_ROUNDS, EM_LIMITTEXT, 4, 0);
 
+		// default bcrypt KDF
+		EnableWindow(GetDlgItem(dlg, IDC_BCRYPT_KDF_CHECK), TRUE);
+		SendMessage(GetDlgItem(dlg, IDC_BCRYPT_KDF_CHECK), BM_SETCHECK, BST_CHECKED, 0);
+		EnableWindow(GetDlgItem(dlg, IDC_BCRYPT_KDF_ROUNDS), TRUE);
+		SetDlgItemInt(dlg, IDC_BCRYPT_KDF_ROUNDS, DEFAULT_ROUNDS, FALSE);
+		SendDlgItemMessage(dlg, IDC_BCRYPT_KDF_ROUNDS, EM_LIMITTEXT, 4, 0);
+
 		}
 		return TRUE;
 

Modified: branches/cmake/ttssh2/ttxssh/ttxssh.h
===================================================================
--- branches/cmake/ttssh2/ttxssh/ttxssh.h	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/ttssh2/ttxssh/ttxssh.h	2019-03-10 14:32:02 UTC (rev 7468)
@@ -142,7 +142,7 @@
 	   cipher. The first digit is the most preferred cipher, and so on.
 	   The digit SSH_CIPHER_NONE signifies that any ciphers after it are
 	   disabled. */
-	char CipherOrder[SSH_CIPHER_MAX+1];
+	char CipherOrder[SSH_CIPHER_MAX+2];
 
 	char KnownHostsFiles[2048];
 	int DefaultAuthMethod;

Modified: branches/cmake/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- branches/cmake/ttssh2/ttxssh/ttxssh.rc	2019-03-09 17:33:37 UTC (rev 7467)
+++ branches/cmake/ttssh2/ttxssh/ttxssh.rc	2019-03-10 14:32:02 UTC (rev 7468)
@@ -38,7 +38,7 @@
     LTEXT           "Tera Term Secure Shell extension, ",IDC_TTSSH_VERSION,6,7,220,15
     ICON            "",IDC_TTSSH_ICON,248,7,20,20
     LTEXT           "Compatible with SSH protocol version 1.5 and 2.0",IDC_SSHVERSIONS,6,23,206,11
-    LTEXT           "Includes:\r\nTTSSH 1.5.4, (C) 1998-2001 Robert O'Callahan roc+tt ＠ cs.cmu.edu\r\nIPv6 extention version 0.81, (C) 2000-2003 Jun-ya KATO kato ＠ win6.jp\r\nSSH2 support, (C) 2004-2018 TeraTerm Project",IDC_INCLUDES,6,36,262,34
+    LTEXT           "Includes:\r\nTTSSH 1.5.4, (C) 1998-2001 Robert O'Callahan roc+tt ＠ cs.cmu.edu\r\nIPv6 extention version 0.81, (C) 2000-2003 Jun-ya KATO kato ＠ win6.jp\r\nSSH2 support, (C) 2004-2019 TeraTerm Project",IDC_INCLUDES,6,36,262,34
     LTEXT           "OpenSSL:",IDC_OPENSSL_VERSION,6,69,175,8
     LTEXT           "zlib:",IDC_ZLIB_VERSION,6,78,175,8
     LTEXT           "PuTTY:",IDC_PUTTY_VERSION,6,87,175,8

From scmnotify ＠ osdn.net  Sun Mar 10 23:32:33 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sun, 10 Mar 2019 23:32:33 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0NjldIGNvZGVjb2525YWl44KM5pu/44GI?=
Message-ID: <1552228353.902832.4840.nullmailer@users.osdn.me>

Revision: 7469
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7469
Author:   zmatsuo
Date:     2019-03-10 23:32:33 +0900 (Sun, 10 Mar 2019)
Log Message:
-----------
codeconv入れ替え

# Conflicts:
#	teraterm/common/codeconv.cpp
#	teraterm/common/codeconv.h

Modified Paths:
--------------
    branches/cmake/teraterm/common/codeconv.cpp
    branches/cmake/teraterm/common/codeconv.h

-------------- next part --------------
Modified: branches/cmake/teraterm/common/codeconv.cpp
===================================================================
--- branches/cmake/teraterm/common/codeconv.cpp	2019-03-10 14:32:02 UTC (rev 7468)
+++ branches/cmake/teraterm/common/codeconv.cpp	2019-03-10 14:32:33 UTC (rev 7469)
@@ -26,14 +26,21 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+/* unicode\x8A֘A\x82̕\xB6\x8E\x9A\x83R\x81[\x83h\x95ϊ\xB7 */
+
 #include <windows.h>
 #include <string.h>
+#include <assert.h>
 #include <crtdbg.h>
 #if (defined(_MSC_VER) && (_MSC_VER >= 1600)) || !defined(_MSC_VER)
 #include <stdint.h>
 #endif
+#include "codemap.h"
 #include "codeconv.h"
 
+// cp932\x95ϊ\xB7\x8E\x9E\x81AWindows API \x82\xE6\x82\xE8 Tera Term \x82̕ϊ\xB7\x83e\x81[\x83u\x83\x8B\x82\xF0\x97D\x90悷\x82\xE9
+//#define PRIORITY_CP932_TABLE
+
 #if defined(_MSC_VER) && (_MSC_VER < 1600)
 typedef unsigned char	uint8_t;
 typedef unsigned short  uint16_t;
@@ -47,64 +54,215 @@
 #define _wcsdup(s)    _wcsdup_dbg((s), _NORMAL_BLOCK, __FILE__, __LINE__)
 #endif
 
+/*
+ *	\x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA2\x8Fꍇ\x82\xCD 0 \x82\xF0\x95Ԃ\xB7
+ */
+static unsigned short _ConvertUnicode(unsigned short code, const codemap_t *table, int tmax)
+{
+	int low, mid, high;
+	unsigned short result;
+
+	low = 0;
+	high = tmax - 1;
+	result = 0; // convert error
+
+	// binary search
+	while (low < high) {
+		mid = (low + high) / 2;
+		if (table[mid].from_code < code) {
+			low = mid + 1;
+		} else {
+			high = mid;
+		}
+	}
+
+	if (table[low].from_code == code) {
+		result = table[low].to_code;
+	}
+
+	return (result);
+}
+
+static int IsHighSurrogate(wchar_t u16)
+{
+	return 0xd800 <= u16 && u16 < 0xdc00;
+}
+
+static int IsLowSurrogate(wchar_t u16)
+{
+	return 0xdc00 <= u16 && u16 < 0xe000;
+}
+
 /**
- * UTF-32 \x82\xA9\x82\xE7 UTF-8 \x82֕ϊ\xB7\x82\xB7\x82\xE9
- * @param[in]		u32		\x95ϊ\xB7\x82\xB7\x82\xE9UTF-32
- * @param[in,out]	u8_ptr	\x95ϊ\xB7\x8C\xE3UTF-8\x95\xB6\x8E\x9A\x97\xF1\x8Fo\x97͐\xE6(NULL\x82̂Ƃ\xAB\x8Fo\x97͂\xB5\x82Ȃ\xA2)
- * @param[in]		u8_len	UTF-8\x8Fo\x97͐敶\x8E\x9A\x90\x94(\x83o\x83b\x83t\x83@\x92\xB7,byte\x90\x94)
- * @retval			\x8Eg\x97p\x82\xB5\x82\xBDutf8\x95\xB6\x8E\x9A\x90\x94(byte\x90\x94\x81j
- *					0=\x83G\x83\x89\x81[
+ * CP932\x95\xB6\x8E\x9A(Shift_JIS) 1\x95\xB6\x8E\x9A\x82\xA9\x82\xE7UTF-32\x82֕ϊ\xB7\x82\xB7\x82\xE9
+ * @param[in]		cp932		CP932\x95\xB6\x8E\x9A
+ * @retval			\x95ϊ\xB7\x82\xB5\x82\xBDUTF-32\x95\xB6\x8E\x9A
+ *					0=\x83G\x83\x89\x81[(\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD)
  */
-size_t UTF32ToUTF8(uint32_t u32, char *u8_ptr_, size_t u8_len)
+unsigned int CP932ToUTF32(unsigned short cp932)
 {
-	size_t out_len = 0;
-	uint8_t *u8_ptr = (uint8_t *)u8_ptr_;
-	if (u8_ptr != NULL) {
-		u8_len = 4;
+#include "../ttpcmn/sjis2uni.map"		// mapSJISToUnicode[]
+	wchar_t wchar;
+	int ret;
+	unsigned int u32;
+	unsigned char buf[2];
+	int len = 0;
+
+#if defined(PRIORITY_CP932_TABLE)
+	u32 = _ConvertUnicode(cp932, mapSJISToUnicode, sizeof(mapSJISToUnicode)/sizeof(mapSJISToUnicode[0]));
+	if (u32 != 0) {
+		return u32;
 	}
+#endif
+	if (cp932 < 0x100) {
+		buf[0] = cp932 & 0xff;
+		len = 1;
+	} else {
+		buf[0] = cp932 >> 8;
+		buf[1] = cp932 & 0xff;
+		len = 2;
+	}
+	ret = MultiByteToWideChar(932, MB_ERR_INVALID_CHARS, (char *)buf, len, &wchar, 1);
+	if (ret <= 0) {
+		// MultiByteToWideChar()\x82\xAA\x95ϊ\xB7\x8E\xB8\x94s
+#if !defined(PRIORITY_CP932_TABLE)
+		u32 = _ConvertUnicode(cp932, mapSJISToUnicode, sizeof(mapSJISToUnicode)/sizeof(mapSJISToUnicode[0]));
+		// \x83e\x81[\x83u\x83\x8B\x82ɂ\xE0\x82Ȃ\xA9\x82\xC1\x82\xBD\x8Fꍇ c = 0(\x95ϊ\xB7\x8E\xB8\x94s\x8E\x9E)
+#else
+		u32 = 0;
+#endif
+	} else {
+		u32 = (unsigned int)wchar;
+	}
 
-	if (u32 <= 0x0000007f) {
-		// 0x00000000 <= u32 <= 0x0000007f
-		if (u8_len >= 1) {
-			if (u8_ptr != NULL) {
-				u8_ptr[0] = (uint8_t)u32;
-			}
-			out_len = 1;
+	return u32;
+}
+
+/**
+ * Unicode\x82\xA9\x82\xE7DEC\x93\xC1\x8Eꕶ\x8E\x9A\x82֕ϊ\xB7
+ * @param	u32			UTF-32\x95\xB6\x8E\x9A\x83R\x81[\x83h
+ * @return	\x89\xBA\x88\xCA8bit	DEC\x93\xC1\x8Eꕶ\x8E\x9A\x83R\x81[\x83h
+ *			\x8F\xE3\x88\xCA8bit	\x95\xB6\x8E\x9A\x83R\x81[\x83h\x8E\xED\x95\xCA (1,2,4)
+ *						file://../../doc/ja/html/setup/teraterm-term.html \x8EQ\x8F\xC6
+ *			0			\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD
+ */
+unsigned short UTF32ToDecSp(unsigned int u32)
+{
+#include "../teraterm/unisym2decsp.map"		// mapUnicodeSymbolToDecSp[]
+	unsigned short cset;
+	if (u32 > 0x10000) {
+		cset = 0;
+	} else {
+		const unsigned short u16 = (unsigned short)u32;
+		cset = _ConvertUnicode(u16, mapUnicodeSymbolToDecSp, _countof(mapUnicodeSymbolToDecSp));
+	}
+	return cset;
+}
+
+/**
+ *	code page \x82\xCC mulit byte \x95\xB6\x8E\x9A\x82\xF0 UTF-32\x82֕ϊ\xB7\x82\xB7\x82\xE9
+ *	@param mb_code		\x83}\x83\x8B\x83`\x83o\x83C\x83g\x82̕\xB6\x8E\x9A\x83R\x81[\x83h(0x0000-0xffff)
+ *	@param code_page	\x83}\x83\x8B\x83`\x83o\x83C\x83g\x82̃R\x81[\x83h\x83y\x81[\x83W
+ *	@retval				unicode(UTF-32\x95\xB6\x8E\x9A\x83R\x81[\x83h)
+ */
+unsigned int MBCP_UTF32(unsigned short mb_code, int code_page)
+{
+	unsigned int c;
+
+	if (code_page == CP_ACP) {
+		code_page = (int)GetACP();
+	}
+	if (code_page == 932) {
+		c = CP932ToUTF32(mb_code);
+	} else {
+		char buf[2];
+		wchar_t wchar;
+		int ret;
+		int len = 0;
+		if (mb_code < 0x100) {
+			buf[0] = mb_code & 0xff;
+			len = 1;
+		} else {
+			buf[0] = mb_code >> 8;
+			buf[1] = mb_code & 0xff;
+			len = 2;
 		}
-	} else if (u32 <= 0x000007ff) {
-		// 0x00000080 <= u32 <= 0x000007ff
-		if (u8_len >= 2) {
-			if (u8_ptr != NULL) {
-				u8_ptr[0] = ((u32 >> 6) & 0x1f) | 0xc0;
-				u8_ptr[1] = (u32 & 0x3f) | 0x80;
-			}
-			out_len = 2;
+		ret = MultiByteToWideChar(code_page, MB_ERR_INVALID_CHARS, buf, len, &wchar, 1);
+		if (ret <= 0) {
+			c = 0;
+		} else {
+			c = (unsigned int)wchar;
 		}
-	} else if (u32 <= 0x0000ffff) {
-		// 0x00000800 <= u32 <= 0x0000ffff
-		if (u8_len >= 3) {
-			if (u8_ptr != NULL) {
-				u8_ptr[0] = ((u32 >> 12) & 0xf) | 0xe0;
-				u8_ptr[1] = ((u32 >> 6) & 0x3f) | 0x80;
-				u8_ptr[2] = (u32 & 0x3f) | 0x80;
-			}
-			out_len = 3;
+	}
+	return c;
+}
+
+/**
+ * UTF-32\x95\xB6\x8E\x9A\x82\xF0CP932\x95\xB6\x8E\x9A(Shift_JIS) 1\x95\xB6\x8E\x9A\x82֕ϊ\xB7\x82\xB7\x82\xE9
+ * @retval		\x8Eg\x97p\x82\xB5\x82\xBDCP932\x95\xB6\x8E\x9A
+ *				0=\x83G\x83\x89\x81[(\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD)
+ */
+unsigned short UTF32_CP932(unsigned int u32)
+{
+#include "../teraterm/uni2sjis.map"		// mapUnicodeToSJIS[]
+	char mbstr[2];
+	unsigned short mb;
+	DWORD mblen;
+	wchar_t u16_str[2];
+	size_t u16_len;
+
+	if (u32 < 0x80) {
+		return (unsigned short)u32;
+	}
+
+#if defined(PRIORITY_CP932_TABLE)
+	if (u32 < 0x10000) {
+		wchar_t u16 = (wchar_t)u32;
+		// Tera Term\x82̕ϊ\xB7\x83e\x81[\x83u\x83\x8B\x82\xC5 Unicode -> Shift_JIS\x82֕ϊ\xB7
+		mb = _ConvertUnicode(u16, mapUnicodeToSJIS, _countof(mapUnicodeToSJIS));
+		if (mb != 0) {
+			// \x95ϊ\xB7\x82ł\xAB\x82\xBD
+			return mb;
 		}
-	} else if (u32 <= 0x0010ffff) {
-		// 0x00010000 <= u32 <= 0x0010ffff
-		if (u8_len >= 4) {
-			if (u8_ptr != NULL) {
-				u8_ptr[0] = ((uint8_t)(u32 >> 18)) | 0xf0;
-				u8_ptr[1] = ((u32 >> 12) & 0x3f) | 0x80;
-				u8_ptr[2] = ((u32 >> 6) & 0x3f) | 0x80;
-				u8_ptr[3] = (u32 & 0x3f) | 0x80;
-			}
-			out_len = 4;
+	}
+#endif
+	u16_len = UTF32ToUTF16(u32, u16_str, 2);
+	if (u16_len == 0) {
+		return 0;
+	}
+	mblen = WideCharToMultiByte(932, 0, u16_str, (int)u16_len, mbstr, 2, NULL, NULL);
+	switch (mblen) {
+	case 0:
+	case 1:
+	default:
+		if (mblen == 0 || mbstr[0] == '?') {
+			goto next_convert;
+		} else {
+			mb = (unsigned char)mbstr[0];
+			return mb;
 		}
-	} else {
-		out_len = 0;
+	case 2:
+		if (mbstr[0] == '?' && mbstr[1] == '?') {
+			// 2byte\x8Fo\x97\xCD && "??" \x82̏ꍇ\x82͕ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD
+			goto next_convert;
+		}
+		mb = (((unsigned char)mbstr[0]) << 8) | (unsigned char)mbstr[1];
+		return mb;
 	}
-	return out_len;
+
+next_convert:
+#if !defined(PRIORITY_CP932_TABLE)
+	if (u32 < 0x10000) {
+		wchar_t u16 = (wchar_t)u32;
+		// Tera Term\x82̕ϊ\xB7\x83e\x81[\x83u\x83\x8B\x82\xC5 Unicode -> Shift_JIS\x82֕ϊ\xB7
+		mb = _ConvertUnicode(u16, mapUnicodeToSJIS, _countof(mapUnicodeToSJIS));
+		if (mb != 0) {
+			// \x95ϊ\xB7\x82ł\xAB\x82\xBD
+			return mb;
+		}
+	}
+#endif
+	return 0;
 }
 
 /**
@@ -113,7 +271,7 @@
  * @param[in]	u8_len	UTF-8\x95\xB6\x8E\x9A\x97񒷂\xB3
  * @param[out]	u32		\x95ϊ\xB7\x82\xB5\x82\xBDUTF-32\x95\xB6\x8E\x9A
  * @retval		\x8Eg\x97p\x82\xB5\x82\xBDUTF-8\x95\xB6\x8E\x9A\x90\x94(byte\x90\x94\x81j
- *				0=\x83G\x83\x89\x81[
+ *				0=\x83G\x83\x89\x81[(\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD)
  */
 size_t UTF8ToUTF32(const char *u8_ptr_, size_t u8_len, uint32_t *u32_)
 {
@@ -191,33 +349,312 @@
 	return u8_in;
 }
 
-// WideCharToMultiByte\x82\xCCUTF8\x93\xC1\x89\xBB\x94\xC5
-int WideCharToUTF8(const wchar_t *wstr_ptr, int wstr_len, char *u8_ptr, int u8_len)
+/**
+ *	wchar_t\x95\xB6\x8E\x9A\x97񂩂\xE7unicode(UTF-32)\x82\xF01\x95\xB6\x8E\x9A\x8E\xE6\x82\xE8\x8Fo\x82\xB7
+ *	@retval	0	\x95\xB6\x8E\x9A\x82Ƃ\xB5\x82Ĉ\xB5\x82\xA6\x82Ȃ\xA2(\x95\xB6\x8E\x9A\x83R\x81[\x83h\x82\xAA\x82\xA8\x82\xA9\x82\xB5\x82\xA2)
+ *	@retval	1	1\x83L\x83\x83\x83\x89\x83N\x83^\x82\xC51\x95\xB6\x8E\x9A\x82Ƃ\xB5\x82Ĉ\xB5\x82\xA6\x82\xE9
+ *	@retval	2	2\x83L\x83\x83\x83\x89\x83N\x83^\x82\xC51\x95\xB6\x8E\x9A\x82Ƃ\xB5\x82Ĉ\xB5\x82\xA6\x82\xE9
+ */
+size_t UTF16ToUTF32(const wchar_t *wstr_ptr, size_t wstr_len, unsigned int *u32)
 {
-	int u8_out_sum = 0;
+	assert(wstr_ptr != NULL);
+	if (wstr_len == 0) {
+		*u32 = 0;
+		return 0;
+	}
+	const wchar_t u16 = *wstr_ptr++;
+	// \x83T\x83\x8D\x83Q\x81[\x83g high?
+	if (IsHighSurrogate(u16)) {
+		if (wstr_len >= 2) {
+			const wchar_t u16_lo = *wstr_ptr++;
+			if (IsLowSurrogate(u16_lo)) {
+				// \x83T\x83\x8D\x83Q\x81[\x83g\x83y\x83A \x83f\x83R\x81[\x83h
+				*u32 = 0x10000 + (u16 - 0xd800) * 0x400 + (u16_lo - 0xdc00);
+				return 2;
+			} else {
+				*u32 = 0;
+				return 0;
+			}
+		} else {
+			*u32 = 0;
+			return 0;
+		}
+	} else if (IsLowSurrogate(u16)) {
+		*u32 = 0;
+		return 0;
+	} else {
+		*u32 = u16;
+		return 1;
+	}
+}
+
+/**
+ *	\x83}\x83\x8B\x83`\x83o\x83C\x83g\x95\xB6\x8E\x9A(code_page) \x82\xA9\x82\xE7unicode(UTF-32)\x82\xF01\x95\xB6\x8E\x9A\x8E\xE6\x82\xE8\x8Fo\x82\xB7
+ *	@retval	0	\x95\xB6\x8E\x9A\x82Ƃ\xB5\x82Ĉ\xB5\x82\xA6\x82Ȃ\xA2(\x95\xB6\x8E\x9A\x83R\x81[\x83h\x82\xAA\x82\xA8\x82\xA9\x82\xB5\x82\xA2)
+ *	@retval	1	1\x83L\x83\x83\x83\x89\x83N\x83^\x82\xC51\x95\xB6\x8E\x9A\x82Ƃ\xB5\x82Ĉ\xB5\x82\xA6\x82\xE9
+ *	@retval	2	2\x83L\x83\x83\x83\x89\x83N\x83^\x82\xC51\x95\xB6\x8E\x9A\x82Ƃ\xB5\x82Ĉ\xB5\x82\xA6\x82\xE9
+ */
+size_t MBCPToUTF32(const char *mb_ptr, size_t mb_len, int code_page, unsigned int *u32)
+{
+	size_t input_len;
+	wchar_t u16_str[2];
+	size_t u16_len;
+
+	assert(mb_ptr != NULL);
+	if (mb_len == 0) {
+		*u32 = 0;
+		return 0;
+	}
+	if (code_page == CP_ACP) {
+		code_page = (int)GetACP();
+	}
+
+	input_len = 1;
+	while(1) {
+		u16_len = ::MultiByteToWideChar(code_page, MB_ERR_INVALID_CHARS,
+										mb_ptr, (int)input_len,
+										u16_str, 2);
+		if (u16_len != 0) {
+			size_t r = UTF16ToUTF32(u16_str, u16_len, u32);
+			assert(r != 0);
+			if (r == 0) {
+				// \x82Ȃ\xA2\x82͂\xB8
+				return 0;
+			} else {
+				return input_len;
+			}
+		}
+
+		input_len++;
+		if (input_len > mb_len) {
+			*u32 = 0;
+			return 0;
+		}
+	}
+}
+
+/**
+ * UTF-32\x95\xB6\x8E\x9A \x82\xA9\x82\xE7 UTF-8 \x82֕ϊ\xB7\x82\xB7\x82\xE9
+ * @param[in]		u32		\x95ϊ\xB7\x82\xB7\x82\xE9UTF-32
+ * @param[in,out]	u8_ptr	\x95ϊ\xB7\x8C\xE3UTF-8\x95\xB6\x8E\x9A\x97\xF1\x8Fo\x97͐\xE6(NULL\x82̂Ƃ\xAB\x8Fo\x97͂\xB5\x82Ȃ\xA2)
+ * @param[in]		u8_len	UTF-8\x8Fo\x97͐敶\x8E\x9A\x90\x94(\x83o\x83b\x83t\x83@\x92\xB7,byte\x90\x94)
+ * @retval			\x8Fo\x97͂\xB5\x82\xBDutf8\x95\xB6\x8E\x9A\x90\x94(byte\x90\x94\x81j
+ *					0=\x83G\x83\x89\x81[
+ */
+size_t UTF32ToUTF8(uint32_t u32, char *u8_ptr_, size_t u8_len)
+{
+	size_t out_len = 0;
+	uint8_t *u8_ptr = (uint8_t *)u8_ptr_;
 	if (u8_ptr == NULL) {
 		u8_len = 4;
+	}
+
+	if (u32 <= 0x0000007f) {
+		// 0x00000000 <= u32 <= 0x0000007f
+		if (u8_len >= 1) {
+			if (u8_ptr != NULL) {
+				u8_ptr[0] = (uint8_t)u32;
+			}
+			out_len = 1;
+		}
+	} else if (u32 <= 0x000007ff) {
+		// 0x00000080 <= u32 <= 0x000007ff
+		if (u8_len >= 2) {
+			if (u8_ptr != NULL) {
+				u8_ptr[0] = ((u32 >> 6) & 0x1f) | 0xc0;
+				u8_ptr[1] = (u32 & 0x3f) | 0x80;
+			}
+			out_len = 2;
+		}
+	} else if (u32 <= 0x0000ffff) {
+		// 0x00000800 <= u32 <= 0x0000ffff
+		if (u8_len >= 3) {
+			if (u8_ptr != NULL) {
+				u8_ptr[0] = ((u32 >> 12) & 0xf) | 0xe0;
+				u8_ptr[1] = ((u32 >> 6) & 0x3f) | 0x80;
+				u8_ptr[2] = (u32 & 0x3f) | 0x80;
+			}
+			out_len = 3;
+		}
+	} else if (u32 <= 0x0010ffff) {
+		// 0x00010000 <= u32 <= 0x0010ffff
+		if (u8_len >= 4) {
+			if (u8_ptr != NULL) {
+				u8_ptr[0] = ((uint8_t)(u32 >> 18)) | 0xf0;
+				u8_ptr[1] = ((u32 >> 12) & 0x3f) | 0x80;
+				u8_ptr[2] = ((u32 >> 6) & 0x3f) | 0x80;
+				u8_ptr[3] = (u32 & 0x3f) | 0x80;
+			}
+			out_len = 4;
+		}
 	} else {
-		if (u8_len == 0) {
+		out_len = 0;
+	}
+	return out_len;
+}
+
+/**
+ * UTF-32 \x82\xA9\x82\xE7 UTF-16 \x82֕ϊ\xB7\x82\xB7\x82\xE9
+ * @param[in]		u32			\x95ϊ\xB7\x82\xB7\x82\xE9UTF-32
+ * @param[in,out]	wstr_ptr	\x95ϊ\xB7\x8C\xE3UTF-16\x95\xB6\x8E\x9A\x97\xF1\x8Fo\x97͐\xE6(NULL\x82̂Ƃ\xAB\x8Fo\x97͂\xB5\x82Ȃ\xA2)
+ * @param[in]		wstr_len	UTF-16\x8Fo\x97͐敶\x8E\x9A\x90\x94(\x95\xB6\x8E\x9A\x90\x94,sizeof(wchar_t)*wstr_len bytes)
+ * @retval			\x8Fo\x97͂\xB5\x82\xBDUTF-16\x95\xB6\x8E\x9A\x90\x94(sizeof(wchar_t)\x94{\x82\xB7\x82\xE9\x82\xC6byte\x90\x94)
+ *					0=\x83G\x83\x89\x81[(\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD)
+ */
+size_t UTF32ToUTF16(uint32_t u32, wchar_t *wstr_ptr, size_t wstr_len)
+{
+	size_t u16_out;
+	if (u32 < 0x10000) {
+		if (wstr_len >= 1) {
+			if (wstr_ptr != NULL) {
+				*wstr_ptr++ = (uint16_t)u32;
+			}
+			u16_out = 1;
+		} else {
+			u16_out = 0;
+		}
+	} else if (u32 <= 0x10ffff) {
+		if (wstr_len >= 2) {
+			if (wstr_ptr != NULL) {
+				// \x83T\x83\x8D\x83Q\x81[\x83g \x83G\x83\x93\x83R\x81[\x83h
+				*wstr_ptr++ = uint16_t((u32 - 0x10000) / 0x400) + 0xd800;
+				*wstr_ptr++ = uint16_t((u32 - 0x10000) % 0x400) + 0xdc00;
+			}
+			u16_out = 2;
+		} else {
+			u16_out = 0;
+		}
+	} else {
+		u16_out = 0;
+	}
+	return u16_out;
+}
+
+/**
+ * UTF-32 \x82\xA9\x82\xE7 CP932 \x82֕ϊ\xB7\x82\xB7\x82\xE9
+ * @param[in]		u32			\x95ϊ\xB7\x82\xB7\x82\xE9UTF-32
+ * @param[in,out]	mb_ptr		\x95ϊ\xB7\x8C\xE3CP932\x95\xB6\x8E\x9A\x97\xF1\x8Fo\x97͐\xE6(NULL\x82̂Ƃ\xAB\x8Fo\x97͂\xB5\x82Ȃ\xA2)
+ * @param[in]		mb_len		CP932\x8Fo\x97͐敶\x8E\x9A\x90\x94(\x95\xB6\x8E\x9A\x90\x94,sizeof(wchar_t)*wstr_len bytes)
+ * @retval			\x8Fo\x97͂\xB5\x82\xBDCP932\x95\xB6\x8E\x9A\x90\x94(byte\x90\x94)
+ *					0=\x83G\x83\x89\x81[(\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD)
+ */
+size_t UTF32ToCP932(uint32_t u32, char *mb_ptr, size_t mb_len)
+{
+	size_t cp932_out;
+	const uint16_t cp932 = UTF32_CP932(u32);
+	if (cp932 == 0 && u32 != 0) {
+		return 0;
+	}
+	if (mb_ptr == NULL) {
+		mb_len = 2;
+	}
+	if (cp932 < 0x100) {
+		if (mb_len >= 1) {
+			if (mb_ptr != NULL) {
+				*mb_ptr = cp932 & 0xff;
+			}
+			cp932_out = 1;
+		} else {
+			cp932_out = 0;
+		}
+	} else {
+		if (mb_len >= 2) {
+			if (mb_ptr != NULL) {
+				mb_ptr[0] = (cp932 >> 8) & 0xff;
+				mb_ptr[1] = cp932 & 0xff;
+			}
+			cp932_out = 2;
+		} else {
+			cp932_out = 0;
+		}
+	}
+	return cp932_out;
+}
+
+/**
+ * UTF-32 \x82\xA9\x82\xE7 MultiByte\x95\xB6\x8E\x9A(code_page) \x82֕ϊ\xB7\x82\xB7\x82\xE9
+ * @param[in]		u32			\x95ϊ\xB7\x8C\xB3UTF-32
+ * @param[in]		code_page	\x95ϊ\xB7\x90\xE6codepage
+ * @param[in,out]	mb_ptr		\x95ϊ\xB7\x90敶\x8E\x9A\x97\xF1\x8Fo\x97͐\xE6(NULL\x82̂Ƃ\xAB\x8Fo\x97͂\xB5\x82Ȃ\xA2)
+ * @param[in]		mb_len		CP932\x8Fo\x97͐敶\x8E\x9A\x90\x94(\x95\xB6\x8E\x9A\x90\x94,sizeof(wchar_t)*wstr_len bytes)
+ * @retval			\x8Fo\x97͂\xB5\x82\xBDCP932\x95\xB6\x8E\x9A\x90\x94(byte\x90\x94)
+ *					0=\x83G\x83\x89\x81[(\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD)
+ */
+size_t UTF32ToMBCP(unsigned int u32, int code_page, char *mb_ptr, size_t mb_len)
+{
+	if (code_page == CP_ACP) {
+		code_page = (int)GetACP();
+	}
+	if (code_page == 932) {
+		return UTF32ToCP932(u32, mb_ptr, mb_len);
+	} else {
+		wchar_t u16_str[2];
+		size_t u16_len;
+		u16_len = UTF32ToUTF16(u32, u16_str, 2);
+		if (u16_len == 0) {
 			return 0;
 		}
+		mb_len = WideCharToMultiByte(code_page, 0, u16_str, u16_len, mb_ptr, mb_len, NULL, NULL);
+		if (mb_ptr != NULL && u32 != '?' && mb_len == 1 && mb_ptr[0] == '?') {
+			// \x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD\x82Ƃ\xAB\x81A\x96߂\xE8\x92l=1, \x95\xB6\x8E\x9A[0]='?' \x82\xF0\x95Ԃ\xB5\x82Ă\xAD\x82\xE9
+			mb_len = 0;
+		}
+		return mb_len;
 	}
-	if (wstr_len < 0) {
+}
+
+/**
+ *	wchar_t(UTF-16)\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x83}\x83\x8B\x83`\x83o\x83C\x83g\x95\xB6\x8E\x9A\x97\xF1\x82ɕϊ\xB7\x82\xB7\x82\xE9
+ *
+ *	@param[in]		*wstr_ptr	wchar_t\x95\xB6\x8E\x9A\x97\xF1
+ *	@param[in,out]	*wstr_len	wchar_t\x95\xB6\x8E\x9A\x97\xF1\x92\xB7
+ *								NULL\x82܂\xBD\x82\xCD0\x82̂Ƃ\xAB\x8E\xA9\x93\xAE\x81AL'\0'\x82Ń^\x81[\x83~\x83l\x81[\x83g\x82\xB7\x82邱\x82\xC6)
+ *								NULL\x88ȊO\x82̂Ƃ\xAB\x93\xFC\x97͂\xB5\x82\xBD\x95\xB6\x8E\x9A\x90\x94\x82\xF0\x95Ԃ\xB7
+ *	@param[in]		*mb_ptr		\x95ϊ\xB7\x82\xB5\x82\xBD\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x8E\xFB\x94[\x82\xB7\x82\xE9\x83|\x83C\x83\x93\x83^
+ *								(NULL\x82̂Ƃ\xAB\x95ϊ\xB7\x82\xB9\x82\xB8\x82ɕ\xB6\x8E\x9A\x90\x94\x82\xF0\x83J\x83E\x83\x93\x83g\x82\xB7\x82\xE9)
+ *	@param[in,out]	*mb_len		\x95ϊ\xB7\x82\xB5\x82\xBD\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x8E\xFB\x94[\x82ł\xAB\x82\xE9\x83T\x83C\x83Y,byte\x90\x94,
+ *								mb_ptr\x82\xAANULL\x82̂Ƃ\xAB\x8Fo\x97͉”\\x83T\x83C\x83Y\x82͕s\x97v
+ *								\x95ϊ\xB7\x82\xB5\x82\xBD\x83}\x83\x8B\x83`\x83o\x83C\x83g\x95\xB6\x8E\x9A\x97\xF1\x82̒\xB7\x82\xB3\x82\xF0\x95Ԃ\xB7
+ *								L'\0'\x82\xF0\x95ϊ\xB7\x82\xB5\x82\xBD\x82\xE7'\0'\x82\xE0\x8A܂\xDE
+ *								mb_ptr\x82\xAANULL\x82̂Ƃ\xAB\x82ł\xE0\x92\xB7\x82\xB3\x82͕Ԃ\xB7
+ *	@param[in]		UTF32ToMB	UTF32\x82\xF0\x83}\x83\x8B\x83`\x83o\x83C\x83g\x82ɕϊ\xB7\x82\xB7\x82\xE9\x8A֐\x94\x82ւ̃|\x83C\x83\x93\x83^
+ */
+static void WideCharToMB(const wchar_t *wstr_ptr, size_t *wstr_len_,
+						 char *mb_ptr, size_t *mb_len_,
+						 size_t (*UTF32ToMB)(uint32_t u32, char *mb_ptr, size_t mb_len))
+{
+	size_t wstr_len;
+	size_t mb_len;
+	size_t mb_out_sum = 0;
+	size_t wstr_in = 0;
+
+	assert(wstr_ptr != NULL);
+	if (mb_ptr == NULL) {
+		// \x95ϊ\xB7\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x8F\x91\x82\xAB\x8Fo\x82\xB3\x82Ȃ\xA2
+		mb_len = 4;		// 1\x95\xB6\x8E\x9A4byte\x82ɂ͎\xFB\x82܂\xE9\x82͂\xB8
+	} else {
+		mb_len = *mb_len_;
+	}
+	if (wstr_len_ == NULL || *wstr_len_ == 0) {
 		wstr_len = (int)wcslen(wstr_ptr) + 1;
+	} else {
+		wstr_len = *wstr_len_;
 	}
 
-	while(u8_len > 0 && wstr_len > 0) {
+	while(mb_len > 0 && wstr_len > 0) {
 		const wchar_t u16 = *wstr_ptr++;
 		uint32_t u32 = u16;
-		size_t u8_out;
+		size_t mb_out;
 		wstr_len--;
+		wstr_in++;
 		// \x83T\x83\x8D\x83Q\x81[\x83g high?
-		if (0xd800 <= u16 && u16 < 0xdc00) {
+		if (IsHighSurrogate(u16)) {
 			if (wstr_len >= 1) {
 				const wchar_t u16_lo = *wstr_ptr++;
 				wstr_len--;
+				wstr_in++;
 				// \x83T\x83\x8D\x83Q\x81[\x83g low?
-				if (0xdc00 <= u16_lo && u16_lo < 0xe000) {
+				if (IsLowSurrogate(u16_lo)) {
 					// \x83T\x83\x8D\x83Q\x81[\x83g\x83y\x83A \x83f\x83R\x81[\x83h
 					u32 = 0x10000 + (u16 - 0xd800) * 0x400 + (u16_lo - 0xdc00);
 				} else {
@@ -224,34 +661,76 @@
 					goto unknown_code;
 				}
 			} else {
-			unknown_code:
-				if (u8_ptr != NULL) {
-					*u8_ptr++ = '?';
-				}
-				u8_out = 1;
-				goto loop_next;
+				goto unknown_code;
 			}
 		}
-		u8_out = UTF32ToUTF8(u32, u8_ptr, u8_len);
-		if (u8_out == 0) {
-			goto unknown_code;
+		mb_out = UTF32ToMB(u32, mb_ptr, mb_len);
+		if (mb_out == 0) {
+		unknown_code:
+			if (mb_ptr != NULL) {
+				// \x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD\x8Fꍇ
+				*mb_ptr++ = '?';
+			}
+			mb_out = 1;
 		}
-	loop_next:
-		u8_out_sum += u8_out;
-		if (u8_ptr != NULL) {
-			u8_ptr += u8_out;
-			u8_len -= u8_out;
+		mb_out_sum += mb_out;
+		if (mb_ptr != NULL) {
+			mb_ptr += mb_out;
+			mb_len -= mb_out;
 		}
 	}
-	return u8_out_sum;
+
+	if (wstr_len_ != NULL) {
+		*wstr_len_ = wstr_in;
+	}
+	*mb_len_ = mb_out_sum;
 }
 
+// WideCharToMultiByte\x82\xCCUTF8\x93\xC1\x89\xBB\x94\xC5
+void WideCharToUTF8(const wchar_t *wstr_ptr, size_t *wstr_len, char *u8_ptr, size_t *u8_len)
+{
+	WideCharToMB(wstr_ptr, wstr_len, u8_ptr, u8_len, UTF32ToUTF8);
+}
+
+void WideCharToCP932(const wchar_t *wstr_ptr, size_t *wstr_len, char *cp932_ptr, size_t *cp932_len)
+{
+	WideCharToMB(wstr_ptr, wstr_len, cp932_ptr, cp932_len, UTF32ToCP932);
+}
+
+void WideCharToMBCP(const wchar_t *wstr_ptr, size_t *wstr_len, char *mb_ptr, size_t *mb_len,
+					int code_page)
+{
+	size_t (*utf32_to_mb)(uint32_t u32, char *mb_ptr, size_t mb_len);
+	if (code_page == CP_ACP) {
+		code_page = (int)GetACP();
+	}
+	switch (code_page) {
+	case CP_UTF8:
+		utf32_to_mb = UTF32ToUTF8;
+		break;
+	case 932:
+		utf32_to_mb = UTF32ToCP932;
+		break;
+	default:
+		*mb_len = 0;
+		return;
+	}
+
+	WideCharToMB(wstr_ptr, wstr_len,
+				 mb_ptr, mb_len,
+				 utf32_to_mb);
+}
+
 // MultiByteToWideChar\x82\xCCUTF8\x93\xC1\x89\xBB\x94\xC5
-int UTF8ToWideChar(const char *u8_ptr, int u8_len, wchar_t *wstr_ptr, int wstr_len)
+int UTF8ToWideChar(const char *u8_ptr, int u8_len_, wchar_t *wstr_ptr, int wstr_len_)
 {
+	size_t u8_len;
+	size_t wstr_len = wstr_len_;
 	size_t u16_out_sum = 0;
-	if (u8_len < 0) {
+	if (u8_len_ < 0) {
 		u8_len = strlen(u8_ptr) + 1;
+	} else {
+		u8_len = u8_len_;
 	}
 	if (wstr_ptr == NULL) {
 		wstr_len = 1;
@@ -295,21 +774,26 @@
 		}
 		u16_out_sum += u16_out;
 	}
-	return u16_out_sum;
+	return (int)u16_out_sum;
 }
 
 /**
  *	wchar_t\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x83}\x83\x8B\x83`\x83o\x83C\x83g\x95\xB6\x8E\x9A\x97\xF1\x82֕ϊ\xB7
  *	@param[in]	*wstr_ptr	wchar_t\x95\xB6\x8E\x9A\x97\xF1
- *	@param[in]	wstr_len	wchar_t\x95\xB6\x8E\x9A\x97\xF1\x92\xB7(0\x82̂Ƃ\xAB\x8E\xA9\x93\xAE)
+ *	@param[in]	wstr_len	wchar_t\x95\xB6\x8E\x9A\x97\xF1\x92\xB7(0\x82̂Ƃ\xAB\x8E\xA9\x93\xAE\x81A\x8E\xA9\x93\xAE\x82̂Ƃ\xAB\x82\xCDL'\0'\x82Ń^\x81[\x83~\x83l\x81[\x83g\x82\xB7\x82邱\x82\xC6)
  *	@param[in]	code_page	\x95ϊ\xB7\x90\xE6\x83R\x81[\x83h\x83y\x81[\x83W
- *	@param[out]	*mb_len_	mb\x95\xB6\x8E\x9A\x97\xF1\x92\xB7(NULL\x82̂Ƃ\xAB\x93\xE0\x95\x94\x83G\x83\x89\x81[)
+ *	@param[out]	*mb_len_	\x95ϊ\xB7\x82\xB5\x82\xBD\x95\xB6\x8E\x9A\x97\xF1\x92\xB7,byte\x90\x94,L'\0'\x82\xF0\x95ϊ\xB7\x82\xB5\x82\xBD\x82\xE7'\0'\x82\xE0\x8A܂\xDE
+ *							(NULL\x82̂Ƃ\xAB\x95\xB6\x8E\x9A\x97񒷂\xF0\x95Ԃ\xB3\x82Ȃ\xA2)
  *	@retval		mb\x95\xB6\x8E\x9A\x97\xF1\x82ւ̃|\x83C\x83\x93\x83^(NULL\x82̎\x9E\x95ϊ\xB7\x83G\x83\x89\x81[)
+ *				\x8Eg\x97p\x8C\xE3 free() \x82\xB7\x82邱\x82\xC6
  */
 char *_WideCharToMultiByte(const wchar_t *wstr_ptr, size_t wstr_len, int code_page, size_t *mb_len_)
 {
 	const DWORD flags = 0;
 	char *mb_ptr;
+	if (code_page == CP_ACP) {
+		code_page = (int)GetACP();
+	}
 	if (mb_len_ != NULL) {
 		*mb_len_ = 0;
 	}
@@ -317,9 +801,11 @@
 		wstr_len = wcslen(wstr_ptr) + 1;
 	}
     int len;
-	if (code_page == CP_UTF8) {
-		len = WideCharToUTF8(wstr_ptr, (DWORD)wstr_len,
-							 NULL, 0);
+	if (code_page == CP_UTF8 || code_page == 932) {
+		size_t wl = wstr_len;
+		size_t ml;
+		WideCharToMBCP(wstr_ptr, &wl, NULL, &ml, code_page);
+		len = ml;
 	} else {
 		len = ::WideCharToMultiByte(code_page, flags,
 									wstr_ptr, (DWORD)wstr_len,
@@ -333,9 +819,11 @@
 	if (mb_ptr == NULL) {
 		return NULL;
 	}
-	if (code_page == CP_UTF8) {
-		len = WideCharToUTF8(wstr_ptr, (DWORD)wstr_len,
-							 mb_ptr, len);
+	if (code_page == CP_UTF8 || code_page == 932) {
+		size_t wl = wstr_len;
+		size_t ml = len;
+		WideCharToMBCP(wstr_ptr, &wl, mb_ptr, &ml, code_page);
+		len = ml;
 	} else {
 		len = ::WideCharToMultiByte(code_page, flags,
 									wstr_ptr, (DWORD)wstr_len,
@@ -347,7 +835,8 @@
 		return NULL;
 	}
 	if (mb_len_ != NULL) {
-		*mb_len_ = len - 1;
+		// \x95ϊ\xB7\x82\xB5\x82\xBD\x95\xB6\x8E\x9A\x97\xF1\x90\x94(byte\x90\x94)\x82\xF0\x95Ԃ\xB7
+		*mb_len_ = len;
 	}
     return mb_ptr;
 }
@@ -355,14 +844,19 @@
 /**
  *	\x83}\x83\x8B\x83`\x83o\x83C\x83g\x95\xB6\x8E\x9A\x97\xF1\x82\xF0wchar_t\x95\xB6\x8E\x9A\x97\xF1\x82֕ϊ\xB7
  *	@param[in]	*str_ptr	mb(char)\x95\xB6\x8E\x9A\x97\xF1
- *	@param[in]	str_len		mb(char)\x95\xB6\x8E\x9A\x97\xF1\x92\xB7(0\x82̂Ƃ\xAB\x8E\xA9\x93\xAE)
+ *	@param[in]	str_len		mb(char)\x95\xB6\x8E\x9A\x97\xF1\x92\xB7(0\x82̂Ƃ\xAB\x8E\xA9\x93\xAE\x81A\x8E\xA9\x93\xAE\x82̂Ƃ\xAB\x82\xCD'\0'\x82Ń^\x81[\x83~\x83l\x81[\x83g\x82\xB7\x82邱\x82\xC6)
  *	@param[in]	code_page	\x95ϊ\xB7\x8C\xB3\x83R\x81[\x83h\x83y\x81[\x83W
- *	@param[out]	*w_len_		wchar_t\x95\xB6\x8E\x9A\x97\xF1\x92\xB7
- *	@retval		mb\x95\xB6\x8E\x9A\x97\xF1\x82ւ̃|\x83C\x83\x93\x83^(NULL\x82̎\x9E\x95ϊ\xB7\x83G\x83\x89\x81[)
+ *	@param[out]	*w_len_		wchar_t\x95\xB6\x8E\x9A\x97\xF1\x92\xB7,wchar_t\x90\x94,'\0'\x82\xF0\x95ϊ\xB7\x82\xB5\x82\xBD\x82\xE7L'\0'\x82\xE0\x8A܂\xDE
+ *							(NULL\x82̂Ƃ\xAB\x95\xB6\x8E\x9A\x97񒷂\xF0\x95Ԃ\xB3\x82Ȃ\xA2)
+ *	@retval		wchar_t\x95\xB6\x8E\x9A\x97\xF1\x82ւ̃|\x83C\x83\x93\x83^(NULL\x82̎\x9E\x95ϊ\xB7\x83G\x83\x89\x81[)
+ *				\x8Eg\x97p\x8C\xE3 free() \x82\xB7\x82邱\x82\xC6
  */
 wchar_t *_MultiByteToWideChar(const char *str_ptr, size_t str_len, int code_page, size_t *w_len_)
 {
 	DWORD flags = MB_ERR_INVALID_CHARS;
+	if (code_page == CP_ACP) {
+		code_page = (int)GetACP();
+	}
 	if (code_page == CP_UTF8) {
 		// CP_UTF8 When this is set, dwFlags must be zero.
 		flags = 0;
@@ -402,7 +896,8 @@
 		return NULL;
 	}
 	if (w_len_ != NULL) {
-		*w_len_ = len - 1;
+		// \x95ϊ\xB7\x82\xB5\x82\xBD\x95\xB6\x8E\x9A\x97\xF1\x90\x94(wchar_t\x90\x94)\x82\xF0\x95Ԃ\xB7
+		*w_len_ = len;
 	}
 	return wstr_ptr;
 }

Modified: branches/cmake/teraterm/common/codeconv.h
===================================================================
--- branches/cmake/teraterm/common/codeconv.h	2019-03-10 14:32:02 UTC (rev 7468)
+++ branches/cmake/teraterm/common/codeconv.h	2019-03-10 14:32:33 UTC (rev 7469)
@@ -34,13 +34,26 @@
 extern "C" {
 #endif
 
+// simple code convert
+unsigned int CP932ToUTF32(unsigned short cp932);
+unsigned short UTF32ToDecSp(unsigned int u32);
+unsigned int MBCP_UTF32(unsigned short mb_code, int code_page);
+unsigned short UTF32_CP932(unsigned int u32);
 
-// 1char
-size_t UTF32ToUTF8(unsigned int u32, char *u8_ptr, size_t u8_len);
+// 1char ToUTF32
 size_t UTF8ToUTF32(const char *u8_ptr_, size_t u8_len, unsigned int *u32_);
+size_t UTF16ToUTF32(const wchar_t *wstr_ptr, size_t wstr_len, unsigned int *u32);
+size_t MBCPToUTF32(const char *mb_ptr, size_t mb_len, int code_page, unsigned int *u32);
 
+// 1char UTF32To
+size_t UTF32ToUTF16(unsigned int u32, wchar_t *wstr_ptr, size_t wstr_len);
+size_t UTF32ToUTF8(unsigned int u32, char *u8_ptr, size_t u8_len);
+size_t UTF32ToCP932(unsigned int u32, char *mb_ptr, size_t mb_len);
+size_t UTF32ToMBCP(unsigned int u32, int code_page, char *mb_ptr, size_t mb_len);
+
 // MultiByteToWideChar() wrappers
-int WideCharToUTF8(const wchar_t *wstr_ptr, int wstr_len, char *u8_ptr, int u8_len);
+void WideCharToUTF8(const wchar_t *wstr_ptr, size_t *wstr_len, char *u8_ptr, size_t *u8_len);
+void WideCharToCP932(const wchar_t *wstr_ptr, size_t *wstr_len, char *cp932_ptr, size_t *cp932_len);
 int UTF8ToWideChar(const char *u8_ptr, int u8_len, wchar_t *wstr_ptr, int wstr_len);
 
 // API wrappers

From scmnotify ＠ osdn.net  Sun Mar 10 23:32:45 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sun, 10 Mar 2019 23:32:45 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0NzBdIGltZemWoumAo+S/ruatow==?=
Message-ID: <1552228365.523357.4925.nullmailer@users.osdn.me>

Revision: 7470
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7470
Author:   zmatsuo
Date:     2019-03-10 23:32:45 +0900 (Sun, 10 Mar 2019)
Log Message:
-----------
ime関連修正

Modified Paths:
--------------
    branches/cmake/teraterm/teraterm/ttime.c
    branches/cmake/teraterm/teraterm/ttime.h

-------------- next part --------------
Modified: branches/cmake/teraterm/teraterm/ttime.c
===================================================================
--- branches/cmake/teraterm/teraterm/ttime.c	2019-03-10 14:32:33 UTC (rev 7469)
+++ branches/cmake/teraterm/teraterm/ttime.c	2019-03-10 14:32:45 UTC (rev 7470)
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (C) 1994-1998 T. Teranishi
  * (C) 2007-2017 TeraTerm Project
  * All rights reserved.
@@ -67,7 +67,7 @@
 typedef BOOL (WINAPI *TImmGetOpenStatus)(HIMC);
 typedef BOOL (WINAPI *TImmSetOpenStatus)(HIMC, BOOL);
 
-static TImmGetCompositionString PImmGetCompositionString;
+static TImmGetCompositionString PImmGetCompositionStringW;
 static TImmGetContext PImmGetContext;
 static TImmReleaseContext PImmReleaseContext;
 static TImmSetCompositionFont PImmSetCompositionFont;
@@ -115,9 +115,9 @@
 
   Err = FALSE;
 
-  PImmGetCompositionString = (TImmGetCompositionString)GetProcAddress(
-    HIMEDLL, "ImmGetCompositionStringA");
-  if (PImmGetCompositionString==NULL) Err = TRUE;
+  PImmGetCompositionStringW = (TImmGetCompositionString)GetProcAddress(
+    HIMEDLL, "ImmGetCompositionStringW");
+  if (PImmGetCompositionStringW==NULL) Err = TRUE;
 
   PImmGetContext = (TImmGetContext)GetProcAddress(
     HIMEDLL, "ImmGetContext");
@@ -189,61 +189,69 @@
   else
     cf.dwStyle = CFS_DEFAULT;
   (*PImmSetCompositionWindow)(hIMC,&cf);
+  (*PImmReleaseContext)(HVTWin,hIMC);
+}
 
+void SetConversionLogFont(HWND HWin, PLOGFONT lf)
+{
+  HIMC	hIMC;
+  if (HIMEDLL == NULL) return;
+
+  memcpy(&lfIME,lf,sizeof(LOGFONT));
+
+  hIMC = (*PImmGetContext)(HVTWin);
   // Set font for the conversion window
   (*PImmSetCompositionFont)(hIMC,&lfIME);
   (*PImmReleaseContext)(HVTWin,hIMC);
 }
 
-void SetConversionLogFont(PLOGFONTA lf)
+/*
+ *	@param[in,out]	*len	wchar_t文字数
+ *	@reterun		変換wchar_t文字列へのポインタ
+ *					NULLの場合変換確定していない(またはエラー)
+ *					文字列は使用後free()すること
+ */
+const wchar_t *GetConvString(HWND hWnd, UINT wParam, LPARAM lParam, size_t *len)
 {
-  memcpy(&lfIME,lf,sizeof(*lf));
-}
-
-HGLOBAL GetConvString(UINT wParam, LPARAM lParam)
-{
-	HIMC hIMC;
-	HGLOBAL hstr = NULL;
-	//LPSTR lpstr;
 	wchar_t *lpstr;
-	DWORD dwSize;
 
+	*len = 0;
 	if (HIMEDLL==NULL) return NULL;
-	hIMC = (*PImmGetContext)(HVTWin);
-	if (hIMC==0) return NULL;
 
-	if ((lParam & GCS_RESULTSTR)==0)
-		goto skip;
+	if ((lParam & GCS_RESULTSTR) != 0) {
+		HIMC hIMC;
+		LONG size;
 
-	// Get the size of the result string.
-	//dwSize = (*PImmGetCompositionString)(hIMC, GCS_RESULTSTR, NULL, 0);
-	dwSize = ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, NULL, 0);
-	dwSize += sizeof(WCHAR);
-	hstr = GlobalAlloc(GHND,dwSize);
-	if (hstr != NULL)
-	{
-//		lpstr = (LPSTR)GlobalLock(hstr);
-		lpstr = GlobalLock(hstr);
-		if (lpstr != NULL)
-		{
-#if 0
-			// Get the result strings that is generated by IME into lpstr.
-			(*PImmGetCompositionString)
-				(hIMC, GCS_RESULTSTR, lpstr, dwSize);
-#else
-			ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, lpstr, dwSize);
-#endif
-			GlobalUnlock(hstr);
+		hIMC = (*PImmGetContext)(hWnd);
+		if (hIMC==0) return NULL;
+
+		// Get the size of the result string.
+		//		注意 ImmGetCompositionStringW() の戻り値は byte 数
+		size = PImmGetCompositionStringW(hIMC, GCS_RESULTSTR, NULL, 0);
+		if (size <= 0) {
+			lpstr = NULL;		// エラー
+		} else {
+			lpstr = malloc(size + sizeof(WCHAR));
+			if (lpstr != NULL)
+			{
+				size = PImmGetCompositionStringW(hIMC, GCS_RESULTSTR, lpstr, size);
+				if (size <= 0) {
+					free(lpstr);
+					lpstr = NULL;
+				} else {
+					*len = size/2;
+					lpstr[(size/2)] = 0;	// ターミネートする
+				}
+			}
 		}
-		else {
-			GlobalFree(hstr);
-			hstr = NULL;
-		}
+
+		(*PImmReleaseContext)(hWnd, hIMC);
+
+	} else {
+		lpstr = NULL;
 	}
 
-skip:
-	(*PImmReleaseContext)(HVTWin, hIMC);
-	return hstr;
+	return lpstr;
 }
 
 BOOL GetIMEOpenStatus()

Modified: branches/cmake/teraterm/teraterm/ttime.h
===================================================================
--- branches/cmake/teraterm/teraterm/ttime.h	2019-03-10 14:32:33 UTC (rev 7469)
+++ branches/cmake/teraterm/teraterm/ttime.h	2019-03-10 14:32:45 UTC (rev 7470)
@@ -38,12 +38,11 @@
 void FreeIME();
 BOOL CanUseIME();
 void SetConversionWindow(HWND HWin, int X, int Y);
-void SetConversionLogFont(PLOGFONTA lf);
+void SetConversionLogFont(HWND HWin, PLOGFONTA lf);
 BOOL GetIMEOpenStatus(void);
 void SetIMEOpenStatus(BOOL stat);
+const wchar_t *GetConvString(HWND hWnd, UINT wParam, LPARAM lParam, size_t *len);
 
-HGLOBAL GetConvString(UINT wParam, LPARAM lParam);
-
 #ifndef WM_IME_COMPOSITION
 #define WM_IME_COMPOSITION              0x010F
 #endif

From scmnotify ＠ osdn.net  Sun Mar 10 23:32:59 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sun, 10 Mar 2019 23:32:59 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0NzFdIGNvZGVjb25244Gr5ZCI44KP44Gb?=
 =?utf-8?b?44Gm5L+u5q2j?=
Message-ID: <1552228379.565648.5075.nullmailer@users.osdn.me>

Revision: 7471
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7471
Author:   zmatsuo
Date:     2019-03-10 23:32:59 +0900 (Sun, 10 Mar 2019)
Log Message:
-----------
codeconvに合わせて修正

Modified Paths:
--------------
    branches/cmake/teraterm/common/i18n.c
    branches/cmake/teraterm/common/ttcommon.h
    branches/cmake/teraterm/teraterm/vtdisp.c
    branches/cmake/teraterm/teraterm/vtterm.c
    branches/cmake/teraterm/teraterm/vtwin.cpp
    branches/cmake/teraterm/ttpcmn/language.c
    branches/cmake/teraterm/ttpcmn/language.h
    branches/cmake/teraterm/ttpcmn/ttcmn.c
    branches/cmake/teraterm/ttpmacro/ttl_gui.cpp

-------------- next part --------------
Modified: branches/cmake/teraterm/common/i18n.c
===================================================================
--- branches/cmake/teraterm/common/i18n.c	2019-03-10 14:32:45 UTC (rev 7470)
+++ branches/cmake/teraterm/common/i18n.c	2019-03-10 14:32:59 UTC (rev 7471)
@@ -56,7 +56,7 @@
 // TODO: \x83o\x83b\x83t\x83@\x95s\x91\xAB\x8E\x9E\x82̓\xAE\x8D\xEC
 DllExport void GetI18nStrU8(const char *section, const char *key, char *buf, int buf_len, const char *def, const char *iniFile)
 {
-	int r;
+	size_t r;
 #if defined(UNICODE)
 	wchar_t tmp[MAX_UIMSG];
 	wchar_t defW[MAX_UIMSG];
@@ -63,7 +63,8 @@
 	r = UTF8ToWideChar(def, -1, defW, _countof(defW));
 	assert(r != 0);
 	GetI18nStrW(section, key, tmp, _countof(tmp), defW, iniFile);
-	r = WideCharToUTF8(tmp, -1, buf, buf_len);
+	r = buf_len;
+	WideCharToUTF8(tmp, NULL, buf, &r);
 	assert(r != 0);
 #else
 	// ANSI -> Wide -> utf8
@@ -72,7 +73,8 @@
 	GetI18nStr(section, key, strA, _countof(strA), def, iniFile);
 	r = MultiByteToWideChar(CP_ACP, 0, strA, -1, strW, _countof(strW));
 	assert(r != 0);
-	r = WideCharToUTF8(strW, -1, buf, buf_len);
+	r = buf_len;
+	WideCharToUTF8(strW, NULL, buf, &r);
 	assert(r != 0);
 #endif
 }

Modified: branches/cmake/teraterm/common/ttcommon.h
===================================================================
--- branches/cmake/teraterm/common/ttcommon.h	2019-03-10 14:32:45 UTC (rev 7470)
+++ branches/cmake/teraterm/common/ttcommon.h	2019-03-10 14:32:59 UTC (rev 7471)
@@ -90,8 +90,10 @@
 DllExport int WINAPI CommBinaryOut(PComVar cv, PCHAR B, int C);
 DllExport int WINAPI CommBinaryBuffOut(PComVar cv, PCHAR B, int C);
 DllExport int WINAPI CommTextOut(PComVar cv, PCHAR B, int C);
+DllExport int WINAPI CommTextOutW(PComVar cv, const wchar_t *B, int C);
 DllExport int WINAPI CommBinaryEcho(PComVar cv, PCHAR B, int C);
 DllExport int WINAPI CommTextEcho(PComVar cv, PCHAR B, int C);
+DllExport int WINAPI CommTextEchoW(PComVar cv, const wchar_t *B, int C);
 
 DllExport void WINAPI CreateNotifyIcon(PComVar cv);
 DllExport void WINAPI DeleteNotifyIcon(PComVar cv);

Modified: branches/cmake/teraterm/teraterm/vtdisp.c
===================================================================
--- branches/cmake/teraterm/teraterm/vtdisp.c	2019-03-10 14:32:45 UTC (rev 7470)
+++ branches/cmake/teraterm/teraterm/vtdisp.c	2019-03-10 14:32:59 UTC (rev 7471)
@@ -1958,7 +1958,7 @@
   VTFont[0] = CreateFontIndirect(&VTlf);
 
   /* set IME font */
-  SetConversionLogFont(&VTlf);
+  SetConversionLogFont(HVTWin, &VTlf);
 
   SelectObject(TmpDC, VTFont[0]);
   GetTextMetrics(TmpDC, &Metrics);
@@ -2039,7 +2039,7 @@
 			if (ts.IMEInline>0) {
 				LOGFONTA VTlf;
 				SetLogFont(&VTlf);
-				SetConversionLogFont(&VTlf);
+				SetConversionLogFont(HVTWin, &VTlf);
 			}
 			else
 				SetConversionWindow(HVTWin,-1,0);

Modified: branches/cmake/teraterm/teraterm/vtterm.c
===================================================================
--- branches/cmake/teraterm/teraterm/vtterm.c	2019-03-10 14:32:45 UTC (rev 7470)
+++ branches/cmake/teraterm/teraterm/vtterm.c	2019-03-10 14:32:59 UTC (rev 7471)
@@ -5414,13 +5414,6 @@
 }
 
 //
-// UTF-8
-//
-#include "uni2sjis.map"
-#include "unisym2decsp.map"
-
-
-//
 // Unicode Combining Character Support
 //
 #include "uni_combining.map"
@@ -5473,10 +5466,9 @@
 	return (index);
 }
 
-// unicode(UTF-16,wchar_t)\x82\xF0\x83o\x83b\x83t\x83@\x82֏\x91\x82\xAB\x8D\x9E\x82\xDE
+// unicode(UTF-32,wchar_t)\x82\xF0\x83o\x83b\x83t\x83@\x82֏\x91\x82\xAB\x8D\x9E\x82\xDE
 static void UnicodeToCP932(unsigned int code)
 {
-	wchar_t wchar = (wchar_t)code;
 	int ret;
 	char mbchar[2];
 	unsigned short cset;
@@ -5483,7 +5475,7 @@
 
 	// Unicode\x82\xA9\x82\xE7DEC\x93\xC1\x8Eꕶ\x8E\x9A\x82ւ̃}\x83b\x83s\x83\x93\x83O
 	if (ts.UnicodeDecSpMapping) {
-		cset = ConvertUnicode(wchar, mapUnicodeSymbolToDecSp, MAPSIZE(mapUnicodeSymbolToDecSp));
+		cset = UTF32ToDecSp(code);
 		if (((cset >> 8) & ts.UnicodeDecSpMapping) != 0) {
 			PutDecSp(cset & 0xff);
 			return;
@@ -5491,20 +5483,19 @@
 	}
 
 	// Unicode -> \x93\xE0\x95\x94\x83R\x81[\x83h(ts.CodePage)\x82֕ϊ\xB7\x82\xB5\x82ďo\x97\xCD
-	ret = WideCharToMultiByte(ts.CodePage, 0, &wchar, 1, mbchar, 2, NULL, NULL);
+	if (ts.CodePage == 932) {
+		ret = (int)UTF32ToCP932(code, mbchar, 2);
+	} else {
+		if (code >= 0x10000) {
+			goto unknown;
+		}
+		wchar_t wchar;
+		wchar = (wchar_t)code;
+		ret = WideCharToMultiByte(ts.CodePage, 0, &wchar, 1, mbchar, 2, NULL, NULL);
+	}
 	switch (ret) {
 	case 0:
-		if (ts.CodePage == 932) {
-			// CP932
-			// U+301C\x82Ȃǂ͕ϊ\xB7\x82ł\xAB\x82Ȃ\xA2\x81BUnicode -> Shift_JIS\x82֕ϊ\xB7\x82\xB5\x82Ă݂\xE9\x81B
-			cset = ConvertUnicode(code, mapUnicodeToSJIS, MAPSIZE(mapUnicodeToSJIS));
-			if (cset != 0) {
-				Kanji = cset & 0xff00;
-				PutKanji(cset & 0x00ff);
-				return;
-			}
-		}
-
+	unknown:
 		PutChar('?');
 		if (ts.UnknownUnicodeCharaAsWide) {
 			PutChar('?');

Modified: branches/cmake/teraterm/teraterm/vtwin.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/vtwin.cpp	2019-03-10 14:32:45 UTC (rev 7470)
+++ branches/cmake/teraterm/teraterm/vtwin.cpp	2019-03-10 14:32:59 UTC (rev 7471)
@@ -3097,7 +3097,6 @@
 }
 //-->
 
-
 LRESULT CVTWindow::OnIMEStartComposition(WPARAM wParam, LPARAM lParam)
 {
 	// \x88ʒu\x82\xF0\x92ʒm\x82\xB7\x82\xE9
@@ -3110,58 +3109,29 @@
 
 LRESULT CVTWindow::OnIMEComposition(WPARAM wParam, LPARAM lParam)
 {
-	HGLOBAL hstr;
-	//LPSTR lpstr;
-	wchar_t *lpstr;
-	int Len;
-	char *mbstr;
-	int mlen;
-
 	if (CanUseIME()) {
-		hstr = GetConvString(wParam, lParam);
-	}
-	else {
-		hstr = NULL;
-	}
-
-	if (hstr!=NULL) {
-		//lpstr = (LPSTR)GlobalLock(hstr);
-		lpstr = (wchar_t *)GlobalLock(hstr);
-		if (lpstr!=NULL) {
-			mlen = wcstombs(NULL, lpstr, 0);
-			mbstr = (char *)malloc(sizeof(char) * (mlen + 1));
-			if (mbstr == NULL) {
-				goto skip;
-			}
-			Len = wcstombs(mbstr, lpstr, mlen + 1);
-
-			// add this string into text buffer of application
-			Len = strlen(mbstr);
-			if (Len==1) {
-				switch (mbstr[0]) {
+		size_t len;
+		const wchar_t *lpstr = GetConvString(HVTWin, wParam, lParam, &len);
+		if (lpstr != NULL) {
+			if (len == 1 && ControlKey()) {
+				const static wchar_t code_ctrl_space = 0;
+				const static wchar_t code_ctrl_backslash = 0x1c;
+				switch(*lpstr) {
 				case 0x20:
-					if (ControlKey()) {
-						mbstr[0] = 0; /* Ctrl-Space */
-					}
+					lpstr = &code_ctrl_space;
 					break;
 				case 0x5c: // Ctrl-\ support for NEC-PC98
-					if (ControlKey()) {
-						mbstr[0] = 0x1c;
-					}
+					lpstr = &code_ctrl_backslash;
 					break;
 				}
 			}
 			if (ts.LocalEcho>0) {
-				CommTextEcho(&cv,mbstr,Len);
+				CommTextEchoW(&cv,lpstr,len);
 			}
-			CommTextOut(&cv,mbstr,Len);
-
-			free(mbstr);
-			GlobalUnlock(hstr);
+			CommTextOutW(&cv,lpstr,len);
+			free((void *)lpstr);
+			return 0;
 		}
-skip:
-		GlobalFree(hstr);
-		return 0;
 	}
 	return CFrameWnd::DefWindowProc(WM_IME_COMPOSITION,wParam,lParam);
 }
@@ -6229,6 +6199,9 @@
 		OnDeviceChange((UINT)wp, (DWORD_PTR)lp);
 		DefWindowProc(msg, wp, lp);
 		break;
+	case WM_IME_STARTCOMPOSITION :
+		OnIMEStartComposition(wp, lp);
+		break;
 	case WM_IME_COMPOSITION:
 		OnIMEComposition(wp, lp);
 		break;

Modified: branches/cmake/teraterm/ttpcmn/language.c
===================================================================
--- branches/cmake/teraterm/ttpcmn/language.c	2019-03-10 14:32:45 UTC (rev 7470)
+++ branches/cmake/teraterm/ttpcmn/language.c	2019-03-10 14:32:59 UTC (rev 7471)
@@ -36,10 +36,9 @@
 #include "tttypes.h"
 #include <mbstring.h>
 #include <locale.h>
+#include "codemap.h"
 
 #include "language.h"
-#include "codeconv.h"
-#include "sjis2uni.map"
 
 #if !defined(DllExport)
 #if defined(TTPCMN)
@@ -75,69 +74,6 @@
 	return (result);
 }
 
-// \x93\xE0\x95\x94\x83R\x81[\x83h(CodePage)\x82\xF0UTF8\x82֕ϊ\xB7\x82\xB7\x82\xE9
-DllExport unsigned int WINAPI SJIS2UTF8(WORD KCode, int *byte, int CodePage)
-{
-	wchar_t wchar;
-	int ret;
-	unsigned int code;
-	unsigned int c, c1, c2, c3;
-	unsigned char buf[3];
-	unsigned char KCode_h;
-	int len = 0;
-
-	// \x93\xE0\x95\x94\x83R\x81[\x83h(CodePage)\x82\xA9\x82\xE7UTF-16LE\x82֕ϊ\xB7\x82\xB7\x82\xE9
-	KCode_h = (unsigned char)(KCode >> 8);
-	if (KCode_h != 0) {
-		buf[len++] = KCode_h;
-	}
-	buf[len++] = KCode & 0xff;
-	ret = MultiByteToWideChar(CodePage, MB_ERR_INVALID_CHARS, buf, len, &wchar, 1);
-	if (ret <= 0) {
-		// \x95ϊ\xB7\x8E\xB8\x94s
-		unsigned short cset = 0;
-		if (CodePage == 932) {
-			// CP932
-			cset = ConvertUnicode(KCode, mapSJISToUnicode, sizeof(mapSJISToUnicode)/sizeof(mapSJISToUnicode[0]));
-		}
-		if (cset == 0) {
-			c = 0xfffd; // U+FFFD: Replacement Character
-		} else {
-			c = cset;
-		}
-	} else {
-		c = (unsigned int)wchar;
-	}
-
-	// UTF-16LE\x82\xA9\x82\xE7UTF-8\x82֕ϊ\xB7\x82\xB7\x82\xE9
-	if (c <= 0x0000007f) {
-		// 0x00000000 <= c <= 0x0000007f
-		code = (c & 0xff);
-		*byte = 1;
-
-	} else if (c <= 0x000007ff) {
-		// 0x00000080 <= c <= 0x000007ff
-		c1 = ((c >> 6) & 0x1f) | 0xc0;
-		c2 = (c & 0x3f) | 0x80;
-		code = (c1 << 8) | c2;
-		*byte = 2;
-
-	} else if (c <= 0x0000ffff) {
-		// 0x00000800 <= c <= 0x0000ffff
-		c1 = ((c >> 12) & 0xf) | 0xe0;
-		c2 = ((c >> 6) & 0x3f) | 0x80;
-		c3 = ((c) & 0x3f) | 0x80;
-		code = (c1 << 16) | (c2 << 8) | c3;
-		*byte = 3;
-	} else {
-		code = KCode;
-		*byte = 2;
-	}
-
-	return (code);
-}
-
-
 // Japanese SJIS -> JIS
 DllExport WORD WINAPI SJIS2JIS(WORD KCode)
 {

Modified: branches/cmake/teraterm/ttpcmn/language.h
===================================================================
--- branches/cmake/teraterm/ttpcmn/language.h	2019-03-10 14:32:45 UTC (rev 7470)
+++ branches/cmake/teraterm/ttpcmn/language.h	2019-03-10 14:32:59 UTC (rev 7471)
@@ -32,7 +32,6 @@
 #pragma once
 
 #include <windows.h>	// for WINAPI
-#include "codemap.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -43,13 +42,11 @@
 #endif
 
 /* proto types */
-DllExport unsigned int WINAPI SJIS2UTF8(WORD KCode, int *byte, int CodePage);
 DllExport WORD WINAPI SJIS2JIS(WORD KCode);
 DllExport WORD WINAPI SJIS2EUC(WORD KCode);
 DllExport WORD WINAPI JIS2SJIS(WORD KCode);
 DllExport BYTE WINAPI RussConv(int cin, int cout, BYTE b);
 DllExport void WINAPI RussConvStr(int cin, int cout, PCHAR Str, int count);
-DllExport unsigned short ConvertUnicode(unsigned short code, const codemap_t *table, int tmax);
 
 #ifdef __cplusplus
 }

Modified: branches/cmake/teraterm/ttpcmn/ttcmn.c
===================================================================
--- branches/cmake/teraterm/ttpcmn/ttcmn.c	2019-03-10 14:32:45 UTC (rev 7470)
+++ branches/cmake/teraterm/ttpcmn/ttcmn.c	2019-03-10 14:32:59 UTC (rev 7471)
@@ -40,6 +40,7 @@
 #include <setupapi.h>
 #include <locale.h>
 #include <htmlhelp.h>
+#include <assert.h>
 
 #define DllExport __declspec(dllexport) 
 #include "language.h"
@@ -1587,31 +1588,26 @@
 	return i;
 }
 
+// \x93\xE0\x95\x94\x83R\x81[\x83h(CodePage)\x82\xF0UTF-8\x82֏o\x97͂\xB7\x82\xE9
 static int OutputTextUTF8(WORD K, char *TempStr, PComVar cv)
 {
+	int CodePage = *cv->CodePage;
 	unsigned int code;
 	int outlen;
-	int TempLen = 0;
 
-	code = SJIS2UTF8(K, &outlen, *cv->CodePage);
-	switch (outlen) {
-	  case 4:
-		TempStr[TempLen++] = (code >> 24) & 0xff;
-	  case 3:
-		TempStr[TempLen++] = (code >> 16) & 0xff;
-	  case 2:
-		TempStr[TempLen++] = (code >> 8) & 0xff;
-	  case 1:
-		TempStr[TempLen++] = code & 0xff;
+	code = MBCP_UTF32(K, CodePage);
+	if (code == 0) {
+		// \x95ϊ\xB7\x8E\xB8\x94s
+		code = 0xfffd; // U+FFFD: Replacement Character
 	}
-
-	return TempLen;
+	outlen = UTF32ToUTF8(code, TempStr, 4);
+	return outlen;
 }
 
 //
 // MBCS\x82\xA9\x82\xE7\x8Ae\x8E튿\x8E\x9A\x83R\x81[\x83h\x82֕ϊ\xB7\x82\xB5\x82ďo\x97͂\xB7\x82\xE9\x81B
 //
-int TextOutMBCS(PComVar cv, PCHAR B, int C)
+static int TextOutMBCS(PComVar cv, PCHAR B, int C)
 {
 	int i, TempLen, OutLen;
 	WORD K;
@@ -1928,6 +1924,42 @@
 	return i;
 }
 
+/**
+ * CommTextOut() \x82\xCC wchar_t \x94\xC5
+ * \x8D\xA1\x82̏\x8AIME\x82\xA9\x82炵\x82\xA9\x8Eg\x82\xC1\x82Ă\xA2\x82Ȃ\xA2\x82\xBD\x82\xDF
+ * \x90\xA7\x8C\xE4\x83R\x81[\x83h\x8Cn\x82͖\xA2\x83e\x83X\x83g
+ */
+int WINAPI CommTextOutW(PComVar cv, const wchar_t *B, int C)
+{
+	int CodePage = *cv->CodePage;
+	size_t mb_len;
+	int r;
+	char *mb_str = _WideCharToMultiByte(B, C, CodePage, &mb_len);
+	if (mb_str == NULL) {
+		r = 0;
+	} else {
+		r = CommTextOut(cv, mb_str, mb_len);
+		free(mb_str);
+	}
+	return r;
+}
+
+// TODO: UTF-16\x82\xA9\x82璼\x90ڕϊ\xB7\x82\xB5\x82ďo\x97͂\xB7\x82\xE9
+int WINAPI CommTextEchoW(PComVar cv, const wchar_t *B, int C)
+{
+	int CodePage = *cv->CodePage;
+	size_t mb_len;
+	int r;
+	char *mb_str = _WideCharToMultiByte(B, C, CodePage, &mb_len);
+	if (mb_str == NULL) {
+		r = 0;
+	} else {
+		r = CommTextEcho(cv, mb_str, mb_len);
+		free(mb_str);
+	}
+	return r;
+}
+
 int WINAPI CommBinaryEcho(PComVar cv, PCHAR B, int C)
 {
 	int a, i, Len;
@@ -1972,7 +2004,7 @@
 	return i;
 }
 
-int WINAPI TextEchoMBCS(PComVar cv, PCHAR B, int C)
+static int WINAPI TextEchoMBCS(PComVar cv, PCHAR B, int C)
 {
 	int i, TempLen;
 	WORD K;

Modified: branches/cmake/teraterm/ttpmacro/ttl_gui.cpp
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttl_gui.cpp	2019-03-10 14:32:45 UTC (rev 7470)
+++ branches/cmake/teraterm/ttpmacro/ttl_gui.cpp	2019-03-10 14:32:59 UTC (rev 7471)
@@ -528,9 +528,9 @@
 	{
 #if defined(UNICODE)
 		TCHAR input_string[MaxStrLen];
+		size_t Temp2_len = sizeof(Temp2);
 		OpenInpDlg(input_string, tc::fromUtf8(Str2), _T("Enter password"), _T(""), TRUE);
-		WideCharToUTF8(input_string, -1,
-					   Temp2, _countof(Temp2));
+		WideCharToUTF8(input_string, NULL, Temp2, &Temp2_len);
 #else
 		OpenInpDlg(Temp2, Str2, _T("Enter password"), _T(""), TRUE);
 #endif
@@ -599,8 +599,8 @@
 		TCHAR input_string[MaxStrLen];
 		OpenInpDlg(input_string,tc::fromUtf8(Str1),tc::fromUtf8(Str2),tc::fromUtf8(Str3),Paswd);
 		char *output = StrVarPtr(VarId);
-		WideCharToUTF8(input_string, -1,
-					   output, MaxStrLen);
+		size_t str_len = MaxStrLen;
+		WideCharToUTF8(input_string, NULL, output, &str_len);
 #else
 		OpenInpDlg(StrVarPtr(VarId),Str1,Str2,Str3,Paswd);
 #endif

From scmnotify ＠ osdn.net  Sun Mar 10 23:33:22 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sun, 10 Mar 2019 23:33:22 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0NzJdIHVuaWNvZGXooajnpLrlr77lv5w=?=
Message-ID: <1552228402.111656.5278.nullmailer@users.osdn.me>

Revision: 7472
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7472
Author:   zmatsuo
Date:     2019-03-10 23:33:21 +0900 (Sun, 10 Mar 2019)
Log Message:
-----------
unicode表示対応

# Conflicts:
#	teraterm/teraterm/CMakeLists.txt

Modified Paths:
--------------
    branches/cmake/teraterm/common/ttlib.c
    branches/cmake/teraterm/common/ttlib.h
    branches/cmake/teraterm/teraterm/CMakeLists.txt
    branches/cmake/teraterm/teraterm/buffer.c
    branches/cmake/teraterm/teraterm/buffer.h
    branches/cmake/teraterm/teraterm/vtdisp.c
    branches/cmake/teraterm/teraterm/vtdisp.h
    branches/cmake/teraterm/teraterm/vtterm.c

-------------- next part --------------
Modified: branches/cmake/teraterm/common/ttlib.c
===================================================================
--- branches/cmake/teraterm/common/ttlib.c	2019-03-10 14:32:59 UTC (rev 7471)
+++ branches/cmake/teraterm/common/ttlib.c	2019-03-10 14:33:21 UTC (rev 7472)
@@ -1145,14 +1145,26 @@
 }
 #endif
 
-void OutputDebugPrintf(const char *fmt, ...) {
+void OutputDebugPrintf(const char *fmt, ...)
+{
 	char tmp[1024];
 	va_list arg;
 	va_start(arg, fmt);
 	_vsnprintf(tmp, sizeof(tmp), fmt, arg);
+	va_end(arg);
 	OutputDebugStringA(tmp);
 }
 
+void OutputDebugPrintfW(const wchar_t *fmt, ...)
+{
+	wchar_t tmp[1024];
+	va_list arg;
+	va_start(arg, fmt);
+	_vsnwprintf(tmp, _countof(tmp), fmt, arg);
+	va_end(arg);
+	OutputDebugStringW(tmp);
+}
+
 #if (_MSC_VER < 1800)
 BOOL vercmp(
 	DWORD cond_val,

Modified: branches/cmake/teraterm/common/ttlib.h
===================================================================
--- branches/cmake/teraterm/common/ttlib.h	2019-03-10 14:32:59 UTC (rev 7471)
+++ branches/cmake/teraterm/common/ttlib.h	2019-03-10 14:33:21 UTC (rev 7472)
@@ -96,6 +96,7 @@
 DllExport BOOL doSelectFolderW(HWND hWnd, wchar_t *path, int pathlen, const wchar_t *def, const wchar_t *msg);
 #endif
 DllExport void OutputDebugPrintf(const char *fmt, ...);
+DllExport void OutputDebugPrintfW(const wchar_t *fmt, ...);
 DllExport DWORD get_OPENFILENAME_SIZEA();
 DllExport DWORD get_OPENFILENAME_SIZEW();
 DllExport BOOL IsWindows95();

Modified: branches/cmake/teraterm/teraterm/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/teraterm/CMakeLists.txt	2019-03-10 14:32:59 UTC (rev 7471)
+++ branches/cmake/teraterm/teraterm/CMakeLists.txt	2019-03-10 14:33:21 UTC (rev 7472)
@@ -3,22 +3,18 @@
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_SFMT.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake)
 
-if (MSVC)
-  string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG            ${CMAKE_C_FLAGS_DEBUG})
-  string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE          ${CMAKE_C_FLAGS_RELEASE})
-  string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG          ${CMAKE_CXX_FLAGS_DEBUG})
-  string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE        ${CMAKE_CXX_FLAGS_RELEASE})
-endif ()
+# UNICODE API を使用して文字描画を行う
+#	- 内部文字コードを unicodeとする
+#	- unicode api時のみ有効
+#	- 描画に ExtTextOutW() API を使用する
+option(USE_UNICODE_API_FOR_DISPLAY "unicode" ON)
 
-
 if(USE_UNICODE_API)
   add_definitions(-DUNICODE -D_UNICODE)
+  if(USE_UNICODE_API_FOR_DISPLAY)
+	add_definitions(-DUNICODE_DISPLAY=1)
+  endif()
 endif()
-if(LINK_UNICOWS)
-#  set(UNICOWS_LIB "${CMAKE_SOURCE_DIR}/libs/unicows_mingw/liblibunicows.a")
-  set(UNICOWS_LIB "${CMAKE_SOURCE_DIR}/libs/libunicows-1.1.2-msvc6/unicows.lib")
-endif()
-
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
 
 set(COMMON_SRC
@@ -26,6 +22,7 @@
   ../common/ttcommon.h
   ../common/ttddecmnd.h
   ../common/tttypes.h
+  ../common/tektypes.h
   ../common/ttftypes.h
   ../common/ttplugin.h
   ../common/tt-version.h
@@ -35,6 +32,8 @@
   ../common/dlglib.c
   ../common/dlglib_cpp.cpp
   ../common/dlglib.h
+  ../common/win16api.h
+  ../common/win16api.c
   ../common/dlglib_tmpl.cpp
   ../common/compat_win.cpp
   ../common/compat_win.h
@@ -45,8 +44,13 @@
   ../common/i18n.h
   ../common/win16api.h
   ../common/win16api.c
+  ../ttpcmn/language.h
   ../common/codeconv.h
   ../common/codeconv.cpp
+  #
+  ../teraterm/uni2sjis.map
+  ../ttpcmn/sjis2uni.map
+  ../teraterm/unisym2decsp.map
   )
 
 source_group(
@@ -131,6 +135,8 @@
   ttutil.c
   ttutil.h
   #
+  uni_combining.map
+  #
   teraterm.manifest
   #
   ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h

Modified: branches/cmake/teraterm/teraterm/buffer.c
===================================================================
--- branches/cmake/teraterm/teraterm/buffer.c	2019-03-10 14:32:59 UTC (rev 7471)
+++ branches/cmake/teraterm/teraterm/buffer.c	2019-03-10 14:33:21 UTC (rev 7472)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2004-2017 TeraTerm Project
+ * (C) 2004-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,6 +36,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <windows.h>
+#include <crtdbg.h>
 
 #include "ttwinman.h"
 #include "teraprn.h"
@@ -43,9 +44,15 @@
 #include "clipboar.h"
 #include "telnet.h"
 #include "ttplug.h" /* TTPLUG */
+#include "codeconv.h"
 
 #include "buffer.h"
 
+#ifdef _DEBUG
+#define malloc(l)	_malloc_dbg((l), _NORMAL_BLOCK, __FILE__, __LINE__)
+#define free(p)		_free_dbg((p), _NORMAL_BLOCK)
+#endif
+
 // URL\x82\xF0\x8B\xAD\x92\xB2\x82\xB7\x82\xE9\x81i\x90΍莁\x83p\x83b\x83` 2005/4/2\x81j
 #define URL_EMPHASIS 1
 
@@ -83,6 +90,10 @@
 static PCHAR AttrLine2;
 static PCHAR AttrLineFG;
 static PCHAR AttrLineBG;
+#if 1
+static wchar_t *CodeBuffW;
+static wchar_t *CodeLineW;
+#endif
 static LONG LinePtr;
 static LONG BufferSize;
 static int NumOfLinesInBuff;
@@ -101,6 +112,24 @@
 int SaveBuffX;
 int SaveBuffY;
 
+void memcpyW(wchar_t *dest, const wchar_t *src, size_t count)
+{
+	memcpy(dest, src, count * sizeof(wchar_t));
+}
+
+void memsetW(wchar_t *dest, wchar_t ch, size_t count)
+{
+	size_t i;
+	for (i=0; i<count; i++) {
+		*dest++ = ch;
+	}
+}
+
+void memmoveW(wchar_t *dest, const wchar_t *src, size_t count)
+{
+	memmove(dest, src, count * sizeof(wchar_t));
+}
+
 LONG GetLinePtr(int Line)
 {
 	LONG Ptr;
@@ -136,8 +165,10 @@
 	LONG NewSize;
 	int NxCopy, NyCopy, i;
 	PCHAR CodeDest, AttrDest, AttrDest2, AttrDestFG, AttrDestBG;
+	wchar_t *CodeDestW;
 	LONG SrcPtr, DestPtr;
 	WORD LockOld;
+	wchar_t *CodeWNew;
 
 	if (Nx > BuffXMax) {
 		Nx = BuffXMax;
@@ -160,6 +191,7 @@
 	HAttr2New = NULL;
 	HAttrFGNew = NULL;
 	HAttrBGNew = NULL;
+	CodeWNew = NULL;
 
 	if ((HCodeNew=GlobalAlloc(GMEM_MOVEABLE, NewSize)) == NULL || (CodeDest=GlobalLock(HCodeNew)) == NULL) {
 		goto allocate_error;
@@ -176,8 +208,11 @@
 	if ((HAttrBGNew=GlobalAlloc(GMEM_MOVEABLE, NewSize)) == NULL || (AttrDestBG=GlobalLock(HAttrBGNew)) == NULL) {
 		goto allocate_error;
 	}
+	CodeWNew = malloc(NewSize * sizeof(wchar_t));
+	CodeDestW = CodeWNew;
 
 	memset(&CodeDest[0], 0x20, NewSize);
+	memsetW(&CodeDestW[0], 0x20, NewSize);
 	memset(&AttrDest[0], AttrDefault, NewSize);
 	memset(&AttrDest2[0], AttrDefault, NewSize);
 	memset(&AttrDestFG[0], AttrDefaultFG, NewSize);
@@ -202,6 +237,7 @@
 		DestPtr = 0;
 		for (i = 1 ; i <= NyCopy ; i++) {
 			memcpy(&CodeDest[DestPtr],&CodeBuff[SrcPtr],NxCopy);
+			memcpyW(&CodeDestW[DestPtr],&CodeBuffW[SrcPtr],NxCopy);
 			memcpy(&AttrDest[DestPtr],&AttrBuff[SrcPtr],NxCopy);
 			memcpy(&AttrDest2[DestPtr],&AttrBuff2[SrcPtr],NxCopy);
 			memcpy(&AttrDestFG[DestPtr],&AttrBuffFG[SrcPtr],NxCopy);
@@ -243,6 +279,7 @@
 	HAttrBuff2 = HAttr2New;
 	HAttrBuffFG = HAttrFGNew;
 	HAttrBuffBG = HAttrBGNew;
+	CodeBuffW = CodeWNew;
 	BufferSize = NewSize;
 	NumOfLinesInBuff = Ny;
 	BuffStartAbs = 0;
@@ -265,6 +302,7 @@
 		AttrBuffFG = (PCHAR)GlobalLock(HAttrBuffFG);
 		AttrBuffBG = (PCHAR)GlobalLock(HAttrBuffBG);
 		CodeLine = CodeBuff;
+		CodeLineW = CodeBuffW;
 		AttrLine = AttrBuff;
 		AttrLine2 = AttrBuff2;
 		AttrLineFG = AttrBuffFG;
@@ -288,6 +326,7 @@
 	if (AttrDestFG) GlobalUnlock(HAttrFGNew);
 	if (AttrDestBG) GlobalUnlock(HAttrBGNew);
 	if (HCodeNew)   GlobalFree(HCodeNew);
+	if (CodeWNew)   free(CodeWNew);
 	if (HAttrNew)   GlobalFree(HAttrNew);
 	if (HAttr2New)  GlobalFree(HAttr2New);
 	if (HAttrFGNew) GlobalFree(HAttrFGNew);
@@ -343,6 +382,7 @@
 	AttrLine2 = &AttrBuff2[LinePtr];
 	AttrLineFG = &AttrBuffFG[LinePtr];
 	AttrLineBG = &AttrBuffBG[LinePtr];
+	CodeLineW = &CodeBuffW[LinePtr];
 }
 
 void LockBuffer()
@@ -393,6 +433,10 @@
 		GlobalFree(HCodeBuff);
 		HCodeBuff = NULL;
 	}
+	if (CodeBuffW != NULL) {
+		free(CodeBuffW);
+		CodeBuffW = NULL;
+	}
 	if (HAttrBuff!=NULL) {
 		GlobalFree(HAttrBuff);
 		HAttrBuff = NULL;
@@ -499,11 +543,13 @@
 		SrcPtr = GetLinePtr(PageStart+NumOfLines-1);
 		for (i=NumOfLines-1; i>=Bottom+1; i--) {
 			memcpy(&(CodeBuff[DestPtr]),&(CodeBuff[SrcPtr]),NumOfColumns);
+			memcpyW(&(CodeBuffW[DestPtr]),&(CodeBuffW[SrcPtr]),NumOfColumns);
 			memcpy(&(AttrBuff[DestPtr]),&(AttrBuff[SrcPtr]),NumOfColumns);
 			memcpy(&(AttrBuff2[DestPtr]),&(AttrBuff2[SrcPtr]),NumOfColumns);
 			memcpy(&(AttrBuffFG[DestPtr]),&(AttrBuffFG[SrcPtr]),NumOfColumns);
 			memcpy(&(AttrBuffBG[DestPtr]),&(AttrBuffBG[SrcPtr]),NumOfColumns);
 			memset(&(CodeBuff[SrcPtr]),0x20,NumOfColumns);
+			memsetW(&(CodeBuffW[SrcPtr]),0x20,NumOfColumns);
 			memset(&(AttrBuff[SrcPtr]),AttrDefault,NumOfColumns);
 			memset(&(AttrBuff2[SrcPtr]),CurCharAttr.Attr2 & Attr2ColorMask, NumOfColumns);
 			memset(&(AttrBuffFG[SrcPtr]),CurCharAttr.Fore,NumOfColumns);
@@ -515,6 +561,7 @@
 	}
 	for (i = 1 ; i <= n ; i++) {
 		memset(&CodeBuff[DestPtr],0x20,NumOfColumns);
+		memsetW(&CodeBuffW[DestPtr],0x20,NumOfColumns);
 		memset(&AttrBuff[DestPtr],AttrDefault,NumOfColumns);
 		memset(&AttrBuff2[DestPtr],CurCharAttr.Attr2 & Attr2ColorMask, NumOfColumns);
 		memset(&AttrBuffFG[DestPtr],CurCharAttr.Fore,NumOfColumns);
@@ -561,6 +608,7 @@
 	AttrLine2 = &AttrBuff2[LinePtr];
 	AttrLineFG = &AttrBuffFG[LinePtr];
 	AttrLineBG = &AttrBuffBG[LinePtr];
+	CodeLineW = &CodeBuffW[LinePtr];
 }
 
 void PrevLine()
@@ -571,6 +619,7 @@
 	AttrLine2 = &AttrBuff2[LinePtr];
 	AttrLineFG = &AttrBuffFG[LinePtr];
 	AttrLineBG = &AttrBuffBG[LinePtr];
+	CodeLineW = &CodeBuffW[LinePtr];
 }
 
 void EraseKanji(int LR)
@@ -607,17 +656,21 @@
 		pos = ptr + CursorLeftM-1;
 		if (CursorLeftM>0 && (AttrBuff[pos] & AttrKanji)) {
 			CodeBuff[pos] = 0x20;
+			CodeBuffW[pos] = 0x20;
 			AttrBuff[pos] &= ~AttrKanji;
 			pos++;
 			CodeBuff[pos] = 0x20;
+			CodeBuffW[pos] = 0x20;
 			AttrBuff[pos] &= ~AttrKanji;
 		}
 		pos = ptr + CursorRightM;
 		if (CursorRightM < NumOfColumns-1 && (AttrBuff[pos] & AttrKanji)) {
 			CodeBuff[pos] = 0x20;
+			CodeBuffW[pos] = 0x20;
 			AttrBuff[pos] &= ~AttrKanji;
 			pos++;
 			CodeBuff[pos] = 0x20;
+			CodeBuffW[pos] = 0x20;
 			AttrBuff[pos] &= ~AttrKanji;
 		}
 		ptr = NextLinePtr(ptr);
@@ -641,6 +694,7 @@
 
 	if (CursorRightM < NumOfColumns-1 && (AttrLine[CursorRightM] & AttrKanji)) {
 		CodeLine[CursorRightM+1] = 0x20;
+		CodeLineW[CursorRightM+1] = 0x20;
 		AttrLine[CursorRightM+1] &= ~AttrKanji;
 		extr = 1;
 	}
@@ -652,6 +706,7 @@
 
 	if (MoveLen > 0) {
 		memmove(&(CodeLine[CursorX+Count]), &(CodeLine[CursorX]), MoveLen);
+		memmoveW(&(CodeLineW[CursorX+Count]), &(CodeLineW[CursorX]), MoveLen);
 		memmove(&(AttrLine[CursorX+Count]), &(AttrLine[CursorX]), MoveLen);
 		memmove(&(AttrLine2[CursorX+Count]), &(AttrLine2[CursorX]), MoveLen);
 		memmove(&(AttrLineFG[CursorX+Count]), &(AttrLineFG[CursorX]), MoveLen);
@@ -658,6 +713,7 @@
 		memmove(&(AttrLineBG[CursorX+Count]), &(AttrLineBG[CursorX]), MoveLen);
 	}
 	memset(&(CodeLine[CursorX]), 0x20, Count);
+	memsetW(&(CodeLineW[CursorX]), 0x20, Count);
 	memset(&(AttrLine[CursorX]), AttrDefault, Count);
 	memset(&(AttrLine2[CursorX]), CurCharAttr.Attr2 & Attr2ColorMask, Count);
 	memset(&(AttrLineFG[CursorX]), CurCharAttr.Fore, Count);
@@ -666,6 +722,7 @@
 	if ((AttrLine[CursorRightM] & AttrKanji) != 0) {
 		/* then delete it */
 		CodeLine[CursorRightM] = 0x20;
+		CodeLineW[CursorRightM] = 0x20;
 		AttrLine[CursorRightM] &= ~AttrKanji;
 	}
 	BuffUpdateRect(CursorX, CursorY, CursorRightM+extr, CursorY);
@@ -690,6 +747,7 @@
 	}
 	for (i = CursorY ; i <= YEnd ; i++) {
 		memset(&(CodeBuff[TmpPtr+offset]),0x20,NumOfColumns-offset);
+		memsetW(&(CodeBuffW[TmpPtr+offset]),0x20,NumOfColumns-offset);
 		memset(&(AttrBuff[TmpPtr+offset]),AttrDefault,NumOfColumns-offset);
 		memset(&(AttrBuff2[TmpPtr+offset]),CurCharAttr.Attr2 & Attr2ColorMask, NumOfColumns-offset);
 		memset(&(AttrBuffFG[TmpPtr+offset]),CurCharAttr.Fore,NumOfColumns-offset);
@@ -725,6 +783,7 @@
 			offset = CursorX+1;
 		}
 		memset(&(CodeBuff[TmpPtr]),0x20,offset);
+		memsetW(&(CodeBuffW[TmpPtr]),0x20,offset);
 		memset(&(AttrBuff[TmpPtr]),AttrDefault,offset);
 		memset(&(AttrBuff2[TmpPtr]),CurCharAttr.Attr2 & Attr2ColorMask, offset);
 		memset(&(AttrBuffFG[TmpPtr]),CurCharAttr.Fore,offset);
@@ -759,6 +818,7 @@
 	linelen = CursorRightM - CursorLeftM + 1;
 	for (i= YEnd-Count ; i>=CursorY ; i--) {
 		memcpy(&(CodeBuff[DestPtr]), &(CodeBuff[SrcPtr]), linelen);
+		memcpyW(&(CodeBuffW[DestPtr]), &(CodeBuffW[SrcPtr]), linelen);
 		memcpy(&(AttrBuff[DestPtr]), &(AttrBuff[SrcPtr]), linelen);
 		memcpy(&(AttrBuff2[DestPtr]), &(AttrBuff2[SrcPtr]), linelen);
 		memcpy(&(AttrBuffFG[DestPtr]), &(AttrBuffFG[SrcPtr]), linelen);
@@ -768,6 +828,7 @@
 	}
 	for (i = 1 ; i <= Count ; i++) {
 		memset(&(CodeBuff[DestPtr]), 0x20, linelen);
+		memsetW(&(CodeBuffW[DestPtr]), 0x20, linelen);
 		memset(&(AttrBuff[DestPtr]), AttrDefault, linelen);
 		memset(&(AttrBuff2[DestPtr]), CurCharAttr.Attr2 & Attr2ColorMask, linelen);
 		memset(&(AttrBuffFG[DestPtr]), CurCharAttr.Fore, linelen);
@@ -797,6 +858,7 @@
 
 	NewLine(PageStart+CursorY);
 	memset(&(CodeLine[XStart]),0x20,Count);
+	memsetW(&(CodeLineW[XStart]),0x20,Count);
 	memset(&(AttrLine[XStart]),AttrDefault,Count);
 	memset(&(AttrLine2[XStart]),CurCharAttr.Attr2 & Attr2ColorMask, Count);
 	memset(&(AttrLineFG[XStart]),CurCharAttr.Fore,Count);
@@ -838,6 +900,7 @@
 	linelen = CursorRightM - CursorLeftM + 1;
 	for (i=CursorY ; i<= YEnd-Count ; i++) {
 		memcpy(&(CodeBuff[DestPtr]), &(CodeBuff[SrcPtr]), linelen);
+		memcpyW(&(CodeBuffW[DestPtr]), &(CodeBuffW[SrcPtr]), linelen);
 		memcpy(&(AttrBuff[DestPtr]), &(AttrBuff[SrcPtr]), linelen);
 		memcpy(&(AttrBuff2[DestPtr]), &(AttrBuff2[SrcPtr]), linelen);
 		memcpy(&(AttrBuffFG[DestPtr]), &(AttrBuffFG[SrcPtr]), linelen);
@@ -847,6 +910,7 @@
 	}
 	for (i = YEnd+1-Count ; i<=YEnd ; i++) {
 		memset(&(CodeBuff[DestPtr]), 0x20, linelen);
+		memsetW(&(CodeBuffW[DestPtr]), 0x20, linelen);
 		memset(&(AttrBuff[DestPtr]), AttrDefault, linelen);
 		memset(&(AttrBuff2[DestPtr]), CurCharAttr.Attr2 & Attr2ColorMask,  linelen);
 		memset(&(AttrBuffFG[DestPtr]), CurCharAttr.Fore, linelen);
@@ -878,6 +942,7 @@
 
 	if (CursorRightM < NumOfColumns-1 && (AttrLine[CursorRightM] & AttrKanji)) {
 		CodeLine[CursorRightM] = 0x20;
+		CodeLineW[CursorRightM] = 0x20;
 		AttrLine[CursorRightM] &= ~AttrKanji;
 		CodeLine[CursorRightM+1] = 0x20;
 		AttrLine[CursorRightM+1] &= ~AttrKanji;
@@ -891,6 +956,7 @@
 
 	if (MoveLen > 0) {
 		memmove(&(CodeLine[CursorX]), &(CodeLine[CursorX+Count]), MoveLen);
+		memmoveW(&(CodeLineW[CursorX]), &(CodeLineW[CursorX+Count]), MoveLen);
 		memmove(&(AttrLine[CursorX]), &(AttrLine[CursorX+Count]), MoveLen);
 		memmove(&(AttrLine2[CursorX]), &(AttrLine2[CursorX+Count]), MoveLen);
 		memmove(&(AttrLineFG[CursorX]), &(AttrLineFG[CursorX+Count]), MoveLen);
@@ -897,6 +963,7 @@
 		memmove(&(AttrLineBG[CursorX]), &(AttrLineBG[CursorX+Count]), MoveLen);
 	}
 	memset(&(CodeLine[CursorX + MoveLen]), 0x20, Count);
+	memsetW(&(CodeLineW[CursorX + MoveLen]), 0x20, Count);
 	memset(&(AttrLine[CursorX + MoveLen]), AttrDefault, Count);
 	memset(&(AttrLine2[CursorX + MoveLen]), CurCharAttr.Attr2 & Attr2ColorMask, Count);
 	memset(&(AttrLineFG[CursorX + MoveLen]), CurCharAttr.Fore, Count);
@@ -920,6 +987,7 @@
 		Count = NumOfColumns-CursorX;
 	}
 	memset(&(CodeLine[CursorX]),0x20,Count);
+	memsetW(&(CodeLineW[CursorX]),0x20,Count);
 	memset(&(AttrLine[CursorX]),AttrDefault,Count);
 	memset(&(AttrLine2[CursorX]),CurCharAttr.Attr2 & Attr2ColorMask, Count);
 	memset(&(AttrLineFG[CursorX]),CurCharAttr.Fore,Count);
@@ -938,6 +1006,7 @@
 	TmpPtr = GetLinePtr(PageStart);
 	for (i = 0 ; i <= NumOfLines-1-StatusLine ; i++) {
 		memset(&(CodeBuff[TmpPtr]),'E',NumOfColumns);
+		memsetW(&(CodeBuffW[TmpPtr]),'E',NumOfColumns);
 		memset(&(AttrBuff[TmpPtr]),AttrDefault,NumOfColumns);
 		memset(&(AttrBuff2[TmpPtr]),AttrDefault,NumOfColumns);
 		memset(&(AttrBuffFG[TmpPtr]),AttrDefaultFG,NumOfColumns);
@@ -977,6 +1046,7 @@
 			}
 			Ptr = GetLinePtr(PageStart+Y);
 			memset(&(CodeBuff[Ptr+CursorX]),'q',C);
+			memsetW(&(CodeBuffW[Ptr+CursorX]),'q',C);
 			memset(&(AttrBuff[Ptr+CursorX]),Attr.Attr,C);
 			memset(&(AttrBuff2[Ptr+CursorX]),Attr.Attr2,C);
 			memset(&(AttrBuffFG[Ptr+CursorX]),Attr.Fore,C);
@@ -1005,6 +1075,7 @@
 			}
 			for (i=1; i<=C; i++) {
 				CodeBuff[Ptr+X] = 'x';
+				CodeBuffW[Ptr+X] = 'x';
 				AttrBuff[Ptr+X] = Attr.Attr;
 				AttrBuff2[Ptr+X] = Attr.Attr2;
 				AttrBuffFG[Ptr+X] = Attr.Fore;
@@ -1040,6 +1111,7 @@
 		if ((XStart>0) &&
 		    ((AttrBuff[Ptr+XStart-1] & AttrKanji) != 0)) {
 			CodeBuff[Ptr+XStart-1] = 0x20;
+			CodeBuffW[Ptr+XStart-1] = 0x20;
 			AttrBuff[Ptr+XStart-1] = CurCharAttr.Attr;
 			AttrBuff2[Ptr+XStart-1] = CurCharAttr.Attr2;
 			AttrBuffFG[Ptr+XStart-1] = CurCharAttr.Fore;
@@ -1048,6 +1120,7 @@
 		if ((XStart+C<NumOfColumns) &&
 		    ((AttrBuff[Ptr+XStart+C-1] & AttrKanji) != 0)) {
 			CodeBuff[Ptr+XStart+C] = 0x20;
+			CodeBuffW[Ptr+XStart+C] = 0x20;
 			AttrBuff[Ptr+XStart+C] = CurCharAttr.Attr;
 			AttrBuff2[Ptr+XStart+C] = CurCharAttr.Attr2;
 			AttrBuffFG[Ptr+XStart+C] = CurCharAttr.Fore;
@@ -1054,6 +1127,7 @@
 			AttrBuffBG[Ptr+XStart+C] = CurCharAttr.Back;
 		}
 		memset(&(CodeBuff[Ptr+XStart]),0x20,C);
+		memsetW(&(CodeBuffW[Ptr+XStart]),0x20,C);
 		memset(&(AttrBuff[Ptr+XStart]),AttrDefault,C);
 		memset(&(AttrBuff2[Ptr+XStart]),CurCharAttr.Attr2 & Attr2ColorMask, C);
 		memset(&(AttrBuffFG[Ptr+XStart]),CurCharAttr.Fore,C);
@@ -1086,13 +1160,16 @@
 		if ((XStart>0) &&
 		    ((AttrBuff[Ptr+XStart-1] & AttrKanji) != 0)) {
 			CodeBuff[Ptr+XStart-1] = 0x20;
+			CodeBuffW[Ptr+XStart-1] = 0x20;
 			AttrBuff[Ptr+XStart-1] ^= AttrKanji;
 		}
 		if ((XStart+Cols<NumOfColumns) &&
 		    ((AttrBuff[Ptr+XStart+Cols-1] & AttrKanji) != 0)) {
 			CodeBuff[Ptr+XStart+Cols] = 0x20;
+			CodeBuffW[Ptr+XStart+Cols] = 0x20;
 		}
 		memset(&(CodeBuff[Ptr+XStart]), ch, Cols);
+		memsetW(&(CodeBuffW[Ptr+XStart]), ch, Cols);
 		memset(&(AttrBuff[Ptr+XStart]), CurCharAttr.Attr, Cols);
 		memset(&(AttrBuff2[Ptr+XStart]), CurCharAttr.Attr2, Cols);
 		memset(&(AttrBuffFG[Ptr+XStart]), CurCharAttr.Fore, Cols);
@@ -1148,6 +1225,7 @@
 		DPtr = GetLinePtr(PageStart+DstY);
 		for (i=0; i<L; i++) {
 			memcpy(&(CodeBuff[DPtr+DstX]), &(CodeBuff[SPtr+SrcXStart]), C);
+			memcpyW(&(CodeBuffW[DPtr+DstX]), &(CodeBuffW[SPtr+SrcXStart]), C);
 			memcpy(&(AttrBuff[DPtr+DstX]), &(AttrBuff[SPtr+SrcXStart]), C);
 			memcpy(&(AttrBuff2[DPtr+DstX]), &(AttrBuff2[SPtr+SrcXStart]), C);
 			memcpy(&(AttrBuffFG[DPtr+DstX]), &(AttrBuffFG[SPtr+SrcXStart]), C);
@@ -1161,6 +1239,7 @@
 		DPtr = GetLinePtr(PageStart+DstY+L-1);
 		for (i=L; i>0; i--) {
 			memcpy(&(CodeBuff[DPtr+DstX]), &(CodeBuff[SPtr+SrcXStart]), C);
+			memcpyW(&(CodeBuffW[DPtr+DstX]), &(CodeBuffW[SPtr+SrcXStart]), C);
 			memcpy(&(AttrBuff[DPtr+DstX]), &(AttrBuff[SPtr+SrcXStart]), C);
 			memcpy(&(AttrBuff2[DPtr+DstX]), &(AttrBuff2[SPtr+SrcXStart]), C);
 			memcpy(&(AttrBuffFG[DPtr+DstX]), &(AttrBuffFG[SPtr+SrcXStart]), C);
@@ -1174,6 +1253,7 @@
 		DPtr = GetLinePtr(PageStart+DstY);
 		for (i=0; i<L; i++) {
 			memmove(&(CodeBuff[DPtr+DstX]), &(CodeBuff[SPtr+SrcXStart]), C);
+			memmoveW(&(CodeBuffW[DPtr+DstX]), &(CodeBuffW[SPtr+SrcXStart]), C);
 			memmove(&(AttrBuff[DPtr+DstX]), &(AttrBuff[SPtr+SrcXStart]), C);
 			memmove(&(AttrBuff2[DPtr+DstX]), &(AttrBuff2[SPtr+SrcXStart]), C);
 			memmove(&(AttrBuffFG[DPtr+DstX]), &(AttrBuffFG[SPtr+SrcXStart]), C);
@@ -2005,6 +2085,194 @@
 	}
 }
 
+// Put a kanji character in the buffer at the current position
+//   b: character
+//   Attr: attributes
+//   Insert: Insert flag
+// @@
+void BuffPutUnicode(unsigned int uc, TCharAttr Attr, BOOL Insert)
+{
+	int XStart, LineEnd, MoveLen;
+	int extr = 0;
+	unsigned int w = uc;
+	int ret;
+	wchar_t wchar = (wchar_t)uc;
+	BYTE b1, b2;
+	unsigned int u32 = uc;
+	unsigned short u16_high;
+	unsigned short u16_low;
+	wchar_t wstr[2];
+	size_t wstr_len;
+
+	wstr_len = UTF32ToUTF16(u32, wstr, 2);
+	switch (wstr_len) {
+	case 0:
+	default:
+		u16_high = '?';
+		u16_low = 0;
+		break;
+	case 1:
+		u16_high = wstr[0];
+		u16_low = 0;
+		break;
+	case 2:
+		u16_high = wstr[0];
+		u16_low = wstr[1];
+		break;
+	}
+
+	if (uc < 0x80) {
+		b1 = (BYTE)uc;
+		b2 = 0;
+		ret = 1;
+	} else {
+		char mbchar[2];
+		ret = UTF32ToCP932(uc, mbchar, 2);
+		if (ret == 0) {
+			b1 = '?';
+			b2 = '?';
+			ret = 2;
+		} else if (ret == 1) {
+			b1 = mbchar[0];
+			b2 = 0;
+		} else {	// ret == 2
+			b1 = mbchar[0];
+			b2 = mbchar[1];
+			ret = 2;
+		}
+	}
+
+#if 0
+	OutputDebugPrintf("BuffPutUnicode(%06x(%04x,%04x)(%02x,%02x)\n",
+					  uc,
+					  u16_high, u16_low, b1, b2);
+#endif
+
+	if (ts.EnableContinuedLineCopy && CursorX == 0 && (AttrLine[0] & AttrLineContinued)) {
+		Attr.Attr |= AttrLineContinued;
+	}
+
+	if (Insert) {
+		if (CursorX > CursorRightM)
+			LineEnd = NumOfColumns - 1;
+		else
+			LineEnd = CursorRightM;
+
+		if (LineEnd < NumOfColumns - 1 && (AttrLine[LineEnd] & AttrKanji)) {
+			CodeLine[LineEnd] = 0x20;
+			CodeLineW[LineEnd] = 0x20;
+			AttrLine[LineEnd] &= ~AttrKanji;
+			CodeLine[LineEnd+1] = 0x20;
+			AttrLine[LineEnd+1] &= ~AttrKanji;
+			extr = 1;
+		}
+
+		MoveLen = LineEnd - CursorX - 1;
+		if (MoveLen > 0) {
+			memmove(&CodeLine[CursorX+2], &CodeLine[CursorX], MoveLen);
+			memmove(&CodeLineW[CursorX+2], &CodeLineW[CursorX], MoveLen * sizeof(wchar_t));
+			memmove(&AttrLine[CursorX+2], &AttrLine[CursorX], MoveLen);
+			memmove(&AttrLine2[CursorX+2], &AttrLine2[CursorX], MoveLen);
+			memmove(&AttrLineFG[CursorX+2], &AttrLineFG[CursorX], MoveLen);
+			memmove(&AttrLineBG[CursorX+2], &AttrLineBG[CursorX], MoveLen);
+		}
+
+		CodeLine[CursorX] = HIBYTE(w);
+		CodeLineW[CursorX] = u16_high;
+		AttrLine[CursorX] = Attr.Attr;
+		AttrLine2[CursorX] = Attr.Attr2;
+		AttrLineFG[CursorX] = Attr.Fore;
+		AttrLineBG[CursorX] = Attr.Back;
+		if (CursorX < LineEnd) {
+			CodeLine[CursorX+1] = LOBYTE(w);
+			CodeLineW[CursorX+1] = u16_low;
+//			CodeLineW[CursorX+1] = 0;
+			AttrLine[CursorX+1] = Attr.Attr;
+			AttrLine2[CursorX+1] = Attr.Attr2;
+			AttrLineFG[CursorX+1] = Attr.Fore;
+			AttrLineBG[CursorX+1] = Attr.Back;
+		}
+		/* begin - ishizaki */
+		markURL(CursorX);
+		markURL(CursorX+1);
+		/* end - ishizaki */
+
+		/* last char in current line is kanji first? */
+		if ((AttrLine[LineEnd] & AttrKanji) != 0) {
+			/* then delete it */
+			CodeLine[LineEnd] = 0x20;
+			CodeLineW[LineEnd] = 0x20;
+			AttrLine[LineEnd] = CurCharAttr.Attr;
+			AttrLine2[LineEnd] = CurCharAttr.Attr2;
+			AttrLineFG[LineEnd] = CurCharAttr.Fore;
+			AttrLineBG[LineEnd] = CurCharAttr.Back;
+		}
+
+		if (StrChangeCount==0) {
+			XStart = CursorX;
+		}
+		else {
+			XStart = StrChangeStart;
+		}
+		StrChangeCount = 0;
+		BuffUpdateRect(XStart, CursorY, LineEnd+extr, CursorY);
+	}
+	else {
+		CodeLine[CursorX] = b1;
+		CodeLineW[CursorX] = u16_high;
+		AttrLine[CursorX] = Attr.Attr; // | AttrKanji; /* DBCS first byte */
+		AttrLine2[CursorX] = Attr.Attr2;
+		AttrLineFG[CursorX] = Attr.Fore;
+		AttrLineBG[CursorX] = Attr.Back;
+#if 0
+		if (b2 != 0) {
+			if (CursorX < NumOfColumns-1) {
+				CodeLine[CursorX+1] = b2;
+				CodeLineW[CursorX+1] = 0;
+				AttrLine[CursorX+1] = Attr.Attr;
+				AttrLine2[CursorX+1] = Attr.Attr2;
+				AttrLineFG[CursorX+1] = Attr.Fore;
+				AttrLineBG[CursorX+1] = Attr.Back;
+			}
+		}
+#else
+		if (CursorX < NumOfColumns-1) {
+			CodeLine[CursorX+1] = b2;
+			CodeLineW[CursorX+1] = u16_low;
+			AttrLine[CursorX+1] = Attr.Attr;
+			AttrLine2[CursorX+1] = Attr.Attr2;
+			AttrLineFG[CursorX+1] = Attr.Fore;
+			AttrLineBG[CursorX+1] = Attr.Back;
+		}
+#endif
+		/* begin - ishizaki */
+//		markURL(CursorX);
+//		markURL(CursorX+1);
+		/* end - ishizaki */
+
+		if (StrChangeCount==0) {
+			StrChangeStart = CursorX;
+		}
+		StrChangeCount = StrChangeCount + (b2 == 0 ? 1 : 2);
+#if 0
+		{
+			char ba[128];
+			memcpy(ba, &CodeLine[0], _countof(ba)-1);
+			ba[127] = 0;
+			OutputDebugPrintf("A '%s'\n", ba);
+			wchar_t bb[128];
+			memcpy(bb, &CodeLineW[0], _countof(bb)-1);
+			bb[127] = 0;
+			OutputDebugPrintfW(L"W '%s'\n", bb);
+		}
+#endif
+	}
+
+#if 0
+	OutputDebugPrintf("BuffPutUnicode leave\n");
+#endif
+}
+
 BOOL CheckSelect(int x, int y)
 //  subroutine called by BuffUpdateRect
 {
@@ -2027,6 +2295,7 @@
 	}
 }
 
+// @@
 void BuffUpdateRect
   (int XStart, int YStart, int XEnd, int YEnd)
 // Display text in a rectangular region in the screen
@@ -2041,6 +2310,10 @@
 	LONG TmpPtr;
 	TCharAttr CurAttr, TempAttr;
 	BOOL CurSel, TempSel, Caret;
+	char bufA[128];
+	wchar_t bufW[128];
+	int lenW = 0;
+	int lenA = 0;
 
 	if (XStart >= WinOrgX+WinWidth) {
 		return;
@@ -2068,6 +2341,13 @@
 		YEnd = WinOrgY+WinHeight-1;
 	}
 
+#if 0
+	OutputDebugPrintf("BuffUpdateRect (%d,%d)-(%d,%d) [%d,%d]\n",
+					  XStart, YStart,
+					  XEnd, YEnd,
+					  XEnd - XStart + 1, YEnd - YStart + 1);
+#endif
+
 	TempAttr = DefCharAttr;
 	TempSel = FALSE;
 
@@ -2095,6 +2375,15 @@
 			CurAttr.Fore = AttrBuffFG[TmpPtr+i];
 			CurAttr.Back = AttrBuffBG[TmpPtr+i];
 			CurSel = CheckSelect(i,j);
+			{
+				bufA[lenA] = CodeBuff[TmpPtr + i];
+				lenA++;
+				wchar_t wc = CodeBuffW[TmpPtr + i];
+				if (wc != 0) {
+					bufW[lenW] = wc;
+					lenW++;
+				}
+			}
 			count = 1;
 			while ( (i+count <= IEnd) &&
 			        (CurAttr.Attr == (AttrBuff[TmpPtr+i+count] & ~ AttrKanji)) &&
@@ -2104,6 +2393,15 @@
 			        (CurSel==CheckSelect(i+count,j)) ||
 			        (i+count<NumOfColumns) &&
 			        ((AttrBuff[TmpPtr+i+count-1] & AttrKanji) != 0) ) {
+				{
+					bufA[lenA] = CodeBuff[TmpPtr + i + count];
+					lenA++;
+					wchar_t wc = CodeBuffW[TmpPtr + i + count];
+					if (wc != 0) {
+						bufW[lenW] = wc;
+						lenW++;
+					}
+				}
 				count++;
 			}
 
@@ -2112,7 +2410,22 @@
 				TempAttr = CurAttr;
 				TempSel = CurSel;
 			}
-			DispStr(&CodeBuff[TmpPtr+i],count,Y, &X);
+#if 1
+			{
+				OutputDebugPrintf("(%d,%d)[%d],%d\n", i, j - PageStart, count, CurAttr.Attr);
+				bufA[lenA] = 0;
+				OutputDebugPrintf("A[%d] '%s'\n", lenA, bufA);
+				bufW[lenW] = 0;
+				OutputDebugPrintfW(L"W[%d] '%s'\n", lenW, bufW);
+			}
+#endif
+			lenA = 0;
+			lenW = 0;
+#if defined(UNICODE_DISPLAY)
+			DispStrW(&CodeBuffW[TmpPtr + i], count, Y, &X);
+#else
+			DispStr(&CodeBuff[TmpPtr + i], count, Y, &X);
+#endif
 			i = i+count;
 		}
 		while (i<=IEnd);
@@ -2122,6 +2435,9 @@
 	if (Caret) {
 		CaretOn();
 	}
+#if 0
+	OutputDebugPrintf("BuffUpdateRect leave\n");
+#endif
 }
 
 void UpdateStr()
@@ -2159,7 +2475,11 @@
 			len++;
 		}
 		DispSetupDC(TempAttr, FALSE);
+#if defined(UNICODE_DISPLAY)
+		DispStrW(&CodeLineW[StrChangeStart], len, Y, &X);
+#else
 		DispStr(&CodeLine[StrChangeStart], len, Y, &X);
+#endif
 
 		/* \x8Ec\x82\xE8\x82̕\xB6\x8E\x9A\x97񂪂\xA0\x82\xEA\x82΁A\x82ӂ‚\xA4\x82ɕ`\x89\xE6\x82\xF0\x8Ds\x82\xA4\x81B*/
 		if (len < StrChangeCount) {
@@ -2169,42 +2489,24 @@
 			TempAttr.Back = AttrLineBG[StrChangeStart + pos];
 
 			DispSetupDC(TempAttr, FALSE);
+#if defined(UNICODE_DISPLAY)
+			DispStrW(&CodeLineW[StrChangeStart + pos], (StrChangeCount - len), Y, &X);
+#else
 			DispStr(&CodeLine[StrChangeStart + pos], (StrChangeCount - len), Y, &X);
+#endif
 		}
 	} else {
 		DispSetupDC(TempAttr, FALSE);
+#if defined(UNICODE_DISPLAY)
+		DispStrW(&CodeLineW[StrChangeStart],StrChangeCount,Y, &X);
+#else
 		DispStr(&CodeLine[StrChangeStart],StrChangeCount,Y, &X);
+#endif
 	}
 
 	StrChangeCount = 0;
 }
 
-#if 0
-void UpdateStrUnicode(void)
-// Display not-yet-displayed string
-{
-  int X, Y;
-  TCharAttr TempAttr;
-
-  if (StrChangeCount==0) return;
-  X = StrChangeStart;
-  Y = CursorY;
-  if (! IsLineVisible(&X, &Y))
-  {
-    StrChangeCount = 0;
-    return;
-  }
-
-  TempAttr.Attr = AttrLine[StrChangeStart];
-  TempAttr.Attr2 = AttrLine2[StrChangeStart];
-  TempAttr.Fore = AttrLineFG[StrChangeStart];
-  TempAttr.Back = AttrLineBG[StrChangeStart];
-  DispSetupDC(TempAttr, FALSE);
-  DispStr(&CodeLine[StrChangeStart],StrChangeCount,Y, &X);
-  StrChangeCount = 0;
-}
-#endif
-
 void MoveCursor(int Xnew, int Ynew)
 {
 	UpdateStr();
@@ -2264,6 +2566,7 @@
 		for (i = CursorBottom-1 ; i >= CursorTop ; i--) {
 			SrcPtr = PrevLinePtr(DestPtr);
 			memcpy(&(CodeBuff[DestPtr]), &(CodeBuff[SrcPtr]), linelen);
+			memcpyW(&(CodeBuffW[DestPtr]), &(CodeBuffW[SrcPtr]), linelen);
 			memcpy(&(AttrBuff[DestPtr]), &(AttrBuff[SrcPtr]), linelen);
 			memcpy(&(AttrBuff2[DestPtr]), &(AttrBuff2[SrcPtr]), linelen);
 			memcpy(&(AttrBuffFG[DestPtr]), &(AttrBuffFG[SrcPtr]), linelen);
@@ -2271,6 +2574,7 @@
 			DestPtr = SrcPtr;
 		}
 		memset(&(CodeBuff[SrcPtr]), 0x20, linelen);
+		memsetW(&(CodeBuffW[SrcPtr]), 0x20, linelen);
 		memset(&(AttrBuff[SrcPtr]), AttrDefault, linelen);
 		memset(&(AttrBuff2[SrcPtr]), CurCharAttr.Attr2 & Attr2ColorMask, linelen);
 		memset(&(AttrBuffFG[SrcPtr]), CurCharAttr.Fore, linelen);
@@ -2335,6 +2639,7 @@
 			SrcPtr = GetLinePtr(PageStart+CursorTop+n) + (LONG)CursorLeftM;
 			for (i = CursorTop+n ; i<=CursorBottom ; i++) {
 				memmove(&(CodeBuff[DestPtr]), &(CodeBuff[SrcPtr]), linelen);
+				memmoveW(&(CodeBuffW[DestPtr]), &(CodeBuffW[SrcPtr]), linelen);
 				memmove(&(AttrBuff[DestPtr]), &(AttrBuff[SrcPtr]), linelen);
 				memmove(&(AttrBuff2[DestPtr]), &(AttrBuff2[SrcPtr]), linelen);
 				memmove(&(AttrBuffFG[DestPtr]), &(AttrBuffFG[SrcPtr]), linelen);
@@ -2348,6 +2653,7 @@
 		}
 		for (i = CursorBottom+1-n ; i<=CursorBottom; i++) {
 			memset(&(CodeBuff[DestPtr]), 0x20, linelen);
+			memsetW(&(CodeBuffW[DestPtr]), 0x20, linelen);
 			memset(&(AttrBuff[DestPtr]), AttrDefault, linelen);
 			memset(&(AttrBuff2[DestPtr]), CurCharAttr.Attr2 & Attr2ColorMask, linelen);
 			memset(&(AttrBuffFG[DestPtr]), CurCharAttr.Fore, linelen);
@@ -2396,6 +2702,7 @@
 			SrcPtr = GetLinePtr(PageStart+CursorTop+n) + CursorLeftM;
 			for (i = CursorTop+n ; i<=CursorBottom ; i++) {
 				memmove(&(CodeBuff[DestPtr]), &(CodeBuff[SrcPtr]), linelen);
+				memmoveW(&(CodeBuffW[DestPtr]), &(CodeBuffW[SrcPtr]), linelen);
 				memmove(&(AttrBuff[DestPtr]), &(AttrBuff[SrcPtr]), linelen);
 				memmove(&(AttrBuff2[DestPtr]), &(AttrBuff2[SrcPtr]), linelen);
 				memmove(&(AttrBuffFG[DestPtr]), &(AttrBuffFG[SrcPtr]), linelen);
@@ -2409,6 +2716,7 @@
 		}
 		for (i = CursorBottom+1-n ; i<=CursorBottom; i++) {
 			memset(&(CodeBuff[DestPtr]), 0x20, linelen);
+			memsetW(&(CodeBuffW[DestPtr]), 0x20, linelen);
 			memset(&(AttrBuff[DestPtr]), AttrDefault, linelen);
 			memset(&(AttrBuff2[DestPtr]), CurCharAttr.Attr2 & Attr2ColorMask, linelen);
 			memset(&(AttrBuffFG[DestPtr]), CurCharAttr.Fore, linelen);
@@ -2448,6 +2756,7 @@
 		SrcPtr = GetLinePtr(PageStart+CursorBottom-n) + CursorLeftM;
 		for (i=CursorBottom-n ; i>=CursorTop ; i--) {
 			memmove(&(CodeBuff[DestPtr]), &(CodeBuff[SrcPtr]), linelen);
+			memmoveW(&(CodeBuffW[DestPtr]), &(CodeBuffW[SrcPtr]), linelen);
 			memmove(&(AttrBuff[DestPtr]), &(AttrBuff[SrcPtr]), linelen);
 			memmove(&(AttrBuff2[DestPtr]), &(AttrBuff2[SrcPtr]), linelen);
 			memmove(&(AttrBuffFG[DestPtr]), &(AttrBuffFG[SrcPtr]), linelen);
@@ -2461,6 +2770,7 @@
 	}
 	for (i = CursorTop+n-1; i>=CursorTop; i--) {
 		memset(&(CodeBuff[DestPtr]), 0x20, linelen);
+		memsetW(&(CodeBuffW[DestPtr]), 0x20, linelen);
 		memset(&(AttrBuff[DestPtr]), AttrDefault, linelen);
 		memset(&(AttrBuff2[DestPtr]), CurCharAttr.Attr2 & Attr2ColorMask, linelen);
 		memset(&(AttrBuffFG[DestPtr]), CurCharAttr.Fore, linelen);
@@ -3476,6 +3786,7 @@
 
 	NewLine(0);
 	memset(&CodeBuff[0],0x20,BufferSize);
+	memsetW(&CodeBuffW[0],0x20,BufferSize);
 	memset(&AttrBuff[0],AttrDefault,BufferSize);
 	memset(&AttrBuff2[0],CurCharAttr.Attr2 & Attr2ColorMask, BufferSize);
 	memset(&AttrBuffFG[0],CurCharAttr.Fore,BufferSize);
@@ -3700,6 +4011,7 @@
 void BuffSaveScreen()
 {
 	PCHAR CodeDest, AttrDest, AttrDest2, AttrDestFG, AttrDestBG;
+	wchar_t *CodeDestW;
 	LONG ScrSize;
 	LONG SrcPtr, DestPtr;
 	int i;
@@ -3706,12 +4018,13 @@
 
 	if (SaveBuff == NULL) {
 		ScrSize = NumOfColumns * NumOfLines;
-		if ((SaveBuff=GlobalAlloc(GMEM_MOVEABLE, ScrSize * 5)) != NULL) {
+		if ((SaveBuff=GlobalAlloc(GMEM_MOVEABLE, ScrSize * (5+2))) != NULL) {
 			if ((CodeDest=GlobalLock(SaveBuff)) != NULL) {
 				AttrDest = CodeDest + ScrSize;
 				AttrDest2 = AttrDest + ScrSize;
 				AttrDestFG = AttrDest2 + ScrSize;
 				AttrDestBG = AttrDestFG + ScrSize;
+				CodeDestW = (wchar_t *)(AttrDestBG + ScrSize);
 
 				SaveBuffX = NumOfColumns;
 				SaveBuffY = NumOfLines;
@@ -3721,6 +4034,7 @@
 
 				for (i=0; i<NumOfLines; i++) {
 					memcpy(&CodeDest[DestPtr], &CodeBuff[SrcPtr], NumOfColumns);
+					memcpyW(&CodeDestW[DestPtr], &CodeBuffW[SrcPtr], NumOfColumns);
 					memcpy(&AttrDest[DestPtr], &AttrBuff[SrcPtr], NumOfColumns);
 					memcpy(&AttrDest2[DestPtr], &AttrBuff2[SrcPtr], NumOfColumns);
 					memcpy(&AttrDestFG[DestPtr], &AttrBuffFG[SrcPtr], NumOfColumns);
@@ -3741,6 +4055,7 @@
 void BuffRestoreScreen()
 {
 	PCHAR CodeSrc, AttrSrc, AttrSrc2, AttrSrcFG, AttrSrcBG;
+	wchar_t *CodeSrcW;
 	LONG ScrSize;
 	LONG SrcPtr, DestPtr;
 	int i, CopyX, CopyY;
@@ -3753,6 +4068,7 @@
 			AttrSrc2 = AttrSrc + ScrSize;
 			AttrSrcFG = AttrSrc2 + ScrSize;
 			AttrSrcBG = AttrSrcFG + ScrSize;
+			CodeSrcW = (wchar_t *)(AttrSrcBG + ScrSize);
 
 			CopyX = (SaveBuffX > NumOfColumns) ? NumOfColumns : SaveBuffX;
 			CopyY = (SaveBuffY > NumOfLines) ? NumOfLines : SaveBuffY;
@@ -3762,6 +4078,7 @@
 
 			for (i=0; i<CopyY; i++) {
 				memcpy(&CodeBuff[DestPtr], &CodeSrc[SrcPtr], CopyX);
+				memcpyW(&CodeBuffW[DestPtr], &CodeSrcW[SrcPtr], CopyX);
 				memcpy(&AttrBuff[DestPtr], &AttrSrc[SrcPtr], CopyX);
 				memcpy(&AttrBuff2[DestPtr], &AttrSrc2[SrcPtr], CopyX);
 				memcpy(&AttrBuffFG[DestPtr], &AttrSrcFG[SrcPtr], CopyX);
@@ -3768,6 +4085,7 @@
 				memcpy(&AttrBuffBG[DestPtr], &AttrSrcBG[SrcPtr], CopyX);
 				if (AttrBuff[DestPtr+CopyX-1] & AttrKanji) {
 					CodeBuff[DestPtr+CopyX-1] = ' ';
+					CodeBuffW[DestPtr+CopyX-1] = ' ';
 					AttrBuff[DestPtr+CopyX-1] ^= AttrKanji;
 				}
 				SrcPtr += SaveBuffX;
@@ -3812,6 +4130,7 @@
 		for (j = TmpPtr + offset; j < TmpPtr + NumOfColumns - offset; j++) {
 			if (!(AttrBuff2[j] & Attr2Protect)) {
 				CodeBuff[j] = 0x20;
+				CodeBuffW[j] = 0x20;
 				AttrBuff[j] &= AttrSgrMask;
 			}
 		}
@@ -3850,6 +4169,7 @@
 		for (j = TmpPtr; j < TmpPtr + offset; j++) {
 			if (!(AttrBuff2[j] & Attr2Protect)) {
 				CodeBuff[j] = 0x20;
+				CodeBuffW[j] = 0x20;
 				AttrBuff[j] &= AttrSgrMask;
 			}
 		}
@@ -3890,6 +4210,7 @@
 		    ((AttrBuff[Ptr+XStart-1] & AttrKanji) != 0) &&
 		    ((AttrBuff2[Ptr+XStart-1] & Attr2Protect) == 0)) {
 			CodeBuff[Ptr+XStart-1] = 0x20;
+			CodeBuffW[Ptr+XStart-1] = 0x20;
 			AttrBuff[Ptr+XStart-1] &= AttrSgrMask;
 		}
 		if ((XStart+C<NumOfColumns) &&
@@ -3896,11 +4217,13 @@
 		    ((AttrBuff[Ptr+XStart+C-1] & AttrKanji) != 0) &&
 		    ((AttrBuff2[Ptr+XStart+C-1] & Attr2Protect) == 0)) {
 			CodeBuff[Ptr+XStart+C] = 0x20;
+			CodeBuffW[Ptr+XStart+C] = 0x20;
 			AttrBuff[Ptr+XStart+C] &= AttrSgrMask;
 		}
 		for (j=Ptr+XStart; j<Ptr+XStart+C; j++) {
 			if (!(AttrBuff2[j] & Attr2Protect)) {
 				CodeBuff[j] = 0x20;
+				CodeBuffW[j] = 0x20;
 				AttrBuff[j] &= AttrSgrMask;
 			}
 		}
@@ -3962,22 +4285,27 @@
 
 		if (AttrBuff[LPtr+CursorRightM] & AttrKanji) {
 			CodeBuff[LPtr+CursorRightM] = 0x20;
+			CodeBuffW[LPtr+CursorRightM] = 0x20;
 			AttrBuff[LPtr+CursorRightM] &= ~AttrKanji;
 			if (CursorRightM < NumOfColumns-1) {
 				CodeBuff[LPtr+CursorRightM+1] = 0x20;
+				CodeBuffW[LPtr+CursorRightM+1] = 0x20;
 			}
 		}
 
 		if (AttrBuff[Ptr+count-1] & AttrKanji) {
 			CodeBuff[Ptr+count] = 0x20;
+			CodeBuffW[Ptr+count] = 0x20;
 		}
 
 		if (CursorLeftM > 0 && AttrBuff[Ptr-1] & AttrKanji) {
 			CodeBuff[Ptr-1] = 0x20;
+			CodeBuffW[Ptr-1] = 0x20;
 			AttrBuff[Ptr-1] &= ~AttrKanji;
 		}
 
 		memmove(&(CodeBuff[Ptr]),   &(CodeBuff[Ptr+count]),   MoveLen);
+		memmoveW(&(CodeBuffW[Ptr]),   &(CodeBuffW[Ptr+count]),   MoveLen);
 		memmove(&(AttrBuff[Ptr]),   &(AttrBuff[Ptr+count]),   MoveLen);
 		memmove(&(AttrBuff2[Ptr]),  &(AttrBuff2[Ptr+count]),  MoveLen);
 		memmove(&(AttrBuffFG[Ptr]), &(AttrBuffFG[Ptr+count]), MoveLen);
@@ -3984,6 +4312,7 @@
 		memmove(&(AttrBuffBG[Ptr]), &(AttrBuffBG[Ptr+count]), MoveLen);
 
 		memset(&(CodeBuff[Ptr+MoveLen]),   0x20,             count);
+		memsetW(&(CodeBuffW[Ptr+MoveLen]),   0x20,             count);
 		memset(&(AttrBuff[Ptr+MoveLen]),   AttrDefault,      count);
 		memset(&(AttrBuff2[Ptr+MoveLen]),  CurCharAttr.Attr2 & Attr2ColorMask, count);
 		memset(&(AttrBuffFG[Ptr+MoveLen]), CurCharAttr.Fore, count);
@@ -4009,15 +4338,19 @@
 
 		if (CursorRightM < NumOfColumns-1 && AttrBuff[LPtr+CursorRightM] & AttrKanji) {
 			CodeBuff[LPtr+CursorRightM+1] = 0x20;
+			CodeBuffW[LPtr+CursorRightM+1] = 0x20;
 		}
 
 		if (CursorLeftM > 0 && AttrBuff[Ptr-1] & AttrKanji) {
 			CodeBuff[Ptr-1] = 0x20;
+			CodeBuffW[Ptr-1] = 0x20;
 			AttrBuff[Ptr-1] &= ~AttrKanji;
 			CodeBuff[Ptr] = 0x20;
+			CodeBuffW[Ptr] = 0x20;
 		}
 
 		memmove(&(CodeBuff[Ptr+count]),   &(CodeBuff[Ptr]),   MoveLen);
+		memmoveW(&(CodeBuffW[Ptr+count]),   &(CodeBuffW[Ptr]),   MoveLen);
 		memmove(&(AttrBuff[Ptr+count]),   &(AttrBuff[Ptr]),   MoveLen);
 		memmove(&(AttrBuff2[Ptr+count]),  &(AttrBuff2[Ptr]),  MoveLen);
 		memmove(&(AttrBuffFG[Ptr+count]), &(AttrBuffFG[Ptr]), MoveLen);
@@ -4024,6 +4357,7 @@
 		memmove(&(AttrBuffBG[Ptr+count]), &(AttrBuffBG[Ptr]), MoveLen);
 
 		memset(&(CodeBuff[Ptr]),   0x20,             count);
+		memsetW(&(CodeBuffW[Ptr]),   0x20,             count);
 		memset(&(AttrBuff[Ptr]),   AttrDefault,      count);
 		memset(&(AttrBuff2[Ptr]),  CurCharAttr.Attr2 & Attr2ColorMask, count);
 		memset(&(AttrBuffFG[Ptr]), CurCharAttr.Fore, count);
@@ -4031,6 +4365,7 @@
 
 		if (AttrBuff[LPtr+CursorRightM] & AttrKanji) {
 			CodeBuff[LPtr+CursorRightM] = 0x20;
+			CodeBuffW[LPtr+CursorRightM] = 0x20;
 			AttrBuff[LPtr+CursorRightM] &= ~AttrKanji;
 		}
 

Modified: branches/cmake/teraterm/teraterm/buffer.h
===================================================================
--- branches/cmake/teraterm/teraterm/buffer.h	2019-03-10 14:32:59 UTC (rev 7471)
+++ branches/cmake/teraterm/teraterm/buffer.h	2019-03-10 14:33:21 UTC (rev 7472)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2005-2017 TeraTerm Project
+ * (C) 2005-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -63,9 +63,9 @@
 void BuffDumpCurrentLine(BYTE TERM);
 void BuffPutChar(BYTE b, TCharAttr Attr, BOOL Insert);
 void BuffPutKanji(WORD w, TCharAttr Attr, BOOL Insert);
+void BuffPutUnicode(unsigned int uc, TCharAttr Attr, BOOL Insert);
 void BuffUpdateRect(int XStart, int YStart, int XEnd, int YEnd);
 void UpdateStr();
-void UpdateStrUnicode(void);
 void MoveCursor(int Xnew, int Ynew);
 void MoveRight();
 void BuffSetCaretWidth();

Modified: branches/cmake/teraterm/teraterm/vtdisp.c
===================================================================
--- branches/cmake/teraterm/teraterm/vtdisp.c	2019-03-10 14:32:59 UTC (rev 7471)
+++ branches/cmake/teraterm/teraterm/vtdisp.c	2019-03-10 14:33:21 UTC (rev 7472)
@@ -2717,9 +2717,37 @@
   }
 }
 
-#if 1
-// \x93\x96\x96ʂ͂\xB1\x82\xBF\x82\xE7\x82̊֐\x94\x82\xF0\x8Eg\x82\xA4\x81B(2004.11.4 yutaka)
-void DispStr(PCHAR Buff, int Count, int Y, int* X)
+static void DrawTextBGImage(HDC hdcBGBuffer, int X, int Y, int width, int height)
+{
+	RECT  rect;
+	SetRect(&rect,0,0,width,height);
+
+	//\x91\x8B\x82̈ړ\xAE\x81A\x83\x8A\x83T\x83C\x83Y\x92\x86\x82͔w\x8Ci\x82\xF0 BGBrushInSizeMove \x82œh\x82\xE8\x82‚Ԃ\xB7
+	if(BGInSizeMove)
+		FillRect(hdcBGBuffer,&rect,BGBrushInSizeMove);
+
+	BitBlt(hdcBGBuffer,0,0,width,height,hdcBG,X,Y,SRCCOPY);
+
+	if(BGReverseText == TRUE)
+	{
+		if(BGReverseTextAlpha < 255)
+		{
+			BLENDFUNCTION bf;
+			HBRUSH hbr;
+
+			hbr = CreateSolidBrush(GetBkColor(hdcBGBuffer));
+			FillRect(hdcBGWork,&rect,hbr);
+			DeleteObject(hbr);
+
+			ZeroMemory(&bf,sizeof(bf));
+			bf.BlendOp             = AC_SRC_OVER;
+			bf.SourceConstantAlpha = BGReverseTextAlpha;
+
+			BGAlphaBlend(hdcBGBuffer,0,0,width,height,hdcBGWork,0,0,width,height,bf);
+		}
+	}
+}
+
 // Display a string
 //   Buff: points the string
 //   Y: vertical position in window cordinate
@@ -2726,159 +2754,124 @@
 //  *X: horizontal position
 // Return:
 //  *X: horizontal position shifted by the width of the string
+void DispStr(PCHAR Buff, int Count, int Y, int* X)
 {
-  RECT RText;
+#ifdef ALPHABLEND_TYPE2
+	const BOOL draw_bg_enable = BGEnable;
+#else
+	const BOOL draw_bg_enable = FALSE;
+#endif
 
-  if ((ts.Language==IdRussian) &&
-      (ts.RussClient!=ts.RussFont))
-    RussConvStr(ts.RussClient,ts.RussFont,Buff,Count);
+	if ((ts.Language==IdRussian) &&
+		(ts.RussClient!=ts.RussFont))
+		RussConvStr(ts.RussClient,ts.RussFont,Buff,Count);
 
-  RText.top = Y;
-  RText.bottom = Y+FontHeight;
-  RText.left = *X;
-  RText.right = *X + Count*FontWidth;
+	if(!draw_bg_enable)
+	{
+		RECT RText;
+		RText.top = Y;
+		RText.bottom = Y+FontHeight;
+		RText.left = *X;
+		RText.right = *X + Count*FontWidth;
 
+		ExtTextOutA(VTDC,*X+ts.FontDX,Y+ts.FontDY,
+					ETO_CLIPPED | ETO_OPAQUE,
+					&RText,Buff,Count,&Dx[0]);
+	}
 #ifdef ALPHABLEND_TYPE2
-//<!--by AKASI
-  if(!BGEnable)
-  {
-    ExtTextOutA(VTDC,*X+ts.FontDX,Y+ts.FontDY,
-               ETO_CLIPPED | ETO_OPAQUE,
-               &RText,Buff,Count,&Dx[0]);
-  }else{
+	else {
+		HFONT hPrevFont;
+		RECT  rect;
+		int   eto_options;
+		const int width  = Count*FontWidth;
+		const int height = FontHeight;
+		SetRect(&rect,0,0,width,height);
 
-    int   width;
-    int   height;
-    int   eto_options = ETO_CLIPPED;
-    RECT  rect;
-    HFONT hPrevFont;
+		//hdcBGBuffer \x82̑\xAE\x90\xAB\x82\xF0\x90ݒ\xE8
+		hPrevFont = SelectObject(hdcBGBuffer,GetCurrentObject(VTDC,OBJ_FONT));
+		SetTextColor(hdcBGBuffer,GetTextColor(VTDC));
+		SetBkColor(hdcBGBuffer,GetBkColor(VTDC));
 
-    width  = Count*FontWidth;
-    height = FontHeight;
-    SetRect(&rect,0,0,width,height);
+		// \x95\xB6\x8E\x9A\x82̔w\x8Ci\x82\xF0\x95`\x89\xE6
+		DrawTextBGImage(hdcBGBuffer, *X, Y, width, height);
 
-    //hdcBGBuffer \x82̑\xAE\x90\xAB\x82\xF0\x90ݒ\xE8
-    hPrevFont = SelectObject(hdcBGBuffer,GetCurrentObject(VTDC,OBJ_FONT));
-    SetTextColor(hdcBGBuffer,GetTextColor(VTDC));
-    SetBkColor(hdcBGBuffer,GetBkColor(VTDC));
+		// \x95\xB6\x8E\x9A\x82\xF0\x95`\x89\xE6
+		eto_options = ETO_CLIPPED;
+		if(BGReverseText == TRUE && BGReverseTextAlpha < 255) {
+			eto_options |= ETO_OPAQUE;
+		}
+		ExtTextOutA(hdcBGBuffer,ts.FontDX,ts.FontDY,eto_options,&rect,Buff,Count,&Dx[0]);
 
-    //\x91\x8B\x82̈ړ\xAE\x81A\x83\x8A\x83T\x83C\x83Y\x92\x86\x82͔w\x8Ci\x82\xF0 BGBrushInSizeMove \x82œh\x82\xE8\x82‚Ԃ\xB7
-    if(BGInSizeMove)
-      FillRect(hdcBGBuffer,&rect,BGBrushInSizeMove);
+		// Window\x82ɓ\\x82\xE8\x95t\x82\xAF
+		BitBlt(VTDC,*X,Y,width,height,hdcBGBuffer,0,0,SRCCOPY);
 
-    BitBlt(hdcBGBuffer,0,0,width,height,hdcBG,*X,Y,SRCCOPY);
+		SelectObject(hdcBGBuffer,hPrevFont);
+	}
+#endif
 
-    if(BGReverseText == TRUE)
-    {
-      if(BGReverseTextAlpha < 255)
-      {
-        BLENDFUNCTION bf;
-        HBRUSH hbr;
+	*X += Count*FontWidth;
 
-        hbr = CreateSolidBrush(GetBkColor(hdcBGBuffer));
-        FillRect(hdcBGWork,&rect,hbr);
-        DeleteObject(hbr);
-
-        ZeroMemory(&bf,sizeof(bf));
-        bf.BlendOp             = AC_SRC_OVER;
-        bf.SourceConstantAlpha = BGReverseTextAlpha;
-
-        BGAlphaBlend(hdcBGBuffer,0,0,width,height,hdcBGWork,0,0,width,height,bf);
-      }else{
-        eto_options |= ETO_OPAQUE;
-      }
-    }
-
-    ExtTextOutA(hdcBGBuffer,ts.FontDX,ts.FontDY,eto_options,&rect,Buff,Count,&Dx[0]);
-    BitBlt(VTDC,*X,Y,width,height,hdcBGBuffer,0,0,SRCCOPY);
-
-    SelectObject(hdcBGBuffer,hPrevFont);
-  }
-//-->
-#else
-  ExtTextOut(VTDC,*X+ts.FontDX,Y+ts.FontDY,
-             ETO_CLIPPED | ETO_OPAQUE,
-             &RText,Buff,Count,&Dx[0]);
-#endif
-  *X = RText.right;
-
-  if ((ts.Language==IdRussian) &&
-      (ts.RussClient!=ts.RussFont))
-    RussConvStr(ts.RussFont,ts.RussClient,Buff,Count);
+	if ((ts.Language==IdRussian) && (ts.RussClient!=ts.RussFont))
+		RussConvStr(ts.RussFont,ts.RussClient,Buff,Count);
 }
 
+// DispStr() \x82\xCC wchar_t\x94\xC5
+#if defined(UNICODE)
+void DispStrW(const wchar_t *Buff, int Count, int Y, int* X)
+{
+#ifdef ALPHABLEND_TYPE2
+	const BOOL draw_bg_enable = BGEnable;
 #else
-void DispStr(PCHAR Buff, int Count, int Y, int* X)
-// Display a string
-//   Buff: points the string
-//   Y: vertical position in window cordinate
-//  *X: horizontal position
-// Return:
-//  *X: horizontal position shifted by the width of the string
-{
-	RECT RText;
-	wchar_t *wc;
-	int len, wclen;
-	CHAR ch;
-
-#if 0
-#include <crtdbg.h>
-	_CrtSetBreakAlloc(52);
-	Buff[0] = 0x82;
-	Buff[1] = 0xe4;
-	Buff[2] = 0x82;
-	Buff[3] = 0xbd;
-	Buff[4] = 0x82;
-	Buff[5] = 0xa9;
-	Count = 6;
+	const BOOL draw_bg_enable = FALSE;
 #endif
 
-	setlocale(LC_ALL, ts.Locale);	// TODO \x83R\x81[\x83h\x95ϊ\xB7\x82\xB1\x82\xB1\x82ł\xB7\x82\xE9?,\x96\xB3\x8C\x{27B0B3}\x82ꂽ\x83R\x81[\x83h
+	if(!draw_bg_enable)
+	{
+		RECT RText;
+		RText.top = Y;
+		RText.bottom = Y+FontHeight;
+		RText.left = *X;
+		RText.right = *X + Count*FontWidth;
 
-	ch = Buff[Count];
-	Buff[Count] = 0;
-	len = mbstowcs(NULL, Buff, 0);
+		ExtTextOutW(VTDC,*X+ts.FontDX,Y+ts.FontDY,
+					ETO_CLIPPED | ETO_OPAQUE,
+					&RText,Buff,Count,&Dx[0]);
+	}
+#ifdef ALPHABLEND_TYPE2
+	else {
+		HFONT hPrevFont;
+		RECT  rect;
+		int   eto_options;
+		const int width  = Count*FontWidth;
+		const int height = FontHeight;
+		SetRect(&rect,0,0,width,height);
 
-	wc = malloc(sizeof(wchar_t) * (len + 1));
-	if (wc == NULL)
-		return;
-	wclen = mbstowcs(wc, Buff, len + 1);
-	Buff[Count] = ch;
+		//hdcBGBuffer \x82̑\xAE\x90\xAB\x82\xF0\x90ݒ\xE8
+		hPrevFont = SelectObject(hdcBGBuffer,GetCurrentObject(VTDC,OBJ_FONT));
+		SetTextColor(hdcBGBuffer,GetTextColor(VTDC));
+		SetBkColor(hdcBGBuffer,GetBkColor(VTDC));
 
-	if ((ts.Language==IdRussian) &&
-		(ts.RussClient!=ts.RussFont))
-		RussConvStr(ts.RussClient,ts.RussFont,Buff,Count);
+		// \x95\xB6\x8E\x9A\x82̔w\x8Ci\x82\xF0\x95`\x89\xE6
+		DrawTextBGImage(hdcBGBuffer, *X, Y, width, height);
 
-	RText.top = Y;
-	RText.bottom = Y+FontHeight;
-	RText.left = *X;
-	RText.right = *X + Count*FontWidth; //
+		// \x95\xB6\x8E\x9A\x82\xF0\x95`\x89\xE6
+		eto_options = ETO_CLIPPED;
+		if(BGReverseText == TRUE && BGReverseTextAlpha < 255) {
+			eto_options |= ETO_OPAQUE;
+		}
+		ExtTextOutW(hdcBGBuffer,ts.FontDX,ts.FontDY,eto_options,&rect,Buff,Count,&Dx[0]);
 
-	// Unicode\x82ŏo\x97͂\xB7\x82\xE9\x81B
-#if 1
-	// UTF-8\x8A‹\xAB\x82ɂ\xA8\x82\xA2\x82āAtcsh\x82\xAAEUC\x8Fo\x97͂\xB5\x82\xBD\x8Fꍇ\x81A\x89\xE6\x96ʂɉ\xBD\x82\xE0\x95\\x8E\xA6\x82\xB3\x82\xEA\x82Ȃ\xA2\x82\xB1\x82Ƃ\xAA\x82\xA0\x82\xE9\x81B
-	// \x83}\x83E\x83X\x82Ńh\x83\x89\x83b\x83O\x82\xB5\x82\xBD\x82\xE8\x81A\x83\x8D\x83O\x83t\x83@\x83C\x83\x8B\x82֕ۑ\xB6\x82\xB5\x82Ă݂\xE9\x82ƁA\x95\xB6\x8E\x9A\x89\xBB\x82\xAF\x82\xB5\x82\xBD\x95\xB6\x8E\x9A\x97\xF1\x82\xF0
-	// \x8Am\x94F\x82\xB7\x82邱\x82Ƃ\xAA\x82ł\xAB\x82\xE9\x81B(2004.8.6 yutaka)
-	ExtTextOutW(VTDC,*X+ts.FontDX,Y+ts.FontDY,
-		ETO_CLIPPED | ETO_OPAQUE,
-		&RText, wc, wclen, NULL);
-//		&RText, wc, wclen, &Dx[0]);
-#else
-	TextOutW(VTDC, *X+ts.FontDX, Y+ts.FontDY, wc, wclen);
+		// Window\x82ɓ\\x82\xE8\x95t\x82\xAF
+		BitBlt(VTDC,*X,Y,width,height,hdcBGBuffer,0,0,SRCCOPY);
 
+		SelectObject(hdcBGBuffer,hPrevFont);
+	}
 #endif
 
-	*X = RText.right;
-
-	if ((ts.Language==IdRussian) &&
-		(ts.RussClient!=ts.RussFont))
-		RussConvStr(ts.RussFont,ts.RussClient,Buff,Count);
-
-	free(wc);
+	*X += Count*FontWidth;
 }
 #endif
 
-
 void DispEraseCurToEnd(int YEnd)
 {
   RECT R;

Modified: branches/cmake/teraterm/teraterm/vtdisp.h
===================================================================
--- branches/cmake/teraterm/teraterm/vtdisp.h	2019-03-10 14:32:59 UTC (rev 7471)
+++ branches/cmake/teraterm/teraterm/vtdisp.h	2019-03-10 14:33:21 UTC (rev 7472)
@@ -80,6 +80,7 @@
 void DispReleaseDC();
 void DispSetupDC(TCharAttr Attr, BOOL Reverse);
 void DispStr(PCHAR Buff, int Count, int Y, int* X);
+void DispStrW(const wchar_t *Buff, int Count, int Y, int* X);
 void DispEraseCurToEnd(int YEnd);
 void DispEraseHomeToCur(int YHome);
 void DispEraseCharsInLine(int XStart, int Count);

Modified: branches/cmake/teraterm/teraterm/vtterm.c
===================================================================
--- branches/cmake/teraterm/teraterm/vtterm.c	2019-03-10 14:32:59 UTC (rev 7471)
+++ branches/cmake/teraterm/teraterm/vtterm.c	2019-03-10 14:33:21 UTC (rev 7472)
@@ -662,7 +662,8 @@
 	else
 		CharAttrTmp.Attr |= CharAttr.Attr;
 
-	BuffPutChar(b, CharAttrTmp, InsertMode);
+	//BuffPutChar(b, CharAttrTmp, InsertMode);
+	BuffPutUnicode(b, CharAttrTmp, InsertMode);
 
 	if (CursorX == CursorRightM || CursorX >= NumOfColumns-1) {
 		UpdateStr();
@@ -849,7 +850,7 @@
 	}
 }
 
-void PrnParseControl(BYTE b) // printer mode
+static void PrnParseControl(BYTE b) // printer mode
 {
 	switch (b) {
 	case NUL:
@@ -898,7 +899,7 @@
 	WriteToPrnFile(b, TRUE);
 }
 
-void ParseControl(BYTE b)
+static void ParseControl(BYTE b)
 {
 	if (PrinterMode) { // printer mode
 		PrnParseControl(b);
@@ -5467,8 +5468,58 @@
 }
 
 // unicode(UTF-32,wchar_t)\x82\xF0\x83o\x83b\x83t\x83@\x82֏\x91\x82\xAB\x8D\x9E\x82\xDE
+// TODO @@
+#if defined(UNICODE_DISPLAY)
+// \x93\xE0\x95\x94\x83R\x81[\x83h unicode\x94\xC5
 static void UnicodeToCP932(unsigned int code)
 {
+	unsigned short cset;
+
+	TCharAttr CharAttrTmp;
+	CharAttrTmp = CharAttr;
+	if (code <= US) {
+		// C0
+		ParseControl(code);
+#if 0
+	} else if ((0x80<=code) && (code<=0x9F)) {
+		// C1
+		ParseControl(code);
+	} else if (code < 0x20) {
+		PutChar(code);
+#endif
+#if 0
+	} else if (code <= 0xff) {
+		PutChar(code);
+#endif
+	} else {
+		// Unicode\x82\xA9\x82\xE7DEC\x93\xC1\x8Eꕶ\x8E\x9A\x82ւ̃}\x83b\x83s\x83\x93\x83O
+		if (ts.UnicodeDecSpMapping) {
+			cset = UTF32ToDecSp(code);
+			if (((cset >> 8) & ts.UnicodeDecSpMapping) != 0) {
+				code = cset & 0xff;
+				CharAttrTmp.Attr |= AttrSpecial;
+			}
+		}
+
+		BuffPutUnicode(code, CharAttrTmp, InsertMode);
+		if (CursorX == CursorRightM || CursorX >= NumOfColumns - 1) {
+			UpdateStr();
+			Wrap = AutoWrapMode;
+		}
+		else {
+			if (code >= 0x80) {
+				MoveRight();
+			}
+			MoveRight();
+		}
+	}
+}
+
+#else
+
+// \x8F]\x97\x88\x94\xC5
+static void UnicodeToCP932(unsigned int code)
+{
 	int ret;
 	char mbchar[2];
 	unsigned short cset;
@@ -5512,9 +5563,28 @@
 	}
 }
 
+#endif
+
 // UTF-8\x82Ŏ\xF3\x90M\x83f\x81[\x83^\x82\xF0\x8F\x88\x97\x9D\x82\xB7\x82\xE9
+
+static BOOL ParseFirstUTF8Sub(BYTE b)
+{
+	if (b<=US)
+		ParseControl(b);
+	else if ((b>=0x20) && (b<=0x7E))
+		PutChar(b);
+	else if ((b>=0x80) && (b<=0x9F))
+		ParseControl(b);
+	else if (b>=0xA0)
+		PutChar(b);
+	return TRUE;
+}
+
+
+// UTF-8\x82Ŏ\xF3\x90M\x83f\x81[\x83^\x82\xF0\x8F\x88\x97\x9D\x82\xB7\x82\xE9
 // returns TRUE if b is processed
 //  (actually allways returns TRUE)
+// TODO:@@
 static BOOL ParseFirstUTF8(BYTE b, int proc_combining)
 {
 	static BYTE buf[4];
@@ -5540,10 +5610,14 @@
 			}
 
 			if (count == 1) {
-				ParseASCII(buf[0]);
+				ParseFirstUTF8Sub(buf[0]);
+				//ParseASCII(buf[0]);
+
 			}
-			ParseASCII(b);
+			//ParseASCII(b);
 
+			ParseFirstUTF8Sub(b);
+			//UnicodeToCP932(b);
 			count = 0;  // reset counter
 			return TRUE;
 		}

From scmnotify ＠ osdn.net  Sun Mar 10 23:33:44 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sun, 10 Mar 2019 23:33:44 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0NzNdIHVuaWNvZGXlhaXlipvlr77lv5w=?=
Message-ID: <1552228424.054840.11573.nullmailer@users.osdn.me>

Revision: 7473
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7473
Author:   zmatsuo
Date:     2019-03-10 23:33:43 +0900 (Sun, 10 Mar 2019)
Log Message:
-----------
unicode入力対応

Modified Paths:
--------------
    branches/cmake/teraterm/ttpcmn/ttcmn.c

-------------- next part --------------
Modified: branches/cmake/teraterm/ttpcmn/ttcmn.c
===================================================================
--- branches/cmake/teraterm/ttpcmn/ttcmn.c	2019-03-10 14:33:21 UTC (rev 7472)
+++ branches/cmake/teraterm/ttpcmn/ttcmn.c	2019-03-10 14:33:43 UTC (rev 7473)
@@ -1931,6 +1931,109 @@
  */
 int WINAPI CommTextOutW(PComVar cv, const wchar_t *B, int C)
 {
+#if 1
+	if (cv->KanjiCodeSend == IdUTF8 || cv->Language == IdUtf8) {
+		int i, TempLen;
+		char TempStr[12];
+		wchar_t d;
+		BOOL Full;
+
+		Full = FALSE;
+		i = 0;
+		while (! Full && (i < C)) {
+			TempLen = 0;
+			d = B[i];
+
+			if (d==CR) {
+				TempStr[TempLen++] = 0x0d;
+				if (cv->CRSend==IdCRLF) {
+					TempStr[TempLen++] = 0x0a;
+				}
+				else if ((cv->CRSend ==IdCR) &&
+						 cv->TelFlag && ! cv->TelBinSend) {
+					TempStr[TempLen++] = 0;
+				}
+				else if (cv->CRSend == IdLF) {
+					TempStr[TempLen-1] = 0x0a;
+				}
+				if (cv->TelLineMode) {
+					cv->Flush = TRUE;
+				}
+			}
+			else if (d== BS) {
+				if (cv->TelLineMode) {
+					if (cv->FlushLen < cv->LineModeBuffCount) {
+						cv->LineModeBuffCount--;
+					}
+				}
+				else {
+					TempStr[TempLen++] = BS;
+				}
+			}
+			else if (d==0x15) { // ctrl-u
+				if (cv->TelLineMode) {
+					cv->LineModeBuffCount = cv->FlushLen;
+				}
+				else {
+					TempStr[TempLen++] = 0x15;
+				}
+			}
+			else if (d>=0x80) {
+				unsigned int u32;
+				size_t u16_len = UTF16ToUTF32(&B[i], C - i, &u32);
+				if (u16_len == 0) {
+					// \x83f\x83R\x81[\x83h\x82ł\xAB\x82Ȃ\xA2\x95\xB6\x8E\x9A
+					TempStr[0] = '?';
+					TempLen = 1;
+					i++;
+				} else {
+					size_t utf8_len = sizeof(TempStr);
+					utf8_len = UTF32ToUTF8(u32, TempStr, utf8_len);
+					TempLen += utf8_len;
+					i += u16_len;
+				}
+			}
+
+			if (cv->TelLineMode) {
+				if (TempLen > 0) {
+					Full = OutBuffSize - cv->LineModeBuffCount - TempLen < 0;
+					if (!Full) {
+						memcpy(&(cv->LineModeBuff[cv->LineModeBuffCount]), TempStr, TempLen);
+						cv->LineModeBuffCount += TempLen;
+						if (cv->Flush) {
+							cv->FlushLen = cv->LineModeBuffCount;
+						}
+					} else {
+						// !?
+						assert(FALSE);
+					}
+				}
+				if (cv->FlushLen > 0) {
+					int OutLen = CommRawOut(cv, cv->LineModeBuff, cv->FlushLen);
+					cv->FlushLen -= OutLen;
+					cv->LineModeBuffCount -= OutLen;
+					memmove(cv->LineModeBuff, &(cv->LineModeBuff[OutLen]), cv->LineModeBuffCount);
+				}
+				cv->Flush = FALSE;
+			}
+			else {
+				if (TempLen > 0) {
+					Full = OutBuffSize -cv->OutBuffCount -TempLen < 0;
+					if (! Full) {
+						CommRawOut(cv,TempStr,TempLen);
+					} else {
+						// !?
+						assert(FALSE);
+					}
+				}
+			}
+
+		} // end of "while {}"
+
+		return i;
+	}
+#endif
+
 	int CodePage = *cv->CodePage;
 	size_t mb_len;
 	int r;

From scmnotify ＠ osdn.net  Sun Mar 10 23:34:06 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sun, 10 Mar 2019 23:34:06 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0NzRdIGNtYWtl44KSdXRmLTgrQk9N44Gr?=
 =?utf-8?b?5aSJ5o+b?=
Message-ID: <1552228446.369751.14363.nullmailer@users.osdn.me>

Revision: 7474
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7474
Author:   zmatsuo
Date:     2019-03-10 23:34:06 +0900 (Sun, 10 Mar 2019)
Log Message:
-----------
cmakeをutf-8+BOMに変換

Modified Paths:
--------------
    branches/cmake/TTProxy/CMakeLists.txt
    branches/cmake/TTXKanjiMenu/CMakeLists.txt
    branches/cmake/TTXSamples/TTXAdditionalTitle/CMakeLists.txt
    branches/cmake/TTXSamples/TTXAlwaysOnTop/CMakeLists.txt
    branches/cmake/TTXSamples/TTXCommandLineOpt/CMakeLists.txt
    branches/cmake/TTXSamples/TTXRecurringCommand/CMakeLists.txt
    branches/cmake/TTXSamples/TTXttyrec/CMakeLists.txt
    branches/cmake/teraterm/ttpdlg/CMakeLists.txt
    branches/cmake/teraterm/ttpfile/CMakeLists.txt
    branches/cmake/teraterm/ttpmacro/CMakeLists.txt
    branches/cmake/teraterm/ttpset/CMakeLists.txt

-------------- next part --------------
Modified: branches/cmake/TTProxy/CMakeLists.txt
===================================================================
--- branches/cmake/TTProxy/CMakeLists.txt	2019-03-10 14:33:43 UTC (rev 7473)
+++ branches/cmake/TTProxy/CMakeLists.txt	2019-03-10 14:34:06 UTC (rev 7474)
@@ -1,4 +1,4 @@
-project(ttproxy)
+project(ttproxy)
 
 if(USE_UNICODE_API)
   add_definitions(-DUNICODE -D_UNICODE)

Modified: branches/cmake/TTXKanjiMenu/CMakeLists.txt
===================================================================
--- branches/cmake/TTXKanjiMenu/CMakeLists.txt	2019-03-10 14:33:43 UTC (rev 7473)
+++ branches/cmake/TTXKanjiMenu/CMakeLists.txt	2019-03-10 14:34:06 UTC (rev 7474)
@@ -1,4 +1,4 @@
-project(ttxkanjimenu)
+project(ttxkanjimenu)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
 

Modified: branches/cmake/TTXSamples/TTXAdditionalTitle/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/TTXAdditionalTitle/CMakeLists.txt	2019-03-10 14:33:43 UTC (rev 7473)
+++ branches/cmake/TTXSamples/TTXAdditionalTitle/CMakeLists.txt	2019-03-10 14:34:06 UTC (rev 7474)
@@ -1,4 +1,4 @@
-project(TTXAdditionalTitle)
+project(TTXAdditionalTitle)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
 

Modified: branches/cmake/TTXSamples/TTXAlwaysOnTop/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/TTXAlwaysOnTop/CMakeLists.txt	2019-03-10 14:33:43 UTC (rev 7473)
+++ branches/cmake/TTXSamples/TTXAlwaysOnTop/CMakeLists.txt	2019-03-10 14:34:06 UTC (rev 7474)
@@ -1,4 +1,4 @@
-project(TTXAlwaysOnTop)
+project(TTXAlwaysOnTop)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
 

Modified: branches/cmake/TTXSamples/TTXCommandLineOpt/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/TTXCommandLineOpt/CMakeLists.txt	2019-03-10 14:33:43 UTC (rev 7473)
+++ branches/cmake/TTXSamples/TTXCommandLineOpt/CMakeLists.txt	2019-03-10 14:34:06 UTC (rev 7474)
@@ -1,4 +1,4 @@
-project(TTXCommandLineOpt)
+project(TTXCommandLineOpt)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
 

Modified: branches/cmake/TTXSamples/TTXRecurringCommand/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/TTXRecurringCommand/CMakeLists.txt	2019-03-10 14:33:43 UTC (rev 7473)
+++ branches/cmake/TTXSamples/TTXRecurringCommand/CMakeLists.txt	2019-03-10 14:34:06 UTC (rev 7474)
@@ -1,4 +1,4 @@
-project(TTXRecurringCommand)
+project(TTXRecurringCommand)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
 

Modified: branches/cmake/TTXSamples/TTXttyrec/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/TTXttyrec/CMakeLists.txt	2019-03-10 14:33:43 UTC (rev 7473)
+++ branches/cmake/TTXSamples/TTXttyrec/CMakeLists.txt	2019-03-10 14:34:06 UTC (rev 7474)
@@ -1,4 +1,4 @@
-project(TTXttyrec)
+project(TTXttyrec)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
 

Modified: branches/cmake/teraterm/ttpdlg/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/ttpdlg/CMakeLists.txt	2019-03-10 14:33:43 UTC (rev 7473)
+++ branches/cmake/teraterm/ttpdlg/CMakeLists.txt	2019-03-10 14:34:06 UTC (rev 7474)
@@ -1,4 +1,4 @@
-project(ttpdlg)
+project(ttpdlg)
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake)
 

Modified: branches/cmake/teraterm/ttpfile/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/ttpfile/CMakeLists.txt	2019-03-10 14:33:43 UTC (rev 7473)
+++ branches/cmake/teraterm/ttpfile/CMakeLists.txt	2019-03-10 14:34:06 UTC (rev 7474)
@@ -1,4 +1,4 @@
-project(ttpfile)
+project(ttpfile)
 
 if (MSVC)
     string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG            ${CMAKE_C_FLAGS_DEBUG})

Modified: branches/cmake/teraterm/ttpmacro/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/ttpmacro/CMakeLists.txt	2019-03-10 14:33:43 UTC (rev 7473)
+++ branches/cmake/teraterm/ttpmacro/CMakeLists.txt	2019-03-10 14:34:06 UTC (rev 7474)
@@ -1,4 +1,4 @@
-project(ttpmacro)
+project(ttpmacro)
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_SFMT.cmake)

Modified: branches/cmake/teraterm/ttpset/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/ttpset/CMakeLists.txt	2019-03-10 14:33:43 UTC (rev 7473)
+++ branches/cmake/teraterm/ttpset/CMakeLists.txt	2019-03-10 14:34:06 UTC (rev 7474)
@@ -1,4 +1,4 @@
-project(ttpset)
+project(ttpset)
 
 if (MSVC)
     string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG            ${CMAKE_C_FLAGS_DEBUG})

From scmnotify ＠ osdn.net  Sun Mar 10 23:34:42 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sun, 10 Mar 2019 23:34:42 +0900
Subject: [Ttssh2-commit] [7475] Merge branch 'trunk' r7467 into cmake
Message-ID: <1552228482.955944.14720.nullmailer@users.osdn.me>

Revision: 7475
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7475
Author:   zmatsuo
Date:     2019-03-10 23:34:42 +0900 (Sun, 10 Mar 2019)
Log Message:
-----------
Merge branch 'trunk' r7467 into cmake

# Conflicts:
#	CMakeLists.txt
#	TTProxy/CMakeLists.txt
#	TTXKanjiMenu/CMakeLists.txt
#	TTXSamples/TTXAdditionalTitle/CMakeLists.txt
#	TTXSamples/TTXAlwaysOnTop/CMakeLists.txt
#	TTXSamples/TTXCallSysMenu/CMakeLists.txt
#	TTXSamples/TTXCommandLineOpt/CMakeLists.txt
#	TTXSamples/TTXCopyIniFile/CMakeLists.txt
#	TTXSamples/TTXFixedWinSize/CMakeLists.txt
#	TTXSamples/TTXKcodeChange/CMakeLists.txt
#	TTXSamples/TTXOutputBuffering/CMakeLists.txt
#	TTXSamples/TTXRecurringCommand/CMakeLists.txt
#	TTXSamples/TTXResizeMenu/CMakeLists.txt
#	TTXSamples/TTXResizeWin/CMakeLists.txt
#	TTXSamples/TTXShowCommandLine/CMakeLists.txt
#	TTXSamples/TTXViewMode/CMakeLists.txt
#	TTXSamples/ttxtest/CMakeLists.txt
#	libs/build_library_with_cmake.md
#	libs/buildall_cmake.bat
#	libs/openssl.cmake
#	teraterm/CMakeLists.txt
#	teraterm/common/compat_win.cpp
#	teraterm/common/compat_win.h
#	teraterm/keycode/CMakeLists.txt
#	teraterm/teraterm/CMakeLists.txt
#	teraterm/teraterm/teraterm.cpp
#	teraterm/teraterm/ttime.h
#	teraterm/teraterm/vtdisp.c
#	teraterm/teraterm/vtterm.c
#	teraterm/teraterm/vtwin.cpp
#	teraterm/teraterm/vtwin.h
#	teraterm/ttpcmn/CMakeLists.txt
#	teraterm/ttpcmn/language.c
#	teraterm/ttpcmn/language.h
#	teraterm/ttpdlg/CMakeLists.txt
#	teraterm/ttpfile/CMakeLists.txt
#	teraterm/ttpmacro/CMakeLists.txt
#	teraterm/ttpset/CMakeLists.txt
#	teraterm/ttptek/CMakeLists.txt
#	ttpmenu/CMakeLists.txt
#	ttssh2/matcher/CMakeLists.txt
#	ttssh2/ttxssh/CMakeLists.txt

Revision Links:
--------------
    http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7467

Modified Paths:
--------------
    branches/cmake/CMakeLists.txt
    branches/cmake/TTProxy/CMakeLists.txt
    branches/cmake/doc/convtext.bat
    branches/cmake/doc/en/html/about/history.html
    branches/cmake/doc/ja/html/about/history.html
    branches/cmake/libs/build_library_with_cmake.md
    branches/cmake/libs/buildall_cmake.bat
    branches/cmake/libs/openssl.cmake
    branches/cmake/teraterm/common/compat_win.cpp
    branches/cmake/teraterm/common/compat_win.h
    branches/cmake/teraterm/keycode/CMakeLists.txt
    branches/cmake/teraterm/teraterm/CMakeLists.txt
    branches/cmake/teraterm/teraterm/buffer.c
    branches/cmake/teraterm/teraterm/teraterm.cpp
    branches/cmake/teraterm/teraterm/ttdialog.c
    branches/cmake/teraterm/teraterm/ttermpro.vcproj
    branches/cmake/teraterm/teraterm/vtdisp.c
    branches/cmake/teraterm/teraterm/vtdisp.h
    branches/cmake/teraterm/teraterm/vtterm.c
    branches/cmake/teraterm/teraterm/vtwin.cpp
    branches/cmake/teraterm/teraterm/vtwin.h
    branches/cmake/teraterm/ttpcmn/CMakeLists.txt
    branches/cmake/teraterm/ttpdlg/CMakeLists.txt
    branches/cmake/teraterm/ttpfile/CMakeLists.txt
    branches/cmake/teraterm/ttpmacro/CMakeLists.txt
    branches/cmake/teraterm/ttpset/CMakeLists.txt
    branches/cmake/teraterm/ttptek/CMakeLists.txt
    branches/cmake/ttssh2/matcher/CMakeLists.txt

Added Paths:
-----------
    branches/cmake/doc/Markdown_1.0.1/
    branches/cmake/doc/Markdown_1.0.1/License.text
    branches/cmake/doc/Markdown_1.0.1/Markdown Readme.text
    branches/cmake/doc/Markdown_1.0.1/Markdown.pl
    branches/cmake/doc/ja/html/reference/build_with_cmake.md
    branches/cmake/teraterm/common/dllutil.cpp
    branches/cmake/teraterm/common/dllutil.h
    branches/cmake/teraterm/ttpdlg/svnversion.h.in

-------------- next part --------------
Modified: branches/cmake/CMakeLists.txt
===================================================================
--- branches/cmake/CMakeLists.txt	2019-03-10 14:34:06 UTC (rev 7474)
+++ branches/cmake/CMakeLists.txt	2019-03-10 14:34:42 UTC (rev 7475)
@@ -13,9 +13,10 @@
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
-# _WIN32_WINNT_WIN10 0x0A00
+# _WIN32_WINNT_WIN10 0x0a00
 set(_WIN32_WINNT "0x0a00")
 if(MSVC)
+  # https://www.leeholmes.com/blog/2017/02/27/differences-between-visual-studio-2012-2013-and-2015/
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_WIN32_WINNT=${_WIN32_WINNT}")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D_WIN32_WINNT=${_WIN32_WINNT}")
   string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
@@ -24,9 +25,11 @@
   string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_CRT_SECURE_NO_DEPRECATE /W3")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D_CRT_SECURE_NO_DEPRECATE /W3")
+  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GF /Gy")
+  set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /GF /Gy")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP")
   if(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP")
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /ZI")
     set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /ZI")
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")
@@ -35,8 +38,10 @@
 elseif(MINGW)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WIN32_WINNT=${_WIN32_WINNT}")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_WIN32_WINNT=${_WIN32_WINNT}")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -static -ffunction-sections -fdata-sections ${C_ONLY_FLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-parameter -static -ffunction-sections -fdata-sections")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra "
+    "-Wno-unused-parameter -static -ffunction-sections -fdata-sections ${C_ONLY_FLAGS}")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra "
+    "-Wno-unused-parameter -static -ffunction-sections -fdata-sections")
   if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static-libgcc -static-libstdc++")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++")

Modified: branches/cmake/TTProxy/CMakeLists.txt
===================================================================
--- branches/cmake/TTProxy/CMakeLists.txt	2019-03-10 14:34:06 UTC (rev 7474)
+++ branches/cmake/TTProxy/CMakeLists.txt	2019-03-10 14:34:42 UTC (rev 7475)
@@ -15,6 +15,7 @@
 
 set(COMMON_SRC
   ../teraterm/common/ttlib.h
+  ../teraterm/common/ttlib.c
   ../teraterm/common/i18n.h
   ../teraterm/common/ttplugin.h
   ../teraterm/common/tttypes.h
@@ -96,12 +97,14 @@
   ${YCL_SRC}
   )
 
-set_target_properties(
-  ttproxy
-  PROPERTIES
-  PREFIX ""
-  OUTPUT_NAME "TTXProxy"
-  )
+if(MINGW)
+  set_target_properties(
+    ttproxy
+    PROPERTIES
+    PREFIX ""
+    OUTPUT_NAME "TTXProxy"
+    )
+endif()
 
 target_link_libraries(
   ttproxy
@@ -112,5 +115,3 @@
   gdi32
   comdlg32
   )
-
-

Added: branches/cmake/doc/Markdown_1.0.1/License.text
===================================================================
--- branches/cmake/doc/Markdown_1.0.1/License.text	                        (rev 0)
+++ branches/cmake/doc/Markdown_1.0.1/License.text	2019-03-10 14:34:42 UTC (rev 7475)
@@ -0,0 +1,30 @@
+Copyright (c) 2004, John Gruber  
+<http://daringfireball.net/>  
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+
+* Neither the name "Markdown" nor the names of its contributors may
+  be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+This software is provided by the copyright holders and contributors "as
+is" and any express or implied warranties, including, but not limited
+to, the implied warranties of merchantability and fitness for a
+particular purpose are disclaimed. In no event shall the copyright owner
+or contributors be liable for any direct, indirect, incidental, special,
+exemplary, or consequential damages (including, but not limited to,
+procurement of substitute goods or services; loss of use, data, or
+profits; or business interruption) however caused and on any theory of
+liability, whether in contract, strict liability, or tort (including
+negligence or otherwise) arising in any way out of the use of this
+software, even if advised of the possibility of such damage.

Added: branches/cmake/doc/Markdown_1.0.1/Markdown Readme.text
===================================================================
--- branches/cmake/doc/Markdown_1.0.1/Markdown Readme.text	                        (rev 0)
+++ branches/cmake/doc/Markdown_1.0.1/Markdown Readme.text	2019-03-10 14:34:42 UTC (rev 7475)
@@ -0,0 +1,341 @@
+Markdown
+========
+
+Version 1.0.1 - Tue 14 Dec 2004
+
+by John Gruber  
+<http://daringfireball.net/>
+
+
+Introduction
+------------
+
+Markdown is a text-to-HTML conversion tool for web writers. Markdown
+allows you to write using an easy-to-read, easy-to-write plain text
+format, then convert it to structurally valid XHTML (or HTML).
+
+Thus, "Markdown" is two things: a plain text markup syntax, and a
+software tool, written in Perl, that converts the plain text markup 
+to HTML.
+
+Markdown works both as a Movable Type plug-in and as a standalone Perl
+script -- which means it can also be used as a text filter in BBEdit
+(or any other application that supporst filters written in Perl).
+
+Full documentation of Markdown's syntax and configuration options is
+available on the web: <http://daringfireball.net/projects/markdown/>.
+(Note: this readme file is formatted in Markdown.)
+
+
+
+Installation and Requirements
+-----------------------------
+
+Markdown requires Perl 5.6.0 or later. Welcome to the 21st Century.
+Markdown also requires the standard Perl library module `Digest::MD5`. 
+
+
+### Movable Type ###
+
+Markdown works with Movable Type version 2.6 or later (including 
+MT 3.0 or later).
+
+1.  Copy the "Markdown.pl" file into your Movable Type "plugins"
+    directory. The "plugins" directory should be in the same directory
+    as "mt.cgi"; if the "plugins" directory doesn't already exist, use
+    your FTP program to create it. Your installation should look like
+    this:
+
+        (mt home)/plugins/Markdown.pl
+
+2.  Once installed, Markdown will appear as an option in Movable Type's
+    Text Formatting pop-up menu. This is selectable on a per-post basis.
+    Markdown translates your posts to HTML when you publish; the posts
+    themselves are stored in your MT database in Markdown format.
+
+3.  If you also install SmartyPants 1.5 (or later), Markdown will offer
+    a second text formatting option: "Markdown with SmartyPants". This
+    option is the same as the regular "Markdown" formatter, except that
+    automatically uses SmartyPants to create typographically correct
+    curly quotes, em-dashes, and ellipses. See the SmartyPants web page
+    for more information: <http://daringfireball.net/projects/smartypants/>
+
+4.  To make Markdown (or "Markdown with SmartyPants") your default
+    text formatting option for new posts, go to Weblog Config ->
+    Preferences.
+
+Note that by default, Markdown produces XHTML output. To configure
+Markdown to produce HTML 4 output, see "Configuration", below.
+
+
+### Blosxom ###
+
+Markdown works with Blosxom version 2.x.
+
+1.  Rename the "Markdown.pl" plug-in to "Markdown" (case is
+    important). Movable Type requires plug-ins to have a ".pl"
+    extension; Blosxom forbids it.
+
+2.  Copy the "Markdown" plug-in file to your Blosxom plug-ins folder.
+    If you're not sure where your Blosxom plug-ins folder is, see the
+    Blosxom documentation for information.
+
+3.  That's it. The entries in your weblog will now automatically be
+    processed by Markdown.
+
+4.  If you'd like to apply Markdown formatting only to certain posts,
+    rather than all of them, see Jason Clark's instructions for using
+    Markdown in conjunction with Blosxom's Meta plugin:
+    
+    <http://jclark.org/weblog/WebDev/Blosxom/Markdown.html>
+
+
+### BBEdit ###
+
+Markdown works with BBEdit 6.1 or later on Mac OS X. (It also works
+with BBEdit 5.1 or later and MacPerl 5.6.1 on Mac OS 8.6 or later.)
+
+1.  Copy the "Markdown.pl" file to appropriate filters folder in your
+    "BBEdit Support" folder. On Mac OS X, this should be:
+
+        BBEdit Support/Unix Support/Unix Filters/
+
+    See the BBEdit documentation for more details on the location of
+    these folders.
+
+    You can rename "Markdown.pl" to whatever you wish.
+
+2.  That's it. To use Markdown, select some text in a BBEdit document,
+    then choose Markdown from the Filters sub-menu in the "#!" menu, or
+    the Filters floating palette
+
+
+
+Configuration
+-------------
+
+By default, Markdown produces XHTML output for tags with empty elements.
+E.g.:
+
+    <br />
+
+Markdown can be configured to produce HTML-style tags; e.g.:
+
+    <br>
+
+
+### Movable Type ###
+
+You need to use a special `MTMarkdownOptions` container tag in each
+Movable Type template where you want HTML 4-style output:
+
+    <MTMarkdownOptions output='html4'>
+        ... put your entry content here ...
+    </MTMarkdownOptions>
+
+The easiest way to use MTMarkdownOptions is probably to put the
+opening tag right after your `<body>` tag, and the closing tag right
+before `</body>`.
+
+To suppress Markdown processing in a particular template, i.e. to
+publish the raw Markdown-formatted text without translation into
+(X)HTML, set the `output` attribute to 'raw':
+
+    <MTMarkdownOptions output='raw'>
+        ... put your entry content here ...
+    </MTMarkdownOptions>
+
+
+### Command-Line ###
+
+Use the `--html4tags` command-line switch to produce HTML output from a
+Unix-style command line. E.g.:
+
+    % perl Markdown.pl --html4tags foo.text
+
+Type `perldoc Markdown.pl`, or read the POD documentation within the
+Markdown.pl source code for more information.
+
+
+
+Bugs
+----
+
+To file bug reports or feature requests please send email to:
+<markdown ＠ daringfireball.net>.
+
+
+
+Version History
+---------------
+
+1.0.1 (14 Dec 2004):
+
++	Changed the syntax rules for code blocks and spans. Previously,
+	backslash escapes for special Markdown characters were processed
+	everywhere other than within inline HTML tags. Now, the contents
+	of code blocks and spans are no longer processed for backslash
+	escapes. This means that code blocks and spans are now treated
+	literally, with no special rules to worry about regarding
+	backslashes.
+
+	**NOTE**: This changes the syntax from all previous versions of
+	Markdown. Code blocks and spans involving backslash characters
+	will now generate different output than before.
+
++	Tweaked the rules for link definitions so that they must occur
+	within three spaces of the left margin. Thus if you indent a link
+	definition by four spaces or a tab, it will now be a code block.
+	
+		   [a]: /url/  "Indented 3 spaces, this is a link def"
+
+		    [b]: /url/  "Indented 4 spaces, this is a code block"
+	
+	**IMPORTANT**: This may affect existing Markdown content if it
+	contains link definitions indented by 4 or more spaces.
+
++	Added `>`, `+`, and `-` to the list of backslash-escapable
+	characters. These should have been done when these characters
+	were added as unordered list item markers.
+
++	Trailing spaces and tabs following HTML comments and `<hr/>` tags
+	are now ignored.
+
++	Inline links using `<` and `>` URL delimiters weren't working:
+
+		like [this](<http://example.com/>)
+
++	Added a bit of tolerance for trailing spaces and tabs after
+	Markdown hr's.
+
++	Fixed bug where auto-links were being processed within code spans:
+
+		like this: `<http://example.com/>`
+
++	Sort-of fixed a bug where lines in the middle of hard-wrapped
+	paragraphs, which lines look like the start of a list item,
+	would accidentally trigger the creation of a list. E.g. a
+	paragraph that looked like this:
+
+		I recommend upgrading to version
+		8. Oops, now this line is treated
+		as a sub-list.
+
+	This is fixed for top-level lists, but it can still happen for
+	sub-lists. E.g., the following list item will not be parsed
+	properly:
+
+		+	I recommend upgrading to version
+			8. Oops, now this line is treated
+			as a sub-list.
+
+	Given Markdown's list-creation rules, I'm not sure this can
+	be fixed.
+
++	Standalone HTML comments are now handled; previously, they'd get
+	wrapped in a spurious `<p>` tag.
+
++	Fix for horizontal rules preceded by 2 or 3 spaces.
+
++	`<hr>` HTML tags in must occur within three spaces of left
+	margin. (With 4 spaces or a tab, they should be code blocks, but
+	weren't before this fix.)
+
++	Capitalized "With" in "Markdown With SmartyPants" for
+	consistency with the same string label in SmartyPants.pl.
+	(This fix is specific to the MT plug-in interface.)
+
++	Auto-linked email address can now optionally contain
+	a 'mailto:' protocol. I.e. these are equivalent:
+
+		<mailto:user ＠ example.com>
+		<user ＠ example.com>
+
++	Fixed annoying bug where nested lists would wind up with
+	spurious (and invalid) `<p>` tags.
+
++	You can now write empty links:
+
+		[like this]()
+
+	and they'll be turned into anchor tags with empty href attributes.
+	This should have worked before, but didn't.
+
++	`***this***` and `___this___` are now turned into
+
+		<strong><em>this</em></strong>
+
+	Instead of
+
+		<strong><em>this</strong></em>
+
+	which isn't valid. (Thanks to Michel Fortin for the fix.)
+
++	Added a new substitution in `_EncodeCode()`: s/\$/&#036;/g; This
+	is only for the benefit of Blosxom users, because Blosxom
+	(sometimes?) interpolates Perl scalars in your article bodies.
+
++	Fixed problem for links defined with urls that include parens, e.g.:
+
+		[1]: http://sources.wikipedia.org/wiki/Middle_East_Policy_(Chomsky)
+
+	"Chomsky" was being erroneously treated as the URL's title.
+
++	At some point during 1.0's beta cycle, I changed every sub's
+	argument fetching from this idiom:
+
+		my $text = shift;
+
+	to:
+
+		my $text = shift || return '';
+
+	The idea was to keep Markdown from doing any work in a sub
+	if the input was empty. This introduced a bug, though:
+	if the input to any function was the single-character string
+	"0", it would also evaluate as false and return immediately.
+	How silly. Now fixed.
+
+
+
+Donations
+---------
+
+Donations to support Markdown's development are happily accepted. See:
+<http://daringfireball.net/projects/markdown/> for details.
+
+
+
+Copyright and License
+---------------------
+
+Copyright (c) 2003-2004 John Gruber   
+<http://daringfireball.net/>   
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+
+* Neither the name "Markdown" nor the names of its contributors may
+  be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+This software is provided by the copyright holders and contributors "as
+is" and any express or implied warranties, including, but not limited
+to, the implied warranties of merchantability and fitness for a
+particular purpose are disclaimed. In no event shall the copyright owner
+or contributors be liable for any direct, indirect, incidental, special,
+exemplary, or consequential damages (including, but not limited to,
+procurement of substitute goods or services; loss of use, data, or
+profits; or business interruption) however caused and on any theory of
+liability, whether in contract, strict liability, or tort (including
+negligence or otherwise) arising in any way out of the use of this
+software, even if advised of the possibility of such damage.

Added: branches/cmake/doc/Markdown_1.0.1/Markdown.pl
===================================================================
--- branches/cmake/doc/Markdown_1.0.1/Markdown.pl	                        (rev 0)
+++ branches/cmake/doc/Markdown_1.0.1/Markdown.pl	2019-03-10 14:34:42 UTC (rev 7475)
@@ -0,0 +1,1450 @@
+#!/usr/bin/perl
+
+#
+# Markdown -- A text-to-HTML conversion tool for web writers
+#
+# Copyright (c) 2004 John Gruber
+# <http://daringfireball.net/projects/markdown/>
+#
+
+
+package Markdown;
+require 5.006_000;
+use strict;
+use warnings;
+
+use Digest::MD5 qw(md5_hex);
+use vars qw($VERSION);
+$VERSION = '1.0.1';
+# Tue 14 Dec 2004
+
+## Disabled; causes problems under Perl 5.6.1:
+use utf8;
+#binmode( STDOUT, ":utf8" );  # c.f.: http://acis.openlib.org/dev/perl-unicode-struggle.html
+
+
+#
+# Global default settings:
+#
+my $g_empty_element_suffix = " />";     # Change to ">" for HTML output
+my $g_tab_width = 4;
+
+
+#
+# Globals:
+#
+
+# Regex to match balanced [brackets]. See Friedl's
+# "Mastering Regular Expressions", 2nd Ed., pp. 328-331.
+my $g_nested_brackets;
+$g_nested_brackets = qr{
+	(?> 								# Atomic matching
+	   [^\[\]]+							# Anything other than brackets
+	 | 
+	   \[
+		 (??{ $g_nested_brackets })		# Recursive set of nested brackets
+	   \]
+	)*
+}x;
+
+
+# Table of hash values for escaped characters:
+my %g_escape_table;
+foreach my $char (split //, '\\`*_{}[]()>#+-.!') {
+	$g_escape_table{$char} = md5_hex($char);
+}
+
+
+# Global hashes, used by various utility routines
+my %g_urls;
+my %g_titles;
+my %g_html_blocks;
+
+# Used to track when we're inside an ordered or unordered list
+# (see _ProcessListItems() for details):
+my $g_list_level = 0;
+
+
+#### Blosxom plug-in interface ##########################################
+
+# Set $g_blosxom_use_meta to 1 to use Blosxom's meta plug-in to determine
+# which posts Markdown should process, using a "meta-markup: markdown"
+# header. If it's set to 0 (the default), Markdown will process all
+# entries.
+my $g_blosxom_use_meta = 0;
+
+sub start { 1; }
+sub story {
+	my($pkg, $path, $filename, $story_ref, $title_ref, $body_ref) = @_;
+
+	if ( (! $g_blosxom_use_meta) or
+	     (defined($meta::markup) and ($meta::markup =~ /^\s*markdown\s*$/i))
+	     ){
+			$$body_ref  = Markdown($$body_ref);
+     }
+     1;
+}
+
+
+#### Movable Type plug-in interface #####################################
+eval {require MT};  # Test to see if we're running in MT.
+unless ($@) {
+    require MT;
+    import  MT;
+    require MT::Template::Context;
+    import  MT::Template::Context;
+
+	eval {require MT::Plugin};  # Test to see if we're running >= MT 3.0.
+	unless ($@) {
+		require MT::Plugin;
+		import  MT::Plugin;
+		my $plugin = new MT::Plugin({
+			name => "Markdown",
+			description => "A plain-text-to-HTML formatting plugin. (Version: $VERSION)",
+			doc_link => 'http://daringfireball.net/projects/markdown/'
+		});
+		MT->add_plugin( $plugin );
+	}
+
+	MT::Template::Context->add_container_tag(MarkdownOptions => sub {
+		my $ctx	 = shift;
+		my $args = shift;
+		my $builder = $ctx->stash('builder');
+		my $tokens = $ctx->stash('tokens');
+
+		if (defined ($args->{'output'}) ) {
+			$ctx->stash('markdown_output', lc $args->{'output'});
+		}
+
+		defined (my $str = $builder->build($ctx, $tokens) )
+			or return $ctx->error($builder->errstr);
+		$str;		# return value
+	});
+
+	MT->add_text_filter('markdown' => {
+		label     => 'Markdown',
+		docs      => 'http://daringfireball.net/projects/markdown/',
+		on_format => sub {
+			my $text = shift;
+			my $ctx  = shift;
+			my $raw  = 0;
+		    if (defined $ctx) {
+		    	my $output = $ctx->stash('markdown_output'); 
+				if (defined $output  &&  $output =~ m/^html/i) {
+					$g_empty_element_suffix = ">";
+					$ctx->stash('markdown_output', '');
+				}
+				elsif (defined $output  &&  $output eq 'raw') {
+					$raw = 1;
+					$ctx->stash('markdown_output', '');
+				}
+				else {
+					$raw = 0;
+					$g_empty_element_suffix = " />";
+				}
+			}
+			$text = $raw ? $text : Markdown($text);
+			$text;
+		},
+	});
+
+	# If SmartyPants is loaded, add a combo Markdown/SmartyPants text filter:
+	my $smartypants;
+
+	{
+		no warnings "once";
+		$smartypants = $MT::Template::Context::Global_filters{'smarty_pants'};
+	}
+
+	if ($smartypants) {
+		MT->add_text_filter('markdown_with_smartypants' => {
+			label     => 'Markdown With SmartyPants',
+			docs      => 'http://daringfireball.net/projects/markdown/',
+			on_format => sub {
+				my $text = shift;
+				my $ctx  = shift;
+				if (defined $ctx) {
+					my $output = $ctx->stash('markdown_output'); 
+					if (defined $output  &&  $output eq 'html') {
+						$g_empty_element_suffix = ">";
+					}
+					else {
+						$g_empty_element_suffix = " />";
+					}
+				}
+				$text = Markdown($text);
+				$text = $smartypants->($text, '1');
+			},
+		});
+	}
+}
+else {
+#### BBEdit/command-line text filter interface ##########################
+# Needs to be hidden from MT (and Blosxom when running in static mode).
+
+    # We're only using $blosxom::version once; tell Perl not to warn us:
+	no warnings 'once';
+    unless ( defined($blosxom::version) ) {
+		use warnings;
+
+		#### Check for command-line switches: #################
+		my %cli_opts;
+		use Getopt::Long;
+		Getopt::Long::Configure('pass_through');
+		GetOptions(\%cli_opts,
+			'version',
+			'shortversion',
+			'html4tags',
+		);
+		if ($cli_opts{'version'}) {		# Version info
+			print "\nThis is Markdown, version $VERSION.\n";
+			print "Copyright 2004 John Gruber\n";
+			print "http://daringfireball.net/projects/markdown/\n\n";
+			exit 0;
+		}
+		if ($cli_opts{'shortversion'}) {		# Just the version number string.
+			print $VERSION;
+			exit 0;
+		}
+		if ($cli_opts{'html4tags'}) {			# Use HTML tag style instead of XHTML
+			$g_empty_element_suffix = ">";
+		}
+
+
+		#### Process incoming text: ###########################
+		my $text;
+		{
+			local $/;               # Slurp the whole file
+			$text = <>;
+		}
+        print Markdown($text);
+    }
+}
+
+
+
+sub Markdown {
+#
+# Main function. The order in which other subs are called here is
+# essential. Link and image substitutions need to happen before
+# _EscapeSpecialChars(), so that any *'s or _'s in the <a>
+# and <img> tags get encoded.
+#
+	my $text = shift;
+
+	# Clear the global hashes. If we don't clear these, you get conflicts
+	# from other articles when generating a page which contains more than
+	# one article (e.g. an index page that shows the N most recent
+	# articles):
+	%g_urls = ();
+	%g_titles = ();
+	%g_html_blocks = ();
+
+
+	# Standardize line endings:
+	$text =~ s{\r\n}{\n}g; 	# DOS to Unix
+	$text =~ s{\r}{\n}g; 	# Mac to Unix
+
+	# Make sure $text ends with a couple of newlines:
+	$text .= "\n\n";
+
+	# Convert all tabs to spaces.
+	$text = _Detab($text);
+
+	# Strip any lines consisting only of spaces and tabs.
+	# This makes subsequent regexen easier to write, because we can
+	# match consecutive blank lines with /\n+/ instead of something
+	# contorted like /[ \t]*\n+/ .
+	$text =~ s/^[ \t]+$//mg;
+
+	# Turn block-level HTML blocks into hash entries
+	$text = _HashHTMLBlocks($text);
+
+	# Strip link definitions, store in hashes.
+	$text = _StripLinkDefinitions($text);
+
+	$text = _RunBlockGamut($text);
+
+	$text = _UnescapeSpecialChars($text);
+
+	return $text . "\n";
+}
+
+
+sub _StripLinkDefinitions {
+#
+# Strips link definitions from text, stores the URLs and titles in
+# hash references.
+#
+	my $text = shift;
+	my $less_than_tab = $g_tab_width - 1;
+
+	# Link defs are in the form: ^[id]: url "optional title"
+	while ($text =~ s{
+						^[ ]{0,$less_than_tab}\[(.+)\]:	# id = $1
+						  [ \t]*
+						  \n?				# maybe *one* newline
+						  [ \t]*
+						<?(\S+?)>?			# url = $2
+						  [ \t]*
+						  \n?				# maybe one newline
+						  [ \t]*
+						(?:
+							(?<=\s)			# lookbehind for whitespace
+							["(]
+							(.+?)			# title = $3
+							[")]
+							[ \t]*
+						)?	# title is optional
+						(?:\n+|\Z)
+					}
+					{}mx) {
+		$g_urls{lc $1} = _EncodeAmpsAndAngles( $2 );	# Link IDs are case-insensitive
+		if ($3) {
+			$g_titles{lc $1} = $3;
+			$g_titles{lc $1} =~ s/"/&quot;/g;
+		}
+	}
+
+	return $text;
+}
+
+
+sub _HashHTMLBlocks {
+	my $text = shift;
+	my $less_than_tab = $g_tab_width - 1;
+
+	# Hashify HTML blocks:
+	# We only want to do this for block-level HTML tags, such as headers,
+	# lists, and tables. That's because we still want to wrap <p>s around
+	# "paragraphs" that are wrapped in non-block-level tags, such as anchors,
+	# phrase emphasis, and spans. The list of tags we're looking for is
+	# hard-coded:
+	my $block_tags_a = qr/p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|ins|del/;
+	my $block_tags_b = qr/p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math/;
+
+	# First, look for nested blocks, e.g.:
+	# 	<div>
+	# 		<div>
+	# 		tags for inner block must be indented.
+	# 		</div>
+	# 	</div>
+	#
+	# The outermost tags must start at the left margin for this to match, and
+	# the inner nested divs must be indented.
+	# We need to do this before the next, more liberal match, because the next
+	# match will start at the first `<div>` and stop at the first `</div>`.
+	$text =~ s{
+				(						# save in $1
+					^					# start of line  (with /m)
+					<($block_tags_a)	# start tag = $2
+					\b					# word break
+					(.*\n)*?			# any number of lines, minimally matching
+					</\2>				# the matching end tag
+					[ \t]*				# trailing spaces/tabs
+					(?=\n+|\Z)	# followed by a newline or end of document
+				)
+			}{
+				my $key = md5_hex($1);
+				$g_html_blocks{$key} = $1;
+				"\n\n" . $key . "\n\n";
+			}egmx;
+
+
+	#
+	# Now match more liberally, simply from `\n<tag>` to `</tag>\n`
+	#
+	$text =~ s{
+				(						# save in $1
+					^					# start of line  (with /m)
+					<($block_tags_b)	# start tag = $2
+					\b					# word break
+					(.*\n)*?			# any number of lines, minimally matching
+					.*</\2>				# the matching end tag
+					[ \t]*				# trailing spaces/tabs
+					(?=\n+|\Z)	# followed by a newline or end of document
+				)
+			}{
+				my $key = md5_hex($1);
+				$g_html_blocks{$key} = $1;
+				"\n\n" . $key . "\n\n";
+			}egmx;
+	# Special case just for <hr />. It was easier to make a special case than
+	# to make the other regex more complicated.	
+	$text =~ s{
+				(?:
+					(?<=\n\n)		# Starting after a blank line
+					|				# or
+					\A\n?			# the beginning of the doc
+				)
+				(						# save in $1
+					[ ]{0,$less_than_tab}
+					<(hr)				# start tag = $2
+					\b					# word break
+					([^<>])*?			# 
+					/?>					# the matching end tag
+					[ \t]*
+					(?=\n{2,}|\Z)		# followed by a blank line or end of document
+				)
+			}{
+				my $key = md5_hex($1);
+				$g_html_blocks{$key} = $1;
+				"\n\n" . $key . "\n\n";
+			}egx;
+
+	# Special case for standalone HTML comments:
+	$text =~ s{
+				(?:
+					(?<=\n\n)		# Starting after a blank line
+					|				# or
+					\A\n?			# the beginning of the doc
+				)
+				(						# save in $1
+					[ ]{0,$less_than_tab}
+					(?s:
+						<!
+						(--.*?--\s*)+
+						>
+					)
+					[ \t]*
+					(?=\n{2,}|\Z)		# followed by a blank line or end of document
+				)
+			}{
+				my $key = md5_hex($1);
+				$g_html_blocks{$key} = $1;
+				"\n\n" . $key . "\n\n";
+			}egx;
+
+
+	return $text;
+}
+
+
+sub _RunBlockGamut {
+#
+# These are all the transformations that form block-level
+# tags like paragraphs, headers, and list items.
+#
+	my $text = shift;
+
+	$text = _DoHeaders($text);
+
+	# Do Horizontal Rules:
+	$text =~ s{^[ ]{0,2}([ ]?\*[ ]?){3,}[ \t]*$}{\n<hr$g_empty_element_suffix\n}gmx;
+	$text =~ s{^[ ]{0,2}([ ]? -[ ]?){3,}[ \t]*$}{\n<hr$g_empty_element_suffix\n}gmx;
+	$text =~ s{^[ ]{0,2}([ ]? _[ ]?){3,}[ \t]*$}{\n<hr$g_empty_element_suffix\n}gmx;
+
+	$text = _DoLists($text);
+
+	$text = _DoCodeBlocks($text);
+
+	$text = _DoBlockQuotes($text);
+
+	# We already ran _HashHTMLBlocks() before, in Markdown(), but that
+	# was to escape raw HTML in the original Markdown source. This time,
+	# we're escaping the markup we've just created, so that we don't wrap
+	# <p> tags around block-level tags.
+	$text = _HashHTMLBlocks($text);
+
+	$text = _FormParagraphs($text);
+
+	return $text;
+}
+
+
+sub _RunSpanGamut {
+#
+# These are all the transformations that occur *within* block-level
+# tags like paragraphs, headers, and list items.
+#
+	my $text = shift;
+
+	$text = _DoCodeSpans($text);
+
+	$text = _EscapeSpecialChars($text);
+
+	# Process anchor and image tags. Images must come first,
+	# because ![foo][f] looks like an anchor.
+	$text = _DoImages($text);
+	$text = _DoAnchors($text);
+
+	# Make links out of things like `<http://example.com/>`
+	# Must come after _DoAnchors(), because you can use < and >
+	# delimiters in inline links like [this](<url>).
+	$text = _DoAutoLinks($text);
+
+	$text = _EncodeAmpsAndAngles($text);
+
+	$text = _DoItalicsAndBold($text);
+
+	# Do hard breaks:
+	$text =~ s/ {2,}\n/ <br$g_empty_element_suffix\n/g;
+
+	return $text;
+}
+
+
+sub _EscapeSpecialChars {
+	my $text = shift;
+	my $tokens ||= _TokenizeHTML($text);
+
+	$text = '';   # rebuild $text from the tokens
+# 	my $in_pre = 0;	 # Keep track of when we're inside <pre> or <code> tags.
+# 	my $tags_to_skip = qr!<(/?)(?:pre|code|kbd|script|math)[\s>]!;
+
+	foreach my $cur_token (@$tokens) {
+		if ($cur_token->[0] eq "tag") {
+			# Within tags, encode * and _ so they don't conflict
+			# with their use in Markdown for italics and strong.
+			# We're replacing each such character with its
+			# corresponding MD5 checksum value; this is likely
+			# overkill, but it should prevent us from colliding
+			# with the escape values by accident.
+			$cur_token->[1] =~  s! \* !$g_escape_table{'*'}!gx;
+			$cur_token->[1] =~  s! _  !$g_escape_table{'_'}!gx;
+			$text .= $cur_token->[1];
+		} else {
+			my $t = $cur_token->[1];
+			$t = _EncodeBackslashEscapes($t);
+			$text .= $t;
+		}
+	}
+	return $text;
+}
+
+
+sub _DoAnchors {
+#
+# Turn Markdown link shortcuts into XHTML <a> tags.
+#
+	my $text = shift;
+
+	#
+	# First, handle reference-style links: [link text] [id]
+	#
+	$text =~ s{
+		(					# wrap whole match in $1
+		  \[
+		    ($g_nested_brackets)	# link text = $2
+		  \]
+
+		  [ ]?				# one optional space
+		  (?:\n[ ]*)?		# one optional newline followed by spaces
+
+		  \[
+		    (.*?)		# id = $3
+		  \]
+		)
+	}{
+		my $result;
+		my $whole_match = $1;
+		my $link_text   = $2;
+		my $link_id     = lc $3;
+
+		if ($link_id eq "") {
+			$link_id = lc $link_text;     # for shortcut links like [this][].
+		}
+
+		if (defined $g_urls{$link_id}) {
+			my $url = $g_urls{$link_id};
+			$url =~ s! \* !$g_escape_table{'*'}!gx;		# We've got to encode these to avoid
+			$url =~ s!  _ !$g_escape_table{'_'}!gx;		# conflicting with italics/bold.
+			$result = "<a href=\"$url\"";
+			if ( defined $g_titles{$link_id} ) {
+				my $title = $g_titles{$link_id};
+				$title =~ s! \* !$g_escape_table{'*'}!gx;
+				$title =~ s!  _ !$g_escape_table{'_'}!gx;
+				$result .=  " title=\"$title\"";
+			}
+			$result .= ">$link_text</a>";
+		}
+		else {
+			$result = $whole_match;
+		}
+		$result;
+	}xsge;
+
+	#
+	# Next, inline-style links: [link text](url "optional title")
+	#
+	$text =~ s{
+		(				# wrap whole match in $1
+		  \[
+		    ($g_nested_brackets)	# link text = $2
+		  \]
+		  \(			# literal paren
+		  	[ \t]*
+			<?(.*?)>?	# href = $3
+		  	[ \t]*
+			(			# $4
+			  (['"])	# quote char = $5
+			  (.*?)		# Title = $6
+			  \5		# matching quote
+			)?			# title is optional
+		  \)
+		)
+	}{
+		my $result;
+		my $whole_match = $1;
+		my $link_text   = $2;
+		my $url	  		= $3;
+		my $title		= $6;
+
+		$url =~ s! \* !$g_escape_table{'*'}!gx;		# We've got to encode these to avoid
+		$url =~ s!  _ !$g_escape_table{'_'}!gx;		# conflicting with italics/bold.
+		$result = "<a href=\"$url\"";
+
+		if (defined $title) {
+			$title =~ s/"/&quot;/g;
+			$title =~ s! \* !$g_escape_table{'*'}!gx;
+			$title =~ s!  _ !$g_escape_table{'_'}!gx;
+			$result .=  " title=\"$title\"";
+		}
+
+		$result .= ">$link_text</a>";
+
+		$result;
+	}xsge;
+
+	return $text;
+}
+
+
+sub _DoImages {
+#
+# Turn Markdown image shortcuts into <img> tags.
+#
+	my $text = shift;
+
+	#
+	# First, handle reference-style labeled images: ![alt text][id]
+	#
+	$text =~ s{
+		(				# wrap whole match in $1
+		  !\[
+		    (.*?)		# alt text = $2
+		  \]
+
+		  [ ]?				# one optional space
+		  (?:\n[ ]*)?		# one optional newline followed by spaces
+
+		  \[
+		    (.*?)		# id = $3
+		  \]
+
+		)
+	}{
+		my $result;
+		my $whole_match = $1;
+		my $alt_text    = $2;
+		my $link_id     = lc $3;
+
+		if ($link_id eq "") {
+			$link_id = lc $alt_text;     # for shortcut links like ![this][].
+		}
+
+		$alt_text =~ s/"/&quot;/g;
+		if (defined $g_urls{$link_id}) {
+			my $url = $g_urls{$link_id};
+			$url =~ s! \* !$g_escape_table{'*'}!gx;		# We've got to encode these to avoid
+			$url =~ s!  _ !$g_escape_table{'_'}!gx;		# conflicting with italics/bold.
+			$result = "<img src=\"$url\" alt=\"$alt_text\"";
+			if (defined $g_titles{$link_id}) {
+				my $title = $g_titles{$link_id};
+				$title =~ s! \* !$g_escape_table{'*'}!gx;
+				$title =~ s!  _ !$g_escape_table{'_'}!gx;
+				$result .=  " title=\"$title\"";
+			}
+			$result .= $g_empty_element_suffix;
+		}
+		else {
+			# If there's no such link ID, leave intact:
+			$result = $whole_match;
+		}
+
+		$result;
+	}xsge;
+
+	#
+	# Next, handle inline images:  ![alt text](url "optional title")
+	# Don't forget: encode * and _
+
+	$text =~ s{
+		(				# wrap whole match in $1
+		  !\[
+		    (.*?)		# alt text = $2
+		  \]
+		  \(			# literal paren
+		  	[ \t]*
+			<?(\S+?)>?	# src url = $3
+		  	[ \t]*
+			(			# $4
+			  (['"])	# quote char = $5
+			  (.*?)		# title = $6
+			  \5		# matching quote
+			  [ \t]*
+			)?			# title is optional
+		  \)
+		)
+	}{
+		my $result;
+		my $whole_match = $1;
+		my $alt_text    = $2;
+		my $url	  		= $3;
+		my $title		= '';
+		if (defined($6)) {
+			$title		= $6;
+		}
+
+		$alt_text =~ s/"/&quot;/g;
+		$title    =~ s/"/&quot;/g;
+		$url =~ s! \* !$g_escape_table{'*'}!gx;		# We've got to encode these to avoid
+		$url =~ s!  _ !$g_escape_table{'_'}!gx;		# conflicting with italics/bold.
+		$result = "<img src=\"$url\" alt=\"$alt_text\"";
+		if (defined $title) {
+			$title =~ s! \* !$g_escape_table{'*'}!gx;
+			$title =~ s!  _ !$g_escape_table{'_'}!gx;
+			$result .=  " title=\"$title\"";
+		}
+		$result .= $g_empty_element_suffix;
+
+		$result;
+	}xsge;
+
+	return $text;
+}
+
+
+sub _DoHeaders {
+	my $text = shift;
+
+	# Setext-style headers:
+	#	  Header 1
+	#	  ========
+	#  
+	#	  Header 2
+	#	  --------
+	#
+	$text =~ s{ ^(.+)[ \t]*\n=+[ \t]*\n+ }{
+		"<h1>"  .  _RunSpanGamut($1)  .  "</h1>\n\n";
+	}egmx;
+
+	$text =~ s{ ^(.+)[ \t]*\n-+[ \t]*\n+ }{
+		"<h2>"  .  _RunSpanGamut($1)  .  "</h2>\n\n";
+	}egmx;
+
+
+	# atx-style headers:
+	#	# Header 1
+	#	## Header 2
+	#	## Header 2 with closing hashes ##
+	#	...
+	#	###### Header 6
+	#
+	$text =~ s{
+			^(\#{1,6})	# $1 = string of #'s
+			[ \t]*
+			(.+?)		# $2 = Header text
+			[ \t]*
+			\#*			# optional closing #'s (not counted)
+			\n+
+		}{
+			my $h_level = length($1);
+			"<h$h_level>"  .  _RunSpanGamut($2)  .  "</h$h_level>\n\n";
+		}egmx;
+
+	return $text;
+}
+
+
+sub _DoLists {
+#
+# Form HTML ordered (numbered) and unordered (bulleted) lists.
+#
+	my $text = shift;
+	my $less_than_tab = $g_tab_width - 1;
+
+	# Re-usable patterns to match list item bullets and number markers:
+	my $marker_ul  = qr/[*+-]/;
+	my $marker_ol  = qr/\d+[.]/;
+	my $marker_any = qr/(?:$marker_ul|$marker_ol)/;
+
+	# Re-usable pattern to match any entirel ul or ol list:
+	my $whole_list = qr{
+		(								# $1 = whole list
+		  (								# $2
+			[ ]{0,$less_than_tab}
+			(${marker_any})				# $3 = first list item marker
+			[ \t]+
+		  )
+		  (?s:.+?)
+		  (								# $4
+			  \z
+			|
+			  \n{2,}
+			  (?=\S)
+			  (?!						# Negative lookahead for another list item marker
+				[ \t]*
+				${marker_any}[ \t]+
+			  )
+		  )
+		)
+	}mx;
+
+	# We use a different prefix before nested lists than top-level lists.
+	# See extended comment in _ProcessListItems().
+	#
+	# Note: There's a bit of duplication here. My original implementation
+	# created a scalar regex pattern as the conditional result of the test on
+	# $g_list_level, and then only ran the $text =~ s{...}{...}egmx
+	# substitution once, using the scalar as the pattern. This worked,
+	# everywhere except when running under MT on my hosting account at Pair
+	# Networks. There, this caused all rebuilds to be killed by the reaper (or
+	# perhaps they crashed, but that seems incredibly unlikely given that the
+	# same script on the same server ran fine *except* under MT. I've spent
+	# more time trying to figure out why this is happening than I'd like to
+	# admit. My only guess, backed up by the fact that this workaround works,
+	# is that Perl optimizes the substition when it can figure out that the
+	# pattern will never change, and when this optimization isn't on, we run
+	# afoul of the reaper. Thus, the slightly redundant code to that uses two
+	# static s/// patterns rather than one conditional pattern.
+
+	if ($g_list_level) {
+		$text =~ s{
+				^
+				$whole_list
+			}{
+				my $list = $1;
+				my $list_type = ($3 =~ m/$marker_ul/) ? "ul" : "ol";
+				# Turn double returns into triple returns, so that we can make a
+				# paragraph for the last item in a list, if necessary:
+				$list =~ s/\n{2,}/\n\n\n/g;
+				my $result = _ProcessListItems($list, $marker_any);
+				$result = "<$list_type>\n" . $result . "</$list_type>\n";
+				$result;
+			}egmx;
+	}
+	else {
+		$text =~ s{
+				(?:(?<=\n\n)|\A\n?)
+				$whole_list
+			}{
+				my $list = $1;
+				my $list_type = ($3 =~ m/$marker_ul/) ? "ul" : "ol";
+				# Turn double returns into triple returns, so that we can make a
+				# paragraph for the last item in a list, if necessary:
+				$list =~ s/\n{2,}/\n\n\n/g;
+				my $result = _ProcessListItems($list, $marker_any);
+				$result = "<$list_type>\n" . $result . "</$list_type>\n";
+				$result;
+			}egmx;
+	}
+
+
+	return $text;
+}
+
+
+sub _ProcessListItems {
+#
+#	Process the contents of a single ordered or unordered list, splitting it
+#	into individual list items.
+#
+
+	my $list_str = shift;
+	my $marker_any = shift;
+
+
+	# The $g_list_level global keeps track of when we're inside a list.
+	# Each time we enter a list, we increment it; when we leave a list,
+	# we decrement. If it's zero, we're not in a list anymore.
+	#
+	# We do this because when we're not inside a list, we want to treat
+	# something like this:
+	#
+	#		I recommend upgrading to version
+	#		8. Oops, now this line is treated
+	#		as a sub-list.
+	#
+	# As a single paragraph, despite the fact that the second line starts
+	# with a digit-period-space sequence.
+	#
+	# Whereas when we're inside a list (or sub-list), that line will be
+	# treated as the start of a sub-list. What a kludge, huh? This is
+	# an aspect of Markdown's syntax that's hard to parse perfectly
+	# without resorting to mind-reading. Perhaps the solution is to
+	# change the syntax rules such that sub-lists must start with a
+	# starting cardinal number; e.g. "1." or "a.".
+
+	$g_list_level++;
+
+	# trim trailing blank lines:
+	$list_str =~ s/\n{2,}\z/\n/;
+
+
+	$list_str =~ s{
+		(\n)?							# leading line = $1
+		(^[ \t]*)						# leading whitespace = $2
+		($marker_any) [ \t]+			# list marker = $3
+		((?s:.+?)						# list item text   = $4
+		(\n{1,2}))
+		(?= \n* (\z | \2 ($marker_any) [ \t]+))
+	}{
+		my $item = $4;
+		my $leading_line = $1;
+		my $leading_space = $2;
+
+		if ($leading_line or ($item =~ m/\n{2,}/)) {
+			$item = _RunBlockGamut(_Outdent($item));
+		}
+		else {
+			# Recursion for sub-lists:
+			$item = _DoLists(_Outdent($item));
+			chomp $item;
+			$item = _RunSpanGamut($item);
+		}
+
+		"<li>" . $item . "</li>\n";
+	}egmx;
+
+	$g_list_level--;
+	return $list_str;
+}
+
+
+
+sub _DoCodeBlocks {
+#
+#	Process Markdown `<pre><code>` blocks.
+#	
+
+	my $text = shift;
+
+	$text =~ s{
+			(?:\n\n|\A)
+			(	            # $1 = the code block -- one or more lines, starting with a space/tab
+			  (?:
+			    (?:[ ]{$g_tab_width} | \t)  # Lines must start with a tab or a tab-width of spaces
+			    .*\n+
+			  )+
+			)
+			((?=^[ ]{0,$g_tab_width}\S)|\Z)	# Lookahead for non-space at line-start, or end of doc
+		}{
+			my $codeblock = $1;
+			my $result; # return value
+
+			$codeblock = _EncodeCode(_Outdent($codeblock));
+			$codeblock = _Detab($codeblock);
+			$codeblock =~ s/\A\n+//; # trim leading newlines
+			$codeblock =~ s/\s+\z//; # trim trailing whitespace
+
+			$result = "\n\n<pre><code>" . $codeblock . "\n</code></pre>\n\n";
+
+			$result;
+		}egmx;
+
+	return $text;
+}
+
+
+sub _DoCodeSpans {
+#
+# 	*	Backtick quotes are used for <code></code> spans.
+# 
+# 	*	You can use multiple backticks as the delimiters if you want to
+# 		include literal backticks in the code span. So, this input:
+#     
+#         Just type ``foo `bar` baz`` at the prompt.
+#     
+#     	Will translate to:
+#     
+#         <p>Just type <code>foo `bar` baz</code> at the prompt.</p>
+#     
+#		There's no arbitrary limit to the number of backticks you
+#		can use as delimters. If you need three consecutive backticks
+#		in your code, use four for delimiters, etc.
+#
+#	*	You can use spaces to get literal backticks at the edges:
+#     
+#         ... type `` `bar` `` ...
+#     
+#     	Turns to:
+#     
+#         ... type <code>`bar`</code> ...
+#
+
+	my $text = shift;
+
+	$text =~ s@
+			(`+)		# $1 = Opening run of `
+			(.+?)		# $2 = The code block
+			(?<!`)
+			\1			# Matching closer
+			(?!`)
+		@
+ 			my $c = "$2";
+ 			$c =~ s/^[ \t]*//g; # leading whitespace
+ 			$c =~ s/[ \t]*$//g; # trailing whitespace
+ 			$c = _EncodeCode($c);
+			"<code>$c</code>";
+		@egsx;
+
+	return $text;
+}
+
+
+sub _EncodeCode {
+#
+# Encode/escape certain characters inside Markdown code runs.
+# The point is that in code, these characters are literals,
+# and lose their special Markdown meanings.
+#
+    local $_ = shift;
+
+	# Encode all ampersands; HTML entities are not
+	# entities within a Markdown code span.
+	s/&/&amp;/g;
+
+	# Encode $'s, but only if we're running under Blosxom.
+	# (Blosxom interpolates Perl variables in article bodies.)
+	{
+		no warnings 'once';
+    	if (defined($blosxom::version)) {
+    		s/\$/&#036;/g;	
+    	}
+    }
+
+
+	# Do the angle bracket song and dance:
+	s! <  !&lt;!gx;
+	s! >  !&gt;!gx;
+
+	# Now, escape characters that are magic in Markdown:
+	s! \* !$g_escape_table{'*'}!gx;
+	s! _  !$g_escape_table{'_'}!gx;
+	s! {  !$g_escape_table{'{'}!gx;
+	s! }  !$g_escape_table{'}'}!gx;
+	s! \[ !$g_escape_table{'['}!gx;
+	s! \] !$g_escape_table{']'}!gx;
+	s! \\ !$g_escape_table{'\\'}!gx;
+
+	return $_;
+}
+
+
+sub _DoItalicsAndBold {
+	my $text = shift;
+
+	# <strong> must go first:
+	$text =~ s{ (\*\*|__) (?=\S) (.+?[*_]*) (?<=\S) \1 }
+		{<strong>$2</strong>}gsx;
+
+	$text =~ s{ (\*|_) (?=\S) (.+?) (?<=\S) \1 }
+		{<em>$2</em>}gsx;
+
+	return $text;
+}
+
+
+sub _DoBlockQuotes {
+	my $text = shift;
+
+	$text =~ s{
+		  (								# Wrap whole match in $1
+			(
+			  ^[ \t]*>[ \t]?			# '>' at the start of a line
+			    .+\n					# rest of the first line
+			  (.+\n)*					# subsequent consecutive lines
+			  \n*						# blanks
+			)+
+		  )
+		}{
+			my $bq = $1;
+			$bq =~ s/^[ \t]*>[ \t]?//gm;	# trim one level of quoting
+			$bq =~ s/^[ \t]+$//mg;			# trim whitespace-only lines
+			$bq = _RunBlockGamut($bq);		# recurse
+
+			$bq =~ s/^/  /g;
+			# These leading spaces screw with <pre> content, so we need to fix that:
+			$bq =~ s{
+					(\s*<pre>.+?</pre>)
+				}{
+					my $pre = $1;
+					$pre =~ s/^  //mg;
+					$pre;
+				}egsx;
+
+			"<blockquote>\n$bq\n</blockquote>\n\n";
+		}egmx;
+
+
+	return $text;
+}
+
+
+sub _FormParagraphs {
+#
+#	Params:
+#		$text - string to process with html <p> tags
+#
+	my $text = shift;
+
+	# Strip leading and trailing lines:
+	$text =~ s/\A\n+//;
+	$text =~ s/\n+\z//;
+
+	my @grafs = split(/\n{2,}/, $text);
+
+	#
+	# Wrap <p> tags.
+	#
+	foreach (@grafs) {
+		unless (defined( $g_html_blocks{$_} )) {
+			$_ = _RunSpanGamut($_);
+			s/^([ \t]*)/<p>/;
+			$_ .= "</p>";
+		}
+	}
+
+	#
+	# Unhashify HTML blocks
+	#
+	foreach (@grafs) {
+		if (defined( $g_html_blocks{$_} )) {
+			$_ = $g_html_blocks{$_};
+		}
+	}
+
+	return join "\n\n", @grafs;
+}
+
+
+sub _EncodeAmpsAndAngles {
+# Smart processing for ampersands and angle brackets that need to be encoded.
+
+	my $text = shift;
+
+	# Ampersand-encoding based entirely on Nat Irons's Amputator MT plugin:
+	#   http://bumppo.net/projects/amputator/
+ 	$text =~ s/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/&amp;/g;
+
+	# Encode naked <'s
+ 	$text =~ s{<(?![a-z/?\$!])}{&lt;}gi;
+
+	return $text;
+}
+
+
+sub _EncodeBackslashEscapes {
+#
+#   Parameter:  String.
+#   Returns:    The string, with after processing the following backslash
+#               escape sequences.
+#
+    local $_ = shift;
+
+    s! \\\\  !$g_escape_table{'\\'}!gx;		# Must process escaped backslashes first.
+    s! \\`   !$g_escape_table{'`'}!gx;
+    s! \\\*  !$g_escape_table{'*'}!gx;
+    s! \\_   !$g_escape_table{'_'}!gx;
+    s! \\\{  !$g_escape_table{'{'}!gx;
+    s! \\\}  !$g_escape_table{'}'}!gx;
+    s! \\\[  !$g_escape_table{'['}!gx;
+    s! \\\]  !$g_escape_table{']'}!gx;
+    s! \\\(  !$g_escape_table{'('}!gx;
+    s! \\\)  !$g_escape_table{')'}!gx;
+    s! \\>   !$g_escape_table{'>'}!gx;
+    s! \\\#  !$g_escape_table{'#'}!gx;
+    s! \\\+  !$g_escape_table{'+'}!gx;
+    s! \\\-  !$g_escape_table{'-'}!gx;
+    s! \\\.  !$g_escape_table{'.'}!gx;
+    s{ \\!  }{$g_escape_table{'!'}}gx;
+
+    return $_;
+}
+
+
+sub _DoAutoLinks {
+	my $text = shift;
+
+	$text =~ s{<((https?|ftp):[^'">\s]+)>}{<a href="$1">$1</a>}gi;
+
+	# Email addresses: <address ＠ domain.foo>
+	$text =~ s{
+		<
+        (?:mailto:)?
+		(
+			[-.\w]+
+			\@
+			[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+
+		)
+		>
+	}{
+		_EncodeEmailAddress( _UnescapeSpecialChars($1) );
+	}egix;
+
+	return $text;
+}
+
+
+sub _EncodeEmailAddress {
+#
+#	Input: an email address, e.g. "foo ＠ example.com"
+#
+#	Output: the email address as a mailto link, with each character
+#		of the address encoded as either a decimal or hex entity, in
+#		the hopes of foiling most address harvesting spam bots. E.g.:
+#
+#	  <a href="&#x6D;&#97;&#105;&#108;&#x74;&#111;:&#102;&#111;&#111;&#64;&#101;
+#       x&#x61;&#109;&#x70;&#108;&#x65;&#x2E;&#99;&#111;&#109;">&#102;&#111;&#111;
+#       &#64;&#101;x&#x61;&#109;&#x70;&#108;&#x65;&#x2E;&#99;&#111;&#109;</a>
+#
+#	Based on a filter by Matthew Wickline, posted to the BBEdit-Talk
+#	mailing list: <http://tinyurl.com/yu7ue>
+#
+
+	my $addr = shift;
+
+	srand;
+	my @encode = (
+		sub { '&#' .                 ord(shift)   . ';' },
+		sub { '&#x' . sprintf( "%X", ord(shift) ) . ';' },
+		sub {                            shift          },
+	);
+
+	$addr = "mailto:" . $addr;
+
+	$addr =~ s{(.)}{
+		my $char = $1;
+		if ( $char eq '@' ) {
+			# this *must* be encoded. I insist.
+			$char = $encode[int rand 1]->($char);
+		} elsif ( $char ne ':' ) {
+			# leave ':' alone (to spot mailto: later)
+			my $r = rand;
+			# roughly 10% raw, 45% hex, 45% dec
+			$char = (
+				$r > .9   ?  $encode[2]->($char)  :
+				$r < .45  ?  $encode[1]->($char)  :
+							 $encode[0]->($char)
+			);
+		}
+		$char;
+	}gex;
+
+	$addr = qq{<a href="$addr">$addr</a>};
+	$addr =~ s{">.+?:}{">}; # strip the mailto: from the visible part
+
+	return $addr;
+}
+
+
+sub _UnescapeSpecialChars {
+#
+# Swap back in all the special characters we've hidden.
+#
+	my $text = shift;
+
+	while( my($char, $hash) = each(%g_escape_table) ) {
+		$text =~ s/$hash/$char/g;
+	}
+    return $text;
+}
+
+
+sub _TokenizeHTML {
+#
+#   Parameter:  String containing HTML markup.
+#   Returns:    Reference to an array of the tokens comprising the input
+#               string. Each token is either a tag (possibly with nested,
+#               tags contained therein, such as <a href="<MTFoo>">, or a
+#               run of text between tags. Each element of the array is a
+#               two-element array; the first is either 'tag' or 'text';
+#               the second is the actual value.
+#
+#
+#   Derived from the _tokenize() subroutine from Brad Choate's MTRegex plugin.
+#       <http://www.bradchoate.com/past/mtregex.php>
+#
+
+    my $str = shift;
+    my $pos = 0;
+    my $len = length $str;
+    my @tokens;
+
+    my $depth = 6;
+    my $nested_tags = join('|', ('(?:<[a-z/!$](?:[^<>]') x $depth) . (')*>)' x  $depth);
+    my $match = qr/(?s: <! ( -- .*? -- \s* )+ > ) |  # comment
+                   (?s: <\? .*? \?> ) |              # processing instruction
+                   $nested_tags/ix;                   # nested tags
+
+    while ($str =~ m/($match)/g) {
+        my $whole_tag = $1;
+        my $sec_start = pos $str;
+        my $tag_start = $sec_start - length $whole_tag;
+        if ($pos < $tag_start) {
+            push @tokens, ['text', substr($str, $pos, $tag_start - $pos)];
+        }
+        push @tokens, ['tag', $whole_tag];
+        $pos = pos $str;
+    }
+    push @tokens, ['text', substr($str, $pos, $len - $pos)] if $pos < $len;
+    \@tokens;
+}
+
+
+sub _Outdent {
+#
+# Remove one level of line-leading tabs or spaces
+#
+	my $text = shift;
+
+	$text =~ s/^(\t|[ ]{1,$g_tab_width})//gm;
+	return $text;
+}
+
+
+sub _Detab {
+#
+# Cribbed from a post by Bart Lateur:
+# <http://www.nntp.perl.org/group/perl.macperl.anyperl/154>
+#
+	my $text = shift;
+
+	$text =~ s{(.*?)\t}{$1.(' ' x ($g_tab_width - length($1) % $g_tab_width))}ge;
+	return $text;
+}
+
+
+1;
+
+__END__
+
+
+=pod
+
+=head1 NAME
+
+B<Markdown>
+
+
+=head1 SYNOPSIS
+
+B<Markdown.pl> [ B<--html4tags> ] [ B<--version> ] [ B<-shortversion> ]
+    [ I<file> ... ]
+
+
+=head1 DESCRIPTION
+
+Markdown is a text-to-HTML filter; it translates an easy-to-read /
+easy-to-write structured text format into HTML. Markdown's text format
+is most similar to that of plain text email, and supports features such
+as headers, *emphasis*, code blocks, blockquotes, and links.
+
+Markdown's syntax is designed not as a generic markup language, but
+specifically to serve as a front-end to (X)HTML. You can  use span-level
+HTML tags anywhere in a Markdown document, and you can use block level
+HTML tags (like <div> and <table> as well).
+
+For more information about Markdown's syntax, see:
+
+    http://daringfireball.net/projects/markdown/
+
+
+=head1 OPTIONS
+
+Use "--" to end switch parsing. For example, to open a file named "-z", use:
+
+	Markdown.pl -- -z
+
+=over 4
+
+
+=item B<--html4tags>
+
+Use HTML 4 style for empty element tags, e.g.:
+
+    <br>
+
+instead of Markdown's default XHTML style tags, e.g.:
+
+    <br />
+
+
+=item B<-v>, B<--version>
+
+Display Markdown's version number and copyright information.
+
+
+=item B<-s>, B<--shortversion>
+
+Display the short-form version number.
+
+
+=back
+
+
+
+=head1 BUGS
+
+To file bug reports or feature requests (other than topics listed in the
+Caveats section above) please send email to:
+
+    support ＠ daringfireball.net
+
+Please include with your report: (1) the example input; (2) the output
+you expected; (3) the output Markdown actually produced.
+
+
+=head1 VERSION HISTORY
+
+See the readme file for detailed release notes for this version.
+
+1.0.1 - 14 Dec 2004
+
+1.0 - 28 Aug 2004
+
+
+=head1 AUTHOR
+
+    John Gruber
+    http://daringfireball.net
+
+    PHP port and other contributions by Michel Fortin
+    http://michelf.com
+
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (c) 2003-2004 John Gruber   
+<http://daringfireball.net/>   
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+
+* Neither the name "Markdown" nor the names of its contributors may
+  be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+This software is provided by the copyright holders and contributors "as
+is" and any express or implied warranties, including, but not limited
+to, the implied warranties of merchantability and fitness for a
+particular purpose are disclaimed. In no event shall the copyright owner
+or contributors be liable for any direct, indirect, incidental, special,
+exemplary, or consequential damages (including, but not limited to,
+procurement of substitute goods or services; loss of use, data, or
+profits; or business interruption) however caused and on any theory of
+liability, whether in contract, strict liability, or tort (including
+negligence or otherwise) arising in any way out of the use of this
+software, even if advised of the possibility of such damage.
+
+=cut

Modified: branches/cmake/doc/convtext.bat
===================================================================
--- branches/cmake/doc/convtext.bat	2019-03-10 14:34:06 UTC (rev 7474)
+++ branches/cmake/doc/convtext.bat	2019-03-10 14:34:42 UTC (rev 7475)
@@ -16,3 +16,7 @@
 %TOSJIS% -i ..\cygterm\COPYING          -o %REF_J%\CygTerm+-LICENSE.txt  -l unix
 %ZLIBCP% -i ..\libs\zlib\README         -o %REF_E%\zlib-LICENSE.txt      -l unix
 %ZLIBCP% -i ..\libs\zlib\README         -o %REF_J%\zlib-LICENSE.txt      -l unix
+
+sed -e '1s/^\xef\xbb\xbf//' < ja/html/reference/build_with_cmake.md > ja/html/reference/build_with_cmake_without_bom.md
+perl Markdown_1.0.1/Markdown.pl ja/html/reference/build_with_cmake_without_bom.md > ja/html/reference/build_with_cmake_utf8.html
+%TOSJIS% -i ja/html/reference/build_with_cmake_utf8.html -o ja/html/reference/build_with_cmake.html  -c utf8

Modified: branches/cmake/doc/en/html/about/history.html
===================================================================
--- branches/cmake/doc/en/html/about/history.html	2019-03-10 14:34:06 UTC (rev 7474)
+++ branches/cmake/doc/en/html/about/history.html	2019-03-10 14:34:42 UTC (rev 7475)
@@ -33,6 +33,12 @@
 
 <h3 id="teraterm_4.103">2019.xx.xx (Ver 4.103)</h3>
 <ul class="history">
+  <li>Bug fixes
+    <ul>
+      <li><!--IME\x82̕ϊ\xB7\x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82̕\\x8E\xA6\x88ʒu\x82\xAA\x83J\x81[\x83\\x83\x8B\x88ʒu\x82ɒǏ]\x82\xB5\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B-->This bus was introduced in 4.102.</li>
+    </ul>
+  </li>
+
   <li>Misc
     <ul>
       <li>upgraded TTSSH to <a href="#ttssh_2.89">2.89</a>.</li>

Modified: branches/cmake/doc/ja/html/about/history.html
===================================================================
--- branches/cmake/doc/ja/html/about/history.html	2019-03-10 14:34:06 UTC (rev 7474)
+++ branches/cmake/doc/ja/html/about/history.html	2019-03-10 14:34:42 UTC (rev 7475)
@@ -33,6 +33,12 @@
 
 <h3 id="teraterm_4.103">2019.xx.xx (Ver 4.103)</h3>
 <ul class="history">
+  <li>\x83o\x83O\x8FC\x90\xB3
+    <ul>
+      <li>IME\x82̕ϊ\xB7\x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82̕\\x8E\xA6\x88ʒu\x82\xAA\x83J\x81[\x83\\x83\x8B\x88ʒu\x82ɒǏ]\x82\xB5\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B4.102\x82ł̃G\x83\x93\x83o\x83O\x81B</li>
+    </ul>
+  </li>
+
   <li>\x82\xBB\x82̑\xBC
     <ul>
       <li><a href="#ttssh_2.89">TTSSH(2.89)</a>\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li>

Added: branches/cmake/doc/ja/html/reference/build_with_cmake.md
===================================================================
--- branches/cmake/doc/ja/html/reference/build_with_cmake.md	                        (rev 0)
+++ branches/cmake/doc/ja/html/reference/build_with_cmake.md	2019-03-10 14:34:42 UTC (rev 7475)
@@ -0,0 +1,32 @@
+# cmakeを使ったビルド
+
+- 実験的に cmake を使用してビルドすることができます
+- cmake https://cmake.org/
+
+## cmakeのバージョン
+
+- Visual Studio 2005 をサポートしている cmake の最後のバージョンは 3.11.4 です
+- 2005 以外の Visual Studio を使用する場合は特に制限はありません
+- Visual Studio 2017 インストーラーで、オプションを選べば cmake をインストールできます
+
+## ライブラリのビルド
+
+- teraterm が使用するライブラリをビルドして準備しておきます
+- `lib/build_library_with_cmake.md` を参照してください
+- ライブラリは `develop.txt` を参照してください
+
+## teratermのビルド
+
+- ソースツリーのトップから、次のようにコマンドを実行します  
+    ```
+    mkdir build_vs2005
+    cd build_vs2005
+    "c:\Program Files (x86)\CMake-3.11.4\bin\cmake.exe" .. -G "Visual Studio 8 2005"
+    ```
+    - パスが通っていれば cmake はフルパスで書く必要はありません
+    - `-G` オプションの後ろは使用する Visual Studio のバージョンに合わせて調整します
+- sln ファイルが生成されるので Visual Studio で開くことができます
+- cmakeを使ってビルドする場合は次のコマンドを実行します  
+    ```
+    cmake --build . --config release
+    ```

Modified: branches/cmake/libs/build_library_with_cmake.md
===================================================================
--- branches/cmake/libs/build_library_with_cmake.md	2019-03-10 14:34:06 UTC (rev 7474)
+++ branches/cmake/libs/build_library_with_cmake.md	2019-03-10 14:34:42 UTC (rev 7475)
@@ -2,18 +2,41 @@
 # libフォルダ
 
 - teratermが利用する外部のライブラリをビルドするためのフォルダ
-- コンパイラ向けに各々ビルドする
+- コンパイラ向けに各々ビルド
 - 1度ビルドしてライブラリを生成しておく
 
+# 準備
+
+## Visual Studio
+
+- cmake
+	- PATHが通してあればok
+	- cygwinのcmakeはつかえない(Visual Studioをサポートしていない)
+	- Visual Studio 2005 を使う場合は cmake 3.11.4 を使用する必要がある
+- perl
+	- OpenSSL のコンパイル、ドキュメントファイルの文字コード・改行コード変換に必要
+	- ActivePerl 5.8 以上、または cygwin perl
+	- PATHが通っていなければ自動で探す
+
+## MinGW 共通 (experimental)
+
+- Cygwin,MSYS2,linux(wsl)上のMinGWでビルド可能
+- 各環境で動作するcmake,make,(MinGW)gcc,perlが必要
+
 # ビルド手順
 
+必要なアーカイブを自動的にダウンロードするので、
+インターネットが利用できる環境でビルドする必要がある
+
 ## Visual Studioの場合
 
 ### batファイルを使用する場合
 
+- 自動的にビルド
 - buildall_cmake.bat を実行
-- cmakeを選択
 - コンパイルに使用する Visual Studioを選ぶ
+- VS2005の場合はcmake 3.11.4 をダウンロードして
+  libs\cmake-3.11.4-win32-x86 にインストールする
 
 ### cmakeを使用する場合
 
@@ -21,12 +44,11 @@
 	- `cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -P buildall.cmake`
 	- `cmake -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64" -P buildall.cmake`
 - Visual Studio 2005の場合は、cmakeのバージョン3.11.4以前を使用する
-	- `cmake -DCMAKE_GENERATOR="Visual Studio 8 2005" -P buildall.cmake`
+	- cmake が libs\cmake-3.11.4-win32-x86 にインストールしてある場合  
+	  `"libs\cmake-3.11.4-win32-x86\bin\cmake.exe" -DCMAKE_GENERATOR="Visual Studio 8 2005" -P buildall.cmake`
 
 ## MinGW 共通
 
-- Cygwin,MSYS2,linux(wsl)上のMinGWでビルドできる
-- 各環境で動作するcmake,make,(MinGW)gcc,perlが必要
 - 各々の環境のcmakeを使って
   `cmake -DCMAKE_GENERATOR="Unix Makefiles" -P buildall.cmake` を実行
 
@@ -43,11 +65,12 @@
 
 ## download アーカイブダウンロードフォルダ
 
-- ダウンロードしたアーカイブファイルが置かれます
-- 自動でダウンロードされます
+- ダウンロードしたアーカイブファイルが置かれる
+- 自動でダウンロードされる
 - ダウンロードされていると再利用する
+- ビルド後、参照する必要がなければ削除できる
 
 ## build ビルドフォルダ
 
-- build/oniguruma_{compiler}/ などの下でビルドされます
-- ビルド後は参照する必要がなければ削除できます。
+- build/oniguruma_{compiler}/ などの下でビルドされる
+- ビルド後、参照する必要がなければ削除できる

Modified: branches/cmake/libs/buildall_cmake.bat
===================================================================
--- branches/cmake/libs/buildall_cmake.bat	2019-03-10 14:34:06 UTC (rev 7474)
+++ branches/cmake/libs/buildall_cmake.bat	2019-03-10 14:34:42 UTC (rev 7475)
@@ -2,25 +2,9 @@
 setlocal
 cd /d %~dp0
 
+set CMAKE="cmake.exe2"
 set opt=
 
-:retry_cmake
-set CMAKE=%~dp0cmake-3.11.4-win32-x86\bin\cmake.exe
-echo 1. \x8E\xA9\x95\xAA\x82\xCCcmake.exe\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9(PATH\x82\xF0\x92ʂ\xB5\x82Ă\xA0\x82\xE9)
-echo 2. VS2005\x82ł\xE0\x8Eg\x97p\x82ł\xAB\x82\xE9cmake\x8Eg\x97p\x82\xB7\x82\xE9
-echo    (\x95K\x97v\x82Ȃ玩\x93\xAE\x82Ń_\x83E\x83\x93\x83\x8D\x81[\x83h\x82\xB5\x82āA\x82\xB1\x82̃t\x83H\x83\x8B\x83_\x82ɃC\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB5\x82܂\xB7)
-if exist %CMAKE% echo    \x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x8Dς\xDD(%CMAKE%)
-
-set /p no="select no "
-if "%no%" == "1" set CMAKE="cmake.exe" & goto finish_cmake
-
-if exist %CMAKE% goto finish_cmake
-echo @echo off > ..\cmake.bat
-echo %CMAKE% %%1 %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9 >> ..\cmake.bat
-call getcmake.bat
-
-:finish_cmake
-
 :retry_vs
 echo 1. Visual Studio 15 2017
 echo 2. Visual Studio 14 2015
@@ -29,18 +13,18 @@
 echo 5. Visual Studio 10 2010
 echo 6. Visual Studio 9 2008
 echo 7. Visual Studio 8 2005
-echo 9. Visual Studio NMake
-echo z. Cygwin MinGW Release + Unix Makefiles
+rem echo 9. Visual Studio NMake (experimental)
+rem echo z. Cygwin MinGW Release + Unix Makefiles (experimental)
 set /p no="select no "
 
 echo %no%
-if "%no%" == "1" set GENERATOR="Visual Studio 15 2017" & chcp 65001 & goto build_all
+if "%no%" == "1" set GENERATOR="Visual Studio 15 2017" & goto build_all
 if "%no%" == "2" set GENERATOR="Visual Studio 14 2015" & goto build_all
 if "%no%" == "3" set GENERATOR="Visual Studio 12 2013" & goto build_all
 if "%no%" == "4" set GENERATOR="Visual Studio 11 2012" & goto build_all
 if "%no%" == "5" set GENERATOR="Visual Studio 10 2010" & goto build_all
 if "%no%" == "6" set GENERATOR="Visual Studio 9 2008" & goto build_all
-if "%no%" == "7" set GENERATOR="Visual Studio 8 2005" & goto build_all
+if "%no%" == "7" set GENERATOR="Visual Studio 8 2005" & call :cmake_3_11_4 & goto build_all_2
 if "%no%" == "9" set GENERATOR="NMake Makefiles" & set OPT=-DCMAKE_BUILD_TYPE=Release & goto build_all
 if "%no%" == "z" set GENERATOR="Unix Makefiles" & set OPT=-DCMAKE_TOOLCHAIN_FILE=../mingw.toolchain.cmake & goto build_all
 echo ? retry
@@ -47,6 +31,15 @@
 goto retry_vs
 
 :build_all
+where %CMAKE%
+if %errorlevel% == 0 goto build_all_2
+set CMAKE="C:\Program Files\CMake\bin\cmake.exe"
+if exist %CMAKE% echo %CMAKE% \x82\xF0\x8Eg\x97p & goto build_all_2
+echo cmake\x82\xAA\x8C\xA9\x82‚\xA9\x82\xE8\x82܂\xB9\x82\xF1
+pause
+exit
+
+:build_all_2
 set C=%CMAKE% -DCMAKE_GENERATOR=%GENERATOR% %OPT% -P buildall.cmake
 echo %C%
 title %C%
@@ -57,3 +50,26 @@
 echo build complete
 endlocal
 pause
+exit
+
+:cmake_3_11_4
+set CMAKE=%~dp0cmake-3.11.4-win32-x86\bin\cmake.exe
+echo 1. \x8E\xA9\x95\xAA\x82\xCCcmake.exe\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9(PATH\x82\xF0\x92ʂ\xB5\x82Ă\xA0\x82\xE9)
+echo 2. VS2005\x82ł\xE0\x8Eg\x97p\x82ł\xAB\x82\xE9cmake\x8Eg\x97p\x82\xB7\x82\xE9
+echo    (\x95K\x97v\x82Ȃ玩\x93\xAE\x82Ń_\x83E\x83\x93\x83\x8D\x81[\x83h\x82\xB5\x82āA\x82\xB1\x82̃t\x83H\x83\x8B\x83_\x82ɃC\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB7\x82\xE9)
+if exist %CMAKE% echo    \x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x8Dς\xDD(%CMAKE%)
+
+set /p no="select no "
+echo %no%
+if "%no%" == "2" goto download
+
+set CMAKE="cmake.exe"
+where %CMAKE%
+goto finish_cmake
+
+:download
+if exist %CMAKE% goto finish_cmake
+call getcmake.bat
+
+:finish_cmake
+exit /b

Modified: branches/cmake/libs/openssl.cmake
===================================================================
--- branches/cmake/libs/openssl.cmake	2019-03-10 14:34:06 UTC (rev 7474)
+++ branches/cmake/libs/openssl.cmake	2019-03-10 14:34:42 UTC (rev 7475)
@@ -4,51 +4,51 @@
 ####
 if(("${CMAKE_BUILD_TYPE}" STREQUAL "") AND ("${CMAKE_CONFIGURATION_TYPE}" STREQUAL ""))
   if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
-	# multi-configuration
-	execute_process(
-	  COMMAND ${CMAKE_COMMAND}
-	  -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
-	  -DCMAKE_CONFIGURATION_TYPE=Release
-	  -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
-	  -P openssl.cmake
-	  )
-	execute_process(
-	  COMMAND ${CMAKE_COMMAND}
-	  -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
-	  -DCMAKE_CONFIGURATION_TYPE=Debug
-	  -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
-	  -P openssl.cmake
-	  )
-	return()
+    # multi-configuration
+    execute_process(
+      COMMAND ${CMAKE_COMMAND}
+      -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+      -DCMAKE_CONFIGURATION_TYPE=Release
+      -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
+      -P openssl.cmake
+      )
+    execute_process(
+      COMMAND ${CMAKE_COMMAND}
+      -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+      -DCMAKE_CONFIGURATION_TYPE=Debug
+      -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
+      -P openssl.cmake
+      )
+    return()
   elseif("$ENV{MSYSTEM}" MATCHES "MINGW32")
-	# mingw on msys2
-	# single-configuration
-	if("${CMAKE_BUILD_TYPE}" STREQUAL "")
-	  set(CMAKE_BUILD_TYPE Release)
-	endif()
+    # mingw on msys2
+    # single-configuration
+    if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+      set(CMAKE_BUILD_TYPE Release)
+    endif()
   elseif("${CMAKE_GENERATOR}" MATCHES "Unix Makefiles")
-	# mingw
-	# single-configuration
-	if("${CMAKE_TOOLCHAIN_FILE}" STREQUAL "")
-	  set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/../mingw.toolchain.cmake")
-	endif()
-	if("${CMAKE_BUILD_TYPE}" STREQUAL "")
-	  set(CMAKE_BUILD_TYPE Release)
-	endif()
+    # mingw
+    # single-configuration
+    if("${CMAKE_TOOLCHAIN_FILE}" STREQUAL "")
+      set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/../mingw.toolchain.cmake")
+    endif()
+    if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+      set(CMAKE_BUILD_TYPE Release)
+    endif()
   elseif("${CMAKE_GENERATOR}" MATCHES "NMake Makefiles")
-	# VS nmake
-	# single-configuration
-	if("${CMAKE_TOOLCHAIN_FILE}" STREQUAL "")
-	  set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/VSToolchain.cmake")
-	endif()
-	if("${CMAKE_BUILD_TYPE}" STREQUAL "")
-	  set(CMAKE_BUILD_TYPE Release)
-	endif()
+    # VS nmake
+    # single-configuration
+    if("${CMAKE_TOOLCHAIN_FILE}" STREQUAL "")
+      set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/VSToolchain.cmake")
+    endif()
+    if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+      set(CMAKE_BUILD_TYPE Release)
+    endif()
   else()
-	# single-configuration
-	if("${CMAKE_BUILD_TYPE}" STREQUAL "")
-	  set(CMAKE_BUILD_TYPE Release)
-	endif()
+    # single-configuration
+    if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+      set(CMAKE_BUILD_TYPE Release)
+    endif()
   endif()
 endif()
 
@@ -86,17 +86,17 @@
 
 if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux")
   find_program(
-	PERL perl
-	)
+    PERL perl
+    )
 else()
-  # CYGWIN 
+  # CYGWIN / Active Perl
   find_program(
-	PERL perl.exe
-	HINTS c:/Perl64/bin
-	HINTS c:/Perl/bin
-	HINTS c:/cygwin/usr/bin
-	HINTS c:/cygwin64/usr/bin
-	)
+    PERL perl.exe
+    HINTS c:/Perl64/bin
+    HINTS c:/Perl/bin
+    HINTS c:/cygwin/usr/bin
+    HINTS c:/cygwin64/usr/bin
+    )
 endif()
 
 if(${PERL} STREQUAL "PERL-NOTFOUND")
@@ -121,183 +121,184 @@
 ########################################
 
 if((${CMAKE_GENERATOR} MATCHES "Visual Studio") OR
-	(${CMAKE_GENERATOR} MATCHES "NMake Makefiles"))
+    (${CMAKE_GENERATOR} MATCHES "NMake Makefiles"))
   ######################################## VS
   if(${CMAKE_GENERATOR} MATCHES "NMake Makefiles")
   elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017")
-	find_program(
-	  VCVARS32 vcvarsall.bat
-	  HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build"
-	  HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC/Auxiliary/Build"
-	  HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/VC/Auxiliary/Build"
-	  )
+    find_program(
+      VCVARS32 vcvarsall.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build"
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC/Auxiliary/Build"
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/VC/Auxiliary/Build"
+      )
   elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 14 2015")
-	find_program(
-	  VCVARS32 vcvars32.bat
-	  HINTS "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin"
-	  )
+    find_program(
+      VCVARS32 vcvars32.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin"
+      )
   elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 12 2013")
-	find_program(
-	  VCVARS32 vcvars32.bat
-	  HINTS "C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/bin"
-	  )
+    find_program(
+      VCVARS32 vcvars32.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/bin"
+      )
   elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 11 2012")
-	find_program(
-	  VCVARS32 vcvars32.bat
-	  HINTS "C:/Program Files (x86)/Microsoft Visual Studio 11.0/VC/bin"
-	  )
+    find_program(
+      VCVARS32 vcvars32.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio 11.0/VC/bin"
+      )
   elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 10 2010")
-	find_program(
-	  VCVARS32 vcvars32.bat
-	  HINTS "C:/Program Files (x86)/Microsoft Visual Studio 10.0/VC/bin"
-	  )
+    find_program(
+      VCVARS32 vcvars32.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio 10.0/VC/bin"
+      )
   elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 9 2008")
-	find_program(
-	  VCVARS32 vcvars32.bat
-	  HINTS "C:/Program Files (x86)/Microsoft Visual Studio 9.0/VC/bin"
-	  )
+    find_program(
+      VCVARS32 vcvars32.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio 9.0/VC/bin"
+      )
   elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 8 2005")
-	find_program(
-	  VCVARS32 vcvars32.bat
-	  HINTS "C:/Program Files (x86)/Microsoft Visual Studio 8/VC/bin"
-	  )
+    find_program(
+      VCVARS32 vcvars32.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio 8/VC/bin"
+      )
   else()
-	message(FATAL_ERROR "CMAKE_GENERATOR ${CMAKE_GENERATOR} not supported")
-  endif()  
+    message(FATAL_ERROR "CMAKE_GENERATOR ${CMAKE_GENERATOR} not supported")
+  endif()
   if(VCVARS32-NOTFOUND)
-	message(FATAL_ERROR "vcvars32.bat not found")
+    message(FATAL_ERROR "vcvars32.bat not found")
   endif()
 
   if(${CMAKE_GENERATOR} MATCHES "Win64")
-	set(CONFIG_TARGET "VC-WIN64A")
-	set(DO_MS "ms\\do_win64a.bat")
+    set(CONFIG_TARGET "VC-WIN64A")
+    set(DO_MS "ms\\do_win64a.bat")
   else()
-	set(CONFIG_TARGET "VC-WIN32")
-	set(DO_MS "ms\\do_ms.bat")
+    set(CONFIG_TARGET "VC-WIN32")
+    set(DO_MS "ms\\do_ms.bat")
   endif()
   if(("${CMAKE_BUILD_TYPE}" STREQUAL "Release") OR ("${CMAKE_CONFIGURATION_TYPE}" STREQUAL "Release"))
   else()
-	set(CONFIG_TARGET "debug-${CONFIG_TARGET}")
+    set(CONFIG_TARGET "debug-${CONFIG_TARGET}")
   endif()
 
   file(WRITE "${SRC_DIR}/build_cmake.bat"
-	"cd %~dp0\n"
-	"setlocal\n"
-	)
+    "cd %~dp0\n"
+    "setlocal\n"
+    )
   file(TO_NATIVE_PATH ${PERL} PERL_N)
   file(TO_NATIVE_PATH ${INSTALL_DIR} INSTALL_DIR_N)
   file(TO_NATIVE_PATH ${VCVARS32} VCVARS32_N)
   string(REGEX REPLACE [[^(.*)\\.*$]] [[\1]] PERL_N_PATH ${PERL_N})
   file(APPEND "${SRC_DIR}/build_cmake.bat"
-	"del crypto\\buildinf.h\n"
-	"setlocal\n"
-	"set PATH=${PERL_N_PATH}\n"
-	"perl Configure no-asm ${CONFIG_TARGET} --prefix=${INSTALL_DIR_N}\n"
-	"call ${DO_MS}\n"
-	"endlocal\n"
-	)
+    "del crypto\\buildinf.h\n"
+    "setlocal\n"
+    "set PATH=${PERL_N_PATH}\n"
+    "perl Configure no-asm ${CONFIG_TARGET} --prefix=${INSTALL_DIR_N}\n"
+    "call ${DO_MS}\n"
+    "endlocal\n"
+    )
   if(${CMAKE_GENERATOR} MATCHES "Visual Studio 8 2005")
-	## Visual Studio 2005 特別処理
-	# include,libパスの設定
-	file(APPEND "${SRC_DIR}/build_cmake.bat"
-	  "set SDK=C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\n"
-	  "set INCLUDE=%SDK%\\Include;%INCLUDE%\n"
-	  "set LIB=%SDK%\\lib;%LIB%\n"
-	  )
+    ## Visual Studio 2005 特別処理
+    # include,libパスの設定
+    file(APPEND "${SRC_DIR}/build_cmake.bat"
+      "set SDK=C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\n"
+      "set INCLUDE=%SDK%\\Include;%INCLUDE%\n"
+      "set LIB=%SDK%\\lib;%LIB%\n"
+      )
   endif()
   if(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017 Win64")
-	file(APPEND "${SRC_DIR}/build_cmake.bat"
-	  "call \"${VCVARS32_N}\" x86_amd64 10.0.17134.0\n"
-	  )
+    file(APPEND "${SRC_DIR}/build_cmake.bat"
+      "call \"${VCVARS32_N}\" x86_amd64 10.0.17134.0\n"
+      )
   elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017")
-	file(APPEND "${SRC_DIR}/build_cmake.bat"
-	  "call \"${VCVARS32_N}\" x86 10.0.17134.0\n"
-	  )
+    file(APPEND "${SRC_DIR}/build_cmake.bat"
+      "call \"${VCVARS32_N}\" x86 10.0.17134.0\n"
+      )
   elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio")
-	file(APPEND "${SRC_DIR}/build_cmake.bat"
-	  "call \"${VCVARS32_N}\"\n"
-	  )
+    file(APPEND "${SRC_DIR}/build_cmake.bat"
+      "call \"${VCVARS32_N}\"\n"
+      )
   endif()
   file(APPEND "${SRC_DIR}/build_cmake.bat"
-	"nmake -f ms\\nt.mak install ${NMAKE_OPTION}\n"
-	)
+    "set PATH=${PERL_N_PATH};%PATH%\n"
+    "nmake -f ms\\nt.mak install ${NMAKE_OPTION}\n"
+    )
 
   set(BUILD_CMAKE_BAT "${SRC_DIR}/build_cmake.bat")
   file(TO_NATIVE_PATH ${BUILD_CMAKE_BAT} BUILD_CMAKE_BAT_N)
   execute_process(
-	COMMAND cmd /c ${BUILD_CMAKE_BAT_N}
-	WORKING_DIRECTORY ${SRC_DIR}
-	RESULT_VARIABLE rv
-	)
+    COMMAND cmd /c ${BUILD_CMAKE_BAT_N}
+    WORKING_DIRECTORY ${SRC_DIR}
+    RESULT_VARIABLE rv
+    )
   if(NOT rv STREQUAL "0")
-	message(FATAL_ERROR "cmake build fail ${rv}")
+    message(FATAL_ERROR "cmake build fail ${rv}")
   endif()
 else()
   ######################################## MinGW
   execute_process(
-	COMMAND "uname" -s
-	OUTPUT_VARIABLE ov)
+    COMMAND "uname" -s
+    OUTPUT_VARIABLE ov)
   string(REGEX MATCH "[A-Za-z0-9]+" UNAME_S ${ov})
   if("${UNAME_S}" STREQUAL "CYGWIN")
-	find_program(
-	  MAKE make.exe
-	  HINTS c:/cygwin/usr/bin
-	  HINTS c:/cygwin64/usr/bin
-	  )
+    find_program(
+      MAKE make.exe
+      HINTS c:/cygwin/usr/bin
+      HINTS c:/cygwin64/usr/bin
+      )
   elseif(("${UNAME_S}" STREQUAL "MINGW32") OR ("${UNAME_S}" STREQUAL "MINGW64"))
-	find_program(
-	  MAKE make
-	  )
+    find_program(
+      MAKE make
+      )
   elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux")
-	find_program(
-	  MAKE make
-	  )
+    find_program(
+      MAKE make
+      )
   else()
-	message(FATAL_ERROR "unsported")
+    message(FATAL_ERROR "unsported")
   endif()
   set(ENV{PATH} "/usr/bin;/bin")
   if("${UNAME_S}" STREQUAL "MINGW32")
-	set(CMAKE_C_COMPILER "cc")
-	set(PATH "/mingw32/bin:/usr/local/bin:/usr/bin:/bin")
+    set(CMAKE_C_COMPILER "cc")
+    set(PATH "/mingw32/bin:/usr/local/bin:/usr/bin:/bin")
   elseif("${UNAME_S}" STREQUAL "MINGW64")
-	set(CMAKE_C_COMPILER "cc")
-	set(PATH "/mingw64/bin:/usr/local/bin:/usr/bin:/bin")
+    set(CMAKE_C_COMPILER "cc")
+    set(PATH "/mingw64/bin:/usr/local/bin:/usr/bin:/bin")
   else()
-	include(${CMAKE_SOURCE_DIR}/../mingw.toolchain.cmake)
-	set(ENV{PREFIX} i686-w64-mingw32)
-	set(ENV{CC} ${CMAKE_C_COMPILER})
-	set(ENV{AR} "i686-w64-mingw32-ar")
-	set(ENV{RANLIB} "i686-w64-mingw32-ranlib")
-	set(PATH "/usr/bin:/bin")
+    include(${CMAKE_SOURCE_DIR}/../mingw.toolchain.cmake)
+    set(ENV{PREFIX} i686-w64-mingw32)
+    set(ENV{CC} ${CMAKE_C_COMPILER})
+    set(ENV{AR} "i686-w64-mingw32-ar")
+    set(ENV{RANLIB} "i686-w64-mingw32-ranlib")
+    set(PATH "/usr/bin:/bin")
   endif()
   if("${UNAME_S}" STREQUAL "MINGW64")
-	set(CONFIG_NAME "mingw64")
+    set(CONFIG_NAME "mingw64")
   else()
-	set(CONFIG_NAME "mingw")
+    set(CONFIG_NAME "mingw")
   endif()
   execute_process(
-	COMMAND ${CMAKE_COMMAND} -E env "PATH=/usr/bin:/bin" ${PERL} ./Configure ${CONFIG_NAME} --prefix=${INSTALL_DIR}
-	WORKING_DIRECTORY ${SRC_DIR}
-	RESULT_VARIABLE rv
-	)
+    COMMAND ${CMAKE_COMMAND} -E env "PATH=/usr/bin:/bin" ${PERL} ./Configure ${CONFIG_NAME} --prefix=${INSTALL_DIR}
+    WORKING_DIRECTORY ${SRC_DIR}
+    RESULT_VARIABLE rv
+    )
   if(NOT rv STREQUAL "0")
-	message(FATAL_ERROR "cmake configure fail ${rv}")
+    message(FATAL_ERROR "cmake configure fail ${rv}")
   endif()
   execute_process(
-	COMMAND ${CMAKE_COMMAND} -E env "PATH=${PATH}" ${MAKE} CC=${CMAKE_C_COMPILER}
-	WORKING_DIRECTORY ${SRC_DIR}
-	RESULT_VARIABLE rv
-	)
+    COMMAND ${CMAKE_COMMAND} -E env "PATH=${PATH}" ${MAKE} CC=${CMAKE_C_COMPILER}
+    WORKING_DIRECTORY ${SRC_DIR}
+    RESULT_VARIABLE rv
+    )
   if(NOT rv STREQUAL "0")
-	message(FATAL_ERROR "cmake build fail ${rv}")
+    message(FATAL_ERROR "cmake build fail ${rv}")
   endif()
   execute_process(
-	COMMAND ${CMAKE_COMMAND} -E env "PATH=${PATH}" ${MAKE} install
-	WORKING_DIRECTORY ${SRC_DIR}
-	RESULT_VARIABLE rv
-	)
+    COMMAND ${CMAKE_COMMAND} -E env "PATH=${PATH}" ${MAKE} install
+    WORKING_DIRECTORY ${SRC_DIR}
+    RESULT_VARIABLE rv
+    )
   if(NOT rv STREQUAL "0")
-	message(FATAL_ERROR "cmake install fail ${rv}")
+    message(FATAL_ERROR "cmake install fail ${rv}")
   endif()
 endif()
 

Modified: branches/cmake/teraterm/common/compat_win.cpp
===================================================================
--- branches/cmake/teraterm/common/compat_win.cpp	2019-03-10 14:34:06 UTC (rev 7474)
+++ branches/cmake/teraterm/common/compat_win.cpp	2019-03-10 14:34:42 UTC (rev 7475)
@@ -1,5 +1,5 @@
 /*
- * (C) 2018 TeraTerm Project
+ * (C) 2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,10 +28,11 @@
 
 /* compat_win */
 
+#include <windows.h>
+#include <tchar.h>
 #include "compat_win.h"
 
-HINSTANCE hDll_msimg32;
-HMODULE hDll_user32;
+#include "dllutil.h"
 
 BOOL (WINAPI *pAlphaBlend)(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION);
 BOOL (WINAPI *pEnumDisplayMonitors)(HDC,LPCRECT,MONITORENUMPROC,LPARAM);
@@ -38,32 +39,36 @@
 DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT dpiContext);
 UINT (WINAPI *pGetDpiForWindow)(HWND hwnd);
 BOOL (WINAPI *pSetLayeredWindowAttributes)(HWND hwnd, COLORREF crKey, BYTE bAlpha, DWORD dwFlags);
+int (WINAPI *pAddFontResourceExA)(LPCSTR name, DWORD fl, PVOID res);
+int (WINAPI *pAddFontResourceExW)(LPCWSTR name, DWORD fl, PVOID res);
+BOOL (WINAPI *pRemoveFontResourceExA)(LPCSTR name, DWORD fl, PVOID pdv);
+BOOL (WINAPI *pRemoveFontResourceExW)(LPCWSTR name, DWORD fl, PVOID pdv);
 
-typedef struct {
-	const char *ApiName;
-	void **func;
-} APIInfo;
-
-typedef struct {
-	const char *DllName;
-	HINSTANCE *hDll;
-	const APIInfo *APIInfoPtr;
-	size_t APIInfoCount;
-} DllInfo;
-
 static const APIInfo Lists_user32[] = {
 	{ "SetLayeredWindowAttributes", (void **)&pSetLayeredWindowAttributes },
 	{ "SetThreadDpiAwarenessContext", (void **)&pSetThreadDpiAwarenessContext },
-	{ "GetDpiForWindow", (void **)&pGetDpiForWindow }
+	{ "GetDpiForWindow", (void **)&pGetDpiForWindow },
+	{ NULL },
 };
-	
+
 static const APIInfo Lists_msimg32[] = {
 	{ "AlphaBlend", (void **)&pAlphaBlend },
+	{ NULL },
 };
-	
+
+static const APIInfo Lists_gdi32[] = {
+	{ "AddFontResourceExA", (void **)&pAddFontResourceExA },
+	{ "RemoveFontResourceExA", (void **)&pRemoveFontResourceExA },
+	{ "AddFontResourceExW", (void **)&pAddFontResourceExW },
+	{ "RemoveFontResourceExW", (void **)&pRemoveFontResourceExW },
+	{ NULL },
+};
+
 static const DllInfo DllInfos[] = {
-	{ "user32.dll", &hDll_user32, Lists_user32, _countof(Lists_user32) },
-	{ "msimg32.dll", &hDll_msimg32, Lists_msimg32, _countof(Lists_msimg32) },
+	{ _T("user32.dll"), DLL_LOAD_LIBRARY_SYSTEM, DLL_ACCEPT_NOT_EXIST, Lists_user32 },
+	{ _T("msimg32.dll"), DLL_LOAD_LIBRARY_SYSTEM, DLL_ACCEPT_NOT_EXIST, Lists_msimg32 },
+	{ _T("gdi32.dll"), DLL_LOAD_LIBRARY_SYSTEM, DLL_ACCEPT_NOT_EXIST, Lists_gdi32 },
+	{ NULL },
 };
 
 void WinCompatInit()
@@ -72,24 +77,5 @@
 	if (done) return;
 	done = TRUE;
 
-	for (size_t i = 0; i < _countof(DllInfos); i++) {
-		const DllInfo *pDllInfo = &DllInfos[i];
-
-		char dllName[MAX_PATH];
-		GetSystemDirectoryA(dllName, sizeof(dllName));
-		strcat_s(dllName, sizeof(dllName), "/");
-		strcat_s(dllName, sizeof(dllName), pDllInfo->DllName);
-
-		HINSTANCE hDll = LoadLibraryA(dllName);
-		*pDllInfo->hDll = hDll;
-
-		if (hDll != NULL) {
-			const APIInfo *pApiInfo = pDllInfo->APIInfoPtr;
-			for (size_t j = 0; j < pDllInfo->APIInfoCount; j++) {
-				void **func = pApiInfo->func;
-				*func = (void *)GetProcAddress(hDll, pApiInfo->ApiName);
-				pApiInfo++;
-			}
-		}
-	}
+	DLLGetApiAddressFromLists(DllInfos);
 }

Modified: branches/cmake/teraterm/common/compat_win.h
===================================================================
--- branches/cmake/teraterm/common/compat_win.h	2019-03-10 14:34:06 UTC (rev 7474)
+++ branches/cmake/teraterm/common/compat_win.h	2019-03-10 14:34:42 UTC (rev 7475)
@@ -47,22 +47,24 @@
 #define WM_DPICHANGED                   0x02E0
 #endif
 
-#if 0
-// BLENDFUNCTION\x82Ɠ\xAF\x88\xEA
-typedef struct _BGBLENDFUNCTION
-{
-    BYTE     BlendOp;
-    BYTE     BlendFlags;
-    BYTE     SourceConstantAlpha;
-    BYTE     AlphaFormat;
-}BGBLENDFUNCTION;
-#endif
 extern BOOL (WINAPI *pAlphaBlend)(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION);
 extern BOOL (WINAPI *pEnumDisplayMonitors)(HDC,LPCRECT,MONITORENUMPROC,LPARAM);
 extern DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT dpiContext);
 extern UINT (WINAPI *pGetDpiForWindow)(HWND hwnd);
 extern BOOL (WINAPI *pSetLayeredWindowAttributes)(HWND hwnd, COLORREF crKey, BYTE bAlpha, DWORD dwFlags);
+extern int (WINAPI *pAddFontResourceExA)(LPCSTR name, DWORD fl, PVOID res);
+extern int (WINAPI *pAddFontResourceExW)(LPCWSTR name, DWORD fl, PVOID res);
+extern BOOL (WINAPI *pRemoveFontResourceExA)(LPCSTR name, DWORD fl, PVOID pdv);
+extern BOOL (WINAPI *pRemoveFontResourceExW)(LPCWSTR name, DWORD fl, PVOID pdv);
 
+#ifdef UNICODE
+#define pAddFontResourceEx		pAddFontResourceExW
+#define pRemoveFontResourceEx	pRemoveFontResourceExW
+#else
+#define pAddFontResourceEx		pAddFontResourceExA
+#define pRemoveFontResourceEx	pRemoveFontResourceExA
+#endif // !UNICODE
+
 void WinCompatInit();
 
 #ifdef __cplusplus

Added: branches/cmake/teraterm/common/dllutil.cpp
===================================================================
--- branches/cmake/teraterm/common/dllutil.cpp	                        (rev 0)
+++ branches/cmake/teraterm/common/dllutil.cpp	2019-03-10 14:34:42 UTC (rev 7475)
@@ -0,0 +1,284 @@
+/*
+ * (C) 2019 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <windows.h>
+#include <tchar.h>
+#include <assert.h>
+#include <crtdbg.h>
+
+#include "dllutil.h"
+
+#ifdef _DEBUG
+#define malloc(l)     _malloc_dbg((l), _NORMAL_BLOCK, __FILE__, __LINE__)
+#define free(p)       _free_dbg((p), _NORMAL_BLOCK)
+#define _strdup(s)	  _strdup_dbg((s), _NORMAL_BLOCK, __FILE__, __LINE__)
+#endif
+
+typedef struct {
+	const TCHAR *dllName;
+	DLLLoadFlag LoadFlag;
+	HMODULE handle;
+	int refCount;
+} HandleList_t;
+
+static HandleList_t *HandleList;
+static int HandleListCount;
+
+static HMODULE GetHandle(const TCHAR *dllName, DLLLoadFlag LoadFlag)
+{
+	TCHAR dllPath[MAX_PATH];
+	HMODULE module;
+	int i;
+	HandleList_t *p;
+	int r;
+
+	if (LoadFlag == DLL_GET_MODULE_HANDLE) {
+		module = GetModuleHandle(dllName);
+		assert(module != NULL);
+		return module;
+	}
+
+	// \x88ȑO\x82Ƀ\x8D\x81[\x83h\x82\xB5\x82\xBD?
+	p = HandleList;
+	for (i = 0; i < HandleListCount; i++) {
+		if (_tcscmp(p->dllName, dllName) == 0) {
+			p->refCount++;
+			return p->handle;
+		}
+		p++;
+	}
+
+	// \x90V\x82\xBD\x82Ƀ\x8D\x81[\x83h\x82\xB7\x82\xE9
+	dllPath[0] = 0;
+	switch (LoadFlag) {
+	case DLL_LOAD_LIBRARY_SYSTEM:
+		r = GetSystemDirectory(dllPath, _countof(dllPath));
+		assert(r != 0);
+		if (r == 0) return NULL;
+		break;
+	case DLL_LOAD_LIBRARY_CURRENT:
+		r = GetModuleFileName(NULL, dllPath, _countof(dllPath));
+		assert(r != 0);
+		if (r == 0) return NULL;
+		*_tcsrchr(dllPath, _T('\\')) = 0;
+		break;
+	default:
+		return NULL;
+	}
+	_tcscat_s(dllPath, _countof(dllPath), _T("\\"));
+	_tcscat_s(dllPath, _countof(dllPath), dllName);
+	module = LoadLibrary(dllPath);
+	if (module == NULL) {
+		// \x91\xB6\x8D݂\xB5\x82Ȃ\xA2,dll\x82\xB6\x82\xE1\x82Ȃ\xA2?
+		return NULL;
+	}
+
+	// \x83\x8A\x83X\x83g\x82ɒlj\xC1
+	HandleListCount++;
+	HandleList = (HandleList_t *)realloc(HandleList, sizeof(HandleList_t)*HandleListCount);
+	p = &HandleList[i];
+	p->dllName = _tcsdup(dllName);
+	p->handle = module;
+	p->LoadFlag = LoadFlag;
+	p->refCount = 1;
+	return module;
+}
+
+static void FreeHandle(const TCHAR *dllName, DLLLoadFlag LoadFlag)
+{
+	int i;
+	HandleList_t *p;
+
+	if (LoadFlag == DLL_GET_MODULE_HANDLE) {
+		// \x82\xBB\x82̂܂ܒu\x82\xA2\x82Ă\xA8\x82\xAD
+		return;
+	}
+
+	// \x83\x8A\x83X\x83g\x82\xA9\x82\xE7\x8D폜\x82\xB7\x82\xE9
+	p = HandleList;
+	for (i = 0; i < HandleListCount; i++) {
+		if (_tcscmp(p->dllName, dllName) != 0) {
+			continue;
+		}
+
+		// \x8C\xA9\x82‚\xA9\x82\xC1\x82\xBD
+		p->refCount--;
+		if (p->refCount > 0) {
+			continue;
+		}
+
+		// free
+		FreeLibrary(p->handle);
+		free((void *)p->dllName);
+		memcpy(p, p+1, sizeof(*p) + (HandleListCount - i - 1));
+		HandleListCount--;
+		HandleList = (HandleList_t *)realloc(HandleList, sizeof(HandleList_t)*HandleListCount);
+		return;
+	}
+	// \x83\x8A\x83X\x83g\x82Ɍ\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA9\x82\xC1\x82\xBD
+}
+
+/**
+ * DLL\x93\xE0\x82̊֐\x94\x82ւ̃A\x83h\x83\x8C\x83X\x82\xF0\x8E擾\x82\xB7\x82\xE9
+ * @param[in,out]	pFunc		\x8A֐\x94\x82ւ̃A\x83h\x83\x8C\x83X
+ *								\x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA2\x8E\x9E\x82\xCDNULL\x82\xAA\x91\xE3\x93\xFC\x82\xB3\x82\xEA\x82\xE9
+ * @param[in] 		FuncFlag	\x8A֐\x94\x82\xAA\x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA2\x82Ƃ\xAB\x82̓\xAE\x8D\xEC
+ *					DLL_ACCEPT_NOT_EXIST	\x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xAD\x82Ă\xE0ok
+ *					DLL_ERROR_NOT_EXIST		\x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA2\x8Fꍇ\x83G\x83\x89\x81[
+ * @retval	NO_ERROR				\x83G\x83\x89\x81[\x82Ȃ\xB5
+ * @retval	ERROR_FILE_NOT_FOUND	DLL\x82\xAA\x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA2(\x95s\x90\xB3\x82ȃt\x83@\x83C\x83\x8B)
+ * @retval	ERROR_PROC_NOT_FOUND	\x8A֐\x94\x83G\x83\x93\x83g\x83\x8A\x82\xAA\x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA2
+ */
+DWORD DLLGetApiAddress(const TCHAR *dllPath, DLLLoadFlag LoadFlag,
+					   const char *ApiName, void **pFunc)
+{
+	HMODULE hDll = GetHandle(dllPath, LoadFlag);
+	if (hDll == NULL) {
+		*pFunc = NULL;
+		return ERROR_FILE_NOT_FOUND;
+	} else {
+		*pFunc = GetProcAddress(hDll, ApiName);
+		if (*pFunc == NULL) {
+			return ERROR_PROC_NOT_FOUND;
+		}
+		return NO_ERROR; // = 0
+	}
+}
+
+/**
+ * DLL\x93\xE0\x82̕\xA1\x90\x94\x82̊֐\x94\x82ւ̃A\x83h\x83\x8C\x83X\x82\xF0\x8E擾\x82\xB7\x82\xE9
+ * @param[in] FuncFlag	\x8A֐\x94\x82\xAA\x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA2\x82Ƃ\xAB\x82̓\xAE\x8D\xEC
+ *				DLL_ACCEPT_NOT_EXIST	\x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xAD\x82Ă\xE0ok
+ *				DLL_ERROR_NOT_EXIST		\x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA2\x8Fꍇ\x83G\x83\x89\x81[
+ * @retval	NO_ERROR				\x83G\x83\x89\x81[\x82Ȃ\xB5
+ * @retval	ERROR_FILE_NOT_FOUND	DLL\x82\xAA\x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA2(\x95s\x90\xB3\x82ȃt\x83@\x83C\x83\x8B)
+ * @retval	ERROR_PROC_NOT_FOUND	\x8A֐\x94\x83G\x83\x93\x83g\x83\x8A\x82\xAA\x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA2
+ */
+DWORD DLLGetApiAddressFromList(const TCHAR *dllPath, DLLLoadFlag LoadFlag,
+							   DLLFuncFlag FuncFlag, const APIInfo *ApiInfo)
+{
+	HMODULE hDll = GetHandle(dllPath, LoadFlag);
+	if (hDll == NULL) {
+		while(ApiInfo->ApiName != NULL) {
+			void **func = ApiInfo->func;
+			*func = NULL;
+			ApiInfo++;
+		}
+		return ERROR_FILE_NOT_FOUND;
+	} else {
+		BOOL exist_all = TRUE;
+		const APIInfo *p = ApiInfo;
+
+		// \x83A\x83h\x83\x8C\x83X\x8E擾
+		while(p->ApiName != NULL) {
+			void **func = p->func;
+			*func = (void *)GetProcAddress(hDll, p->ApiName);
+			if (*func == NULL) {
+				exist_all = FALSE;
+			}
+			p++;
+		}
+
+		// \x82\xB7\x82ׂČ\xA9\x82‚\xA9\x82\xC1\x82\xBD or \x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA2API\x82\xAA\x82\xA0\x82\xC1\x82Ă\xE0ok
+		if (exist_all || FuncFlag == DLL_ACCEPT_NOT_EXIST) {
+			return NO_ERROR;
+		}
+
+		// \x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA2API\x82\xAA\x82\xA0\x82\xC1\x82\xBD\x82̂ŃG\x83\x89\x81[
+		p = ApiInfo;
+		while(p->ApiName != NULL) {
+			void **func = p->func;
+			*func = NULL;
+			p++;
+		}
+		FreeHandle(dllPath, LoadFlag);
+		return ERROR_PROC_NOT_FOUND;
+	}
+}
+
+void DLLGetApiAddressFromLists(const DllInfo *dllInfos)
+{
+	while (dllInfos->DllName != NULL) {
+		DLLGetApiAddressFromList(dllInfos->DllName,
+								 dllInfos->LoadFlag,
+								 dllInfos->FuncFlag,
+								 dllInfos->APIInfoPtr);
+		dllInfos++;
+	}
+}
+
+static void SetupLoadLibraryPath(void)
+{
+	BOOL (WINAPI *pSetDefaultDllDirectories)(DWORD);
+	BOOL (WINAPI *pSetDllDirectoryA)(LPCSTR);
+	const TCHAR *kernel32 = _T("kernel32.dll");
+
+#if !defined(LOAD_LIBRARY_SEARCH_SYSTEM32)
+#define LOAD_LIBRARY_SEARCH_SYSTEM32        0x00000800
+#endif
+
+	// SetDefaultDllDirectories() \x82\xAA\x8Eg\x82\xA6\x82\xE9\x8Fꍇ\x82́A
+	// \x8C\x9F\x8D\xF5\x83p\x83X\x82\xF0 %WINDOWS%\system32 \x82݂̂ɐݒ肷\x82\xE9
+	DLLGetApiAddress(kernel32, DLL_GET_MODULE_HANDLE,
+					 "SetDefaultDllDirectories", (void **)&pSetDefaultDllDirectories);
+	if (pSetDefaultDllDirectories != NULL) {
+		pSetDefaultDllDirectories(LOAD_LIBRARY_SEARCH_SYSTEM32);
+		return;
+	}
+
+	// SetDefaultDllDirectories() \x82\xAA\x8Eg\x82\xA6\x82Ȃ\xAD\x82Ă\xE0
+	// SetDllDirectory() \x82\xAA\x8Eg\x82\xA6\x82\xE9\x8Fꍇ\x82\xCD
+	// \x83J\x83\x8C\x83\x93\x83g\x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82\xBE\x82\xAF\x82ł\xE0\x8C\x9F\x8D\xF5\x83p\x83X\x82\xA9\x82\xE7\x82͂\xB8\x82\xB5\x82Ă\xA8\x82\xAD\x81B
+	DLLGetApiAddress(kernel32, DLL_GET_MODULE_HANDLE,
+					 "SetDllDirectoryA", (void **)&pSetDllDirectoryA);
+	if (pSetDllDirectoryA != NULL) {
+		pSetDllDirectoryA("");
+	}
+}
+
+void DLLInit()
+{
+	HandleList = NULL;
+	HandleListCount = 0;
+	SetupLoadLibraryPath();
+}
+
+void DLLExit()
+{
+	int i;
+	for (i = 0; i < HandleListCount; i++) {
+		HandleList_t *p = &HandleList[i];
+		if (p->LoadFlag != DLL_GET_MODULE_HANDLE) {
+			FreeLibrary(p->handle);
+		}
+		free((void *)p->dllName);
+	}
+	free(HandleList);
+	HandleList = NULL;
+	HandleListCount = 0;
+}

Copied: branches/cmake/teraterm/common/dllutil.h (from rev 7474, branches/cmake/teraterm/common/compat_win.h)
===================================================================
--- branches/cmake/teraterm/common/dllutil.h	                        (rev 0)
+++ branches/cmake/teraterm/common/dllutil.h	2019-03-10 14:34:42 UTC (rev 7475)
@@ -0,0 +1,66 @@
+/*
+ * (C) 2019 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum {
+	DLL_GET_MODULE_HANDLE,
+	DLL_LOAD_LIBRARY_SYSTEM,
+	DLL_LOAD_LIBRARY_CURRENT,
+} DLLLoadFlag;
+
+typedef enum {
+	DLL_ACCEPT_NOT_EXIST,
+	DLL_ERROR_NOT_EXIST,
+} DLLFuncFlag;
+
+typedef struct {
+	const char *ApiName;
+	void **func;
+} APIInfo;
+
+typedef struct {
+	const TCHAR *DllName;
+	DLLLoadFlag LoadFlag;
+	DLLFuncFlag FuncFlag;
+	const APIInfo *APIInfoPtr;
+} DllInfo;
+
+void DLLInit();
+void DLLExit();
+void DLLGetApiAddressFromLists(const DllInfo *dllInfos);
+DWORD DLLGetApiAddressFromList(const TCHAR *dllPath, DLLLoadFlag LoadFlag,
+							   DLLFuncFlag FuncFlag, const APIInfo *ApiInfo);
+DWORD DLLGetApiAddress(const TCHAR *dllPath, DLLLoadFlag LoadFlag,
+					   const char *ApiName, void **pFunc);
+
+#ifdef __cplusplus
+}
+#endif

Modified: branches/cmake/teraterm/keycode/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/keycode/CMakeLists.txt	2019-03-10 14:34:06 UTC (rev 7474)
+++ branches/cmake/teraterm/keycode/CMakeLists.txt	2019-03-10 14:34:42 UTC (rev 7475)
@@ -1,16 +1,5 @@
 project(keycode)
 
-if (MSVC)
-    string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG            ${CMAKE_C_FLAGS_DEBUG})
-    string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_MINSIZEREL       ${CMAKE_C_FLAGS_MINSIZEREL})
-    string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE          ${CMAKE_C_FLAGS_RELEASE})
-    string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELWITHDEBINFO   ${CMAKE_C_FLAGS_RELWITHDEBINFO})
-    string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG          ${CMAKE_CXX_FLAGS_DEBUG})
-    string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_MINSIZEREL     ${CMAKE_CXX_FLAGS_MINSIZEREL})
-    string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE        ${CMAKE_CXX_FLAGS_RELEASE})
-    string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
-endif ()
-
 if(USE_UNICODE_API)
   add_definitions(-DUNICODE -D_UNICODE)
 endif()
@@ -38,5 +27,4 @@
 
 target_link_libraries(
   keycode
-  gdi32
   )

Modified: branches/cmake/teraterm/teraterm/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/teraterm/CMakeLists.txt	2019-03-10 14:34:06 UTC (rev 7474)
+++ branches/cmake/teraterm/teraterm/CMakeLists.txt	2019-03-10 14:34:42 UTC (rev 7475)
@@ -35,6 +35,8 @@
   ../common/win16api.h
   ../common/win16api.c
   ../common/dlglib_tmpl.cpp
+  ../common/codemap.h
+  ../common/compat_w95.h
   ../common/compat_win.cpp
   ../common/compat_win.h
   ../common/tmfc.cpp
@@ -44,7 +46,8 @@
   ../common/i18n.h
   ../common/win16api.h
   ../common/win16api.c
-  ../ttpcmn/language.h
+  ../common/dllutil.cpp
+  ../common/dllutil.h
   ../common/codeconv.h
   ../common/codeconv.cpp
   #
@@ -118,6 +121,7 @@
   ttplug.h
   ttsetup.c
   ttsetup.h
+  tt-version.rc
   ttwinman.c
   ttwinman.h
   ttwsk.c
@@ -177,7 +181,6 @@
 
 target_link_libraries(
   teraterm
-  ${UNICOWS_LIB}
   ttpcmn
   ttpfile
   ttpset

Modified: branches/cmake/teraterm/teraterm/buffer.c
===================================================================
--- branches/cmake/teraterm/teraterm/buffer.c	2019-03-10 14:34:06 UTC (rev 7474)
+++ branches/cmake/teraterm/teraterm/buffer.c	2019-03-10 14:34:42 UTC (rev 7475)
@@ -2410,7 +2410,7 @@
 				TempAttr = CurAttr;
 				TempSel = CurSel;
 			}
-#if 1
+#if 0
 			{
 				OutputDebugPrintf("(%d,%d)[%d],%d\n", i, j - PageStart, count, CurAttr.Attr);
 				bufA[lenA] = 0;

Modified: branches/cmake/teraterm/teraterm/teraterm.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/teraterm.cpp	2019-03-10 14:34:06 UTC (rev 7474)
+++ branches/cmake/teraterm/teraterm/teraterm.cpp	2019-03-10 14:34:42 UTC (rev 7475)
@@ -30,6 +30,7 @@
 /* TERATERM.EXE, main */
 
 #include <crtdbg.h>
+#include <tchar.h>
 #include "teraterm.h"
 #include "tttypes.h"
 #include "commlib.h"
@@ -45,36 +46,101 @@
 #include "tekwin.h"
 #include "ttdde.h"
 #include "keyboard.h"
+#include "dllutil.h"
 #include "compat_win.h"
 #include "compat_w95.h"
 #include "dlglib.h"
 #include "teraterml.h"
 
-static void init()
+
+
+typedef struct {
+	const TCHAR *FaceName;
+	bool found;
+} EnumFontInfo;
+
+static int CALLBACK EnumFontExProc(
+	ENUMLOGFONT* lpelf, NEWTEXTMETRIC* lpntm,
+	int nFontType, LPARAM lParam)
 {
-	typedef BOOL (WINAPI *pSetDllDir)(LPCSTR);
-	typedef BOOL (WINAPI *pSetDefDllDir)(DWORD);
+	EnumFontInfo *info = (EnumFontInfo *)lParam;
+	if (nFontType == DEVICE_FONTTYPE) {
+		// \x90ڑ\xB1\x82\xB3\x82ꂽ\x83f\x83o\x83C\x83X(\x83v\x83\x8A\x83\x93\x83^\x82Ȃ\xC7)\x93\xE0\x82̃t\x83H\x83\x93\x83g
+		return 1;
+	}
+	const TCHAR *FaceName = lpelf->elfLogFont.lfFaceName;
+	if (_tcscmp(info->FaceName, FaceName) == 0) {
+		info->found = true;
+		return 0;
+	}
+	return 1;
+}
 
-	HMODULE module;
-	pSetDllDir setDllDir;
-	pSetDefDllDir setDefDllDir;
+BOOL isExistFont(const TCHAR *FaceName)
+{
+	HDC hDC = GetDC(NULL);
+	LOGFONT lf;
+	memset(&lf, 0, sizeof(lf));
+	lf.lfCharSet = DEFAULT_CHARSET;// SHIFTJIS_CHARSET;
+	lf.lfPitchAndFamily = 0;
 
-	if ((module = GetModuleHandleA("kernel32.dll")) != NULL) {
-		if ((setDefDllDir = (pSetDefDllDir)GetProcAddress(module, "SetDefaultDllDirectories")) != NULL) {
-			// SetDefaultDllDirectories() \x82\xAA\x8Eg\x82\xA6\x82\xE9\x8Fꍇ\x82́A\x8C\x9F\x8D\xF5\x83p\x83X\x82\xF0 %WINDOWS%\system32 \x82݂̂ɐݒ肷\x82\xE9
-			(*setDefDllDir)((DWORD)0x00000800); // LOAD_LIBRARY_SEARCH_SYSTEM32
+	EnumFontInfo info;
+	info.FaceName = FaceName;
+	info.found = false;
+	EnumFontFamiliesEx(hDC, &lf, (FONTENUMPROC)EnumFontExProc, (LPARAM)&info, 0);
+	ReleaseDC(NULL, hDC);
+	return info.found;
+}
+
+static BOOL AddFontFlag;
+static TCHAR TSpecialFont[MAX_PATH];
+
+static void LoadSpecialFont()
+{
+	if (!isExistFont(_T("Tera Special"))) {
+		int r;
+
+		if (GetModuleFileName(NULL, TSpecialFont,_countof(TSpecialFont)) == 0) {
+			AddFontFlag = FALSE;
+			return;
 		}
-		else if ((setDllDir = (pSetDllDir)GetProcAddress(module, "SetDllDirectoryA")) != NULL) {
-			// SetDefaultDllDirectories() \x82\xAA\x8Eg\x82\xA6\x82Ȃ\xAD\x82Ă\xE0\x81ASetDllDirectory() \x82\xAA\x8Eg\x82\xA6\x82\xE9\x8Fꍇ\x82\xCD
-			// \x83J\x83\x8C\x83\x93\x83g\x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82\xBE\x82\xAF\x82ł\xE0\x8C\x9F\x8D\xF5\x83p\x83X\x82\xA9\x82\xE7\x82͂\xB8\x82\xB5\x82Ă\xA8\x82\xAD\x81B
-			(*setDllDir)("");
+		*_tcsrchr(TSpecialFont, _T('\\')) = 0;
+		_tcscat_s(TSpecialFont, _T("\\TSPECIAL1.TTF"));
+
+		if (pAddFontResourceEx != NULL) {
+			// teraterm.exe\x82݂̂ŗL\x8C\xF8\x82ȃt\x83H\x83\x93\x83g\x82ƂȂ\xE9\x81B
+			// remove\x82\xB5\x82Ȃ\xAD\x82Ă\xE0\x8FI\x97\xB9\x82\xB7\x82\xE9\x82\xC6OS\x82\xA9\x82\xE7\x82Ȃ\xAD\x82Ȃ\xE9
+			r = pAddFontResourceEx(TSpecialFont, FR_PRIVATE, NULL);
+		} else {
+			// \x83V\x83X\x83e\x83\x80\x91S\x91̂Ŏg\x82\xA6\x82\xE9\x83t\x83H\x83\x93\x83g\x82ƂȂ\xE9
+			// remove\x82\xB5\x82Ȃ\xA2\x82\xC6OS\x82\xAA\x92͂񂾂܂܂ƂȂ\xE9
+			r = AddFontResource(TSpecialFont);
 		}
+		if (r != 0) {
+			AddFontFlag = TRUE;
+		}
 	}
+}
 
+static void UnloadSpecialFont()
+{
+	if (AddFontFlag) {
+		if (pRemoveFontResourceEx != NULL) {
+			pRemoveFontResourceEx(TSpecialFont, FR_PRIVATE, NULL);
+		} else {
+			RemoveFontResource(TSpecialFont);
+		}
+	}
+}
+
+static void init()
+{
+	DLLInit();
 	WinCompatInit();
 	if (pSetThreadDpiAwarenessContext) {
 		pSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
 	}
+	LoadSpecialFont();
 }
 
 // Tera Term main engine
@@ -292,5 +358,8 @@
 	delete m_pMainWnd;
 	m_pMainWnd = NULL;
 
+	UnloadSpecialFont();
+	DLLExit();
+
     return msg.wParam;
 }

Modified: branches/cmake/teraterm/teraterm/ttdialog.c
===================================================================
--- branches/cmake/teraterm/teraterm/ttdialog.c	2019-03-10 14:34:06 UTC (rev 7474)
+++ branches/cmake/teraterm/teraterm/ttdialog.c	2019-03-10 14:34:42 UTC (rev 7475)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2007-2018 TeraTerm Project
+ * (C) 2007-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Modified: branches/cmake/teraterm/teraterm/ttermpro.vcproj
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.vcproj	2019-03-10 14:34:06 UTC (rev 7474)
+++ branches/cmake/teraterm/teraterm/ttermpro.vcproj	2019-03-10 14:34:42 UTC (rev 7475)
@@ -393,6 +393,18 @@
 				RelativePath="..\common\win16api.c"
 				>
 			</File>
+			<File
+				RelativePath="..\common\compat_win.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\common\dllutil.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\common\codeconv.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"

Modified: branches/cmake/teraterm/teraterm/vtdisp.c
===================================================================
--- branches/cmake/teraterm/teraterm/vtdisp.c	2019-03-10 14:34:06 UTC (rev 7474)
+++ branches/cmake/teraterm/teraterm/vtdisp.c	2019-03-10 14:34:42 UTC (rev 7475)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2005-2018 TeraTerm Project
+ * (C) 2005-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -113,7 +113,8 @@
 // caret variables
 static int CaretStatus;
 static BOOL CaretEnabled = TRUE;
-BOOL IMEstat;		/* IME Status  TRUE=IME ON */
+BOOL IMEstat;				/* IME Status  TRUE=IME ON */
+BOOL IMEShowingCandidate;	/* \x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x95\\x8E\xA6\x8F\xF3\x8B\xB5 TRUE=\x95\\x8E\xA6\x92\x86 */
 
 // ---- device context and status flags
 static HDC VTDC = NULL; /* Device context for VT window */
@@ -1577,14 +1578,15 @@
 
   // AlphaBlend \x82̃A\x83h\x83\x8C\x83X\x82\xF0\x93ǂݍ\x9E\x82\xDD
   if(BGUseAlphaBlendAPI) {
-	BGAlphaBlend = pAlphaBlend;
+	if(pAlphaBlend != NULL)
+	  BGAlphaBlend = pAlphaBlend;
+	else
+	  BGAlphaBlend = AlphaBlendWithoutAPI;
   }
   else {
     BGAlphaBlend = NULL;
   }
 
-  if(!BGAlphaBlend)
-    BGAlphaBlend = AlphaBlendWithoutAPI;
 }
 
 void BGExchangeColor() {
@@ -2196,6 +2198,15 @@
 
 		CaretX = (CursorX-WinOrgX)*FontWidth;
 		CaretY = (CursorY-WinOrgY)*FontHeight;
+
+		if (IMEstat && IMEShowingCandidate) {
+			// IME ON && \x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x95\\x8E\xA6\x92\x86\x82̏ꍇ\x82݂̂̏\x88\x97\x9D
+			// \x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82\xAA\x95\\x8E\xA6\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x8F\xF3\x91Ԃ\xC5
+			// \x83z\x83X\x83g\x82\xA9\x82\xE7\x82̃G\x83R\x81[\x82\xF0\x8E\xF3\x90M\x82\xB5\x82\xC4caret\x88ʒu\x82\xAA\x95ω\xBB\x82\xB5\x82\xBD\x8Fꍇ\x81A
+			// \x95ϊ\xB7\x83E\x83B\x83\x93\x83h\x83E\x82̈ʒu\x82\xF0\x8DX\x90V\x82\xB7\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE9
+			SetConversionWindow(HVTWin,CaretX,CaretY);
+		}
+
 		if (ts.CursorShape!=IdVCur) {
 			if (ts.CursorShape==IdHCur) {
 				CaretY = CaretY+FontHeight-CurWidth;

Modified: branches/cmake/teraterm/teraterm/vtdisp.h
===================================================================
--- branches/cmake/teraterm/teraterm/vtdisp.h	2019-03-10 14:34:06 UTC (rev 7474)
+++ branches/cmake/teraterm/teraterm/vtdisp.h	2019-03-10 14:34:42 UTC (rev 7475)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2008-2017 TeraTerm Project
+ * (C) 2008-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -130,6 +130,7 @@
 extern TCharAttr DefCharAttr;
 
 extern BOOL IMEstat;
+extern BOOL IMEShowingCandidate;
 
 #define SCROLL_BOTTOM	1
 #define SCROLL_LINEDOWN	2

Modified: branches/cmake/teraterm/teraterm/vtterm.c
===================================================================
--- branches/cmake/teraterm/teraterm/vtterm.c	2019-03-10 14:34:06 UTC (rev 7474)
+++ branches/cmake/teraterm/teraterm/vtterm.c	2019-03-10 14:34:42 UTC (rev 7475)
@@ -52,8 +52,9 @@
 #include "telnet.h"
 #include "ttime.h"
 #include "clipboar.h"
-#include "../ttpcmn/language.h"
 #include "codeconv.h"
+#include "codeconv.h"
+#include "codeconv.h"
 
 #include "vtterm.h"
 
@@ -5522,7 +5523,6 @@
 {
 	int ret;
 	char mbchar[2];
-	unsigned short cset;
 
 	// Unicode\x82\xA9\x82\xE7DEC\x93\xC1\x8Eꕶ\x8E\x9A\x82ւ̃}\x83b\x83s\x83\x93\x83O
 	if (ts.UnicodeDecSpMapping) {
@@ -5534,19 +5534,18 @@
 	}
 
 	// Unicode -> \x93\xE0\x95\x94\x83R\x81[\x83h(ts.CodePage)\x82֕ϊ\xB7\x82\xB5\x82ďo\x97\xCD
-	if (ts.CodePage == 932) {
-		ret = (int)UTF32ToCP932(code, mbchar, 2);
-	} else {
-		if (code >= 0x10000) {
-			goto unknown;
-		}
-		wchar_t wchar;
-		wchar = (wchar_t)code;
-		ret = WideCharToMultiByte(ts.CodePage, 0, &wchar, 1, mbchar, 2, NULL, NULL);
+	mblen = UTF32ToMBCP(code, ts.CodePage, mbchar, 2);
+#if 1	// U+203e OVERLINE \x93\xC1\x95ʏ\x88\x97\x9D
+	if (code == 0x203e && ts.CodePage == 932) {
+		// U+203e\x82\xCD0x7e'~'\x82ɕϊ\xB7\x82\xB3\x82\xEA\x82\xE9
+		// \x96\xB3\x97\x9D\x82\xE2\x82芿\x8E\x9A\x8Fo\x97͂\xB7\x82\xE9
+		mbchar[0] = 0;			// \x82\xB1\x82\xCC0\x82̂\xBD\x82߁A\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82ɕ\xB6\x8E\x9A\x97񂪂\xA4\x82܂\xAD\x93\xFC\x82\xE7\x82Ȃ\xA2
+		mbchar[1] = 0x7e;
+		mblen = 2;
 	}
-	switch (ret) {
+#endif
+	switch (mblen) {
 	case 0:
-	unknown:
 		PutChar('?');
 		if (ts.UnknownUnicodeCharaAsWide) {
 			PutChar('?');

Modified: branches/cmake/teraterm/teraterm/vtwin.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/vtwin.cpp	2019-03-10 14:34:06 UTC (rev 7474)
+++ branches/cmake/teraterm/teraterm/vtwin.cpp	2019-03-10 14:34:42 UTC (rev 7475)
@@ -180,6 +180,7 @@
 	ON_WM_VSCROLL()
 	ON_WM_DEVICECHANGE()
 	ON_MESSAGE(WM_IME_STARTCOMPOSITION,OnIMEStartComposition)
+	ON_MESSAGE(WM_IME_ENDCOMPOSITION,OnIMEEndComposition)
 	ON_MESSAGE(WM_IME_COMPOSITION,OnIMEComposition)
 	ON_MESSAGE(WM_INPUTLANGCHANGE,OnIMEInputChange)
 	ON_MESSAGE(WM_IME_NOTIFY,OnIMENotify)
@@ -3099,6 +3100,8 @@
 
 LRESULT CVTWindow::OnIMEStartComposition(WPARAM wParam, LPARAM lParam)
 {
+	IMEShowingCandidate = TRUE;
+
 	// \x88ʒu\x82\xF0\x92ʒm\x82\xB7\x82\xE9
 	int CaretX = (CursorX-WinOrgX)*FontWidth;
 	int CaretY = (CursorY-WinOrgY)*FontHeight;
@@ -3107,6 +3110,12 @@
 	return CFrameWnd::DefWindowProc(WM_IME_STARTCOMPOSITION,wParam,lParam);
 }
 
+LRESULT CVTWindow::OnIMEEndComposition(WPARAM wParam, LPARAM lParam)
+{
+	IMEShowingCandidate = FALSE;
+	return CFrameWnd::DefWindowProc(WM_IME_ENDCOMPOSITION,wParam,lParam);
+}
+
 LRESULT CVTWindow::OnIMEComposition(WPARAM wParam, LPARAM lParam)
 {
 	if (CanUseIME()) {
@@ -3145,7 +3154,10 @@
 
 LRESULT CVTWindow::OnIMENotify(WPARAM wParam, LPARAM lParam)
 {
-	if (wParam == IMN_SETOPENSTATUS) {
+	switch (wParam) {
+	case IMN_SETOPENSTATUS: {
+		// \x93\xFC\x97̓R\x83\x93\x83e\x83L\x83X\x83g\x82̊J\x95\xF3\x91Ԃ\xAA\x8DX\x90V\x82\xB3\x82\xEA\x82\xE9(IME On/OFF)
+
 		// IME\x82\xCCOn/Off\x82\xF0\x8E擾\x82\xB7\x82\xE9
 		IMEstat = GetIMEOpenStatus();
 
@@ -3156,8 +3168,32 @@
 
 		// \x95`\x89\xE6
 		ChangeCaret();
+
+		break;
 	}
 
+	// \x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82̕\\x8E\xA6\x8F󋵒ʒm
+	// IME_OPENCANDIDATE / IMN_CLOSECANDIDATE \x83T\x83|\x81[\x83g\x8F\xF3\x8B\xB5
+	//
+	//  IME								status
+	//  --------------------------------+----------
+	//  MS IME \x93\xFA\x96{\x8C\xEA(Windows 10 1809)	suport
+	//  Google \x93\xFA\x96{\x8C\xEA\x93\xFC\x97\xCD(2.24.3250.0)	not support
+	//
+	// WM_IME_STARTCOMPOSITION, WM_IME_ENDCOMPOSITION\x82݂̂Ŕ\xBB\x92\xE8\x89”\\x82\xBE\x82\xAA
+	// \x94O\x82ׂ̈\xB1\x82̃\x81\x83b\x83Z\x81[\x83W\x82\xE0\x8F\x88\x97\x9D\x82\xB7\x82\xE9
+	case IMN_OPENCANDIDATE:
+		// \x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8AJ\x82\xB1\x82\xA4\x82Ƃ\xB5\x82Ă\xA2\x82\xE9
+		IMEShowingCandidate = TRUE;
+		break;
+	case IMN_CLOSECANDIDATE:
+		// \x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x95‚\xB6\x82悤\x82Ƃ\xB5\x82Ă\xA2\x82\xE9
+		IMEShowingCandidate = FALSE;
+		break;
+	default:
+		break;
+	}
+
 	return CFrameWnd::DefWindowProc(WM_IME_NOTIFY,wParam,lParam);
 }
 
@@ -6202,6 +6238,9 @@
 	case WM_IME_STARTCOMPOSITION :
 		OnIMEStartComposition(wp, lp);
 		break;
+	case WM_IME_ENDCOMPOSITION :
+		OnIMEEndComposition(wp, lp);
+		break;
 	case WM_IME_COMPOSITION:
 		OnIMEComposition(wp, lp);
 		break;

Modified: branches/cmake/teraterm/teraterm/vtwin.h
===================================================================
--- branches/cmake/teraterm/teraterm/vtwin.h	2019-03-10 14:34:06 UTC (rev 7474)
+++ branches/cmake/teraterm/teraterm/vtwin.h	2019-03-10 14:34:42 UTC (rev 7475)
@@ -136,7 +136,8 @@
 	afx_msg LRESULT OnExitSizeMove(WPARAM wParam, LPARAM lParam);
 //-->
 	afx_msg LRESULT OnIMEStartComposition(WPARAM wParam, LPARAM lParam);
-	afx_msg LRESULT OnIMEComposition(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnIMEEndComposition(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnIMEComposition(UINT wParam, LONG lParam);
 	afx_msg LRESULT OnIMEInputChange(WPARAM wParam, LPARAM lParam);
 	afx_msg LRESULT OnIMENotify(WPARAM wParam, LPARAM lParam);
 	afx_msg LRESULT OnIMERequest(WPARAM wParam, LPARAM lParam);

Modified: branches/cmake/teraterm/ttpcmn/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/ttpcmn/CMakeLists.txt	2019-03-10 14:34:06 UTC (rev 7474)
+++ branches/cmake/teraterm/ttpcmn/CMakeLists.txt	2019-03-10 14:34:42 UTC (rev 7475)
@@ -1,16 +1,5 @@
 project(ttpcmn)
 
-if (MSVC)
-    string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG            ${CMAKE_C_FLAGS_DEBUG})
-    string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_MINSIZEREL       ${CMAKE_C_FLAGS_MINSIZEREL})
-    string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE          ${CMAKE_C_FLAGS_RELEASE})
-    string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELWITHDEBINFO   ${CMAKE_C_FLAGS_RELWITHDEBINFO})
-    string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG          ${CMAKE_CXX_FLAGS_DEBUG})
-    string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_MINSIZEREL     ${CMAKE_CXX_FLAGS_MINSIZEREL})
-    string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE        ${CMAKE_CXX_FLAGS_RELEASE})
-    string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
-endif ()
-
 if(USE_UNICODE_API)
   add_definitions(-DUNICODE -D_UNICODE)
 endif()
@@ -57,7 +46,8 @@
   )
 
 if (MSVC)
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DELAYLOAD:setupapi.dll /DELAYLOAD:user32.dll")
+  set(CMAKE_SHARED_LINKER_FLAGS
+    "${CMAKE_SHARED_LINKER_FLAGS} /DELAYLOAD:setupapi.dll /DELAYLOAD:user32.dll")
 endif()
 
 add_library(
@@ -72,10 +62,10 @@
   )
 if(MINGW)
   set_target_properties(
-	ttpcmn
-	PROPERTIES PREFIX ""
-	SUFFIX ".dll"
-	)
+    ttpcmn
+    PROPERTIES PREFIX ""
+    SUFFIX ".dll"
+    )
 endif()
 
 target_link_libraries(

Modified: branches/cmake/teraterm/ttpdlg/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/ttpdlg/CMakeLists.txt	2019-03-10 14:34:06 UTC (rev 7474)
+++ branches/cmake/teraterm/ttpdlg/CMakeLists.txt	2019-03-10 14:34:42 UTC (rev 7475)
@@ -2,17 +2,6 @@
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake)
 
-if (MSVC)
-    string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG            ${CMAKE_C_FLAGS_DEBUG})
-    string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_MINSIZEREL       ${CMAKE_C_FLAGS_MINSIZEREL})
-    string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE          ${CMAKE_C_FLAGS_RELEASE})
-    string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELWITHDEBINFO   ${CMAKE_C_FLAGS_RELWITHDEBINFO})
-    string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG          ${CMAKE_CXX_FLAGS_DEBUG})
-    string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_MINSIZEREL     ${CMAKE_CXX_FLAGS_MINSIZEREL})
-    string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE        ${CMAKE_CXX_FLAGS_RELEASE})
-    string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
-endif ()
-
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
 
 if(MINGW)
@@ -24,8 +13,6 @@
 set(COMMON_SRC
   ../common/dlglib.c
   ../common/dlglib.h
-  ../common/dlglib_cpp.cpp
-  ../common/dlglib_tmpl.cpp
   ../common/ttlib.c
   ../common/ttlib.h
   ../common/teraterm.ico
@@ -40,6 +27,7 @@
 set(SRC
   dlg_res.h
   ttdlg.c
+  ttpdlg.def
   ttpdlg.rc
   ttpdlg-version.rc
   ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h
@@ -63,10 +51,10 @@
 
 if(MINGW)
   set_target_properties(
-	ttpdlg
-	PROPERTIES PREFIX ""
-	SUFFIX ".dll"
-	)
+    ttpdlg
+    PROPERTIES PREFIX ""
+    SUFFIX ".dll"
+    )
 endif()
 
 target_link_libraries(
@@ -81,14 +69,10 @@
   ttpcmn
   )
 
-## svnversion.h
-if(EXISTS ${CMAKE_SOURCE_DIR}/.svn)
-  INCLUDE(FindSubversion)
+configure_file(
+  svnversion.h.in
+  svnversion.h @ONLY)
+
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/svnversion.h")
+  file(REMOVE "${CMAKE_CURRENT_SOURCE_DIR}/svnversion.h")
 endif()
-if(Subversion_FOUND)
-  Subversion_WC_INFO(${CMAKE_SOURCE_DIR} TT)
-  FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h "#define SVNVERSION ${TT_WC_REVISION}\n")
-  message("rev.${TT_WC_REVISION}")
-else()
-  FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h "#undef SVNVERSION\n")
-endif()

Added: branches/cmake/teraterm/ttpdlg/svnversion.h.in
===================================================================
--- branches/cmake/teraterm/ttpdlg/svnversion.h.in	                        (rev 0)
+++ branches/cmake/teraterm/ttpdlg/svnversion.h.in	2019-03-10 14:34:42 UTC (rev 7475)
@@ -0,0 +1 @@
+#cmakedefine SVNVERSION @SVNVERSION@

Modified: branches/cmake/teraterm/ttpfile/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/ttpfile/CMakeLists.txt	2019-03-10 14:34:06 UTC (rev 7474)
+++ branches/cmake/teraterm/ttpfile/CMakeLists.txt	2019-03-10 14:34:42 UTC (rev 7475)
@@ -1,16 +1,5 @@
 project(ttpfile)
 
-if (MSVC)
-    string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG            ${CMAKE_C_FLAGS_DEBUG})
-    string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_MINSIZEREL       ${CMAKE_C_FLAGS_MINSIZEREL})
-    string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE          ${CMAKE_C_FLAGS_RELEASE})
-    string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELWITHDEBINFO   ${CMAKE_C_FLAGS_RELWITHDEBINFO})
-    string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG          ${CMAKE_CXX_FLAGS_DEBUG})
-    string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_MINSIZEREL     ${CMAKE_CXX_FLAGS_MINSIZEREL})
-    string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE        ${CMAKE_CXX_FLAGS_RELEASE})
-    string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
-endif ()
-
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
 
 set(COMMON_SRC
@@ -63,10 +52,10 @@
 
 if(MINGW)
   set_target_properties(
-	ttpfile
-	PROPERTIES PREFIX ""
-	SUFFIX ".dll"
-	)
+    ttpfile
+    PROPERTIES PREFIX ""
+    SUFFIX ".dll"
+    )
 endif()
 
 target_link_libraries(

Modified: branches/cmake/teraterm/ttpmacro/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/ttpmacro/CMakeLists.txt	2019-03-10 14:34:06 UTC (rev 7474)
+++ branches/cmake/teraterm/ttpmacro/CMakeLists.txt	2019-03-10 14:34:42 UTC (rev 7475)
@@ -3,17 +3,6 @@
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_SFMT.cmake)
 
-if (MSVC)
-    string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG            ${CMAKE_C_FLAGS_DEBUG})
-    string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_MINSIZEREL       ${CMAKE_C_FLAGS_MINSIZEREL})
-    string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE          ${CMAKE_C_FLAGS_RELEASE})
-    string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELWITHDEBINFO   ${CMAKE_C_FLAGS_RELWITHDEBINFO})
-    string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG          ${CMAKE_CXX_FLAGS_DEBUG})
-    string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_MINSIZEREL     ${CMAKE_CXX_FLAGS_MINSIZEREL})
-    string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE        ${CMAKE_CXX_FLAGS_RELEASE})
-    string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
-endif ()
-
 if(USE_UNICODE_API)
   add_definitions(-DUNICODE -D_UNICODE)
 endif()
@@ -21,6 +10,11 @@
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
 
 set(COMMON_SRC
+  ../common/teraterm.h
+  ../common/ttcommon.h
+  ../common/ttddecmnd.h
+  ../common/tttypes.h
+  ../common/tt-version.h
   ../common/i18n.c
   ../common/i18n.h
   ../common/ttlib.c
@@ -39,6 +33,7 @@
   ../common/win16api.c
   ../common/codeconv.h
   ../common/codeconv.cpp
+  ../common/dllutil.cpp
   )
 
 source_group(

Modified: branches/cmake/teraterm/ttpset/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/ttpset/CMakeLists.txt	2019-03-10 14:34:06 UTC (rev 7474)
+++ branches/cmake/teraterm/ttpset/CMakeLists.txt	2019-03-10 14:34:42 UTC (rev 7475)
@@ -1,16 +1,5 @@
 project(ttpset)
 
-if (MSVC)
-    string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG            ${CMAKE_C_FLAGS_DEBUG})
-    string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_MINSIZEREL       ${CMAKE_C_FLAGS_MINSIZEREL})
-    string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE          ${CMAKE_C_FLAGS_RELEASE})
-    string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELWITHDEBINFO   ${CMAKE_C_FLAGS_RELWITHDEBINFO})
-    string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG          ${CMAKE_CXX_FLAGS_DEBUG})
-    string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_MINSIZEREL     ${CMAKE_CXX_FLAGS_MINSIZEREL})
-    string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE        ${CMAKE_CXX_FLAGS_RELEASE})
-    string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
-endif ()
-
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
 
 set(COMMON_SRC
@@ -43,10 +32,10 @@
 
 if(MINGW)
   set_target_properties(
-	ttpset
-	PROPERTIES PREFIX ""
-	SUFFIX ".dll"
-	)
+    ttpset
+    PROPERTIES PREFIX ""
+    SUFFIX ".dll"
+    )
 endif()
 
 target_link_libraries(

Modified: branches/cmake/teraterm/ttptek/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/ttptek/CMakeLists.txt	2019-03-10 14:34:06 UTC (rev 7474)
+++ branches/cmake/teraterm/ttptek/CMakeLists.txt	2019-03-10 14:34:42 UTC (rev 7475)
@@ -3,17 +3,6 @@
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_SFMT.cmake)
 
-if (MSVC)
-    string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG            ${CMAKE_C_FLAGS_DEBUG})
-    string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_MINSIZEREL       ${CMAKE_C_FLAGS_MINSIZEREL})
-    string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE          ${CMAKE_C_FLAGS_RELEASE})
-    string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELWITHDEBINFO   ${CMAKE_C_FLAGS_RELWITHDEBINFO})
-    string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG          ${CMAKE_CXX_FLAGS_DEBUG})
-    string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_MINSIZEREL     ${CMAKE_CXX_FLAGS_MINSIZEREL})
-    string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE        ${CMAKE_CXX_FLAGS_RELEASE})
-    string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
-endif ()
-
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
 
 set(COMMON_SRC
@@ -60,10 +49,10 @@
 
 if(MINGW)
   set_target_properties(
-	ttptek
-	PROPERTIES PREFIX ""
-	SUFFIX ".dll"
-	)
+    ttptek
+    PROPERTIES PREFIX ""
+    SUFFIX ".dll"
+    )
 endif()
 
 target_link_libraries(

Modified: branches/cmake/ttssh2/matcher/CMakeLists.txt
===================================================================
--- branches/cmake/ttssh2/matcher/CMakeLists.txt	2019-03-10 14:34:06 UTC (rev 7474)
+++ branches/cmake/ttssh2/matcher/CMakeLists.txt	2019-03-10 14:34:42 UTC (rev 7475)
@@ -1,13 +1,13 @@
-project(matcher)
-
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
-
-set(SRC
-  matcher.c
-  test.c
-  )
-
-add_executable(
-  matcher
-  ${SRC}
-  )
+project(matcher)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+
+set(SRC
+  matcher.c
+  test.c
+  )
+
+add_executable(
+  matcher
+  ${SRC}
+  )

From scmnotify ＠ osdn.net  Wed Mar 13 12:13:55 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Wed, 13 Mar 2019 12:13:55 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0NzZdIOODh+ODkOODg+OCsOODreOCsA==?=
 =?utf-8?b?5Lit44Gu6Zai5pWw5ZCN44GM6ZaT6YGV44Gj44Gm44GE44Gf44Gu44KS5L+u?=
 =?utf-8?b?5q2j44CC?=
Message-ID: <1552446835.700208.99464.nullmailer@users.osdn.me>

Revision: 7476
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7476
Author:   doda
Date:     2019-03-13 12:13:55 +0900 (Wed, 13 Mar 2019)
Log Message:
-----------
デバッグログ中の関数名が間違っていたのを修正。

関数名を直接書くのではなく __FUNCTION__ を使うように変更。
他の同様な部分も変更すべき。

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/ssh.c

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2019-03-10 14:34:42 UTC (rev 7475)
+++ trunk/ttssh2/ttxssh/ssh.c	2019-03-13 03:13:55 UTC (rev 7476)
@@ -7325,7 +7325,7 @@
 		finish_send_packet(pvar);
 		buffer_free(msg);
 
-		logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_USERAUTH_REQUEST was sent at handle_SSH2_userauth_inforeq().");
+		logputs(LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH2_MSG_USERAUTH_REQUEST method=publickey");
 
 		pvar->pageant_keyfinal = TRUE;
 

From scmnotify ＠ osdn.net  Wed Mar 13 12:14:00 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Wed, 13 Mar 2019 12:14:00 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B7477=5D_keyboard-interactive_?=
 =?utf-8?b?6KqN6Ki85pmC44CBcHJvbXB0IOOBriBlY2hvIOODleODqeOCsOOBjOeEoQ==?=
 =?utf-8?b?6KaW44GV44KM44KL44Gu44KS5L+u5q2j44CC?=
Message-ID: <1552446840.744426.99527.nullmailer@users.osdn.me>

Revision: 7477
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7477
Author:   doda
Date:     2019-03-13 12:14:00 +0900 (Wed, 13 Mar 2019)
Log Message:
-----------
keyboard-interactive 認証時、prompt の echo フラグが無視されるのを修正。

Ticket: #37294

パスワード入力では制御文字の入力を可能にしているが、表示可能にする事によって
記号等として表示されて文字化けしているように見えるのが課題。

Ticket Links:
------------
    http://sourceforge.jp/projects/ttssh2/tracker/detail/37294

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html
    trunk/ttssh2/ttxssh/auth.c
    trunk/ttssh2/ttxssh/auth.h
    trunk/ttssh2/ttxssh/ssh.c

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2019-03-13 03:13:55 UTC (rev 7476)
+++ trunk/doc/en/html/about/history.html	2019-03-13 03:14:00 UTC (rev 7477)
@@ -3112,6 +3112,7 @@
   <li>Bug fixes
     <ul>
       <li>garbage data is added to the CipherOrder and MacOrder settings when saving settings.</li>
+      <li>when echo flag is 1 in the server's authentication informatin message, password string is masked on the keyboard-interactive authentication dialog.</li>
     </ul>
   </li>
 </ul>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2019-03-13 03:13:55 UTC (rev 7476)
+++ trunk/doc/ja/html/about/history.html	2019-03-13 03:14:00 UTC (rev 7477)
@@ -3118,6 +3118,7 @@
   <li>\x83o\x83O\x8FC\x90\xB3
     <ul>
       <li>\x90ݒ\xE8\x82̕ۑ\xB6\x8E\x9E\x81ACipherOrder, MacOrder \x90ݒ\xE8\x82ɃS\x83~\x82\xAA\x95t\x89\xC1\x82\xB3\x82\xEA\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+      <li>\x83T\x81[\x83o\x82̔F\x8F؏\xEE\x95񃁃b\x83Z\x81[\x83W\x82\xC5 echo \x83t\x83\x89\x83O\x82\xAA 1 \x82̎\x9E\x82ɂ\xE0\x83L\x81[\x83{\x81[\x83h\x83C\x83\x93\x83^\x83\x89\x83N\x83e\x83B\x83u\x94F\x8F؃_\x83C\x83A\x83\x8D\x83O\x82Ńp\x83X\x83\x8F\x81[\x83h\x82\xAA\x83}\x83X\x83N\x82\xB3\x82\xEA\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
     </ul>
   </li>
 </ul>

Modified: trunk/ttssh2/ttxssh/auth.c
===================================================================
--- trunk/ttssh2/ttxssh/auth.c	2019-03-13 03:13:55 UTC (rev 7476)
+++ trunk/ttssh2/ttxssh/auth.c	2019-03-13 03:14:00 UTC (rev 7477)
@@ -1112,6 +1112,10 @@
 					   pvar->auth_state.TIS_prompt);
 		destroy_malloced_string(&pvar->auth_state.TIS_prompt);
 	}
+
+	if (pvar->auth_state.echo) {
+		SendMessage(GetDlgItem(dlg, IDC_SSHPASSWORD), EM_SETPASSWORDCHAR, 0, 0);
+	}
 }
 
 static BOOL end_TIS_dlg(PTInstVar pvar, HWND dlg)
@@ -1443,6 +1447,7 @@
 	pvar->auth_state.user = NULL;
 	pvar->auth_state.flags = 0;
 	pvar->auth_state.TIS_prompt = NULL;
+	pvar->auth_state.echo = 0;
 	pvar->auth_state.supported_types = 0;
 	pvar->auth_state.cur_cred.method = SSH_AUTH_NONE;
 	pvar->auth_state.cur_cred.password = NULL;
@@ -1457,7 +1462,7 @@
 	destroy_malloced_string(&pvar->auth_state.TIS_prompt);
 }
 
-void AUTH_set_TIS_mode(PTInstVar pvar, char *prompt, int len)
+void AUTH_set_TIS_mode(PTInstVar pvar, char *prompt, int len, int echo)
 {
 	if (pvar->auth_state.cur_cred.method == SSH_AUTH_TIS) {
 		pvar->auth_state.mode = TIS_AUTH_MODE;
@@ -1466,6 +1471,7 @@
 		pvar->auth_state.TIS_prompt = malloc(len + 1);
 		memcpy(pvar->auth_state.TIS_prompt, prompt, len);
 		pvar->auth_state.TIS_prompt[len] = 0;
+		pvar->auth_state.echo = echo;
 	} else {
 		AUTH_set_generic_mode(pvar);
 	}

Modified: trunk/ttssh2/ttxssh/auth.h
===================================================================
--- trunk/ttssh2/ttxssh/auth.h	2019-03-13 03:13:55 UTC (rev 7476)
+++ trunk/ttssh2/ttxssh/auth.h	2019-03-13 03:14:00 UTC (rev 7477)
@@ -56,6 +56,7 @@
 
   AuthMode mode;
   char *TIS_prompt;
+  int echo;
 } AUTHState;
 
 void AUTH_init(PTInstVar pvar);
@@ -62,7 +63,7 @@
 char *AUTH_get_user_name(PTInstVar pvar);
 int AUTH_set_supported_auth_types(PTInstVar pvar, int types);
 void AUTH_set_generic_mode(PTInstVar pvar);
-void AUTH_set_TIS_mode(PTInstVar pvar, char *prompt, int len);
+void AUTH_set_TIS_mode(PTInstVar pvar, char *prompt, int len, int echo);
 void AUTH_advance_to_next_cred(PTInstVar pvar);
 void AUTH_do_cred_dialog(PTInstVar pvar);
 void AUTH_do_default_cred_dialog(PTInstVar pvar);

Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2019-03-13 03:13:55 UTC (rev 7476)
+++ trunk/ttssh2/ttxssh/ssh.c	2019-03-13 03:14:00 UTC (rev 7477)
@@ -1452,7 +1452,7 @@
 		if (grab_payload(pvar, len)) {
 			logputs(LOG_LEVEL_VERBOSE, "Received TIS challenge");
 
-			AUTH_set_TIS_mode(pvar, pvar->ssh_state.payload + 4, len);
+			AUTH_set_TIS_mode(pvar, pvar->ssh_state.payload + 4, len, 0);
 			AUTH_advance_to_next_cred(pvar);
 			pvar->ssh_state.status_flags &= ~STATUS_DONT_SEND_CREDENTIALS;
 			try_send_credentials(pvar);
@@ -7200,7 +7200,7 @@
 		// keyboard-interactive method (2005.3.12 yutaka)
 		if (pvar->keyboard_interactive_password_input == 0 &&
 			pvar->auth_state.cur_cred.method == SSH_AUTH_TIS) {
-			AUTH_set_TIS_mode(pvar, prompt, slen);
+			AUTH_set_TIS_mode(pvar, prompt, slen, echo);
 			AUTH_advance_to_next_cred(pvar);
 			pvar->ssh_state.status_flags &= ~STATUS_DONT_SEND_CREDENTIALS;
 			//try_send_credentials(pvar);

From scmnotify ＠ osdn.net  Wed Mar 13 12:14:05 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Wed, 13 Mar 2019 12:14:05 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0NzhdIOWkieabtOWxpeattOabtOaWsA==?=
Message-ID: <1552446845.536718.100596.nullmailer@users.osdn.me>

Revision: 7478
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7478
Author:   doda
Date:     2019-03-13 12:14:05 +0900 (Wed, 13 Mar 2019)
Log Message:
-----------
変更履歴更新

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2019-03-13 03:14:00 UTC (rev 7477)
+++ trunk/doc/en/html/about/history.html	2019-03-13 03:14:05 UTC (rev 7478)
@@ -35,7 +35,8 @@
 <ul class="history">
   <li>Bug fixes
     <ul>
-      <li><!--IME\x82̕ϊ\xB7\x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82̕\\x8E\xA6\x88ʒu\x82\xAA\x83J\x81[\x83\\x83\x8B\x88ʒu\x82ɒǏ]\x82\xB5\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B-->This bus was introduced in 4.102.</li>
+      <li><!--IME\x82̕ϊ\xB7\x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82̕\\x8E\xA6\x88ʒu\x82\xAA\x83J\x81[\x83\\x83\x8B\x88ʒu\x82ɒǏ]\x82\xB5\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B-->This bug was introduced in 4.102.</li>
+      <li>Can't display character such as U+2014 EM DASH, U+2212 MINUS SIGN, U+301C WAVE DASH etc. This bug was introduced in 4.102.</li>
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2019-03-13 03:14:00 UTC (rev 7477)
+++ trunk/doc/ja/html/about/history.html	2019-03-13 03:14:05 UTC (rev 7478)
@@ -36,6 +36,7 @@
   <li>\x83o\x83O\x8FC\x90\xB3
     <ul>
       <li>IME\x82̕ϊ\xB7\x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82̕\\x8E\xA6\x88ʒu\x82\xAA\x83J\x81[\x83\\x83\x8B\x88ʒu\x82ɒǏ]\x82\xB5\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B4.102\x82ł̃G\x83\x93\x83o\x83O\x81B</li>
+      <li>U+2014 EM DASH, U+2212 MINUS SIGN, U+301C WAVE DASH \x93\x99\x82̕\xB6\x8E\x9A\x82\xAA\x95\\x8E\xA6\x82ł\xAB\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B4.102\x82ł̃G\x83\x93\x83o\x83O\x81B</li>
     </ul>
   </li>
 

From scmnotify ＠ osdn.net  Thu Mar 14 00:32:18 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Thu, 14 Mar 2019 00:32:18 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0NzldIHdzcGlhcGkuaCDjgpIgaW5jbHVk?=
 =?utf-8?b?ZSDjgZfjgZ8=?=
Message-ID: <1552491138.337557.120573.nullmailer@users.osdn.me>

Revision: 7479
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7479
Author:   zmatsuo
Date:     2019-03-14 00:32:17 +0900 (Thu, 14 Mar 2019)
Log Message:
-----------
wspiapi.h を include した
ws2_32.dll関連でエラーが出ないバイナリがビルドできるようになった
従来は _WIN32_WINNT のdefine具合よってWindows95でエラーが出るバイナリとなっていた

Modified Paths:
--------------
    trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.c
    trunk/teraterm/teraterm/ttwsk.c
    trunk/ttssh2/ttxssh/ttxssh.h

-------------- next part --------------
Modified: trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.c
===================================================================
--- trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.c	2019-03-13 03:14:05 UTC (rev 7478)
+++ trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.c	2019-03-13 15:32:17 UTC (rev 7479)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2017 TeraTerm Project
+ * Copyright (C) 2010-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,9 +31,10 @@
  */
 #include <winsock2.h>
 #include <ws2tcpip.h>
+#include <wspiapi.h>
 #include <windows.h>
 #include <process.h>
-#include "WSAASyncGetAddrInfo.h"
+#include "WSAAsyncGetAddrInfo.h"
 #include "ttwsk.h"
 
 static unsigned __stdcall getaddrinfo_thread(void * p);

Modified: trunk/teraterm/teraterm/ttwsk.c
===================================================================
--- trunk/teraterm/teraterm/ttwsk.c	2019-03-13 03:14:05 UTC (rev 7478)
+++ trunk/teraterm/teraterm/ttwsk.c	2019-03-13 15:32:17 UTC (rev 7479)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2007-2017 TeraTerm Project
+ * (C) 2007-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,6 +31,7 @@
 
 #include "teraterm.h"
 #include "ttwsk.h"
+#include <wspiapi.h>
 #include "WSAAsyncGetAddrInfo.h"
 
 static HANDLE HWinsock = NULL;

Modified: trunk/ttssh2/ttxssh/ttxssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.h	2019-03-13 03:14:05 UTC (rev 7478)
+++ trunk/ttssh2/ttxssh/ttxssh.h	2019-03-13 15:32:17 UTC (rev 7479)
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1998-2001, Robert O'Callahan
- * (C) 2004-2017 TeraTerm Project
+ * (C) 2004-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,6 +49,7 @@
 
 #include <winsock2.h>
 #include <ws2tcpip.h>
+#include <wspiapi.h>
 /* actual body of in6addr_any and in6addr_loopback is disappeared?? */
 #undef IN6_IS_ADDR_LOOPBACK
 #define IN6_IS_ADDR_LOOPBACK(a)         \

From scmnotify ＠ osdn.net  Thu Mar 14 00:32:54 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Thu, 14 Mar 2019 00:32:54 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0ODBdIOS9v+eUqOOBl+OBpuOBhOOBqg==?=
 =?utf-8?b?44GE44Op44Kk44OW44Op44Oq44KS44Oq44Oz44Kv44GX44Gq44GP44GX44Gf?=
Message-ID: <1552491174.699879.125237.nullmailer@users.osdn.me>

Revision: 7480
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7480
Author:   zmatsuo
Date:     2019-03-14 00:32:54 +0900 (Thu, 14 Mar 2019)
Log Message:
-----------
使用していないライブラリをリンクしなくした

Modified Paths:
--------------
    trunk/teraterm/teraterm/CMakeLists.txt

-------------- next part --------------
Modified: trunk/teraterm/teraterm/CMakeLists.txt
===================================================================
--- trunk/teraterm/teraterm/CMakeLists.txt	2019-03-13 15:32:17 UTC (rev 7479)
+++ trunk/teraterm/teraterm/CMakeLists.txt	2019-03-13 15:32:54 UTC (rev 7480)
@@ -167,7 +167,6 @@
   imm32
   imagehlp
   delayimp
-  oleaut32
   uuid
   )
 

From scmnotify ＠ osdn.net  Thu Mar 14 00:33:06 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Thu, 14 Mar 2019 00:33:06 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0ODFdIOWGheWuueiqv+aVtOOAgeOCuQ==?=
 =?utf-8?b?44Kv44Oq44OX44OI6Kq/5pW0?=
Message-ID: <1552491186.657498.126269.nullmailer@users.osdn.me>

Revision: 7481
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7481
Author:   zmatsuo
Date:     2019-03-14 00:33:06 +0900 (Thu, 14 Mar 2019)
Log Message:
-----------
内容調整、スクリプト調整

Modified Paths:
--------------
    trunk/doc/convtext.bat
    trunk/doc/ja/html/index.html
    trunk/doc/ja/html/reference/build_with_cmake.md

-------------- next part --------------
Modified: trunk/doc/convtext.bat
===================================================================
--- trunk/doc/convtext.bat	2019-03-13 15:32:54 UTC (rev 7480)
+++ trunk/doc/convtext.bat	2019-03-13 15:33:06 UTC (rev 7481)
@@ -17,6 +17,5 @@
 %ZLIBCP% -i ..\libs\zlib\README         -o %REF_E%\zlib-LICENSE.txt      -l unix
 %ZLIBCP% -i ..\libs\zlib\README         -o %REF_J%\zlib-LICENSE.txt      -l unix
 
-sed -e '1s/^\xef\xbb\xbf//' < ja/html/reference/build_with_cmake.md > ja/html/reference/build_with_cmake_without_bom.md
-perl Markdown_1.0.1/Markdown.pl ja/html/reference/build_with_cmake_without_bom.md > ja/html/reference/build_with_cmake_utf8.html
+perl -pe 'tr/\x{feff}//d' ja/html/reference/build_with_cmake.md | perl Markdown_1.0.1/Markdown.pl > ja/html/reference/build_with_cmake_utf8.html
 %TOSJIS% -i ja/html/reference/build_with_cmake_utf8.html -o ja/html/reference/build_with_cmake.html  -c utf8

Modified: trunk/doc/ja/html/index.html
===================================================================
--- trunk/doc/ja/html/index.html	2019-03-13 15:32:54 UTC (rev 7480)
+++ trunk/doc/ja/html/index.html	2019-03-13 15:33:06 UTC (rev 7481)
@@ -144,6 +144,9 @@
  <LI><A HREF="reference/SFMT-LICENSE.txt">SFMT \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
  <LI><A HREF="reference/CygTerm+-LICENSE.txt">CygTerm+ \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
  <LI><A HREF="reference/develop.txt">\x8AJ\x94\xAD\x8EҌ\xFC\x82\xAF</A></LI>
+ <UL>
+   <LI><A HREF="reference/build_with_cmake.html">CMake\x83r\x83\x8B\x83h\x83V\x83X\x83e\x83\x80\x82\xF0\x8Eg\x97p\x82\xB5\x82\xBD\x83r\x83\x8B\x83h(experimental)</A></LI>
+ </UL>
  <LI><A HREF="reference/sourcecode.html">\x83\\x81[\x83X\x83R\x81[\x83h\x89\xF0\x90\xE0</A></LI>
 </UL>
 

Modified: trunk/doc/ja/html/reference/build_with_cmake.md
===================================================================
--- trunk/doc/ja/html/reference/build_with_cmake.md	2019-03-13 15:32:54 UTC (rev 7480)
+++ trunk/doc/ja/html/reference/build_with_cmake.md	2019-03-13 15:33:06 UTC (rev 7481)
@@ -1,12 +1,12 @@
 # cmakeを使ったビルド
 
-- 実験的に cmake を使用してビルドすることができます
-- cmake https://cmake.org/
+- cmake を使用してビルドすることができます(実験的な位置づけです)
+	- https://cmake.org/
 
 ## cmakeのバージョン
 
 - Visual Studio 2005 をサポートしている cmake の最後のバージョンは 3.11.4 です
-- 2005 以外の Visual Studio を使用する場合は特に制限はありません
+- Visual Studio 2005 以外を使用する場合は特に制限はありません
 - Visual Studio 2017 インストーラーで、オプションを選べば cmake をインストールできます
 
 ## ライブラリのビルド
@@ -21,12 +21,15 @@
     ```
     mkdir build_vs2005
     cd build_vs2005
-    "c:\Program Files (x86)\CMake-3.11.4\bin\cmake.exe" .. -G "Visual Studio 8 2005"
+	..\libs\cmake-3.11.4-win32-x86\bin\cmake.exe .. -G "Visual Studio 8 2005"
     ```
-    - パスが通っていれば cmake はフルパスで書く必要はありません
     - `-G` オプションの後ろは使用する Visual Studio のバージョンに合わせて調整します
 - sln ファイルが生成されるので Visual Studio で開くことができます
 - cmakeを使ってビルドする場合は次のコマンドを実行します  
     ```
-    cmake --build . --config release
+	..\libs\cmake-3.11.4-win32-x86\bin\cmake.exe --build . --config release
     ```
+- パスが通っていれば cmake はフルパスで書く必要はありません
+- 生成された sln ファイルから起動したVisual Studioでビルドすると
+  CMakeLists.txt を変更を検出してプロジェクトファイルの再生成を自動で行うので
+  sln ファイルの生成を手動で行うのは最初の1回だけです

From scmnotify ＠ osdn.net  Fri Mar 15 00:38:12 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Fri, 15 Mar 2019 00:38:12 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B7482=5D_WideCharToMultiByte=28=29?=
 =?utf-8?b?44GuVXNlZERlZmF1bHRDaGFy44KS5L2/55So44GX44Gm5aSJ5o+b5aSx5pWX?=
 =?utf-8?b?44KS5qSc5Ye644GZ44KL44KI44GG44Gr44GX44Gf?=
Message-ID: <1552577892.772922.22389.nullmailer@users.osdn.me>

Revision: 7482
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7482
Author:   zmatsuo
Date:     2019-03-15 00:38:11 +0900 (Fri, 15 Mar 2019)
Log Message:
-----------
WideCharToMultiByte()のUsedDefaultCharを使用して変換失敗を検出するようにした
WideCharToMB()で変換に失敗することがあったので修正

Modified Paths:
--------------
    trunk/teraterm/common/codeconv.cpp

-------------- next part --------------
Modified: trunk/teraterm/common/codeconv.cpp
===================================================================
--- trunk/teraterm/common/codeconv.cpp	2019-03-13 15:33:06 UTC (rev 7481)
+++ trunk/teraterm/common/codeconv.cpp	2019-03-14 15:38:11 UTC (rev 7482)
@@ -122,7 +122,7 @@
 		buf[1] = cp932 & 0xff;
 		len = 2;
 	}
-	ret = MultiByteToWideChar(932, MB_ERR_INVALID_CHARS, (char *)buf, len, &wchar, 1);
+	ret = ::MultiByteToWideChar(932, MB_ERR_INVALID_CHARS, (char *)buf, len, &wchar, 1);
 	if (ret <= 0) {
 		// MultiByteToWideChar()\x82\xAA\x95ϊ\xB7\x8E\xB8\x94s
 #if !defined(PRIORITY_CP932_TABLE)
@@ -164,6 +164,7 @@
  *	@param mb_code		\x83}\x83\x8B\x83`\x83o\x83C\x83g\x82̕\xB6\x8E\x9A\x83R\x81[\x83h(0x0000-0xffff)
  *	@param code_page	\x83}\x83\x8B\x83`\x83o\x83C\x83g\x82̃R\x81[\x83h\x83y\x81[\x83W
  *	@retval				unicode(UTF-32\x95\xB6\x8E\x9A\x83R\x81[\x83h)
+ *						0=\x83G\x83\x89\x81[(\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD)
  */
 unsigned int MBCP_UTF32(unsigned short mb_code, int code_page)
 {
@@ -187,7 +188,7 @@
 			buf[1] = mb_code & 0xff;
 			len = 2;
 		}
-		ret = MultiByteToWideChar(code_page, MB_ERR_INVALID_CHARS, buf, len, &wchar, 1);
+		ret = ::MultiByteToWideChar(code_page, MB_ERR_INVALID_CHARS, buf, len, &wchar, 1);
 		if (ret <= 0) {
 			c = 0;
 		} else {
@@ -210,6 +211,7 @@
 	DWORD mblen;
 	wchar_t u16_str[2];
 	size_t u16_len;
+	BOOL use_default_char;
 
 	if (u32 < 0x80) {
 		return (unsigned short)u32;
@@ -230,22 +232,20 @@
 	if (u16_len == 0) {
 		return 0;
 	}
-	mblen = WideCharToMultiByte(932, 0, u16_str, (int)u16_len, mbstr, 2, NULL, NULL);
+	use_default_char = FALSE;
+	mblen = ::WideCharToMultiByte(932, 0, u16_str, (int)u16_len, mbstr, 2, NULL, &use_default_char);
+	if (use_default_char) {
+		// \x95ϊ\xB7\x82ł\xAB\x82\xB8\x81A\x8A\xF9\x92\xE8\x82̕\xB6\x8E\x9A\x82\xF0\x8Eg\x82\xC1\x82\xBD
+		goto next_convert;
+	}
 	switch (mblen) {
 	case 0:
+		// \x95ϊ\xB7\x8E\xB8\x94s
+		goto next_convert;
 	case 1:
-	default:
-		if (mblen == 0 || mbstr[0] == '?') {
-			goto next_convert;
-		} else {
-			mb = (unsigned char)mbstr[0];
-			return mb;
-		}
+		mb = (unsigned char)mbstr[0];
+		return mb;
 	case 2:
-		if (mbstr[0] == '?' && mbstr[1] == '?') {
-			// 2byte\x8Fo\x97\xCD && "??" \x82̏ꍇ\x82͕ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD
-			goto next_convert;
-		}
 		mb = (((unsigned char)mbstr[0]) << 8) | (unsigned char)mbstr[1];
 		return mb;
 	}
@@ -540,11 +540,16 @@
  */
 size_t UTF32ToCP932(uint32_t u32, char *mb_ptr, size_t mb_len)
 {
+	uint16_t cp932;
 	size_t cp932_out;
-	const uint16_t cp932 = UTF32_CP932(u32);
-	if (cp932 == 0 && u32 != 0) {
+	if (u32 == 0) {
 		return 0;
 	}
+	cp932 = UTF32_CP932(u32);
+	if (cp932 == 0) {
+		// \x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD
+		return 0;
+	}
 	if (mb_ptr == NULL) {
 		mb_len = 2;
 	}
@@ -577,7 +582,7 @@
  * @param[in]		code_page	\x95ϊ\xB7\x90\xE6codepage
  * @param[in,out]	mb_ptr		\x95ϊ\xB7\x90敶\x8E\x9A\x97\xF1\x8Fo\x97͐\xE6(NULL\x82̂Ƃ\xAB\x8Fo\x97͂\xB5\x82Ȃ\xA2)
  * @param[in]		mb_len		CP932\x8Fo\x97͐敶\x8E\x9A\x90\x94(\x95\xB6\x8E\x9A\x90\x94,sizeof(wchar_t)*wstr_len bytes)
- * @retval			\x8Fo\x97͂\xB5\x82\xBDCP932\x95\xB6\x8E\x9A\x90\x94(byte\x90\x94)
+ * @retval			\x8Fo\x97͂\xB5\x82\xBDmultibyte\x95\xB6\x8E\x9A\x90\x94(byte\x90\x94)
  *					0=\x83G\x83\x89\x81[(\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD)
  */
 size_t UTF32ToMBCP(unsigned int u32, int code_page, char *mb_ptr, size_t mb_len)
@@ -588,6 +593,7 @@
 	if (code_page == 932) {
 		return UTF32ToCP932(u32, mb_ptr, mb_len);
 	} else {
+		BOOL use_default_char;
 		wchar_t u16_str[2];
 		size_t u16_len;
 		u16_len = UTF32ToUTF16(u32, u16_str, 2);
@@ -594,10 +600,11 @@
 		if (u16_len == 0) {
 			return 0;
 		}
-		mb_len = WideCharToMultiByte(code_page, 0, u16_str, u16_len, mb_ptr, mb_len, NULL, NULL);
-		if (mb_ptr != NULL && u32 != '?' && mb_len == 1 && mb_ptr[0] == '?') {
-			// \x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD\x82Ƃ\xAB\x81A\x96߂\xE8\x92l=1, \x95\xB6\x8E\x9A[0]='?' \x82\xF0\x95Ԃ\xB5\x82Ă\xAD\x82\xE9
-			mb_len = 0;
+		use_default_char = FALSE;
+		mb_len = ::WideCharToMultiByte(code_page, 0, u16_str, u16_len, mb_ptr, mb_len, NULL, &use_default_char);
+		if (use_default_char) {
+			// \x95ϊ\xB7\x82ł\xAB\x82\xB8\x81A\x8A\xF9\x92\xE8\x82̕\xB6\x8E\x9A\x82\xF0\x8Eg\x82\xC1\x82\xBD
+			return 0;
 		}
 		return mb_len;
 	}
@@ -605,6 +612,7 @@
 
 /**
  *	wchar_t(UTF-16)\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x83}\x83\x8B\x83`\x83o\x83C\x83g\x95\xB6\x8E\x9A\x97\xF1\x82ɕϊ\xB7\x82\xB7\x82\xE9
+ *	\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA2\x95\xB6\x8E\x9A\x82\xCD '?' \x82ŏo\x97͂\xB7\x82\xE9
  *
  *	@param[in]		*wstr_ptr	wchar_t\x95\xB6\x8E\x9A\x97\xF1
  *	@param[in,out]	*wstr_len	wchar_t\x95\xB6\x8E\x9A\x97\xF1\x92\xB7
@@ -643,33 +651,41 @@
 
 	while(mb_len > 0 && wstr_len > 0) {
 		const wchar_t u16 = *wstr_ptr++;
-		uint32_t u32 = u16;
 		size_t mb_out;
 		wstr_len--;
 		wstr_in++;
-		// \x83T\x83\x8D\x83Q\x81[\x83g high?
-		if (IsHighSurrogate(u16)) {
-			if (wstr_len >= 1) {
-				const wchar_t u16_lo = *wstr_ptr++;
-				wstr_len--;
-				wstr_in++;
-				// \x83T\x83\x8D\x83Q\x81[\x83g low?
-				if (IsLowSurrogate(u16_lo)) {
-					// \x83T\x83\x8D\x83Q\x81[\x83g\x83y\x83A \x83f\x83R\x81[\x83h
-					u32 = 0x10000 + (u16 - 0xd800) * 0x400 + (u16_lo - 0xdc00);
+		if (u16 != 0) {
+			uint32_t u32 = u16;
+			// \x83T\x83\x8D\x83Q\x81[\x83g high?
+			if (IsHighSurrogate(u16)) {
+				if (wstr_len >= 1) {
+					const wchar_t u16_lo = *wstr_ptr++;
+					wstr_len--;
+					wstr_in++;
+					// \x83T\x83\x8D\x83Q\x81[\x83g low?
+					if (IsLowSurrogate(u16_lo)) {
+						// \x83T\x83\x8D\x83Q\x81[\x83g\x83y\x83A \x83f\x83R\x81[\x83h
+						u32 = 0x10000 + (u16 - 0xd800) * 0x400 + (u16_lo - 0xdc00);
+					} else {
+						goto unknown_code;
+					}
 				} else {
 					goto unknown_code;
 				}
-			} else {
-				goto unknown_code;
 			}
-		}
-		mb_out = UTF32ToMB(u32, mb_ptr, mb_len);
-		if (mb_out == 0) {
-		unknown_code:
+			mb_out = UTF32ToMB(u32, mb_ptr, mb_len);
+			if (mb_out == 0) {
+			unknown_code:
+				if (mb_ptr != NULL) {
+					// \x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD\x8Fꍇ
+					*mb_ptr = '?';
+				}
+				mb_out = 1;
+			}
+		} else {
+			// '\0'
 			if (mb_ptr != NULL) {
-				// \x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD\x8Fꍇ
-				*mb_ptr++ = '?';
+				*mb_ptr = 0;
 			}
 			mb_out = 1;
 		}
@@ -739,10 +755,16 @@
 	while(wstr_len > 0 && u8_len > 0) {
 		uint32_t u32;
 		size_t u16_out;
-		size_t u8_in = UTF8ToUTF32(u8_ptr, u8_len, &u32);
-		if (u8_in == 0) {
-			u32 = '?';
+		size_t u8_in;
+		if (*u8_ptr == 0) {
+			u32 = 0;
 			u8_in = 1;
+		} else {
+			u8_in = UTF8ToUTF32(u8_ptr, u8_len, &u32);
+			if (u8_in == 0) {
+				u32 = '?';
+				u8_in = 1;
+			}
 		}
 		u8_ptr += u8_in;
 		u8_len -= u8_in;
@@ -779,6 +801,8 @@
 
 /**
  *	wchar_t\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x83}\x83\x8B\x83`\x83o\x83C\x83g\x95\xB6\x8E\x9A\x97\xF1\x82֕ϊ\xB7
+ *	\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA2\x95\xB6\x8E\x9A\x82\xCD '?' \x82ŏo\x97͂\xB7\x82\xE9
+ *
  *	@param[in]	*wstr_ptr	wchar_t\x95\xB6\x8E\x9A\x97\xF1
  *	@param[in]	wstr_len	wchar_t\x95\xB6\x8E\x9A\x97\xF1\x92\xB7(0\x82̂Ƃ\xAB\x8E\xA9\x93\xAE\x81A\x8E\xA9\x93\xAE\x82̂Ƃ\xAB\x82\xCDL'\0'\x82Ń^\x81[\x83~\x83l\x81[\x83g\x82\xB7\x82邱\x82\xC6)
  *	@param[in]	code_page	\x95ϊ\xB7\x90\xE6\x83R\x81[\x83h\x83y\x81[\x83W

From scmnotify ＠ osdn.net  Fri Mar 15 00:38:25 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Fri, 15 Mar 2019 00:38:25 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0ODNdIFdpZGVDaGFyVG9NQigp44KS5L+u?=
 =?utf-8?b?5q2j?=
Message-ID: <1552577905.033565.22517.nullmailer@users.osdn.me>

Revision: 7483
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7483
Author:   zmatsuo
Date:     2019-03-15 00:38:24 +0900 (Fri, 15 Mar 2019)
Log Message:
-----------
WideCharToMB()を修正

Modified Paths:
--------------
    trunk/teraterm/common/codeconv.cpp
    trunk/teraterm/teraterm/vtterm.c

-------------- next part --------------
Modified: trunk/teraterm/common/codeconv.cpp
===================================================================
--- trunk/teraterm/common/codeconv.cpp	2019-03-14 15:38:11 UTC (rev 7482)
+++ trunk/teraterm/common/codeconv.cpp	2019-03-14 15:38:24 UTC (rev 7483)
@@ -320,7 +320,7 @@
 		} else {
 			goto error;
 		}
-	} else if (0xf0 <= c1 && c1 <= 0xf7 && u8_len >= 4) {
+	} else if (0xf0 <= c1 && c1 <= 0xf7) {
 		// 4byte
 		if (u8_len >= 4) {
 			const uint8_t c2 = *u8_ptr++;
@@ -504,6 +504,12 @@
 size_t UTF32ToUTF16(uint32_t u32, wchar_t *wstr_ptr, size_t wstr_len)
 {
 	size_t u16_out;
+	if (wstr_ptr == NULL) {
+		wstr_len = 2;
+	}
+	if (wstr_len == 0) {
+		return 0;
+	}
 	if (u32 < 0x10000) {
 		if (wstr_len >= 1) {
 			if (wstr_ptr != NULL) {
@@ -542,9 +548,19 @@
 {
 	uint16_t cp932;
 	size_t cp932_out;
-	if (u32 == 0) {
+	if (mb_ptr == NULL) {
+		mb_len = 2;		// 2byte\x82\xA0\x82\xEA\x82Α\xAB\x82\xE8\x82\xE9\x82͂\xB8
+	}
+	if (mb_len == 0) {
+		// \x8Fo\x97͐\xE6\x83T\x83C\x83Y\x82\xAA0
 		return 0;
 	}
+	if (u32 == 0) {
+		if (mb_ptr != NULL) {
+			*mb_ptr = 0;
+		}
+		return 1;
+	}
 	cp932 = UTF32_CP932(u32);
 	if (cp932 == 0) {
 		// \x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD
@@ -616,7 +632,7 @@
  *
  *	@param[in]		*wstr_ptr	wchar_t\x95\xB6\x8E\x9A\x97\xF1
  *	@param[in,out]	*wstr_len	wchar_t\x95\xB6\x8E\x9A\x97\xF1\x92\xB7
- *								NULL\x82܂\xBD\x82\xCD0\x82̂Ƃ\xAB\x8E\xA9\x93\xAE\x81AL'\0'\x82Ń^\x81[\x83~\x83l\x81[\x83g\x82\xB7\x82邱\x82\xC6)
+ *								NULL\x82܂\xBD\x82\xCD0\x82̂Ƃ\xAB\x8E\xA9\x93\xAE(L'\0'\x82Ń^\x81[\x83~\x83l\x81[\x83g\x82\xB7\x82邱\x82\xC6)
  *								NULL\x88ȊO\x82̂Ƃ\xAB\x93\xFC\x97͂\xB5\x82\xBD\x95\xB6\x8E\x9A\x90\x94\x82\xF0\x95Ԃ\xB7
  *	@param[in]		*mb_ptr		\x95ϊ\xB7\x82\xB5\x82\xBD\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x8E\xFB\x94[\x82\xB7\x82\xE9\x83|\x83C\x83\x93\x83^
  *								(NULL\x82̂Ƃ\xAB\x95ϊ\xB7\x82\xB9\x82\xB8\x82ɕ\xB6\x8E\x9A\x90\x94\x82\xF0\x83J\x83E\x83\x93\x83g\x82\xB7\x82\xE9)
@@ -650,42 +666,24 @@
 	}
 
 	while(mb_len > 0 && wstr_len > 0) {
-		const wchar_t u16 = *wstr_ptr++;
 		size_t mb_out;
-		wstr_len--;
-		wstr_in++;
-		if (u16 != 0) {
-			uint32_t u32 = u16;
-			// \x83T\x83\x8D\x83Q\x81[\x83g high?
-			if (IsHighSurrogate(u16)) {
-				if (wstr_len >= 1) {
-					const wchar_t u16_lo = *wstr_ptr++;
-					wstr_len--;
-					wstr_in++;
-					// \x83T\x83\x8D\x83Q\x81[\x83g low?
-					if (IsLowSurrogate(u16_lo)) {
-						// \x83T\x83\x8D\x83Q\x81[\x83g\x83y\x83A \x83f\x83R\x81[\x83h
-						u32 = 0x10000 + (u16 - 0xd800) * 0x400 + (u16_lo - 0xdc00);
-					} else {
-						goto unknown_code;
-					}
-				} else {
-					goto unknown_code;
-				}
-			}
-			mb_out = UTF32ToMB(u32, mb_ptr, mb_len);
-			if (mb_out == 0) {
-			unknown_code:
-				if (mb_ptr != NULL) {
-					// \x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD\x8Fꍇ
-					*mb_ptr = '?';
-				}
-				mb_out = 1;
-			}
-		} else {
-			// '\0'
+		uint32_t u32;
+		size_t wb_in = UTF16ToUTF32(wstr_ptr, wstr_len, &u32);
+		if (wb_in == 0) {
+			wstr_len -= 1;
+			wstr_in += 1;
+			wstr_ptr++;
+			goto unknown_code;
+		}
+		wstr_len -= wb_in;
+		wstr_in += wb_in;
+		wstr_ptr += wb_in;
+		mb_out = UTF32ToMB(u32, mb_ptr, mb_len);
+		if (mb_out == 0) {
+		unknown_code:
 			if (mb_ptr != NULL) {
-				*mb_ptr = 0;
+				// \x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD\x8Fꍇ
+				*mb_ptr = '?';
 			}
 			mb_out = 1;
 		}

Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2019-03-14 15:38:11 UTC (rev 7482)
+++ trunk/teraterm/teraterm/vtterm.c	2019-03-14 15:38:24 UTC (rev 7483)
@@ -53,7 +53,6 @@
 #include "ttime.h"
 #include "clipboar.h"
 #include "codeconv.h"
-#include "codeconv.h"
 
 #include "vtterm.h"
 

From scmnotify ＠ osdn.net  Fri Mar 15 00:53:55 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Fri, 15 Mar 2019 00:53:55 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B7484=5D_GetConvString=28=29=23ttime?=
 =?utf-8?b?LmPjga7miLvjgorlgKTjgpJjb25zdCB3Y2hhcl90ICrjgavlpInmm7Q=?=
Message-ID: <1552578835.753220.59621.nullmailer@users.osdn.me>

Revision: 7484
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7484
Author:   zmatsuo
Date:     2019-03-15 00:53:55 +0900 (Fri, 15 Mar 2019)
Log Message:
-----------
GetConvString()#ttime.cの戻り値をconst wchar_t *に変更
前後参照変換の処理を ttime.c に移動
CommTextOutW(), CommTextEchoW() を ttcmn.c に追加
imm32.lib をリンクから外した

Modified Paths:
--------------
    trunk/teraterm/common/ttcommon.h
    trunk/teraterm/teraterm/CMakeLists.txt
    trunk/teraterm/teraterm/ttime.c
    trunk/teraterm/teraterm/ttime.h
    trunk/teraterm/teraterm/vtwin.cpp
    trunk/teraterm/ttpcmn/ttcmn.c
    trunk/teraterm/ttpcmn/ttpcmn.def

-------------- next part --------------
Modified: trunk/teraterm/common/ttcommon.h
===================================================================
--- trunk/teraterm/common/ttcommon.h	2019-03-14 15:38:24 UTC (rev 7483)
+++ trunk/teraterm/common/ttcommon.h	2019-03-14 15:53:55 UTC (rev 7484)
@@ -76,8 +76,10 @@
 int PASCAL CommBinaryOut(PComVar cv, PCHAR B, int C);
 int PASCAL CommBinaryBuffOut(PComVar cv, PCHAR B, int C);
 int PASCAL CommTextOut(PComVar cv, PCHAR B, int C);
+int PASCAL CommTextOutW(PComVar cv, const wchar_t *B, int C);
 int PASCAL CommBinaryEcho(PComVar cv, PCHAR B, int C);
 int PASCAL CommTextEcho(PComVar cv, PCHAR B, int C);
+int PASCAL CommTextEchoW(PComVar cv, const wchar_t *B, int C);
 
 void PASCAL CreateNotifyIcon(PComVar cv);
 void PASCAL DeleteNotifyIcon(PComVar cv);

Modified: trunk/teraterm/teraterm/CMakeLists.txt
===================================================================
--- trunk/teraterm/teraterm/CMakeLists.txt	2019-03-14 15:38:24 UTC (rev 7483)
+++ trunk/teraterm/teraterm/CMakeLists.txt	2019-03-14 15:53:55 UTC (rev 7484)
@@ -164,7 +164,6 @@
   gdi32
   comctl32
   ws2_32
-  imm32
   imagehlp
   delayimp
   uuid

Modified: trunk/teraterm/teraterm/ttime.c
===================================================================
--- trunk/teraterm/teraterm/ttime.c	2019-03-14 15:38:24 UTC (rev 7483)
+++ trunk/teraterm/teraterm/ttime.c	2019-03-14 15:53:55 UTC (rev 7484)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2007-2017 TeraTerm Project
+ * (C) 2007-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,18 +29,25 @@
 /* Tera Term */
 /* TERATERM.EXE, IME interface */
 
-#include "teraterm.h"
-#include "tttypes.h"
+#undef UNICODE
+#undef _UNICODE
+
+#include <windows.h>
 #include <stdlib.h>
 #include <string.h>
 #include <imm.h>
 
+#include "ttime.h"
+#include "ttlib.h"
+
+#if 1
+#include "teraterm.h"
+#include "tttypes.h"
 #include "ttwinman.h"
 #include "ttcommon.h"
+#include "buffer.h"		// for BuffGetCurrentLineData()
+#endif
 
-#include "ttime.h"
-#include "ttlib.h"
-
 #ifndef _IMM_
   #define _IMM_
 
@@ -55,8 +62,8 @@
 
 #define GCS_RESULTSTR 0x0800
 
-typedef LONG (WINAPI *TImmGetCompositionString)
-	(HIMC, DWORD, LPVOID, DWORD);
+typedef LONG (WINAPI *TImmGetCompositionStringA)(HIMC, DWORD, LPVOID, DWORD);
+typedef LONG (WINAPI *TImmGetCompositionStringW)(HIMC, DWORD, LPVOID, DWORD);
 typedef HIMC (WINAPI *TImmGetContext)(HWND);
 typedef BOOL (WINAPI *TImmReleaseContext)(HWND, HIMC);
 typedef BOOL (WINAPI *TImmSetCompositionFont)(HIMC, LPLOGFONTA);
@@ -64,7 +71,8 @@
 typedef BOOL (WINAPI *TImmGetOpenStatus)(HIMC);
 typedef BOOL (WINAPI *TImmSetOpenStatus)(HIMC, BOOL);
 
-static TImmGetCompositionString PImmGetCompositionString;
+static TImmGetCompositionStringW PImmGetCompositionStringW;
+static TImmGetCompositionStringA PImmGetCompositionStringA;
 static TImmGetContext PImmGetContext;
 static TImmReleaseContext PImmReleaseContext;
 static TImmSetCompositionFont PImmSetCompositionFont;
@@ -74,8 +82,29 @@
 
 
 static HANDLE HIMEDLL = NULL;
-static LOGFONT lfIME;
+static LOGFONTA lfIME;
 
+#if 1
+static void show_message()
+{
+  char uimsg[MAX_UIMSG];
+    get_lang_msg("MSG_TT_ERROR", uimsg, sizeof(uimsg),  "Tera Term: Error", ts.UILanguageFile);
+    get_lang_msg("MSG_USE_IME_ERROR", ts.UIMsg, sizeof(ts.UIMsg), "Can't use IME", ts.UILanguageFile);
+    MessageBoxA(0,ts.UIMsg,uimsg,MB_ICONEXCLAMATION);
+    WritePrivateProfileStringA("Tera Term","IME","off",ts.SetupFName);
+    ts.UseIME = 0;
+#if 0
+    tempts = (PTTSet)malloc(sizeof(TTTSet));
+    if (tempts!=NULL)
+    {
+		GetDefaultSet(tempts);
+		tempts->UseIME = 0;
+		ChangeDefaultSet(tempts,NULL);
+		free(tempts);
+    }
+#endif
+}
+#endif
 
 BOOL LoadIME()
 {
@@ -83,38 +112,27 @@
 #if 0
   PTTSet tempts;
 #endif
-  char uimsg[MAX_UIMSG];
   char imm32_dll[MAX_PATH];
 
   if (HIMEDLL != NULL) return TRUE;
-  GetSystemDirectory(imm32_dll, sizeof(imm32_dll));
+  GetSystemDirectoryA(imm32_dll, sizeof(imm32_dll));
   strncat_s(imm32_dll, sizeof(imm32_dll), "\\imm32.dll", _TRUNCATE);
-  HIMEDLL = LoadLibrary(imm32_dll);
+  HIMEDLL = LoadLibraryA(imm32_dll);
   if (HIMEDLL == NULL)
   {
-    get_lang_msg("MSG_TT_ERROR", uimsg, sizeof(uimsg),  "Tera Term: Error", ts.UILanguageFile);
-    get_lang_msg("MSG_USE_IME_ERROR", ts.UIMsg, sizeof(ts.UIMsg), "Can't use IME", ts.UILanguageFile);
-    MessageBox(0,ts.UIMsg,uimsg,MB_ICONEXCLAMATION);
-    WritePrivateProfileString("Tera Term","IME","off",ts.SetupFName);
-    ts.UseIME = 0;
-#if 0
-    tempts = (PTTSet)malloc(sizeof(TTTSet));
-    if (tempts!=NULL)
-    {
-      GetDefaultSet(tempts);
-      tempts->UseIME = 0;
-      ChangeDefaultSet(tempts,NULL);
-      free(tempts);
-    }
-#endif
+	  show_message();
     return FALSE;
   }
 
   Err = FALSE;
 
-  PImmGetCompositionString = (TImmGetCompositionString)GetProcAddress(
+  PImmGetCompositionStringW = (TImmGetCompositionStringW)GetProcAddress(
+    HIMEDLL, "ImmGetCompositionStringW");
+  if (PImmGetCompositionStringW==NULL) Err = TRUE;
+
+  PImmGetCompositionStringA = (TImmGetCompositionStringA)GetProcAddress(
     HIMEDLL, "ImmGetCompositionStringA");
-  if (PImmGetCompositionString==NULL) Err = TRUE;
+  if (PImmGetCompositionStringA==NULL) Err = TRUE;
 
   PImmGetContext = (TImmGetContext)GetProcAddress(
     HIMEDLL, "ImmGetContext");
@@ -202,50 +220,53 @@
   (*PImmReleaseContext)(HVTWin,hIMC);
 }
 
-HGLOBAL GetConvString(UINT wParam, LPARAM lParam)
+/*
+ *	@param[in,out]	*len	wchar_t\x95\xB6\x8E\x9A\x90\x94
+ *	@reterun		\x95ϊ\xB7wchar_t\x95\xB6\x8E\x9A\x97\xF1\x82ւ̃|\x83C\x83\x93\x83^
+ *					NULL\x82̏ꍇ\x95ϊ\xB7\x8Am\x92肵\x82Ă\xA2\x82Ȃ\xA2(\x82܂\xBD\x82̓G\x83\x89\x81[)
+ *					\x95\xB6\x8E\x9A\x97\xF1\x82͎g\x97p\x8C\xE3free()\x82\xB7\x82邱\x82\xC6
+ */
+const wchar_t *GetConvString(HWND hWnd, UINT wParam, LPARAM lParam, size_t *len)
 {
-	HIMC hIMC;
-	HGLOBAL hstr = NULL;
-	//LPSTR lpstr;
 	wchar_t *lpstr;
-	DWORD dwSize;
 
+	*len = 0;
 	if (HIMEDLL==NULL) return NULL;
-	hIMC = (*PImmGetContext)(HVTWin);
-	if (hIMC==0) return NULL;
 
-	if ((lParam & GCS_RESULTSTR)==0)
-		goto skip;
+	if ((lParam & GCS_RESULTSTR) != 0) {
+		HIMC hIMC;
+		LONG size;
 
-	// Get the size of the result string.
-	//dwSize = (*PImmGetCompositionString)(hIMC, GCS_RESULTSTR, NULL, 0);
-	dwSize = ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, NULL, 0);
-	dwSize += sizeof(WCHAR);
-	hstr = GlobalAlloc(GHND,dwSize);
-	if (hstr != NULL)
-	{
-//		lpstr = (LPSTR)GlobalLock(hstr);
-		lpstr = GlobalLock(hstr);
-		if (lpstr != NULL)
-		{
-#if 0
-			// Get the result strings that is generated by IME into lpstr.
-			(*PImmGetCompositionString)
-				(hIMC, GCS_RESULTSTR, lpstr, dwSize);
-#else
-			ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, lpstr, dwSize);
-#endif
-			GlobalUnlock(hstr);
+		hIMC = (*PImmGetContext)(hWnd);
+		if (hIMC==0) return NULL;
+
+		// Get the size of the result string.
+		//		\x92\x8D\x88\xD3 ImmGetCompositionStringW() \x82̖߂\xE8\x92l\x82\xCD byte \x90\x94
+		size = PImmGetCompositionStringW(hIMC, GCS_RESULTSTR, NULL, 0);
+		if (size <= 0) {
+			lpstr = NULL;		// \x83G\x83\x89\x81[
+		} else {
+			lpstr = malloc(size + sizeof(WCHAR));
+			if (lpstr != NULL)
+			{
+				size = PImmGetCompositionStringW(hIMC, GCS_RESULTSTR, lpstr, size);
+				if (size <= 0) {
+					free(lpstr);
+					lpstr = NULL;
+				} else {
+					*len = size/2;
+					lpstr[(size/2)] = 0;	// \x83^\x81[\x83~\x83l\x81[\x83g\x82\xB7\x82\xE9
+				}
+			}
 		}
-		else {
-			GlobalFree(hstr);
-			hstr = NULL;
-		}
+
+		(*PImmReleaseContext)(hWnd, hIMC);
+
+	} else {
+		lpstr = NULL;
 	}
 
-skip:
-	(*PImmReleaseContext)(HVTWin, hIMC);
-	return hstr;
+	return lpstr;
 }
 
 BOOL GetIMEOpenStatus()
@@ -270,3 +291,67 @@
 	(*PImmSetOpenStatus)(hIMC, stat);
 	(*PImmReleaseContext)(HVTWin, hIMC);
 }
+
+// IME\x82̑O\x8C\xE3\x8EQ\x8Fƕϊ\xB7\x8B@\x94\\x82ւ̑Ή\x9E
+// MS\x82\xA9\x82炿\x82\xE1\x82\xF1\x82Ǝd\x97l\x82\xAA\x92񎦂\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x82̂ŁA\x83A\x83h\x83z\x83b\x83N\x82ɂ\xE2\x82邵\x82\xA9\x82Ȃ\xA2\x82炵\x82\xA2\x81B
+// cf. http://d.hatena.ne.jp/topiyama/20070703
+//     http://ice.hotmint.com/putty/#DOWNLOAD
+//     http://27213143.at.webry.info/201202/article_2.html
+//     http://webcache.googleusercontent.com/search?q=cache:WzlX3ouMscIJ:anago.2ch.net/test/read.cgi/software/1325573999/82+IMR_DOCUMENTFEED&cd=13&hl=ja&ct=clnk&gl=jp
+// (2012.5.9 yutaka)
+LRESULT ReplyIMERequestDocumentfeed(LPARAM lParam, int NumOfColumns)
+{
+	static int complen, newsize;
+	static char comp[512];
+	int size, ret;
+	char buf[512], newbuf[1024];
+	HIMC hIMC;
+
+	// "IME=off"\x82̏ꍇ\x82́A\x89\xBD\x82\xE0\x82\xB5\x82Ȃ\xA2\x81B
+	size = NumOfColumns + 1;   // \x83J\x81[\x83\\x83\x8B\x82\xAA\x82\xA0\x82\xE9\x8Ds\x82̒\xB7\x82\xB3+null
+
+	if (lParam == 0) {  // 1\x89\xF1\x96ڂ̌Ăяo\x82\xB5
+		// \x83o\x83b\x83t\x83@\x82̃T\x83C\x83Y\x82\xF0\x95Ԃ\xB7\x82̂݁B
+		// ATOK2012\x82ł͏\xED\x82\xC9 complen=0 \x82ƂȂ\xE9\x81B
+		complen = 0;
+		memset(comp, 0, sizeof(comp));
+		hIMC = PImmGetContext(HVTWin);
+		if (hIMC) {
+			ret = PImmGetCompositionStringA(hIMC, GCS_COMPSTR, comp, sizeof(comp));
+			if (ret == IMM_ERROR_NODATA || ret == IMM_ERROR_GENERAL) {
+				memset(comp, 0, sizeof(comp));
+			}
+			complen = strlen(comp);  // w/o null
+			PImmReleaseContext(HVTWin, hIMC);
+		}
+		newsize = size + complen;  // \x95ϊ\xB7\x95\xB6\x8E\x9A\x82\xE0\x8A܂߂\xBD\x91S\x91̂̒\xB7\x82\xB3(including null)
+
+	} else {  // 2\x89\xF1\x96ڂ̌Ăяo\x82\xB5
+		//lParam \x82\xF0 RECONVERTSTRING \x82\xC6 \x95\xB6\x8E\x9A\x97\xF1\x8Ai\x94[\x83o\x83b\x83t\x83@\x82Ɏg\x97p\x82\xB7\x82\xE9
+		RECONVERTSTRING *pReconv   = (RECONVERTSTRING*)lParam;
+		char*  pszParagraph        = (char*)pReconv + sizeof(RECONVERTSTRING);
+		int cx;
+
+		cx = BuffGetCurrentLineData(buf, sizeof(buf));
+
+		// \x83J\x81[\x83\\x83\x8B\x88ʒu\x82ɕϊ\xB7\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x91}\x93\xFC\x82\xB7\x82\xE9\x81B
+		memset(newbuf, 0, sizeof(newbuf));
+		memcpy(newbuf, buf, cx);
+		memcpy(newbuf + cx, comp, complen);
+		memcpy(newbuf + cx + complen, buf + cx, size - cx);
+		newsize = size + complen;  // \x95ϊ\xB7\x95\xB6\x8E\x9A\x82\xE0\x8A܂߂\xBD\x91S\x91̂̒\xB7\x82\xB3(including null)
+
+		pReconv->dwSize            = sizeof(RECONVERTSTRING);
+		pReconv->dwVersion         = 0;
+		pReconv->dwStrLen          = newsize - 1;
+		pReconv->dwStrOffset       = sizeof(RECONVERTSTRING);
+		pReconv->dwCompStrLen      = complen;
+		pReconv->dwCompStrOffset   = cx;
+		pReconv->dwTargetStrLen    = complen;
+		pReconv->dwTargetStrOffset = cx;
+
+		memcpy(pszParagraph, newbuf, newsize);
+		//OutputDebugPrintf("cx %d buf [%d:%s] -> [%d:%s]\n", cx, size, buf, newsize, newbuf);
+	}
+	return (sizeof(RECONVERTSTRING) + newsize);
+}

Modified: trunk/teraterm/teraterm/ttime.h
===================================================================
--- trunk/teraterm/teraterm/ttime.h	2019-03-14 15:38:24 UTC (rev 7483)
+++ trunk/teraterm/teraterm/ttime.h	2019-03-14 15:53:55 UTC (rev 7484)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2007-2017 TeraTerm Project
+ * (C) 2007-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,11 +38,12 @@
 void FreeIME();
 BOOL CanUseIME();
 void SetConversionWindow(HWND HWin, int X, int Y);
-void SetConversionLogFont(HWND HWin, PLOGFONT lf);
+void SetConversionLogFont(HWND HWin, PLOGFONTA lf);
 BOOL GetIMEOpenStatus(void);
 void SetIMEOpenStatus(BOOL stat);
 
-HGLOBAL GetConvString(UINT wParam, LPARAM lParam);
+const wchar_t *GetConvString(HWND hWnd, UINT wParam, LPARAM lParam, size_t *len);
+LRESULT ReplyIMERequestDocumentfeed(LPARAM lParam, int NumOfColumns);
 
 #ifndef WM_IME_COMPOSITION
 #define WM_IME_COMPOSITION              0x010F

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2019-03-14 15:38:24 UTC (rev 7483)
+++ trunk/teraterm/teraterm/vtwin.cpp	2019-03-14 15:53:55 UTC (rev 7484)
@@ -3218,63 +3218,34 @@
 
 LRESULT CVTWindow::OnIMEComposition(WPARAM wParam, LPARAM lParam)
 {
-	HGLOBAL hstr;
-	//LPSTR lpstr;
-	wchar_t *lpstr;
-	int Len;
-	char *mbstr;
-	int mlen;
-
 	if (CanUseIME()) {
-		hstr = GetConvString(wParam, lParam);
-	}
-	else {
-		hstr = NULL;
-	}
-
-	if (hstr!=NULL) {
-		//lpstr = (LPSTR)GlobalLock(hstr);
-		lpstr = (wchar_t *)GlobalLock(hstr);
-		if (lpstr!=NULL) {
-			mlen = wcstombs(NULL, lpstr, 0);
-			mbstr = (char *)malloc(sizeof(char) * (mlen + 1));
-			if (mbstr == NULL) {
-				goto skip;
-			}
-			Len = wcstombs(mbstr, lpstr, mlen + 1);
-
-			// add this string into text buffer of application
-			Len = strlen(mbstr);
-			if (Len==1) {
-				switch (mbstr[0]) {
+		size_t len;
+		const wchar_t *lpstr = GetConvString(HVTWin, wParam, lParam, &len);
+		if (lpstr != NULL) {
+			if (len == 1 && ControlKey()) {
+				const static wchar_t code_ctrl_space = 0;
+				const static wchar_t code_ctrl_backslash = 0x1c;
+				switch(*lpstr) {
 				case 0x20:
-					if (ControlKey()) {
-						mbstr[0] = 0; /* Ctrl-Space */
-					}
+					lpstr = &code_ctrl_space;
 					break;
 				case 0x5c: // Ctrl-\ support for NEC-PC98
-					if (ControlKey()) {
-						mbstr[0] = 0x1c;
-					}
+					lpstr = &code_ctrl_backslash;
 					break;
 				}
 			}
 			if (ts.LocalEcho>0) {
-				CommTextEcho(&cv,mbstr,Len);
+				CommTextEchoW(&cv,lpstr,len);
 			}
-			CommTextOut(&cv,mbstr,Len);
-
-			free(mbstr);
-			GlobalUnlock(hstr);
+			CommTextOutW(&cv,lpstr,len);
+			free((void *)lpstr);
+			return 0;
 		}
-skip:
-		GlobalFree(hstr);
-		return 0;
 	}
 	return CFrameWnd::DefWindowProc(WM_IME_COMPOSITION,wParam,lParam);
 }
 
-LONG CVTWindow::OnIMEInputChange(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnIMEInputChange(WPARAM wParam, LPARAM lParam)
 {
 	ChangeCaret();
 
@@ -3281,7 +3252,7 @@
 	return CFrameWnd::DefWindowProc(WM_INPUTLANGCHANGE,wParam,lParam);
 }
 
-LONG CVTWindow::OnIMENotify(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnIMENotify(WPARAM wParam, LPARAM lParam)
 {
 	switch (wParam) {
 	case IMN_SETOPENSTATUS: {
@@ -3326,72 +3297,17 @@
 	return CFrameWnd::DefWindowProc(WM_IME_NOTIFY,wParam,lParam);
 }
 
-// IME\x82̑O\x8C\xE3\x8EQ\x8Fƕϊ\xB7\x8B@\x94\\x82ւ̑Ή\x9E
-// MS\x82\xA9\x82炿\x82\xE1\x82\xF1\x82Ǝd\x97l\x82\xAA\x92񎦂\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x82̂ŁA\x83A\x83h\x83z\x83b\x83N\x82ɂ\xE2\x82邵\x82\xA9\x82Ȃ\xA2\x82炵\x82\xA2\x81B
-// cf. http://d.hatena.ne.jp/topiyama/20070703
-//     http://ice.hotmint.com/putty/#DOWNLOAD
-//     http://27213143.at.webry.info/201202/article_2.html
-//     http://webcache.googleusercontent.com/search?q=cache:WzlX3ouMscIJ:anago.2ch.net/test/read.cgi/software/1325573999/82+IMR_DOCUMENTFEED&cd=13&hl=ja&ct=clnk&gl=jp
-// (2012.5.9 yutaka)
-LONG CVTWindow::OnIMERequest(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnIMERequest(WPARAM wParam, LPARAM lParam)
 {
-	static int complen, newsize;
-	static char comp[512];
-	int size, ret;
-	char buf[512], newbuf[1024];
-	HIMC hIMC;
-
 	// "IME=off"\x82̏ꍇ\x82́A\x89\xBD\x82\xE0\x82\xB5\x82Ȃ\xA2\x81B
-	if (ts.UseIME > 0 &&
-		wParam == IMR_DOCUMENTFEED) {
-		size = NumOfColumns + 1;   // \x83J\x81[\x83\\x83\x8B\x82\xAA\x82\xA0\x82\xE9\x8Ds\x82̒\xB7\x82\xB3+null
-
-		if (lParam == 0) {  // 1\x89\xF1\x96ڂ̌Ăяo\x82\xB5
-			// \x83o\x83b\x83t\x83@\x82̃T\x83C\x83Y\x82\xF0\x95Ԃ\xB7\x82̂݁B
-			// ATOK2012\x82ł͏\xED\x82\xC9 complen=0 \x82ƂȂ\xE9\x81B
-			complen = 0;
-			memset(comp, 0, sizeof(comp));
-			hIMC = ImmGetContext(HVTWin);
-			if (hIMC) {
-				ret = ImmGetCompositionString(hIMC, GCS_COMPSTR, comp, sizeof(comp));
-				if (ret == IMM_ERROR_NODATA || ret == IMM_ERROR_GENERAL) {
-					memset(comp, 0, sizeof(comp));
-				}
-				complen = strlen(comp);  // w/o null
-				ImmReleaseContext(HVTWin, hIMC);
-			}
-			newsize = size + complen;  // \x95ϊ\xB7\x95\xB6\x8E\x9A\x82\xE0\x8A܂߂\xBD\x91S\x91̂̒\xB7\x82\xB3(including null)
-
-		} else {  // 2\x89\xF1\x96ڂ̌Ăяo\x82\xB5
-			//lParam \x82\xF0 RECONVERTSTRING \x82\xC6 \x95\xB6\x8E\x9A\x97\xF1\x8Ai\x94[\x83o\x83b\x83t\x83@\x82Ɏg\x97p\x82\xB7\x82\xE9
-			RECONVERTSTRING *pReconv   = (RECONVERTSTRING*)lParam;
-			char*  pszParagraph        = (char*)pReconv + sizeof(RECONVERTSTRING);
-			int cx;
-
-			cx = BuffGetCurrentLineData(buf, sizeof(buf));
-
-			// \x83J\x81[\x83\\x83\x8B\x88ʒu\x82ɕϊ\xB7\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x91}\x93\xFC\x82\xB7\x82\xE9\x81B
-			memset(newbuf, 0, sizeof(newbuf));
-			memcpy(newbuf, buf, cx);
-			memcpy(newbuf + cx, comp, complen);
-			memcpy(newbuf + cx + complen, buf + cx, size - cx);
-			newsize = size + complen;  // \x95ϊ\xB7\x95\xB6\x8E\x9A\x82\xE0\x8A܂߂\xBD\x91S\x91̂̒\xB7\x82\xB3(including null)
-
-			pReconv->dwSize            = sizeof(RECONVERTSTRING);
-			pReconv->dwVersion         = 0;
-			pReconv->dwStrLen          = newsize - 1;
-			pReconv->dwStrOffset       = sizeof(RECONVERTSTRING);
-			pReconv->dwCompStrLen      = complen;
-			pReconv->dwCompStrOffset   = cx;
-			pReconv->dwTargetStrLen    = complen;
-			pReconv->dwTargetStrOffset = cx;
-
-			memcpy(pszParagraph, newbuf, newsize);
-			//OutputDebugPrintf("cx %d buf [%d:%s] -> [%d:%s]\n", cx, size, buf, newsize, newbuf);
+	if (ts.UseIME > 0) {
+		switch(wParam) {
+		case IMR_DOCUMENTFEED:
+			return ReplyIMERequestDocumentfeed(lParam, NumOfColumns);
+		default:
+			break;
 		}
-		return (sizeof(RECONVERTSTRING) + newsize);
 	}
-
 	return CFrameWnd::DefWindowProc(WM_IME_REQUEST,wParam,lParam);
 }
 

Modified: trunk/teraterm/ttpcmn/ttcmn.c
===================================================================
--- trunk/teraterm/ttpcmn/ttcmn.c	2019-03-14 15:38:24 UTC (rev 7483)
+++ trunk/teraterm/ttpcmn/ttcmn.c	2019-03-14 15:53:55 UTC (rev 7484)
@@ -48,6 +48,7 @@
 
 #include "compat_w95.h"
 #include "tt_res.h"
+#include "ttcommon.h"
 #include "codeconv.h"
 
 // TMap \x82\xF0\x8Ai\x94[\x82\xB7\x82\xE9\x83t\x83@\x83C\x83\x8B\x83}\x83b\x83s\x83\x93\x83O\x83I\x83u\x83W\x83F\x83N\x83g(\x8B\xA4\x97L\x83\x81\x83\x82\x83\x8A)\x82̖\xBC\x91O
@@ -1918,6 +1919,38 @@
 	return i;
 }
 
+// TODO: UTF-16\x82\xA9\x82璼\x90ڕϊ\xB7\x82\xB5\x82ďo\x97͂\xB7\x82\xE9
+int WINAPI CommTextOutW(PComVar cv, const wchar_t *B, int C)
+{
+	int CodePage = *cv->CodePage;
+	size_t mb_len;
+	int r;
+	char *mb_str = _WideCharToMultiByte(B, C, CodePage, &mb_len);
+	if (mb_str == NULL) {
+		r = 0;
+	} else {
+		r = CommTextOut(cv, mb_str, mb_len);
+		free(mb_str);
+	}
+	return r;
+}
+
+// TODO: UTF-16\x82\xA9\x82璼\x90ڕϊ\xB7\x82\xB5\x82ďo\x97͂\xB7\x82\xE9
+int WINAPI CommTextEchoW(PComVar cv, const wchar_t *B, int C)
+{
+	int CodePage = *cv->CodePage;
+	size_t mb_len;
+	int r;
+	char *mb_str = _WideCharToMultiByte(B, C, CodePage, &mb_len);
+	if (mb_str == NULL) {
+		r = 0;
+	} else {
+		r = CommTextEcho(cv, mb_str, mb_len);
+		free(mb_str);
+	}
+	return r;
+}
+
 int WINAPI CommBinaryEcho(PComVar cv, PCHAR B, int C)
 {
 	int a, i, Len;

Modified: trunk/teraterm/ttpcmn/ttpcmn.def
===================================================================
--- trunk/teraterm/ttpcmn/ttpcmn.def	2019-03-14 15:38:24 UTC (rev 7483)
+++ trunk/teraterm/ttpcmn/ttpcmn.def	2019-03-14 15:53:55 UTC (rev 7484)
@@ -23,8 +23,10 @@
   CommBinaryOut @24
   CommBinaryBuffOut @52
   CommTextOut @25
+  CommTextOutW
   CommBinaryEcho @26
   CommTextEcho @27
+  CommTextEchoW
   DetectComPorts @42
   GetDefaultFName @47
   ExtractFileName @48

From scmnotify ＠ osdn.net  Fri Mar 15 00:54:14 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Fri, 15 Mar 2019 00:54:14 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0ODVdIHR0aW1l5ZGo44KK44KS5pW055CG?=
Message-ID: <1552578854.153558.60804.nullmailer@users.osdn.me>

Revision: 7485
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7485
Author:   zmatsuo
Date:     2019-03-15 00:54:13 +0900 (Fri, 15 Mar 2019)
Log Message:
-----------
ttime周りを整理

Modified Paths:
--------------
    trunk/teraterm/teraterm/ttime.c
    trunk/teraterm/teraterm/ttime.h
    trunk/teraterm/teraterm/vtdisp.c
    trunk/teraterm/teraterm/vtterm.c
    trunk/teraterm/teraterm/vtwin.cpp

-------------- next part --------------
Modified: trunk/teraterm/teraterm/ttime.c
===================================================================
--- trunk/teraterm/teraterm/ttime.c	2019-03-14 15:53:55 UTC (rev 7484)
+++ trunk/teraterm/teraterm/ttime.c	2019-03-14 15:54:13 UTC (rev 7485)
@@ -29,9 +29,6 @@
 /* Tera Term */
 /* TERATERM.EXE, IME interface */
 
-#undef UNICODE
-#undef _UNICODE
-
 #include <windows.h>
 #include <stdlib.h>
 #include <string.h>
@@ -48,7 +45,7 @@
 #include "buffer.h"		// for BuffGetCurrentLineData()
 #endif
 
-#ifndef _IMM_
+#if 0	// #ifndef _IMM_
   #define _IMM_
 
   typedef DWORD HIMC;
@@ -58,9 +55,9 @@
     POINT ptCurrentPos;
     RECT  rcArea;
   } COMPOSITIONFORM, *PCOMPOSITIONFORM, NEAR *NPCOMPOSITIONFORM, *LPCOMPOSITIONFORM;
-#endif //_IMM_
 
 #define GCS_RESULTSTR 0x0800
+#endif //_IMM_
 
 typedef LONG (WINAPI *TImmGetCompositionStringA)(HIMC, DWORD, LPVOID, DWORD);
 typedef LONG (WINAPI *TImmGetCompositionStringW)(HIMC, DWORD, LPVOID, DWORD);
@@ -87,6 +84,9 @@
 #if 1
 static void show_message()
 {
+#if 0
+  PTTSet tempts;
+#endif
   char uimsg[MAX_UIMSG];
     get_lang_msg("MSG_TT_ERROR", uimsg, sizeof(uimsg),  "Tera Term: Error", ts.UILanguageFile);
     get_lang_msg("MSG_USE_IME_ERROR", ts.UIMsg, sizeof(ts.UIMsg), "Can't use IME", ts.UILanguageFile);
@@ -109,9 +109,6 @@
 BOOL LoadIME()
 {
   BOOL Err;
-#if 0
-  PTTSet tempts;
-#endif
   char imm32_dll[MAX_PATH];
 
   if (HIMEDLL != NULL) return TRUE;
@@ -168,7 +165,7 @@
     return TRUE;
 }
 
-void FreeIME()
+void FreeIME(HWND hWnd)
 {
   HANDLE HTemp;
 
@@ -177,7 +174,7 @@
   HIMEDLL = NULL;
 
   /* position of conv. window -> default */
-  SetConversionWindow(HVTWin,-1,0);
+  SetConversionWindow(hWnd,-1,0);
   Sleep(1); // for safety
   FreeLibrary(HTemp);
 }
@@ -187,7 +184,7 @@
   return (HIMEDLL != NULL);
 }
 
-void SetConversionWindow(HWND HWin, int X, int Y)
+void SetConversionWindow(HWND HWnd, int X, int Y)
 {
   HIMC	hIMC;
   COMPOSITIONFORM cf;
@@ -194,7 +191,7 @@
 
   if (HIMEDLL == NULL) return;
 // Adjust the position of conversion window
-  hIMC = (*PImmGetContext)(HVTWin);
+  hIMC = (*PImmGetContext)(HWnd);
   if (X>=0)
   {
     cf.dwStyle = CFS_POINT;
@@ -204,10 +201,10 @@
   else
     cf.dwStyle = CFS_DEFAULT;
   (*PImmSetCompositionWindow)(hIMC,&cf);
-  (*PImmReleaseContext)(HVTWin,hIMC);
+  (*PImmReleaseContext)(HWnd,hIMC);
 }
 
-void SetConversionLogFont(HWND HWin, PLOGFONT lf)
+void SetConversionLogFont(HWND HWnd, PLOGFONTA lf)
 {
   HIMC	hIMC;
   if (HIMEDLL == NULL) return;
@@ -214,10 +211,10 @@
 
   memcpy(&lfIME,lf,sizeof(LOGFONT));
 
-  hIMC = (*PImmGetContext)(HVTWin);
+  hIMC = (*PImmGetContext)(HWnd);
   // Set font for the conversion window
   (*PImmSetCompositionFont)(hIMC,&lfIME);
-  (*PImmReleaseContext)(HVTWin,hIMC);
+  (*PImmReleaseContext)(HWnd,hIMC);
 }
 
 /*
@@ -269,27 +266,27 @@
 	return lpstr;
 }
 
-BOOL GetIMEOpenStatus()
+BOOL GetIMEOpenStatus(HWND hWnd)
 {
 	HIMC hIMC;
 	BOOL stat;
 
 	if (HIMEDLL==NULL) return FALSE;
-	hIMC = (*PImmGetContext)(HVTWin);
+	hIMC = (*PImmGetContext)(hWnd);
 	stat = (*PImmGetOpenStatus)(hIMC);
-	(*PImmReleaseContext)(HVTWin, hIMC);
+	(*PImmReleaseContext)(hWnd, hIMC);
 
 	return stat;
 
 }
 
-void SetIMEOpenStatus(BOOL stat) {
+void SetIMEOpenStatus(HWND hWnd, BOOL stat) {
 	HIMC hIMC;
 
 	if (HIMEDLL==NULL) return;
-	hIMC = (*PImmGetContext)(HVTWin);
+	hIMC = (*PImmGetContext)(hWnd);
 	(*PImmSetOpenStatus)(hIMC, stat);
-	(*PImmReleaseContext)(HVTWin, hIMC);
+	(*PImmReleaseContext)(hWnd, hIMC);
 }
 
 // IME\x82̑O\x8C\xE3\x8EQ\x8Fƕϊ\xB7\x8B@\x94\\x82ւ̑Ή\x9E
@@ -299,7 +296,7 @@
 //     http://27213143.at.webry.info/201202/article_2.html
 //     http://webcache.googleusercontent.com/search?q=cache:WzlX3ouMscIJ:anago.2ch.net/test/read.cgi/software/1325573999/82+IMR_DOCUMENTFEED&cd=13&hl=ja&ct=clnk&gl=jp
 // (2012.5.9 yutaka)
-LRESULT ReplyIMERequestDocumentfeed(LPARAM lParam, int NumOfColumns)
+LRESULT ReplyIMERequestDocumentfeed(HWND hWnd, LPARAM lParam, int NumOfColumns)
 {
 	static int complen, newsize;
 	static char comp[512];
@@ -306,6 +303,7 @@
 	int size, ret;
 	char buf[512], newbuf[1024];
 	HIMC hIMC;
+	int cx;
 
 	// "IME=off"\x82̏ꍇ\x82́A\x89\xBD\x82\xE0\x82\xB5\x82Ȃ\xA2\x81B
 	size = NumOfColumns + 1;   // \x83J\x81[\x83\\x83\x8B\x82\xAA\x82\xA0\x82\xE9\x8Ds\x82̒\xB7\x82\xB3+null
@@ -315,7 +313,7 @@
 		// ATOK2012\x82ł͏\xED\x82\xC9 complen=0 \x82ƂȂ\xE9\x81B
 		complen = 0;
 		memset(comp, 0, sizeof(comp));
-		hIMC = PImmGetContext(HVTWin);
+		hIMC = PImmGetContext(hWnd);
 		if (hIMC) {
 			ret = PImmGetCompositionStringA(hIMC, GCS_COMPSTR, comp, sizeof(comp));
 			if (ret == IMM_ERROR_NODATA || ret == IMM_ERROR_GENERAL) {
@@ -322,7 +320,7 @@
 				memset(comp, 0, sizeof(comp));
 			}
 			complen = strlen(comp);  // w/o null
-			PImmReleaseContext(HVTWin, hIMC);
+			PImmReleaseContext(hWnd, hIMC);
 		}
 		newsize = size + complen;  // \x95ϊ\xB7\x95\xB6\x8E\x9A\x82\xE0\x8A܂߂\xBD\x91S\x91̂̒\xB7\x82\xB3(including null)
 
@@ -330,7 +328,6 @@
 		//lParam \x82\xF0 RECONVERTSTRING \x82\xC6 \x95\xB6\x8E\x9A\x97\xF1\x8Ai\x94[\x83o\x83b\x83t\x83@\x82Ɏg\x97p\x82\xB7\x82\xE9
 		RECONVERTSTRING *pReconv   = (RECONVERTSTRING*)lParam;
 		char*  pszParagraph        = (char*)pReconv + sizeof(RECONVERTSTRING);
-		int cx;
 
 		cx = BuffGetCurrentLineData(buf, sizeof(buf));
 
@@ -351,7 +348,14 @@
 		pReconv->dwTargetStrOffset = cx;
 
 		memcpy(pszParagraph, newbuf, newsize);
-		//OutputDebugPrintf("cx %d buf [%d:%s] -> [%d:%s]\n", cx, size, buf, newsize, newbuf);
 	}
+
+#if 0
+	OutputDebugPrintf("WM_IME_REQUEST,IMR_DOCUMENTFEED size %d\n", newsize);
+	if (lParam == 1) {
+		OutputDebugPrintf("cx %d buf [%d:%s] -> [%d:%s]\n", cx, size, buf, newsize, newbuf);
+	}
+#endif
+
 	return (sizeof(RECONVERTSTRING) + newsize);
 }

Modified: trunk/teraterm/teraterm/ttime.h
===================================================================
--- trunk/teraterm/teraterm/ttime.h	2019-03-14 15:53:55 UTC (rev 7484)
+++ trunk/teraterm/teraterm/ttime.h	2019-03-14 15:54:13 UTC (rev 7485)
@@ -35,20 +35,15 @@
 
 /* proto types */
 BOOL LoadIME();
-void FreeIME();
+void FreeIME(HWND hWnd);
 BOOL CanUseIME();
-void SetConversionWindow(HWND HWin, int X, int Y);
-void SetConversionLogFont(HWND HWin, PLOGFONTA lf);
-BOOL GetIMEOpenStatus(void);
-void SetIMEOpenStatus(BOOL stat);
-
+void SetConversionWindow(HWND HWnd, int X, int Y);
+void SetConversionLogFont(HWND HWnd, PLOGFONTA lf);
+BOOL GetIMEOpenStatus(HWND hWnd);
+void SetIMEOpenStatus(HWND hWnd, BOOL stat);
 const wchar_t *GetConvString(HWND hWnd, UINT wParam, LPARAM lParam, size_t *len);
-LRESULT ReplyIMERequestDocumentfeed(LPARAM lParam, int NumOfColumns);
+LRESULT ReplyIMERequestDocumentfeed(HWND hWnd, LPARAM lParam, int NumOfColumns);
 
-#ifndef WM_IME_COMPOSITION
-#define WM_IME_COMPOSITION              0x010F
-#endif
-
 #ifdef __cplusplus
 }
 #endif

Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c	2019-03-14 15:53:55 UTC (rev 7484)
+++ trunk/teraterm/teraterm/vtdisp.c	2019-03-14 15:54:13 UTC (rev 7485)
@@ -2057,7 +2057,7 @@
 	if ((ts.Language==IdJapanese) || (ts.Language==IdKorean) || (ts.Language==IdUtf8)) //HKS
 	{
 		if (ts.UseIME==0)
-			FreeIME();
+			FreeIME(HVTWin);
 		else if (! LoadIME())
 			ts.UseIME = 0;
 
@@ -2070,7 +2070,7 @@
 		}
 	}
 	else
-		FreeIME();
+		FreeIME(HVTWin);
 
 	if (IsCaretOn()) CaretOn();
 }

Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2019-03-14 15:53:55 UTC (rev 7484)
+++ trunk/teraterm/teraterm/vtterm.c	2019-03-14 15:54:13 UTC (rev 7485)
@@ -2644,19 +2644,19 @@
 	switch (b) {
 	  case 'r':
 		if (CanUseIME()) {
-			SetIMEOpenStatus(IMEstat);
+			SetIMEOpenStatus(HVTWin, IMEstat);
 		}
 		break;
 
 	  case 's':
 		if (CanUseIME()) {
-			IMEstat = GetIMEOpenStatus();
+			IMEstat = GetIMEOpenStatus(HVTWin);
 		}
 		break;
 
 	  case 't':
 		if (CanUseIME()) {
-			SetIMEOpenStatus(Param[1] == 1);
+			SetIMEOpenStatus(HVTWin, Param[1] == 1);
 		}
 		break;
 	}

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2019-03-14 15:53:55 UTC (rev 7484)
+++ trunk/teraterm/teraterm/vtwin.cpp	2019-03-14 15:54:13 UTC (rev 7485)
@@ -118,6 +118,10 @@
 // \x96{\x91̂\xCD addsetting.cpp
 extern mouse_cursor_t MouseCursor[];
 
+#ifndef WM_IME_COMPOSITION
+#define WM_IME_COMPOSITION              0x010F
+#endif
+
 /////////////////////////////////////////////////////////////////////////////
 // CVTWindow
 
@@ -1984,7 +1988,7 @@
 
 	OpenHelp(HH_CLOSE_ALL, 0, ts.UILanguageFile);
 
-	FreeIME();
+	FreeIME(HVTWin);
 	FreeTTSET();
 	do { }
 	while (FreeTTDLG());
@@ -3259,7 +3263,7 @@
 		// \x93\xFC\x97̓R\x83\x93\x83e\x83L\x83X\x83g\x82̊J\x95\xF3\x91Ԃ\xAA\x8DX\x90V\x82\xB3\x82\xEA\x82\xE9(IME On/OFF)
 
 		// IME\x82\xCCOn/Off\x82\xF0\x8E擾\x82\xB7\x82\xE9
-		IMEstat = GetIMEOpenStatus();
+		IMEstat = GetIMEOpenStatus(HVTWin);
 
 		// \x8F\xF3\x91Ԃ\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9IME\x82̂\xBD\x82߂Ɉʒu\x82\xF0\x92ʒm\x82\xB7\x82\xE9
 		int CaretX = (CursorX-WinOrgX)*FontWidth;
@@ -3303,7 +3307,7 @@
 	if (ts.UseIME > 0) {
 		switch(wParam) {
 		case IMR_DOCUMENTFEED:
-			return ReplyIMERequestDocumentfeed(lParam, NumOfColumns);
+			return ReplyIMERequestDocumentfeed(HVTWin, lParam, NumOfColumns);
 		default:
 			break;
 		}

From scmnotify ＠ osdn.net  Fri Mar 15 00:54:31 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Fri, 15 Mar 2019 00:54:31 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0ODZdIExvYWRJTUUoKSN0dGltZS5j44Gu?=
 =?utf-8?b?44Ko44Op44O86KGo56S65Yem55CG44KS5ZG844Gz5YWD44GudnRkaXNwLmM=?=
 =?utf-8?b?44Gr56e75YuV44GX44Gf?=
Message-ID: <1552578871.575816.60882.nullmailer@users.osdn.me>

Revision: 7486
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7486
Author:   zmatsuo
Date:     2019-03-15 00:54:31 +0900 (Fri, 15 Mar 2019)
Log Message:
-----------
LoadIME()#ttime.cのエラー表示処理を呼び元のvtdisp.cに移動した

Modified Paths:
--------------
    trunk/teraterm/teraterm/ttime.c
    trunk/teraterm/teraterm/ttime.h
    trunk/teraterm/teraterm/vtdisp.c
    trunk/teraterm/teraterm/vtwin.cpp

-------------- next part --------------
Modified: trunk/teraterm/teraterm/ttime.c
===================================================================
--- trunk/teraterm/teraterm/ttime.c	2019-03-14 15:54:13 UTC (rev 7485)
+++ trunk/teraterm/teraterm/ttime.c	2019-03-14 15:54:31 UTC (rev 7486)
@@ -45,7 +45,8 @@
 #include "buffer.h"		// for BuffGetCurrentLineData()
 #endif
 
-#if 0	// #ifndef _IMM_
+// imm.h \x82\xAA include \x82ł\xAB\x82\xEA\x82\xCE _IMM_ \x82\xAA define \x82\xB3\x82\xEA\x82\xE9 \x81\xA8 \x82\xB1\x82̃u\x83\x8D\x83b\x83N\x95s\x97v?
+#ifndef _IMM_
   #define _IMM_
 
   typedef DWORD HIMC;
@@ -81,33 +82,8 @@
 static HANDLE HIMEDLL = NULL;
 static LOGFONTA lfIME;
 
-#if 1
-static void show_message()
+BOOL LoadIME(void)
 {
-#if 0
-  PTTSet tempts;
-#endif
-  char uimsg[MAX_UIMSG];
-    get_lang_msg("MSG_TT_ERROR", uimsg, sizeof(uimsg),  "Tera Term: Error", ts.UILanguageFile);
-    get_lang_msg("MSG_USE_IME_ERROR", ts.UIMsg, sizeof(ts.UIMsg), "Can't use IME", ts.UILanguageFile);
-    MessageBoxA(0,ts.UIMsg,uimsg,MB_ICONEXCLAMATION);
-    WritePrivateProfileStringA("Tera Term","IME","off",ts.SetupFName);
-    ts.UseIME = 0;
-#if 0
-    tempts = (PTTSet)malloc(sizeof(TTTSet));
-    if (tempts!=NULL)
-    {
-		GetDefaultSet(tempts);
-		tempts->UseIME = 0;
-		ChangeDefaultSet(tempts,NULL);
-		free(tempts);
-    }
-#endif
-}
-#endif
-
-BOOL LoadIME()
-{
   BOOL Err;
   char imm32_dll[MAX_PATH];
 
@@ -117,7 +93,6 @@
   HIMEDLL = LoadLibraryA(imm32_dll);
   if (HIMEDLL == NULL)
   {
-	  show_message();
     return FALSE;
   }
 
@@ -179,7 +154,7 @@
   FreeLibrary(HTemp);
 }
 
-BOOL CanUseIME()
+BOOL CanUseIME(void)
 {
   return (HIMEDLL != NULL);
 }
@@ -280,7 +255,8 @@
 
 }
 
-void SetIMEOpenStatus(HWND hWnd, BOOL stat) {
+void SetIMEOpenStatus(HWND hWnd, BOOL stat)
+{
 	HIMC hIMC;
 
 	if (HIMEDLL==NULL) return;

Modified: trunk/teraterm/teraterm/ttime.h
===================================================================
--- trunk/teraterm/teraterm/ttime.h	2019-03-14 15:54:13 UTC (rev 7485)
+++ trunk/teraterm/teraterm/ttime.h	2019-03-14 15:54:31 UTC (rev 7486)
@@ -34,9 +34,9 @@
 #endif
 
 /* proto types */
-BOOL LoadIME();
+BOOL LoadIME(void);
 void FreeIME(HWND hWnd);
-BOOL CanUseIME();
+BOOL CanUseIME(void);
 void SetConversionWindow(HWND HWnd, int X, int Y);
 void SetConversionLogFont(HWND HWnd, PLOGFONTA lf);
 BOOL GetIMEOpenStatus(HWND hWnd);

Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c	2019-03-14 15:54:13 UTC (rev 7485)
+++ trunk/teraterm/teraterm/vtdisp.c	2019-03-14 15:54:31 UTC (rev 7486)
@@ -2058,8 +2058,14 @@
 	{
 		if (ts.UseIME==0)
 			FreeIME(HVTWin);
-		else if (! LoadIME())
+		else if (! LoadIME()) {
+			char uimsg[MAX_UIMSG];
+			get_lang_msg("MSG_TT_ERROR", uimsg, sizeof(uimsg),  "Tera Term: Error", ts.UILanguageFile);
+			get_lang_msg("MSG_USE_IME_ERROR", ts.UIMsg, sizeof(ts.UIMsg), "Can't use IME", ts.UILanguageFile);
+			MessageBoxA(0,ts.UIMsg,uimsg,MB_ICONEXCLAMATION);
+			WritePrivateProfileStringA("Tera Term","IME","off",ts.SetupFName);
 			ts.UseIME = 0;
+		}
 
 		if (ts.UseIME>0)
 		{

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2019-03-14 15:54:13 UTC (rev 7485)
+++ trunk/teraterm/teraterm/vtwin.cpp	2019-03-14 15:54:31 UTC (rev 7486)
@@ -3226,22 +3226,23 @@
 		size_t len;
 		const wchar_t *lpstr = GetConvString(HVTWin, wParam, lParam, &len);
 		if (lpstr != NULL) {
+			const wchar_t *output_wstr = lpstr;
 			if (len == 1 && ControlKey()) {
 				const static wchar_t code_ctrl_space = 0;
 				const static wchar_t code_ctrl_backslash = 0x1c;
 				switch(*lpstr) {
 				case 0x20:
-					lpstr = &code_ctrl_space;
+					output_wstr = &code_ctrl_space;
 					break;
 				case 0x5c: // Ctrl-\ support for NEC-PC98
-					lpstr = &code_ctrl_backslash;
+					output_wstr = &code_ctrl_backslash;
 					break;
 				}
 			}
 			if (ts.LocalEcho>0) {
-				CommTextEchoW(&cv,lpstr,len);
+				CommTextEchoW(&cv,output_wstr,len);
 			}
-			CommTextOutW(&cv,lpstr,len);
+			CommTextOutW(&cv,output_wstr,len);
 			free((void *)lpstr);
 			return 0;
 		}

From scmnotify ＠ osdn.net  Sun Mar 17 01:20:34 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sun, 17 Mar 2019 01:20:34 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0ODddIElNReWJjeW+jOWPgueFp+WkiQ==?=
 =?utf-8?b?5o+b44GM5YuV5L2c44GX44Gq44GP44Gq44Gj44Gm44GE44Gf44Gu44Gn6Kq/?=
 =?utf-8?b?5pW0?=
Message-ID: <1552753234.053243.72166.nullmailer@users.osdn.me>

Revision: 7487
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7487
Author:   zmatsuo
Date:     2019-03-17 01:20:33 +0900 (Sun, 17 Mar 2019)
Log Message:
-----------
IME前後参照変換が動作しなくなっていたので調整

Modified Paths:
--------------
    trunk/teraterm/teraterm/ttime.c
    trunk/teraterm/teraterm/ttime.h
    trunk/teraterm/teraterm/vtwin.cpp

-------------- next part --------------
Modified: trunk/teraterm/teraterm/ttime.c
===================================================================
--- trunk/teraterm/teraterm/ttime.c	2019-03-14 15:54:31 UTC (rev 7486)
+++ trunk/teraterm/teraterm/ttime.c	2019-03-16 16:20:33 UTC (rev 7487)
@@ -33,16 +33,16 @@
 #include <stdlib.h>
 #include <string.h>
 #include <imm.h>
+#include <crtdbg.h>
+#include <stdio.h>
+#include <assert.h>
 
 #include "ttime.h"
-#include "ttlib.h"
 
-#if 1
-#include "teraterm.h"
-#include "tttypes.h"
-#include "ttwinman.h"
-#include "ttcommon.h"
-#include "buffer.h"		// for BuffGetCurrentLineData()
+#ifdef _DEBUG
+#define malloc(l)	_malloc_dbg((l), _NORMAL_BLOCK, __FILE__, __LINE__)
+#define calloc(l,n)	_calloc_dbg((l), (n), _NORMAL_BLOCK, __FILE__, __LINE__)
+#define free(p)		_free_dbg((p), _NORMAL_BLOCK)
 #endif
 
 // imm.h \x82\xAA include \x82ł\xAB\x82\xEA\x82\xCE _IMM_ \x82\xAA define \x82\xB3\x82\xEA\x82\xE9 \x81\xA8 \x82\xB1\x82̃u\x83\x8D\x83b\x83N\x95s\x97v?
@@ -60,6 +60,8 @@
 #define GCS_RESULTSTR 0x0800
 #endif //_IMM_
 
+// #define ENABLE_DUMP	1
+
 typedef LONG (WINAPI *TImmGetCompositionStringA)(HIMC, DWORD, LPVOID, DWORD);
 typedef LONG (WINAPI *TImmGetCompositionStringW)(HIMC, DWORD, LPVOID, DWORD);
 typedef HIMC (WINAPI *TImmGetContext)(HWND);
@@ -88,56 +90,57 @@
   char imm32_dll[MAX_PATH];
 
   if (HIMEDLL != NULL) return TRUE;
+
   GetSystemDirectoryA(imm32_dll, sizeof(imm32_dll));
   strncat_s(imm32_dll, sizeof(imm32_dll), "\\imm32.dll", _TRUNCATE);
   HIMEDLL = LoadLibraryA(imm32_dll);
   if (HIMEDLL == NULL)
   {
-    return FALSE;
+	return FALSE;
   }
 
   Err = FALSE;
 
   PImmGetCompositionStringW = (TImmGetCompositionStringW)GetProcAddress(
-    HIMEDLL, "ImmGetCompositionStringW");
+	HIMEDLL, "ImmGetCompositionStringW");
   if (PImmGetCompositionStringW==NULL) Err = TRUE;
 
   PImmGetCompositionStringA = (TImmGetCompositionStringA)GetProcAddress(
-    HIMEDLL, "ImmGetCompositionStringA");
+	HIMEDLL, "ImmGetCompositionStringA");
   if (PImmGetCompositionStringA==NULL) Err = TRUE;
 
   PImmGetContext = (TImmGetContext)GetProcAddress(
-    HIMEDLL, "ImmGetContext");
+	HIMEDLL, "ImmGetContext");
   if (PImmGetContext==NULL) Err = TRUE;
 
   PImmReleaseContext = (TImmReleaseContext)GetProcAddress(
-    HIMEDLL, "ImmReleaseContext");
+	HIMEDLL, "ImmReleaseContext");
   if (PImmReleaseContext==NULL) Err = TRUE;
 
   PImmSetCompositionFont = (TImmSetCompositionFont)GetProcAddress(
-    HIMEDLL, "ImmSetCompositionFontA");
+	HIMEDLL, "ImmSetCompositionFontA");
   if (PImmSetCompositionFont==NULL) Err = TRUE;
 
   PImmSetCompositionWindow = (TImmSetCompositionWindow)GetProcAddress(
-    HIMEDLL, "ImmSetCompositionWindow");
+	HIMEDLL, "ImmSetCompositionWindow");
   if (PImmSetCompositionWindow==NULL) Err = TRUE;
 
   PImmGetOpenStatus = (TImmGetOpenStatus)GetProcAddress(
-    HIMEDLL, "ImmGetOpenStatus");
+	HIMEDLL, "ImmGetOpenStatus");
   if (PImmGetOpenStatus==NULL) Err = TRUE;
 
   PImmSetOpenStatus = (TImmSetOpenStatus)GetProcAddress(
-    HIMEDLL, "ImmSetOpenStatus");
+	HIMEDLL, "ImmSetOpenStatus");
   if (PImmSetOpenStatus==NULL) Err = TRUE;
 
   if ( Err )
   {
-    FreeLibrary(HIMEDLL);
-    HIMEDLL = NULL;
-    return FALSE;
+	FreeLibrary(HIMEDLL);
+	HIMEDLL = NULL;
+	return FALSE;
   }
-  else
-    return TRUE;
+
+  return TRUE;
 }
 
 void FreeIME(HWND hWnd)
@@ -169,12 +172,12 @@
   hIMC = (*PImmGetContext)(HWnd);
   if (X>=0)
   {
-    cf.dwStyle = CFS_POINT;
-    cf.ptCurrentPos.x = X;
-    cf.ptCurrentPos.y = Y;
+	cf.dwStyle = CFS_POINT;
+	cf.ptCurrentPos.x = X;
+	cf.ptCurrentPos.y = Y;
   }
   else
-    cf.dwStyle = CFS_DEFAULT;
+	cf.dwStyle = CFS_DEFAULT;
   (*PImmSetCompositionWindow)(hIMC,&cf);
   (*PImmReleaseContext)(HWnd,hIMC);
 }
@@ -192,48 +195,123 @@
   (*PImmReleaseContext)(HWnd,hIMC);
 }
 
+// \x93\xE0\x95\x94\x97p
+static const char *GetConvStringA_i(HWND hWnd, DWORD index, size_t *len)
+{
+	HIMC hIMC;
+	LONG size;
+	char *lpstr;
+
+	hIMC = (*PImmGetContext)(hWnd);
+	if (hIMC==0)
+		goto error_2;
+
+	// Get the size of the result string.
+	//		\x92\x8D\x88\xD3 ImmGetCompositionStringA() \x82̖߂\xE8\x92l\x82\xCD byte \x90\x94
+	size = PImmGetCompositionStringA(hIMC, index, NULL, 0);
+	if (size <= 0)
+		goto error_1;
+
+	lpstr = malloc(size + sizeof(char));
+	if (lpstr == NULL)
+		goto error_1;
+
+	size = PImmGetCompositionStringA(hIMC, index, lpstr, size);
+	if (size <= 0) {
+		free(lpstr);
+		goto error_1;
+	}
+
+	*len = size;
+	lpstr[size] = 0;	// \x83^\x81[\x83~\x83l\x81[\x83g\x82\xB7\x82\xE9
+
+	(*PImmReleaseContext)(hWnd, hIMC);
+	return lpstr;
+
+error_1:
+	(*PImmReleaseContext)(hWnd, hIMC);
+error_2:
+	*len = 0;
+	return NULL;
+}
+
+// \x93\xE0\x95\x94\x97p wchar_t\x94\xC5
+static const wchar_t *GetConvStringW_i(HWND hWnd, DWORD index, size_t *len)
+{
+	HIMC hIMC;
+	LONG size;
+	wchar_t *lpstr;
+
+	hIMC = (*PImmGetContext)(hWnd);
+	if (hIMC==0)
+		goto error_2;
+
+	// Get the size of the result string.
+	//		\x92\x8D\x88\xD3 ImmGetCompositionStringW() \x82̖߂\xE8\x92l\x82\xCD byte \x90\x94
+	size = PImmGetCompositionStringW(hIMC, index, NULL, 0);
+	if (size <= 0)
+		goto error_1;
+
+	lpstr = malloc(size + sizeof(wchar_t));
+	if (lpstr == NULL)
+		goto error_1;
+
+	size = PImmGetCompositionStringW(hIMC, index, lpstr, size);
+	if (size <= 0) {
+		free(lpstr);
+		goto error_1;
+	}
+
+	*len = size/2;
+	lpstr[(size/2)] = 0;	// \x83^\x81[\x83~\x83l\x81[\x83g\x82\xB7\x82\xE9
+
+	(*PImmReleaseContext)(hWnd, hIMC);
+	return lpstr;
+
+error_1:
+	(*PImmReleaseContext)(hWnd, hIMC);
+error_2:
+	*len = 0;
+	return NULL;
+}
+
 /*
- *	@param[in,out]	*len	wchar_t\x95\xB6\x8E\x9A\x90\x94
- *	@reterun		\x95ϊ\xB7wchar_t\x95\xB6\x8E\x9A\x97\xF1\x82ւ̃|\x83C\x83\x93\x83^
+ *	@param[out]		*len	wchar_t\x95\xB6\x8E\x9A\x90\x94('\0'\x82͊܂܂Ȃ\xA2)
+ *	@retval			\x95ϊ\xB7wchar_t\x95\xB6\x8E\x9A\x97\xF1\x82ւ̃|\x83C\x83\x93\x83^
  *					NULL\x82̏ꍇ\x95ϊ\xB7\x8Am\x92肵\x82Ă\xA2\x82Ȃ\xA2(\x82܂\xBD\x82̓G\x83\x89\x81[)
  *					\x95\xB6\x8E\x9A\x97\xF1\x82͎g\x97p\x8C\xE3free()\x82\xB7\x82邱\x82\xC6
  */
-const wchar_t *GetConvString(HWND hWnd, UINT wParam, LPARAM lParam, size_t *len)
+const wchar_t *GetConvStringW(HWND hWnd, LPARAM lParam, size_t *len)
 {
-	wchar_t *lpstr;
+	const wchar_t *lpstr;
 
 	*len = 0;
 	if (HIMEDLL==NULL) return NULL;
 
 	if ((lParam & GCS_RESULTSTR) != 0) {
-		HIMC hIMC;
-		LONG size;
+		lpstr = GetConvStringW_i(hWnd, GCS_RESULTSTR, len);
+	} else {
+		lpstr = NULL;
+	}
 
-		hIMC = (*PImmGetContext)(hWnd);
-		if (hIMC==0) return NULL;
+	return lpstr;
+}
 
-		// Get the size of the result string.
-		//		\x92\x8D\x88\xD3 ImmGetCompositionStringW() \x82̖߂\xE8\x92l\x82\xCD byte \x90\x94
-		size = PImmGetCompositionStringW(hIMC, GCS_RESULTSTR, NULL, 0);
-		if (size <= 0) {
-			lpstr = NULL;		// \x83G\x83\x89\x81[
-		} else {
-			lpstr = malloc(size + sizeof(WCHAR));
-			if (lpstr != NULL)
-			{
-				size = PImmGetCompositionStringW(hIMC, GCS_RESULTSTR, lpstr, size);
-				if (size <= 0) {
-					free(lpstr);
-					lpstr = NULL;
-				} else {
-					*len = size/2;
-					lpstr[(size/2)] = 0;	// \x83^\x81[\x83~\x83l\x81[\x83g\x82\xB7\x82\xE9
-				}
-			}
-		}
+/*
+ *	@param[out]		*len	\x95\xB6\x8E\x9A\x90\x94('\0'\x82͊܂܂Ȃ\xA2)
+ *	@retval			\x95ϊ\xB7\x95\xB6\x8E\x9A\x97\xF1\x82ւ̃|\x83C\x83\x93\x83^
+ *					NULL\x82̏ꍇ\x95ϊ\xB7\x8Am\x92肵\x82Ă\xA2\x82Ȃ\xA2(\x82܂\xBD\x82̓G\x83\x89\x81[)
+ *					\x95\xB6\x8E\x9A\x97\xF1\x82͎g\x97p\x8C\xE3free()\x82\xB7\x82邱\x82\xC6
+ */
+const char *GetConvStringA(HWND hWnd, LPARAM lParam, size_t *len)
+{
+	const char *lpstr;
 
-		(*PImmReleaseContext)(hWnd, hIMC);
+	*len = 0;
+	if (HIMEDLL==NULL) return NULL;
 
+	if ((lParam & GCS_RESULTSTR) != 0) {
+		lpstr = GetConvStringA_i(hWnd, GCS_RESULTSTR, len);
 	} else {
 		lpstr = NULL;
 	}
@@ -252,7 +330,6 @@
 	(*PImmReleaseContext)(hWnd, hIMC);
 
 	return stat;
-
 }
 
 void SetIMEOpenStatus(HWND hWnd, BOOL stat)
@@ -265,73 +342,182 @@
 	(*PImmReleaseContext)(hWnd, hIMC);
 }
 
+#if defined(ENABLE_DUMP)
+static void DumpReconvStringSt(RECONVERTSTRING *pReconv, BOOL unicode)
+{
+	if (unicode) {
+		wchar_t tmp[1024];
+		_snwprintf(tmp, _countof(tmp),
+				   L"Str %d,%d CompStr %d,%d TargeteStr %d,%d '%s'\n",
+				   pReconv->dwStrLen,
+				   pReconv->dwStrOffset,
+				   pReconv->dwCompStrLen,
+				   pReconv->dwCompStrOffset,
+				   pReconv->dwTargetStrLen,
+				   pReconv->dwTargetStrOffset,
+				   (wchar_t *)(((char *)pReconv) + pReconv->dwStrOffset)
+			);
+		OutputDebugStringW(tmp);
+	} else {
+		char tmp[1024];
+		_snprintf(tmp, sizeof(tmp),
+				  "Str %d,%d CompStr %d,%d TargeteStr %d,%d '%s'\n",
+				  pReconv->dwStrLen,
+				  pReconv->dwStrOffset,
+				  pReconv->dwCompStrLen,
+				  pReconv->dwCompStrOffset,
+				  pReconv->dwTargetStrLen,
+				  pReconv->dwTargetStrOffset,
+				  (((char *)pReconv) + pReconv->dwStrOffset)
+			);
+		OutputDebugStringA(tmp);
+	}
+}
+#endif
+
 // IME\x82̑O\x8C\xE3\x8EQ\x8Fƕϊ\xB7\x8B@\x94\\x82ւ̑Ή\x9E
 // MS\x82\xA9\x82炿\x82\xE1\x82\xF1\x82Ǝd\x97l\x82\xAA\x92񎦂\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x82̂ŁA\x83A\x83h\x83z\x83b\x83N\x82ɂ\xE2\x82邵\x82\xA9\x82Ȃ\xA2\x82炵\x82\xA2\x81B
 // cf. http://d.hatena.ne.jp/topiyama/20070703
-//     http://ice.hotmint.com/putty/#DOWNLOAD
-//     http://27213143.at.webry.info/201202/article_2.html
-//     http://webcache.googleusercontent.com/search?q=cache:WzlX3ouMscIJ:anago.2ch.net/test/read.cgi/software/1325573999/82+IMR_DOCUMENTFEED&cd=13&hl=ja&ct=clnk&gl=jp
+//	   http://ice.hotmint.com/putty/#DOWNLOAD
+//	   http://27213143.at.webry.info/201202/article_2.html
+//	   http://webcache.googleusercontent.com/search?q=cache:WzlX3ouMscIJ:anago.2ch.net/test/read.cgi/software/1325573999/82+IMR_DOCUMENTFEED&cd=13&hl=ja&ct=clnk&gl=jp
 // (2012.5.9 yutaka)
-LRESULT ReplyIMERequestDocumentfeed(HWND hWnd, LPARAM lParam, int NumOfColumns)
+/**
+ * IME\x82̑O\x8C\xE3\x8EQ\x8Fƕϊ\xB7\x8B@\x94\\x97p\x8D\\x91\xA2\x91̂\xF0\x8D쐬\x82\xB7\x82\xE9
+ *		msg == WM_IME_REQUEST,wParam == IMR_DOCUMENTFEED \x82̉\x9E\x93\x9A\x82Ɏg\x82\xA4
+ *		ANSI\x82\xA9Unicode\x83E\x83B\x83\x93\x83h\x83E\x82ɂ\xE6\x82\xC1\x82ĎQ\x8Fƕ\xB6\x8E\x9A\x97\xF1\x82\xF0\x95ύX\x82\xB7\x82邱\x82\xC6
+ * unicode		TRUE\x82̂Ƃ\xABunicode
+ * str_ptr		\x8EQ\x8Fƕ\xB6\x8E\x9A\x97\xF1\x82ւ̃|\x83C\x83\x93\x83^
+ * str_count	\x8EQ\x8Fƕ\xB6\x8E\x9A\x97\xF1\x82̕\xB6\x8E\x9A\x90\x94(char\x82Ȃ\xE7bytes\x90\x94,wchar_t\x82Ȃ\xE7wchar_t\x90\x94)
+ * cx			\x83J\x81[\x83\\x83\x8B\x88ʒu(char/wchar_t\x92P\x88\xCA)
+ * st_size		\x90\xB6\x90\xAC\x82\xB5\x82\xBD\x8D\\x91\xA2\x91̂̃T\x83C\x83Y
+ * \x96߂\xE8\x92l		\x8D\\x91\xA2\x91̂ւ̃|\x83C\x83\x93\x83^
+ *				\x95s\x97v\x82ɂȂ\xC1\x82\xBD\x82\xE7 free()\x82\xB7\x82邱\x82\xC6
+ */
+static void *CreateReconvStringSt(HWND hWnd, BOOL unicode,
+								  const void *str_ptr, size_t str_count,
+								  size_t cx, size_t *st_size_)
 {
-	static int complen, newsize;
-	static char comp[512];
-	int size, ret;
-	char buf[512], newbuf[1024];
-	HIMC hIMC;
-	int cx;
+	static int new_str_len_bytes;
+	static int new_buf_len_bytes;
+	int new_str_len_count;
+	int str_len_bytes;
+	size_t str_len_count;
+	int cx_bytes;
+	RECONVERTSTRING *pReconv;
+	const void *comp_ptr;
+	size_t complen_count;
+	size_t complen_bytes;
+	const void *buf;
+	size_t st_size;
 
-	// "IME=off"\x82̏ꍇ\x82́A\x89\xBD\x82\xE0\x82\xB5\x82Ȃ\xA2\x81B
-	size = NumOfColumns + 1;   // \x83J\x81[\x83\\x83\x8B\x82\xAA\x82\xA0\x82\xE9\x8Ds\x82̒\xB7\x82\xB3+null
+	buf = str_ptr;
+	str_len_count = str_count;
 
-	if (lParam == 0) {  // 1\x89\xF1\x96ڂ̌Ăяo\x82\xB5
-		// \x83o\x83b\x83t\x83@\x82̃T\x83C\x83Y\x82\xF0\x95Ԃ\xB7\x82̂݁B
-		// ATOK2012\x82ł͏\xED\x82\xC9 complen=0 \x82ƂȂ\xE9\x81B
-		complen = 0;
-		memset(comp, 0, sizeof(comp));
-		hIMC = PImmGetContext(hWnd);
-		if (hIMC) {
-			ret = PImmGetCompositionStringA(hIMC, GCS_COMPSTR, comp, sizeof(comp));
-			if (ret == IMM_ERROR_NODATA || ret == IMM_ERROR_GENERAL) {
-				memset(comp, 0, sizeof(comp));
-			}
-			complen = strlen(comp);  // w/o null
-			PImmReleaseContext(hWnd, hIMC);
-		}
-		newsize = size + complen;  // \x95ϊ\xB7\x95\xB6\x8E\x9A\x82\xE0\x8A܂߂\xBD\x91S\x91̂̒\xB7\x82\xB3(including null)
+	if(unicode) {
+		str_len_bytes = str_len_count * sizeof(wchar_t);
+		cx_bytes = cx * sizeof(wchar_t);
+	} else {
+		str_len_bytes = str_len_count;
+		cx_bytes = cx;
+	}
 
-	} else {  // 2\x89\xF1\x96ڂ̌Ăяo\x82\xB5
-		//lParam \x82\xF0 RECONVERTSTRING \x82\xC6 \x95\xB6\x8E\x9A\x97\xF1\x8Ai\x94[\x83o\x83b\x83t\x83@\x82Ɏg\x97p\x82\xB7\x82\xE9
-		RECONVERTSTRING *pReconv   = (RECONVERTSTRING*)lParam;
-		char*  pszParagraph        = (char*)pReconv + sizeof(RECONVERTSTRING);
+	// \x95ϊ\xB7\x92\x86\x8C\xF3\x95╶\x8E\x9A\x97\xF1\x82\xF0\x8E擾
+	// ATOK2012\x82ł͏\xED\x82\xC9 complen_count=0 \x82ƂȂ\xE9\x81B
+	if (!unicode) {
+		const char *comp_strA;
+		comp_strA = GetConvStringA_i(hWnd, GCS_COMPSTR, &complen_count);
+		complen_bytes = complen_count;
+		comp_ptr = comp_strA;
+	} else {
+		const wchar_t *comp_strW;
+		comp_strW = GetConvStringW_i(hWnd,GCS_COMPSTR,	&complen_count);
+		complen_bytes = complen_count * sizeof(wchar_t);
+		comp_ptr = comp_strW;
+	}
 
-		cx = BuffGetCurrentLineData(buf, sizeof(buf));
+	// \x95ϊ\xB7\x95\xB6\x8E\x9A\x82\xE0\x8A܂߂\xBD\x91S\x91̂̒\xB7\x82\xB3(including null)
+	if (!unicode) {
+		new_str_len_bytes = str_len_bytes + complen_bytes;
+		new_buf_len_bytes = new_str_len_bytes + 1;
+		new_str_len_count = new_str_len_bytes;
+	} else {
+		new_str_len_bytes = str_len_bytes + complen_bytes;
+		new_buf_len_bytes = new_str_len_bytes + sizeof(wchar_t);
+		new_str_len_count = new_str_len_bytes / sizeof(wchar_t);
+	}
 
-		// \x83J\x81[\x83\\x83\x8B\x88ʒu\x82ɕϊ\xB7\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x91}\x93\xFC\x82\xB7\x82\xE9\x81B
-		memset(newbuf, 0, sizeof(newbuf));
-		memcpy(newbuf, buf, cx);
-		memcpy(newbuf + cx, comp, complen);
-		memcpy(newbuf + cx + complen, buf + cx, size - cx);
-		newsize = size + complen;  // \x95ϊ\xB7\x95\xB6\x8E\x9A\x82\xE0\x8A܂߂\xBD\x91S\x91̂̒\xB7\x82\xB3(including null)
+	st_size = sizeof(RECONVERTSTRING) + new_buf_len_bytes;
+	pReconv = calloc(1, st_size);
 
-		pReconv->dwSize            = sizeof(RECONVERTSTRING);
-		pReconv->dwVersion         = 0;
-		pReconv->dwStrLen          = newsize - 1;
-		pReconv->dwStrOffset       = sizeof(RECONVERTSTRING);
-		pReconv->dwCompStrLen      = complen;
-		pReconv->dwCompStrOffset   = cx;
-		pReconv->dwTargetStrLen    = complen;
-		pReconv->dwTargetStrOffset = cx;
+	// Len\x82͕\xB6\x8E\x9A\x90\x94(char/wchar_t\x92P\x88\xCA)
+	// Offset\x82\xCDbyte\x92P\x88\xCA
+//	pReconv->dwSize				= sizeof(RECONVERTSTRING);
+	pReconv->dwSize				= sizeof(RECONVERTSTRING) + new_buf_len_bytes;
+	pReconv->dwVersion			= 0;
+	pReconv->dwStrLen			= new_str_len_count;
+	pReconv->dwStrOffset		= sizeof(RECONVERTSTRING);
+	pReconv->dwCompStrLen		= complen_count;
+	pReconv->dwCompStrOffset	= cx_bytes;
+	pReconv->dwTargetStrLen		= complen_count;		// = dwCompStrOffset
+	pReconv->dwTargetStrOffset	= cx_bytes;				// = dwTargetStrLen
 
-		memcpy(pszParagraph, newbuf, newsize);
+	// RECONVERTSTRING\x82̌\xE3\x82\xEB\x82\xC9
+	// \x8EQ\x8Fƕ\xB6\x8E\x9A\x97\xF1\x82\xF0\x83R\x83s\x81[+\x83J\x81[\x83\\x83\x8B\x88ʒu\x82ɕϕ\xB6\x8E\x9A\x97\xF1\x82\xF0\x91}\x93\xFC
+	char *newbuf = (char *)pReconv + sizeof(RECONVERTSTRING);
+	if (comp_ptr != NULL) {
+		memcpy(newbuf, buf, cx_bytes);
+		newbuf += cx_bytes;
+		memcpy(newbuf, comp_ptr, complen_bytes);
+		newbuf += complen_bytes;
+		memcpy(newbuf, (char *)buf + cx_bytes, str_len_bytes - cx_bytes);
+		free((void *)comp_ptr);
+		comp_ptr = NULL;
+	} else {
+		memcpy(newbuf, buf, str_len_bytes);
 	}
-
-#if 0
-	OutputDebugPrintf("WM_IME_REQUEST,IMR_DOCUMENTFEED size %d\n", newsize);
-	if (lParam == 1) {
-		OutputDebugPrintf("cx %d buf [%d:%s] -> [%d:%s]\n", cx, size, buf, newsize, newbuf);
-	}
+#if defined(ENABLE_DUMP)
+	DumpReconvStringSt(pReconv, unicode);
 #endif
 
-	return (sizeof(RECONVERTSTRING) + newsize);
+	*st_size_ = st_size;
+	return pReconv;
 }
+
+/**
+ * IME\x82̑O\x8C\xE3\x8EQ\x8Fƕϊ\xB7\x8B@\x94\\x97p\x8D\\x91\xA2\x91̂\xF0\x8D쐬\x82\xB7\x82\xE9
+ * ANSI\x83E\x83B\x83\x93\x83h\x83E\x97p
+ *		msg == WM_IME_REQUEST,wParam == IMR_DOCUMENTFEED \x82̉\x9E\x93\x9A\x82Ɏg\x82\xA4
+ * str_ptr		\x8EQ\x8Fƕ\xB6\x8E\x9A\x97\xF1\x82ւ̃|\x83C\x83\x93\x83^
+ * str_count	\x8EQ\x8Fƕ\xB6\x8E\x9A\x97\xF1\x82̕\xB6\x8E\x9A\x90\x94(char\x90\x94,bytes\x90\x94)
+ * cx			\x83J\x81[\x83\\x83\x8B\x88ʒu(char\x92P\x88\xCA)
+ * st_size		\x90\xB6\x90\xAC\x82\xB5\x82\xBD\x8D\\x91\xA2\x91̂̃T\x83C\x83Y(byte)
+ * \x96߂\xE8\x92l		\x8D\\x91\xA2\x91̂ւ̃|\x83C\x83\x93\x83^
+ *				\x95s\x97v\x82ɂȂ\xC1\x82\xBD\x82\xE7 free()\x82\xB7\x82邱\x82\xC6
+ */
+void *CreateReconvStringStA(
+	HWND hWnd, const char *str_ptr, size_t str_count,
+	size_t cx, size_t *st_size_)
+{
+	assert(IsWindowUnicode(hWnd) == FALSE);
+	return CreateReconvStringSt(hWnd, FALSE, str_ptr, str_count, cx, st_size_);
+}
+
+/**
+ * IME\x82̑O\x8C\xE3\x8EQ\x8Fƕϊ\xB7\x8B@\x94\\x97p\x8D\\x91\xA2\x91̂\xF0\x8D쐬\x82\xB7\x82\xE9
+ * unicode\x83E\x83B\x83\x93\x83h\x83E\x97p
+ *		msg == WM_IME_REQUEST,wParam == IMR_DOCUMENTFEED \x82̉\x9E\x93\x9A\x82Ɏg\x82\xA4
+ * str_ptr		\x8EQ\x8Fƕ\xB6\x8E\x9A\x97\xF1\x82ւ̃|\x83C\x83\x93\x83^
+ * str_count	\x8EQ\x8Fƕ\xB6\x8E\x9A\x97\xF1\x82̕\xB6\x8E\x9A\x90\x94(wchar_t\x90\x94)
+ * cx			\x83J\x81[\x83\\x83\x8B\x88ʒu(wchar_t\x92P\x88\xCA)
+ * st_size		\x90\xB6\x90\xAC\x82\xB5\x82\xBD\x8D\\x91\xA2\x91̂̃T\x83C\x83Y(byte)
+ * \x96߂\xE8\x92l		\x8D\\x91\xA2\x91̂ւ̃|\x83C\x83\x93\x83^
+ *				\x95s\x97v\x82ɂȂ\xC1\x82\xBD\x82\xE7 free()\x82\xB7\x82邱\x82\xC6
+ */
+void *CreateReconvStringStW(
+	HWND hWnd, const wchar_t *str_ptr, size_t str_count,
+	size_t cx, size_t *st_size_)
+{
+	assert(IsWindowUnicode(hWnd) == TRUE);
+	return CreateReconvStringSt(hWnd, TRUE, str_ptr, str_count, cx, st_size_);
+}

Modified: trunk/teraterm/teraterm/ttime.h
===================================================================
--- trunk/teraterm/teraterm/ttime.h	2019-03-14 15:54:31 UTC (rev 7486)
+++ trunk/teraterm/teraterm/ttime.h	2019-03-16 16:20:33 UTC (rev 7487)
@@ -41,8 +41,14 @@
 void SetConversionLogFont(HWND HWnd, PLOGFONTA lf);
 BOOL GetIMEOpenStatus(HWND hWnd);
 void SetIMEOpenStatus(HWND hWnd, BOOL stat);
-const wchar_t *GetConvString(HWND hWnd, UINT wParam, LPARAM lParam, size_t *len);
-LRESULT ReplyIMERequestDocumentfeed(HWND hWnd, LPARAM lParam, int NumOfColumns);
+const wchar_t *GetConvStringW(HWND hWnd, LPARAM lParam, size_t *len);
+//const char *GetConvStringA(HWND hWnd, LPARAM lParam, size_t *len);
+void *CreateReconvStringStW(HWND hWnd,
+							const wchar_t *str_ptr, size_t str_count,
+							size_t cx, size_t *st_size_);
+void *CreateReconvStringStA(HWND hWnd,
+							const char *str_ptr, size_t str_count,
+							size_t cx, size_t *st_size_);
 
 #ifdef __cplusplus
 }

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2019-03-14 15:54:31 UTC (rev 7486)
+++ trunk/teraterm/teraterm/vtwin.cpp	2019-03-16 16:20:33 UTC (rev 7487)
@@ -71,6 +71,7 @@
 #include <windowsx.h>
 #include <imm.h>
 #include <Dbt.h>
+#include <assert.h>
 
 #include "tt_res.h"
 #include "vtwin.h"
@@ -3224,7 +3225,7 @@
 {
 	if (CanUseIME()) {
 		size_t len;
-		const wchar_t *lpstr = GetConvString(HVTWin, wParam, lParam, &len);
+		const wchar_t *lpstr = GetConvStringW(HVTWin, lParam, &len);
 		if (lpstr != NULL) {
 			const wchar_t *output_wstr = lpstr;
 			if (len == 1 && ControlKey()) {
@@ -3302,6 +3303,67 @@
 	return CFrameWnd::DefWindowProc(WM_IME_NOTIFY,wParam,lParam);
 }
 
+static LRESULT ReplyIMERequestDocumentfeed(HWND hWnd, LPARAM lParam)
+{
+	static RECONVERTSTRING *pReconvPtrSave;		// TODO leak
+	static size_t ReconvSizeSave;
+	LRESULT result;
+
+	if (lParam == 0)
+	{  // 1\x89\xF1\x96ڂ̌Ăяo\x82\xB5 \x83T\x83C\x83Y\x82\xBE\x82\xAF\x82\xF0\x95Ԃ\xB7
+		char buf[512];			// \x8EQ\x8Fƕ\xB6\x8E\x9A\x97\xF1\x82\xF0\x8E󂯎\xE6\x82\xE9\x83o\x83b\x83t\x83@
+		size_t str_len_count;
+		int cx;
+		assert(IsWindowUnicode(hWnd) == FALSE);
+
+		// \x8EQ\x8Fƕ\xB6\x8E\x9A\x97\xF1\x8E擾\x81A1\x8Ds\x8E\xE6\x82\xE8\x8Fo\x82\xB7
+		{	// \x83J\x81[\x83\\x83\x8B\x82\xA9\x82\xE7\x8C\xE3\x82\xEB\x81A\x83X\x83y\x81[\x83X\x88ȊO\x82\xAA\x8C\xA9\x82‚\xA9\x82\xC1\x82\xBD\x82Ƃ\xB1\x82\xEB\x82\xF0\x8Ds\x96\x96\x82Ƃ\xB7\x82\xE9
+			int x;
+			int len;
+			cx = BuffGetCurrentLineData(buf, sizeof(buf));
+			len = cx;
+			for (x=cx; x < NumOfColumns; x++) {
+				const char c = buf[x];
+				if (c != 0 && c != 0x20) {
+					len = x+1;
+				}
+			}
+			str_len_count = len;
+		}
+
+		// IME\x82ɕԂ\xB7\x8D\\x91\xA2\x91̂\xF0\x8D쐬\x82\xB7\x82\xE9
+		if (pReconvPtrSave != NULL) {
+			free(pReconvPtrSave);
+		}
+		pReconvPtrSave = (RECONVERTSTRING *)CreateReconvStringStA(
+			hWnd, buf, str_len_count, cx, &ReconvSizeSave);
+
+		// 1\x89\xF1\x96ڂ̓T\x83C\x83Y\x82\xBE\x82\xAF\x82\xF0\x95Ԃ\xB7
+		result = ReconvSizeSave;
+	}
+	else {
+		// 2\x89\xF1\x96ڂ̌Ăяo\x82\xB5 \x8D\\x91\xA2\x91̂\xF0\x93n\x82\xB7
+		if (pReconvPtrSave != NULL) {
+			RECONVERTSTRING *pReconv = (RECONVERTSTRING*)lParam;
+			memcpy(pReconv, pReconvPtrSave, ReconvSizeSave);
+			result = ReconvSizeSave;
+			free(pReconvPtrSave);
+			pReconvPtrSave = NULL;
+			ReconvSizeSave = 0;
+		} else {
+			// 3\x89\xF1\x96\xDA?
+			result = 0;
+		}
+	}
+
+#if 0
+	OutputDebugPrintf("WM_IME_REQUEST,IMR_DOCUMENTFEED lp=%p LRESULT %d\n",
+		lParam, result);
+#endif
+
+	return result;
+}
+
 LRESULT CVTWindow::OnIMERequest(WPARAM wParam, LPARAM lParam)
 {
 	// "IME=off"\x82̏ꍇ\x82́A\x89\xBD\x82\xE0\x82\xB5\x82Ȃ\xA2\x81B
@@ -3308,7 +3370,7 @@
 	if (ts.UseIME > 0) {
 		switch(wParam) {
 		case IMR_DOCUMENTFEED:
-			return ReplyIMERequestDocumentfeed(HVTWin, lParam, NumOfColumns);
+			return ReplyIMERequestDocumentfeed(HVTWin, lParam);
 		default:
 			break;
 		}

From scmnotify ＠ osdn.net  Sun Mar 17 01:20:46 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sun, 17 Mar 2019 01:20:46 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0ODhdIGtleWNvZGXjgpJVTklDT0RF5paH?=
 =?utf-8?b?5a2X44K744OD44OI44Gn44OT44Or44OJ44Gn44GN44KL44KI44GG44Gr44GX?=
 =?utf-8?b?44Gf?=
Message-ID: <1552753246.533220.72329.nullmailer@users.osdn.me>

Revision: 7488
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7488
Author:   zmatsuo
Date:     2019-03-17 01:20:46 +0900 (Sun, 17 Mar 2019)
Log Message:
-----------
keycodeをUNICODE文字セットでビルドできるようにした

Modified Paths:
--------------
    trunk/teraterm/keycode/keycode.c

-------------- next part --------------
Modified: trunk/teraterm/keycode/keycode.c
===================================================================
--- trunk/teraterm/keycode/keycode.c	2019-03-16 16:20:33 UTC (rev 7487)
+++ trunk/teraterm/keycode/keycode.c	2019-03-16 16:20:46 UTC (rev 7488)
@@ -32,9 +32,10 @@
 #include <windows.h>
 #include <stdio.h>
 #include <string.h>
+#include <tchar.h>
 
 #include "kc_res.h"
-#define ClassName "KeyCodeWin32"
+#define ClassName _T("KeyCodeWin32")
 
 #include "compat_w95.h"
 
@@ -64,7 +65,7 @@
 
 	DoCover_IsDebuggerPresent();
 
-	if ((module = GetModuleHandle("kernel32.dll")) != NULL) {
+	if ((module = GetModuleHandleA("kernel32.dll")) != NULL) {
 		if ((setDefDllDir = (pSetDefDllDir)GetProcAddress(module, "SetDefaultDllDirectories")) != NULL) {
 			// SetDefaultDllDirectories() \x82\xAA\x8Eg\x82\xA6\x82\xE9\x8Fꍇ\x82́A\x8C\x9F\x8D\xF5\x83p\x83X\x82\xF0 %WINDOWS%\system32 \x82݂̂ɐݒ肷\x82\xE9
 			(*setDefDllDir)((DWORD)0x00000800); // LOAD_LIBRARY_SEARCH_SYSTEM32
@@ -93,7 +94,7 @@
 	ghInstance = hInstance;
 
 	hWnd = CreateWindow(ClassName,
-	                    "Key code for Tera Term",
+	                    _T("Key code for Tera Term"),
 	                    WS_OVERLAPPEDWINDOW,
 	                    CW_USEDEFAULT,
 	                    CW_USEDEFAULT,
@@ -174,10 +175,10 @@
 
 	if (KeyDown) {
 		_snprintf_s(OutStr,sizeof(OutStr),_TRUNCATE,"Key code is %u.",Scan);
-		TextOut(hDC,10,10,OutStr,strlen(OutStr));
+		TextOutA(hDC,10,10,OutStr,strlen(OutStr));
 	}
 	else {
-		TextOut(hDC,10,10,"Push any key.",13);
+		TextOutA(hDC,10,10,"Push any key.",13);
 	}
 
 	EndPaint(hWnd, &ps);

From scmnotify ＠ osdn.net  Mon Mar 18 18:28:54 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 18 Mar 2019 18:28:54 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0ODldIFZTMjAwNSDjgafjg5Pjg6vjg4k=?=
 =?utf-8?b?44Gn44GN44Gq44GE44Gu44KS5L+u5q2j?=
Message-ID: <1552901334.904192.33508.nullmailer@users.osdn.me>

Revision: 7489
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7489
Author:   doda
Date:     2019-03-18 18:28:54 +0900 (Mon, 18 Mar 2019)
Log Message:
-----------
VS2005 でビルドできないのを修正

Modified Paths:
--------------
    trunk/teraterm/teraterm/ttime.c

-------------- next part --------------
Modified: trunk/teraterm/teraterm/ttime.c
===================================================================
--- trunk/teraterm/teraterm/ttime.c	2019-03-16 16:20:46 UTC (rev 7488)
+++ trunk/teraterm/teraterm/ttime.c	2019-03-18 09:28:54 UTC (rev 7489)
@@ -410,6 +410,7 @@
 	size_t complen_bytes;
 	const void *buf;
 	size_t st_size;
+	char *newbuf;
 
 	buf = str_ptr;
 	str_len_count = str_count;
@@ -464,7 +465,7 @@
 
 	// RECONVERTSTRING\x82̌\xE3\x82\xEB\x82\xC9
 	// \x8EQ\x8Fƕ\xB6\x8E\x9A\x97\xF1\x82\xF0\x83R\x83s\x81[+\x83J\x81[\x83\\x83\x8B\x88ʒu\x82ɕϕ\xB6\x8E\x9A\x97\xF1\x82\xF0\x91}\x93\xFC
-	char *newbuf = (char *)pReconv + sizeof(RECONVERTSTRING);
+	newbuf = (char *)pReconv + sizeof(RECONVERTSTRING);
 	if (comp_ptr != NULL) {
 		memcpy(newbuf, buf, cx_bytes);
 		newbuf += cx_bytes;

From scmnotify ＠ osdn.net  Mon Mar 18 22:28:00 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 18 Mar 2019 22:28:00 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0OTBdIHdzMl8zMi5kbGzjgafjgqjjg6k=?=
 =?utf-8?b?44O844GM5Ye644Gq44GE44KI44GG5L+u5q2jKHI3NDk35Y+C54WnKQ==?=
Message-ID: <1552915680.958847.45640.nullmailer@users.osdn.me>

Revision: 7490
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7490
Author:   zmatsuo
Date:     2019-03-18 22:28:00 +0900 (Mon, 18 Mar 2019)
Log Message:
-----------
ws2_32.dllでエラーが出ないよう修正(r7497参照)
プロキシプラグインのファイル名を修正(TTXProxy.dll)

Modified Paths:
--------------
    trunk/TTProxy/CMakeLists.txt
    trunk/TTProxy/StdAfx.h

-------------- next part --------------
Modified: trunk/TTProxy/CMakeLists.txt
===================================================================
--- trunk/TTProxy/CMakeLists.txt	2019-03-18 09:28:54 UTC (rev 7489)
+++ trunk/TTProxy/CMakeLists.txt	2019-03-18 13:28:00 UTC (rev 7490)
@@ -91,14 +91,12 @@
   ${YCL_SRC}
   )
 
-if(MINGW)
-  set_target_properties(
-    ttproxy
-    PROPERTIES
-    PREFIX ""
-    OUTPUT_NAME "TTXProxy"
-    )
-endif()
+set_target_properties(
+  ttproxy
+  PROPERTIES
+  PREFIX ""
+  OUTPUT_NAME "TTXProxy"
+  )
 
 target_link_libraries(
   ttproxy

Modified: trunk/TTProxy/StdAfx.h
===================================================================
--- trunk/TTProxy/StdAfx.h	2019-03-18 09:28:54 UTC (rev 7489)
+++ trunk/TTProxy/StdAfx.h	2019-03-18 13:28:00 UTC (rev 7490)
@@ -24,6 +24,8 @@
 
 // \x82\xB1\x82̈ʒu\x82Ƀw\x83b\x83_\x81[\x82\xF0\x91}\x93\xFC\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2
 #include <winsock2.h>
+#include <ws2tcpip.h>
+#include <wspiapi.h>
 
 #include <openssl/crypto.h>
 #include <openssl/x509.h>

From scmnotify ＠ osdn.net  Mon Mar 18 22:57:04 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 18 Mar 2019 22:57:04 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0OTFdIOODnuODvOOCuOODn+OCuQ==?=
Message-ID: <1552917424.767745.119571.nullmailer@users.osdn.me>

Revision: 7491
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7491
Author:   zmatsuo
Date:     2019-03-18 22:57:04 +0900 (Mon, 18 Mar 2019)
Log Message:
-----------
マージミス

Modified Paths:
--------------
    branches/cmake/teraterm/teraterm/vtterm.c

-------------- next part --------------
Modified: branches/cmake/teraterm/teraterm/vtterm.c
===================================================================
--- branches/cmake/teraterm/teraterm/vtterm.c	2019-03-18 13:28:00 UTC (rev 7490)
+++ branches/cmake/teraterm/teraterm/vtterm.c	2019-03-18 13:57:04 UTC (rev 7491)
@@ -53,8 +53,6 @@
 #include "ttime.h"
 #include "clipboar.h"
 #include "codeconv.h"
-#include "codeconv.h"
-#include "codeconv.h"
 
 #include "vtterm.h"
 
@@ -5521,11 +5519,12 @@
 // \x8F]\x97\x88\x94\xC5
 static void UnicodeToCP932(unsigned int code)
 {
-	int ret;
+	size_t mblen;
 	char mbchar[2];
 
 	// Unicode\x82\xA9\x82\xE7DEC\x93\xC1\x8Eꕶ\x8E\x9A\x82ւ̃}\x83b\x83s\x83\x93\x83O
 	if (ts.UnicodeDecSpMapping) {
+		unsigned short cset;
 		cset = UTF32ToDecSp(code);
 		if (((cset >> 8) & ts.UnicodeDecSpMapping) != 0) {
 			PutDecSp(cset & 0xff);

From scmnotify ＠ osdn.net  Mon Mar 18 22:57:16 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 18 Mar 2019 22:57:16 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0OTJdIHZzMjAwNeOBp+OCs+ODs+ODkQ==?=
 =?utf-8?b?44Kk44Or44Gn44GN44Gq44GP44Gq44Gj44Gm44GE44Gf?=
Message-ID: <1552917436.993241.119774.nullmailer@users.osdn.me>

Revision: 7492
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7492
Author:   zmatsuo
Date:     2019-03-18 22:57:16 +0900 (Mon, 18 Mar 2019)
Log Message:
-----------
vs2005でコンパイルできなくなっていた

Modified Paths:
--------------
    branches/cmake/teraterm/teraterm/buffer.c
    branches/cmake/teraterm/ttpcmn/ttcmn.c

-------------- next part --------------
Modified: branches/cmake/teraterm/teraterm/buffer.c
===================================================================
--- branches/cmake/teraterm/teraterm/buffer.c	2019-03-18 13:57:04 UTC (rev 7491)
+++ branches/cmake/teraterm/teraterm/buffer.c	2019-03-18 13:57:16 UTC (rev 7492)
@@ -2376,9 +2376,10 @@
 			CurAttr.Back = AttrBuffBG[TmpPtr+i];
 			CurSel = CheckSelect(i,j);
 			{
+				wchar_t wc;
 				bufA[lenA] = CodeBuff[TmpPtr + i];
 				lenA++;
-				wchar_t wc = CodeBuffW[TmpPtr + i];
+				wc = CodeBuffW[TmpPtr + i];
 				if (wc != 0) {
 					bufW[lenW] = wc;
 					lenW++;
@@ -2394,9 +2395,10 @@
 			        (i+count<NumOfColumns) &&
 			        ((AttrBuff[TmpPtr+i+count-1] & AttrKanji) != 0) ) {
 				{
+					wchar_t wc;
 					bufA[lenA] = CodeBuff[TmpPtr + i + count];
 					lenA++;
-					wchar_t wc = CodeBuffW[TmpPtr + i + count];
+					wc = CodeBuffW[TmpPtr + i + count];
 					if (wc != 0) {
 						bufW[lenW] = wc;
 						lenW++;

Modified: branches/cmake/teraterm/ttpcmn/ttcmn.c
===================================================================
--- branches/cmake/teraterm/ttpcmn/ttcmn.c	2019-03-18 13:57:04 UTC (rev 7491)
+++ branches/cmake/teraterm/ttpcmn/ttcmn.c	2019-03-18 13:57:16 UTC (rev 7492)
@@ -2034,17 +2034,19 @@
 	}
 #endif
 
-	int CodePage = *cv->CodePage;
-	size_t mb_len;
-	int r;
-	char *mb_str = _WideCharToMultiByte(B, C, CodePage, &mb_len);
-	if (mb_str == NULL) {
-		r = 0;
-	} else {
-		r = CommTextOut(cv, mb_str, mb_len);
-		free(mb_str);
+	{
+		int CodePage = *cv->CodePage;
+		size_t mb_len;
+		int r;
+		char *mb_str = _WideCharToMultiByte(B, C, CodePage, &mb_len);
+		if (mb_str == NULL) {
+			r = 0;
+		} else {
+			r = CommTextOut(cv, mb_str, mb_len);
+			free(mb_str);
+		}
+		return r;
 	}
-	return r;
 }
 
 // TODO: UTF-16\x82\xA9\x82璼\x90ڕϊ\xB7\x82\xB5\x82ďo\x97͂\xB7\x82\xE9

From scmnotify ＠ osdn.net  Mon Mar 18 22:57:27 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 18 Mar 2019 22:57:27 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0OTNdIFVuaWNvZGUvQU5TSeOBjOOCjw==?=
 =?utf-8?b?44GL44KL44KI44GG44Gr44GX44Gf?=
Message-ID: <1552917447.640626.119914.nullmailer@users.osdn.me>

Revision: 7493
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7493
Author:   zmatsuo
Date:     2019-03-18 22:57:27 +0900 (Mon, 18 Mar 2019)
Log Message:
-----------
Unicode/ANSIがわかるようにした

Modified Paths:
--------------
    branches/cmake/version_info.h.in

-------------- next part --------------
Modified: branches/cmake/version_info.h.in
===================================================================
--- branches/cmake/version_info.h.in	2019-03-18 13:57:16 UTC (rev 7492)
+++ branches/cmake/version_info.h.in	2019-03-18 13:57:27 UTC (rev 7493)
@@ -5,6 +5,7 @@
 // infos when generated
 #cmakedefine MSVC
 #cmakedefine MINGW
+#cmakedefine USE_UNICODE_API
 // CMAKE_GENERATOR
 //  @CMAKE_GENERATOR@
 // CMAKE_COMMAND

From scmnotify ＠ osdn.net  Mon Mar 18 22:57:38 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 18 Mar 2019 22:57:38 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0OTRdIGJ1aWxk5pmC44Gr5oyH5a6a44Gn?=
 =?utf-8?b?44GN44KLX1dJTjMyX1dJTk5U44KS6Kq/44G544Gf?=
Message-ID: <1552917458.197694.119974.nullmailer@users.osdn.me>

Revision: 7494
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7494
Author:   zmatsuo
Date:     2019-03-18 22:57:37 +0900 (Mon, 18 Mar 2019)
Log Message:
-----------
build時に指定できる_WIN32_WINNTを調べた
https://sourceforge.net/p/mingw/mailman/message/8593552/

Modified Paths:
--------------
    branches/cmake/CMakeLists.txt

-------------- next part --------------
Modified: branches/cmake/CMakeLists.txt
===================================================================
--- branches/cmake/CMakeLists.txt	2019-03-18 13:57:27 UTC (rev 7493)
+++ branches/cmake/CMakeLists.txt	2019-03-18 13:57:37 UTC (rev 7494)
@@ -13,8 +13,11 @@
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
-# _WIN32_WINNT_WIN10 0x0a00
-set(_WIN32_WINNT "0x0a00")
+set(_WIN32_WINNT "0x0a00")      # _WIN32_WINNT_WIN10    Windows 10
+#set(_WIN32_WINNT "0x0501")     # _WIN32_WINNT_WINXP    Windows XP ↑build ok
+#set(_WIN32_WINNT "0x0500")     # _WIN32_WINNT_WIN2K    Windows 2000 ↓build ng
+#set(_WIN32_WINNT "0x0400")     # _WIN32_WINNT_NT4      Windows NT 4.0(95)
+message("_WIN32_WINNT=${_WIN32_WINNT}")
 if(MSVC)
   # https://www.leeholmes.com/blog/2017/02/27/differences-between-visual-studio-2012-2013-and-2015/
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_WIN32_WINNT=${_WIN32_WINNT}")

From scmnotify ＠ osdn.net  Mon Mar 18 22:57:53 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 18 Mar 2019 22:57:53 +0900
Subject: [Ttssh2-commit] [7495] Merge branch 'trunk' into cmake
Message-ID: <1552917473.919788.120063.nullmailer@users.osdn.me>

Revision: 7495
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7495
Author:   zmatsuo
Date:     2019-03-18 22:57:53 +0900 (Mon, 18 Mar 2019)
Log Message:
-----------
Merge branch 'trunk' into cmake

Modified Paths:
--------------
    branches/cmake/TTProxy/CMakeLists.txt
    branches/cmake/doc/convtext.bat
    branches/cmake/doc/en/html/about/history.html
    branches/cmake/doc/ja/html/about/history.html
    branches/cmake/doc/ja/html/index.html
    branches/cmake/doc/ja/html/reference/build_with_cmake.md
    branches/cmake/teraterm/common/codeconv.cpp
    branches/cmake/teraterm/keycode/keycode.c
    branches/cmake/teraterm/teraterm/CMakeLists.txt
    branches/cmake/teraterm/teraterm/WSAAsyncGetAddrInfo.c
    branches/cmake/teraterm/teraterm/ttime.c
    branches/cmake/teraterm/teraterm/ttime.h
    branches/cmake/teraterm/teraterm/ttwsk.c
    branches/cmake/teraterm/teraterm/vtdisp.c
    branches/cmake/teraterm/teraterm/vtterm.c
    branches/cmake/teraterm/teraterm/vtwin.cpp
    branches/cmake/ttssh2/ttxssh/auth.c
    branches/cmake/ttssh2/ttxssh/auth.h
    branches/cmake/ttssh2/ttxssh/ssh.c
    branches/cmake/ttssh2/ttxssh/ttxssh.h

-------------- next part --------------
Modified: branches/cmake/TTProxy/CMakeLists.txt
===================================================================
--- branches/cmake/TTProxy/CMakeLists.txt	2019-03-18 13:57:37 UTC (rev 7494)
+++ branches/cmake/TTProxy/CMakeLists.txt	2019-03-18 13:57:53 UTC (rev 7495)
@@ -97,14 +97,12 @@
   ${YCL_SRC}
   )
 
-if(MINGW)
-  set_target_properties(
-    ttproxy
-    PROPERTIES
-    PREFIX ""
-    OUTPUT_NAME "TTXProxy"
-    )
-endif()
+set_target_properties(
+  ttproxy
+  PROPERTIES
+  PREFIX ""
+  OUTPUT_NAME "TTXProxy"
+  )
 
 target_link_libraries(
   ttproxy

Modified: branches/cmake/doc/convtext.bat
===================================================================
--- branches/cmake/doc/convtext.bat	2019-03-18 13:57:37 UTC (rev 7494)
+++ branches/cmake/doc/convtext.bat	2019-03-18 13:57:53 UTC (rev 7495)
@@ -17,6 +17,5 @@
 %ZLIBCP% -i ..\libs\zlib\README         -o %REF_E%\zlib-LICENSE.txt      -l unix
 %ZLIBCP% -i ..\libs\zlib\README         -o %REF_J%\zlib-LICENSE.txt      -l unix
 
-sed -e '1s/^\xef\xbb\xbf//' < ja/html/reference/build_with_cmake.md > ja/html/reference/build_with_cmake_without_bom.md
-perl Markdown_1.0.1/Markdown.pl ja/html/reference/build_with_cmake_without_bom.md > ja/html/reference/build_with_cmake_utf8.html
+perl -pe 'tr/\x{feff}//d' ja/html/reference/build_with_cmake.md | perl Markdown_1.0.1/Markdown.pl > ja/html/reference/build_with_cmake_utf8.html
 %TOSJIS% -i ja/html/reference/build_with_cmake_utf8.html -o ja/html/reference/build_with_cmake.html  -c utf8

Modified: branches/cmake/doc/en/html/about/history.html
===================================================================
--- branches/cmake/doc/en/html/about/history.html	2019-03-18 13:57:37 UTC (rev 7494)
+++ branches/cmake/doc/en/html/about/history.html	2019-03-18 13:57:53 UTC (rev 7495)
@@ -35,7 +35,8 @@
 <ul class="history">
   <li>Bug fixes
     <ul>
-      <li><!--IME\x82̕ϊ\xB7\x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82̕\\x8E\xA6\x88ʒu\x82\xAA\x83J\x81[\x83\\x83\x8B\x88ʒu\x82ɒǏ]\x82\xB5\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B-->This bus was introduced in 4.102.</li>
+      <li><!--IME\x82̕ϊ\xB7\x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82̕\\x8E\xA6\x88ʒu\x82\xAA\x83J\x81[\x83\\x83\x8B\x88ʒu\x82ɒǏ]\x82\xB5\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B-->This bug was introduced in 4.102.</li>
+      <li>Can't display character such as U+2014 EM DASH, U+2212 MINUS SIGN, U+301C WAVE DASH etc. This bug was introduced in 4.102.</li>
     </ul>
   </li>
 
@@ -3112,6 +3113,7 @@
   <li>Bug fixes
     <ul>
       <li>garbage data is added to the CipherOrder and MacOrder settings when saving settings.</li>
+      <li>when echo flag is 1 in the server's authentication informatin message, password string is masked on the keyboard-interactive authentication dialog.</li>
     </ul>
   </li>
 </ul>

Modified: branches/cmake/doc/ja/html/about/history.html
===================================================================
--- branches/cmake/doc/ja/html/about/history.html	2019-03-18 13:57:37 UTC (rev 7494)
+++ branches/cmake/doc/ja/html/about/history.html	2019-03-18 13:57:53 UTC (rev 7495)
@@ -36,6 +36,7 @@
   <li>\x83o\x83O\x8FC\x90\xB3
     <ul>
       <li>IME\x82̕ϊ\xB7\x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82̕\\x8E\xA6\x88ʒu\x82\xAA\x83J\x81[\x83\\x83\x8B\x88ʒu\x82ɒǏ]\x82\xB5\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B4.102\x82ł̃G\x83\x93\x83o\x83O\x81B</li>
+      <li>U+2014 EM DASH, U+2212 MINUS SIGN, U+301C WAVE DASH \x93\x99\x82̕\xB6\x8E\x9A\x82\xAA\x95\\x8E\xA6\x82ł\xAB\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B4.102\x82ł̃G\x83\x93\x83o\x83O\x81B</li>
     </ul>
   </li>
 
@@ -3118,6 +3119,7 @@
   <li>\x83o\x83O\x8FC\x90\xB3
     <ul>
       <li>\x90ݒ\xE8\x82̕ۑ\xB6\x8E\x9E\x81ACipherOrder, MacOrder \x90ݒ\xE8\x82ɃS\x83~\x82\xAA\x95t\x89\xC1\x82\xB3\x82\xEA\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+      <li>\x83T\x81[\x83o\x82̔F\x8F؏\xEE\x95񃁃b\x83Z\x81[\x83W\x82\xC5 echo \x83t\x83\x89\x83O\x82\xAA 1 \x82̎\x9E\x82ɂ\xE0\x83L\x81[\x83{\x81[\x83h\x83C\x83\x93\x83^\x83\x89\x83N\x83e\x83B\x83u\x94F\x8F؃_\x83C\x83A\x83\x8D\x83O\x82Ńp\x83X\x83\x8F\x81[\x83h\x82\xAA\x83}\x83X\x83N\x82\xB3\x82\xEA\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
     </ul>
   </li>
 </ul>

Modified: branches/cmake/doc/ja/html/index.html
===================================================================
--- branches/cmake/doc/ja/html/index.html	2019-03-18 13:57:37 UTC (rev 7494)
+++ branches/cmake/doc/ja/html/index.html	2019-03-18 13:57:53 UTC (rev 7495)
@@ -144,6 +144,9 @@
  <LI><A HREF="reference/SFMT-LICENSE.txt">SFMT \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
  <LI><A HREF="reference/CygTerm+-LICENSE.txt">CygTerm+ \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
  <LI><A HREF="reference/develop.txt">\x8AJ\x94\xAD\x8EҌ\xFC\x82\xAF</A></LI>
+ <UL>
+   <LI><A HREF="reference/build_with_cmake.html">CMake\x83r\x83\x8B\x83h\x83V\x83X\x83e\x83\x80\x82\xF0\x8Eg\x97p\x82\xB5\x82\xBD\x83r\x83\x8B\x83h(experimental)</A></LI>
+ </UL>
  <LI><A HREF="reference/sourcecode.html">\x83\\x81[\x83X\x83R\x81[\x83h\x89\xF0\x90\xE0</A></LI>
 </UL>
 

Modified: branches/cmake/doc/ja/html/reference/build_with_cmake.md
===================================================================
--- branches/cmake/doc/ja/html/reference/build_with_cmake.md	2019-03-18 13:57:37 UTC (rev 7494)
+++ branches/cmake/doc/ja/html/reference/build_with_cmake.md	2019-03-18 13:57:53 UTC (rev 7495)
@@ -1,12 +1,12 @@
 # cmakeを使ったビルド
 
-- 実験的に cmake を使用してビルドすることができます
-- cmake https://cmake.org/
+- cmake を使用してビルドすることができます(実験的な位置づけです)
+	- https://cmake.org/
 
 ## cmakeのバージョン
 
 - Visual Studio 2005 をサポートしている cmake の最後のバージョンは 3.11.4 です
-- 2005 以外の Visual Studio を使用する場合は特に制限はありません
+- Visual Studio 2005 以外を使用する場合は特に制限はありません
 - Visual Studio 2017 インストーラーで、オプションを選べば cmake をインストールできます
 
 ## ライブラリのビルド
@@ -21,12 +21,15 @@
     ```
     mkdir build_vs2005
     cd build_vs2005
-    "c:\Program Files (x86)\CMake-3.11.4\bin\cmake.exe" .. -G "Visual Studio 8 2005"
+	..\libs\cmake-3.11.4-win32-x86\bin\cmake.exe .. -G "Visual Studio 8 2005"
     ```
-    - パスが通っていれば cmake はフルパスで書く必要はありません
     - `-G` オプションの後ろは使用する Visual Studio のバージョンに合わせて調整します
 - sln ファイルが生成されるので Visual Studio で開くことができます
 - cmakeを使ってビルドする場合は次のコマンドを実行します  
     ```
-    cmake --build . --config release
+	..\libs\cmake-3.11.4-win32-x86\bin\cmake.exe --build . --config release
     ```
+- パスが通っていれば cmake はフルパスで書く必要はありません
+- 生成された sln ファイルから起動したVisual Studioでビルドすると
+  CMakeLists.txt を変更を検出してプロジェクトファイルの再生成を自動で行うので
+  sln ファイルの生成を手動で行うのは最初の1回だけです

Modified: branches/cmake/teraterm/common/codeconv.cpp
===================================================================
--- branches/cmake/teraterm/common/codeconv.cpp	2019-03-18 13:57:37 UTC (rev 7494)
+++ branches/cmake/teraterm/common/codeconv.cpp	2019-03-18 13:57:53 UTC (rev 7495)
@@ -122,7 +122,7 @@
 		buf[1] = cp932 & 0xff;
 		len = 2;
 	}
-	ret = MultiByteToWideChar(932, MB_ERR_INVALID_CHARS, (char *)buf, len, &wchar, 1);
+	ret = ::MultiByteToWideChar(932, MB_ERR_INVALID_CHARS, (char *)buf, len, &wchar, 1);
 	if (ret <= 0) {
 		// MultiByteToWideChar()\x82\xAA\x95ϊ\xB7\x8E\xB8\x94s
 #if !defined(PRIORITY_CP932_TABLE)
@@ -164,6 +164,7 @@
  *	@param mb_code		\x83}\x83\x8B\x83`\x83o\x83C\x83g\x82̕\xB6\x8E\x9A\x83R\x81[\x83h(0x0000-0xffff)
  *	@param code_page	\x83}\x83\x8B\x83`\x83o\x83C\x83g\x82̃R\x81[\x83h\x83y\x81[\x83W
  *	@retval				unicode(UTF-32\x95\xB6\x8E\x9A\x83R\x81[\x83h)
+ *						0=\x83G\x83\x89\x81[(\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD)
  */
 unsigned int MBCP_UTF32(unsigned short mb_code, int code_page)
 {
@@ -187,7 +188,7 @@
 			buf[1] = mb_code & 0xff;
 			len = 2;
 		}
-		ret = MultiByteToWideChar(code_page, MB_ERR_INVALID_CHARS, buf, len, &wchar, 1);
+		ret = ::MultiByteToWideChar(code_page, MB_ERR_INVALID_CHARS, buf, len, &wchar, 1);
 		if (ret <= 0) {
 			c = 0;
 		} else {
@@ -210,6 +211,7 @@
 	DWORD mblen;
 	wchar_t u16_str[2];
 	size_t u16_len;
+	BOOL use_default_char;
 
 	if (u32 < 0x80) {
 		return (unsigned short)u32;
@@ -230,22 +232,20 @@
 	if (u16_len == 0) {
 		return 0;
 	}
-	mblen = WideCharToMultiByte(932, 0, u16_str, (int)u16_len, mbstr, 2, NULL, NULL);
+	use_default_char = FALSE;
+	mblen = ::WideCharToMultiByte(932, 0, u16_str, (int)u16_len, mbstr, 2, NULL, &use_default_char);
+	if (use_default_char) {
+		// \x95ϊ\xB7\x82ł\xAB\x82\xB8\x81A\x8A\xF9\x92\xE8\x82̕\xB6\x8E\x9A\x82\xF0\x8Eg\x82\xC1\x82\xBD
+		goto next_convert;
+	}
 	switch (mblen) {
 	case 0:
+		// \x95ϊ\xB7\x8E\xB8\x94s
+		goto next_convert;
 	case 1:
-	default:
-		if (mblen == 0 || mbstr[0] == '?') {
-			goto next_convert;
-		} else {
-			mb = (unsigned char)mbstr[0];
-			return mb;
-		}
+		mb = (unsigned char)mbstr[0];
+		return mb;
 	case 2:
-		if (mbstr[0] == '?' && mbstr[1] == '?') {
-			// 2byte\x8Fo\x97\xCD && "??" \x82̏ꍇ\x82͕ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD
-			goto next_convert;
-		}
 		mb = (((unsigned char)mbstr[0]) << 8) | (unsigned char)mbstr[1];
 		return mb;
 	}
@@ -320,7 +320,7 @@
 		} else {
 			goto error;
 		}
-	} else if (0xf0 <= c1 && c1 <= 0xf7 && u8_len >= 4) {
+	} else if (0xf0 <= c1 && c1 <= 0xf7) {
 		// 4byte
 		if (u8_len >= 4) {
 			const uint8_t c2 = *u8_ptr++;
@@ -504,6 +504,12 @@
 size_t UTF32ToUTF16(uint32_t u32, wchar_t *wstr_ptr, size_t wstr_len)
 {
 	size_t u16_out;
+	if (wstr_ptr == NULL) {
+		wstr_len = 2;
+	}
+	if (wstr_len == 0) {
+		return 0;
+	}
 	if (u32 < 0x10000) {
 		if (wstr_len >= 1) {
 			if (wstr_ptr != NULL) {
@@ -540,11 +546,26 @@
  */
 size_t UTF32ToCP932(uint32_t u32, char *mb_ptr, size_t mb_len)
 {
+	uint16_t cp932;
 	size_t cp932_out;
-	const uint16_t cp932 = UTF32_CP932(u32);
-	if (cp932 == 0 && u32 != 0) {
+	if (mb_ptr == NULL) {
+		mb_len = 2;		// 2byte\x82\xA0\x82\xEA\x82Α\xAB\x82\xE8\x82\xE9\x82͂\xB8
+	}
+	if (mb_len == 0) {
+		// \x8Fo\x97͐\xE6\x83T\x83C\x83Y\x82\xAA0
 		return 0;
 	}
+	if (u32 == 0) {
+		if (mb_ptr != NULL) {
+			*mb_ptr = 0;
+		}
+		return 1;
+	}
+	cp932 = UTF32_CP932(u32);
+	if (cp932 == 0) {
+		// \x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD
+		return 0;
+	}
 	if (mb_ptr == NULL) {
 		mb_len = 2;
 	}
@@ -577,7 +598,7 @@
  * @param[in]		code_page	\x95ϊ\xB7\x90\xE6codepage
  * @param[in,out]	mb_ptr		\x95ϊ\xB7\x90敶\x8E\x9A\x97\xF1\x8Fo\x97͐\xE6(NULL\x82̂Ƃ\xAB\x8Fo\x97͂\xB5\x82Ȃ\xA2)
  * @param[in]		mb_len		CP932\x8Fo\x97͐敶\x8E\x9A\x90\x94(\x95\xB6\x8E\x9A\x90\x94,sizeof(wchar_t)*wstr_len bytes)
- * @retval			\x8Fo\x97͂\xB5\x82\xBDCP932\x95\xB6\x8E\x9A\x90\x94(byte\x90\x94)
+ * @retval			\x8Fo\x97͂\xB5\x82\xBDmultibyte\x95\xB6\x8E\x9A\x90\x94(byte\x90\x94)
  *					0=\x83G\x83\x89\x81[(\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD)
  */
 size_t UTF32ToMBCP(unsigned int u32, int code_page, char *mb_ptr, size_t mb_len)
@@ -588,6 +609,7 @@
 	if (code_page == 932) {
 		return UTF32ToCP932(u32, mb_ptr, mb_len);
 	} else {
+		BOOL use_default_char;
 		wchar_t u16_str[2];
 		size_t u16_len;
 		u16_len = UTF32ToUTF16(u32, u16_str, 2);
@@ -594,10 +616,11 @@
 		if (u16_len == 0) {
 			return 0;
 		}
-		mb_len = WideCharToMultiByte(code_page, 0, u16_str, u16_len, mb_ptr, mb_len, NULL, NULL);
-		if (mb_ptr != NULL && u32 != '?' && mb_len == 1 && mb_ptr[0] == '?') {
-			// \x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD\x82Ƃ\xAB\x81A\x96߂\xE8\x92l=1, \x95\xB6\x8E\x9A[0]='?' \x82\xF0\x95Ԃ\xB5\x82Ă\xAD\x82\xE9
-			mb_len = 0;
+		use_default_char = FALSE;
+		mb_len = ::WideCharToMultiByte(code_page, 0, u16_str, u16_len, mb_ptr, mb_len, NULL, &use_default_char);
+		if (use_default_char) {
+			// \x95ϊ\xB7\x82ł\xAB\x82\xB8\x81A\x8A\xF9\x92\xE8\x82̕\xB6\x8E\x9A\x82\xF0\x8Eg\x82\xC1\x82\xBD
+			return 0;
 		}
 		return mb_len;
 	}
@@ -605,10 +628,11 @@
 
 /**
  *	wchar_t(UTF-16)\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x83}\x83\x8B\x83`\x83o\x83C\x83g\x95\xB6\x8E\x9A\x97\xF1\x82ɕϊ\xB7\x82\xB7\x82\xE9
+ *	\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA2\x95\xB6\x8E\x9A\x82\xCD '?' \x82ŏo\x97͂\xB7\x82\xE9
  *
  *	@param[in]		*wstr_ptr	wchar_t\x95\xB6\x8E\x9A\x97\xF1
  *	@param[in,out]	*wstr_len	wchar_t\x95\xB6\x8E\x9A\x97\xF1\x92\xB7
- *								NULL\x82܂\xBD\x82\xCD0\x82̂Ƃ\xAB\x8E\xA9\x93\xAE\x81AL'\0'\x82Ń^\x81[\x83~\x83l\x81[\x83g\x82\xB7\x82邱\x82\xC6)
+ *								NULL\x82܂\xBD\x82\xCD0\x82̂Ƃ\xAB\x8E\xA9\x93\xAE(L'\0'\x82Ń^\x81[\x83~\x83l\x81[\x83g\x82\xB7\x82邱\x82\xC6)
  *								NULL\x88ȊO\x82̂Ƃ\xAB\x93\xFC\x97͂\xB5\x82\xBD\x95\xB6\x8E\x9A\x90\x94\x82\xF0\x95Ԃ\xB7
  *	@param[in]		*mb_ptr		\x95ϊ\xB7\x82\xB5\x82\xBD\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x8E\xFB\x94[\x82\xB7\x82\xE9\x83|\x83C\x83\x93\x83^
  *								(NULL\x82̂Ƃ\xAB\x95ϊ\xB7\x82\xB9\x82\xB8\x82ɕ\xB6\x8E\x9A\x90\x94\x82\xF0\x83J\x83E\x83\x93\x83g\x82\xB7\x82\xE9)
@@ -642,34 +666,24 @@
 	}
 
 	while(mb_len > 0 && wstr_len > 0) {
-		const wchar_t u16 = *wstr_ptr++;
-		uint32_t u32 = u16;
 		size_t mb_out;
-		wstr_len--;
-		wstr_in++;
-		// \x83T\x83\x8D\x83Q\x81[\x83g high?
-		if (IsHighSurrogate(u16)) {
-			if (wstr_len >= 1) {
-				const wchar_t u16_lo = *wstr_ptr++;
-				wstr_len--;
-				wstr_in++;
-				// \x83T\x83\x8D\x83Q\x81[\x83g low?
-				if (IsLowSurrogate(u16_lo)) {
-					// \x83T\x83\x8D\x83Q\x81[\x83g\x83y\x83A \x83f\x83R\x81[\x83h
-					u32 = 0x10000 + (u16 - 0xd800) * 0x400 + (u16_lo - 0xdc00);
-				} else {
-					goto unknown_code;
-				}
-			} else {
-				goto unknown_code;
-			}
+		uint32_t u32;
+		size_t wb_in = UTF16ToUTF32(wstr_ptr, wstr_len, &u32);
+		if (wb_in == 0) {
+			wstr_len -= 1;
+			wstr_in += 1;
+			wstr_ptr++;
+			goto unknown_code;
 		}
+		wstr_len -= wb_in;
+		wstr_in += wb_in;
+		wstr_ptr += wb_in;
 		mb_out = UTF32ToMB(u32, mb_ptr, mb_len);
 		if (mb_out == 0) {
 		unknown_code:
 			if (mb_ptr != NULL) {
 				// \x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD\x8Fꍇ
-				*mb_ptr++ = '?';
+				*mb_ptr = '?';
 			}
 			mb_out = 1;
 		}
@@ -739,10 +753,16 @@
 	while(wstr_len > 0 && u8_len > 0) {
 		uint32_t u32;
 		size_t u16_out;
-		size_t u8_in = UTF8ToUTF32(u8_ptr, u8_len, &u32);
-		if (u8_in == 0) {
-			u32 = '?';
+		size_t u8_in;
+		if (*u8_ptr == 0) {
+			u32 = 0;
 			u8_in = 1;
+		} else {
+			u8_in = UTF8ToUTF32(u8_ptr, u8_len, &u32);
+			if (u8_in == 0) {
+				u32 = '?';
+				u8_in = 1;
+			}
 		}
 		u8_ptr += u8_in;
 		u8_len -= u8_in;
@@ -779,6 +799,8 @@
 
 /**
  *	wchar_t\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x83}\x83\x8B\x83`\x83o\x83C\x83g\x95\xB6\x8E\x9A\x97\xF1\x82֕ϊ\xB7
+ *	\x95ϊ\xB7\x82ł\xAB\x82Ȃ\xA2\x95\xB6\x8E\x9A\x82\xCD '?' \x82ŏo\x97͂\xB7\x82\xE9
+ *
  *	@param[in]	*wstr_ptr	wchar_t\x95\xB6\x8E\x9A\x97\xF1
  *	@param[in]	wstr_len	wchar_t\x95\xB6\x8E\x9A\x97\xF1\x92\xB7(0\x82̂Ƃ\xAB\x8E\xA9\x93\xAE\x81A\x8E\xA9\x93\xAE\x82̂Ƃ\xAB\x82\xCDL'\0'\x82Ń^\x81[\x83~\x83l\x81[\x83g\x82\xB7\x82邱\x82\xC6)
  *	@param[in]	code_page	\x95ϊ\xB7\x90\xE6\x83R\x81[\x83h\x83y\x81[\x83W

Modified: branches/cmake/teraterm/keycode/keycode.c
===================================================================
--- branches/cmake/teraterm/keycode/keycode.c	2019-03-18 13:57:37 UTC (rev 7494)
+++ branches/cmake/teraterm/keycode/keycode.c	2019-03-18 13:57:53 UTC (rev 7495)
@@ -169,16 +169,16 @@
 {
 	PAINTSTRUCT ps;
 	HDC hDC;
-	TCHAR OutStr[30];
+	char OutStr[30];
 
 	hDC = BeginPaint(hWnd, &ps);
 
 	if (KeyDown) {
-		_sntprintf_s(OutStr,_countof(OutStr),_TRUNCATE, _T("Key code is %u.") ,Scan);
-		TextOut(hDC,10,10,OutStr,_tcslen(OutStr));
+		_snprintf_s(OutStr,sizeof(OutStr),_TRUNCATE,"Key code is %u.",Scan);
+		TextOutA(hDC,10,10,OutStr,strlen(OutStr));
 	}
 	else {
-		TextOut(hDC,10,10,_T("Push any key."),13);
+		TextOutA(hDC,10,10,"Push any key.",13);
 	}
 
 	EndPaint(hWnd, &ps);

Modified: branches/cmake/teraterm/teraterm/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/teraterm/CMakeLists.txt	2019-03-18 13:57:37 UTC (rev 7494)
+++ branches/cmake/teraterm/teraterm/CMakeLists.txt	2019-03-18 13:57:53 UTC (rev 7495)
@@ -192,10 +192,8 @@
   gdi32
   comctl32
   ws2_32
-  imm32
   imagehlp
   delayimp
-  oleaut32
   uuid
   )
 

Modified: branches/cmake/teraterm/teraterm/WSAAsyncGetAddrInfo.c
===================================================================
--- branches/cmake/teraterm/teraterm/WSAAsyncGetAddrInfo.c	2019-03-18 13:57:37 UTC (rev 7494)
+++ branches/cmake/teraterm/teraterm/WSAAsyncGetAddrInfo.c	2019-03-18 13:57:53 UTC (rev 7495)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2017 TeraTerm Project
+ * Copyright (C) 2010-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Modified: branches/cmake/teraterm/teraterm/ttime.c
===================================================================
--- branches/cmake/teraterm/teraterm/ttime.c	2019-03-18 13:57:37 UTC (rev 7494)
+++ branches/cmake/teraterm/teraterm/ttime.c	2019-03-18 13:57:53 UTC (rev 7495)
@@ -1,6 +1,6 @@
-/*
+/*
  * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2007-2017 TeraTerm Project
+ * (C) 2007-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,21 +29,23 @@
 /* Tera Term */
 /* TERATERM.EXE, IME interface */
 
-#undef UNICODE
-#undef _UNICODE
-
-#include "teraterm.h"
-#include "tttypes.h"
+#include <windows.h>
 #include <stdlib.h>
 #include <string.h>
 #include <imm.h>
+#include <crtdbg.h>
+#include <stdio.h>
+#include <assert.h>
 
-#include "ttwinman.h"
-#include "ttcommon.h"
-
 #include "ttime.h"
-#include "ttlib.h"
 
+#ifdef _DEBUG
+#define malloc(l)	_malloc_dbg((l), _NORMAL_BLOCK, __FILE__, __LINE__)
+#define calloc(l,n)	_calloc_dbg((l), (n), _NORMAL_BLOCK, __FILE__, __LINE__)
+#define free(p)		_free_dbg((p), _NORMAL_BLOCK)
+#endif
+
+// imm.h \x82\xAA include \x82ł\xAB\x82\xEA\x82\xCE _IMM_ \x82\xAA define \x82\xB3\x82\xEA\x82\xE9 \x81\xA8 \x82\xB1\x82̃u\x83\x8D\x83b\x83N\x95s\x97v?
 #ifndef _IMM_
   #define _IMM_
 
@@ -54,12 +56,14 @@
     POINT ptCurrentPos;
     RECT  rcArea;
   } COMPOSITIONFORM, *PCOMPOSITIONFORM, NEAR *NPCOMPOSITIONFORM, *LPCOMPOSITIONFORM;
-#endif //_IMM_
 
 #define GCS_RESULTSTR 0x0800
+#endif //_IMM_
 
-typedef LONG (WINAPI *TImmGetCompositionString)
-	(HIMC, DWORD, LPVOID, DWORD);
+// #define ENABLE_DUMP	1
+
+typedef LONG (WINAPI *TImmGetCompositionStringA)(HIMC, DWORD, LPVOID, DWORD);
+typedef LONG (WINAPI *TImmGetCompositionStringW)(HIMC, DWORD, LPVOID, DWORD);
 typedef HIMC (WINAPI *TImmGetContext)(HWND);
 typedef BOOL (WINAPI *TImmReleaseContext)(HWND, HIMC);
 typedef BOOL (WINAPI *TImmSetCompositionFont)(HIMC, LPLOGFONTA);
@@ -67,7 +71,8 @@
 typedef BOOL (WINAPI *TImmGetOpenStatus)(HIMC);
 typedef BOOL (WINAPI *TImmSetOpenStatus)(HIMC, BOOL);
 
-static TImmGetCompositionString PImmGetCompositionStringW;
+static TImmGetCompositionStringW PImmGetCompositionStringW;
+static TImmGetCompositionStringA PImmGetCompositionStringA;
 static TImmGetContext PImmGetContext;
 static TImmReleaseContext PImmReleaseContext;
 static TImmSetCompositionFont PImmSetCompositionFont;
@@ -79,81 +84,66 @@
 static HANDLE HIMEDLL = NULL;
 static LOGFONTA lfIME;
 
-
-BOOL LoadIME()
+BOOL LoadIME(void)
 {
   BOOL Err;
-#if 0
-  PTTSet tempts;
-#endif
-  char uimsg[MAX_UIMSG];
   char imm32_dll[MAX_PATH];
 
   if (HIMEDLL != NULL) return TRUE;
+
   GetSystemDirectoryA(imm32_dll, sizeof(imm32_dll));
   strncat_s(imm32_dll, sizeof(imm32_dll), "\\imm32.dll", _TRUNCATE);
   HIMEDLL = LoadLibraryA(imm32_dll);
   if (HIMEDLL == NULL)
   {
-    get_lang_msg("MSG_TT_ERROR", uimsg, sizeof(uimsg),  "Tera Term: Error", ts.UILanguageFile);
-    get_lang_msg("MSG_USE_IME_ERROR", ts.UIMsg, sizeof(ts.UIMsg), "Can't use IME", ts.UILanguageFile);
-    MessageBoxA(0,ts.UIMsg,uimsg,MB_ICONEXCLAMATION);
-    WritePrivateProfileStringA("Tera Term","IME","off",ts.SetupFName);
-    ts.UseIME = 0;
-#if 0
-    tempts = (PTTSet)malloc(sizeof(TTTSet));
-    if (tempts!=NULL)
-    {
-      GetDefaultSet(tempts);
-      tempts->UseIME = 0;
-      ChangeDefaultSet(tempts,NULL);
-      free(tempts);
-    }
-#endif
-    return FALSE;
+	return FALSE;
   }
 
   Err = FALSE;
 
-  PImmGetCompositionStringW = (TImmGetCompositionString)GetProcAddress(
-    HIMEDLL, "ImmGetCompositionStringW");
+  PImmGetCompositionStringW = (TImmGetCompositionStringW)GetProcAddress(
+	HIMEDLL, "ImmGetCompositionStringW");
   if (PImmGetCompositionStringW==NULL) Err = TRUE;
 
+  PImmGetCompositionStringA = (TImmGetCompositionStringA)GetProcAddress(
+	HIMEDLL, "ImmGetCompositionStringA");
+  if (PImmGetCompositionStringA==NULL) Err = TRUE;
+
   PImmGetContext = (TImmGetContext)GetProcAddress(
-    HIMEDLL, "ImmGetContext");
+	HIMEDLL, "ImmGetContext");
   if (PImmGetContext==NULL) Err = TRUE;
 
   PImmReleaseContext = (TImmReleaseContext)GetProcAddress(
-    HIMEDLL, "ImmReleaseContext");
+	HIMEDLL, "ImmReleaseContext");
   if (PImmReleaseContext==NULL) Err = TRUE;
 
   PImmSetCompositionFont = (TImmSetCompositionFont)GetProcAddress(
-    HIMEDLL, "ImmSetCompositionFontA");
+	HIMEDLL, "ImmSetCompositionFontA");
   if (PImmSetCompositionFont==NULL) Err = TRUE;
 
   PImmSetCompositionWindow = (TImmSetCompositionWindow)GetProcAddress(
-    HIMEDLL, "ImmSetCompositionWindow");
+	HIMEDLL, "ImmSetCompositionWindow");
   if (PImmSetCompositionWindow==NULL) Err = TRUE;
 
   PImmGetOpenStatus = (TImmGetOpenStatus)GetProcAddress(
-    HIMEDLL, "ImmGetOpenStatus");
+	HIMEDLL, "ImmGetOpenStatus");
   if (PImmGetOpenStatus==NULL) Err = TRUE;
 
   PImmSetOpenStatus = (TImmSetOpenStatus)GetProcAddress(
-    HIMEDLL, "ImmSetOpenStatus");
+	HIMEDLL, "ImmSetOpenStatus");
   if (PImmSetOpenStatus==NULL) Err = TRUE;
 
   if ( Err )
   {
-    FreeLibrary(HIMEDLL);
-    HIMEDLL = NULL;
-    return FALSE;
+	FreeLibrary(HIMEDLL);
+	HIMEDLL = NULL;
+	return FALSE;
   }
-  else
-    return TRUE;
+
+  return TRUE;
 }
 
-void FreeIME()
+void FreeIME(HWND hWnd)
 {
   HANDLE HTemp;
 
@@ -162,17 +152,17 @@
   HIMEDLL = NULL;
 
   /* position of conv. window -> default */
-  SetConversionWindow(HVTWin,-1,0);
+  SetConversionWindow(hWnd,-1,0);
   Sleep(1); // for safety
   FreeLibrary(HTemp);
 }
 
-BOOL CanUseIME()
+BOOL CanUseIME(void)
 {
   return (HIMEDLL != NULL);
 }
 
-void SetConversionWindow(HWND HWin, int X, int Y)
+void SetConversionWindow(HWND HWnd, int X, int Y)
 {
   HIMC	hIMC;
   COMPOSITIONFORM cf;
@@ -179,20 +169,20 @@
 
   if (HIMEDLL == NULL) return;
 // Adjust the position of conversion window
-  hIMC = (*PImmGetContext)(HVTWin);
+  hIMC = (*PImmGetContext)(HWnd);
   if (X>=0)
   {
-    cf.dwStyle = CFS_POINT;
-    cf.ptCurrentPos.x = X;
-    cf.ptCurrentPos.y = Y;
+	cf.dwStyle = CFS_POINT;
+	cf.ptCurrentPos.x = X;
+	cf.ptCurrentPos.y = Y;
   }
   else
-    cf.dwStyle = CFS_DEFAULT;
+	cf.dwStyle = CFS_DEFAULT;
   (*PImmSetCompositionWindow)(hIMC,&cf);
-  (*PImmReleaseContext)(HVTWin,hIMC);
+  (*PImmReleaseContext)(HWnd,hIMC);
 }
 
-void SetConversionLogFont(HWND HWin, PLOGFONT lf)
+void SetConversionLogFont(HWND HWnd, PLOGFONTA lf)
 {
   HIMC	hIMC;
   if (HIMEDLL == NULL) return;
@@ -199,54 +189,129 @@
 
   memcpy(&lfIME,lf,sizeof(LOGFONT));
 
-  hIMC = (*PImmGetContext)(HVTWin);
+  hIMC = (*PImmGetContext)(HWnd);
   // Set font for the conversion window
   (*PImmSetCompositionFont)(hIMC,&lfIME);
-  (*PImmReleaseContext)(HVTWin,hIMC);
+  (*PImmReleaseContext)(HWnd,hIMC);
 }
 
+// \x93\xE0\x95\x94\x97p
+static const char *GetConvStringA_i(HWND hWnd, DWORD index, size_t *len)
+{
+	HIMC hIMC;
+	LONG size;
+	char *lpstr;
+
+	hIMC = (*PImmGetContext)(hWnd);
+	if (hIMC==0)
+		goto error_2;
+
+	// Get the size of the result string.
+	//		\x92\x8D\x88\xD3 ImmGetCompositionStringA() \x82̖߂\xE8\x92l\x82\xCD byte \x90\x94
+	size = PImmGetCompositionStringA(hIMC, index, NULL, 0);
+	if (size <= 0)
+		goto error_1;
+
+	lpstr = malloc(size + sizeof(char));
+	if (lpstr == NULL)
+		goto error_1;
+
+	size = PImmGetCompositionStringA(hIMC, index, lpstr, size);
+	if (size <= 0) {
+		free(lpstr);
+		goto error_1;
+	}
+
+	*len = size;
+	lpstr[size] = 0;	// \x83^\x81[\x83~\x83l\x81[\x83g\x82\xB7\x82\xE9
+
+	(*PImmReleaseContext)(hWnd, hIMC);
+	return lpstr;
+
+error_1:
+	(*PImmReleaseContext)(hWnd, hIMC);
+error_2:
+	*len = 0;
+	return NULL;
+}
+
+// \x93\xE0\x95\x94\x97p wchar_t\x94\xC5
+static const wchar_t *GetConvStringW_i(HWND hWnd, DWORD index, size_t *len)
+{
+	HIMC hIMC;
+	LONG size;
+	wchar_t *lpstr;
+
+	hIMC = (*PImmGetContext)(hWnd);
+	if (hIMC==0)
+		goto error_2;
+
+	// Get the size of the result string.
+	//		\x92\x8D\x88\xD3 ImmGetCompositionStringW() \x82̖߂\xE8\x92l\x82\xCD byte \x90\x94
+	size = PImmGetCompositionStringW(hIMC, index, NULL, 0);
+	if (size <= 0)
+		goto error_1;
+
+	lpstr = malloc(size + sizeof(wchar_t));
+	if (lpstr == NULL)
+		goto error_1;
+
+	size = PImmGetCompositionStringW(hIMC, index, lpstr, size);
+	if (size <= 0) {
+		free(lpstr);
+		goto error_1;
+	}
+
+	*len = size/2;
+	lpstr[(size/2)] = 0;	// \x83^\x81[\x83~\x83l\x81[\x83g\x82\xB7\x82\xE9
+
+	(*PImmReleaseContext)(hWnd, hIMC);
+	return lpstr;
+
+error_1:
+	(*PImmReleaseContext)(hWnd, hIMC);
+error_2:
+	*len = 0;
+	return NULL;
+}
+
 /*
- *	@param[in,out]	*len	wchar_t文字数
- *	@reterun		変換wchar_t文字列へのポインタ
- *					NULLの場合変換確定していない(またはエラー)
- *					文字列は使用後free()すること
+ *	@param[out]		*len	wchar_t\x95\xB6\x8E\x9A\x90\x94('\0'\x82͊܂܂Ȃ\xA2)
+ *	@retval			\x95ϊ\xB7wchar_t\x95\xB6\x8E\x9A\x97\xF1\x82ւ̃|\x83C\x83\x93\x83^
+ *					NULL\x82̏ꍇ\x95ϊ\xB7\x8Am\x92肵\x82Ă\xA2\x82Ȃ\xA2(\x82܂\xBD\x82̓G\x83\x89\x81[)
+ *					\x95\xB6\x8E\x9A\x97\xF1\x82͎g\x97p\x8C\xE3free()\x82\xB7\x82邱\x82\xC6
  */
-const wchar_t *GetConvString(HWND hWnd, UINT wParam, LPARAM lParam, size_t *len)
+const wchar_t *GetConvStringW(HWND hWnd, LPARAM lParam, size_t *len)
 {
-	wchar_t *lpstr;
+	const wchar_t *lpstr;
 
 	*len = 0;
 	if (HIMEDLL==NULL) return NULL;
 
 	if ((lParam & GCS_RESULTSTR) != 0) {
-		HIMC hIMC;
-		LONG size;
+		lpstr = GetConvStringW_i(hWnd, GCS_RESULTSTR, len);
+	} else {
+		lpstr = NULL;
+	}
 
-		hIMC = (*PImmGetContext)(hWnd);
-		if (hIMC==0) return NULL;
+	return lpstr;
+}
 
-		// Get the size of the result string.
-		//		注意 ImmGetCompositionStringW() の戻り値は byte 数
-		size = PImmGetCompositionStringW(hIMC, GCS_RESULTSTR, NULL, 0);
-		if (size <= 0) {
-			lpstr = NULL;		// エラー
-		} else {
-			lpstr = malloc(size + sizeof(WCHAR));
-			if (lpstr != NULL)
-			{
-				size = PImmGetCompositionStringW(hIMC, GCS_RESULTSTR, lpstr, size);
-				if (size <= 0) {
-					free(lpstr);
-					lpstr = NULL;
-				} else {
-					*len = size/2;
-					lpstr[(size/2)] = 0;	// ターミネートする
-				}
-			}
-		}
+/*
+ *	@param[out]		*len	\x95\xB6\x8E\x9A\x90\x94('\0'\x82͊܂܂Ȃ\xA2)
+ *	@retval			\x95ϊ\xB7\x95\xB6\x8E\x9A\x97\xF1\x82ւ̃|\x83C\x83\x93\x83^
+ *					NULL\x82̏ꍇ\x95ϊ\xB7\x8Am\x92肵\x82Ă\xA2\x82Ȃ\xA2(\x82܂\xBD\x82̓G\x83\x89\x81[)
+ *					\x95\xB6\x8E\x9A\x97\xF1\x82͎g\x97p\x8C\xE3free()\x82\xB7\x82邱\x82\xC6
+ */
+const char *GetConvStringA(HWND hWnd, LPARAM lParam, size_t *len)
+{
+	const char *lpstr;
 
-		(*PImmReleaseContext)(hWnd, hIMC);
+	*len = 0;
+	if (HIMEDLL==NULL) return NULL;
 
+	if ((lParam & GCS_RESULTSTR) != 0) {
+		lpstr = GetConvStringA_i(hWnd, GCS_RESULTSTR, len);
 	} else {
 		lpstr = NULL;
 	}
@@ -254,25 +319,206 @@
 	return lpstr;
 }
 
-BOOL GetIMEOpenStatus()
+BOOL GetIMEOpenStatus(HWND hWnd)
 {
 	HIMC hIMC;
 	BOOL stat;
 
 	if (HIMEDLL==NULL) return FALSE;
-	hIMC = (*PImmGetContext)(HVTWin);
+	hIMC = (*PImmGetContext)(hWnd);
 	stat = (*PImmGetOpenStatus)(hIMC);
-	(*PImmReleaseContext)(HVTWin, hIMC);
+	(*PImmReleaseContext)(hWnd, hIMC);
 
 	return stat;
-
 }
 
-void SetIMEOpenStatus(BOOL stat) {
+void SetIMEOpenStatus(HWND hWnd, BOOL stat)
+{
 	HIMC hIMC;
 
 	if (HIMEDLL==NULL) return;
-	hIMC = (*PImmGetContext)(HVTWin);
+	hIMC = (*PImmGetContext)(hWnd);
 	(*PImmSetOpenStatus)(hIMC, stat);
-	(*PImmReleaseContext)(HVTWin, hIMC);
+	(*PImmReleaseContext)(hWnd, hIMC);
 }
+
+#if defined(ENABLE_DUMP)
+static void DumpReconvStringSt(RECONVERTSTRING *pReconv, BOOL unicode)
+{
+	if (unicode) {
+		wchar_t tmp[1024];
+		_snwprintf(tmp, _countof(tmp),
+				   L"Str %d,%d CompStr %d,%d TargeteStr %d,%d '%s'\n",
+				   pReconv->dwStrLen,
+				   pReconv->dwStrOffset,
+				   pReconv->dwCompStrLen,
+				   pReconv->dwCompStrOffset,
+				   pReconv->dwTargetStrLen,
+				   pReconv->dwTargetStrOffset,
+				   (wchar_t *)(((char *)pReconv) + pReconv->dwStrOffset)
+			);
+		OutputDebugStringW(tmp);
+	} else {
+		char tmp[1024];
+		_snprintf(tmp, sizeof(tmp),
+				  "Str %d,%d CompStr %d,%d TargeteStr %d,%d '%s'\n",
+				  pReconv->dwStrLen,
+				  pReconv->dwStrOffset,
+				  pReconv->dwCompStrLen,
+				  pReconv->dwCompStrOffset,
+				  pReconv->dwTargetStrLen,
+				  pReconv->dwTargetStrOffset,
+				  (((char *)pReconv) + pReconv->dwStrOffset)
+			);
+		OutputDebugStringA(tmp);
+	}
+}
+#endif
+
+// IME\x82̑O\x8C\xE3\x8EQ\x8Fƕϊ\xB7\x8B@\x94\\x82ւ̑Ή\x9E
+// MS\x82\xA9\x82炿\x82\xE1\x82\xF1\x82Ǝd\x97l\x82\xAA\x92񎦂\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x82̂ŁA\x83A\x83h\x83z\x83b\x83N\x82ɂ\xE2\x82邵\x82\xA9\x82Ȃ\xA2\x82炵\x82\xA2\x81B
+// cf. http://d.hatena.ne.jp/topiyama/20070703
+//	   http://ice.hotmint.com/putty/#DOWNLOAD
+//	   http://27213143.at.webry.info/201202/article_2.html
+//	   http://webcache.googleusercontent.com/search?q=cache:WzlX3ouMscIJ:anago.2ch.net/test/read.cgi/software/1325573999/82+IMR_DOCUMENTFEED&cd=13&hl=ja&ct=clnk&gl=jp
+// (2012.5.9 yutaka)
+/**
+ * IME\x82̑O\x8C\xE3\x8EQ\x8Fƕϊ\xB7\x8B@\x94\\x97p\x8D\\x91\xA2\x91̂\xF0\x8D쐬\x82\xB7\x82\xE9
+ *		msg == WM_IME_REQUEST,wParam == IMR_DOCUMENTFEED \x82̉\x9E\x93\x9A\x82Ɏg\x82\xA4
+ *		ANSI\x82\xA9Unicode\x83E\x83B\x83\x93\x83h\x83E\x82ɂ\xE6\x82\xC1\x82ĎQ\x8Fƕ\xB6\x8E\x9A\x97\xF1\x82\xF0\x95ύX\x82\xB7\x82邱\x82\xC6
+ * unicode		TRUE\x82̂Ƃ\xABunicode
+ * str_ptr		\x8EQ\x8Fƕ\xB6\x8E\x9A\x97\xF1\x82ւ̃|\x83C\x83\x93\x83^
+ * str_count	\x8EQ\x8Fƕ\xB6\x8E\x9A\x97\xF1\x82̕\xB6\x8E\x9A\x90\x94(char\x82Ȃ\xE7bytes\x90\x94,wchar_t\x82Ȃ\xE7wchar_t\x90\x94)
+ * cx			\x83J\x81[\x83\\x83\x8B\x88ʒu(char/wchar_t\x92P\x88\xCA)
+ * st_size		\x90\xB6\x90\xAC\x82\xB5\x82\xBD\x8D\\x91\xA2\x91̂̃T\x83C\x83Y
+ * \x96߂\xE8\x92l		\x8D\\x91\xA2\x91̂ւ̃|\x83C\x83\x93\x83^
+ *				\x95s\x97v\x82ɂȂ\xC1\x82\xBD\x82\xE7 free()\x82\xB7\x82邱\x82\xC6
+ */
+static void *CreateReconvStringSt(HWND hWnd, BOOL unicode,
+								  const void *str_ptr, size_t str_count,
+								  size_t cx, size_t *st_size_)
+{
+	static int new_str_len_bytes;
+	static int new_buf_len_bytes;
+	int new_str_len_count;
+	int str_len_bytes;
+	size_t str_len_count;
+	int cx_bytes;
+	RECONVERTSTRING *pReconv;
+	const void *comp_ptr;
+	size_t complen_count;
+	size_t complen_bytes;
+	const void *buf;
+	size_t st_size;
+	char *newbuf;
+
+	buf = str_ptr;
+	str_len_count = str_count;
+
+	if(unicode) {
+		str_len_bytes = str_len_count * sizeof(wchar_t);
+		cx_bytes = cx * sizeof(wchar_t);
+	} else {
+		str_len_bytes = str_len_count;
+		cx_bytes = cx;
+	}
+
+	// \x95ϊ\xB7\x92\x86\x8C\xF3\x95╶\x8E\x9A\x97\xF1\x82\xF0\x8E擾
+	// ATOK2012\x82ł͏\xED\x82\xC9 complen_count=0 \x82ƂȂ\xE9\x81B
+	if (!unicode) {
+		const char *comp_strA;
+		comp_strA = GetConvStringA_i(hWnd, GCS_COMPSTR, &complen_count);
+		complen_bytes = complen_count;
+		comp_ptr = comp_strA;
+	} else {
+		const wchar_t *comp_strW;
+		comp_strW = GetConvStringW_i(hWnd,GCS_COMPSTR,	&complen_count);
+		complen_bytes = complen_count * sizeof(wchar_t);
+		comp_ptr = comp_strW;
+	}
+
+	// \x95ϊ\xB7\x95\xB6\x8E\x9A\x82\xE0\x8A܂߂\xBD\x91S\x91̂̒\xB7\x82\xB3(including null)
+	if (!unicode) {
+		new_str_len_bytes = str_len_bytes + complen_bytes;
+		new_buf_len_bytes = new_str_len_bytes + 1;
+		new_str_len_count = new_str_len_bytes;
+	} else {
+		new_str_len_bytes = str_len_bytes + complen_bytes;
+		new_buf_len_bytes = new_str_len_bytes + sizeof(wchar_t);
+		new_str_len_count = new_str_len_bytes / sizeof(wchar_t);
+	}
+
+	st_size = sizeof(RECONVERTSTRING) + new_buf_len_bytes;
+	pReconv = calloc(1, st_size);
+
+	// Len\x82͕\xB6\x8E\x9A\x90\x94(char/wchar_t\x92P\x88\xCA)
+	// Offset\x82\xCDbyte\x92P\x88\xCA
+//	pReconv->dwSize				= sizeof(RECONVERTSTRING);
+	pReconv->dwSize				= sizeof(RECONVERTSTRING) + new_buf_len_bytes;
+	pReconv->dwVersion			= 0;
+	pReconv->dwStrLen			= new_str_len_count;
+	pReconv->dwStrOffset		= sizeof(RECONVERTSTRING);
+	pReconv->dwCompStrLen		= complen_count;
+	pReconv->dwCompStrOffset	= cx_bytes;
+	pReconv->dwTargetStrLen		= complen_count;		// = dwCompStrOffset
+	pReconv->dwTargetStrOffset	= cx_bytes;				// = dwTargetStrLen
+
+	// RECONVERTSTRING\x82̌\xE3\x82\xEB\x82\xC9
+	// \x8EQ\x8Fƕ\xB6\x8E\x9A\x97\xF1\x82\xF0\x83R\x83s\x81[+\x83J\x81[\x83\\x83\x8B\x88ʒu\x82ɕϕ\xB6\x8E\x9A\x97\xF1\x82\xF0\x91}\x93\xFC
+	newbuf = (char *)pReconv + sizeof(RECONVERTSTRING);
+	if (comp_ptr != NULL) {
+		memcpy(newbuf, buf, cx_bytes);
+		newbuf += cx_bytes;
+		memcpy(newbuf, comp_ptr, complen_bytes);
+		newbuf += complen_bytes;
+		memcpy(newbuf, (char *)buf + cx_bytes, str_len_bytes - cx_bytes);
+		free((void *)comp_ptr);
+		comp_ptr = NULL;
+	} else {
+		memcpy(newbuf, buf, str_len_bytes);
+	}
+#if defined(ENABLE_DUMP)
+	DumpReconvStringSt(pReconv, unicode);
+#endif
+
+	*st_size_ = st_size;
+	return pReconv;
+}
+
+/**
+ * IME\x82̑O\x8C\xE3\x8EQ\x8Fƕϊ\xB7\x8B@\x94\\x97p\x8D\\x91\xA2\x91̂\xF0\x8D쐬\x82\xB7\x82\xE9
+ * ANSI\x83E\x83B\x83\x93\x83h\x83E\x97p
+ *		msg == WM_IME_REQUEST,wParam == IMR_DOCUMENTFEED \x82̉\x9E\x93\x9A\x82Ɏg\x82\xA4
+ * str_ptr		\x8EQ\x8Fƕ\xB6\x8E\x9A\x97\xF1\x82ւ̃|\x83C\x83\x93\x83^
+ * str_count	\x8EQ\x8Fƕ\xB6\x8E\x9A\x97\xF1\x82̕\xB6\x8E\x9A\x90\x94(char\x90\x94,bytes\x90\x94)
+ * cx			\x83J\x81[\x83\\x83\x8B\x88ʒu(char\x92P\x88\xCA)
+ * st_size		\x90\xB6\x90\xAC\x82\xB5\x82\xBD\x8D\\x91\xA2\x91̂̃T\x83C\x83Y(byte)
+ * \x96߂\xE8\x92l		\x8D\\x91\xA2\x91̂ւ̃|\x83C\x83\x93\x83^
+ *				\x95s\x97v\x82ɂȂ\xC1\x82\xBD\x82\xE7 free()\x82\xB7\x82邱\x82\xC6
+ */
+void *CreateReconvStringStA(
+	HWND hWnd, const char *str_ptr, size_t str_count,
+	size_t cx, size_t *st_size_)
+{
+	assert(IsWindowUnicode(hWnd) == FALSE);
+	return CreateReconvStringSt(hWnd, FALSE, str_ptr, str_count, cx, st_size_);
+}
+
+/**
+ * IME\x82̑O\x8C\xE3\x8EQ\x8Fƕϊ\xB7\x8B@\x94\\x97p\x8D\\x91\xA2\x91̂\xF0\x8D쐬\x82\xB7\x82\xE9
+ * unicode\x83E\x83B\x83\x93\x83h\x83E\x97p
+ *		msg == WM_IME_REQUEST,wParam == IMR_DOCUMENTFEED \x82̉\x9E\x93\x9A\x82Ɏg\x82\xA4
+ * str_ptr		\x8EQ\x8Fƕ\xB6\x8E\x9A\x97\xF1\x82ւ̃|\x83C\x83\x93\x83^
+ * str_count	\x8EQ\x8Fƕ\xB6\x8E\x9A\x97\xF1\x82̕\xB6\x8E\x9A\x90\x94(wchar_t\x90\x94)
+ * cx			\x83J\x81[\x83\\x83\x8B\x88ʒu(wchar_t\x92P\x88\xCA)
+ * st_size		\x90\xB6\x90\xAC\x82\xB5\x82\xBD\x8D\\x91\xA2\x91̂̃T\x83C\x83Y(byte)
+ * \x96߂\xE8\x92l		\x8D\\x91\xA2\x91̂ւ̃|\x83C\x83\x93\x83^
+ *				\x95s\x97v\x82ɂȂ\xC1\x82\xBD\x82\xE7 free()\x82\xB7\x82邱\x82\xC6
+ */
+void *CreateReconvStringStW(
+	HWND hWnd, const wchar_t *str_ptr, size_t str_count,
+	size_t cx, size_t *st_size_)
+{
+	assert(IsWindowUnicode(hWnd) == TRUE);
+	return CreateReconvStringSt(hWnd, TRUE, str_ptr, str_count, cx, st_size_);
+}

Modified: branches/cmake/teraterm/teraterm/ttime.h
===================================================================
--- branches/cmake/teraterm/teraterm/ttime.h	2019-03-18 13:57:37 UTC (rev 7494)
+++ branches/cmake/teraterm/teraterm/ttime.h	2019-03-18 13:57:53 UTC (rev 7495)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2007-2017 TeraTerm Project
+ * (C) 2007-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,19 +34,22 @@
 #endif
 
 /* proto types */
-BOOL LoadIME();
-void FreeIME();
-BOOL CanUseIME();
-void SetConversionWindow(HWND HWin, int X, int Y);
-void SetConversionLogFont(HWND HWin, PLOGFONTA lf);
-BOOL GetIMEOpenStatus(void);
-void SetIMEOpenStatus(BOOL stat);
-const wchar_t *GetConvString(HWND hWnd, UINT wParam, LPARAM lParam, size_t *len);
+BOOL LoadIME(void);
+void FreeIME(HWND hWnd);
+BOOL CanUseIME(void);
+void SetConversionWindow(HWND HWnd, int X, int Y);
+void SetConversionLogFont(HWND HWnd, PLOGFONTA lf);
+BOOL GetIMEOpenStatus(HWND hWnd);
+void SetIMEOpenStatus(HWND hWnd, BOOL stat);
+const wchar_t *GetConvStringW(HWND hWnd, LPARAM lParam, size_t *len);
+//const char *GetConvStringA(HWND hWnd, LPARAM lParam, size_t *len);
+void *CreateReconvStringStW(HWND hWnd,
+							const wchar_t *str_ptr, size_t str_count,
+							size_t cx, size_t *st_size_);
+void *CreateReconvStringStA(HWND hWnd,
+							const char *str_ptr, size_t str_count,
+							size_t cx, size_t *st_size_);
 
-#ifndef WM_IME_COMPOSITION
-#define WM_IME_COMPOSITION              0x010F
-#endif
-
 #ifdef __cplusplus
 }
 #endif

Modified: branches/cmake/teraterm/teraterm/ttwsk.c
===================================================================
--- branches/cmake/teraterm/teraterm/ttwsk.c	2019-03-18 13:57:37 UTC (rev 7494)
+++ branches/cmake/teraterm/teraterm/ttwsk.c	2019-03-18 13:57:53 UTC (rev 7495)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2007-2017 TeraTerm Project
+ * (C) 2007-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Modified: branches/cmake/teraterm/teraterm/vtdisp.c
===================================================================
--- branches/cmake/teraterm/teraterm/vtdisp.c	2019-03-18 13:57:37 UTC (rev 7494)
+++ branches/cmake/teraterm/teraterm/vtdisp.c	2019-03-18 13:57:53 UTC (rev 7495)
@@ -2032,9 +2032,15 @@
 	if ((ts.Language==IdJapanese) || (ts.Language==IdKorean) || (ts.Language==IdUtf8)) //HKS
 	{
 		if (ts.UseIME==0)
-			FreeIME();
-		else if (! LoadIME())
+			FreeIME(HVTWin);
+		else if (! LoadIME()) {
+			char uimsg[MAX_UIMSG];
+			get_lang_msg("MSG_TT_ERROR", uimsg, sizeof(uimsg),  "Tera Term: Error", ts.UILanguageFile);
+			get_lang_msg("MSG_USE_IME_ERROR", ts.UIMsg, sizeof(ts.UIMsg), "Can't use IME", ts.UILanguageFile);
+			MessageBoxA(0,ts.UIMsg,uimsg,MB_ICONEXCLAMATION);
+			WritePrivateProfileStringA("Tera Term","IME","off",ts.SetupFName);
 			ts.UseIME = 0;
+		}
 
 		if (ts.UseIME>0)
 		{
@@ -2048,7 +2054,7 @@
 		}
 	}
 	else
-		FreeIME();
+		FreeIME(HVTWin);
 
 	if (IsCaretOn()) CaretOn();
 }

Modified: branches/cmake/teraterm/teraterm/vtterm.c
===================================================================
--- branches/cmake/teraterm/teraterm/vtterm.c	2019-03-18 13:57:37 UTC (rev 7494)
+++ branches/cmake/teraterm/teraterm/vtterm.c	2019-03-18 13:57:53 UTC (rev 7495)
@@ -2645,19 +2645,19 @@
 	switch (b) {
 	  case 'r':
 		if (CanUseIME()) {
-			SetIMEOpenStatus(IMEstat);
+			SetIMEOpenStatus(HVTWin, IMEstat);
 		}
 		break;
 
 	  case 's':
 		if (CanUseIME()) {
-			IMEstat = GetIMEOpenStatus();
+			IMEstat = GetIMEOpenStatus(HVTWin);
 		}
 		break;
 
 	  case 't':
 		if (CanUseIME()) {
-			SetIMEOpenStatus(Param[1] == 1);
+			SetIMEOpenStatus(HVTWin, Param[1] == 1);
 		}
 		break;
 	}

Modified: branches/cmake/teraterm/teraterm/vtwin.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/vtwin.cpp	2019-03-18 13:57:37 UTC (rev 7494)
+++ branches/cmake/teraterm/teraterm/vtwin.cpp	2019-03-18 13:57:53 UTC (rev 7495)
@@ -72,6 +72,7 @@
 #include <windowsx.h>
 #include <imm.h>
 #include <dbt.h>
+#include <assert.h>
 
 #include "tt_res.h"
 #include "vtwin.h"
@@ -136,6 +137,10 @@
 
 static int AutoDisconnectedPort = -1;
 
+#ifndef WM_IME_COMPOSITION
+#define WM_IME_COMPOSITION              0x010F
+#endif
+
 /////////////////////////////////////////////////////////////////////////////
 // CVTWindow
 
@@ -1858,7 +1863,7 @@
 
 	OpenHelp(HH_CLOSE_ALL, 0, ts.UILanguageFile);
 
-	FreeIME();
+	FreeIME(HVTWin);
 	FreeTTSET();
 #if 0	// free\x82Ɏ\xB8\x94s\x82\xB7\x82\xE9\x82܂\xC5free\x82\xB5\x91\xB1\x82\xAF\x82\xE9
 	do { }
@@ -3120,24 +3125,25 @@
 {
 	if (CanUseIME()) {
 		size_t len;
-		const wchar_t *lpstr = GetConvString(HVTWin, wParam, lParam, &len);
+		const wchar_t *lpstr = GetConvStringW(HVTWin, lParam, &len);
 		if (lpstr != NULL) {
+			const wchar_t *output_wstr = lpstr;
 			if (len == 1 && ControlKey()) {
 				const static wchar_t code_ctrl_space = 0;
 				const static wchar_t code_ctrl_backslash = 0x1c;
 				switch(*lpstr) {
 				case 0x20:
-					lpstr = &code_ctrl_space;
+					output_wstr = &code_ctrl_space;
 					break;
 				case 0x5c: // Ctrl-\ support for NEC-PC98
-					lpstr = &code_ctrl_backslash;
+					output_wstr = &code_ctrl_backslash;
 					break;
 				}
 			}
 			if (ts.LocalEcho>0) {
-				CommTextEchoW(&cv,lpstr,len);
+				CommTextEchoW(&cv,output_wstr,len);
 			}
-			CommTextOutW(&cv,lpstr,len);
+			CommTextOutW(&cv,output_wstr,len);
 			free((void *)lpstr);
 			return 0;
 		}
@@ -3159,7 +3165,7 @@
 		// \x93\xFC\x97̓R\x83\x93\x83e\x83L\x83X\x83g\x82̊J\x95\xF3\x91Ԃ\xAA\x8DX\x90V\x82\xB3\x82\xEA\x82\xE9(IME On/OFF)
 
 		// IME\x82\xCCOn/Off\x82\xF0\x8E擾\x82\xB7\x82\xE9
-		IMEstat = GetIMEOpenStatus();
+		IMEstat = GetIMEOpenStatus(HVTWin);
 
 		// \x8F\xF3\x91Ԃ\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9IME\x82̂\xBD\x82߂Ɉʒu\x82\xF0\x92ʒm\x82\xB7\x82\xE9
 		int CaretX = (CursorX-WinOrgX)*FontWidth;
@@ -3197,73 +3203,78 @@
 	return CFrameWnd::DefWindowProc(WM_IME_NOTIFY,wParam,lParam);
 }
 
-// IME\x82̑O\x8C\xE3\x8EQ\x8Fƕϊ\xB7\x8B@\x94\\x82ւ̑Ή\x9E
-// MS\x82\xA9\x82炿\x82\xE1\x82\xF1\x82Ǝd\x97l\x82\xAA\x92񎦂\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x82̂ŁA\x83A\x83h\x83z\x83b\x83N\x82ɂ\xE2\x82邵\x82\xA9\x82Ȃ\xA2\x82炵\x82\xA2\x81B
-// cf. http://d.hatena.ne.jp/topiyama/20070703
-//     http://ice.hotmint.com/putty/#DOWNLOAD
-//     http://27213143.at.webry.info/201202/article_2.html
-//     http://webcache.googleusercontent.com/search?q=cache:WzlX3ouMscIJ:anago.2ch.net/test/read.cgi/software/1325573999/82+IMR_DOCUMENTFEED&cd=13&hl=ja&ct=clnk&gl=jp
-// (2012.5.9 yutaka)
-LRESULT CVTWindow::OnIMERequest(WPARAM wParam, LPARAM lParam)
+static LRESULT ReplyIMERequestDocumentfeed(HWND hWnd, LPARAM lParam)
 {
-	static int complen, newsize;
-	static char comp[512];
-	int size, ret;
-	char buf[512], newbuf[1024];
-	HIMC hIMC;
+	static RECONVERTSTRING *pReconvPtrSave;		// TODO leak
+	static size_t ReconvSizeSave;
+	LRESULT result;
 
-	// "IME=off"\x82̏ꍇ\x82́A\x89\xBD\x82\xE0\x82\xB5\x82Ȃ\xA2\x81B
-	if (ts.UseIME > 0 &&
-		wParam == IMR_DOCUMENTFEED) {
-		size = NumOfColumns + 1;   // \x83J\x81[\x83\\x83\x8B\x82\xAA\x82\xA0\x82\xE9\x8Ds\x82̒\xB7\x82\xB3+null
+	if (lParam == 0)
+	{  // 1\x89\xF1\x96ڂ̌Ăяo\x82\xB5 \x83T\x83C\x83Y\x82\xBE\x82\xAF\x82\xF0\x95Ԃ\xB7
+		char buf[512];			// \x8EQ\x8Fƕ\xB6\x8E\x9A\x97\xF1\x82\xF0\x8E󂯎\xE6\x82\xE9\x83o\x83b\x83t\x83@
+		size_t str_len_count;
+		int cx;
+		assert(IsWindowUnicode(hWnd) == FALSE);
 
-		if (lParam == 0) {  // 1\x89\xF1\x96ڂ̌Ăяo\x82\xB5
-			// \x83o\x83b\x83t\x83@\x82̃T\x83C\x83Y\x82\xF0\x95Ԃ\xB7\x82̂݁B
-			// ATOK2012\x82ł͏\xED\x82\xC9 complen=0 \x82ƂȂ\xE9\x81B
-			complen = 0;
-			memset(comp, 0, sizeof(comp));
-			hIMC = ImmGetContext(HVTWin);
-			if (hIMC) {
-				// TODO \x82\xA2\x82\xAB\x82Ȃ\xE8\x83C\x83\x93\x83|\x81[\x83g\x82\xB5\x82Ă\xA2\x82\xE9
-				ret = ImmGetCompositionStringA(hIMC, GCS_COMPSTR, comp, sizeof(comp));
-				if (ret == IMM_ERROR_NODATA || ret == IMM_ERROR_GENERAL) {
-					memset(comp, 0, sizeof(comp));
+		// \x8EQ\x8Fƕ\xB6\x8E\x9A\x97\xF1\x8E擾\x81A1\x8Ds\x8E\xE6\x82\xE8\x8Fo\x82\xB7
+		{	// \x83J\x81[\x83\\x83\x8B\x82\xA9\x82\xE7\x8C\xE3\x82\xEB\x81A\x83X\x83y\x81[\x83X\x88ȊO\x82\xAA\x8C\xA9\x82‚\xA9\x82\xC1\x82\xBD\x82Ƃ\xB1\x82\xEB\x82\xF0\x8Ds\x96\x96\x82Ƃ\xB7\x82\xE9
+			int x;
+			int len;
+			cx = BuffGetCurrentLineData(buf, sizeof(buf));
+			len = cx;
+			for (x=cx; x < NumOfColumns; x++) {
+				const char c = buf[x];
+				if (c != 0 && c != 0x20) {
+					len = x+1;
 				}
-				complen = strlen(comp);  // w/o null
-				ImmReleaseContext(HVTWin, hIMC);
 			}
-			newsize = size + complen;  // \x95ϊ\xB7\x95\xB6\x8E\x9A\x82\xE0\x8A܂߂\xBD\x91S\x91̂̒\xB7\x82\xB3(including null)
+			str_len_count = len;
+		}
 
-		} else {  // 2\x89\xF1\x96ڂ̌Ăяo\x82\xB5
-			//lParam \x82\xF0 RECONVERTSTRING \x82\xC6 \x95\xB6\x8E\x9A\x97\xF1\x8Ai\x94[\x83o\x83b\x83t\x83@\x82Ɏg\x97p\x82\xB7\x82\xE9
-			RECONVERTSTRING *pReconv   = (RECONVERTSTRING*)lParam;
-			char*  pszParagraph        = (char*)pReconv + sizeof(RECONVERTSTRING);
-			int cx;
+		// IME\x82ɕԂ\xB7\x8D\\x91\xA2\x91̂\xF0\x8D쐬\x82\xB7\x82\xE9
+		if (pReconvPtrSave != NULL) {
+			free(pReconvPtrSave);
+		}
+		pReconvPtrSave = (RECONVERTSTRING *)CreateReconvStringStA(
+			hWnd, buf, str_len_count, cx, &ReconvSizeSave);
 
-			cx = BuffGetCurrentLineData(buf, sizeof(buf));
+		// 1\x89\xF1\x96ڂ̓T\x83C\x83Y\x82\xBE\x82\xAF\x82\xF0\x95Ԃ\xB7
+		result = ReconvSizeSave;
+	}
+	else {
+		// 2\x89\xF1\x96ڂ̌Ăяo\x82\xB5 \x8D\\x91\xA2\x91̂\xF0\x93n\x82\xB7
+		if (pReconvPtrSave != NULL) {
+			RECONVERTSTRING *pReconv = (RECONVERTSTRING*)lParam;
+			memcpy(pReconv, pReconvPtrSave, ReconvSizeSave);
+			result = ReconvSizeSave;
+			free(pReconvPtrSave);
+			pReconvPtrSave = NULL;
+			ReconvSizeSave = 0;
+		} else {
+			// 3\x89\xF1\x96\xDA?
+			result = 0;
+		}
+	}
 
-			// \x83J\x81[\x83\\x83\x8B\x88ʒu\x82ɕϊ\xB7\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x91}\x93\xFC\x82\xB7\x82\xE9\x81B
-			memset(newbuf, 0, sizeof(newbuf));
-			memcpy(newbuf, buf, cx);
-			memcpy(newbuf + cx, comp, complen);
-			memcpy(newbuf + cx + complen, buf + cx, size - cx);
-			newsize = size + complen;  // \x95ϊ\xB7\x95\xB6\x8E\x9A\x82\xE0\x8A܂߂\xBD\x91S\x91̂̒\xB7\x82\xB3(including null)
+#if 0
+	OutputDebugPrintf("WM_IME_REQUEST,IMR_DOCUMENTFEED lp=%p LRESULT %d\n",
+		lParam, result);
+#endif
 
-			pReconv->dwSize            = sizeof(RECONVERTSTRING);
-			pReconv->dwVersion         = 0;
-			pReconv->dwStrLen          = newsize - 1;
-			pReconv->dwStrOffset       = sizeof(RECONVERTSTRING);
-			pReconv->dwCompStrLen      = complen;
-			pReconv->dwCompStrOffset   = cx;
-			pReconv->dwTargetStrLen    = complen;
-			pReconv->dwTargetStrOffset = cx;
+	return result;
+}
 
-			memcpy(pszParagraph, newbuf, newsize);
-			//OutputDebugPrintf("cx %d buf [%d:%s] -> [%d:%s]\n", cx, size, buf, newsize, newbuf);
+LRESULT CVTWindow::OnIMERequest(WPARAM wParam, LPARAM lParam)
+{
+	// "IME=off"\x82̏ꍇ\x82́A\x89\xBD\x82\xE0\x82\xB5\x82Ȃ\xA2\x81B
+	if (ts.UseIME > 0) {
+		switch(wParam) {
+		case IMR_DOCUMENTFEED:
+			return ReplyIMERequestDocumentfeed(HVTWin, lParam);
+		default:
+			break;
 		}
-		return (sizeof(RECONVERTSTRING) + newsize);
 	}
-
 	return CFrameWnd::DefWindowProc(WM_IME_REQUEST,wParam,lParam);
 }
 

Modified: branches/cmake/ttssh2/ttxssh/auth.c
===================================================================
--- branches/cmake/ttssh2/ttxssh/auth.c	2019-03-18 13:57:37 UTC (rev 7494)
+++ branches/cmake/ttssh2/ttxssh/auth.c	2019-03-18 13:57:53 UTC (rev 7495)
@@ -1190,6 +1190,10 @@
 					   pvar->auth_state.TIS_prompt);
 		destroy_malloced_string(&pvar->auth_state.TIS_prompt);
 	}
+
+	if (pvar->auth_state.echo) {
+		SendMessage(GetDlgItem(dlg, IDC_SSHPASSWORD), EM_SETPASSWORDCHAR, 0, 0);
+	}
 }
 
 static BOOL end_TIS_dlg(PTInstVar pvar, HWND dlg)
@@ -1541,6 +1545,7 @@
 	pvar->auth_state.user = NULL;
 	pvar->auth_state.flags = 0;
 	pvar->auth_state.TIS_prompt = NULL;
+	pvar->auth_state.echo = 0;
 	pvar->auth_state.supported_types = 0;
 	pvar->auth_state.cur_cred.method = SSH_AUTH_NONE;
 	pvar->auth_state.cur_cred.password = NULL;
@@ -1555,7 +1560,7 @@
 	destroy_malloced_string(&pvar->auth_state.TIS_prompt);
 }
 
-void AUTH_set_TIS_mode(PTInstVar pvar, char *prompt, int len)
+void AUTH_set_TIS_mode(PTInstVar pvar, char *prompt, int len, int echo)
 {
 	if (pvar->auth_state.cur_cred.method == SSH_AUTH_TIS) {
 		pvar->auth_state.mode = TIS_AUTH_MODE;
@@ -1564,6 +1569,7 @@
 		pvar->auth_state.TIS_prompt = malloc(len + 1);
 		memcpy(pvar->auth_state.TIS_prompt, prompt, len);
 		pvar->auth_state.TIS_prompt[len] = 0;
+		pvar->auth_state.echo = echo;
 	} else {
 		AUTH_set_generic_mode(pvar);
 	}

Modified: branches/cmake/ttssh2/ttxssh/auth.h
===================================================================
--- branches/cmake/ttssh2/ttxssh/auth.h	2019-03-18 13:57:37 UTC (rev 7494)
+++ branches/cmake/ttssh2/ttxssh/auth.h	2019-03-18 13:57:53 UTC (rev 7495)
@@ -56,6 +56,7 @@
 
   AuthMode mode;
   char *TIS_prompt;
+  int echo;
 } AUTHState;
 
 void AUTH_init(PTInstVar pvar);
@@ -62,7 +63,7 @@
 char *AUTH_get_user_name(PTInstVar pvar);
 int AUTH_set_supported_auth_types(PTInstVar pvar, int types);
 void AUTH_set_generic_mode(PTInstVar pvar);
-void AUTH_set_TIS_mode(PTInstVar pvar, char *prompt, int len);
+void AUTH_set_TIS_mode(PTInstVar pvar, char *prompt, int len, int echo);
 void AUTH_advance_to_next_cred(PTInstVar pvar);
 void AUTH_do_cred_dialog(PTInstVar pvar);
 void AUTH_do_default_cred_dialog(PTInstVar pvar);

Modified: branches/cmake/ttssh2/ttxssh/ssh.c
===================================================================
--- branches/cmake/ttssh2/ttxssh/ssh.c	2019-03-18 13:57:37 UTC (rev 7494)
+++ branches/cmake/ttssh2/ttxssh/ssh.c	2019-03-18 13:57:53 UTC (rev 7495)
@@ -1502,7 +1502,7 @@
 		if (grab_payload(pvar, len)) {
 			logputs(LOG_LEVEL_VERBOSE, "Received TIS challenge");
 
-			AUTH_set_TIS_mode(pvar, pvar->ssh_state.payload + 4, len);
+			AUTH_set_TIS_mode(pvar, pvar->ssh_state.payload + 4, len, 0);
 			AUTH_advance_to_next_cred(pvar);
 			pvar->ssh_state.status_flags &= ~STATUS_DONT_SEND_CREDENTIALS;
 			try_send_credentials(pvar);
@@ -7332,7 +7332,7 @@
 		// keyboard-interactive method (2005.3.12 yutaka)
 		if (pvar->keyboard_interactive_password_input == 0 &&
 			pvar->auth_state.cur_cred.method == SSH_AUTH_TIS) {
-			AUTH_set_TIS_mode(pvar, prompt, slen);
+			AUTH_set_TIS_mode(pvar, prompt, slen, echo);
 			AUTH_advance_to_next_cred(pvar);
 			pvar->ssh_state.status_flags &= ~STATUS_DONT_SEND_CREDENTIALS;
 			//try_send_credentials(pvar);
@@ -7457,7 +7457,7 @@
 		finish_send_packet(pvar);
 		buffer_free(msg);
 
-		logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_USERAUTH_REQUEST was sent at handle_SSH2_userauth_inforeq().");
+		logputs(LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH2_MSG_USERAUTH_REQUEST method=publickey");
 
 		pvar->pageant_keyfinal = TRUE;
 

Modified: branches/cmake/ttssh2/ttxssh/ttxssh.h
===================================================================
--- branches/cmake/ttssh2/ttxssh/ttxssh.h	2019-03-18 13:57:37 UTC (rev 7494)
+++ branches/cmake/ttssh2/ttxssh/ttxssh.h	2019-03-18 13:57:53 UTC (rev 7495)
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1998-2001, Robert O'Callahan
- * (C) 2004-2017 TeraTerm Project
+ * (C) 2004-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

From scmnotify ＠ osdn.net  Mon Mar 18 23:01:33 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 18 Mar 2019 23:01:33 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0OTZdIOmrmOmAn+WMluODhuOCueODiChU?=
 =?utf-8?q?tssh2-devel_3598=29?=
Message-ID: <1552917693.906000.128796.nullmailer@users.osdn.me>

Revision: 7496
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7496
Author:   zmatsuo
Date:     2019-03-18 23:01:33 +0900 (Mon, 18 Mar 2019)
Log Message:
-----------
高速化テスト(Ttssh2-devel 3598)

Modified Paths:
--------------
    trunk/teraterm/teraterm/buffer.c
    trunk/teraterm/teraterm/teraterm.cpp
    trunk/teraterm/teraterm/vtdisp.c
    trunk/teraterm/teraterm/vtterm.c
    trunk/teraterm/teraterm/vtwin.cpp

Added Paths:
-----------
    trunk/teraterm/teraterm/vtdisp_delay.c
    trunk/teraterm/teraterm/vtdisp_delay.h

-------------- next part --------------
Modified: trunk/teraterm/teraterm/buffer.c
===================================================================
--- trunk/teraterm/teraterm/buffer.c	2019-03-18 13:57:53 UTC (rev 7495)
+++ trunk/teraterm/teraterm/buffer.c	2019-03-18 14:01:33 UTC (rev 7496)
@@ -88,7 +88,7 @@
 static BOOL BoxSelect;
 static POINT DblClkStart, DblClkEnd;
 
-static int StrChangeStart, StrChangeCount;
+int StrChangeStart, StrChangeCount;
 
 static BOOL SeveralPageSelect;  // add (2005.5.15 yutaka)
 
@@ -1900,6 +1900,7 @@
 			StrChangeStart = CursorX;
 		}
 		StrChangeCount++;
+		UpdateStr();
 	}
 }
 
@@ -2024,7 +2025,7 @@
 	}
 }
 
-void BuffUpdateRect
+void BuffUpdateRect2
   (int XStart, int YStart, int XEnd, int YEnd)
 // Display text in a rectangular region in the screen
 //   XStart: x position of the upper-left corner (screen cordinate)
@@ -2121,6 +2122,7 @@
 	}
 }
 
+#if 0
 void UpdateStr()
 // Display not-yet-displayed string
 {
@@ -2175,6 +2177,7 @@
 
 	StrChangeCount = 0;
 }
+#endif
 
 #if 0
 void UpdateStrUnicode(void)

Modified: trunk/teraterm/teraterm/teraterm.cpp
===================================================================
--- trunk/teraterm/teraterm/teraterm.cpp	2019-03-18 13:57:53 UTC (rev 7495)
+++ trunk/teraterm/teraterm/teraterm.cpp	2019-03-18 14:01:33 UTC (rev 7496)
@@ -47,6 +47,7 @@
 #include "keyboard.h"
 #include "dllutil.h"
 #include "compat_win.h"
+#include "vtdisp_delay.h"
 
 #include "teraapp.h"
 
@@ -302,6 +303,12 @@
 		Busy--;
 	}
 
+	if (Busy == 0) {
+		if (IsUpdateTerm()) {
+			Busy++;
+		}
+	}
+
 	return (Busy>0);
 }
 

Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c	2019-03-18 13:57:53 UTC (rev 7495)
+++ trunk/teraterm/teraterm/vtdisp.c	2019-03-18 14:01:33 UTC (rev 7496)
@@ -80,7 +80,7 @@
   {168,168,168}, {178,178,178}, {188,188,188}, {198,198,198}, {208,208,208}, {218,218,218}, {228,228,228}, {238,238,238}   // 248 - 255
 };
 
-int WinWidth, WinHeight;
+int WinWidth, WinHeight;								// \x89\xE6\x96ʂɕ\\x8E\xA6\x82\xB3\x82\xEA\x82Ă\xA2\x82镶\x8E\x9A\x90\x94
 static BOOL Active = FALSE;
 static BOOL CompletelyVisible;
 HFONT VTFont[AttrFontMask+1];
@@ -95,10 +95,12 @@
 RECT VirtualScreen;
 
 // --- scrolling status flags
-int WinOrgX, WinOrgY, NewOrgX, NewOrgY;
+int WinOrgX, WinOrgY;		// \x8C\xBB\x8D݂̕\\x8E\xA6\x88ʒu
+int NewOrgX, NewOrgY;		// \x8DX\x90V\x8C\xE3\x82̕\\x8E\xA6\x88ʒu
+int ScrollBarVPos;			// \x83X\x83N\x83\x8D\x81[\x83\x8B\x83o\x81[\x82̈ʒu
 
-int NumOfLines, NumOfColumns;
-int PageStart, BuffEnd;
+int NumOfLines, NumOfColumns;	// \x83o\x83b\x83t\x83@\x83\x8A\x83\x93\x83O\x82\xB5\x82Ă\xA2\x82镶\x8E\x9A\x90\x94
+int PageStart, BuffEnd;			// \x95\\x8E\xA6\x82\xB5\x82Ă\xA2\x82\xE9\x83o\x83b\x83t\x83@\x93\xE0\x82̈ʒu
 
 static BOOL CursorOnDBCS = FALSE;
 static LOGFONT VTlf;
@@ -130,7 +132,7 @@
 
 // scrolling
 static int ScrollCount = 0;
-static int dScroll = 0;
+int dScroll = 0;
 static int SRegionTop;
 static int SRegionBottom;
 
@@ -3179,6 +3181,7 @@
   if (ScrollCount>=ts.ScrollThreshold) DispUpdateScroll();
 }
 
+#if 0
 void DispUpdateScroll()
 {
   int d;
@@ -3284,6 +3287,7 @@
 
   if (IsCaretOn()) CaretOn();
 }
+#endif
 
 void DispScrollHomePos()
 {

Added: trunk/teraterm/teraterm/vtdisp_delay.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp_delay.c	                        (rev 0)
+++ trunk/teraterm/teraterm/vtdisp_delay.c	2019-03-18 14:01:33 UTC (rev 7496)
@@ -0,0 +1,183 @@
+/* Tera Term \x8D\x82\x91\xAC\x89\xBB\x83e\x83X\x83g */
+
+#include <windows.h>
+#include <time.h>
+#include <stdio.h>
+
+#include "tttypes.h"
+#include "ttwinman.h"
+#include "ttlib.h"
+#include "vtdisp.h"
+#include "vtdisp_delay.h"
+
+// buffer.c
+extern int StrChangeStart, StrChangeCount;
+extern int dScroll;
+
+#define DISPLAY_INTERVAL	(1000 / 30)		// (ms)
+//#define DISPLAY_INTERVAL	(1000)	// (ms)
+
+#define OutputDebugPrintf(...)
+
+void BuffUpdateRect2(int XStart, int YStart, int XEnd, int YEnd);
+
+////////////////////////////////////////
+
+typedef struct {
+	enum {
+		NONE,				// \x95`\x89\xE6\x82Ȃ\xB5
+		ONE_LINE,			// 1\x8Ds\x95`\x89\xE6
+		WHOLE_TERM,			// \x91S\x89\xE6\x96ʕ`\x89\xE6
+	} Type;
+
+	// ONE_LINE\x8E\x9E\x82̃f\x81[\x83^
+	int StrChangeStart;		// cursor\x82\xCCX
+	int CursorY;			// cursor\x82\xCCY
+	int StrChangeCount;		// \x95\xB6\x8E\x9A\x90\x94
+
+	// \x95\\x8E\xA6\x8AJ\x8En\x88ʒu
+	int NewOrgX;
+	int NewOrgY;
+
+	DWORD UpdateTick;
+
+	// scroll bar\x8F\xEE\x95\xF1
+	int ScrollBarVPos;
+} UpdateInfo_t;
+
+static UpdateInfo_t UpdateInfo;
+
+void UpdateStr()
+{
+	if (UpdateInfo.Type == NONE) {
+		if (StrChangeCount != 0) {
+			UpdateInfo.Type = ONE_LINE;
+			UpdateInfo.CursorY = CursorY;
+			UpdateInfo.StrChangeStart = StrChangeStart;
+			UpdateInfo.StrChangeCount = StrChangeCount;
+		}
+	} else if (UpdateInfo.Type == ONE_LINE) {
+		if (StrChangeCount == 0) {
+			;
+		} else if (UpdateInfo.CursorY != CursorY) {
+			UpdateInfo.Type = WHOLE_TERM;
+		} else if (UpdateInfo.StrChangeStart + UpdateInfo.StrChangeCount == StrChangeStart ) {
+			UpdateInfo.StrChangeCount += StrChangeCount;
+		} else {
+			UpdateInfo.StrChangeStart = 0;
+			UpdateInfo.StrChangeCount = NumOfColumns;
+		}
+	}
+
+	OutputDebugPrintf("%d (%d,%d)%d , (%d,%d)%d\n",
+					  UpdateInfo.Type,
+					  StrChangeStart, CursorY, StrChangeCount,
+					  UpdateInfo.StrChangeStart, UpdateInfo.CursorY, UpdateInfo.StrChangeCount);
+
+	StrChangeCount = 0;
+}
+
+void BuffUpdateRect(int XStart, int YStart, int XEnd, int YEnd)
+{
+	OutputDebugPrintf("BuffUpdateRect(%d,%d,%d,%d)\n",
+					  XStart, YStart, XEnd, YEnd);
+	UpdateInfo.Type = WHOLE_TERM;
+}
+
+void DispUpdateScroll()
+{
+	OutputDebugPrintf("DispUpdateScroll\n");
+	UpdateInfo.Type = WHOLE_TERM;
+	UpdateInfo.NewOrgX += NewOrgX;
+	UpdateInfo.NewOrgY += NewOrgY;
+	dScroll = 0;
+}
+
+void UpdateTerm()
+{
+	DWORD now = timeGetTime();
+	int NewOrgX;
+	int NewOrgY;
+	int ScrollBarUpdated = 0;
+	OutputDebugPrintf("UpdateTerm %d\n", UpdateInfo.Type);
+
+	if (UpdateInfo.Type == NONE) {
+		return;
+	}
+
+	NewOrgX = UpdateInfo.NewOrgX;
+	NewOrgY = UpdateInfo.NewOrgY;
+
+	/* Update normal scroll */
+	if (NewOrgX < 0) NewOrgX = 0;
+	if (NewOrgX > NumOfColumns - WinWidth)
+		NewOrgX = NumOfColumns - WinWidth;
+	if (NewOrgY < -PageStart)
+		NewOrgY = -PageStart;
+	if (NewOrgY > BuffEnd - WinHeight - PageStart)
+		NewOrgY = BuffEnd - WinHeight - PageStart;
+
+	if (NewOrgX != WinOrgX) {
+		SetScrollPos(HVTWin, SB_HORZ, NewOrgX, TRUE);
+		ScrollBarUpdated = 1;
+	}
+
+	if (((ts.AutoScrollOnlyInBottomLine != 0 || NewOrgY!=WinOrgY)) &&
+		(UpdateInfo.ScrollBarVPos != NewOrgY + PageStart))
+	{
+		SCROLLINFO scroll_info;
+		scroll_info.cbSize = sizeof(scroll_info);
+		scroll_info.fMask = SIF_PAGE | SIF_RANGE | SIF_POS;
+		scroll_info.nPage = WinHeight;
+		scroll_info.nMin = 0;
+		scroll_info.nMax = BuffEnd-WinHeight;
+
+		if ((BuffEnd==WinHeight) && (ts.EnableScrollBuff>0)) {
+			scroll_info.nMax = BuffEnd;
+			scroll_info.nPos = 0;
+		} else {
+			int max = BuffEnd - WinHeight;
+			scroll_info.nMax = BuffEnd;
+			scroll_info.nPos = NewOrgY+PageStart;
+		}
+
+		SetScrollInfo(HVTWin, SB_VERT, &scroll_info, TRUE);
+		UpdateInfo.ScrollBarVPos = scroll_info.nPos;
+		ScrollBarUpdated = 1;
+		OutputDebugPrintf("sb_vert %d-%d-%d,%d\n",
+						  scroll_info.nMin,
+						  scroll_info.nPos,
+						  scroll_info.nMax,
+						  scroll_info.nPage);
+	}
+
+#if 0
+	if (ScrollBarUpdated) {
+		// \x83X\x83N\x83\x8D\x81[\x83\x8B\x83o\x81[\x82\xAA\x8DX\x90V\x82\xB3\x82ꂽ\x8Fꍇ\x82͂\xB7\x82\xAE\x82ɕ`\x89悷\x82\xE9
+		InvalidateRect(HVTWin, NULL, FALSE);
+	} else
+#endif
+	if (UpdateInfo.Type == WHOLE_TERM) {
+		if ((now - UpdateInfo.UpdateTick) < DISPLAY_INTERVAL) {
+			return;
+		}
+		InvalidateRect(HVTWin, NULL, FALSE);
+	} else if (UpdateInfo.Type == ONE_LINE) {
+		BuffUpdateRect2(UpdateInfo.StrChangeStart, UpdateInfo.CursorY,
+						UpdateInfo.StrChangeStart + UpdateInfo.StrChangeCount, UpdateInfo.CursorY);
+	}
+
+	WinOrgX = NewOrgX;
+	WinOrgY = NewOrgY;
+	UpdateInfo.UpdateTick = now;
+	UpdateInfo.Type = NONE;
+
+}
+
+int IsUpdateTerm()
+{
+	if (UpdateInfo.Type == NONE) {
+		return 0;
+	}
+	return 1;
+}

Added: trunk/teraterm/teraterm/vtdisp_delay.h
===================================================================
--- trunk/teraterm/teraterm/vtdisp_delay.h	                        (rev 0)
+++ trunk/teraterm/teraterm/vtdisp_delay.h	2019-03-18 14:01:33 UTC (rev 7496)
@@ -0,0 +1,10 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int IsUpdateTerm();
+void UpdateTerm();
+
+#ifdef __cplusplus
+}
+#endif

Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2019-03-18 13:57:53 UTC (rev 7495)
+++ trunk/teraterm/teraterm/vtterm.c	2019-03-18 14:01:33 UTC (rev 7496)
@@ -54,6 +54,8 @@
 #include "clipboar.h"
 #include "codeconv.h"
 
+#include "vtdisp_delay.h"
+
 #include "vtterm.h"
 
 #ifdef _DEBUG
@@ -5748,7 +5750,12 @@
 
 	c = CommRead1Byte(&cv,&b);
 
-	if (c==0) return 0;
+	if (c==0) {
+		if (IsUpdateTerm()) {
+			UpdateTerm();
+		}
+		return 0;
+	}
 
 	CaretOff();
 	UpdateCaretPosition(FALSE);	// \x94\xF1\x83A\x83N\x83e\x83B\x83u\x82̏ꍇ\x82̂ݍĕ`\x89悷\x82\xE9
@@ -5807,7 +5814,9 @@
 			c = CommRead1Byte(&cv,&b);
 	}
 
-	BuffUpdateScroll();
+	if (IsUpdateTerm()) {
+		UpdateTerm();
+	}
 
 	BuffSetCaretWidth();
 	UnlockBuffer();

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2019-03-18 13:57:53 UTC (rev 7495)
+++ trunk/teraterm/teraterm/vtwin.cpp	2019-03-18 14:01:33 UTC (rev 7496)
@@ -94,6 +94,8 @@
 static char THIS_FILE[] = __FILE__;
 #endif
 
+extern "C" void BuffUpdateRect2(int XStart, int YStart, int XEnd, int YEnd);
+
 // \x83E\x83B\x83\x93\x83h\x83E\x8Dő剻\x83{\x83^\x83\x93\x82\xF0\x97L\x8C\xF8\x82ɂ\xB7\x82\xE9 (2005.1.15 yutaka)
 #define WINDOW_MAXMIMUM_ENABLED 1
 
@@ -2655,7 +2657,7 @@
 
 	PaintWindow(PaintDC,ps.rcPaint,ps.fErase, &Xs,&Ys,&Xe,&Ye);
 	LockBuffer();
-	BuffUpdateRect(Xs,Ys,Xe,Ye);
+	BuffUpdateRect2(Xs,Ys,Xe,Ye);
 	UnlockBuffer();
 	DispEndPaint();
 

From scmnotify ＠ osdn.net  Mon Mar 18 23:01:47 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 18 Mar 2019 23:01:47 +0900
Subject: [Ttssh2-commit] [7497] patch(Ttssh2-devel 3599)
Message-ID: <1552917707.095056.128934.nullmailer@users.osdn.me>

Revision: 7497
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7497
Author:   zmatsuo
Date:     2019-03-18 23:01:46 +0900 (Mon, 18 Mar 2019)
Log Message:
-----------
patch(Ttssh2-devel 3599)

Modified Paths:
--------------
    trunk/teraterm/teraterm/teraterm.cpp
    trunk/teraterm/teraterm/vtdisp_delay.c

-------------- next part --------------
Modified: trunk/teraterm/teraterm/teraterm.cpp
===================================================================
--- trunk/teraterm/teraterm/teraterm.cpp	2019-03-18 14:01:33 UTC (rev 7496)
+++ trunk/teraterm/teraterm/teraterm.cpp	2019-03-18 14:01:46 UTC (rev 7497)
@@ -305,6 +305,7 @@
 
 	if (Busy == 0) {
 		if (IsUpdateTerm()) {
+			UpdateTerm();
 			Busy++;
 		}
 	}

Modified: trunk/teraterm/teraterm/vtdisp_delay.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp_delay.c	2019-03-18 14:01:33 UTC (rev 7496)
+++ trunk/teraterm/teraterm/vtdisp_delay.c	2019-03-18 14:01:46 UTC (rev 7497)
@@ -88,8 +88,8 @@
 {
 	OutputDebugPrintf("DispUpdateScroll\n");
 	UpdateInfo.Type = WHOLE_TERM;
-	UpdateInfo.NewOrgX += NewOrgX;
-	UpdateInfo.NewOrgY += NewOrgY;
+	UpdateInfo.NewOrgX = NewOrgX;
+	UpdateInfo.NewOrgY = NewOrgY;
 	dScroll = 0;
 }
 
@@ -157,7 +157,7 @@
 		InvalidateRect(HVTWin, NULL, FALSE);
 	} else
 #endif
-	if (UpdateInfo.Type == WHOLE_TERM) {
+	if (UpdateInfo.Type == WHOLE_TERM || NewOrgY != WinOrgY) {
 		if ((now - UpdateInfo.UpdateTick) < DISPLAY_INTERVAL) {
 			return;
 		}
@@ -169,6 +169,8 @@
 
 	WinOrgX = NewOrgX;
 	WinOrgY = NewOrgY;
+	UpdateInfo.NewOrgX = 0;
+	UpdateInfo.NewOrgY = 0;
 	UpdateInfo.UpdateTick = now;
 	UpdateInfo.Type = NONE;
 

From scmnotify ＠ osdn.net  Mon Mar 18 23:01:58 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 18 Mar 2019 23:01:58 +0900
Subject: [Ttssh2-commit] [7498] modify ttermpro.vcproj, CMakeLists.txt
Message-ID: <1552917718.122588.131575.nullmailer@users.osdn.me>

Revision: 7498
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7498
Author:   zmatsuo
Date:     2019-03-18 23:01:57 +0900 (Mon, 18 Mar 2019)
Log Message:
-----------
modify ttermpro.vcproj, CMakeLists.txt

Modified Paths:
--------------
    trunk/teraterm/teraterm/CMakeLists.txt
    trunk/teraterm/teraterm/ttermpro.vcproj

-------------- next part --------------
Modified: trunk/teraterm/teraterm/CMakeLists.txt
===================================================================
--- trunk/teraterm/teraterm/CMakeLists.txt	2019-03-18 14:01:46 UTC (rev 7497)
+++ trunk/teraterm/teraterm/CMakeLists.txt	2019-03-18 14:01:57 UTC (rev 7498)
@@ -98,6 +98,8 @@
   ttwsk.h
   vtdisp.c
   vtdisp.h
+  vtdisp_delay.c
+  vtdisp_delay.h
   vtterm.c
   vtterm.h
   vtwin.cpp

Modified: trunk/teraterm/teraterm/ttermpro.vcproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.vcproj	2019-03-18 14:01:46 UTC (rev 7497)
+++ trunk/teraterm/teraterm/ttermpro.vcproj	2019-03-18 14:01:57 UTC (rev 7498)
@@ -430,6 +430,10 @@
 				RelativePath="..\common\win16api.h"
 				>
 			</File>
+			<File
+				RelativePath="vtdisp_delay.c"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>

From scmnotify ＠ osdn.net  Mon Mar 18 23:13:16 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 18 Mar 2019 23:13:16 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc0OTldIOiqpOOBo+OBpuOCs+ODn+ODgw==?=
 =?utf-8?b?44OI44GX44Gm44GX44G+44Gj44Gf44Gf44KB44Oq44OQ44O844OI?=
Message-ID: <1552918396.432350.13813.nullmailer@users.osdn.me>

Revision: 7499
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7499
Author:   zmatsuo
Date:     2019-03-18 23:13:16 +0900 (Mon, 18 Mar 2019)
Log Message:
-----------
誤ってコミットしてしまったためリバート

Modified Paths:
--------------
    trunk/teraterm/teraterm/CMakeLists.txt
    trunk/teraterm/teraterm/buffer.c
    trunk/teraterm/teraterm/teraterm.cpp
    trunk/teraterm/teraterm/ttermpro.vcproj
    trunk/teraterm/teraterm/vtdisp.c
    trunk/teraterm/teraterm/vtterm.c
    trunk/teraterm/teraterm/vtwin.cpp

Removed Paths:
-------------
    trunk/teraterm/teraterm/vtdisp_delay.c
    trunk/teraterm/teraterm/vtdisp_delay.h

-------------- next part --------------
Modified: trunk/teraterm/teraterm/CMakeLists.txt
===================================================================
--- trunk/teraterm/teraterm/CMakeLists.txt	2019-03-18 14:01:57 UTC (rev 7498)
+++ trunk/teraterm/teraterm/CMakeLists.txt	2019-03-18 14:13:16 UTC (rev 7499)
@@ -98,8 +98,6 @@
   ttwsk.h
   vtdisp.c
   vtdisp.h
-  vtdisp_delay.c
-  vtdisp_delay.h
   vtterm.c
   vtterm.h
   vtwin.cpp

Modified: trunk/teraterm/teraterm/buffer.c
===================================================================
--- trunk/teraterm/teraterm/buffer.c	2019-03-18 14:01:57 UTC (rev 7498)
+++ trunk/teraterm/teraterm/buffer.c	2019-03-18 14:13:16 UTC (rev 7499)
@@ -88,7 +88,7 @@
 static BOOL BoxSelect;
 static POINT DblClkStart, DblClkEnd;
 
-int StrChangeStart, StrChangeCount;
+static int StrChangeStart, StrChangeCount;
 
 static BOOL SeveralPageSelect;  // add (2005.5.15 yutaka)
 
@@ -1900,7 +1900,6 @@
 			StrChangeStart = CursorX;
 		}
 		StrChangeCount++;
-		UpdateStr();
 	}
 }
 
@@ -2025,7 +2024,7 @@
 	}
 }
 
-void BuffUpdateRect2
+void BuffUpdateRect
   (int XStart, int YStart, int XEnd, int YEnd)
 // Display text in a rectangular region in the screen
 //   XStart: x position of the upper-left corner (screen cordinate)
@@ -2122,7 +2121,6 @@
 	}
 }
 
-#if 0
 void UpdateStr()
 // Display not-yet-displayed string
 {
@@ -2177,7 +2175,6 @@
 
 	StrChangeCount = 0;
 }
-#endif
 
 #if 0
 void UpdateStrUnicode(void)

Modified: trunk/teraterm/teraterm/teraterm.cpp
===================================================================
--- trunk/teraterm/teraterm/teraterm.cpp	2019-03-18 14:01:57 UTC (rev 7498)
+++ trunk/teraterm/teraterm/teraterm.cpp	2019-03-18 14:13:16 UTC (rev 7499)
@@ -47,7 +47,6 @@
 #include "keyboard.h"
 #include "dllutil.h"
 #include "compat_win.h"
-#include "vtdisp_delay.h"
 
 #include "teraapp.h"
 
@@ -303,13 +302,6 @@
 		Busy--;
 	}
 
-	if (Busy == 0) {
-		if (IsUpdateTerm()) {
-			UpdateTerm();
-			Busy++;
-		}
-	}
-
 	return (Busy>0);
 }
 

Modified: trunk/teraterm/teraterm/ttermpro.vcproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.vcproj	2019-03-18 14:01:57 UTC (rev 7498)
+++ trunk/teraterm/teraterm/ttermpro.vcproj	2019-03-18 14:13:16 UTC (rev 7499)
@@ -430,10 +430,6 @@
 				RelativePath="..\common\win16api.h"
 				>
 			</File>
-			<File
-				RelativePath="vtdisp_delay.c"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>

Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c	2019-03-18 14:01:57 UTC (rev 7498)
+++ trunk/teraterm/teraterm/vtdisp.c	2019-03-18 14:13:16 UTC (rev 7499)
@@ -80,7 +80,7 @@
   {168,168,168}, {178,178,178}, {188,188,188}, {198,198,198}, {208,208,208}, {218,218,218}, {228,228,228}, {238,238,238}   // 248 - 255
 };
 
-int WinWidth, WinHeight;								// \x89\xE6\x96ʂɕ\\x8E\xA6\x82\xB3\x82\xEA\x82Ă\xA2\x82镶\x8E\x9A\x90\x94
+int WinWidth, WinHeight;
 static BOOL Active = FALSE;
 static BOOL CompletelyVisible;
 HFONT VTFont[AttrFontMask+1];
@@ -95,12 +95,10 @@
 RECT VirtualScreen;
 
 // --- scrolling status flags
-int WinOrgX, WinOrgY;		// \x8C\xBB\x8D݂̕\\x8E\xA6\x88ʒu
-int NewOrgX, NewOrgY;		// \x8DX\x90V\x8C\xE3\x82̕\\x8E\xA6\x88ʒu
-int ScrollBarVPos;			// \x83X\x83N\x83\x8D\x81[\x83\x8B\x83o\x81[\x82̈ʒu
+int WinOrgX, WinOrgY, NewOrgX, NewOrgY;
 
-int NumOfLines, NumOfColumns;	// \x83o\x83b\x83t\x83@\x83\x8A\x83\x93\x83O\x82\xB5\x82Ă\xA2\x82镶\x8E\x9A\x90\x94
-int PageStart, BuffEnd;			// \x95\\x8E\xA6\x82\xB5\x82Ă\xA2\x82\xE9\x83o\x83b\x83t\x83@\x93\xE0\x82̈ʒu
+int NumOfLines, NumOfColumns;
+int PageStart, BuffEnd;
 
 static BOOL CursorOnDBCS = FALSE;
 static LOGFONT VTlf;
@@ -132,7 +130,7 @@
 
 // scrolling
 static int ScrollCount = 0;
-int dScroll = 0;
+static int dScroll = 0;
 static int SRegionTop;
 static int SRegionBottom;
 
@@ -3181,7 +3179,6 @@
   if (ScrollCount>=ts.ScrollThreshold) DispUpdateScroll();
 }
 
-#if 0
 void DispUpdateScroll()
 {
   int d;
@@ -3287,7 +3284,6 @@
 
   if (IsCaretOn()) CaretOn();
 }
-#endif
 
 void DispScrollHomePos()
 {

Deleted: trunk/teraterm/teraterm/vtdisp_delay.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp_delay.c	2019-03-18 14:01:57 UTC (rev 7498)
+++ trunk/teraterm/teraterm/vtdisp_delay.c	2019-03-18 14:13:16 UTC (rev 7499)
@@ -1,185 +0,0 @@
-/* Tera Term \x8D\x82\x91\xAC\x89\xBB\x83e\x83X\x83g */
-
-#include <windows.h>
-#include <time.h>
-#include <stdio.h>
-
-#include "tttypes.h"
-#include "ttwinman.h"
-#include "ttlib.h"
-#include "vtdisp.h"
-#include "vtdisp_delay.h"
-
-// buffer.c
-extern int StrChangeStart, StrChangeCount;
-extern int dScroll;
-
-#define DISPLAY_INTERVAL	(1000 / 30)		// (ms)
-//#define DISPLAY_INTERVAL	(1000)	// (ms)
-
-#define OutputDebugPrintf(...)
-
-void BuffUpdateRect2(int XStart, int YStart, int XEnd, int YEnd);
-
-////////////////////////////////////////
-
-typedef struct {
-	enum {
-		NONE,				// \x95`\x89\xE6\x82Ȃ\xB5
-		ONE_LINE,			// 1\x8Ds\x95`\x89\xE6
-		WHOLE_TERM,			// \x91S\x89\xE6\x96ʕ`\x89\xE6
-	} Type;
-
-	// ONE_LINE\x8E\x9E\x82̃f\x81[\x83^
-	int StrChangeStart;		// cursor\x82\xCCX
-	int CursorY;			// cursor\x82\xCCY
-	int StrChangeCount;		// \x95\xB6\x8E\x9A\x90\x94
-
-	// \x95\\x8E\xA6\x8AJ\x8En\x88ʒu
-	int NewOrgX;
-	int NewOrgY;
-
-	DWORD UpdateTick;
-
-	// scroll bar\x8F\xEE\x95\xF1
-	int ScrollBarVPos;
-} UpdateInfo_t;
-
-static UpdateInfo_t UpdateInfo;
-
-void UpdateStr()
-{
-	if (UpdateInfo.Type == NONE) {
-		if (StrChangeCount != 0) {
-			UpdateInfo.Type = ONE_LINE;
-			UpdateInfo.CursorY = CursorY;
-			UpdateInfo.StrChangeStart = StrChangeStart;
-			UpdateInfo.StrChangeCount = StrChangeCount;
-		}
-	} else if (UpdateInfo.Type == ONE_LINE) {
-		if (StrChangeCount == 0) {
-			;
-		} else if (UpdateInfo.CursorY != CursorY) {
-			UpdateInfo.Type = WHOLE_TERM;
-		} else if (UpdateInfo.StrChangeStart + UpdateInfo.StrChangeCount == StrChangeStart ) {
-			UpdateInfo.StrChangeCount += StrChangeCount;
-		} else {
-			UpdateInfo.StrChangeStart = 0;
-			UpdateInfo.StrChangeCount = NumOfColumns;
-		}
-	}
-
-	OutputDebugPrintf("%d (%d,%d)%d , (%d,%d)%d\n",
-					  UpdateInfo.Type,
-					  StrChangeStart, CursorY, StrChangeCount,
-					  UpdateInfo.StrChangeStart, UpdateInfo.CursorY, UpdateInfo.StrChangeCount);
-
-	StrChangeCount = 0;
-}
-
-void BuffUpdateRect(int XStart, int YStart, int XEnd, int YEnd)
-{
-	OutputDebugPrintf("BuffUpdateRect(%d,%d,%d,%d)\n",
-					  XStart, YStart, XEnd, YEnd);
-	UpdateInfo.Type = WHOLE_TERM;
-}
-
-void DispUpdateScroll()
-{
-	OutputDebugPrintf("DispUpdateScroll\n");
-	UpdateInfo.Type = WHOLE_TERM;
-	UpdateInfo.NewOrgX = NewOrgX;
-	UpdateInfo.NewOrgY = NewOrgY;
-	dScroll = 0;
-}
-
-void UpdateTerm()
-{
-	DWORD now = timeGetTime();
-	int NewOrgX;
-	int NewOrgY;
-	int ScrollBarUpdated = 0;
-	OutputDebugPrintf("UpdateTerm %d\n", UpdateInfo.Type);
-
-	if (UpdateInfo.Type == NONE) {
-		return;
-	}
-
-	NewOrgX = UpdateInfo.NewOrgX;
-	NewOrgY = UpdateInfo.NewOrgY;
-
-	/* Update normal scroll */
-	if (NewOrgX < 0) NewOrgX = 0;
-	if (NewOrgX > NumOfColumns - WinWidth)
-		NewOrgX = NumOfColumns - WinWidth;
-	if (NewOrgY < -PageStart)
-		NewOrgY = -PageStart;
-	if (NewOrgY > BuffEnd - WinHeight - PageStart)
-		NewOrgY = BuffEnd - WinHeight - PageStart;
-
-	if (NewOrgX != WinOrgX) {
-		SetScrollPos(HVTWin, SB_HORZ, NewOrgX, TRUE);
-		ScrollBarUpdated = 1;
-	}
-
-	if (((ts.AutoScrollOnlyInBottomLine != 0 || NewOrgY!=WinOrgY)) &&
-		(UpdateInfo.ScrollBarVPos != NewOrgY + PageStart))
-	{
-		SCROLLINFO scroll_info;
-		scroll_info.cbSize = sizeof(scroll_info);
-		scroll_info.fMask = SIF_PAGE | SIF_RANGE | SIF_POS;
-		scroll_info.nPage = WinHeight;
-		scroll_info.nMin = 0;
-		scroll_info.nMax = BuffEnd-WinHeight;
-
-		if ((BuffEnd==WinHeight) && (ts.EnableScrollBuff>0)) {
-			scroll_info.nMax = BuffEnd;
-			scroll_info.nPos = 0;
-		} else {
-			int max = BuffEnd - WinHeight;
-			scroll_info.nMax = BuffEnd;
-			scroll_info.nPos = NewOrgY+PageStart;
-		}
-
-		SetScrollInfo(HVTWin, SB_VERT, &scroll_info, TRUE);
-		UpdateInfo.ScrollBarVPos = scroll_info.nPos;
-		ScrollBarUpdated = 1;
-		OutputDebugPrintf("sb_vert %d-%d-%d,%d\n",
-						  scroll_info.nMin,
-						  scroll_info.nPos,
-						  scroll_info.nMax,
-						  scroll_info.nPage);
-	}
-
-#if 0
-	if (ScrollBarUpdated) {
-		// \x83X\x83N\x83\x8D\x81[\x83\x8B\x83o\x81[\x82\xAA\x8DX\x90V\x82\xB3\x82ꂽ\x8Fꍇ\x82͂\xB7\x82\xAE\x82ɕ`\x89悷\x82\xE9
-		InvalidateRect(HVTWin, NULL, FALSE);
-	} else
-#endif
-	if (UpdateInfo.Type == WHOLE_TERM || NewOrgY != WinOrgY) {
-		if ((now - UpdateInfo.UpdateTick) < DISPLAY_INTERVAL) {
-			return;
-		}
-		InvalidateRect(HVTWin, NULL, FALSE);
-	} else if (UpdateInfo.Type == ONE_LINE) {
-		BuffUpdateRect2(UpdateInfo.StrChangeStart, UpdateInfo.CursorY,
-						UpdateInfo.StrChangeStart + UpdateInfo.StrChangeCount, UpdateInfo.CursorY);
-	}
-
-	WinOrgX = NewOrgX;
-	WinOrgY = NewOrgY;
-	UpdateInfo.NewOrgX = 0;
-	UpdateInfo.NewOrgY = 0;
-	UpdateInfo.UpdateTick = now;
-	UpdateInfo.Type = NONE;
-
-}
-
-int IsUpdateTerm()
-{
-	if (UpdateInfo.Type == NONE) {
-		return 0;
-	}
-	return 1;
-}

Deleted: trunk/teraterm/teraterm/vtdisp_delay.h
===================================================================
--- trunk/teraterm/teraterm/vtdisp_delay.h	2019-03-18 14:01:57 UTC (rev 7498)
+++ trunk/teraterm/teraterm/vtdisp_delay.h	2019-03-18 14:13:16 UTC (rev 7499)
@@ -1,10 +0,0 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int IsUpdateTerm();
-void UpdateTerm();
-
-#ifdef __cplusplus
-}
-#endif

Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2019-03-18 14:01:57 UTC (rev 7498)
+++ trunk/teraterm/teraterm/vtterm.c	2019-03-18 14:13:16 UTC (rev 7499)
@@ -54,8 +54,6 @@
 #include "clipboar.h"
 #include "codeconv.h"
 
-#include "vtdisp_delay.h"
-
 #include "vtterm.h"
 
 #ifdef _DEBUG
@@ -5750,12 +5748,7 @@
 
 	c = CommRead1Byte(&cv,&b);
 
-	if (c==0) {
-		if (IsUpdateTerm()) {
-			UpdateTerm();
-		}
-		return 0;
-	}
+	if (c==0) return 0;
 
 	CaretOff();
 	UpdateCaretPosition(FALSE);	// \x94\xF1\x83A\x83N\x83e\x83B\x83u\x82̏ꍇ\x82̂ݍĕ`\x89悷\x82\xE9
@@ -5814,9 +5807,7 @@
 			c = CommRead1Byte(&cv,&b);
 	}
 
-	if (IsUpdateTerm()) {
-		UpdateTerm();
-	}
+	BuffUpdateScroll();
 
 	BuffSetCaretWidth();
 	UnlockBuffer();

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2019-03-18 14:01:57 UTC (rev 7498)
+++ trunk/teraterm/teraterm/vtwin.cpp	2019-03-18 14:13:16 UTC (rev 7499)
@@ -94,8 +94,6 @@
 static char THIS_FILE[] = __FILE__;
 #endif
 
-extern "C" void BuffUpdateRect2(int XStart, int YStart, int XEnd, int YEnd);
-
 // \x83E\x83B\x83\x93\x83h\x83E\x8Dő剻\x83{\x83^\x83\x93\x82\xF0\x97L\x8C\xF8\x82ɂ\xB7\x82\xE9 (2005.1.15 yutaka)
 #define WINDOW_MAXMIMUM_ENABLED 1
 
@@ -2657,7 +2655,7 @@
 
 	PaintWindow(PaintDC,ps.rcPaint,ps.fErase, &Xs,&Ys,&Xe,&Ye);
 	LockBuffer();
-	BuffUpdateRect2(Xs,Ys,Xe,Ye);
+	BuffUpdateRect(Xs,Ys,Xe,Ye);
 	UnlockBuffer();
 	DispEndPaint();
 

From scmnotify ＠ osdn.net  Mon Mar 18 23:17:33 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 18 Mar 2019 23:17:33 +0900
Subject: [Ttssh2-commit] [7500]
Message-ID: <1552918653.256693.27825.nullmailer@users.osdn.me>

Revision: 7500
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7500
Author:   zmatsuo
Date:     2019-03-18 23:17:33 +0900 (Mon, 18 Mar 2019)
Log Message:
-----------


Added Paths:
-----------
    branches/speedup_parse_draw/


From scmnotify ＠ osdn.net  Mon Mar 18 23:24:35 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 18 Mar 2019 23:24:35 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc1MDFdIOmrmOmAn+WMluODhuOCueODiChU?=
 =?utf-8?q?tssh2-devel_3598=29?=
Message-ID: <1552919075.561890.44677.nullmailer@users.osdn.me>

Revision: 7501
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7501
Author:   zmatsuo
Date:     2019-03-18 23:24:35 +0900 (Mon, 18 Mar 2019)
Log Message:
-----------
高速化テスト(Ttssh2-devel 3598)

Modified Paths:
--------------
    branches/speedup_parse_draw/teraterm/teraterm/buffer.c
    branches/speedup_parse_draw/teraterm/teraterm/teraterm.cpp
    branches/speedup_parse_draw/teraterm/teraterm/vtdisp.c
    branches/speedup_parse_draw/teraterm/teraterm/vtterm.c
    branches/speedup_parse_draw/teraterm/teraterm/vtwin.cpp

Added Paths:
-----------
    branches/speedup_parse_draw/teraterm/teraterm/vtdisp_delay.c
    branches/speedup_parse_draw/teraterm/teraterm/vtdisp_delay.h

-------------- next part --------------
Modified: branches/speedup_parse_draw/teraterm/teraterm/buffer.c
===================================================================
--- branches/speedup_parse_draw/teraterm/teraterm/buffer.c	2019-03-18 14:17:33 UTC (rev 7500)
+++ branches/speedup_parse_draw/teraterm/teraterm/buffer.c	2019-03-18 14:24:35 UTC (rev 7501)
@@ -88,7 +88,7 @@
 static BOOL BoxSelect;
 static POINT DblClkStart, DblClkEnd;
 
-static int StrChangeStart, StrChangeCount;
+int StrChangeStart, StrChangeCount;
 
 static BOOL SeveralPageSelect;  // add (2005.5.15 yutaka)
 
@@ -1900,6 +1900,7 @@
 			StrChangeStart = CursorX;
 		}
 		StrChangeCount++;
+		UpdateStr();
 	}
 }
 
@@ -2024,7 +2025,7 @@
 	}
 }
 
-void BuffUpdateRect
+void BuffUpdateRect2
   (int XStart, int YStart, int XEnd, int YEnd)
 // Display text in a rectangular region in the screen
 //   XStart: x position of the upper-left corner (screen cordinate)
@@ -2121,6 +2122,7 @@
 	}
 }
 
+#if 0
 void UpdateStr()
 // Display not-yet-displayed string
 {
@@ -2175,6 +2177,7 @@
 
 	StrChangeCount = 0;
 }
+#endif
 
 #if 0
 void UpdateStrUnicode(void)

Modified: branches/speedup_parse_draw/teraterm/teraterm/teraterm.cpp
===================================================================
--- branches/speedup_parse_draw/teraterm/teraterm/teraterm.cpp	2019-03-18 14:17:33 UTC (rev 7500)
+++ branches/speedup_parse_draw/teraterm/teraterm/teraterm.cpp	2019-03-18 14:24:35 UTC (rev 7501)
@@ -47,6 +47,7 @@
 #include "keyboard.h"
 #include "dllutil.h"
 #include "compat_win.h"
+#include "vtdisp_delay.h"
 
 #include "teraapp.h"
 
@@ -302,6 +303,12 @@
 		Busy--;
 	}
 
+	if (Busy == 0) {
+		if (IsUpdateTerm()) {
+			Busy++;
+		}
+	}
+
 	return (Busy>0);
 }
 

Modified: branches/speedup_parse_draw/teraterm/teraterm/vtdisp.c
===================================================================
--- branches/speedup_parse_draw/teraterm/teraterm/vtdisp.c	2019-03-18 14:17:33 UTC (rev 7500)
+++ branches/speedup_parse_draw/teraterm/teraterm/vtdisp.c	2019-03-18 14:24:35 UTC (rev 7501)
@@ -80,7 +80,7 @@
   {168,168,168}, {178,178,178}, {188,188,188}, {198,198,198}, {208,208,208}, {218,218,218}, {228,228,228}, {238,238,238}   // 248 - 255
 };
 
-int WinWidth, WinHeight;
+int WinWidth, WinHeight;								// \x89\xE6\x96ʂɕ\\x8E\xA6\x82\xB3\x82\xEA\x82Ă\xA2\x82镶\x8E\x9A\x90\x94
 static BOOL Active = FALSE;
 static BOOL CompletelyVisible;
 HFONT VTFont[AttrFontMask+1];
@@ -95,10 +95,12 @@
 RECT VirtualScreen;
 
 // --- scrolling status flags
-int WinOrgX, WinOrgY, NewOrgX, NewOrgY;
+int WinOrgX, WinOrgY;		// \x8C\xBB\x8D݂̕\\x8E\xA6\x88ʒu
+int NewOrgX, NewOrgY;		// \x8DX\x90V\x8C\xE3\x82̕\\x8E\xA6\x88ʒu
+int ScrollBarVPos;			// \x83X\x83N\x83\x8D\x81[\x83\x8B\x83o\x81[\x82̈ʒu
 
-int NumOfLines, NumOfColumns;
-int PageStart, BuffEnd;
+int NumOfLines, NumOfColumns;	// \x83o\x83b\x83t\x83@\x83\x8A\x83\x93\x83O\x82\xB5\x82Ă\xA2\x82镶\x8E\x9A\x90\x94
+int PageStart, BuffEnd;			// \x95\\x8E\xA6\x82\xB5\x82Ă\xA2\x82\xE9\x83o\x83b\x83t\x83@\x93\xE0\x82̈ʒu
 
 static BOOL CursorOnDBCS = FALSE;
 static LOGFONT VTlf;
@@ -130,7 +132,7 @@
 
 // scrolling
 static int ScrollCount = 0;
-static int dScroll = 0;
+int dScroll = 0;
 static int SRegionTop;
 static int SRegionBottom;
 
@@ -3179,6 +3181,7 @@
   if (ScrollCount>=ts.ScrollThreshold) DispUpdateScroll();
 }
 
+#if 0
 void DispUpdateScroll()
 {
   int d;
@@ -3284,6 +3287,7 @@
 
   if (IsCaretOn()) CaretOn();
 }
+#endif
 
 void DispScrollHomePos()
 {

Added: branches/speedup_parse_draw/teraterm/teraterm/vtdisp_delay.c
===================================================================
--- branches/speedup_parse_draw/teraterm/teraterm/vtdisp_delay.c	                        (rev 0)
+++ branches/speedup_parse_draw/teraterm/teraterm/vtdisp_delay.c	2019-03-18 14:24:35 UTC (rev 7501)
@@ -0,0 +1,183 @@
+/* Tera Term \x8D\x82\x91\xAC\x89\xBB\x83e\x83X\x83g */
+
+#include <windows.h>
+#include <time.h>
+#include <stdio.h>
+
+#include "tttypes.h"
+#include "ttwinman.h"
+#include "ttlib.h"
+#include "vtdisp.h"
+#include "vtdisp_delay.h"
+
+// buffer.c
+extern int StrChangeStart, StrChangeCount;
+extern int dScroll;
+
+#define DISPLAY_INTERVAL	(1000 / 30)		// (ms)
+//#define DISPLAY_INTERVAL	(1000)	// (ms)
+
+#define OutputDebugPrintf(...)
+
+void BuffUpdateRect2(int XStart, int YStart, int XEnd, int YEnd);
+
+////////////////////////////////////////
+
+typedef struct {
+	enum {
+		NONE,				// \x95`\x89\xE6\x82Ȃ\xB5
+		ONE_LINE,			// 1\x8Ds\x95`\x89\xE6
+		WHOLE_TERM,			// \x91S\x89\xE6\x96ʕ`\x89\xE6
+	} Type;
+
+	// ONE_LINE\x8E\x9E\x82̃f\x81[\x83^
+	int StrChangeStart;		// cursor\x82\xCCX
+	int CursorY;			// cursor\x82\xCCY
+	int StrChangeCount;		// \x95\xB6\x8E\x9A\x90\x94
+
+	// \x95\\x8E\xA6\x8AJ\x8En\x88ʒu
+	int NewOrgX;
+	int NewOrgY;
+
+	DWORD UpdateTick;
+
+	// scroll bar\x8F\xEE\x95\xF1
+	int ScrollBarVPos;
+} UpdateInfo_t;
+
+static UpdateInfo_t UpdateInfo;
+
+void UpdateStr()
+{
+	if (UpdateInfo.Type == NONE) {
+		if (StrChangeCount != 0) {
+			UpdateInfo.Type = ONE_LINE;
+			UpdateInfo.CursorY = CursorY;
+			UpdateInfo.StrChangeStart = StrChangeStart;
+			UpdateInfo.StrChangeCount = StrChangeCount;
+		}
+	} else if (UpdateInfo.Type == ONE_LINE) {
+		if (StrChangeCount == 0) {
+			;
+		} else if (UpdateInfo.CursorY != CursorY) {
+			UpdateInfo.Type = WHOLE_TERM;
+		} else if (UpdateInfo.StrChangeStart + UpdateInfo.StrChangeCount == StrChangeStart ) {
+			UpdateInfo.StrChangeCount += StrChangeCount;
+		} else {
+			UpdateInfo.StrChangeStart = 0;
+			UpdateInfo.StrChangeCount = NumOfColumns;
+		}
+	}
+
+	OutputDebugPrintf("%d (%d,%d)%d , (%d,%d)%d\n",
+					  UpdateInfo.Type,
+					  StrChangeStart, CursorY, StrChangeCount,
+					  UpdateInfo.StrChangeStart, UpdateInfo.CursorY, UpdateInfo.StrChangeCount);
+
+	StrChangeCount = 0;
+}
+
+void BuffUpdateRect(int XStart, int YStart, int XEnd, int YEnd)
+{
+	OutputDebugPrintf("BuffUpdateRect(%d,%d,%d,%d)\n",
+					  XStart, YStart, XEnd, YEnd);
+	UpdateInfo.Type = WHOLE_TERM;
+}
+
+void DispUpdateScroll()
+{
+	OutputDebugPrintf("DispUpdateScroll\n");
+	UpdateInfo.Type = WHOLE_TERM;
+	UpdateInfo.NewOrgX += NewOrgX;
+	UpdateInfo.NewOrgY += NewOrgY;
+	dScroll = 0;
+}
+
+void UpdateTerm()
+{
+	DWORD now = timeGetTime();
+	int NewOrgX;
+	int NewOrgY;
+	int ScrollBarUpdated = 0;
+	OutputDebugPrintf("UpdateTerm %d\n", UpdateInfo.Type);
+
+	if (UpdateInfo.Type == NONE) {
+		return;
+	}
+
+	NewOrgX = UpdateInfo.NewOrgX;
+	NewOrgY = UpdateInfo.NewOrgY;
+
+	/* Update normal scroll */
+	if (NewOrgX < 0) NewOrgX = 0;
+	if (NewOrgX > NumOfColumns - WinWidth)
+		NewOrgX = NumOfColumns - WinWidth;
+	if (NewOrgY < -PageStart)
+		NewOrgY = -PageStart;
+	if (NewOrgY > BuffEnd - WinHeight - PageStart)
+		NewOrgY = BuffEnd - WinHeight - PageStart;
+
+	if (NewOrgX != WinOrgX) {
+		SetScrollPos(HVTWin, SB_HORZ, NewOrgX, TRUE);
+		ScrollBarUpdated = 1;
+	}
+
+	if (((ts.AutoScrollOnlyInBottomLine != 0 || NewOrgY!=WinOrgY)) &&
+		(UpdateInfo.ScrollBarVPos != NewOrgY + PageStart))
+	{
+		SCROLLINFO scroll_info;
+		scroll_info.cbSize = sizeof(scroll_info);
+		scroll_info.fMask = SIF_PAGE | SIF_RANGE | SIF_POS;
+		scroll_info.nPage = WinHeight;
+		scroll_info.nMin = 0;
+		scroll_info.nMax = BuffEnd-WinHeight;
+
+		if ((BuffEnd==WinHeight) && (ts.EnableScrollBuff>0)) {
+			scroll_info.nMax = BuffEnd;
+			scroll_info.nPos = 0;
+		} else {
+			int max = BuffEnd - WinHeight;
+			scroll_info.nMax = BuffEnd;
+			scroll_info.nPos = NewOrgY+PageStart;
+		}
+
+		SetScrollInfo(HVTWin, SB_VERT, &scroll_info, TRUE);
+		UpdateInfo.ScrollBarVPos = scroll_info.nPos;
+		ScrollBarUpdated = 1;
+		OutputDebugPrintf("sb_vert %d-%d-%d,%d\n",
+						  scroll_info.nMin,
+						  scroll_info.nPos,
+						  scroll_info.nMax,
+						  scroll_info.nPage);
+	}
+
+#if 0
+	if (ScrollBarUpdated) {
+		// \x83X\x83N\x83\x8D\x81[\x83\x8B\x83o\x81[\x82\xAA\x8DX\x90V\x82\xB3\x82ꂽ\x8Fꍇ\x82͂\xB7\x82\xAE\x82ɕ`\x89悷\x82\xE9
+		InvalidateRect(HVTWin, NULL, FALSE);
+	} else
+#endif
+	if (UpdateInfo.Type == WHOLE_TERM) {
+		if ((now - UpdateInfo.UpdateTick) < DISPLAY_INTERVAL) {
+			return;
+		}
+		InvalidateRect(HVTWin, NULL, FALSE);
+	} else if (UpdateInfo.Type == ONE_LINE) {
+		BuffUpdateRect2(UpdateInfo.StrChangeStart, UpdateInfo.CursorY,
+						UpdateInfo.StrChangeStart + UpdateInfo.StrChangeCount, UpdateInfo.CursorY);
+	}
+
+	WinOrgX = NewOrgX;
+	WinOrgY = NewOrgY;
+	UpdateInfo.UpdateTick = now;
+	UpdateInfo.Type = NONE;
+
+}
+
+int IsUpdateTerm()
+{
+	if (UpdateInfo.Type == NONE) {
+		return 0;
+	}
+	return 1;
+}

Added: branches/speedup_parse_draw/teraterm/teraterm/vtdisp_delay.h
===================================================================
--- branches/speedup_parse_draw/teraterm/teraterm/vtdisp_delay.h	                        (rev 0)
+++ branches/speedup_parse_draw/teraterm/teraterm/vtdisp_delay.h	2019-03-18 14:24:35 UTC (rev 7501)
@@ -0,0 +1,10 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int IsUpdateTerm();
+void UpdateTerm();
+
+#ifdef __cplusplus
+}
+#endif

Modified: branches/speedup_parse_draw/teraterm/teraterm/vtterm.c
===================================================================
--- branches/speedup_parse_draw/teraterm/teraterm/vtterm.c	2019-03-18 14:17:33 UTC (rev 7500)
+++ branches/speedup_parse_draw/teraterm/teraterm/vtterm.c	2019-03-18 14:24:35 UTC (rev 7501)
@@ -54,6 +54,8 @@
 #include "clipboar.h"
 #include "codeconv.h"
 
+#include "vtdisp_delay.h"
+
 #include "vtterm.h"
 
 #ifdef _DEBUG
@@ -5748,7 +5750,12 @@
 
 	c = CommRead1Byte(&cv,&b);
 
-	if (c==0) return 0;
+	if (c==0) {
+		if (IsUpdateTerm()) {
+			UpdateTerm();
+		}
+		return 0;
+	}
 
 	CaretOff();
 	UpdateCaretPosition(FALSE);	// \x94\xF1\x83A\x83N\x83e\x83B\x83u\x82̏ꍇ\x82̂ݍĕ`\x89悷\x82\xE9
@@ -5807,7 +5814,9 @@
 			c = CommRead1Byte(&cv,&b);
 	}
 
-	BuffUpdateScroll();
+	if (IsUpdateTerm()) {
+		UpdateTerm();
+	}
 
 	BuffSetCaretWidth();
 	UnlockBuffer();

Modified: branches/speedup_parse_draw/teraterm/teraterm/vtwin.cpp
===================================================================
--- branches/speedup_parse_draw/teraterm/teraterm/vtwin.cpp	2019-03-18 14:17:33 UTC (rev 7500)
+++ branches/speedup_parse_draw/teraterm/teraterm/vtwin.cpp	2019-03-18 14:24:35 UTC (rev 7501)
@@ -94,6 +94,8 @@
 static char THIS_FILE[] = __FILE__;
 #endif
 
+extern "C" void BuffUpdateRect2(int XStart, int YStart, int XEnd, int YEnd);
+
 // \x83E\x83B\x83\x93\x83h\x83E\x8Dő剻\x83{\x83^\x83\x93\x82\xF0\x97L\x8C\xF8\x82ɂ\xB7\x82\xE9 (2005.1.15 yutaka)
 #define WINDOW_MAXMIMUM_ENABLED 1
 
@@ -2655,7 +2657,7 @@
 
 	PaintWindow(PaintDC,ps.rcPaint,ps.fErase, &Xs,&Ys,&Xe,&Ye);
 	LockBuffer();
-	BuffUpdateRect(Xs,Ys,Xe,Ye);
+	BuffUpdateRect2(Xs,Ys,Xe,Ye);
 	UnlockBuffer();
 	DispEndPaint();
 

From scmnotify ＠ osdn.net  Mon Mar 18 23:24:48 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 18 Mar 2019 23:24:48 +0900
Subject: [Ttssh2-commit] [7502] patch(Ttssh2-devel 3599)
Message-ID: <1552919088.753146.44781.nullmailer@users.osdn.me>

Revision: 7502
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7502
Author:   zmatsuo
Date:     2019-03-18 23:24:48 +0900 (Mon, 18 Mar 2019)
Log Message:
-----------
patch(Ttssh2-devel 3599)

Modified Paths:
--------------
    branches/speedup_parse_draw/teraterm/teraterm/teraterm.cpp
    branches/speedup_parse_draw/teraterm/teraterm/vtdisp_delay.c

-------------- next part --------------
Modified: branches/speedup_parse_draw/teraterm/teraterm/teraterm.cpp
===================================================================
--- branches/speedup_parse_draw/teraterm/teraterm/teraterm.cpp	2019-03-18 14:24:35 UTC (rev 7501)
+++ branches/speedup_parse_draw/teraterm/teraterm/teraterm.cpp	2019-03-18 14:24:48 UTC (rev 7502)
@@ -305,6 +305,7 @@
 
 	if (Busy == 0) {
 		if (IsUpdateTerm()) {
+			UpdateTerm();
 			Busy++;
 		}
 	}

Modified: branches/speedup_parse_draw/teraterm/teraterm/vtdisp_delay.c
===================================================================
--- branches/speedup_parse_draw/teraterm/teraterm/vtdisp_delay.c	2019-03-18 14:24:35 UTC (rev 7501)
+++ branches/speedup_parse_draw/teraterm/teraterm/vtdisp_delay.c	2019-03-18 14:24:48 UTC (rev 7502)
@@ -88,8 +88,8 @@
 {
 	OutputDebugPrintf("DispUpdateScroll\n");
 	UpdateInfo.Type = WHOLE_TERM;
-	UpdateInfo.NewOrgX += NewOrgX;
-	UpdateInfo.NewOrgY += NewOrgY;
+	UpdateInfo.NewOrgX = NewOrgX;
+	UpdateInfo.NewOrgY = NewOrgY;
 	dScroll = 0;
 }
 
@@ -157,7 +157,7 @@
 		InvalidateRect(HVTWin, NULL, FALSE);
 	} else
 #endif
-	if (UpdateInfo.Type == WHOLE_TERM) {
+	if (UpdateInfo.Type == WHOLE_TERM || NewOrgY != WinOrgY) {
 		if ((now - UpdateInfo.UpdateTick) < DISPLAY_INTERVAL) {
 			return;
 		}
@@ -169,6 +169,8 @@
 
 	WinOrgX = NewOrgX;
 	WinOrgY = NewOrgY;
+	UpdateInfo.NewOrgX = 0;
+	UpdateInfo.NewOrgY = 0;
 	UpdateInfo.UpdateTick = now;
 	UpdateInfo.Type = NONE;
 

From scmnotify ＠ osdn.net  Mon Mar 18 23:25:02 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 18 Mar 2019 23:25:02 +0900
Subject: [Ttssh2-commit] [7503] modify ttermpro.vcproj, CMakeLists.txt
Message-ID: <1552919102.499813.44997.nullmailer@users.osdn.me>

Revision: 7503
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7503
Author:   zmatsuo
Date:     2019-03-18 23:25:02 +0900 (Mon, 18 Mar 2019)
Log Message:
-----------
modify ttermpro.vcproj, CMakeLists.txt

Modified Paths:
--------------
    branches/speedup_parse_draw/teraterm/teraterm/CMakeLists.txt
    branches/speedup_parse_draw/teraterm/teraterm/ttermpro.vcproj

-------------- next part --------------
Modified: branches/speedup_parse_draw/teraterm/teraterm/CMakeLists.txt
===================================================================
--- branches/speedup_parse_draw/teraterm/teraterm/CMakeLists.txt	2019-03-18 14:24:48 UTC (rev 7502)
+++ branches/speedup_parse_draw/teraterm/teraterm/CMakeLists.txt	2019-03-18 14:25:02 UTC (rev 7503)
@@ -98,6 +98,8 @@
   ttwsk.h
   vtdisp.c
   vtdisp.h
+  vtdisp_delay.c
+  vtdisp_delay.h
   vtterm.c
   vtterm.h
   vtwin.cpp

Modified: branches/speedup_parse_draw/teraterm/teraterm/ttermpro.vcproj
===================================================================
--- branches/speedup_parse_draw/teraterm/teraterm/ttermpro.vcproj	2019-03-18 14:24:48 UTC (rev 7502)
+++ branches/speedup_parse_draw/teraterm/teraterm/ttermpro.vcproj	2019-03-18 14:25:02 UTC (rev 7503)
@@ -430,6 +430,10 @@
 				RelativePath="..\common\win16api.h"
 				>
 			</File>
+			<File
+				RelativePath="vtdisp_delay.c"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>

From scmnotify ＠ osdn.net  Fri Mar 22 23:37:45 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Fri, 22 Mar 2019 23:37:45 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc1MDRdIGltbTMyLmxpYuOCkkFkZGl0aW9u?=
 =?utf-8?b?YWxEZXBlbmRlbmNpZXPjgYvjgonliYrpmaQ=?=
Message-ID: <1553265465.772498.44400.nullmailer@users.osdn.me>

Revision: 7504
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7504
Author:   zmatsuo
Date:     2019-03-22 23:37:45 +0900 (Fri, 22 Mar 2019)
Log Message:
-----------
imm32.libをAdditionalDependenciesから削除

Modified Paths:
--------------
    trunk/teraterm/teraterm/ttermpro.v10.vcxproj
    trunk/teraterm/teraterm/ttermpro.v11.vcxproj
    trunk/teraterm/teraterm/ttermpro.v12.vcxproj
    trunk/teraterm/teraterm/ttermpro.v14.vcxproj
    trunk/teraterm/teraterm/ttermpro.v15.vcxproj
    trunk/teraterm/teraterm/ttermpro.v9.vcproj
    trunk/teraterm/teraterm/ttermpro.vcproj

-------------- next part --------------
Modified: trunk/teraterm/teraterm/ttermpro.v10.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v10.vcxproj	2019-03-18 14:25:02 UTC (rev 7503)
+++ trunk/teraterm/teraterm/ttermpro.v10.vcxproj	2019-03-22 14:37:45 UTC (rev 7504)
@@ -79,7 +79,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;imm32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -120,7 +120,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;imm32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

Modified: trunk/teraterm/teraterm/ttermpro.v11.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v11.vcxproj	2019-03-18 14:25:02 UTC (rev 7503)
+++ trunk/teraterm/teraterm/ttermpro.v11.vcxproj	2019-03-22 14:37:45 UTC (rev 7504)
@@ -77,7 +77,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;imm32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -117,7 +117,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;imm32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

Modified: trunk/teraterm/teraterm/ttermpro.v12.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v12.vcxproj	2019-03-18 14:25:02 UTC (rev 7503)
+++ trunk/teraterm/teraterm/ttermpro.v12.vcxproj	2019-03-22 14:37:45 UTC (rev 7504)
@@ -77,7 +77,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;ws2_32.lib;imm32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -118,7 +118,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>nafxcw.lib;LIBCMT.lib;ws2_32.lib;imm32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>nafxcw.lib;LIBCMT.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

Modified: trunk/teraterm/teraterm/ttermpro.v14.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v14.vcxproj	2019-03-18 14:25:02 UTC (rev 7503)
+++ trunk/teraterm/teraterm/ttermpro.v14.vcxproj	2019-03-22 14:37:45 UTC (rev 7504)
@@ -79,7 +79,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;ws2_32.lib;imm32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -120,7 +120,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>nafxcw.lib;LIBCMT.lib;ws2_32.lib;imm32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>nafxcw.lib;LIBCMT.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

Modified: trunk/teraterm/teraterm/ttermpro.v15.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v15.vcxproj	2019-03-18 14:25:02 UTC (rev 7503)
+++ trunk/teraterm/teraterm/ttermpro.v15.vcxproj	2019-03-22 14:37:45 UTC (rev 7504)
@@ -81,7 +81,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;ws2_32.lib;imm32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -123,7 +123,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>nafxcw.lib;LIBCMT.lib;ws2_32.lib;imm32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>nafxcw.lib;LIBCMT.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -261,4 +261,4 @@
       <UserProperties RESOURCE_FILE="ttermpro.rc" />
     </VisualStudio>
   </ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>

Modified: trunk/teraterm/teraterm/ttermpro.v9.vcproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v9.vcproj	2019-03-18 14:25:02 UTC (rev 7503)
+++ trunk/teraterm/teraterm/ttermpro.v9.vcproj	2019-03-22 14:37:45 UTC (rev 7504)
@@ -72,7 +72,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib imm32.lib imagehlp.lib"
+				AdditionalDependencies="ws2_32.lib imagehlp.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(OutDir)"
@@ -164,7 +164,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib imm32.lib imagehlp.lib"
+				AdditionalDependencies="ws2_32.lib imagehlp.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(OutDir)"

Modified: trunk/teraterm/teraterm/ttermpro.vcproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.vcproj	2019-03-18 14:25:02 UTC (rev 7503)
+++ trunk/teraterm/teraterm/ttermpro.vcproj	2019-03-22 14:37:45 UTC (rev 7504)
@@ -71,7 +71,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib imm32.lib imagehlp.lib"
+				AdditionalDependencies="ws2_32.lib imagehlp.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(OutDir)"
@@ -164,7 +164,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib imm32.lib imagehlp.lib"
+				AdditionalDependencies="ws2_32.lib imagehlp.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(OutDir)"

From scmnotify ＠ osdn.net  Fri Mar 22 23:38:00 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Fri, 22 Mar 2019 23:38:00 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc1MDVdIHZjW3hdcHJvauODleOCoeOCpA==?=
 =?utf-8?b?44Or5L+d5a6I?=
Message-ID: <1553265480.266616.44507.nullmailer@users.osdn.me>

Revision: 7505
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7505
Author:   zmatsuo
Date:     2019-03-22 23:38:00 +0900 (Fri, 22 Mar 2019)
Log Message:
-----------
vc[x]projファイル保守

Modified Paths:
--------------
    trunk/teraterm/svnrev/svnrev.v15.vcxproj
    trunk/teraterm/teraterm/ttermpro.v10.vcxproj
    trunk/teraterm/teraterm/ttermpro.v11.vcxproj
    trunk/teraterm/teraterm/ttermpro.v12.vcxproj
    trunk/teraterm/teraterm/ttermpro.v14.vcxproj
    trunk/teraterm/teraterm/ttermpro.v15.vcxproj
    trunk/teraterm/teraterm/ttermpro.v9.vcproj

-------------- next part --------------
Modified: trunk/teraterm/svnrev/svnrev.v15.vcxproj
===================================================================
--- trunk/teraterm/svnrev/svnrev.v15.vcxproj	2019-03-22 14:37:45 UTC (rev 7504)
+++ trunk/teraterm/svnrev/svnrev.v15.vcxproj	2019-03-22 14:38:00 UTC (rev 7505)
@@ -15,7 +15,6 @@
     <RootNamespace>svnrev</RootNamespace>
     <Keyword>Win32Proj</Keyword>
     <ProjectName>svnrev</ProjectName>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

Modified: trunk/teraterm/teraterm/ttermpro.v10.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v10.vcxproj	2019-03-22 14:37:45 UTC (rev 7504)
+++ trunk/teraterm/teraterm/ttermpro.v10.vcxproj	2019-03-22 14:38:00 UTC (rev 7505)
@@ -133,31 +133,33 @@
     </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="addsetting.cpp" />
-    <ClCompile Include="..\common\win16api.c" />
     <ClCompile Include="..\common\dlglib.c" />
-    <ClCompile Include="filesys.cpp" />
-    <ClCompile Include="ftdlg.cpp" />
-    <ClCompile Include="prnabort.cpp" />
-    <ClCompile Include="protodlg.cpp" />
     <ClCompile Include="..\common\stdafx.cpp" />
-    <ClCompile Include="tekwin.cpp" />
-    <ClCompile Include="teraprn.cpp" />
-    <ClCompile Include="teraterm.cpp" />
-    <ClCompile Include="vtwin.cpp" />
+    <ClCompile Include="..\common\ttlib.c" />
+    <ClCompile Include="..\common\win16api.c" />
+    <ClCompile Include="..\common\codeconv.cpp" />
+    <ClCompile Include="..\common\dllutil.cpp" />
+    <ClCompile Include="..\common\compat_win.cpp" />
+    <ClCompile Include="addsetting.cpp" />
     <ClCompile Include="buffer.c" />
     <ClCompile Include="clipboar.c" />
     <ClCompile Include="commlib.c" />
     <ClCompile Include="dnddlg.cpp" />
+    <ClCompile Include="filesys.cpp" />
+    <ClCompile Include="ftdlg.cpp" />
     <ClCompile Include="keyboard.c" />
     <ClCompile Include="sizetip.c" />
+    <ClCompile Include="prnabort.cpp" />
+    <ClCompile Include="protodlg.cpp" />
     <ClCompile Include="teklib.c" />
+    <ClCompile Include="tekwin.cpp" />
     <ClCompile Include="telnet.c" />
+    <ClCompile Include="teraprn.cpp" />
+    <ClCompile Include="teraterm.cpp" />
     <ClCompile Include="ttdde.c" />
     <ClCompile Include="ttdialog.c" />
     <ClCompile Include="ttfileio.c" />
     <ClCompile Include="ttime.c" />
-    <ClCompile Include="..\common\ttlib.c" />
     <ClCompile Include="ttplug.c" />
     <ClCompile Include="ttsetup.c" />
     <ClCompile Include="ttwinman.c" />
@@ -164,6 +166,7 @@
     <ClCompile Include="ttwsk.c" />
     <ClCompile Include="vtdisp.c" />
     <ClCompile Include="vtterm.c" />
+    <ClCompile Include="vtwin.cpp" />
     <ClCompile Include="winjump.c" />
     <ClCompile Include="WSAAsyncGetAddrInfo.c" />
   </ItemGroup>

Modified: trunk/teraterm/teraterm/ttermpro.v11.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v11.vcxproj	2019-03-22 14:37:45 UTC (rev 7504)
+++ trunk/teraterm/teraterm/ttermpro.v11.vcxproj	2019-03-22 14:38:00 UTC (rev 7505)
@@ -130,31 +130,33 @@
     </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="addsetting.cpp" />
-    <ClCompile Include="..\common\win16api.c" />
     <ClCompile Include="..\common\dlglib.c" />
-    <ClCompile Include="filesys.cpp" />
-    <ClCompile Include="ftdlg.cpp" />
-    <ClCompile Include="prnabort.cpp" />
-    <ClCompile Include="protodlg.cpp" />
     <ClCompile Include="..\common\stdafx.cpp" />
-    <ClCompile Include="tekwin.cpp" />
-    <ClCompile Include="teraprn.cpp" />
-    <ClCompile Include="teraterm.cpp" />
-    <ClCompile Include="vtwin.cpp" />
+    <ClCompile Include="..\common\ttlib.c" />
+    <ClCompile Include="..\common\win16api.c" />
+    <ClCompile Include="..\common\codeconv.cpp" />
+    <ClCompile Include="..\common\dllutil.cpp" />
+    <ClCompile Include="..\common\compat_win.cpp" />
+    <ClCompile Include="addsetting.cpp" />
     <ClCompile Include="buffer.c" />
     <ClCompile Include="clipboar.c" />
     <ClCompile Include="commlib.c" />
     <ClCompile Include="dnddlg.cpp" />
+    <ClCompile Include="filesys.cpp" />
+    <ClCompile Include="ftdlg.cpp" />
     <ClCompile Include="keyboard.c" />
     <ClCompile Include="sizetip.c" />
+    <ClCompile Include="prnabort.cpp" />
+    <ClCompile Include="protodlg.cpp" />
     <ClCompile Include="teklib.c" />
+    <ClCompile Include="tekwin.cpp" />
     <ClCompile Include="telnet.c" />
+    <ClCompile Include="teraprn.cpp" />
+    <ClCompile Include="teraterm.cpp" />
     <ClCompile Include="ttdde.c" />
     <ClCompile Include="ttdialog.c" />
     <ClCompile Include="ttfileio.c" />
     <ClCompile Include="ttime.c" />
-    <ClCompile Include="..\common\ttlib.c" />
     <ClCompile Include="ttplug.c" />
     <ClCompile Include="ttsetup.c" />
     <ClCompile Include="ttwinman.c" />
@@ -161,6 +163,7 @@
     <ClCompile Include="ttwsk.c" />
     <ClCompile Include="vtdisp.c" />
     <ClCompile Include="vtterm.c" />
+    <ClCompile Include="vtwin.cpp" />
     <ClCompile Include="winjump.c" />
     <ClCompile Include="WSAAsyncGetAddrInfo.c" />
   </ItemGroup>

Modified: trunk/teraterm/teraterm/ttermpro.v12.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v12.vcxproj	2019-03-22 14:37:45 UTC (rev 7504)
+++ trunk/teraterm/teraterm/ttermpro.v12.vcxproj	2019-03-22 14:38:00 UTC (rev 7505)
@@ -136,6 +136,9 @@
     <ClCompile Include="..\common\stdafx.cpp" />
     <ClCompile Include="..\common\ttlib.c" />
     <ClCompile Include="..\common\win16api.c" />
+    <ClCompile Include="..\common\codeconv.cpp" />
+    <ClCompile Include="..\common\dllutil.cpp" />
+    <ClCompile Include="..\common\compat_win.cpp" />
     <ClCompile Include="addsetting.cpp" />
     <ClCompile Include="buffer.c" />
     <ClCompile Include="clipboar.c" />

Modified: trunk/teraterm/teraterm/ttermpro.v14.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v14.vcxproj	2019-03-22 14:37:45 UTC (rev 7504)
+++ trunk/teraterm/teraterm/ttermpro.v14.vcxproj	2019-03-22 14:38:00 UTC (rev 7505)
@@ -138,6 +138,9 @@
     <ClCompile Include="..\common\stdafx.cpp" />
     <ClCompile Include="..\common\ttlib.c" />
     <ClCompile Include="..\common\win16api.c" />
+    <ClCompile Include="..\common\codeconv.cpp" />
+    <ClCompile Include="..\common\dllutil.cpp" />
+    <ClCompile Include="..\common\compat_win.cpp" />
     <ClCompile Include="addsetting.cpp" />
     <ClCompile Include="buffer.c" />
     <ClCompile Include="clipboar.c" />

Modified: trunk/teraterm/teraterm/ttermpro.v15.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v15.vcxproj	2019-03-22 14:37:45 UTC (rev 7504)
+++ trunk/teraterm/teraterm/ttermpro.v15.vcxproj	2019-03-22 14:38:00 UTC (rev 7505)
@@ -15,7 +15,6 @@
     <RootNamespace>ttermpro</RootNamespace>
     <Keyword>MFCProj</Keyword>
     <ProjectName>ttermpro</ProjectName>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -141,6 +140,9 @@
     <ClCompile Include="..\common\stdafx.cpp" />
     <ClCompile Include="..\common\ttlib.c" />
     <ClCompile Include="..\common\win16api.c" />
+    <ClCompile Include="..\common\codeconv.cpp" />
+    <ClCompile Include="..\common\dllutil.cpp" />
+    <ClCompile Include="..\common\compat_win.cpp" />
     <ClCompile Include="addsetting.cpp" />
     <ClCompile Include="buffer.c" />
     <ClCompile Include="clipboar.c" />

Modified: trunk/teraterm/teraterm/ttermpro.v9.vcproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v9.vcproj	2019-03-22 14:37:45 UTC (rev 7504)
+++ trunk/teraterm/teraterm/ttermpro.v9.vcproj	2019-03-22 14:38:00 UTC (rev 7505)
@@ -388,6 +388,18 @@
 				RelativePath="..\common\win16api.c"
 				>
 			</File>
+			<File
+				RelativePath="..\common\compat_win.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\common\dllutil.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\common\codeconv.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"

From scmnotify ＠ osdn.net  Fri Mar 22 23:38:12 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Fri, 22 Mar 2019 23:38:12 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc1MDZdIGltbTMyLmRsbOOBjOOBquOBhA==?=
 =?utf-8?b?5aC05ZCI44KS6ICD5oWu?=
Message-ID: <1553265492.474585.48639.nullmailer@users.osdn.me>

Revision: 7506
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7506
Author:   zmatsuo
Date:     2019-03-22 23:38:12 +0900 (Fri, 22 Mar 2019)
Log Message:
-----------
imm32.dllがない場合を考慮

Modified Paths:
--------------
    trunk/teraterm/teraterm/ttime.c

-------------- next part --------------
Modified: trunk/teraterm/teraterm/ttime.c
===================================================================
--- trunk/teraterm/teraterm/ttime.c	2019-03-22 14:38:00 UTC (rev 7505)
+++ trunk/teraterm/teraterm/ttime.c	2019-03-22 14:38:12 UTC (rev 7506)
@@ -500,6 +500,7 @@
 	HWND hWnd, const char *str_ptr, size_t str_count,
 	size_t cx, size_t *st_size_)
 {
+	if (HIMEDLL != NULL) return NULL;
 	assert(IsWindowUnicode(hWnd) == FALSE);
 	return CreateReconvStringSt(hWnd, FALSE, str_ptr, str_count, cx, st_size_);
 }
@@ -519,6 +520,7 @@
 	HWND hWnd, const wchar_t *str_ptr, size_t str_count,
 	size_t cx, size_t *st_size_)
 {
+	if (HIMEDLL == NULL) return NULL;
 	assert(IsWindowUnicode(hWnd) == TRUE);
 	return CreateReconvStringSt(hWnd, TRUE, str_ptr, str_count, cx, st_size_);
 }

From scmnotify ＠ osdn.net  Sat Mar 23 02:19:15 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sat, 23 Mar 2019 02:19:15 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B7507=5D_teraterm/common/tipwin=2Ecpp?=
 =?utf-8?b?LGgg44KS6L+95Yqg?=
Message-ID: <1553275155.919292.36115.nullmailer@users.osdn.me>

Revision: 7507
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7507
Author:   zmatsuo
Date:     2019-03-23 02:19:15 +0900 (Sat, 23 Mar 2019)
Log Message:
-----------
teraterm/common/tipwin.cpp,h を追加
 teraterm/teraterm/sizetip.c から分離
ttssh2/ttxssh/auth.c
 passphraseに制御コードを入力すると tooltip が出るようにした
 特に CTRL+V のときは特に SHIFT+Insert を案内するようにした(未i18n化)
 [From Clipboard]ボタンを追加した

Modified Paths:
--------------
    trunk/teraterm/teraterm/CMakeLists.txt
    trunk/teraterm/teraterm/sizetip.c
    trunk/teraterm/teraterm/ttermpro.vcproj
    trunk/ttssh2/ttxssh/CMakeLists.txt
    trunk/ttssh2/ttxssh/auth.c
    trunk/ttssh2/ttxssh/resource.h
    trunk/ttssh2/ttxssh/ttxssh.rc
    trunk/ttssh2/ttxssh/ttxssh.vcproj

Added Paths:
-----------
    trunk/teraterm/common/tipwin.cpp
    trunk/teraterm/common/tipwin.h

-------------- next part --------------
Added: trunk/teraterm/common/tipwin.cpp
===================================================================
--- trunk/teraterm/common/tipwin.cpp	                        (rev 0)
+++ trunk/teraterm/common/tipwin.cpp	2019-03-22 17:19:15 UTC (rev 7507)
@@ -0,0 +1,289 @@
+// Import from PuTTY 0.60 windows/sizetip.c
+/*
+ * PuTTY is copyright 1997-2004 Simon Tatham.
+ *
+ * Portions copyright Robert de Bath, Joris van Rantwijk, Delian
+ * Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,
+ * Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus
+ * Kuhn, Colin Watson, Christopher Staite, and CORE SDI S.A.
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE
+ * FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/*
+ * Copyright (C) 2008-2018 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/* based on windows/sizetip.c from PuTTY 0.60 */
+
+#include <windows.h>
+#include <stdio.h>
+#include <tchar.h>
+#include <commctrl.h>	// for CCSIZEOF_STRUCT()
+#include <assert.h>
+
+#include "TipWin.h"
+
+#define	FRAME_WIDTH	6
+
+static ATOM tip_class = 0;
+
+typedef struct tagTipWinData {
+	HFONT tip_font;
+	COLORREF tip_bg;
+	COLORREF tip_text;
+	HWND tip_wnd;
+	HWND hParentWnd;
+	int tip_enabled;
+	const TCHAR *str;
+	size_t str_len;
+	RECT str_rect;
+	RECT rect;
+	int px;
+	int py;
+	BOOL auto_destroy;
+} TipWin;
+
+static void CalcStrRect(TipWin *pTipWin)
+{
+	HDC hdc = CreateCompatibleDC(NULL);
+	SelectObject(hdc, pTipWin->tip_font);
+	pTipWin->str_rect.top = 0;
+	pTipWin->str_rect.left = 0;
+	DrawText(hdc, pTipWin->str, pTipWin->str_len,
+			 &pTipWin->str_rect, DT_LEFT|DT_CALCRECT);
+	DeleteDC(hdc);
+}
+
+static LRESULT CALLBACK SizeTipWndProc(HWND hWnd, UINT nMsg,
+                                       WPARAM wParam, LPARAM lParam)
+{
+	TipWin *pTipWin = (TipWin *)GetWindowLongPtr(hWnd, GWLP_USERDATA);
+
+	switch (nMsg) {
+		case WM_CREATE: {
+			CREATESTRUCTA *create_st = (CREATESTRUCTA *)lParam;
+			pTipWin = (TipWin *)create_st->lpCreateParams;
+			SetWindowLongPtr(hWnd, GWLP_USERDATA, (LONG_PTR)pTipWin);
+			pTipWin->tip_wnd = hWnd;
+			break;
+		}
+
+		case WM_ERASEBKGND:
+			return TRUE;
+
+		case WM_PAINT:
+			{
+				HBRUSH hbr;
+				HGDIOBJ holdbr;
+				RECT cr;
+				HDC hdc;
+
+				PAINTSTRUCT ps;
+				hdc = BeginPaint(hWnd, &ps);
+
+				SelectObject(hdc, pTipWin->tip_font);
+				SelectObject(hdc, GetStockObject(BLACK_PEN));
+
+				hbr = CreateSolidBrush(pTipWin->tip_bg);
+				holdbr = SelectObject(hdc, hbr);
+
+				GetClientRect(hWnd, &cr);
+				Rectangle(hdc, cr.left, cr.top, cr.right, cr.bottom);
+
+				SetTextColor(hdc, pTipWin->tip_text);
+				SetBkColor(hdc, pTipWin->tip_bg);
+
+				{
+					RECT rect = pTipWin->str_rect;
+					rect.left = rect.left + FRAME_WIDTH;
+					rect.right = rect.right + FRAME_WIDTH;
+					rect.top = rect.top + FRAME_WIDTH;
+					rect.bottom = rect.bottom + FRAME_WIDTH;
+					DrawText(hdc, pTipWin->str, pTipWin->str_len, &rect, DT_LEFT);
+				}
+
+				SelectObject(hdc, holdbr);
+				DeleteObject(hbr);
+
+				EndPaint(hWnd, &ps);
+			}
+			return 0;
+
+		case WM_NCHITTEST:
+			return HTTRANSPARENT;
+
+		case WM_DESTROY:
+			DeleteObject(pTipWin->tip_font);
+			pTipWin->tip_font = NULL;
+			break;
+
+		case WM_SETTEXT:
+			{
+				LPCTSTR str = (LPCTSTR) lParam;
+				const int str_width = pTipWin->str_rect.right - pTipWin->str_rect.left;
+				const int str_height = pTipWin->str_rect.bottom - pTipWin->str_rect.top;
+
+				free((void *)(pTipWin->str));
+				pTipWin->str_len = _tcslen(str);
+				pTipWin->str = _tcsdup(str);
+				CalcStrRect(pTipWin);
+
+				SetWindowPos(hWnd, NULL,
+							 0, 0,
+							 str_width + FRAME_WIDTH * 2, str_height + FRAME_WIDTH * 2,
+				             SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE);
+				InvalidateRect(hWnd, NULL, FALSE);
+
+			}
+			break;
+
+		case WM_NCDESTROY:
+			if (pTipWin->auto_destroy) {
+				free((void *)pTipWin->str);
+				free(pTipWin);
+			}
+			break;
+		default:
+			break;
+	}
+
+	return DefWindowProc(hWnd, nMsg, wParam, lParam);
+}
+
+// todo: dlglib.c\x82ɓ\xAF\x93\x99\x82ȃR\x81[\x83h\x82\xA0\x82\xE8
+void GetMessageboxFont(LOGFONT *logfont)
+{
+	NONCLIENTMETRICS nci;
+	const int st_size = CCSIZEOF_STRUCT(NONCLIENTMETRICS, lfMessageFont);
+	BOOL r;
+
+	memset(&nci, 0, sizeof(nci));
+	nci.cbSize = st_size;
+	r = SystemParametersInfo(SPI_GETNONCLIENTMETRICS, st_size, &nci, 0);
+	assert(r == TRUE);
+	*logfont = nci.lfStatusFont;
+}
+
+static void register_class(HINSTANCE hInst)
+{
+	if (!tip_class) {
+		WNDCLASS wc;
+		wc.style = CS_HREDRAW | CS_VREDRAW;
+		wc.lpfnWndProc = SizeTipWndProc;
+		wc.cbClsExtra = 0;
+		wc.cbWndExtra = 0;
+		wc.hInstance = hInst;
+		wc.hIcon = NULL;
+		wc.hCursor = NULL;
+		wc.hbrBackground = NULL;
+		wc.lpszMenuName = NULL;
+		wc.lpszClassName = _T("SizeTipClass");
+
+		tip_class = RegisterClass(&wc);
+	}
+}
+
+/* Create the tip window */
+static void create_tipwin(TipWin *pTipWin, HINSTANCE hInst, int cx, int cy)
+{
+	const TCHAR *str = pTipWin->str;
+	HWND hParnetWnd = pTipWin->hParentWnd;
+	const int str_width = pTipWin->str_rect.right - pTipWin->str_rect.left;
+	const int str_height = pTipWin->str_rect.bottom - pTipWin->str_rect.top;
+	pTipWin->tip_wnd =
+		CreateWindowEx(WS_EX_TOOLWINDOW | WS_EX_TOPMOST,
+					   MAKEINTRESOURCE(tip_class),
+					   str, WS_POPUP,
+					   cx, cy,
+					   str_width + FRAME_WIDTH * 2, str_height + FRAME_WIDTH * 2,
+					   hParnetWnd, NULL, hInst, pTipWin);
+	assert(pTipWin->tip_wnd != NULL);
+}
+
+TipWin *TipWinCreate(HWND src, int cx, int cy, const TCHAR *str)
+{
+	TipWin *pTipWin;
+	HINSTANCE hInst = (HINSTANCE)GetWindowLongPtr(src, GWLP_HINSTANCE);
+	LOGFONT logfont;
+
+	register_class(hInst);
+	pTipWin = (TipWin *)malloc(sizeof(TipWin));
+	if (pTipWin == NULL) return NULL;
+	pTipWin->str_len = _tcslen(str);
+	pTipWin->str = _tcsdup(str);
+	pTipWin->px = cx;
+	pTipWin->py = cy;
+	pTipWin->tip_bg = GetSysColor(COLOR_INFOBK);
+	pTipWin->tip_text = GetSysColor(COLOR_INFOTEXT);
+	GetMessageboxFont(&logfont);
+	pTipWin->tip_font = CreateFontIndirect(&logfont);
+	CalcStrRect(pTipWin);
+	pTipWin->hParentWnd = src;
+	create_tipwin(pTipWin, hInst, cx, cy);
+
+	pTipWin->hParentWnd = src;
+	pTipWin->auto_destroy = TRUE;
+	ShowWindow(pTipWin->tip_wnd, SW_SHOWNOACTIVATE);
+	return pTipWin;
+}
+
+void TipWinSetPos(int x, int y)
+{
+}
+
+void TipWinSetText(TipWin *tWin, TCHAR *text)
+{
+	if (tWin != NULL) {
+		HWND tip_wnd = tWin->tip_wnd;
+		SetWindowText(tip_wnd, text);
+	}
+}
+
+void TipWinDestroy(TipWin *tWin)
+{
+	if (tWin != NULL) {
+		HWND tip_wnd = tWin->tip_wnd;
+		DestroyWindow(tip_wnd);
+	}
+}
+

Added: trunk/teraterm/common/tipwin.h
===================================================================
--- trunk/teraterm/common/tipwin.h	                        (rev 0)
+++ trunk/teraterm/common/tipwin.h	2019-03-22 17:19:15 UTC (rev 7507)
@@ -0,0 +1,17 @@
+
+#include <windows.h>
+#include <tchar.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct tagTipWinData TipWin;
+
+TipWin *TipWinCreate(HWND src, int cx, int cy, const TCHAR *str);
+void TipWinSetText(TipWin *tWin, TCHAR *text);
+void TipWinDestroy(TipWin *tWin);
+
+#ifdef __cplusplus
+}
+#endif

Modified: trunk/teraterm/teraterm/CMakeLists.txt
===================================================================
--- trunk/teraterm/teraterm/CMakeLists.txt	2019-03-22 14:38:12 UTC (rev 7506)
+++ trunk/teraterm/teraterm/CMakeLists.txt	2019-03-22 17:19:15 UTC (rev 7507)
@@ -33,6 +33,8 @@
   ../common/dllutil.h
   ../common/codeconv.h
   ../common/codeconv.cpp
+  ../common/tipwin.h
+  ../common/tipwin.cpp
   #
   ../teraterm/unisym2decsp.map
   ../teraterm/uni2sjis.map

Modified: trunk/teraterm/teraterm/sizetip.c
===================================================================
--- trunk/teraterm/teraterm/sizetip.c	2019-03-22 14:38:12 UTC (rev 7506)
+++ trunk/teraterm/teraterm/sizetip.c	2019-03-22 17:19:15 UTC (rev 7507)
@@ -1,33 +1,5 @@
-// Import from PuTTY 0.60 windows/sizetip.c
-/*
- * PuTTY is copyright 1997-2004 Simon Tatham.
- *
- * Portions copyright Robert de Bath, Joris van Rantwijk, Delian
- * Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,
- * Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus
- * Kuhn, Colin Watson, Christopher Staite, and CORE SDI S.A.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE
- * FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-/*
- * Copyright (C) 2008-2018 TeraTerm Project
+/*
+ * Copyright (C) 2008-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -53,6 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+/* original idea from PuTTY 0.60 windows/sizetip.c */
 
 #include "teraterm.h"
 #include "tttypes.h"
@@ -61,91 +34,58 @@
 
 #include <windows.h>
 #include <stdio.h>
+#include <tchar.h>
 
-//
-// \x83\x8A\x83T\x83C\x83Y\x83c\x81[\x83\x8B\x83`\x83b\x83v (based on PuTTY sizetip.c)
-//
-static ATOM tip_class = 0;
-static HFONT tip_font;
-static COLORREF tip_bg;
-static COLORREF tip_text;
-static HWND tip_wnd = NULL;
+#include "TipWin.h"
+
+static TipWin *SizeTip;
 static int tip_enabled = 0;
 
-static LRESULT CALLBACK SizeTipWndProc(HWND hWnd, UINT nMsg,
-                                       WPARAM wParam, LPARAM lParam)
+/**
+ *	point を
+ *	スクリーンからはみ出している場合、入るように補正する
+ *	NearestMonitor が TRUE のとき、最も近いモニタ
+ *	FALSEのとき、マウスのあるモニタに移動させる
+ *	ディスプレイの端から FrameWidth(pixel) より離れるようにする
+ */
+static void FixPosFromFrame(POINT *point, int FrameWidth, BOOL NearestMonitor)
 {
+	if (HasMultiMonitorSupport()) {
+		// マルチモニタがサポートされている場合
+		HMONITOR hm;
+		MONITORINFO mi;
 
-	switch (nMsg) {
-		case WM_ERASEBKGND:
-			return TRUE;
-
-		case WM_PAINT:
-			{
-				HBRUSH hbr;
-				HGDIOBJ holdbr;
-				RECT cr;
-				int wtlen;
-				LPTSTR wt;
-				HDC hdc;
-
-				PAINTSTRUCT ps;
-				hdc = BeginPaint(hWnd, &ps);
-
-				SelectObject(hdc, tip_font);
-				SelectObject(hdc, GetStockObject(BLACK_PEN));
-
-				hbr = CreateSolidBrush(tip_bg);
-				holdbr = SelectObject(hdc, hbr);
-
-				GetClientRect(hWnd, &cr);
-				Rectangle(hdc, cr.left, cr.top, cr.right, cr.bottom);
-
-				wtlen = GetWindowTextLength(hWnd);
-				wt = (LPTSTR) malloc((wtlen + 1) * sizeof(TCHAR));
-				GetWindowText(hWnd, wt, wtlen + 1);
-
-				SetTextColor(hdc, tip_text);
-				SetBkColor(hdc, tip_bg);
-
-				TextOut(hdc, cr.left + 3, cr.top + 3, wt, wtlen);
-
-				free(wt);
-
-				SelectObject(hdc, holdbr);
-				DeleteObject(hbr);
-
-				EndPaint(hWnd, &ps);
+		hm = MonitorFromPoint(*point, MONITOR_DEFAULTTONULL);
+		if (hm == NULL) {
+			if (NearestMonitor) {
+				// 最も近いモニタに表示する
+				hm = MonitorFromPoint(*point, MONITOR_DEFAULTTONEAREST);
+			} else {
+				// スクリーンからはみ出している場合はマウスのあるモニタに表示する
+				GetCursorPos(point);
+				hm = MonitorFromPoint(*point, MONITOR_DEFAULTTONEAREST);
 			}
-			return 0;
+		}
 
-		case WM_NCHITTEST:
-			return HTTRANSPARENT;
-
-		case WM_DESTROY:
-			DeleteObject(tip_font);
-			tip_font = NULL;
-			break;
-
-		case WM_SETTEXT:
-			{
-				LPCTSTR str = (LPCTSTR) lParam;
-				SIZE sz;
-				HDC hdc = CreateCompatibleDC(NULL);
-
-				SelectObject(hdc, tip_font);
-				GetTextExtentPoint32(hdc, str, strlen(str), &sz);
-
-				SetWindowPos(hWnd, NULL, 0, 0, sz.cx + 6, sz.cy + 6,
-				             SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE);
-				InvalidateRect(hWnd, NULL, FALSE);
-
-				DeleteDC(hdc);
-			}
-			break;
+		mi.cbSize = sizeof(MONITORINFO);
+		GetMonitorInfo(hm, &mi);
+		if (point->x < mi.rcMonitor.left + FrameWidth) {
+			point->x = mi.rcMonitor.left + FrameWidth;
+		}
+		if (point->y < mi.rcMonitor.top + FrameWidth) {
+			point->y = mi.rcMonitor.top + FrameWidth;
+		}
 	}
-
-	return DefWindowProc(hWnd, nMsg, wParam, lParam);
+	else
+	{
+		// マルチモニタがサポートされていない場合
+		if (point->x < FrameWidth) {
+			point->x = FrameWidth;
+		}
+		if (point->y < FrameWidth) {
+			point->y = FrameWidth;
+		}
+	}
 }
 
 void UpdateSizeTip(HWND src, int cx, int cy)
@@ -155,130 +95,34 @@
 	if (!tip_enabled)
 		return;
 
-	if (!tip_wnd) {
-		NONCLIENTMETRICS nci;
-
-		/* First make sure the window class is registered */
-
-		if (!tip_class) {
-			WNDCLASS wc;
-			wc.style = CS_HREDRAW | CS_VREDRAW;
-			wc.lpfnWndProc = SizeTipWndProc;
-			wc.cbClsExtra = 0;
-			wc.cbWndExtra = 0;
-			wc.hInstance = hInst;
-			wc.hIcon = NULL;
-			wc.hCursor = NULL;
-			wc.hbrBackground = NULL;
-			wc.lpszMenuName = NULL;
-			wc.lpszClassName = "SizeTipClass";
-
-			tip_class = RegisterClass(&wc);
-		}
-#if 0
-		/* Default values based on Windows Standard color scheme */
-
-		tip_font = GetStockObject(SYSTEM_FONT);
-		tip_bg = RGB(255, 255, 225);
-		tip_text = RGB(0, 0, 0);
-#endif
-
-		/* Prepare other GDI objects and drawing info */
-
-		tip_bg = GetSysColor(COLOR_INFOBK);
-		tip_text = GetSysColor(COLOR_INFOTEXT);
-
-		memset(&nci, 0, sizeof(NONCLIENTMETRICS));
-		nci.cbSize = sizeof(NONCLIENTMETRICS);
-		SystemParametersInfo(SPI_GETNONCLIENTMETRICS,
-			sizeof(NONCLIENTMETRICS), &nci, 0);
-		tip_font = CreateFontIndirect(&nci.lfStatusFont);
-	}
-
 	/* Generate the tip text */
 
-	sprintf(str, "%dx%d", cx, cy);
+	_stprintf_s(str, _countof(str), _T("%dx%d"), cx, cy);
 
-	if (!tip_wnd) {
-		HDC hdc;
-		SIZE sz;
+	if (SizeTip == NULL) {
 		RECT wr;
-		int ix, iy;
-		HMONITOR hm;
-
-		/* calculate the tip's size */
-
-		hdc = CreateCompatibleDC(NULL);
-		GetTextExtentPoint32(hdc, str, strlen(str), &sz);
-		DeleteDC(hdc);
-
+		POINT point;
+		// ウィンドウの位置を取得
 		GetWindowRect(src, &wr);
-
-		ix = wr.left;
-		iy = wr.top - sz.cy;
-
-		if (HasMultiMonitorSupport()) {
-			// \x83}\x83\x8B\x83`\x83\x82\x83j\x83^\x82\xAA\x83T\x83|\x81[\x83g\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x8Fꍇ
-			POINT p;
-			MONITORINFO mi;
-
-			p.x = ix;
-			p.y = iy;
-
-			hm = MonitorFromPoint(p, MONITOR_DEFAULTTONULL);
-
-			if (hm == NULL) {
-#if 1
-				// \x83c\x81[\x83\x8B\x83`\x83b\x83v\x82\xAA\x83X\x83N\x83\x8A\x81[\x83\x93\x82\xA9\x82\xE7\x82͂ݏo\x82\xB5\x82Ă\xA2\x82\xE9\x8Fꍇ\x82̓}\x83E\x83X\x82̂\xA0\x82郂\x83j\x83^\x82ɕ\\x8E\xA6\x82\xB7\x82\xE9
-				GetCursorPos(&p);
-				hm = MonitorFromPoint(p, MONITOR_DEFAULTTONEAREST);
-#else
-				// \x83c\x81[\x83\x8B\x83`\x83b\x83v\x82\xAA\x83X\x83N\x83\x8A\x81[\x83\x93\x82\xA9\x82\xE7\x82͂ݏo\x82\xB5\x82Ă\xA2\x82\xE9\x8Fꍇ\x82͍ł\xE0\x8B߂\xA2\x83\x82\x83j\x83^\x82ɕ\\x8E\xA6\x82\xB7\x82\xE9
-				hm = MonitorFromPoint(p, MONITOR_DEFAULTTONEAREST);
-#endif
-			}
-
-			mi.cbSize = sizeof(MONITORINFO);
-			GetMonitorInfo(hm, &mi);
-			if (ix < mi.rcMonitor.left + 16) {
-				ix = mi.rcMonitor.left + 16;
-			}
-			if (iy < mi.rcMonitor.top + 16) {
-				iy = mi.rcMonitor.top + 16;
-			}
-		}
-		else {
-			// \x83}\x83\x8B\x83`\x83\x82\x83j\x83^\x82\xAA\x83T\x83|\x81[\x83g\x82\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x8Fꍇ
-			if (ix < 16) {
-				ix = 16;
-			}
-			if (iy < 16) {
-				iy = 16;
-			}
-		}
-
-		/* Create the tip window */
-
-		tip_wnd =
-			CreateWindowEx(WS_EX_TOOLWINDOW | WS_EX_TOPMOST,
-				MAKEINTRESOURCE(tip_class), str, WS_POPUP, ix,
-				iy, sz.cx, sz.cy, NULL, NULL, hInst, NULL);
-
-		ShowWindow(tip_wnd, SW_SHOWNOACTIVATE);
-
+		// sizetipを出す位置は、ウィンドウ左上-(8,16)
+		point.x = wr.left - 16;
+		point.y = wr.top - 8;
+		FixPosFromFrame(&point, 16, FALSE);
+		cx = point.x;
+		cy = point.y;
+		SizeTip = TipWinCreate(src, cx, cy, str);
 	} else {
-
 		/* Tip already exists, just set the text */
-
-		SetWindowText(tip_wnd, str);
+		TipWinSetText(SizeTip, str);
+		//SetWindowText(tip_wnd, str);
 	}
 }
 
 void EnableSizeTip(int bEnable)
 {
-	if (tip_wnd && !bEnable) {
-		DestroyWindow(tip_wnd);
-		tip_wnd = NULL;
+	if (SizeTip && !bEnable) {
+		TipWinDestroy(SizeTip);
+		SizeTip = NULL;
 	}
 
 	tip_enabled = bEnable;

Modified: trunk/teraterm/teraterm/ttermpro.vcproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.vcproj	2019-03-22 14:38:12 UTC (rev 7506)
+++ trunk/teraterm/teraterm/ttermpro.vcproj	2019-03-22 17:19:15 UTC (rev 7507)
@@ -401,6 +401,10 @@
 				RelativePath="..\common\codeconv.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\common\tipwin.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"

Modified: trunk/ttssh2/ttxssh/CMakeLists.txt
===================================================================
--- trunk/ttssh2/ttxssh/CMakeLists.txt	2019-03-22 14:38:12 UTC (rev 7506)
+++ trunk/ttssh2/ttxssh/CMakeLists.txt	2019-03-22 17:19:15 UTC (rev 7507)
@@ -18,6 +18,8 @@
   ../../teraterm/common/servicenames.h
   ../../teraterm/common/codeconv.cpp
   ../../teraterm/common/codeconv.h
+  ../../teraterm/common/tipwin.cpp
+  ../../teraterm/common/tipwin.h
   )
 
 source_group(

Modified: trunk/ttssh2/ttxssh/auth.c
===================================================================
--- trunk/ttssh2/ttxssh/auth.c	2019-03-22 14:38:12 UTC (rev 7506)
+++ trunk/ttssh2/ttxssh/auth.c	2019-03-22 17:19:15 UTC (rev 7507)
@@ -41,6 +41,7 @@
 #include "resource.h"
 #include "keyfiles.h"
 #include "libputty.h"
+#include "tipwin.h"
 
 #define AUTH_START_USER_AUTH_ON_ERROR_END 1
 
@@ -64,6 +65,7 @@
 	IDC_SSHUSERHOSTS, IDC_SSHUSETIS, -1,
 	-1, -1, -1, -1, -1, -1, -1, -1, -1, IDC_SSHUSEPAGEANT, -1
 };
+static TipWin *tipwin;
 
 LRESULT CALLBACK password_wnd_proc(HWND control, UINT msg,
                                    WPARAM wParam, LPARAM lParam)
@@ -71,12 +73,39 @@
 	switch (msg) {
 	case WM_CHAR:
 		if ((GetKeyState(VK_CONTROL) & 0x8000) != 0) {
-			char chars[] = { (char) wParam, 0 };
+			TCHAR chars[] = { (TCHAR) wParam, 0 };
 
 			SendMessage(control, EM_REPLACESEL, (WPARAM) TRUE,
-			            (LPARAM) (char *) chars);
+			            (LPARAM) (TCHAR *) chars);
+
+			if (tipwin == NULL) {
+				TCHAR *s;
+				if (wParam == 'V' - 'A' + 1) {
+					s = _T("\x90\xA7\x8C䕶\x8E\x9A\x82\xF0\x93\xFC\x97͂\xB5\x82Ă\xA2\x82܂\xB7")
+						_T("\n")
+						_T("\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82\xA9\x82\xE7\x82̓\\x82\xE8\x95t\x82\xAF\x82̃V\x83\x87\x81[\x83g\x83J\x83b\x83g\x82\xCDCTRL+Insert\x82ł\xB7");
+				} else {
+					s = _T("\x90\xA7\x8C䕶\x8E\x9A\x82\xF0\x93\xFC\x97͂\xB5\x82Ă\xA2\x82܂\xB7");
+				}
+				RECT rect;
+				GetWindowRect(control, &rect);
+				tipwin = TipWinCreate(control, rect.left, rect.bottom, s);
+			}
+
 			return 0;
+		} else {
+			if (tipwin != NULL) {
+				TipWinDestroy(tipwin);
+				tipwin = NULL;
+			}
 		}
+		break;
+	case WM_NCDESTROY:
+		if (tipwin != NULL) {
+			TipWinDestroy(tipwin);
+			tipwin = NULL;
+		}
+		break;
 	}
 
 	return CallWindowProc((WNDPROC) GetWindowLong(control, GWL_USERDATA),
@@ -106,6 +135,7 @@
 
 	EnableWindow(GetDlgItem(dlg, IDC_SSHPASSWORDCAPTION), (!TIS_enabled && !PAGEANT_enabled));
 	EnableWindow(GetDlgItem(dlg, IDC_SSHPASSWORD), (!TIS_enabled && !PAGEANT_enabled));
+	EnableWindow(GetDlgItem(dlg, IDC_FROM_CLIPBOARD), (!TIS_enabled && !PAGEANT_enabled));
 
 	for (i = IDC_CHOOSERSAFILE; i <= IDC_RSAFILENAME; i++) {
 		EnableWindow(GetDlgItem(dlg, i), RSA_enabled);
@@ -286,6 +316,7 @@
 		if (pvar->ssh2_autologin == 1) {
 			EnableWindow(GetDlgItem(dlg, IDC_SSHPASSWORD), FALSE);
 			EnableWindow(GetDlgItem(dlg, IDC_SSHPASSWORDCAPTION), FALSE);
+			EnableWindow(GetDlgItem(dlg, IDC_FROM_CLIPBOARD), FALSE);
 		}
 	}
 
@@ -312,6 +343,7 @@
 	} else if (pvar->ssh2_authmethod == SSH_AUTH_TIS) {
 		CheckRadioButton(dlg, IDC_SSHUSEPASSWORD, MAX_AUTH_CONTROL, IDC_SSHUSETIS);
 		EnableWindow(GetDlgItem(dlg, IDC_SSHPASSWORD), FALSE);
+		EnableWindow(GetDlgItem(dlg, IDC_FROM_CLIPBOARD), FALSE);
 		SetDlgItemText(dlg, IDC_SSHPASSWORD, "");
 
 	// /auth=pageant \x82\xF0\x92lj\xC1
@@ -318,6 +350,7 @@
 	} else if (pvar->ssh2_authmethod == SSH_AUTH_PAGEANT) {
 		CheckRadioButton(dlg, IDC_SSHUSEPASSWORD, MAX_AUTH_CONTROL, IDC_SSHUSEPAGEANT);
 		EnableWindow(GetDlgItem(dlg, IDC_SSHPASSWORD), FALSE);
+		EnableWindow(GetDlgItem(dlg, IDC_FROM_CLIPBOARD), FALSE);
 		SetDlgItemText(dlg, IDC_SSHPASSWORD, "");
 
 	} else {
@@ -676,6 +709,46 @@
 	return TRUE;
 }
 
+/**
+ *	\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82\xA9\x82\xE7ANSI\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x8E擾\x82\xB7\x82\xE9
+ *	\x95\xB6\x8E\x9A\x97񒷂\xAA\x95K\x97v\x82ȂƂ\xAB\x82\xCDstrlen()\x82\xB7\x82邱\x82\xC6
+ *	@param	hWnd
+ *	@param	emtpy	TRUE\x82̂Ƃ\xAB\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82\xF0\x8B\xF3\x82ɂ\xB7\x82\xE9
+ *	@retval	\x95\xB6\x8E\x9A\x97\xF1\x82ւ̃|\x83C\x83\x93\x83^ \x8Eg\x97p\x8C\xE3free()\x82\xB7\x82邱\x82\xC6
+ *			\x95\xB6\x8E\x9A\x82\xAA\x82Ȃ\xA2(\x82܂\xBD\x82̓G\x83\x89\x81[\x8E\x9E)\x82\xCDNULL
+ */
+char *GetClipboardTextA(HWND hWnd, BOOL empty)
+{
+	HGLOBAL hGlobal;
+	const char *lpStr;
+	size_t length;
+	char *pool;
+
+    OpenClipboard(hWnd);
+    hGlobal = (HGLOBAL)GetClipboardData(CF_TEXT);
+    if (hGlobal == NULL) {
+        CloseClipboard();
+		return NULL;
+    }
+    lpStr = (const char *)GlobalLock(hGlobal);
+	length = GlobalSize(hGlobal);
+	if (length == 0) {
+		pool = NULL;
+	} else {
+		pool = (char *)malloc(length + 1);	// +1 for terminator
+		memcpy(pool, lpStr, length);
+		pool[length] = '\0';
+	}
+	GlobalUnlock(hGlobal);
+	if (empty) {
+		EmptyClipboard();
+	}
+	CloseClipboard();
+
+	return pool;
+}
+
+
 BOOL autologin_sent_none;
 static BOOL CALLBACK auth_dlg_proc(HWND dlg, UINT msg, WPARAM wParam,
                                    LPARAM lParam)
@@ -929,6 +1002,17 @@
 			pvar->session_settings.ForwardAgent = IsDlgButtonChecked(dlg, IDC_FORWARD_AGENT);
 			return TRUE;
 
+		case IDC_FROM_CLIPBOARD: {
+			char *clipboard = GetClipboardTextA(dlg, TRUE);
+			if (clipboard != NULL) {
+				SetDlgItemTextA(dlg, IDC_SSHPASSWORD, clipboard);
+				free(clipboard);
+				SendMessage(dlg, WM_NEXTDLGCTL, (WPARAM)GetDlgItem(dlg, IDOK), TRUE);
+				return FALSE;
+			}
+			return TRUE;
+		}
+
 		default:
 			return FALSE;
 		}

Modified: trunk/ttssh2/ttxssh/resource.h
===================================================================
--- trunk/ttssh2/ttxssh/resource.h	2019-03-22 14:38:12 UTC (rev 7506)
+++ trunk/ttssh2/ttxssh/resource.h	2019-03-22 17:19:15 UTC (rev 7507)
@@ -227,14 +227,15 @@
 #define IDC_SSHDYNFROMPORT              1228
 #define IDC_SSHFWDLOCALDYNAMIC_LISTEN   1229
 #define IDC_SSHDYNLISTENADDR            1230
+#define IDC_FROM_CLIPBOARD              1231
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        114
+#define _APS_NEXT_RESOURCE_VALUE        115
 #define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1231
+#define _APS_NEXT_CONTROL_VALUE         1232
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

Modified: trunk/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.rc	2019-03-22 14:38:12 UTC (rev 7506)
+++ trunk/ttssh2/ttxssh/ttxssh.rc	2019-03-22 17:19:15 UTC (rev 7507)
@@ -59,6 +59,7 @@
     EDITTEXT        IDC_SSHUSERNAME,75,29,145,12,ES_AUTOHSCROLL
     RTEXT           "&Passphrase:",IDC_SSHPASSWORDCAPTION,14,48,56,8,0,WS_EX_RIGHT
     EDITTEXT        IDC_SSHPASSWORD,75,46,145,12,ES_PASSWORD | ES_AUTOHSCROLL
+    PUSHBUTTON      "&From Clipboard",IDC_FROM_CLIPBOARD,225,46,60,14
     CONTROL         "Remember password in &memory",IDC_REMEMBER_PASSWORD,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,75,61,132,10
     CONTROL         "F&orward agent",IDC_FORWARD_AGENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,75,74,132,10

Modified: trunk/ttssh2/ttxssh/ttxssh.vcproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.vcproj	2019-03-22 14:38:12 UTC (rev 7506)
+++ trunk/ttssh2/ttxssh/ttxssh.vcproj	2019-03-22 17:19:15 UTC (rev 7507)
@@ -452,6 +452,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\teraterm\common\tipwin.cpp"
+				>
+			</File>
+			<File
 				RelativePath="x11util.c"
 				>
 			</File>

From scmnotify ＠ osdn.net  Sun Mar 24 12:44:59 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sun, 24 Mar 2019 12:44:59 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B7508=5D_Visual_Studio_2005_=E3=81=A7?=
 =?utf-8?b?44OT44Or44OJ44Gn44GN44Gq44GE44Gu44KS5L+u5q2j?=
Message-ID: <1553399099.353883.32653.nullmailer@users.osdn.me>

Revision: 7508
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7508
Author:   maya
Date:     2019-03-24 12:44:58 +0900 (Sun, 24 Mar 2019)
Log Message:
-----------
Visual Studio 2005 でビルドできないのを修正

r7507 で発生

Revision Links:
--------------
    http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7507

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/auth.c

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/auth.c
===================================================================
--- trunk/ttssh2/ttxssh/auth.c	2019-03-22 17:19:15 UTC (rev 7507)
+++ trunk/ttssh2/ttxssh/auth.c	2019-03-24 03:44:58 UTC (rev 7508)
@@ -80,6 +80,7 @@
 
 			if (tipwin == NULL) {
 				TCHAR *s;
+				RECT rect;
 				if (wParam == 'V' - 'A' + 1) {
 					s = _T("\x90\xA7\x8C䕶\x8E\x9A\x82\xF0\x93\xFC\x97͂\xB5\x82Ă\xA2\x82܂\xB7")
 						_T("\n")
@@ -87,7 +88,6 @@
 				} else {
 					s = _T("\x90\xA7\x8C䕶\x8E\x9A\x82\xF0\x93\xFC\x97͂\xB5\x82Ă\xA2\x82܂\xB7");
 				}
-				RECT rect;
 				GetWindowRect(control, &rect);
 				tipwin = TipWinCreate(control, rect.left, rect.bottom, s);
 			}

From scmnotify ＠ osdn.net  Mon Mar 25 22:47:33 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 25 Mar 2019 22:47:33 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc1MDldIOOCr+ODquODg+ODl+ODnOODvA==?=
 =?utf-8?b?44OJ5YaF5a656KGo56S644OA44Kk44Ki44Ot44Kw44KSSGlEUEnljJY=?=
Message-ID: <1553521653.382804.5597.nullmailer@users.osdn.me>

Revision: 7509
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7509
Author:   zmatsuo
Date:     2019-03-25 22:47:32 +0900 (Mon, 25 Mar 2019)
Log Message:
-----------
クリップボード内容表示ダイアログをHiDPI化
dlglib.c,h ANSI/UNICODE対応,IsExistFont(),SetDialogFont()(ダイアログフォントの初期化) 追加
dlglib_cpp.cpp 追加、ダイアログAPIラッパ
dlg_tmpl.cpp 追加、ダイアログテンプレート操作
i18n.c,h ANSI/UNICODE対応,SetI18DlgStrs(),SetI18MenuStrs()追加
ttlib.c,h ANSI/UNICODE対応

Modified Paths:
--------------
    trunk/TTProxy/CMakeLists.txt
    trunk/teraterm/common/dlglib.c
    trunk/teraterm/common/dlglib.h
    trunk/teraterm/common/dllutil.cpp
    trunk/teraterm/common/i18n.c
    trunk/teraterm/common/i18n.h
    trunk/teraterm/common/teraterm.h
    trunk/teraterm/common/ttlib.c
    trunk/teraterm/common/ttlib.h
    trunk/teraterm/teraterm/CMakeLists.txt
    trunk/teraterm/teraterm/clipboar.c
    trunk/teraterm/teraterm/protodlg.cpp
    trunk/teraterm/teraterm/teraterm.cpp
    trunk/teraterm/ttpcmn/CMakeLists.txt
    trunk/teraterm/ttpcmn/language.c
    trunk/teraterm/ttpcmn/ttpcmn.def
    trunk/teraterm/ttpdlg/CMakeLists.txt
    trunk/teraterm/ttpfile/CMakeLists.txt
    trunk/teraterm/ttptek/CMakeLists.txt
    trunk/teraterm/ttptek/tekesc.c
    trunk/teraterm/ttptek/tekesc.h
    trunk/teraterm/ttptek/tttek.c
    trunk/ttpmenu/CMakeLists.txt
    trunk/ttpmenu/ttpmenu.cpp

Added Paths:
-----------
    trunk/teraterm/common/dlglib_cpp.cpp
    trunk/teraterm/common/dlglib_tmpl.cpp
    trunk/teraterm/ttptek/tttek.h

-------------- next part --------------
Modified: trunk/TTProxy/CMakeLists.txt
===================================================================
--- trunk/TTProxy/CMakeLists.txt	2019-03-24 03:44:58 UTC (rev 7508)
+++ trunk/TTProxy/CMakeLists.txt	2019-03-25 13:47:32 UTC (rev 7509)
@@ -19,6 +19,8 @@
   ../teraterm/common/codeconv.cpp
   ../teraterm/common/dlglib.h
   ../teraterm/common/dlglib.c
+  ../teraterm/common/dlglib_cpp.cpp
+  ../teraterm/common/dlglib_tmpl.cpp
   ../teraterm/teraterm/ttdialog.h
   ../teraterm/teraterm/ttfileio.h
   ../teraterm/teraterm/ttsetup.h

Modified: trunk/teraterm/common/dlglib.c
===================================================================
--- trunk/teraterm/common/dlglib.c	2019-03-24 03:44:58 UTC (rev 7508)
+++ trunk/teraterm/common/dlglib.c	2019-03-25 13:47:32 UTC (rev 7509)
@@ -28,11 +28,15 @@
  */
 
 /* Routines for dialog boxes */
+#include "dlglib.h"
+
+#include "i18n.h"
 #include <windows.h>
-#include "dlglib.h"
-#include "i18n.h"		// for MAX_UIMSG
+#include <assert.h>
 #include <stdio.h>
 #include <commctrl.h>
+#include <tchar.h>
+#include "ttlib.h"	// for get_lang_font()
 
 void EnableDlgItem(HWND HDlg, int FirstId, int LastId)
 {
@@ -80,8 +84,8 @@
 	}
 	HControl = GetDlgItem(HDlg, FirstId + R - 1);
 	SendMessage(HControl, BM_SETCHECK, 1, 0);
-	Style = GetClassLong(HControl, GCL_STYLE);
-	SetClassLong(HControl, GCL_STYLE, Style | WS_TABSTOP);
+	Style = GetClassLongPtr(HControl, GCL_STYLE);
+	SetClassLongPtr(HControl, GCL_STYLE, Style | WS_TABSTOP);
 }
 
 void GetRB(HWND HDlg, LPWORD R, int FirstId, int LastId)
@@ -91,7 +95,7 @@
 	*R = 0;
 	for (i = FirstId ; i <= LastId ; i++) {
 		if (SendDlgItemMessage(HDlg, i, BM_GETCHECK, 0, 0) != 0) {
-			*R = i - FirstId + 1;
+			*R = (WORD)(i - FirstId + 1);
 			return;
 		}
 	}
@@ -99,10 +103,10 @@
 
 void SetDlgNum(HWND HDlg, int id_Item, LONG Num)
 {
-	char Temp[16];
+	TCHAR Temp[16];
 
 	/* In Win16, SetDlgItemInt can not be used to display long integer. */
-	_snprintf_s(Temp,sizeof(Temp),_TRUNCATE,"%d",Num);
+	_sntprintf_s(Temp, _countof(Temp), _TRUNCATE, _T("%d"), Num);
 	SetDlgItemText(HDlg,id_Item,Temp);
 }
 
@@ -125,17 +129,17 @@
 	// 20MB\x88ȏ\xE3\x82̃t\x83@\x83C\x83\x8B\x82\xF0\x83A\x83b\x83v\x83\x8D\x81[\x83h\x82\xB5\x82悤\x82Ƃ\xB7\x82\xE9\x82ƁAbuffer overflow\x82\xC5
 	// \x97\x8E\x82\xBF\x82\xE9\x96\xE2\x91\xE8\x82ւ̑Ώ\x88\x81B(2005.3.18 yutaka)
 	// cf. http://sourceforge.jp/tracker/index.php?func=detail&aid=5713&group_id=1412&atid=5333
-	double Num; 
-	char NumStr[10]; 
+	double Num;
+	TCHAR NumStr[10];
 
 	if (b==0) {
-		Num = 100.0; 
+		Num = 100.0;
 	}
 	else {
-		Num = 100.0 * (double)a / (double)b; 
+		Num = 100.0 * (double)a / (double)b;
 	}
-	_snprintf_s(NumStr,sizeof(NumStr),_TRUNCATE,"%3.1f%%",Num); 
-	SetDlgItemText(HDlg, id_Item, NumStr); 
+	_sntprintf_s(NumStr, _countof(NumStr),_TRUNCATE,_T("%3.1f%%"),Num);
+	SetDlgItemText(HDlg, id_Item, NumStr);
 
 	if (id_Progress != 0 && p != NULL && *p >= 0 && (double)*p < Num) {
 		*p = (int)Num;
@@ -147,13 +151,13 @@
 {
 	static int prev_elapsed;
 	int elapsed, rate;
-	char buff[64];
+	TCHAR buff[64];
 
 	elapsed = (GetTickCount() - stime) / 1000;
 
 	if (elapsed == 0) {
 		prev_elapsed = 0;
-		SetDlgItemText(HDlg, id_Item, "0:00");
+		SetDlgItemText(HDlg, id_Item, _T("0:00"));
 		return;
 	}
 
@@ -164,34 +168,49 @@
 
 	rate = bytes / elapsed;
 	if (rate < 1200) {
-		_snprintf_s(buff, sizeof(buff), _TRUNCATE, "%d:%02d (%dBytes/s)", elapsed / 60, elapsed % 60, rate); 
+		_sntprintf_s(buff, _countof(buff), _TRUNCATE, _T("%d:%02d (%dBytes/s)"), elapsed / 60, elapsed % 60, rate);
 	}
 	else if (rate < 1200000) {
-		_snprintf_s(buff, sizeof(buff), _TRUNCATE, "%d:%02d (%d.%02dKB/s)", elapsed / 60, elapsed % 60, rate / 1000, rate / 10 % 100); 
+		_sntprintf_s(buff, _countof(buff), _TRUNCATE, _T("%d:%02d (%d.%02dKB/s)"), elapsed / 60, elapsed % 60, rate / 1000, rate / 10 % 100);
 	}
 	else {
-		_snprintf_s(buff, sizeof(buff), _TRUNCATE, "%d:%02d (%d.%02dMB/s)", elapsed / 60, elapsed % 60, rate / (1000 * 1000), rate / 10000 % 100); 
+		_sntprintf_s(buff, _countof(buff), _TRUNCATE, _T("%d:%02d (%d.%02dMB/s)"), elapsed / 60, elapsed % 60, rate / (1000 * 1000), rate / 10000 % 100);
 	}
 
 	SetDlgItemText(HDlg, id_Item, buff);
 }
 
-void SetDropDownList(HWND HDlg, int Id_Item, const TCHAR **List, int nsel)
+void SetDropDownList(HWND HDlg, int Id_Item, const char *List[], int nsel)
 {
 	int i;
 
 	i = 0;
 	while (List[i] != NULL) {
-		SendDlgItemMessage(HDlg, Id_Item, CB_ADDSTRING,
-		                   0, (LPARAM)List[i]);
+		SendDlgItemMessageA(HDlg, Id_Item, CB_ADDSTRING,
+							0, (LPARAM)List[i]);
 		i++;
 	}
 	SendDlgItemMessage(HDlg, Id_Item, CB_SETCURSEL,nsel-1,0);
 }
 
+#if defined(UNICODE)
+void SetDropDownListW(HWND HDlg, int Id_Item, const wchar_t *List[], int nsel)
+{
+	int i;
+
+	i = 0;
+	while (List[i] != NULL) {
+		SendDlgItemMessageW(HDlg, Id_Item, CB_ADDSTRING,
+							0, (LPARAM)List[i]);
+		i++;
+	}
+	SendDlgItemMessage(HDlg, Id_Item, CB_SETCURSEL,nsel-1,0);
+}
+#endif
+
 LONG GetCurSel(HWND HDlg, int Id_Item)
 {
-	LONG n;
+	LRESULT n;
 
 	n = SendDlgItemMessage(HDlg, Id_Item, CB_GETCURSEL, 0, 0);
 	if (n==CB_ERR) {
@@ -201,7 +220,7 @@
 		n++;
 	}
 
-	return n;
+	return (LONG)n;
 }
 
 typedef struct {
@@ -218,9 +237,11 @@
 static LRESULT CALLBACK HostnameEditProc(HWND dlg, UINT msg,
                                          WPARAM wParam, LPARAM lParam)
 {
-	EditSubclassData *data = (EditSubclassData *)GetWindowLong(dlg, GWLP_USERDATA);
+	EditSubclassData *data = (EditSubclassData *)GetWindowLongPtr(dlg, GWLP_USERDATA);
 	LRESULT Result;
-	int  max, select, len;
+	LRESULT select;
+	LRESULT max;
+	int len;
 	char *str, *orgstr;
 
 	switch (msg) {
@@ -274,7 +295,7 @@
 						max++; // '\0'
 						orgstr = str = (char *)malloc(max);
 						if (str != NULL) {
-							len = GetWindowText(dlg, str, max);
+							len = GetWindowTextA(dlg, str, (int)max);
 							if (select >= 0 && select < len) {
 								if (wParam == 0x44) { // \x83J\x81[\x83\\x83\x8B\x94z\x89\xBA\x82̕\xB6\x8E\x9A\x82݂̂\xF0\x8D폜\x82\xB7\x82\xE9
 									memmove(&str[select], &str[select + 1], len - select - 1);
@@ -295,7 +316,7 @@
 								select = 0;
 							}
 
-							SetWindowText(dlg, str);
+							SetWindowTextA(dlg, str);
 							SendMessage(dlg, EM_SETSEL, select, select);
 							free(orgstr);
 							return 0;
@@ -350,29 +371,154 @@
 		hWndEdit = GetWindow(hWndEdit, GW_CHILD);
 	}
 	data = (EditSubclassData *)malloc(sizeof(EditSubclassData));
-	data->OrigProc = (WNDPROC)GetWindowLong(hWndEdit, GWLP_WNDPROC);
-	data->OrigUser = (LONG_PTR)GetWindowLong(hWndEdit, GWLP_USERDATA);
+	data->OrigProc = (WNDPROC)GetWindowLongPtr(hWndEdit, GWLP_WNDPROC);
+	data->OrigUser = (LONG_PTR)GetWindowLongPtr(hWndEdit, GWLP_USERDATA);
 	data->ComboBox = ComboBox;
-	SetWindowLongPtr(hWndEdit, GWL_WNDPROC, (LONG_PTR)HostnameEditProc);
+	SetWindowLongPtr(hWndEdit, GWLP_WNDPROC, (LONG_PTR)HostnameEditProc);
 	SetWindowLongPtr(hWndEdit, GWLP_USERDATA, (LONG_PTR)data);
 }
 
-void SetDlgTexts(HWND hDlgWnd, const DlgTextInfo *infos, int infoCount, const char *UILanguageFile)
+typedef struct {
+	BOOL found;
+	const char *face;
+	BYTE charset;
+} IsExistFontInfoA;
+
+int CALLBACK IsExistFontSubA(
+	ENUMLOGFONTA* lpelf, NEWTEXTMETRICA* lpntm,
+	int nFontType, LPARAM lParam)
 {
-	int i;
-	for (i = 0 ; i < infoCount; i++) {
-		char *key = infos[i].key;
-		char uimsg[MAX_UIMSG];
-		get_lang_msg(key, uimsg, sizeof(uimsg), "", UILanguageFile);
-		if (uimsg[0] != '\0') {
-			const int nIDDlgItem = infos[i].nIDDlgItem;
-			if (nIDDlgItem == 0) {
-				SetWindowText(hDlgWnd, uimsg);
-			} else {
-				SetDlgItemText(hDlgWnd, nIDDlgItem, uimsg);
+	IsExistFontInfoA *info = (IsExistFontInfoA *)lParam;
+	(void)lpntm;
+	if (nFontType != DEVICE_FONTTYPE &&
+		_stricmp(lpelf->elfLogFont.lfFaceName, info->face) == 0 &&
+		lpelf->elfLogFont.lfCharSet == info->charset)
+	{
+		info->found = TRUE;
+		return 0;
+	}
+	return 1;
+}
+
+/**
+ *	IsExistFont
+ *	\x83t\x83H\x83\x93\x83g\x82\xAA\x91\xB6\x8D݂\xB5\x82Ă\xA2\x82邩\x83`\x83F\x83b\x83N\x82\xB7\x82\xE9
+ *
+ *	@param[in]	face		\x83t\x83H\x83\x93\x83g\x96\xBC(\x83t\x83@\x83C\x83\x8B\x96\xBC\x82ł͂Ȃ\xA2)
+ *	@param[in]	charset		SHIFTJIS_CHARSET\x82Ȃ\xC7
+ *	@param[in]	strict		TRUE	\x83t\x83H\x83\x93\x83g\x83\x8A\x83\x93\x83N\x82͌\x9F\x8D\xF5\x82Ɋ܂߂Ȃ\xA2
+ *							FALSE	\x83t\x83H\x83\x93\x83g\x83\x8A\x83\x93\x83N\x82\xE0\x8C\x9F\x8D\xF5\x82Ɋ܂߂\xE9
+ *	@retval		FALSE		\x83t\x83H\x83\x93\x83g\x82͂\xB5\x82Ȃ\xA2
+ *	@retval		TRUE		\x83t\x83H\x83\x93\x83g\x82͑\xB6\x8D݂\xB7\x82\xE9
+ *
+ *	strict = FALSE\x8E\x9E\x81A\x91\xB6\x8D݂\xB5\x82Ȃ\xA2\x83t\x83H\x83\x93\x83g\x82ł\xE0\x95\\x8E\xA6\x82ł\xAB\x82\xE9\x82Ȃ\xE7TRUE\x82\xAA\x95Ԃ\xE9
+ */
+BOOL IsExistFontA(const char *face, BYTE charset, BOOL strict)
+{
+	HDC hDC = GetDC(NULL);
+	LOGFONTA lf;
+	IsExistFontInfoA info;
+	memset(&lf, 0, sizeof(lf));
+	lf.lfCharSet = !strict ? DEFAULT_CHARSET : charset;
+	// \x81\xAADEFAULT_CHARSET\x82Ƃ\xB7\x82\xE9\x82ƃt\x83H\x83\x93\x83g\x83\x8A\x83\x93\x83N\x82\xE0\x97L\x8C\xF8\x82ɂȂ\xE9\x82悤\x82\xBE
+	lf.lfPitchAndFamily = 0;
+	info.found = FALSE;
+	info.face = face;
+	info.charset = charset;
+	EnumFontFamiliesExA(hDC, &lf, (FONTENUMPROCA)IsExistFontSubA, (LPARAM)&info, 0);
+	ReleaseDC(NULL, hDC);
+	return info.found;
+}
+
+/**
+ *	\x83_\x83C\x83A\x83\x8D\x83O\x83t\x83H\x83\x93\x83g\x82\xF0\x8E擾\x82\xB7\x82\xE9
+ *	\x83G\x83\x89\x81[\x82͔\xAD\x90\xB6\x82\xB5\x82Ȃ\xA2
+ */
+void GetMessageboxFont(LOGFONT *logfont)
+{
+	NONCLIENTMETRICS nci;
+	const int st_size = CCSIZEOF_STRUCT(NONCLIENTMETRICS, lfMessageFont);
+	BOOL r;
+
+	memset(&nci, 0, sizeof(nci));
+	nci.cbSize = st_size;
+	r = SystemParametersInfo(SPI_GETNONCLIENTMETRICS, st_size, &nci, 0);
+	assert(r == TRUE);
+	*logfont = nci.lfStatusFont;
+}
+
+/**
+ *	\x8Eg\x97p\x82\xB7\x82\xE9\x83_\x83C\x83A\x83\x8D\x83O\x83t\x83H\x83\x93\x83g\x82\xF0\x8C\x88\x92肷\x82\xE9
+ */
+void SetDialogFont(const char *SetupFName,
+				   const char *UILanguageFile, const char *Section)
+{
+	// teraterm.ini\x82̎w\x92\xE8
+	if (SetupFName != NULL) {
+		LOGFONTA logfont;
+		BOOL result;
+		result = GetI18nLogfont("Tera Term", "DlgFont", &logfont, 0, SetupFName);
+		if (result == TRUE) {
+			result = IsExistFontA(logfont.lfFaceName, logfont.lfCharSet, TRUE);
+			if (result == TRUE) {
+				TTSetDlgFontA(logfont.lfFaceName, logfont.lfHeight, logfont.lfCharSet);
+				return;
 			}
 		}
 	}
+
+	// .lng\x82̎w\x92\xE8
+	if (UILanguageFile != NULL) {
+		static const char *dlg_font_keys[] = {
+			"DLG_FONT",
+			"DLG_TAHOMA_FONT",
+			"DLG_SYSTEM_FONT",
+		};
+		BOOL result = FALSE;
+		LOGFONTA logfont;
+		size_t i;
+		if (Section != NULL) {
+			for (i = 0; i < _countof(dlg_font_keys); i++) {
+				result = GetI18nLogfont(Section, dlg_font_keys[i], &logfont, 0, UILanguageFile);
+				if (result == FALSE) {
+					continue;
+				}
+				if (logfont.lfFaceName[0] == '\0') {
+					break;
+				}
+				if (IsExistFontA(logfont.lfFaceName, logfont.lfCharSet, TRUE)) {
+					break;
+				}
+			}
+		}
+		if (result == FALSE) {
+			for (i = 0; i < _countof(dlg_font_keys); i++) {
+				result = GetI18nLogfont("Tera Term", dlg_font_keys[i], &logfont, 0, UILanguageFile);
+				if (result == FALSE) {
+					continue;
+				}
+				if (logfont.lfFaceName[0] == '\0') {
+					break;
+				}
+				if (IsExistFontA(logfont.lfFaceName, logfont.lfCharSet, TRUE)) {
+					break;
+				}
+			}
+		}
+		if (result == TRUE) {
+			TTSetDlgFontA(logfont.lfFaceName, logfont.lfHeight, logfont.lfCharSet);
+			return;
+		}
+	}
+
+	// ini,lng\x82Ŏw\x92肳\x82ꂽ\x83t\x83H\x83\x93\x83g\x82\xAA\x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA9\x82\xC1\x82\xBD\x82Ƃ\xAB\x81A
+	// \x95\xB6\x8E\x9A\x89\xBB\x82\xAF\x82Ő\xB3\x82\xB5\x82\xAD\x95\\x8E\xA6\x82\xB3\x82\xEA\x82Ȃ\xA2\x8E\x96\x91ԂƂȂ\xE9
+	// messagebox()\x82̃t\x83H\x83\x93\x83g\x82\xF0\x82Ƃ肠\x82\xA6\x82\xB8\x91I\x91\xF0\x82\xB5\x82Ă\xA8\x82\xAD
+	{
+		LOGFONT logfont;
+		GetMessageboxFont(&logfont);
+		TTSetDlgFont(logfont.lfFaceName, logfont.lfHeight, logfont.lfCharSet);
+	}
 }
 
 HFONT SetDlgFonts(HWND hDlg, const int nIDDlgItems[], int nIDDlgItemCount,

Modified: trunk/teraterm/common/dlglib.h
===================================================================
--- trunk/teraterm/common/dlglib.h	2019-03-24 03:44:58 UTC (rev 7508)
+++ trunk/teraterm/common/dlglib.h	2019-03-25 13:47:32 UTC (rev 7509)
@@ -27,7 +27,12 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* Routines for dialog boxes */
+#pragma once
+
+#include <windows.h>
+#include "i18n.h"
+
+ /* Routines for dialog boxes */
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -40,18 +45,59 @@
 void SetDlgNum(HWND HDlg, int id_Item, LONG Num);
 void SetDlgPercent(HWND HDlg, int id_Item, int id_Progress, LONG a, LONG b, int *prog);
 void SetDlgTime(HWND HDlg, int id_Item, DWORD elapsed, int bytes);
-void SetDropDownList(HWND HDlg, int Id_Item, const TCHAR **List, int nsel);
+void SetDropDownList(HWND HDlg, int Id_Item, const char *List[], int nsel);
+void SetDropDownListW(HWND HDlg, int Id_Item, const wchar_t *List[], int nsel);
 LONG GetCurSel(HWND HDlg, int Id_Item);
 void InitDlgProgress(HWND HDlg, int id_Progress, int *CurProgStat);
 void SetEditboxSubclass(HWND hDlg, int nID, BOOL ComboBox);
-typedef struct {
-	int nIDDlgItem;
-	char *key;
-} DlgTextInfo;
-void SetDlgTexts(HWND hDlgWnd, const DlgTextInfo *infos, int infoCount, const char *UILanguageFile);
+
+#if defined(_UNICODE)
+#define SetDropDownListT(p1, p2, p3, p4)	SetDropDownListW(p1, p2, p3, p4)
+#else
+#define SetDropDownListT(p1, p2, p3, p4)	SetDropDownList(p1, p2, p3, p4)
+#endif
+
+void TTSetDlgFontA(const char *face, int height, int charset);
+void TTSetDlgFontW(const wchar_t *face, int height, int charset);
+const wchar_t *TTGetClassName(const DLGTEMPLATE *DlgTempl);
+DLGTEMPLATE *TTGetDlgTemplate(HINSTANCE hInst, LPCTSTR lpTemplateName);
+DLGTEMPLATE *TTGetNewDlgTemplate(
+	HINSTANCE hInst, const DLGTEMPLATE *src,
+	size_t *PrevTemplSize, size_t *NewTemplSize);
+BOOL TTEndDialog(HWND hDlgWnd, INT_PTR nResult);
+HWND TTCreateDialogIndirectParam(
+	HINSTANCE hInstance,
+	LPCDLGTEMPLATE lpTemplate,
+	HWND hWndParent,
+	DLGPROC lpDialogFunc,
+	LPARAM lParamInit);
+HWND TTCreateDialog(
+	HINSTANCE hInstance,
+	LPCTSTR lpTemplateName,
+	HWND hWndParent,
+	DLGPROC lpDialogFunc);
+INT_PTR TTDialogBoxParam(
+	HINSTANCE hInstance,
+	LPCTSTR lpTemplateName,
+	HWND hWndParent,
+	DLGPROC lpDialogFunc,
+	LPARAM lParamInit);
+INT_PTR TTDialogBox(
+	HINSTANCE hInstance,
+	LPCTSTR lpTemplateName,
+	HWND hWndParent,
+	DLGPROC lpDialogFunc);
+void SetDialogFont(const char *SetupFName, const char *UILanguageFile, const char *Section);
 HFONT SetDlgFonts(HWND hDlg, const int nIDDlgItems[], int nIDDlgItemCount,
 				  const char *UILanguageFile, PCHAR key);
+BOOL IsExistFontA(const char *face, BYTE charset, BOOL strict);
 
+#if defined(_UNICODE)
+#define TTSetDlgFont(p1,p2,p3)	TTSetDlgFontW(p1,p2,p3)
+#else
+#define TTSetDlgFont(p1,p2,p3)	TTSetDlgFontA(p1,p2,p3)
+#endif
+
 #ifdef __cplusplus
 }
 #endif

Added: trunk/teraterm/common/dlglib_cpp.cpp
===================================================================
--- trunk/teraterm/common/dlglib_cpp.cpp	                        (rev 0)
+++ trunk/teraterm/common/dlglib_cpp.cpp	2019-03-25 13:47:32 UTC (rev 7509)
@@ -0,0 +1,242 @@
+/*
+ * (C) 2005-2018 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* Routines for dialog boxes */
+
+#include <windows.h>
+#include "dlglib.h"
+
+// \x83_\x83C\x83A\x83\x8D\x83O\x83\x82\x81[\x83_\x83\x8B\x8F\xF3\x91Ԃ̎\x9E\x81AOnIdle()\x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9
+//#define ENABLE_CALL_IDLE_MODAL	1
+
+extern BOOL CallOnIdle(LONG lCount);
+
+typedef struct {
+	DLGPROC OrigProc;	// Dialog proc
+	LONG_PTR OrigUser;	// DWLP_USER
+	LPARAM ParamInit;
+	int DlgResult;
+	bool EndDialogFlag;
+} TTDialogData;
+
+static TTDialogData *TTDialogTmpData;
+
+#if ENABLE_CALL_IDLE_MODAL
+static int TTDoModal(HWND hDlgWnd)
+{
+	LONG lIdleCount = 0;
+	MSG Msg;
+	TTDialogData *data = (TTDialogData *)GetWindowLongPtr(hDlgWnd, DWLP_USER);
+
+	for (;;)
+	{
+		if (!IsWindow(hDlgWnd)) {
+			// \x83E\x83C\x83\x93\x83h\x83E\x82\xAA\x95‚\xB6\x82\xE7\x82ꂽ
+			return IDCANCEL;
+		}
+#if defined(_DEBUG)
+		if (!IsWindowVisible(hDlgWnd)) {
+			// \x8C\xEB\x82\xC1\x82\xC4EndDialog()\x82\xAA\x8Eg\x82\xED\x82ꂽ? -> TTEndDialog()\x82\xF0\x8Eg\x82\xA4\x82\xB1\x82\xC6
+			::ShowWindow(hDlgWnd, SW_SHOWNORMAL);
+		}
+#endif
+		if (data->EndDialogFlag) {
+			// TTEndDialog()\x82\xAA\x8CĂ΂ꂽ
+			return data->DlgResult;
+		}
+
+		if(!::PeekMessage(&Msg, NULL, NULL, NULL, PM_NOREMOVE))
+		{
+			// \x83\x81\x83b\x83Z\x81[\x83W\x82\xAA\x82Ȃ\xA2
+			// OnIdel() \x82\xF0\x8F\x88\x97\x9D\x82\xB7\x82\xE9
+			if (!CallOnIdle(lIdleCount++)) {
+				// Idle\x8F\x88\x97\x9D\x82\xAA\x82Ȃ\xAD\x82Ȃ\xC1\x82\xBD
+				lIdleCount = 0;
+				Sleep(10);
+			}
+			continue;
+		}
+		else
+		{
+			// \x83\x81\x83b\x83Z\x81[\x83W\x82\xAA\x82\xA0\x82\xE9
+
+			// pump message
+			BOOL quit = !::GetMessage(&Msg, NULL, NULL, NULL);
+			if (quit) {
+				// QM_QUIT
+				PostQuitMessage(0);
+				return IDCANCEL;
+			}
+
+			if (!::IsDialogMessage(hDlgWnd, &Msg)) {
+				// \x83_\x83C\x83A\x83\x8D\x83O\x88ȊO\x82̏\x88\x97\x9D
+				::TranslateMessage(&Msg);
+				::DispatchMessage(&Msg);
+			}
+		}
+	}
+
+	// \x82\xB1\x82\xB1\x82ɂ͗\x88\x82Ȃ\xA2
+	return IDOK;
+}
+#endif
+
+static INT_PTR CALLBACK TTDialogProc(
+	HWND hDlgWnd, UINT msg,
+	WPARAM wParam, LPARAM lParam)
+{
+	TTDialogData *data = (TTDialogData *)GetWindowLongPtr(hDlgWnd, DWLP_USER);
+	if (msg == WM_INITDIALOG) {
+		data = (TTDialogData *)lParam;
+		SetWindowLongPtr(hDlgWnd, DWLP_USER, (LONG_PTR)lParam);
+		lParam = data->ParamInit;
+	}
+
+	if (data == NULL) {
+		// WM_INITDIALOG\x82\xE6\x82\xE8\x82\xE0\x91O\x82͐ݒ肳\x82\xEA\x82Ă\xA2\x82Ȃ\xA2
+		data = TTDialogTmpData;
+	} else {
+		// TTEndDialog()\x82\xAA\x8CĂ΂ꂽ\x82Ƃ\xAB\x81ADWLP_USER \x82\xAA\x8EQ\x8FƂł\xAB\x82Ȃ\xA2
+		TTDialogTmpData = data;
+	}
+
+	SetWindowLongPtr(hDlgWnd, DWLP_DLGPROC, (LONG_PTR)data->OrigProc);
+	SetWindowLongPtr(hDlgWnd, DWLP_USER, (LONG_PTR)data->OrigUser);
+	LRESULT Result = data->OrigProc(hDlgWnd, msg, wParam, lParam);
+	data->OrigProc = (DLGPROC)GetWindowLongPtr(hDlgWnd, DWLP_DLGPROC);
+	data->OrigUser = GetWindowLongPtr(hDlgWnd, DWLP_USER);
+	SetWindowLongPtr(hDlgWnd, DWLP_DLGPROC, (LONG_PTR)TTDialogProc);
+	SetWindowLongPtr(hDlgWnd, DWLP_USER, (LONG_PTR)data);
+
+	if (msg == WM_NCDESTROY) {
+		SetWindowLongPtr(hDlgWnd, DWLP_USER, 0);
+		free(data);
+	}
+
+	return Result;
+}
+
+/**
+ *	EndDialog() \x8C݊\xB7\x8A֐\x94
+ */
+BOOL TTEndDialog(HWND hDlgWnd, INT_PTR nResult)
+{
+#if ENABLE_CALL_IDLE_MODAL
+	TTDialogData *data = TTDialogTmpData;
+	data->DlgResult = nResult;
+	data->EndDialogFlag = true;
+	return TRUE;
+#else
+	return EndDialog(hDlgWnd, nResult);
+#endif
+}
+
+/**
+ *	CreateDialogIndirectParam() \x8C݊\xB7\x8A֐\x94
+ */
+HWND TTCreateDialogIndirectParam(
+	HINSTANCE hInstance,
+	LPCTSTR lpTemplateName,
+	HWND hWndParent,			// \x83I\x81[\x83i\x81[\x83E\x83B\x83\x93\x83h\x83E\x82̃n\x83\x93\x83h\x83\x8B
+	DLGPROC lpDialogFunc,		// \x83_\x83C\x83A\x83\x8D\x83O\x83{\x83b\x83N\x83X\x83v\x83\x8D\x83V\x81[\x83W\x83\x83\x82ւ̃|\x83C\x83\x93\x83^
+	LPARAM lParamInit)			// \x8F\x89\x8A\xFA\x89\xBB\x92l
+{
+	TTDialogData *data = (TTDialogData *)malloc(sizeof(TTDialogData));
+	data->OrigProc = lpDialogFunc;
+	data->OrigUser = 0;
+	data->ParamInit = lParamInit;
+	data->EndDialogFlag = false;
+	data->DlgResult = 0;
+	DLGTEMPLATE *lpTemplate = TTGetDlgTemplate(hInstance, lpTemplateName);
+	TTDialogTmpData = data;
+	HWND hDlgWnd = CreateDialogIndirectParam(
+		hInstance, lpTemplate, hWndParent, TTDialogProc, (LPARAM)data);
+	TTDialogTmpData = NULL;
+	ShowWindow(hDlgWnd, SW_SHOW);
+    UpdateWindow(hDlgWnd);
+	free(lpTemplate);
+	return hDlgWnd;
+}
+
+/**
+ *	CreateDialog() \x8C݊\xB7\x8A֐\x94
+ */
+HWND TTCreateDialog(
+	HINSTANCE hInstance,
+	LPCTSTR lpTemplateName,
+	HWND hWndParent,
+	DLGPROC lpDialogFunc)
+{
+	return TTCreateDialogIndirectParam(hInstance, lpTemplateName,
+									   hWndParent, lpDialogFunc, NULL);
+}
+
+/**
+ *	DialogBoxParam() \x8C݊\xB7\x8A֐\x94
+ *		EndDialog()\x82ł͂Ȃ\xAD\x81ATTEndDialog()\x82\xF0\x8Eg\x97p\x82\xB7\x82邱\x82\xC6
+ */
+INT_PTR TTDialogBoxParam(
+	HINSTANCE hInstance,
+	LPCTSTR lpTemplateName,
+	HWND hWndParent,			// \x83I\x81[\x83i\x81[\x83E\x83B\x83\x93\x83h\x83E\x82̃n\x83\x93\x83h\x83\x8B
+	DLGPROC lpDialogFunc,		// \x83_\x83C\x83A\x83\x8D\x83O\x83{\x83b\x83N\x83X\x83v\x83\x8D\x83V\x81[\x83W\x83\x83\x82ւ̃|\x83C\x83\x93\x83^
+	LPARAM lParamInit)			// \x8F\x89\x8A\xFA\x89\xBB\x92l
+{
+#if ENABLE_CALL_IDLE_MODAL
+	HWND hDlgWnd = TTCreateDialogIndirectParam(
+		hInstance, lpTemplateName,
+		hWndParent, lpDialogFunc, lParamInit);
+	EnableWindow(hWndParent, FALSE);
+	int DlgResult = TTDoModal(hDlgWnd);
+	::DestroyWindow(hDlgWnd);
+	EnableWindow(hWndParent, TRUE);
+	return DlgResult;
+#else
+	DLGTEMPLATE *lpTemplate = TTGetDlgTemplate(hInstance, lpTemplateName);
+	INT_PTR DlgResult = DialogBoxIndirectParam(
+		hInstance, lpTemplate, hWndParent,
+		lpDialogFunc, lParamInit);
+	free(lpTemplate);
+	return DlgResult;
+#endif
+}
+
+/**
+ *	DialogBoxParam() \x8C݊\xB7\x8A֐\x94
+ *		EndDialog()\x82ł͂Ȃ\xAD\x81ATTEndDialog()\x82\xF0\x8Eg\x97p\x82\xB7\x82邱\x82\xC6
+ */
+INT_PTR TTDialogBox(
+	HINSTANCE hInstance,
+	LPCTSTR lpTemplateName,
+	HWND hWndParent,
+	DLGPROC lpDialogFunc)
+{
+	return TTDialogBoxParam(
+		hInstance, lpTemplateName,
+		hWndParent, lpDialogFunc, (LPARAM)NULL);
+}

Added: trunk/teraterm/common/dlglib_tmpl.cpp
===================================================================
--- trunk/teraterm/common/dlglib_tmpl.cpp	                        (rev 0)
+++ trunk/teraterm/common/dlglib_tmpl.cpp	2019-03-25 13:47:32 UTC (rev 7509)
@@ -0,0 +1,510 @@
+/*
+ * (C) 2005-2018 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* Routines for dialog boxes */
+
+#include "dlglib.h"
+
+#include <wchar.h>
+#include <assert.h>
+#include <crtdbg.h>
+
+#ifdef _DEBUG
+#define malloc(l) _malloc_dbg((l), _NORMAL_BLOCK, __FILE__, __LINE__)
+#define free(p)   _free_dbg((p), _NORMAL_BLOCK, __FILE__, __LINE__)
+#endif
+
+//#define	_countof(ary)	(sizeof(ary)/sizeof(ary[0]))
+
+// https://docs.microsoft.com/ja-jp/windows/desktop/dlgbox/dlgtemplateex
+// https://www.pg-fl.jp/program/tips/dlgmem.htm
+#pragma pack(push, 1)
+typedef struct
+{
+    WORD dlgVer;
+    WORD signature;
+    DWORD helpID;
+    DWORD exStyle;
+    DWORD style;
+    WORD cDlgItems;
+    short x;
+    short y;
+    short cx;
+    short cy;
+
+	// sz_Or_Ord menu;				// name or ordinal of a menu resource
+	// sz_Or_Ord windowClass;		// name or ordinal of a window class
+	// WCHAR title[N];
+	// WORD pointsize;				// only if DS_SETFONT is set
+	// WORD weight;					// only if DS_SETFONT is set
+    // BYTE italic;					// only if DS_SETFONT is set
+    // BYTE charset;				// only if DS_SETFONT is set
+	// WCHAR typeface[stringLen];	// only if DS_SETFONT is set
+
+	// PAD
+
+    // DLGITEMTEMPLATEEX controls[cDlgItems];
+} DLGTEMPLATEEX;
+
+typedef struct
+{
+    DWORD helpID;
+    DWORD exStyle;
+    DWORD style;
+    short x;
+    short y;
+    short cx;
+    short cy;
+    DWORD id;
+
+	// sz_Or_Ord windowClass;	// name or ordinal of a window class
+	// sz_Or_Ord title;			// title string or ordinal of a resource
+	// WORD extraCount;			// bytes following creation data
+} DLGITEMTEMPLATEEX;
+#pragma pack(pop)
+
+#if 0 // !defined(_MSC_VER)
+static inline errno_t wcscpy_s(
+	wchar_t *dest,
+	size_t dest_size,
+	const wchar_t *src)
+{
+	wcscpy(dest, src);
+	return 0;
+}
+#endif
+
+static size_t CopySz(const WORD *src, WORD *dest)
+{
+	size_t size = 0;
+	do {
+		if (dest != NULL) {
+			*dest++ = *src;
+		}
+		size++;
+	} while (*src++ != 0);
+	return size;
+}
+
+static size_t CopySzOrOrd(const WORD *src, WORD *dest)
+{
+	size_t size;
+	if (*src == 0x0000) {
+		// 0x0000 \x82̂Ƃ\xAB\x81A\x82Ȃɂ\xE0\x82Ȃ\xA2
+		if (dest != NULL) {
+			*dest = *src;
+		}
+		size = 1;
+	} else if (*src == 0xffff) {
+		// 0xffff \x82̂Ƃ\xAB\x81A1WORD\x82̃f\x81[\x83^
+		if (dest != NULL) {
+			*dest++ = *src++;
+			*dest++ = *src++;
+		}
+		size = 2;
+	} else {
+		// \x88ȊO\x82\xCDwchar_t\x82̕\xB6\x8E\x9A\x97\xF1
+		return CopySz(src, dest);
+	}
+	return size;
+}
+
+static size_t CopyDlgItem(const WORD *src, WORD *dest)
+{
+	size_t size = sizeof(DLGITEMTEMPLATE) / sizeof(WORD);
+	if (dest != NULL) {
+		*(DLGITEMTEMPLATE *)dest = *(DLGITEMTEMPLATE *)src;
+		dest += size;
+	}
+	src += size;
+
+	size_t t;
+	t = CopySzOrOrd(src, dest);		// windowClass
+	size += t;
+	src += t; if (dest != NULL) dest += t;
+	t = CopySzOrOrd(src, dest);		// title
+	size += t;
+	src += t; if (dest != NULL) dest += t;
+	const WORD extraCount = *src++;
+	size++;
+	if (dest != NULL) {
+		*dest++ = extraCount;
+	}
+	if (extraCount != 0) {
+		size += extraCount;
+		if (dest != NULL) {
+			memcpy(dest, src, extraCount * sizeof(WORD));
+			dest += extraCount;
+		}
+		src += extraCount;
+	}
+
+	size = (size + 1) & ~1;
+	return size;
+}
+
+/**
+ *	drc		\x83_\x83C\x83A\x83\x8D\x83O\x83\x8A\x83\\x81[\x83X\x82ւ̃|\x83C\x83\x93\x83^
+ *	dest	\x83R\x83s\x81[\x90\xE6(NULL\x82̂Ƃ\xAB\x83R\x83s\x81[\x82\xB5\x82Ȃ\xA2)
+ *	logfont	\x90ݒ肷\x82\xE9\x83t\x83H\x83\x93\x83g\x8F\xEE\x95\xF1(\x82\xBD\x82\xBE\x82\xB5\x81Adest_v\x82\xAANULL\x82̎\x9E\x82͎擾)
+ *			NULL\x82̂Ƃ\xAB\x90ݒ\xE8,\x8E擾\x82\xB5\x82Ȃ\xA2
+ */
+static size_t CopyDlgTemplate(
+	const WORD *src_v,
+	WORD *dest_v,
+	LOGFONTW *logfont)
+{
+	const WORD *src = (const WORD *)src_v;
+	WORD *dest = (WORD *)dest_v;
+	size_t size = sizeof(DLGTEMPLATE) / sizeof(WORD);
+	const DLGTEMPLATE *dlg = (DLGTEMPLATE *)src;
+	if (dest != NULL) {
+		*(DLGTEMPLATE *)dest = *dlg;
+		dest += size;
+	}
+	src += size;
+
+	size_t t;
+	t = CopySzOrOrd(src, dest);	// menu
+	size += t;
+	src += t; if (dest != NULL) dest += t;
+	t = CopySzOrOrd(src, dest);	// windowClass
+	size += t;
+	src += t; if (dest != NULL) dest += t;
+	t = CopySz(src, dest);		// title
+	size += t;
+	src += t; if (dest != NULL) dest += t;
+	size_t dsize = 0;
+	if (dlg->style & DS_SETFONT) {
+		if (dest == NULL) {
+			// \x8E擾
+			if (logfont != NULL) {
+				memset(logfont, 0, sizeof(*logfont));
+				logfont->lfHeight = *src++;
+				t = CopySz(src, (WORD *)(&logfont->lfFaceName[0]));
+			} else {
+				src++;
+				t = CopySz(src, NULL);
+			}
+			size += t + 1;
+		} else {
+			// \x83Z\x83b\x83g
+			if (logfont != NULL) {
+				*dest++ = (WORD)logfont->lfHeight;
+				src += 1;
+				t = CopySz((WORD *)(&logfont->lfFaceName[0]), dest);
+				dest += t;
+				dsize = size + t + 1;
+				t = CopySz(src, NULL);
+				size += t + 1;
+			} else {
+				*dest++ = *src++;
+				t = CopySz(src, dest);
+				size += t + 1;
+				dsize = size;
+			}
+		}
+	}
+
+	size = (size + 1) & ~1;
+	src = ((const WORD *)src_v) + size;
+	if (dest != NULL) {
+		dsize = (dsize + 1) & ~1;
+		dest = ((WORD *)dest_v) + dsize;
+		size = dsize;
+	}
+	for (int i = 0; i < dlg->cdit; i++) {
+		t = CopyDlgItem(src, dest);
+		src += t; if (dest != NULL) dest += t;
+		size += t;
+	}
+
+	return size * sizeof(WORD);
+}
+
+static size_t CopyDlgItemEx(const WORD *src, WORD *dest)
+{
+	size_t size = sizeof(DLGITEMTEMPLATEEX) / sizeof(WORD);
+	if (dest != NULL) {
+		*(DLGITEMTEMPLATEEX *)dest = *(DLGITEMTEMPLATEEX *)src;
+		dest += size;
+	}
+	src += size;
+
+	size_t t;
+	t = CopySzOrOrd(src, dest);		// windowClass
+	size += t;
+	src += t; if (dest != NULL) dest += t;
+	t = CopySzOrOrd(src, dest);		// title
+	size += t;
+	src += t; if (dest != NULL) dest += t;
+	const WORD extraCount = *src++;
+	size++;
+	if (dest != NULL) {
+		*dest++ = extraCount;
+	}
+	if (extraCount != 0) {
+		size += extraCount;
+		if (dest != NULL) {
+			memcpy(dest, src, extraCount * sizeof(WORD));
+			dest += extraCount;
+		}
+		src += extraCount;
+	}
+
+	size = (size + 1) & ~1;
+	return size;
+}
+
+/**
+ *	drc_v	\x83_\x83C\x83A\x83\x8D\x83O\x83\x8A\x83\\x81[\x83X\x82ւ̃|\x83C\x83\x93\x83^
+ *	dest_v	\x83R\x83s\x81[\x90\xE6(NULL\x82̂Ƃ\xAB\x83R\x83s\x81[\x82\xB5\x82Ȃ\xA2)
+ *	logfont	\x90ݒ肷\x82\xE9\x83t\x83H\x83\x93\x83g\x8F\xEE\x95\xF1(\x82\xBD\x82\xBE\x82\xB5\x81Adest_v\x82\xAANULL\x82̎\x9E\x82͎擾)
+ *			NULL\x82̂Ƃ\xAB\x90ݒ\xE8,\x8E擾\x82\xB5\x82Ȃ\xA2
+ */
+static size_t CopyDlgTemplateEx(
+	const DLGTEMPLATE *src_v,
+	DLGTEMPLATE *dest_v,
+	LOGFONTW *logfont)
+{
+	const WORD *src = (const WORD *)src_v;
+	WORD *dest = (WORD *)dest_v;
+	if (*src != 1) {
+		return CopyDlgTemplate(src, dest, logfont);
+	}
+	// version 1
+	size_t size = sizeof(DLGTEMPLATEEX) / sizeof(WORD);
+	const DLGTEMPLATEEX *dlg = (DLGTEMPLATEEX *)src;
+	if (dest != NULL) {
+		*(DLGTEMPLATEEX *)dest = *dlg;
+		dest += size;
+	}
+	src += size;
+
+	size_t t;
+	t = CopySzOrOrd(src, dest);	// menu
+	size += t;
+	src += t; if (dest != NULL) dest += t;
+	t = CopySzOrOrd(src, dest);	// windowClass
+	size += t;
+	src += t; if (dest != NULL) dest += t;
+	t = CopySz(src, dest);		// title
+	size += t;
+	src += t; if (dest != NULL) dest += t;
+	size_t dsize = 0;
+	if (dlg->style & DS_SETFONT) {
+		if (dest == NULL) {
+			// \x8E擾
+			if (logfont != NULL) {
+				memset(logfont, 0, sizeof(*logfont));
+				logfont->lfHeight = *src++;
+				logfont->lfWeight = *src++;
+				logfont->lfItalic = *((BYTE *)src);
+				logfont->lfCharSet = *(((BYTE *)src)+1);
+				src++;
+				t = CopySz(src, (WORD *)(&logfont->lfFaceName[0]));
+			} else {
+				src++;
+				src++;
+				src++;
+				t = CopySz(src, NULL);
+			}
+			size += t + 3;
+		} else {
+			// \x83Z\x83b\x83g
+			if (logfont != NULL) {
+				*dest++ = (WORD)logfont->lfHeight;
+				*dest++ = (WORD)logfont->lfWeight;
+				*((BYTE *)dest) = logfont->lfItalic;
+				*(((BYTE *)dest)+1) = logfont->lfCharSet;
+				dest++;
+				src += 3;
+				t = CopySz((WORD *)(&logfont->lfFaceName[0]), dest);
+				dest += t;
+				dsize = size + t + 3;
+				t = CopySz(src, NULL);
+				size += t + 3;
+			} else {
+				*dest++ = *src++;
+				*dest++ = *src++;
+				*dest++ = *src++;
+				t = CopySz(src, dest);
+				size += t + 3;
+				dsize = size;
+			}
+		}
+	}
+
+	size = (size + 1) & ~1;
+	src = ((const WORD *)src_v) + size;
+	if (dest != NULL) {
+		dsize = (dsize + 1) & ~1;
+		dest = ((WORD *)dest_v) + dsize;
+		size = dsize;
+	}
+	for (int i = 0; i < dlg->cDlgItems; i++) {
+		t = CopyDlgItemEx(src, dest);
+		src += t; if (dest != NULL) dest += t;
+		size += t;
+	}
+
+	return size * sizeof(WORD);
+}
+
+static DLGTEMPLATE *GetDlgTemplate(
+	const DLGTEMPLATE *src,
+	const WCHAR *FontFaceName, LONG FontHeight, BYTE FontCharSet,
+	size_t *PrevTemplSize, size_t *NewTemplSize)
+{
+	LOGFONTW logfont;
+	const size_t prev_size = CopyDlgTemplateEx(src, NULL, &logfont);
+	DLGTEMPLATE *dest;
+	size_t new_size = 0;
+	if (FontFaceName == NULL || FontFaceName[0] == '\0') {
+		// simple copy
+		dest = (DLGTEMPLATE *)malloc(prev_size);
+		CopyDlgTemplateEx(src, dest, NULL);
+		new_size = prev_size;
+	} else {
+		// copy with replacing font
+		int size_namediff =
+			wcslen(FontFaceName) - wcslen(logfont.lfFaceName);
+		size_namediff *= sizeof(WCHAR);
+		size_namediff += 3;		// \x83e\x83L\x83X\x83g\x81A\x83t\x83H\x83\x93\x83g\x96\xBC\x92\xB7\x82\xC5align\x82\xAA\x95ω\xBB\x82\xB7\x82\xE9
+		size_t new_size_forcast = prev_size + size_namediff;
+		new_size_forcast = (new_size_forcast + 3) & ~3;
+		dest = (DLGTEMPLATE *)malloc(new_size_forcast);
+		logfont.lfCharSet = FontCharSet;
+		logfont.lfHeight = FontHeight;
+		wcscpy_s(logfont.lfFaceName, _countof(logfont.lfFaceName),
+				 FontFaceName);
+		new_size = CopyDlgTemplateEx(src, dest, &logfont);
+		assert(new_size <= new_size_forcast);
+	}
+
+	if (PrevTemplSize != NULL) {
+		*PrevTemplSize = prev_size;
+	}
+	if (NewTemplSize != NULL) {
+		*NewTemplSize = new_size;
+	}
+	return dest;
+}
+
+static DLGTEMPLATE *GetDlgTemplate(
+	HINSTANCE hInst, LPCTSTR lpTemplateName,
+	const WCHAR *FontFaceName, LONG FontHeight, BYTE FontCharSet,
+	size_t *PrevTemplSize, size_t *NewTemplSize)
+{
+	HRSRC hResource = ::FindResource(hInst, lpTemplateName, RT_DIALOG);
+	assert(hResource != NULL);
+	HANDLE hDlgTemplate = ::LoadResource(hInst, hResource);
+	const DLGTEMPLATE *src = (DLGTEMPLATE *)::LockResource(hDlgTemplate);
+
+	DLGTEMPLATE *dest = GetDlgTemplate(
+		src,
+		FontFaceName, FontHeight, FontCharSet,
+		PrevTemplSize, NewTemplSize);
+
+	::FreeResource(hDlgTemplate);
+
+	return dest;
+}
+
+static wchar_t FontFaceName[LF_FACESIZE];
+static LONG FontHeight;
+static BYTE FontCharSet;
+
+void TTSetDlgFontW(const wchar_t *face, int height, int charset)
+{
+	if (face != NULL) {
+		wcscpy_s(FontFaceName, face);
+	} else {
+		FontFaceName[0] = L'\0';
+	}
+	FontHeight = height;
+	FontCharSet = (BYTE)charset;
+}
+
+void TTSetDlgFontA(const char *face, int height, int charset)
+{
+	if (face != NULL) {
+		MultiByteToWideChar(CP_ACP, 0, face, -1, FontFaceName, LF_FACESIZE);
+	} else {
+		FontFaceName[0] = L'\0';
+	}
+	FontHeight = height;
+	FontCharSet = (BYTE)charset;
+}
+
+DLGTEMPLATE *TTGetNewDlgTemplate(
+	HINSTANCE hInst, const DLGTEMPLATE *src,
+	size_t *PrevTemplSize, size_t *NewTemplSize)
+{
+	(void)hInst;
+	DLGTEMPLATE *DlgTemplate =
+		GetDlgTemplate(src,
+					   FontFaceName, FontHeight, FontCharSet,
+					   PrevTemplSize, NewTemplSize);
+
+	return DlgTemplate;
+}
+
+DLGTEMPLATE *TTGetDlgTemplate(HINSTANCE hInst, LPCTSTR lpTemplateName)
+{
+	DLGTEMPLATE *DlgTemplate =
+		GetDlgTemplate(hInst, lpTemplateName,
+					   FontFaceName, FontHeight, FontCharSet,
+					   NULL, NULL);
+	return DlgTemplate;
+}
+
+/*
+ *	\x83_\x83C\x83A\x83\x8D\x83O\x83e\x83\x93\x83v\x83\x8C\x81[\x83g\x82̃N\x83\x89\x83X\x96\xBC\x8E擾
+ *	@retval		\x83N\x83\x89\x83X\x95\xB6\x8E\x9A\x97\xF1
+ *	@retval		NULL \x83N\x83\x89\x83X\x82Ȃ\xB5
+ */
+const wchar_t *TTGetClassName(const DLGTEMPLATE *DlgTempl)
+{
+	const WORD *src = (const WORD *)DlgTempl;
+	if (*src != 1) {
+		// DLGTEMPLATE
+		src += sizeof(DLGTEMPLATE) / sizeof(WORD);
+	} else {
+		// DLGTEMPLATEEX
+		src += sizeof(DLGTEMPLATEEX) / sizeof(WORD);
+	}
+	size_t t = CopySzOrOrd(src, NULL);	// menu
+	src += t;
+
+	if (*src == L'\0') {
+		// no class name
+		return NULL;
+	}
+	return (wchar_t *)src;
+}

Modified: trunk/teraterm/common/dllutil.cpp
===================================================================
--- trunk/teraterm/common/dllutil.cpp	2019-03-24 03:44:58 UTC (rev 7508)
+++ trunk/teraterm/common/dllutil.cpp	2019-03-25 13:47:32 UTC (rev 7509)
@@ -162,7 +162,7 @@
 		*pFunc = NULL;
 		return ERROR_FILE_NOT_FOUND;
 	} else {
-		*pFunc = GetProcAddress(hDll, ApiName);
+		*pFunc = (void *)GetProcAddress(hDll, ApiName);
 		if (*pFunc == NULL) {
 			return ERROR_PROC_NOT_FOUND;
 		}

Modified: trunk/teraterm/common/i18n.c
===================================================================
--- trunk/teraterm/common/i18n.c	2019-03-24 03:44:58 UTC (rev 7508)
+++ trunk/teraterm/common/i18n.c	2019-03-25 13:47:32 UTC (rev 7509)
@@ -27,31 +27,129 @@
  */
 
 #include "i18n.h"
+#include "ttlib.h"
+#include "codeconv.h"
 
-void WINAPI GetI18nStr(PCHAR section, PCHAR key, PCHAR buf, int buf_len, PCHAR def, const char *iniFile)
+#include <assert.h>
+#include <tchar.h>
+
+#if defined(UNICODE)
+DllExport void GetI18nStrW(const char *section, const char *key, wchar_t *buf, int buf_len, const wchar_t *def, const char *iniFile)
 {
-	GetPrivateProfileString(section, key, def, buf, buf_len, iniFile);
+	wchar_t sectionW[64];
+	wchar_t keyW[128];
+	wchar_t iniFileW[MAX_PATH];
+	MultiByteToWideChar(CP_ACP, 0, section, -1, sectionW, _countof(sectionW));
+	MultiByteToWideChar(CP_ACP, 0, key, -1, keyW, _countof(keyW));
+	MultiByteToWideChar(CP_ACP, 0, iniFile, -1, iniFileW, _countof(iniFileW));
+	GetPrivateProfileStringW(sectionW, keyW, def, buf, buf_len, iniFileW);
+	RestoreNewLineW(buf);
+}
+#endif
+
+void GetI18nStr(const char *section, const char *key, PCHAR buf, int buf_len, const char *def, const char *iniFile)
+{
+	GetPrivateProfileStringA(section, key, def, buf, buf_len, iniFile);
 	RestoreNewLine(buf);
 }
 
-int WINAPI GetI18nLogfont(PCHAR section, PCHAR key, PLOGFONT logfont, int ppi, const char *iniFile)
+// TODO: \x83o\x83b\x83t\x83@\x95s\x91\xAB\x8E\x9E\x82̓\xAE\x8D\xEC
+void GetI18nStrU8(const char *section, const char *key, char *buf, int buf_len, const char *def, const char *iniFile)
 {
-	static char tmp[MAX_UIMSG];
-	static char font[LF_FACESIZE];
-	int hight, charset;
-	GetPrivateProfileString(section, key, "-", tmp, MAX_UIMSG, iniFile);
-	if (strcmp(tmp, "-") == 0) {
+	size_t r;
+#if defined(UNICODE)
+	wchar_t tmp[MAX_UIMSG];
+	wchar_t defW[MAX_UIMSG];
+	r = UTF8ToWideChar(def, -1, defW, _countof(defW));
+	assert(r != 0);
+	GetI18nStrW(section, key, tmp, _countof(tmp), defW, iniFile);
+	r = buf_len;
+	WideCharToUTF8(tmp, NULL, buf, &r);
+	assert(r != 0);
+#else
+	// ANSI -> Wide -> utf8
+	char strA[MAX_UIMSG];
+	wchar_t strW[MAX_UIMSG];
+	GetI18nStr(section, key, strA, _countof(strA), def, iniFile);
+	r = MultiByteToWideChar(CP_ACP, 0, strA, -1, strW, _countof(strW));
+	assert(r != 0);
+	r = buf_len;
+	WideCharToUTF8(strW, NULL, buf, &r);
+	assert(r != 0);
+#endif
+}
+
+int GetI18nLogfont(const char *section, const char *key, PLOGFONTA logfont, int ppi, const char *iniFile)
+{
+	char tmp[MAX_UIMSG];
+	char font[LF_FACESIZE];
+	int height, charset;
+	assert(iniFile[0] != '\0');
+	memset(logfont, 0, sizeof(*logfont));
+
+	GetPrivateProfileStringA(section, key, "", tmp, MAX_UIMSG, iniFile);
+	if (tmp[0] == '\0') {
 		return FALSE;
 	}
 
 	GetNthString(tmp, 1, LF_FACESIZE-1, font);
-	GetNthNum(tmp, 2, &hight);
+	GetNthNum(tmp, 2, &height);
 	GetNthNum(tmp, 3, &charset);
 
-	strncpy_s(logfont->lfFaceName, sizeof(logfont->lfFaceName), font, _TRUNCATE);
-	logfont->lfCharSet = charset;
-	logfont->lfHeight = MulDiv(hight, -ppi, 72);
+	if (font[0] != '\0') {
+		strncpy_s(logfont->lfFaceName, sizeof(logfont->lfFaceName), font, _TRUNCATE);
+	}
+	logfont->lfCharSet = (BYTE)charset;
+	if (ppi != 0) {
+		logfont->lfHeight = MulDiv(height, -ppi, 72);
+	} else {
+		logfont->lfHeight = height;
+	}
 	logfont->lfWidth = 0;
 
 	return TRUE;
 }
+
+void SetI18DlgStrs(const char *section, HWND hDlgWnd,
+				   const DlgTextInfo *infos, size_t infoCount, const char *UILanguageFile)
+{
+	size_t i;
+	assert(hDlgWnd != NULL);
+	assert(infoCount > 0);
+	for (i = 0 ; i < infoCount; i++) {
+		const char *key = infos[i].key;
+		TCHAR uimsg[MAX_UIMSG];
+		GetI18nStrT(section, key, uimsg, sizeof(uimsg), _T(""), UILanguageFile);
+		if (uimsg[0] != _T('\0')) {
+			const int nIDDlgItem = infos[i].nIDDlgItem;
+			BOOL r;
+			if (nIDDlgItem == 0) {
+				r = SetWindowText(hDlgWnd, uimsg);
+				assert(r != 0);
+			} else {
+				r = SetDlgItemText(hDlgWnd, nIDDlgItem, uimsg);
+				assert(r != 0);
+			}
+			(void)r;
+		}
+	}
+}
+
+void SetI18MenuStrs(const char *section, HMENU hMenu,
+					const DlgTextInfo *infos, size_t infoCount, const char *UILanguageFile)
+{
+	size_t i;
+	for (i = 0; i < infoCount; i++) {
+		const int nIDDlgItem = infos[i].nIDDlgItem;
+		const char *key = infos[i].key;
+		TCHAR uimsg[MAX_UIMSG];
+		GetI18nStrT(section, key, uimsg, sizeof(uimsg), _T(""), UILanguageFile);
+		if (uimsg[0] != '\0') {
+			if (nIDDlgItem < 1000) {
+				ModifyMenu(hMenu, nIDDlgItem, MF_BYPOSITION, nIDDlgItem, uimsg);
+			} else {
+				ModifyMenu(hMenu, nIDDlgItem, MF_BYCOMMAND, nIDDlgItem, uimsg);
+			}
+		}
+	}
+}

Modified: trunk/teraterm/common/i18n.h
===================================================================
--- trunk/teraterm/common/i18n.h	2019-03-24 03:44:58 UTC (rev 7508)
+++ trunk/teraterm/common/i18n.h	2019-03-25 13:47:32 UTC (rev 7509)
@@ -30,7 +30,6 @@
 #define __I18N_H
 
 #include <windows.h>
-#include "ttlib.h"
 
 #define MAX_UIMSG	1024
 
@@ -38,9 +37,27 @@
 extern "C" {
 #endif
 
-void WINAPI GetI18nStr(PCHAR section, PCHAR key, PCHAR buf, int buf_len, PCHAR def, const char *iniFile);
-int WINAPI GetI18nLogfont(PCHAR section, PCHAR key, PLOGFONT logfont, int ppi, const char *iniFile);
+typedef struct {
+	int nIDDlgItem;
+	const char *key;
+} DlgTextInfo;
 
+#if defined(UNICODE)
+void GetI18nStrW(const char *section, const char *key, wchar_t *buf, int buf_len, const wchar_t *def, const char *iniFile);
+#endif
+void GetI18nStr(const char *section, const char *key, PCHAR buf, int buf_len, const char *def, const char *iniFile);
+int GetI18nLogfont(const char *section, const char *key, PLOGFONTA logfont, int ppi, const char *iniFile);
+void SetI18DlgStrs(const char *section, HWND hDlgWnd,
+							 const DlgTextInfo *infos, size_t infoCount, const char *UILanguageFile);
+void SetI18MenuStrs(const char *section, HMENU hMenu,
+							  const DlgTextInfo *infos, size_t infoCount, const char *UILanguageFile);
+
+#if defined(_UNICODE)
+#define	GetI18nStrT(p1, p2, p3, p4, p5, p6) GetI18nStrW(p1, p2, p3, p4, p5, p6)
+#else
+#define	GetI18nStrT(p1, p2, p3, p4, p5, p6) GetI18nStr(p1, p2, p3, p4, p5, p6)
+#endif
+
 #ifdef __cplusplus
 }
 #endif

Modified: trunk/teraterm/common/teraterm.h
===================================================================
--- trunk/teraterm/common/teraterm.h	2019-03-24 03:44:58 UTC (rev 7508)
+++ trunk/teraterm/common/teraterm.h	2019-03-25 13:47:32 UTC (rev 7509)
@@ -70,6 +70,7 @@
 #define USE_NORMAL_BGCOLOR
 
 #include "i18n.h"
+#include "ttlib.h"
 
 #define MAXPATHLEN 256
 /* version 2.3 */

Modified: trunk/teraterm/common/ttlib.c
===================================================================
--- trunk/teraterm/common/ttlib.c	2019-03-24 03:44:58 UTC (rev 7508)
+++ trunk/teraterm/common/ttlib.c	2019-03-25 13:47:32 UTC (rev 7509)
@@ -275,7 +275,7 @@
 
 /* fit a filename to the windows-filename format */
 /* FileName must contain filename part only. */
-void FitFileName(PCHAR FileName, int destlen, PCHAR DefExt)
+void FitFileName(PCHAR FileName, int destlen, const char *DefExt)
 {
 	int i, j, NumOfDots;
 	char Temp[MAX_PATH];
@@ -880,7 +880,7 @@
 	}
 }
 
-void WINAPI GetDefaultFName(char *home, char *file, char *dest, int destlen)
+void GetDefaultFName(const char *home, const char *file, char *dest, int destlen)
 {
 	// My Documents \x82\xC9 file \x82\xAA\x82\xA0\x82\xE9\x8Fꍇ\x81A
 	// \x82\xBB\x82\xEA\x82\xF0\x93ǂݍ\x9E\x82ނ悤\x82ɂ\xB5\x82\xBD\x81B(2007.2.18 maya)
@@ -971,7 +971,7 @@
 	strncpy_s(buf, buflen, Temp, _TRUNCATE);
 }
 
-void get_lang_msg(PCHAR key, PCHAR buf, int buf_len, PCHAR def, const char *iniFile)
+void get_lang_msg(const char *key, PCHAR buf, int buf_len, const char *def, const char *iniFile)
 {
 	GetI18nStr("Tera Term", key, buf, buf_len, def, iniFile);
 }
@@ -1002,9 +1002,9 @@
 	return 0;
 }
 
-BOOL doSelectFolder(HWND hWnd, char *path, int pathlen, char *def, char *msg)
+BOOL doSelectFolder(HWND hWnd, char *path, int pathlen, const char *def, const char *msg)
 {
-	BROWSEINFO      bi;
+	BROWSEINFOA     bi;
 	LPITEMIDLIST    pidlRoot;      // \x83u\x83\x89\x83E\x83Y\x82̃\x8B\x81[\x83gPIDL
 	LPITEMIDLIST    pidlBrowse;    // \x83\x86\x81[\x83U\x81[\x82\xAA\x91I\x91\xF0\x82\xB5\x82\xBDPIDL
 	char buf[MAX_PATH];
@@ -1046,14 +1046,26 @@
 	return ret;
 }
 
-void OutputDebugPrintf(char *fmt, ...) {
+void OutputDebugPrintf(const char *fmt, ...)
+{
 	char tmp[1024];
 	va_list arg;
 	va_start(arg, fmt);
 	_vsnprintf(tmp, sizeof(tmp), fmt, arg);
-	OutputDebugString(tmp);
+	va_end(arg);
+	OutputDebugStringA(tmp);
 }
 
+void OutputDebugPrintfW(const wchar_t *fmt, ...)
+{
+	wchar_t tmp[1024];
+	va_list arg;
+	va_start(arg, fmt);
+	_vsnwprintf(tmp, _countof(tmp), fmt, arg);
+	va_end(arg);
+	OutputDebugStringW(tmp);
+}
+
 #if (_MSC_VER < 1800)
 BOOL vercmp(
 	DWORD cond_val,
@@ -1783,3 +1795,13 @@
 
 	return TRUE;
 }
+
+void SetDlgTexts(HWND hDlgWnd, const DlgTextInfo *infos, int infoCount, const char *UILanguageFile)
+{
+	SetI18DlgStrs("Tera Term", hDlgWnd, infos, infoCount, UILanguageFile);
+}
+
+void SetDlgMenuTexts(HMENU hMenu, const DlgTextInfo *infos, int infoCount, const char *UILanguageFile)
+{
+	SetI18MenuStrs("Tera Term", hMenu, infos, infoCount, UILanguageFile);
+}

Modified: trunk/teraterm/common/ttlib.h
===================================================================
--- trunk/teraterm/common/ttlib.h	2019-03-24 03:44:58 UTC (rev 7508)
+++ trunk/teraterm/common/ttlib.h	2019-03-25 13:47:32 UTC (rev 7509)
@@ -29,6 +29,10 @@
 
 /* useful routines */
 
+#pragma once
+
+#include "i18n.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -36,7 +40,7 @@
 BOOL GetFileNamePos(PCHAR PathName, int far *DirLen, int far *FNPos);
 BOOL ExtractFileName(PCHAR PathName, PCHAR FileName, int destlen);
 BOOL ExtractDirName(PCHAR PathName, PCHAR DirName);
-void FitFileName(PCHAR FileName, int destlen, PCHAR DefExt);
+void FitFileName(PCHAR FileName, int destlen, const char *DefExt);
 void AppendSlash(PCHAR Path, int destlen);
 void DeleteSlash(PCHAR Path);
 void Str2Hex(PCHAR Str, PCHAR Hex, int Len, int MaxHexLen, BOOL ConvSP);
@@ -63,18 +67,18 @@
 void GetNthNum(PCHAR Source, int Nth, int far *Num);
 int GetNthNum2(PCHAR Source, int Nth, int defval);
 void GetDownloadFolder(char *dest, int destlen);
-void WINAPI GetDefaultFName(char *home, char *file, char *dest, int destlen);
+void GetDefaultFName(const char *home, const char *file, char *dest, int destlen);
 void GetDefaultSetupFName(char *home, char *dest, int destlen);
 void GetUILanguageFile(char *buf, int buflen);
 void GetOnOffEntryInifile(char *entry, char *buf, int buflen);
-void get_lang_msg(PCHAR key, PCHAR buf, int buf_len, PCHAR def, const char *iniFile);
+void get_lang_msg(const char *key, PCHAR buf, int buf_len, const char *def, const char *iniFile);
 #if defined(UNICODE)
 void get_lang_msgW(const char *key, wchar_t *buf, int buf_len, const wchar_t *def, const char *iniFile);
 #endif
 int get_lang_font(PCHAR key, HWND dlg, PLOGFONT logfont, HFONT *font, const char *iniFile);
-BOOL doSelectFolder(HWND hWnd, char *path, int pathlen, char *def, char *msg);
-void OutputDebugPrintf(char *fmt, ...);
-DWORD get_OPENFILENAME_SIZE();
+BOOL doSelectFolder(HWND hWnd, char *path, int pathlen, const char *def, const char *msg);
+void OutputDebugPrintf(const char *fmt, ...);
+DWORD get_OPENFILENAME_SIZEA();
 BOOL IsWindows95();
 BOOL IsWindowsMe();
 BOOL IsWindowsNT4();
@@ -107,10 +111,13 @@
 
 #define CheckFlag(var, flag)	(((var) & (flag)) != 0)
 
+void SetDlgTexts(HWND hDlgWnd, const DlgTextInfo *infos, int infoCount, const char *UILanguageFile);
 #if defined(_UNICODE)
 #define	get_lang_msgT(p1, p2, p3, p4, p5) get_lang_msgW(p1, p2, p3, p4, p5)
+#define	get_OPENFILENAME_SIZE() get_OPENFILENAME_SIZEW()
 #else
 #define	get_lang_msgT(p1, p2, p3, p4, p5) get_lang_msg(p1, p2, p3, p4, p5)
+#define	get_OPENFILENAME_SIZE() get_OPENFILENAME_SIZEA()
 #endif
 #ifdef __cplusplus
 }

Modified: trunk/teraterm/teraterm/CMakeLists.txt
===================================================================
--- trunk/teraterm/teraterm/CMakeLists.txt	2019-03-24 03:44:58 UTC (rev 7508)
+++ trunk/teraterm/teraterm/CMakeLists.txt	2019-03-25 13:47:32 UTC (rev 7509)
@@ -20,8 +20,10 @@
   ../common/teraterm.h
   ../common/ttlib.c
   ../common/ttlib.h
+  ../common/dlglib.h
   ../common/dlglib.c
-  ../common/dlglib.h
+  ../common/dlglib_cpp.cpp
+  ../common/dlglib_tmpl.cpp
   ../common/win16api.h
   ../common/win16api.c
   ../common/codemap.h
@@ -179,3 +181,59 @@
   ttpset
   ttptek
   )
+
+# copy .lng files
+if(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017")
+  add_custom_target(
+    copy_lang ALL
+    DEPENDS
+      "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}$(Configuration)/lang/Default.lng"
+      "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}$(Configuration)/lang/English.lng"
+      "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}$(Configuration)/lang/French.lng"
+      "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}$(Configuration)/lang/German.lng"
+      "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}$(Configuration)/lang/Japanese.lng"
+      "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}$(Configuration)/lang/Korean.lng"
+      "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}$(Configuration)/lang/Russian.lng"
+      "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}$(Configuration)/lang/Simplified Chinese.lng"
+      "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}$(Configuration)/lang/Traditional Chinese.lng"
+    )
+  add_custom_command(
+    OUTPUT
+      "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}$(Configuration)/lang/Default.lng"
+      "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}$(Configuration)/lang/English.lng"
+      "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}$(Configuration)/lang/French.lng"
+      "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}$(Configuration)/lang/German.lng"
+      "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}$(Configuration)/lang/Japanese.lng"
+      "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}$(Configuration)/lang/Korean.lng"
+      "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}$(Configuration)/lang/Russian.lng"
+      "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}$(Configuration)/lang/Simplified Chinese.lng"
+      "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}$(Configuration)/lang/Traditional Chinese.lng"
+    COMMAND ${CMAKE_COMMAND} -E copy
+      "${CMAKE_SOURCE_DIR}/installer/release/lang/Default.lng"
+      "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}$(Configuration)/lang/Default.lng"
+    COMMAND ${CMAKE_COMMAND} -E copy
+      "${CMAKE_SOURCE_DIR}/installer/release/lang/English.lng"
+      "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}$(Configuration)/lang/English.lng"
+    COMMAND ${CMAKE_COMMAND} -E copy
+      "${CMAKE_SOURCE_DIR}/installer/release/lang/French.lng"
+      "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}$(Configuration)/lang/French.lng"
+    COMMAND ${CMAKE_COMMAND} -E copy
+      "${CMAKE_SOURCE_DIR}/installer/release/lang/German.lng"
+      "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}$(Configuration)/lang/German.lng"
+    COMMAND ${CMAKE_COMMAND} -E copy
+      "${CMAKE_SOURCE_DIR}/installer/release/lang/Japanese.lng"
+      "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}$(Configuration)/lang/Japanese.lng"
+    COMMAND ${CMAKE_COMMAND} -E copy
+      "${CMAKE_SOURCE_DIR}/installer/release/lang/Korean.lng"
+      "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}$(Configuration)/lang/Korean.lng"
+    COMMAND ${CMAKE_COMMAND} -E copy
+      "${CMAKE_SOURCE_DIR}/installer/release/lang/Russian.lng"
+      "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}$(Configuration)/lang/Russian.lng"
+    COMMAND ${CMAKE_COMMAND} -E copy
+      "${CMAKE_SOURCE_DIR}/installer/release/lang/Simplified Chinese.lng"
+      "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}$(Configuration)/lang/Simplified Chinese.lng"
+    COMMAND ${CMAKE_COMMAND} -E copy
+      "${CMAKE_SOURCE_DIR}/installer/release/lang/Traditional Chinese.lng"
+      "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}$(Configuration)/lang/Traditional Chinese.lng"
+    )
+endif()

Modified: trunk/teraterm/teraterm/clipboar.c
===================================================================
--- trunk/teraterm/teraterm/clipboar.c	2019-03-24 03:44:58 UTC (rev 7508)
+++ trunk/teraterm/teraterm/clipboar.c	2019-03-25 13:47:32 UTC (rev 7509)
@@ -40,6 +40,7 @@
 #include "ttwinman.h"
 #include "ttcommon.h"
 #include "ttlib.h"
+#include "dlglib.h"
 
 #include "clipboar.h"
 #include "tt_res.h"
@@ -61,8 +62,6 @@
 static BOOL CBEchoOnly;
 static BOOL CBInsertDelay = FALSE;
 
-static HFONT DlgClipboardFont;
-
 static LRESULT CALLBACK OnClipboardDlgProc(HWND hDlgWnd, UINT msg, WPARAM wp, LPARAM lp);
 
 PCHAR CBOpen(LONG MemSize)
@@ -358,8 +357,8 @@
 	}
 
 	if (confirm) {
-		ret = DialogBox(hInst, MAKEINTRESOURCE(IDD_CLIPBOARD_DIALOG),
-		                HWin, (DLGPROC)OnClipboardDlgProc);
+		ret = TTDialogBox(hInst, MAKEINTRESOURCE(IDD_CLIPBOARD_DIALOG),
+						  HWin, (DLGPROC)OnClipboardDlgProc);
 		/*
 		 * \x88ȑO\x82̓_\x83C\x83A\x83\x8D\x83O\x82̓\xE0\x97e\x82\xF0\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82ɏ\x91\x82\xAB\x96߂\xB5\x82Ă\xA2\x82\xBD\x82\xAF\x82\xEA\x82ǁA\x95K\x97v?
 		 */
@@ -814,7 +813,7 @@
 	char *buf;
 	int wide_len;
 	HGLOBAL wide_hMem;
-	LPWSTR wide_buf;
+	LPWSTR wide_buf = 0;
 
 	if (OpenClipboard(owner) == 0)
 		return FALSE;
@@ -861,9 +860,11 @@
 
 static LRESULT CALLBACK OnClipboardDlgProc(HWND hDlgWnd, UINT msg, WPARAM wp, LPARAM lp)
 {
-	LOGFONT logfont;
-	HFONT font;
-	char uimsg[MAX_UIMSG];
+	static const DlgTextInfo TextInfos[] = {
+		{ 0, "DLG_CLIPBOARD_TITLE" },
+		{ IDCANCEL, "BTN_CANCEL" },
+		{ IDOK, "BTN_OK" },
+	};
 	POINT p;
 	RECT rc_dsk, rc_dlg;
 	int dlg_height, dlg_width;
@@ -871,33 +872,14 @@
 	RECT rc_edit, rc_ok, rc_cancel;
 	// for status bar
 	static HWND hStatus = NULL;
-	static init_width, init_height;
+	static int init_width, init_height;
 
 	switch (msg) {
 		case WM_INITDIALOG:
-			font = (HFONT)SendMessage(hDlgWnd, WM_GETFONT, 0, 0);
-			GetObject(font, sizeof(LOGFONT), &logfont);
-			if (get_lang_font("DLG_TAHOMA_FONT", hDlgWnd, &logfont, &DlgClipboardFont, ts.UILanguageFile)) {
-				SendDlgItemMessage(hDlgWnd, IDC_EDIT, WM_SETFONT, (WPARAM)DlgClipboardFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(hDlgWnd, IDOK, WM_SETFONT, (WPARAM)DlgClipboardFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(hDlgWnd, IDCANCEL, WM_SETFONT, (WPARAM)DlgClipboardFont, MAKELPARAM(TRUE,0));
-			}
-			else {
-				DlgClipboardFont = NULL;
-			}
+			SetDlgTexts(hDlgWnd, TextInfos, _countof(TextInfos), ts.UILanguageFile);
 
-			GetWindowText(hDlgWnd, uimsg, sizeof(uimsg));
-			get_lang_msg("DLG_CLIPBOARD_TITLE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-			SetWindowText(hDlgWnd, ts.UIMsg);
-			GetDlgItemText(hDlgWnd, IDCANCEL, uimsg, sizeof(uimsg));
-			get_lang_msg("BTN_CANCEL", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-			SetDlgItemText(hDlgWnd, IDCANCEL, ts.UIMsg);
-			GetDlgItemText(hDlgWnd, IDOK, uimsg, sizeof(uimsg));
-			get_lang_msg("BTN_OK", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-			SetDlgItemText(hDlgWnd, IDOK, ts.UIMsg);
+			SetDlgItemTextA(hDlgWnd, IDC_EDIT, CBMemPtr);
 
-			SendMessage(GetDlgItem(hDlgWnd, IDC_EDIT), WM_SETTEXT, 0, (LPARAM)CBMemPtr);
-
 			if (ActiveWin == IdVT) { // VT Window
 				/*
 				 * Caret off \x8E\x9E\x82\xC9 GetCaretPos() \x82Ő\xB3\x8Am\x82ȏꏊ\x82\xAA\x8E\xE6\x82\xEA\x82Ȃ\xA2\x82̂ŁA
@@ -995,7 +977,7 @@
 			switch (LOWORD(wp)) {
 				case IDOK:
 				{
-					unsigned len = SendMessage(GetDlgItem(hDlgWnd, IDC_EDIT), WM_GETTEXTLENGTH, 0, 0);
+					unsigned len = SendMessageA(GetDlgItem(hDlgWnd, IDC_EDIT), WM_GETTEXTLENGTH, 0, 0);
 					HGLOBAL hMem;
 					INT_PTR result = IDCANCEL;
 
@@ -1033,26 +1015,18 @@
 						if (CBMemPtr == NULL) {
 							CBMemPtr = GlobalLock(CBMemHandle);
 						}
-						SendMessage(GetDlgItem(hDlgWnd, IDC_EDIT), WM_GETTEXT, GlobalSize(CBMemHandle), (LPARAM)CBMemPtr);
+						GetDlgItemTextA(hDlgWnd, IDC_EDIT, CBMemPtr, GlobalSize(CBMemHandle));
 						result = IDOK;
 					}
 
-					if (DlgClipboardFont != NULL) {
-						DeleteObject(DlgClipboardFont);
-					}
-
 					DestroyWindow(hStatus);
-					EndDialog(hDlgWnd, result);
+					TTEndDialog(hDlgWnd, result);
 				}
 					break;
 
 				case IDCANCEL:
-					if (DlgClipboardFont != NULL) {
-						DeleteObject(DlgClipboardFont);
-					}
-
 					DestroyWindow(hStatus);
-					EndDialog(hDlgWnd, IDCANCEL);
+					TTEndDialog(hDlgWnd, IDCANCEL);
 					break;
 
 				default:

Modified: trunk/teraterm/teraterm/protodlg.cpp
===================================================================
--- trunk/teraterm/teraterm/protodlg.cpp	2019-03-24 03:44:58 UTC (rev 7508)
+++ trunk/teraterm/teraterm/protodlg.cpp	2019-03-25 13:47:32 UTC (rev 7509)
@@ -34,6 +34,7 @@
 #include "tttypes.h"
 #include "ttftypes.h"
 #include "ttlib.h"
+#include "dlglib.h"
 #include "protodlg.h"
 
 #ifdef _DEBUG

Modified: trunk/teraterm/teraterm/teraterm.cpp
===================================================================
--- trunk/teraterm/teraterm/teraterm.cpp	2019-03-24 03:44:58 UTC (rev 7508)
+++ trunk/teraterm/teraterm/teraterm.cpp	2019-03-25 13:47:32 UTC (rev 7509)
@@ -51,6 +51,7 @@
 #include "teraapp.h"
 
 #include "compat_w95.h"
+#include "dlglib.h"
 
 #if 0
 //#ifdef _DEBUG
@@ -65,50 +66,12 @@
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
-typedef struct {
-	const TCHAR *FaceName;
-	bool found;
-} EnumFontInfo;
-
-static int CALLBACK EnumFontExProc(
-	ENUMLOGFONT* lpelf, NEWTEXTMETRIC* lpntm,
-	int nFontType, LPARAM lParam)
-{
-	EnumFontInfo *info = (EnumFontInfo *)lParam;
-	if (nFontType == DEVICE_FONTTYPE) {
-		// \x90ڑ\xB1\x82\xB3\x82ꂽ\x83f\x83o\x83C\x83X(\x83v\x83\x8A\x83\x93\x83^\x82Ȃ\xC7)\x93\xE0\x82̃t\x83H\x83\x93\x83g
-		return 1;
-	}
-	const TCHAR *FaceName = lpelf->elfLogFont.lfFaceName;
-	if (_tcscmp(info->FaceName, FaceName) == 0) {
-		info->found = true;
-		return 0;
-	}
-	return 1;
-}
-
-BOOL isExistFont(const TCHAR *FaceName)
-{
-	HDC hDC = GetDC(NULL);
-	LOGFONT lf;
-	memset(&lf, 0, sizeof(lf));
-	lf.lfCharSet = DEFAULT_CHARSET;// SHIFTJIS_CHARSET;
-	lf.lfPitchAndFamily = 0;
-
-	EnumFontInfo info;
-	info.FaceName = FaceName;
-	info.found = false;
-	EnumFontFamiliesEx(hDC, &lf, (FONTENUMPROC)EnumFontExProc, (LPARAM)&info, 0);
-	ReleaseDC(NULL, hDC);
-	return info.found;
-}
-
 static BOOL AddFontFlag;
 static TCHAR TSpecialFont[MAX_PATH];
 
 static void LoadSpecialFont()
 {
-	if (!isExistFont(_T("Tera Special"))) {
+	if (!IsExistFontA("Tera Special", SYMBOL_CHARSET, TRUE)) {
 		int r;
 
 		if (GetModuleFileName(NULL, TSpecialFont,_countof(TSpecialFont)) == 0) {
@@ -144,16 +107,26 @@
 	}
 }
 
-CTeraApp::CTeraApp()
+static void init()
 {
 #ifdef _DEBUG
 	::_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
 #endif
-
 	DLLInit();
 	WinCompatInit();
+#if 1
+	if (pSetThreadDpiAwarenessContext) {
+		pSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
+	}
+#endif
+	LoadSpecialFont();
 }
 
+CTeraApp::CTeraApp()
+{
+	init();
+}
+
 // CTeraApp instance
 CTeraApp theApp;
 
@@ -164,10 +137,12 @@
 // CTeraApp initialization
 BOOL CTeraApp::InitInstance()
 {
-	LoadSpecialFont();
 	hInst = m_hInstance;
 	m_pMainWnd = new CVTWindow();
 	pVTWin = m_pMainWnd;
+	// [Tera Term]\x83Z\x83N\x83V\x83\x87\x83\x93\x82\xCCDlgFont=\x82\xAA\x82Ȃ\xA2\x8Fꍇ\x82\xCD
+	// [TTSH]\x83Z\x83N\x83V\x83\x87\x83\x93\x82̃t\x83H\x83\x93\x83g\x90ݒ\xE8\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9
+	SetDialogFont(ts.SetupFName, ts.UILanguageFile, "TTSSH");
 	return TRUE;
 }
 

Modified: trunk/teraterm/ttpcmn/CMakeLists.txt
===================================================================
--- trunk/teraterm/ttpcmn/CMakeLists.txt	2019-03-24 03:44:58 UTC (rev 7508)
+++ trunk/teraterm/ttpcmn/CMakeLists.txt	2019-03-25 13:47:32 UTC (rev 7509)
@@ -57,6 +57,10 @@
   ${SRC}
   )
 
+target_compile_definitions(
+  ttpcmn
+  PRIVATE -DTTPCMN_DLL
+  )
 if(MINGW)
   set_target_properties(
     ttpcmn

Modified: trunk/teraterm/ttpcmn/language.c
===================================================================
--- trunk/teraterm/ttpcmn/language.c	2019-03-24 03:44:58 UTC (rev 7508)
+++ trunk/teraterm/ttpcmn/language.c	2019-03-25 13:47:32 UTC (rev 7509)
@@ -33,6 +33,7 @@
 #include "tttypes.h"
 #include <mbstring.h>
 #include <locale.h>
+#include "codemap.h"
 
 #include "language.h"
 

Modified: trunk/teraterm/ttpcmn/ttpcmn.def
===================================================================
--- trunk/teraterm/ttpcmn/ttpcmn.def	2019-03-24 03:44:58 UTC (rev 7508)
+++ trunk/teraterm/ttpcmn/ttpcmn.def	2019-03-25 13:47:32 UTC (rev 7509)
@@ -90,4 +90,7 @@
   parse_port @90
   parse_port_from_buf @91
   service_name @92
-  get_OPENFILENAME_SIZE @93
\ No newline at end of file
+  get_OPENFILENAME_SIZEA @93
+
+  SetI18DlgStrs
+  SetI18MenuStrs

Modified: trunk/teraterm/ttpdlg/CMakeLists.txt
===================================================================
--- trunk/teraterm/ttpdlg/CMakeLists.txt	2019-03-24 03:44:58 UTC (rev 7508)
+++ trunk/teraterm/ttpdlg/CMakeLists.txt	2019-03-25 13:47:32 UTC (rev 7509)
@@ -13,6 +13,7 @@
 set(COMMON_SRC
   ../common/dlglib.c
   ../common/dlglib.h
+  ../common/dlglib_tmpl.cpp
   ../common/ttlib.c
   ../common/ttlib.h
   ../common/teraterm.ico

Modified: trunk/teraterm/ttpfile/CMakeLists.txt
===================================================================
--- trunk/teraterm/ttpfile/CMakeLists.txt	2019-03-24 03:44:58 UTC (rev 7508)
+++ trunk/teraterm/ttpfile/CMakeLists.txt	2019-03-25 13:47:32 UTC (rev 7509)
@@ -5,6 +5,8 @@
 set(COMMON_SRC
   ../common/dlglib.c
   ../common/dlglib.h
+  ../common/dlglib_cpp.cpp
+  ../common/dlglib_tmpl.cpp
   ../common/ttlib.c
   ../common/ttlib.h
   ../common/win16api.h

Modified: trunk/teraterm/ttptek/CMakeLists.txt
===================================================================
--- trunk/teraterm/ttptek/CMakeLists.txt	2019-03-24 03:44:58 UTC (rev 7508)
+++ trunk/teraterm/ttptek/CMakeLists.txt	2019-03-25 13:47:32 UTC (rev 7509)
@@ -11,7 +11,10 @@
   ../common/i18n.h
   ../common/ttlib.c
   ../common/ttlib.h
+  ../common/codeconv.h
+  ../common/codeconv.cpp
   )
+
 source_group(
   "common"
   FILES
@@ -25,7 +28,7 @@
   ttptek.def
   ttptek.rc
   ttptek-version.rc
-#  tttek.h
+  tttek.h
   tttek.c
   ${COMMON_SRC}
   )
@@ -56,8 +59,8 @@
 target_link_libraries(
   ttptek
   ttpcmn
-  debug sfmtd.lib
-  optimized sfmt.lib
+  debug sfmtd
+  optimized sfmt
   #
   iphlpapi
   gdi32

Modified: trunk/teraterm/ttptek/tekesc.c
===================================================================
--- trunk/teraterm/ttptek/tekesc.c	2019-03-24 03:44:58 UTC (rev 7508)
+++ trunk/teraterm/ttptek/tekesc.c	2019-03-25 13:47:32 UTC (rev 7509)
@@ -35,7 +35,11 @@
 #include <math.h>
 #include <string.h>
 
+#undef DllExport
+#define DllExport __declspec(dllexport) 
+
 #include "tekesc.h"
+#include "tttek.h"
 
 void Log1Byte(PComVar cv, BYTE b)
 {

Modified: trunk/teraterm/ttptek/tekesc.h
===================================================================
--- trunk/teraterm/ttptek/tekesc.h	2019-03-24 03:44:58 UTC (rev 7508)
+++ trunk/teraterm/ttptek/tekesc.h	2019-03-25 13:47:32 UTC (rev 7509)
@@ -29,7 +29,6 @@
 
 /* TTTEK.DLL, TEK escape sequences */
 
-void PASCAL TEKChangeCaret(PTEKVar tk, PTTSet ts);
 void ParseFirst(PTEKVar tk, PTTSet ts, PComVar cv, BYTE b);
 void TEKEscape(PTEKVar tk, PTTSet ts, PComVar cv, BYTE b);
 void SelectCode(PTEKVar tk, PTTSet ts, BYTE b);

Modified: trunk/teraterm/ttptek/tttek.c
===================================================================
--- trunk/teraterm/ttptek/tttek.c	2019-03-24 03:44:58 UTC (rev 7508)
+++ trunk/teraterm/ttptek/tttek.c	2019-03-25 13:47:32 UTC (rev 7509)
@@ -36,10 +36,15 @@
 #include <string.h>
 
 #include "ttcommon.h"
-#include "tekesc.h"
 
 #include "compat_w95.h"
 
+#undef DllExport
+#define DllExport __declspec(dllexport) 
+
+#include "tekesc.h"
+#include "tttek.h"
+
 static HANDLE hInst;
 
 void PASCAL TEKInit(PTEKVar tk, PTTSet ts)

Copied: trunk/teraterm/ttptek/tttek.h (from rev 7508, trunk/teraterm/ttptek/tekesc.h)
===================================================================
--- trunk/teraterm/ttptek/tttek.h	                        (rev 0)
+++ trunk/teraterm/ttptek/tttek.h	2019-03-25 13:47:32 UTC (rev 7509)
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2018 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* TTTEK.DLL, TEK escape sequences */
+
+DllExport void WINAPI TEKInit(PTEKVar tk, PTTSet ts);
+DllExport void WINAPI TEKChangeCaret(PTEKVar tk, PTTSet ts);
+DllExport void WINAPI TEKDestroyCaret(PTEKVar tk, PTTSet ts);
+DllExport void WINAPI TEKResizeWindow(PTEKVar tk, PTTSet ts, int W, int H);
+DllExport int WINAPI TEKParse(PTEKVar tk, PTTSet ts, PComVar cv);
+DllExport void WINAPI TEKReportGIN(PTEKVar tk, PTTSet ts, PComVar cv, BYTE KeyCode);
+DllExport void WINAPI TEKPaint(PTEKVar tk, PTTSet ts, HDC PaintDC, PAINTSTRUCT *PaintInfo);
+DllExport void WINAPI TEKWMLButtonDown(PTEKVar tk, PTTSet ts, PComVar cv, POINT pos);
+DllExport void WINAPI TEKWMLButtonUp(PTEKVar tk, PTTSet ts);
+DllExport void WINAPI TEKWMMouseMove(PTEKVar tk, PTTSet ts, POINT p);
+DllExport void WINAPI TEKWMSize(PTEKVar tk, PTTSet ts, int W, int H, int cx, int cy);
+DllExport void WINAPI TEKCMCopy(PTEKVar tk, PTTSet ts);
+DllExport void WINAPI TEKCMCopyScreen(PTEKVar tk, PTTSet ts);
+DllExport void WINAPI TEKPrint(PTEKVar tk, PTTSet ts, HDC PrintDC, BOOL SelFlag);
+DllExport void WINAPI TEKClearScreen(PTEKVar tk, PTTSet ts);
+DllExport void WINAPI TEKSetupFont(PTEKVar tk, PTTSet ts);
+DllExport void WINAPI TEKResetWin(PTEKVar tk, PTTSet ts, WORD EmuOld);
+DllExport void WINAPI TEKRestoreSetup(PTEKVar tk, PTTSet ts);
+DllExport void WINAPI TEKEnd(PTEKVar tk);

Modified: trunk/ttpmenu/CMakeLists.txt
===================================================================
--- trunk/ttpmenu/CMakeLists.txt	2019-03-24 03:44:58 UTC (rev 7508)
+++ trunk/ttpmenu/CMakeLists.txt	2019-03-25 13:47:32 UTC (rev 7509)
@@ -3,10 +3,12 @@
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
 
 set(COMMON_SRC
+  ../teraterm/common/ttlib.h
   ../teraterm/common/ttlib.c
-  ../teraterm/common/ttlib.h
+  ../teraterm/common/i18n.h
   ../teraterm/common/i18n.c
-  ../teraterm/common/i18n.h
+  ../teraterm/common/codeconv.h
+  ../teraterm/common/codeconv.cpp
   )
 
 source_group(
@@ -18,8 +20,10 @@
 set(SRC
   resource.h
   registry.cpp
+  ttpmenu.h
   ttpmenu.cpp
   winmisc.cpp
+  #
   left.ico
   right.ico
   teraterm.ico

Modified: trunk/ttpmenu/ttpmenu.cpp
===================================================================
--- trunk/ttpmenu/ttpmenu.cpp	2019-03-24 03:44:58 UTC (rev 7508)
+++ trunk/ttpmenu/ttpmenu.cpp	2019-03-25 13:47:32 UTC (rev 7509)
@@ -17,7 +17,8 @@
 #include	"winmisc.h"
 #include	"resource.h"
 
-#include "compat_w95.h"
+#include	"compat_w95.h"
+#include	"ttlib.h"
 
 // UTF-8 TeraTerm\x82ł́A\x83f\x83t\x83H\x83\x8B\x83g\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x90\xE6\x82\xF0\x89\xBA\x8BL\x82ɕύX\x82\xB5\x82\xBD\x81B(2004.12.2 yutaka)
 // \x82\xB3\x82\xE7\x82ɁA\x83f\x83t\x83H\x83\x8B\x83g\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x90\xE6\x82̓J\x83\x8C\x83\x93\x83g\x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82ɕύX\x81B(2004.12.14 yutaka)

From scmnotify ＠ osdn.net  Mon Mar 25 22:53:31 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 25 Mar 2019 22:53:31 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B7510=5D_ENABLE=5FDPIAWARENESS_?=
 =?utf-8?b?44Kq44OX44K344On44Oz44KS6L+95Yqg44GX44Gf?=
Message-ID: <1553522011.262537.20775.nullmailer@users.osdn.me>

Revision: 7510
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7510
Author:   zmatsuo
Date:     2019-03-25 22:53:31 +0900 (Mon, 25 Mar 2019)
Log Message:
-----------
ENABLE_DPIAWARENESS オプションを追加した

Modified Paths:
--------------
    trunk/CMakeLists.txt
    trunk/teraterm/teraterm/CMakeLists.txt
    trunk/teraterm/teraterm/teraterm.cpp

-------------- next part --------------
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2019-03-25 13:47:32 UTC (rev 7509)
+++ trunk/CMakeLists.txt	2019-03-25 13:53:31 UTC (rev 7510)
@@ -3,6 +3,7 @@
 
 project(teraterm_all)
 
+option(ENABLE_DPIAWARENESS "Dpiawareness" ON)
 option(ENABLE_TTXSAMPLES "TTXSamples" ON)
 option(USE_UNICODE_API "unicode" OFF)
 

Modified: trunk/teraterm/teraterm/CMakeLists.txt
===================================================================
--- trunk/teraterm/teraterm/CMakeLists.txt	2019-03-25 13:47:32 UTC (rev 7509)
+++ trunk/teraterm/teraterm/CMakeLists.txt	2019-03-25 13:53:31 UTC (rev 7510)
@@ -6,6 +6,10 @@
 if(USE_UNICODE_API)
   add_definitions(-DUNICODE -D_UNICODE)
 endif()
+if(ENABLE_DPIAWARENESS)
+  add_definitions(-DDPIAWARENESS)
+endif()
+
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
 
 set(COMMON_SRC

Modified: trunk/teraterm/teraterm/teraterm.cpp
===================================================================
--- trunk/teraterm/teraterm/teraterm.cpp	2019-03-25 13:47:32 UTC (rev 7509)
+++ trunk/teraterm/teraterm/teraterm.cpp	2019-03-25 13:53:31 UTC (rev 7510)
@@ -114,7 +114,7 @@
 #endif
 	DLLInit();
 	WinCompatInit();
-#if 1
+#if defined(DPIAWARENESS)
 	if (pSetThreadDpiAwarenessContext) {
 		pSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
 	}

From scmnotify ＠ osdn.net  Mon Mar 25 23:29:54 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 25 Mar 2019 23:29:54 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc1MTFdIOODhuODvOODluODq+OCkmNvbnN0?=
 =?utf-8?b?44Gr5aSJ5pu0?=
Message-ID: <1553524194.565516.120931.nullmailer@users.osdn.me>

Revision: 7511
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7511
Author:   zmatsuo
Date:     2019-03-25 23:29:54 +0900 (Mon, 25 Mar 2019)
Log Message:
-----------
テーブルをconstに変更

Modified Paths:
--------------
    trunk/teraterm/ttpcmn/sjis2uni.map

-------------- next part --------------
Modified: trunk/teraterm/ttpcmn/sjis2uni.map
===================================================================
--- trunk/teraterm/ttpcmn/sjis2uni.map	2019-03-25 13:53:31 UTC (rev 7510)
+++ trunk/teraterm/ttpcmn/sjis2uni.map	2019-03-25 14:29:54 UTC (rev 7511)
@@ -31,7 +31,7 @@
  * cf. ftp://ftp.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS/SHIFTJIS.TXT 
  *
  */
-static codemap_t mapSJISToUnicode[] = {
+static const codemap_t mapSJISToUnicode[] = {
 	{ 0x0020, 0x0020 },
 	{ 0x0021, 0x0021 },
 	{ 0x0022, 0x0022 },

From scmnotify ＠ osdn.net  Mon Mar 25 23:45:54 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 25 Mar 2019 23:45:54 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc1MTJdIERyYWcmRHJvcOODgOOCpOOCog==?=
 =?utf-8?b?44Ot44Kw44KS6auYRHBp44Gr5a++5b+c?=
Message-ID: <1553525154.257548.17785.nullmailer@users.osdn.me>

Revision: 7512
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7512
Author:   zmatsuo
Date:     2019-03-25 23:45:53 +0900 (Mon, 25 Mar 2019)
Log Message:
-----------
Drag&Dropダイアログを高Dpiに対応
UNICODEを考慮した
WM_NEXTDLGCTL でフォーカスを持つコントロールを直接指定するようにした

Modified Paths:
--------------
    trunk/teraterm/teraterm/dnddlg.cpp
    trunk/teraterm/teraterm/dnddlg.h

-------------- next part --------------
Modified: trunk/teraterm/teraterm/dnddlg.cpp
===================================================================
--- trunk/teraterm/teraterm/dnddlg.cpp	2019-03-25 14:29:54 UTC (rev 7511)
+++ trunk/teraterm/teraterm/dnddlg.cpp	2019-03-25 14:45:53 UTC (rev 7512)
@@ -39,7 +39,7 @@
 #include "dlglib.h"
 
 struct DrapDropDlgParam {
-	const char *TargetFilename;
+	const TCHAR *TargetFilename;
 	enum drop_type DropType;
 	unsigned char DropTypePaste;
 	bool ScpEnable;
@@ -56,23 +56,11 @@
 };
 
 struct DrapDropDlgData {
-	HFONT hNewFont;
 	DrapDropDlgParam *Param;
 };
 
 static LRESULT CALLBACK OnDragDropDlgProc(HWND hDlgWnd, UINT msg, WPARAM wp, LPARAM lp)
 {
-	static const int FontIDs[] = {
-		IDC_FILENAME_EDIT,
-		IDC_DAD_STATIC,
-		IDC_SCP_RADIO, IDC_SENDFILE_RADIO, IDC_PASTE_RADIO,
-		IDC_SCP_PATH_LABEL, IDC_SCP_PATH, IDC_SCP_PATH_NOTE,
-		IDC_BINARY_CHECK,
-		IDC_ESCAPE_CHECK, IDC_NEWLINE_RADIO, IDC_SPACE_RADIO,
-		IDC_SAME_PROCESS_CHECK, IDC_SAME_PROCESS_NEXTDROP_CHECK, IDC_DONTSHOW_CHECK,
-		IDC_DAD_NOTE,
-		IDOK, IDCANCEL,
-	};
 	static const DlgTextInfo TextInfos[] = {
 		{ 0, "DLG_DANDD_TITLE" },
 		{ IDC_DAD_STATIC, "DLG_DANDD_TEXT" },
@@ -101,7 +89,6 @@
 		SetWindowLongPtr(hDlgWnd, DWLP_USER, (LONG_PTR)DlgData);
 		DrapDropDlgParam *Param = (DrapDropDlgParam *)lp;
 		DlgData->Param = Param;
-		DlgData->hNewFont = SetDlgFonts(hDlgWnd, FontIDs, _countof(FontIDs), Param->UILanguageFile, NULL);
 		SetDlgTexts(hDlgWnd, TextInfos, _countof(TextInfos), Param->UILanguageFile);
 
 		// target file
@@ -115,7 +102,7 @@
 						 IDC_SCP_RADIO);
 
 		// SCP
-		SendMessage(GetDlgItem(hDlgWnd, IDC_SCP_PATH), WM_SETTEXT, 0, (LPARAM)Param->ScpSendDirPtr);
+		SetDlgItemTextA(hDlgWnd, IDC_SCP_PATH, Param->ScpSendDirPtr);
 		if (!Param->ScpEnable) {
 			// \x96\xB3\x8C\xF8\x89\xBB
 			EnableWindow(GetDlgItem(hDlgWnd, IDC_SCP_RADIO), FALSE);
@@ -149,10 +136,10 @@
 
 		// Do this for the next %d files
 		char orgmsg[MAX_UIMSG];
-		GetDlgItemText(hDlgWnd, IDC_SAME_PROCESS_CHECK, orgmsg, sizeof(orgmsg));
+		GetDlgItemTextA(hDlgWnd, IDC_SAME_PROCESS_CHECK, orgmsg, sizeof(orgmsg));
 		char uimsg[MAX_UIMSG];
 		_snprintf_s(uimsg, sizeof(uimsg), _TRUNCATE, orgmsg, Param->RemaingFileCount - 1);
-		SetDlgItemText(hDlgWnd, IDC_SAME_PROCESS_CHECK, uimsg);
+		SetDlgItemTextA(hDlgWnd, IDC_SAME_PROCESS_CHECK, uimsg);
 		if (Param->RemaingFileCount < 2) {
 			EnableWindow(GetDlgItem(hDlgWnd, IDC_SAME_PROCESS_CHECK), FALSE);
 		}
@@ -167,19 +154,16 @@
 		}
 
 		// focus to "SCP dest textbox" or "Cancel"
-		if (Param->ScpEnable) {
-			// "SCP" \x97L\x8C\xF8\x8E\x9E\x82\xCD Cancel \x82Ƀt\x83H\x81[\x83J\x83X\x82𓖂āA\x8DŏI\x93I\x82\xC9 SCP PATH \x82Ƀt\x83H\x81[\x83J\x83X\x82\xAA
-			// \x93\x96\x82\xBD\x82\xE9\x82悤\x82ɂ\xB7\x82\xE9\x81B
-			SetFocus(GetDlgItem(hDlgWnd, IDC_SCP_RADIO));
-		} else {
-			// \x83t\x83H\x81[\x83J\x83X\x82̏\x89\x8A\xFA\x8F\xF3\x91Ԃ\xF0 Cancel \x82ɂ\xB7\x82\xE9\x88ׁA\x82\xB1\x82̎\x9E\x93_\x82ł\xCD IDOK \x82\xC9
-			// \x83t\x83H\x81[\x83J\x83X\x82𓖂Ă\xE9\x81B\x8C\xE3\x82\xC5 WM_NEXTDLGCTL \x82Ńt\x83H\x81[\x83J\x83X\x82\xAA\x8E\x9F\x82̃{\x83^\x83\x93\x82ɂȂ\xE9\x81B
-			SetFocus(GetDlgItem(hDlgWnd, IDOK));
+		{
+			int focus_id;
+			if (Param->ScpEnable) {
+				focus_id = IDC_SCP_PATH;
+			} else {
+				focus_id = IDCANCEL;
+			}
+			PostMessage(hDlgWnd, WM_NEXTDLGCTL,
+						(WPARAM)GetDlgItem(hDlgWnd, focus_id), TRUE);
 		}
-		// \x83t\x83H\x81[\x83J\x83X\x82\xF0\x8E\x9F\x82̃{\x83^\x83\x93\x82Ɉڂ\xB7
-		// SetFocus() \x82Œ\xBC\x90ڃt\x83H\x81[\x83J\x83X\x82𓖂Ă\xE9\x82ƃ^\x83u\x83L\x81[\x82̓\xAE\x8D쓙\x82ɖ\xE2\x91肪\x8Fo\x82邽\x82߁A
-		// \x82\xB1\x82̃\x81\x83b\x83Z\x81[\x83W\x82𕹗p\x82\xB7\x82\xE9
-		PostMessage(hDlgWnd, WM_NEXTDLGCTL, 0, 0L);
 
 		// TRUE\x82ɂ\xB7\x82\xE9\x82ƃ{\x83^\x83\x93\x82Ƀt\x83H\x81[\x83J\x83X\x82\xAA\x93\x96\x82\xBD\x82\xE7\x82Ȃ\xA2\x81B
 		return FALSE;
@@ -209,9 +193,8 @@
 			if (IsDlgButtonChecked(hDlgWnd, IDC_SCP_RADIO) == BST_CHECKED) {
 				// SCP
 				DlgData->Param->DropType = DROP_TYPE_SCP;
-				SendMessage(GetDlgItem(hDlgWnd, IDC_SCP_PATH), WM_GETTEXT,
-							(WPARAM)DlgData->Param->ScpSendDirSize,
-							(LPARAM)DlgData->Param->ScpSendDirPtr);
+				GetDlgItemTextA(hDlgWnd, IDC_SCP_PATH,
+								DlgData->Param->ScpSendDirPtr, DlgData->Param->ScpSendDirSize);
 			} else if (IsDlgButtonChecked(hDlgWnd, IDC_SENDFILE_RADIO) == BST_CHECKED) {
 				// Send File
 				DlgData->Param->DropType =
@@ -242,16 +225,12 @@
 			DlgData->Param->DropType = DROP_TYPE_CANCEL;
 		}
 		if (wID == IDOK || wID == IDCANCEL) {
-			EndDialog(hDlgWnd, wID);
+			TTEndDialog(hDlgWnd, wID);
 			break;
 		}
 		return FALSE;
 	}
 	case WM_NCDESTROY:
-		if (DlgData->hNewFont != NULL) {
-			DeleteObject(DlgData->hNewFont);
-			DlgData->hNewFont = NULL;
-		}
 		free(DlgData);
 		break;
 
@@ -263,7 +242,7 @@
 
 enum drop_type ShowDropDialogBox(
 	HINSTANCE hInstance, HWND hWndParent,
-	const char *TargetFilename,
+	const TCHAR *TargetFilename,
 	enum drop_type DefaultDropType,
 	int RemaingFileCount,
 	bool EnableSCP,
@@ -288,7 +267,7 @@
 	Param.ScpSendDirSize = _countof(pts->ScpSendDir);
 	Param.UILanguageFile = pts->UILanguageFile;
 
-	int ret = DialogBoxParam(
+	int ret = TTDialogBoxParam(
 		hInstance, MAKEINTRESOURCE(IDD_DAD_DIALOG),
 		hWndParent, (DLGPROC)OnDragDropDlgProc,
 		(LPARAM)&Param);

Modified: trunk/teraterm/teraterm/dnddlg.h
===================================================================
--- trunk/teraterm/teraterm/dnddlg.h	2019-03-25 14:29:54 UTC (rev 7511)
+++ trunk/teraterm/teraterm/dnddlg.h	2019-03-25 14:45:53 UTC (rev 7512)
@@ -42,7 +42,7 @@
 
 enum drop_type ShowDropDialogBox(
 	HINSTANCE hInstance, HWND hWndParent,
-	const char *TargetFilename,
+	const TCHAR *TargetFilename,
 	enum drop_type DefaultDropType,
 	int RemaingFileCount,
 	bool EnableSCP,

From scmnotify ＠ osdn.net  Tue Mar 26 01:32:00 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Tue, 26 Mar 2019 01:32:00 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B7513=5D_ssh_auth_dialog_=E8=AA=BF?=
 =?utf-8?b?5pW0?=
Message-ID: <1553531520.844100.23656.nullmailer@users.osdn.me>

Revision: 7513
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7513
Author:   zmatsuo
Date:     2019-03-26 01:32:00 +0900 (Tue, 26 Mar 2019)
Log Message:
-----------
ssh auth dialog 調整

Modified Paths:
--------------
    branches/ssh_auth_dialog/ttssh2/ttxssh/auth.c
    branches/ssh_auth_dialog/ttssh2/ttxssh/resource.h
    branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.rc

Added Paths:
-----------
    branches/ssh_auth_dialog/

-------------- next part --------------
Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/auth.c
===================================================================
--- trunk/ttssh2/ttxssh/auth.c	2019-03-25 14:45:53 UTC (rev 7512)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/auth.c	2019-03-25 16:32:00 UTC (rev 7513)
@@ -79,17 +79,27 @@
 			            (LPARAM) (TCHAR *) chars);
 
 			if (tipwin == NULL) {
-				TCHAR *s;
+				TCHAR uimsg[MAX_UIMSG];
 				RECT rect;
+				const TCHAR *s;
+				s = _T("\x90\xA7\x8C䕶\x8E\x9A\x82\xAA\x93\xFC\x97͂\xB3\x82\xEA\x82܂\xB5\x82\xBD")
+					_T("\n")
+					_T("\x89p\x8C\xEA:")
+					_T("\n")
+					_T("control character is entered");
+				_tcscpy_s(uimsg, _countof(uimsg), s);
 				if (wParam == 'V' - 'A' + 1) {
-					s = _T("\x90\xA7\x8C䕶\x8E\x9A\x82\xF0\x93\xFC\x97͂\xB5\x82Ă\xA2\x82܂\xB7")
+					// CTRL + V
+					s = _T("\n")
+						_T("Shift+Insert\x82ŃN\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82\xA9\x82\xE7\x83y\x81[\x83X\x83g\x82ł\xAB\x82܂\xB7")
 						_T("\n")
-						_T("\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82\xA9\x82\xE7\x82̓\\x82\xE8\x95t\x82\xAF\x82̃V\x83\x87\x81[\x83g\x83J\x83b\x83g\x82\xCDCTRL+Insert\x82ł\xB7");
-				} else {
-					s = _T("\x90\xA7\x8C䕶\x8E\x9A\x82\xF0\x93\xFC\x97͂\xB5\x82Ă\xA2\x82܂\xB7");
+						_T("\x89p\x8C\xEA:")
+						_T("\n")
+						_T("Use Shift + Insert to paste from clipboard");
+						_tcscat_s(uimsg, _countof(uimsg), s);
 				}
 				GetWindowRect(control, &rect);
-				tipwin = TipWinCreate(control, rect.left, rect.bottom, s);
+				tipwin = TipWinCreate(control, rect.left, rect.bottom, uimsg);
 			}
 
 			return 0;

Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/resource.h
===================================================================
--- trunk/ttssh2/ttxssh/resource.h	2019-03-25 14:45:53 UTC (rev 7512)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/resource.h	2019-03-25 16:32:00 UTC (rev 7513)
@@ -117,7 +117,6 @@
 #define IDC_ECDSA256_TYPE               1067
 #define IDC_HISTORY_LABEL               1068
 #define IDC_ECDSA384_TYPE               1068
-#define IDC_EDIT1                       1069
 #define IDC_FINGER_PRINT                1069
 #define IDC_SENDFILE_EDIT               1069
 #define IDC_PASSWD                      1069
@@ -177,7 +176,6 @@
 #define IDC_RECVFILE_TO                 1101
 #define IDC_CHOOSEHOSTRSAFILE           1102
 #define IDC_HOSTRSAFILENAME             1103
-#define IDC_EDIT3                       1103
 #define IDC_FP_RANDOMART                1103
 #define IDC_CONFIRM_PASSWD              1103
 #define IDC_TTSSH_ICON                  1104
@@ -201,7 +199,6 @@
 #define IDC_SSHUSEPAGEANT               1205
 #define IDC_SSHUSETIS2                  1206
 #define IDC_REMEMBERPASSWORD            1207
-#define IDC_EDIT2                       1208
 #define IDC_SENDFILE_TO                 1208
 #define IDC_SFTP_CONSOLE                1208
 #define IDC_REMOVEKEY_EDIT              1208
@@ -228,14 +225,19 @@
 #define IDC_SSHFWDLOCALDYNAMIC_LISTEN   1229
 #define IDC_SSHDYNLISTENADDR            1230
 #define IDC_FROM_CLIPBOARD              1231
+#define IDC_SHOW_PASSPHRASE             1232
+#define IDC_CLEAR_CLIPBOARD             1233
+#define IDC_USE_CONTROL_CHARACTER       1234
+#define IDC_HOSTRSAFILENAMELABEL        1235
+#define IDC_RSAFILENAMELABEL            1236
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        115
+#define _APS_NEXT_RESOURCE_VALUE        116
 #define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1232
+#define _APS_NEXT_CONTROL_VALUE         1237
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.rc	2019-03-25 14:45:53 UTC (rev 7512)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.rc	2019-03-25 16:32:00 UTC (rev 7513)
@@ -48,42 +48,45 @@
     DEFPUSHBUTTON   "OK",IDOK,112,310,50,14
 END
 
-IDD_SSHAUTH DIALOGEX 0, 0, 330, 262
+IDD_SSHAUTH DIALOGEX 0, 0, 331, 402
 STYLE DS_SETFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "SSH Authentication"
 FONT 8, "Tahoma", 0, 0, 0x0
 BEGIN
     LTEXT           "Logging in to %s",IDC_SSHAUTHBANNER,6,3,166,10
-    LTEXT           "Authentication required.",IDC_SSHAUTHBANNER2,6,16,296,10
-    RTEXT           "User &name:",IDC_SSHUSERNAMELABEL,13,31,57,8,0,WS_EX_RIGHT
-    EDITTEXT        IDC_SSHUSERNAME,75,29,145,12,ES_AUTOHSCROLL
-    RTEXT           "&Passphrase:",IDC_SSHPASSWORDCAPTION,14,48,56,8,0,WS_EX_RIGHT
-    EDITTEXT        IDC_SSHPASSWORD,75,46,145,12,ES_PASSWORD | ES_AUTOHSCROLL
-    PUSHBUTTON      "&From Clipboard",IDC_FROM_CLIPBOARD,225,46,60,14
+    LTEXT           "Authentication required.",IDC_SSHAUTHBANNER2,6,16,319,10
+    LTEXT           "User &name:",IDC_SSHUSERNAMELABEL,17,31,57,8
+    EDITTEXT        IDC_SSHUSERNAME,28,44,145,12,ES_AUTOHSCROLL
+    LTEXT           "&Passphrase:",IDC_SSHPASSWORDCAPTION,17,62,56,8
+    EDITTEXT        IDC_SSHPASSWORD,28,76,145,12,ES_PASSWORD | ES_AUTOHSCROLL
+    PUSHBUTTON      "Paste from &clipboard",IDC_FROM_CLIPBOARD,28,92,80,14
+    CONTROL         "Cl&ear clipboard after paste",IDC_CLEAR_CLIPBOARD,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,40,110,132,10
+    CONTROL         "Use control characters",IDC_USE_CONTROL_CHARACTER,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,28,125,132,10
+    CONTROL         "&Show passphrase",IDC_SHOW_PASSPHRASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,28,140,132,10
     CONTROL         "Remember password in &memory",IDC_REMEMBER_PASSWORD,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,75,61,132,10
-    CONTROL         "F&orward agent",IDC_FORWARD_AGENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,75,74,132,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,157,132,10
+    CONTROL         "F&orward agent",IDC_FORWARD_AGENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,173,132,10
     CONTROL         "Use p&lain password to log in",IDC_SSHUSEPASSWORD,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,13,94,219,10
+                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,27,204,219,10
     CONTROL         "Use &RSA/DSA/ECDSA/ED25519 key to log in",IDC_SSHUSERSA,
-                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,122,152,10
-    CONTROL         "Use r&hosts to log in (SSH1)",IDC_SSHUSERHOSTS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,149,99,10
+                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,27,222,152,10
+    CONTROL         "Use r&hosts to log in (SSH1)",IDC_SSHUSERHOSTS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,27,272,99,10
     CONTROL         "Use SSH1:challenge/response(&TIS) / SSH2:keyboard-interactive to log in",IDC_SSHUSETIS,
-                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,14,193,300,10
-    CONTROL         "Use P&ageant to log in",IDC_SSHUSEPAGEANT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,14,219,276,10
-    PUSHBUTTON      "Private &key file:",IDC_CHOOSERSAFILE,169,120,58,14,WS_GROUP
-    EDITTEXT        IDC_RSAFILENAME,231,121,89,13,ES_AUTOHSCROLL
-    RTEXT           "Local &user name:",IDC_LOCALUSERNAMELABEL,120,150,91,8,0,WS_EX_RIGHT
-    EDITTEXT        IDC_LOCALUSERNAME,214,148,106,13,ES_AUTOHSCROLL
-    PUSHBUTTON      "Host private key &file:",IDC_CHOOSEHOSTRSAFILE,92,164,73,14
-    EDITTEXT        IDC_HOSTRSAFILENAME,169,164,151,13,ES_AUTOHSCROLL
-    DEFPUSHBUTTON   "OK",IDOK,96,242,50,14,WS_GROUP
-    PUSHBUTTON      "&Disconnect",IDCANCEL,183,242,50,14
-    GROUPBOX        "",IDC_STATIC,6,85,320,25
-    GROUPBOX        "",IDC_STATIC,6,113,320,25
-    GROUPBOX        "",IDC_STATIC,6,140,320,42
-    GROUPBOX        "",IDC_STATIC,6,184,320,25
-    GROUPBOX        "",IDC_STATIC,6,210,320,25
+                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,27,341,260,10
+    CONTROL         "Use P&ageant to log in",IDC_SSHUSEPAGEANT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,27,358,276,10
+    LTEXT           "Private &key file:",IDC_RSAFILENAMELABEL,38,238,91,8
+    EDITTEXT        IDC_RSAFILENAME,50,250,150,13,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_CHOOSERSAFILE,207,249,14,14,WS_GROUP
+    LTEXT           "Local &user name:",IDC_LOCALUSERNAMELABEL,38,284,91,8
+    EDITTEXT        IDC_LOCALUSERNAME,50,296,106,13,ES_AUTOHSCROLL
+    LTEXT           "Host private key &file:",IDC_HOSTRSAFILENAMELABEL,38,312,91,8
+    EDITTEXT        IDC_HOSTRSAFILENAME,50,326,151,13,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_CHOOSEHOSTRSAFILE,208,325,17,14
+    DEFPUSHBUTTON   "OK",IDOK,217,382,50,14,WS_GROUP
+    PUSHBUTTON      "&Disconnect",IDCANCEL,275,382,50,14
+    GROUPBOX        "authentication methods ",IDC_STATIC,17,191,300,185
 END
 
 IDD_HOSTDLG DIALOGEX 20, 20, 240, 128
@@ -446,7 +449,7 @@
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
+GUIDELINES DESIGNINFO
 BEGIN
     IDD_ABOUTDIALOG, DIALOG
     BEGIN
@@ -459,9 +462,14 @@
     IDD_SSHAUTH, DIALOG
     BEGIN
         LEFTMARGIN, 6
-        RIGHTMARGIN, 302
+        RIGHTMARGIN, 325
+        VERTGUIDE, 17
+        VERTGUIDE, 28
+        VERTGUIDE, 40
+        VERTGUIDE, 52
         TOPMARGIN, 3
-        BOTTOMMARGIN, 256
+        BOTTOMMARGIN, 396
+        HORZGUIDE, 234
     END
 
     IDD_HOSTDLG, DIALOG

From scmnotify ＠ osdn.net  Wed Mar 27 00:42:30 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Wed, 27 Mar 2019 00:42:30 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc1MTRdIOODl+ODreOCuOOCp+OCr+ODiA==?=
 =?utf-8?b?44OV44Kh44Kk44Or5L+d5a6I?=
Message-ID: <1553614950.010629.43884.nullmailer@users.osdn.me>

Revision: 7514
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7514
Author:   zmatsuo
Date:     2019-03-27 00:42:29 +0900 (Wed, 27 Mar 2019)
Log Message:
-----------
プロジェクトファイル保守
vs2017でビルドできるよう調整

Modified Paths:
--------------
    trunk/teraterm/teraterm/ttermpro.v15.vcxproj
    trunk/teraterm/ttpdlg/ttpdlg.v15.vcxproj
    trunk/teraterm/ttpfile/ttpfile.v15.vcxproj

-------------- next part --------------
Modified: trunk/teraterm/teraterm/ttermpro.v15.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v15.vcxproj	2019-03-25 16:32:00 UTC (rev 7513)
+++ trunk/teraterm/teraterm/ttermpro.v15.vcxproj	2019-03-26 15:42:29 UTC (rev 7514)
@@ -137,8 +137,11 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\common\dlglib.c" />
+    <ClCompile Include="..\common\dlglib_cpp.cpp" />
+    <ClCompile Include="..\common\dlglib_tmpl.cpp" />
     <ClCompile Include="..\common\stdafx.cpp" />
     <ClCompile Include="..\common\ttlib.c" />
+    <ClCompile Include="..\common\tipwin.cpp" />
     <ClCompile Include="..\common\win16api.c" />
     <ClCompile Include="..\common\codeconv.cpp" />
     <ClCompile Include="..\common\dllutil.cpp" />

Modified: trunk/teraterm/ttpdlg/ttpdlg.v15.vcxproj
===================================================================
--- trunk/teraterm/ttpdlg/ttpdlg.v15.vcxproj	2019-03-25 16:32:00 UTC (rev 7513)
+++ trunk/teraterm/ttpdlg/ttpdlg.v15.vcxproj	2019-03-26 15:42:29 UTC (rev 7514)
@@ -134,6 +134,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\common\dlglib.c" />
+    <ClCompile Include="..\common\dlglib_tmpl.cpp" />
     <ClCompile Include="..\common\ttlib.c" />
     <ClCompile Include="ttdlg.c" />
   </ItemGroup>

Modified: trunk/teraterm/ttpfile/ttpfile.v15.vcxproj
===================================================================
--- trunk/teraterm/ttpfile/ttpfile.v15.vcxproj	2019-03-25 16:32:00 UTC (rev 7513)
+++ trunk/teraterm/ttpfile/ttpfile.v15.vcxproj	2019-03-26 15:42:29 UTC (rev 7514)
@@ -128,6 +128,8 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\common\dlglib.c" />
+    <ClCompile Include="..\common\dlglib_cpp.cpp" />
+    <ClCompile Include="..\common\dlglib_tmpl.cpp" />
     <ClCompile Include="..\common\ttlib.c" />
     <ClCompile Include="..\common\win16api.c" />
     <ClCompile Include="bplus.c" />
@@ -170,4 +172,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

From scmnotify ＠ osdn.net  Wed Mar 27 00:42:43 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Wed, 27 Mar 2019 00:42:43 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc1MTVdIHR0cGRsZ+WGheOBruODgOOCpA==?=
 =?utf-8?b?44Ki44Ot44Kw44KS6auYRHBp5a++5b+c?=
Message-ID: <1553614963.595773.49406.nullmailer@users.osdn.me>

Revision: 7515
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7515
Author:   zmatsuo
Date:     2019-03-27 00:42:43 +0900 (Wed, 27 Mar 2019)
Log Message:
-----------
ttpdlg内のダイアログを高Dpi対応
ttpdlg.dllをtterm.exeに統合
(installer/teraterm.issは未着手)

Modified Paths:
--------------
    trunk/CMakeLists.txt
    trunk/teraterm/CMakeLists.txt
    trunk/teraterm/teraterm/CMakeLists.txt
    trunk/teraterm/teraterm/ttdialog.c
    trunk/teraterm/teraterm/vtwin.cpp
    trunk/teraterm/ttpdlg/ttdlg.c
    trunk/teraterm/ttpdlg/ttpdlg.rc

Added Paths:
-----------
    trunk/teraterm/teraterm/svnversion.h.in
    trunk/teraterm/ttpdlg/ttdlg.h

Removed Paths:
-------------
    trunk/teraterm/ttpdlg/CMakeLists.txt
    trunk/teraterm/ttpdlg/svnversion.h.in
    trunk/teraterm/ttpdlg/ttpdlg-version.rc

-------------- next part --------------
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2019-03-26 15:42:29 UTC (rev 7514)
+++ trunk/CMakeLists.txt	2019-03-26 15:42:43 UTC (rev 7515)
@@ -86,3 +86,12 @@
 if(${ENABLE_TTXSAMPLES})
   add_subdirectory(TTXSamples)
 endif()
+
+####
+# ソースツリー内に生成ファイルが存在していたら削除する
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/teraterm/ttpdlg/svnversion.h")
+  file(REMOVE "${CMAKE_CURRENT_SOURCE_DIR}/teraterm/ttpdlg/svnversion.h")
+endif()
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ttssh2/ttxssh/puttyversion.h")
+  file(REMOVE "${CMAKE_CURRENT_SOURCE_DIR}/ttssh2/ttxssh/puttyversion.h")
+endif()

Modified: trunk/teraterm/CMakeLists.txt
===================================================================
--- trunk/teraterm/CMakeLists.txt	2019-03-26 15:42:29 UTC (rev 7514)
+++ trunk/teraterm/CMakeLists.txt	2019-03-26 15:42:43 UTC (rev 7515)
@@ -4,11 +4,6 @@
   ttpcmn
   PROPERTIES FOLDER teraterm)
 
-add_subdirectory(ttpdlg)
-set_target_properties(
-  ttpdlg
-  PROPERTIES FOLDER teraterm)
-
 add_subdirectory(ttpfile)
 set_target_properties(
   ttpfile

Modified: trunk/teraterm/teraterm/CMakeLists.txt
===================================================================
--- trunk/teraterm/teraterm/CMakeLists.txt	2019-03-26 15:42:29 UTC (rev 7514)
+++ trunk/teraterm/teraterm/CMakeLists.txt	2019-03-26 15:42:43 UTC (rev 7515)
@@ -53,6 +53,19 @@
   ${COMMON_SRC}
   )
 
+set(TTDLG_SRC
+  ../ttpdlg/dlg_res.h
+  ../ttpdlg/ttdlg.c
+  ../ttpdlg/ttdlg.h
+  ../ttpdlg/ttpdlg.rc
+  )
+
+source_group(
+  "ttdlg"
+  FILES
+  ${TTDLG_SRC}
+  )
+
 set(SRC
   addsetting.cpp
   addsetting.h
@@ -119,12 +132,17 @@
   #
   teraterm.manifest
   #
+  svnversion.h.in
+  ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h
+  #
   ${COMMON_SRC}
+  ${TTDLG_SRC}
   )
 
 include_directories(
   ../common
   ../ttpfile
+  ../ttpdlg
   ${SFMT_INCLUDE_DIRS}
   ${ONIGURUMA_INCLUDE_DIRS}
   .
@@ -158,7 +176,6 @@
 target_link_libraries(
   teraterm
   ttpcmn
-  ttpdlg
   ttpfile
   ttpset
   ttptek
@@ -180,12 +197,15 @@
 add_dependencies(
   teraterm
   ttpcmn
-  ttpdlg
   ttpfile
   ttpset
   ttptek
   )
 
+configure_file(
+  svnversion.h.in
+  svnversion.h @ONLY)
+
 # copy .lng files
 if(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017")
   add_custom_target(
@@ -241,3 +261,8 @@
       "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}$(Configuration)/lang/Traditional Chinese.lng"
     )
 endif()
+
+####
+configure_file(
+  svnversion.h.in
+  svnversion.h @ONLY)

Copied: trunk/teraterm/teraterm/svnversion.h.in (from rev 7514, trunk/teraterm/ttpdlg/svnversion.h.in)
===================================================================
--- trunk/teraterm/teraterm/svnversion.h.in	                        (rev 0)
+++ trunk/teraterm/teraterm/svnversion.h.in	2019-03-26 15:42:43 UTC (rev 7515)
@@ -0,0 +1 @@
+#cmakedefine SVNVERSION @SVNVERSION@

Modified: trunk/teraterm/teraterm/ttdialog.c
===================================================================
--- trunk/teraterm/teraterm/ttdialog.c	2019-03-26 15:42:29 UTC (rev 7514)
+++ trunk/teraterm/teraterm/ttdialog.c	2019-03-26 15:42:43 UTC (rev 7515)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2007-2017 TeraTerm Project
+ * (C) 2007-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,13 +31,11 @@
 #include "teraterm.h"
 #include "tttypes.h"
 #include "ttplug.h" /* TTPLUG */
+#include "ttdlg.h"
 
 #include "ttdialog.h"
 #include "ttwinman.h"
 
-static HMODULE HTTDLG = NULL;
-static TTDLGUseCount = 0;
-
 PSetupTerminal SetupTerminal;
 PSetupWin SetupWin;
 PSetupKeyboard SetupKeyboard;
@@ -51,131 +49,29 @@
 PWindowWindow WindowWindow;
 PTTDLGSetUILanguageFile TTDLGSetUILanguageFile;
 
-#define IdSetupTerminal   1
-#define IdSetupWin        2
-#define IdSetupKeyboard   3
-#define IdSetupSerialPort 4
-#define IdSetupTCPIP      5
-#define IdGetHostName     6
-#define IdChangeDirectory 7
-#define IdAboutDialog     8
-#define IdChooseFontDlg   9
-#define IdSetupGeneral    10
-#define IdWindowWindow    11
-#define IdTTDLGSetUILanguageFile  12
-
 BOOL LoadTTDLG()
 {
-	BOOL Err;
+	SetupTerminal = _SetupTerminal;
+	SetupWin = _SetupWin;
+	SetupKeyboard = _SetupKeyboard;
+	SetupSerialPort = _SetupSerialPort;
+	SetupTCPIP = _SetupTCPIP;
+	GetHostName = _GetHostName;
+	ChangeDirectory = _ChangeDirectory;
+	AboutDialog = _AboutDialog;
+	ChooseFontDlg = _ChooseFontDlg;
+	SetupGeneral = _SetupGeneral;
+	WindowWindow = _WindowWindow;
+	TTDLGSetUILanguageFile = _TTDLGSetUILanguageFile;
 
-	if (HTTDLG == NULL) {
-		TTDLGUseCount = 0;
+	TTDLGSetUILanguageFile(ts.UILanguageFile);
+	TTXGetUIHooks(); /* TTPLUG */
 
-		HTTDLG = LoadHomeDLL("TTPDLG.DLL");
-		if (HTTDLG==NULL) return FALSE;
-
-		Err = FALSE;
-
-		SetupTerminal = (PSetupTerminal)GetProcAddress(HTTDLG,
-		  MAKEINTRESOURCE(IdSetupTerminal));
-		if (SetupTerminal==NULL) {
-			Err = TRUE;
-		}
-
-		SetupWin = (PSetupWin)GetProcAddress(HTTDLG,
-		  MAKEINTRESOURCE(IdSetupWin));
-		if (SetupWin==NULL) {
-			Err = TRUE;
-		}
-
-		SetupKeyboard = (PSetupKeyboard)GetProcAddress(HTTDLG,
-		  MAKEINTRESOURCE(IdSetupKeyboard));
-		if (SetupKeyboard==NULL) {
-			Err = TRUE;
-		}
-
-		SetupSerialPort = (PSetupSerialPort)GetProcAddress(HTTDLG,
-		  MAKEINTRESOURCE(IdSetupSerialPort));
-		if (SetupSerialPort==NULL) {
-			Err = TRUE;
-		}
-
-		SetupTCPIP = (PSetupTCPIP)GetProcAddress(HTTDLG,
-		  MAKEINTRESOURCE(IdSetupTCPIP));
-		if (SetupTCPIP==NULL) {
-			Err = TRUE;
-		}
-
-		GetHostName = (PGetHostName)GetProcAddress(HTTDLG,
-		  MAKEINTRESOURCE(IdGetHostName));
-		if (GetHostName==NULL) {
-			Err = TRUE;
-		}
-
-		ChangeDirectory = (PChangeDirectory)GetProcAddress(HTTDLG,
-		  MAKEINTRESOURCE(IdChangeDirectory));
-		if (ChangeDirectory==NULL) {
-			Err = TRUE;
-		}
-
-		AboutDialog = (PAboutDialog)GetProcAddress(HTTDLG,
-		  MAKEINTRESOURCE(IdAboutDialog));
-		if (AboutDialog==NULL) {
-			Err = TRUE;
-		}
-
-		ChooseFontDlg = (PChooseFontDlg)GetProcAddress(HTTDLG,
-		  MAKEINTRESOURCE(IdChooseFontDlg));
-		if (ChooseFontDlg==NULL) {
-			Err = TRUE;
-		}
-
-		SetupGeneral = (PSetupGeneral)GetProcAddress(HTTDLG,
-		  MAKEINTRESOURCE(IdSetupGeneral));
-		if (SetupGeneral==NULL) {
-			Err = TRUE;
-		}
-
-		WindowWindow = (PWindowWindow)GetProcAddress(HTTDLG,
-		  MAKEINTRESOURCE(IdWindowWindow));
-		if (WindowWindow==NULL) {
-			Err = TRUE;
-		}
-
-		TTDLGSetUILanguageFile = (PTTDLGSetUILanguageFile)GetProcAddress(HTTDLG,
-		  MAKEINTRESOURCE(IdTTDLGSetUILanguageFile));
-		if (TTDLGSetUILanguageFile==NULL) {
-			Err = TRUE;
-		}
-		else {
-			TTDLGSetUILanguageFile(ts.UILanguageFile);
-		}
-
-		if (Err) {
-			FreeLibrary(HTTDLG);
-			HTTDLG = NULL;
-			return FALSE;
-		}
-
-		TTXGetUIHooks(); /* TTPLUG */
-	}
-	TTDLGUseCount++;
 	return TRUE;
 }
 
 BOOL FreeTTDLG()
 {
-	if (TTDLGUseCount==0) {
-		return FALSE;
-	}
-	TTDLGUseCount--;
-	if (TTDLGUseCount>0) {
-		return TRUE;
-	}
-	if (HTTDLG!=NULL) {
-		FreeLibrary(HTTDLG);
-		HTTDLG = NULL;
-	}
-	return FALSE;
+	return TRUE;
 }
 

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2019-03-26 15:42:29 UTC (rev 7514)
+++ trunk/teraterm/teraterm/vtwin.cpp	2019-03-26 15:42:43 UTC (rev 7515)
@@ -1991,8 +1991,10 @@
 
 	FreeIME(HVTWin);
 	FreeTTSET();
+#if 0	// free\x82Ɏ\xB8\x94s\x82\xB7\x82\xE9\x82܂\xC5free\x82\xB5\x91\xB1\x82\xAF\x82\xE9
 	do { }
 	while (FreeTTDLG());
+#endif
 
 	do { }
 	while (FreeTTFILE());

Deleted: trunk/teraterm/ttpdlg/CMakeLists.txt
===================================================================
--- trunk/teraterm/ttpdlg/CMakeLists.txt	2019-03-26 15:42:29 UTC (rev 7514)
+++ trunk/teraterm/ttpdlg/CMakeLists.txt	2019-03-26 15:42:43 UTC (rev 7515)
@@ -1,79 +0,0 @@
-project(ttpdlg)
-
-include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake)
-
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
-
-if(MINGW)
-  set(CMAKE_RC_FLAGS "${CMAKE_RC_FLAGS} -I ${CMAKE_CURRENT_SOURCE_DIR}/../common")
-else()
-  set(CMAKE_RC_FLAGS "${CMAKE_RC_FLAGS} /i ${CMAKE_CURRENT_SOURCE_DIR}/../common")
-endif()
-
-set(COMMON_SRC
-  ../common/dlglib.c
-  ../common/dlglib.h
-  ../common/dlglib_tmpl.cpp
-  ../common/ttlib.c
-  ../common/ttlib.h
-  ../common/teraterm.ico
-  )
-
-source_group(
-  "common"
-  FILES
-  ${COMMON_SRC}
-  )
-
-set(SRC
-  dlg_res.h
-  ttdlg.c
-  ttpdlg.def
-  ttpdlg.rc
-  ttpdlg-version.rc
-  ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h
-  ${COMMON_SRC}
-  )
-
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}/../common
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${ONIGURUMA_INCLUDE_DIRS}
-  )
-
-link_directories(
-  ${ONIGURUMA_LIBRARY_DIRS}
-  )
-
-add_library(
-  ttpdlg SHARED
-  ${SRC}
-  )
-
-if(MINGW)
-  set_target_properties(
-    ttpdlg
-    PROPERTIES PREFIX ""
-    SUFFIX ".dll"
-    )
-endif()
-
-target_link_libraries(
-  ttpdlg
-  ttpcmn
-  optimized onig.lib
-  debug onigd.lib
-  )
-
-add_dependencies(
-  ttpdlg
-  ttpcmn
-  )
-
-configure_file(
-  svnversion.h.in
-  svnversion.h @ONLY)
-
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/svnversion.h")
-  file(REMOVE "${CMAKE_CURRENT_SOURCE_DIR}/svnversion.h")
-endif()

Deleted: trunk/teraterm/ttpdlg/svnversion.h.in
===================================================================
--- trunk/teraterm/ttpdlg/svnversion.h.in	2019-03-26 15:42:29 UTC (rev 7514)
+++ trunk/teraterm/ttpdlg/svnversion.h.in	2019-03-26 15:42:43 UTC (rev 7515)
@@ -1 +0,0 @@
-#cmakedefine SVNVERSION @SVNVERSION@

Modified: trunk/teraterm/ttpdlg/ttdlg.c
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.c	2019-03-26 15:42:29 UTC (rev 7514)
+++ trunk/teraterm/ttpdlg/ttdlg.c	2019-03-26 15:42:43 UTC (rev 7515)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2004-2018 TeraTerm Project
+ * (C) 2004-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,6 +45,7 @@
 #include "ttcommon.h"
 #include "dlg_res.h"
 #include "svnversion.h"
+#include "ttdlg.h"
 
 // Oniguruma: Regular expression library
 #define ONIG_EXTERN extern
@@ -55,7 +56,7 @@
 #undef EFFECT_ENABLED	// \x83G\x83t\x83F\x83N\x83g\x82̗L\x8C\xF8\x89”\xDB
 #undef TEXTURE_ENABLED	// \x83e\x83N\x83X\x83`\x83\x83\x82̗L\x8C\xF8\x89”\xDB
 
-#include "compat_w95.h"
+//#include "compat_w95.h"
 
 #ifdef _DEBUG
 #define calloc(c, s)  _calloc_dbg((c), (s), _NORMAL_BLOCK, __FILE__, __LINE__)
@@ -63,18 +64,18 @@
 #define _strdup(s)	  _strdup_dbg((s), _NORMAL_BLOCK, __FILE__, __LINE__)
 #endif
 
-static HANDLE hInst;
+#undef DialogBoxParam
+#define DialogBoxParam(p1,p2,p3,p4,p5) \
+	TTDialogBoxParam(p1,p2,p3,p4,p5)
+#undef DialogBox
+#define DialogBox(p1,p2,p3,p4) \
+	TTDialogBox(p1,p2,p3,p4)
+#undef EndDialog
+#define EndDialog(p1,p2) \
+	TTEndDialog(p1, p2)
 
-static HFONT DlgAboutFont;
-static HFONT DlgDirFont;
-static HFONT DlgGenFont;
-static HFONT DlgHostFont;
-static HFONT DlgKeybFont;
-static HFONT DlgSerialFont;
-static HFONT DlgTcpipFont;
-static HFONT DlgTermFont;
-static HFONT DlgWinFont;
-static HFONT DlgWinlistFont;
+//static HANDLE hInst;
+extern HANDLE hInst;
 
 char UILanguageFile[MAX_PATH];
 
@@ -116,169 +117,63 @@
 	 "230400", "460800", "921600", NULL};
 
 
-BOOL CALLBACK TermDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK TermDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
 {
+	static const DlgTextInfo TextInfosCom[] = {
+		{ 0, "DLG_TERM_TITLE" },
+		{ IDC_TERMWIDTHLABEL, "DLG_TERM_WIDTHLABEL" },
+		{ IDC_TERMISWIN, "DLG_TERM_ISWIN" },
+		{ IDC_TERMRESIZE, "DLG_TERM_RESIZE" },
+		{ IDC_TERMNEWLINE, "DLG_TERM_NEWLINE" },
+		{ IDC_TERMCRRCVLABEL, "DLG_TERM_CRRCV" },
+		{ IDC_TERMCRSENDLABEL, "DLG_TERM_CRSEND" },
+		{ IDC_TERMIDLABEL, "DLG_TERM_ID" },
+		{ IDC_TERMLOCALECHO, "DLG_TERM_LOCALECHO" },
+		{ IDC_TERMANSBACKTEXT, "DLG_TERM_ANSBACK" },
+		{ IDC_TERMAUTOSWITCH, "DLG_TERM_AUTOSWITCH" },
+		{ IDOK, "BTN_OK" },
+		{ IDCANCEL, "BTN_CANCEL" },
+		{ IDC_TERMHELP, "BTN_HELP" },
+	};
 	PTTSet ts;
 	WORD w;
 	//  char Temp[HostNameMaxLength + 1]; // 81(yutaka)
 	char Temp[81]; // 81(yutaka)
-	char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
-	LOGFONT logfont;
-	HFONT font;
 
 	switch (Message) {
 		case WM_INITDIALOG:
 			ts = (PTTSet)lParam;
-			SetWindowLong(Dialog, DWL_USER, lParam);
+			SetWindowLongPtr(Dialog, DWLP_USER, lParam);
 
-			font = (HFONT)SendMessage(Dialog, WM_GETFONT, 0, 0);
-			GetObject(font, sizeof(LOGFONT), &logfont);
-			if (get_lang_font("DLG_SYSTEM_FONT", Dialog, &logfont, &DlgTermFont, UILanguageFile)) {
-				SendDlgItemMessage(Dialog, IDC_TERMWIDTHLABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMWIDTH, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMX, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMHEIGHT, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMISWIN, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMRESIZE, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMNEWLINE, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMCRRCVLABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMCRRCV, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMCRSENDLABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMCRSEND, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMIDLABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMID, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMLOCALECHO, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMANSBACKTEXT, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMANSBACK, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMAUTOSWITCH, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDOK, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDCANCEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMHELP, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
+			SetDlgTexts(Dialog, TextInfosCom, _countof(TextInfosCom), UILanguageFile);
 				if (ts->Language==IdJapanese) {
-					SendDlgItemMessage(Dialog, IDC_TERMKANJILABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMKANJI, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMKANA, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMKANJISENDLABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMKANJISEND, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMKANASEND, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMKINTEXT, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMKIN, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMKOUTTEXT, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMKOUT, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_LOCALE_LABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_LOCALE_EDIT, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				}
-				else if (ts->Language==IdRussian) {
-					SendDlgItemMessage(Dialog, IDC_TERMRUSSCHARSET, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMRUSSHOSTLABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMRUSSHOST, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMRUSSCLIENTLABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMRUSSCLIENT, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMRUSSFONTLABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMRUSSFONT, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				}
-				else if (ts->Language==IdUtf8 || ts->Language==IdKorean) {
-					SendDlgItemMessage(Dialog, IDC_TERMKANJILABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMKANJI, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMKANJISENDLABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMKANJISEND, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_LOCALE_LABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_LOCALE_EDIT, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				}
+				static const DlgTextInfo TextInfosJp[] = {
+					{ IDC_TERMKANJILABEL, "DLG_TERM_KANJI" },
+					{ IDC_TERMKANA, "DLG_TERM_KANA" },
+					{ IDC_TERMKANJISENDLABEL, "DLG_TERM_KANJISEND" },
+					{ IDC_TERMKANASEND, "DLG_TERM_KANASEND" },
+					{ IDC_TERMKINTEXT, "DLG_TERM_KIN" },
+					{ IDC_TERMKOUTTEXT, "DLG_TERM_KOUT" },
+					{ IDC_LOCALE_LABEL, "DLG_TERM_LOCALE" },
+				};
+				SetDlgTexts(Dialog, TextInfosJp, _countof(TextInfosJp), UILanguageFile);
 			}
-			else {
-				DlgTermFont = NULL;
-			}
-
-			GetWindowText(Dialog, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TERM_TITLE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetWindowText(Dialog, uimsg);
-			GetDlgItemText(Dialog, IDC_TERMWIDTHLABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TERM_WIDTHLABEL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TERMWIDTHLABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_TERMISWIN, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TERM_ISWIN", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TERMISWIN, uimsg);
-			GetDlgItemText(Dialog, IDC_TERMRESIZE, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TERM_RESIZE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TERMRESIZE, uimsg);
-			GetDlgItemText(Dialog, IDC_TERMNEWLINE, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TERM_NEWLINE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TERMNEWLINE, uimsg);
-			GetDlgItemText(Dialog, IDC_TERMCRRCVLABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TERM_CRRCV", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TERMCRRCVLABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_TERMCRSENDLABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TERM_CRSEND", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TERMCRSENDLABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_TERMIDLABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TERM_ID", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TERMIDLABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_TERMLOCALECHO, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TERM_LOCALECHO", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TERMLOCALECHO, uimsg);
-			GetDlgItemText(Dialog, IDC_TERMANSBACKTEXT, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TERM_ANSBACK", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TERMANSBACKTEXT, uimsg);
-			GetDlgItemText(Dialog, IDC_TERMAUTOSWITCH, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TERM_AUTOSWITCH", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TERMAUTOSWITCH, uimsg);
-			GetDlgItemText(Dialog, IDOK, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_OK", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDOK, uimsg);
-			GetDlgItemText(Dialog, IDCANCEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_CANCEL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDCANCEL, uimsg);
-			GetDlgItemText(Dialog, IDC_TERMHELP, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_HELP", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TERMHELP, uimsg);
-			if ( ts->Language==IdJapanese ) {
-				GetDlgItemText(Dialog, IDC_TERMKANJILABEL, uimsg2, sizeof(uimsg2));
-				get_lang_msg("DLG_TERM_KANJI", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-				SetDlgItemText(Dialog, IDC_TERMKANJILABEL, uimsg);
-				GetDlgItemText(Dialog, IDC_TERMKANA, uimsg2, sizeof(uimsg2));
-				get_lang_msg("DLG_TERM_KANA", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-				SetDlgItemText(Dialog, IDC_TERMKANA, uimsg);
-				GetDlgItemText(Dialog, IDC_TERMKANJISENDLABEL, uimsg2, sizeof(uimsg2));
-				get_lang_msg("DLG_TERM_KANJISEND", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-				SetDlgItemText(Dialog, IDC_TERMKANJISENDLABEL, uimsg);
-				GetDlgItemText(Dialog, IDC_TERMKANASEND, uimsg2, sizeof(uimsg2));
-				get_lang_msg("DLG_TERM_KANASEND", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-				SetDlgItemText(Dialog, IDC_TERMKANASEND, uimsg);
-				GetDlgItemText(Dialog, IDC_TERMKINTEXT, uimsg2, sizeof(uimsg2));
-				get_lang_msg("DLG_TERM_KIN", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-				SetDlgItemText(Dialog, IDC_TERMKINTEXT, uimsg);
-				GetDlgItemText(Dialog, IDC_TERMKOUTTEXT, uimsg2, sizeof(uimsg2));
-				get_lang_msg("DLG_TERM_KOUT", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-				SetDlgItemText(Dialog, IDC_TERMKOUTTEXT, uimsg);
-				GetDlgItemText(Dialog, IDC_LOCALE_LABEL, uimsg2, sizeof(uimsg2));
-				get_lang_msg("DLG_TERM_LOCALE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-				SetDlgItemText(Dialog, IDC_LOCALE_LABEL, uimsg);
-			}
 			else if ( ts->Language==IdRussian ) {
-				GetDlgItemText(Dialog, IDC_TERMRUSSCHARSET, uimsg2, sizeof(uimsg2));
-				get_lang_msg("DLG_TERM_RUSSCHARSET", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-				SetDlgItemText(Dialog, IDC_TERMRUSSCHARSET, uimsg);
-				GetDlgItemText(Dialog, IDC_TERMRUSSHOSTLABEL, uimsg2, sizeof(uimsg2));
-				get_lang_msg("DLG_TERM_RUSSHOST", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-				SetDlgItemText(Dialog, IDC_TERMRUSSHOSTLABEL, uimsg);
-				GetDlgItemText(Dialog, IDC_TERMRUSSCLIENTLABEL, uimsg2, sizeof(uimsg2));
-				get_lang_msg("DLG_TERM_RUSSCLIENT", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-				SetDlgItemText(Dialog, IDC_TERMRUSSCLIENTLABEL, uimsg);
-				GetDlgItemText(Dialog, IDC_TERMRUSSFONTLABEL, uimsg2, sizeof(uimsg2));
-				get_lang_msg("DLG_TERM_RUSSFONT", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-				SetDlgItemText(Dialog, IDC_TERMRUSSFONTLABEL, uimsg);
+				static const DlgTextInfo TextInfosRu[] = {
+					{ IDC_TERMRUSSCHARSET, "DLG_TERM_RUSSCHARSET" },
+					{ IDC_TERMRUSSHOSTLABEL, "DLG_TERM_RUSSHOST" },
+					{ IDC_TERMRUSSCLIENTLABEL, "DLG_TERM_RUSSCLIENT" },
+					{ IDC_TERMRUSSFONTLABEL, "DLG_TERM_RUSSFONT" },
+				};
+				SetDlgTexts(Dialog, TextInfosRu, _countof(TextInfosRu), UILanguageFile);
 			}
 			else if (ts->Language==IdUtf8 || ts->Language==IdKorean) {
-				GetDlgItemText(Dialog, IDC_TERMKANJILABEL, uimsg2, sizeof(uimsg2));
-				get_lang_msg("DLG_TERMK_KANJI", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-				SetDlgItemText(Dialog, IDC_TERMKANJILABEL, uimsg);
-				GetDlgItemText(Dialog, IDC_TERMKANJISENDLABEL, uimsg2, sizeof(uimsg2));
-				get_lang_msg("DLG_TERMK_KANJISEND", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-				SetDlgItemText(Dialog, IDC_TERMKANJISENDLABEL, uimsg);
-				GetDlgItemText(Dialog, IDC_LOCALE_LABEL, uimsg2, sizeof(uimsg2));
-				get_lang_msg("DLG_TERM_LOCALE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-				SetDlgItemText(Dialog, IDC_LOCALE_LABEL, uimsg);
+				static const DlgTextInfo TextInfosKo[] = {
+					{ IDC_TERMKANJILABEL, "DLG_TERMK_KANJI" },
+					{ IDC_TERMKANJISENDLABEL, "DLG_TERMK_KANJISEND" },
+					{ IDC_LOCALE_LABEL, "DLG_TERM_LOCALE" },
+				};
+				SetDlgTexts(Dialog, TextInfosKo, _countof(TextInfosKo), UILanguageFile);
 			}
 
 			SetDlgItemInt(Dialog,IDC_TERMWIDTH,ts->TerminalWidth,FALSE);
@@ -475,16 +370,10 @@
 
 					}
 					EndDialog(Dialog, 1);
-					if (DlgTermFont != NULL) {
-						DeleteObject(DlgTermFont);
-					}
 					return TRUE;
 
 				case IDCANCEL:
 					EndDialog(Dialog, 0);
-					if (DlgTermFont != NULL) {
-						DeleteObject(DlgTermFont);
-					}
 					return TRUE;
 
 				case IDC_TERMISWIN:
@@ -611,141 +500,51 @@
 	}
 }
 
-BOOL CALLBACK WinDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK WinDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
 {
+	static const DlgTextInfo TextInfos[] = {
+		{ 0, "DLG_WIN_TITLE" },
+		{ IDC_WINTITLELABEL, "DLG_WIN_TITLELABEL" },
+		{ IDC_WINCURSOR, "DLG_WIN_CURSOR" },
+		{ IDC_WINBLOCK, "DLG_WIN_BLOCK" },
+		{ IDC_WINVERT, "DLG_WIN_VERT" },
+		{ IDC_WINHORZ, "DLG_WIN_HORZ" },
+		{ IDC_FONTBOLD, "DLG_WIN_BOLDFONT" },
+		{ IDC_WINHIDETITLE, "DLG_WIN_HIDETITLE" },
+		{ IDC_WINHIDEMENU, "DLG_WIN_HIDEMENU" },
+		{ IDC_WINCOLOREMU, "DLG_WIN_COLOREMU" },
+		{ IDC_WINAIXTERM16, "DLG_WIN_AIXTERM16" },
+		{ IDC_WINXTERM256, "DLG_WIN_XTERM256" },
+		{ IDC_WINSCROLL1, "DLG_WIN_SCROLL1" },
+		{ IDC_WINSCROLL3, "DLG_WIN_SCROLL3" },
+		{ IDC_WINCOLOR, "DLG_WIN_COLOR" },
+		{ IDC_WINTEXT, "DLG_WIN_TEXT" },
+		{ IDC_WINBACK, "DLG_WIN_BG" },
+		{ IDC_WINATTRTEXT, "DLG_WIN_ATTRIB" },
+		{ IDC_WINREV, "DLG_WIN_REVERSE" },
+		{ IDC_WINREDLABEL, "DLG_WIN_R" },
+		{ IDC_WINGREENLABEL, "DLG_WIN_G" },
+		{ IDC_WINBLUELABEL, "DLG_WIN_B" },
+		{ IDC_WINUSENORMALBG, "DLG_WIN_ALWAYSBG" },
+		{ IDOK, "BTN_OK" },
+		{ IDCANCEL, "BTN_CANCEL" },
+		{ IDC_WINHELP, "BTN_HELP" },
+		{ IDC_WINCOLOREMU, "DLG_WIN_PCBOLD16" },		// get_lang_msg
+	};
 	PTTSet ts;
 	HWND Wnd, HRed, HGreen, HBlue;
 	int IAttr, IOffset;
 	WORD i, pos, ScrollCode, NewPos;
 	HDC DC;
-	char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
-	LOGFONT logfont;
-	HFONT font;
+	TCHAR uimsg[MAX_UIMSG];
 
 	switch (Message) {
 		case WM_INITDIALOG:
 			ts = (PTTSet)lParam;
-			SetWindowLong(Dialog, DWL_USER, lParam);
+			SetWindowLongPtr(Dialog, DWLP_USER, lParam);
 
-			font = (HFONT)SendMessage(Dialog, WM_GETFONT, 0, 0);
-			GetObject(font, sizeof(LOGFONT), &logfont);
-			if (get_lang_font("DLG_SYSTEM_FONT", Dialog, &logfont, &DlgWinFont, UILanguageFile)) {
-				SendDlgItemMessage(Dialog, IDC_WINTITLELABEL, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINTITLE, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINCURSOR, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINBLOCK, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINVERT, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINHORZ, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_FONTBOLD, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINHIDETITLE, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINHIDEMENU, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINCOLOREMU, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINAIXTERM16, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINXTERM256, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINSCROLL1, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINSCROLL3, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINSCROLL2, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINCOLOR, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINTEXT, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINBACK, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINREV, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINATTRTEXT, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINATTR, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINREDLABEL, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINRED, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINGREENLABEL, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINGREEN, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINBLUELABEL, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINBLUE, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINUSENORMALBG, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDOK, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDCANCEL, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINHELP, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-			}
-			else {
-				DlgWinFont = NULL;
-			}
-
-			GetWindowText(Dialog, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_TITLE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetWindowText(Dialog, uimsg);
-			GetDlgItemText(Dialog, IDC_WINTITLELABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_TITLELABEL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINTITLELABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_WINCURSOR, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_CURSOR", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINCURSOR, uimsg);
-			GetDlgItemText(Dialog, IDC_WINBLOCK, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_BLOCK", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINBLOCK, uimsg);
-			GetDlgItemText(Dialog, IDC_WINVERT, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_VERT", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINVERT, uimsg);
-			GetDlgItemText(Dialog, IDC_WINHORZ, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_HORZ", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINHORZ, uimsg);
-			GetDlgItemText(Dialog, IDC_FONTBOLD, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_BOLDFONT", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_FONTBOLD, uimsg);
-			GetDlgItemText(Dialog, IDC_WINHIDETITLE, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_HIDETITLE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINHIDETITLE, uimsg);
-			GetDlgItemText(Dialog, IDC_WINHIDEMENU, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_HIDEMENU", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINHIDEMENU, uimsg);
-			GetDlgItemText(Dialog, IDC_WINCOLOREMU, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_COLOREMU", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINCOLOREMU, uimsg);
-			GetDlgItemText(Dialog, IDC_WINAIXTERM16, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_AIXTERM16", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINAIXTERM16, uimsg);
-			GetDlgItemText(Dialog, IDC_WINXTERM256, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_XTERM256", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINXTERM256, uimsg);
-			GetDlgItemText(Dialog, IDC_WINSCROLL1, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_SCROLL1", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINSCROLL1, uimsg);
-			GetDlgItemText(Dialog, IDC_WINSCROLL3, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_SCROLL3", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINSCROLL3, uimsg);
-			GetDlgItemText(Dialog, IDC_WINCOLOR, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_COLOR", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINCOLOR, uimsg);
-			GetDlgItemText(Dialog, IDC_WINTEXT, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_TEXT", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINTEXT, uimsg);
-			GetDlgItemText(Dialog, IDC_WINBACK, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_BG", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINBACK, uimsg);
-			GetDlgItemText(Dialog, IDC_WINATTRTEXT, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_ATTRIB", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINATTRTEXT, uimsg);
-			GetDlgItemText(Dialog, IDC_WINREV, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_REVERSE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINREV, uimsg);
-			GetDlgItemText(Dialog, IDC_WINREDLABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_R", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINREDLABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_WINGREENLABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_G", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINGREENLABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_WINBLUELABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_B", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINBLUELABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_WINUSENORMALBG, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_ALWAYSBG", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINUSENORMALBG, uimsg);
-			GetDlgItemText(Dialog, IDOK, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_OK", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDOK, uimsg);
-			GetDlgItemText(Dialog, IDCANCEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_CANCEL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDCANCEL, uimsg);
-			GetDlgItemText(Dialog, IDC_WINHELP, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_HELP", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINHELP, uimsg);
-
-			SetDlgItemText(Dialog, IDC_WINTITLE, ts->Title);
+			SetDlgTexts(Dialog, TextInfos, _countof(TextInfos), UILanguageFile);
+			SetDlgItemTextA(Dialog, IDC_WINTITLE, ts->Title);
 			SendDlgItemMessage(Dialog, IDC_WINTITLE, EM_LIMITTEXT,
 			                   sizeof(ts->Title)-1, 0);
 
@@ -1057,16 +856,10 @@
 						GetRB(Dialog,&ts->CursorShape,IDC_WINBLOCK,IDC_WINHORZ);
 					}
 					EndDialog(Dialog, 1);
-					if (DlgWinFont != NULL) {
-						DeleteObject(DlgWinFont);
-					}
 					return TRUE;
 
 				case IDCANCEL:
 					EndDialog(Dialog, 0);
-					if (DlgWinFont != NULL) {
-						DeleteObject(DlgWinFont);
-					}
 					return TRUE;
 
 				case IDC_WINHIDETITLE:
@@ -1219,76 +1012,31 @@
 	return FALSE;
 }
 
-BOOL CALLBACK KeybDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK KeybDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
 {
+	static const DlgTextInfo TextInfos[] = {
+		{ 0, "DLG_KEYB_TITLE" },
+		{ IDC_KEYBTRANS, "DLG_KEYB_TRANSMIT" },
+		{ IDC_KEYBBS, "DLG_KEYB_BS" },
+		{ IDC_KEYBDEL, "DLG_KEYB_DEL" },
+		{ IDC_KEYBKEYBTEXT, "DLG_KEYB_KEYB" },
+		{ IDC_KEYBMETATEXT, "DLG_KEYB_META" },
+		{ IDC_KEYBDISABLE, "DLG_KEYB_DISABLE" },
+		{ IDC_KEYBAPPKEY, "DLG_KEYB_APPKEY" },
+		{ IDC_KEYBAPPCUR, "DLG_KEYB_APPCUR" },
+		{ IDOK, "BTN_OK" },
+		{ IDCANCEL, "BTN_CANCEL" },
+		{ IDC_KEYBHELP, "BTN_HELP" },
+	};
 	PTTSet ts;
-	char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
-	LOGFONT logfont;
-	HFONT font;
 
 	switch (Message) {
 		case WM_INITDIALOG:
 			ts = (PTTSet)lParam;
-			SetWindowLong(Dialog, DWL_USER, lParam);
+			SetWindowLongPtr(Dialog, DWLP_USER, lParam);
 
-			font = (HFONT)SendMessage(Dialog, WM_GETFONT, 0, 0);
-			GetObject(font, sizeof(LOGFONT), &logfont);
-			if (get_lang_font("DLG_SYSTEM_FONT", Dialog, &logfont, &DlgKeybFont, UILanguageFile)) {
-				SendDlgItemMessage(Dialog, IDC_KEYBTRANS, WM_SETFONT, (WPARAM)DlgKeybFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_KEYBBS, WM_SETFONT, (WPARAM)DlgKeybFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_KEYBDEL, WM_SETFONT, (WPARAM)DlgKeybFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_KEYBKEYBTEXT, WM_SETFONT, (WPARAM)DlgKeybFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_KEYBKEYB, WM_SETFONT, (WPARAM)DlgKeybFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_KEYBMETATEXT, WM_SETFONT, (WPARAM)DlgKeybFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_KEYBMETA, WM_SETFONT, (WPARAM)DlgKeybFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_KEYBDISABLE, WM_SETFONT, (WPARAM)DlgKeybFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_KEYBAPPKEY, WM_SETFONT, (WPARAM)DlgKeybFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_KEYBAPPCUR, WM_SETFONT, (WPARAM)DlgKeybFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDOK, WM_SETFONT, (WPARAM)DlgKeybFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDCANCEL, WM_SETFONT, (WPARAM)DlgKeybFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_KEYBHELP, WM_SETFONT, (WPARAM)DlgKeybFont, MAKELPARAM(TRUE,0));
-			}
-			else {
-				DlgKeybFont = NULL;
-			}
+			SetDlgTexts(Dialog, TextInfos, _countof(TextInfos), UILanguageFile);
 
-			GetWindowText(Dialog, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_KEYB_TITLE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetWindowText(Dialog, uimsg);
-			GetDlgItemText(Dialog, IDC_KEYBTRANS, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_KEYB_TRANSMIT", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_KEYBTRANS, uimsg);
-			GetDlgItemText(Dialog, IDC_KEYBBS, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_KEYB_BS", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_KEYBBS, uimsg);
-			GetDlgItemText(Dialog, IDC_KEYBDEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_KEYB_DEL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_KEYBDEL, uimsg);
-			GetDlgItemText(Dialog, IDC_KEYBKEYBTEXT, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_KEYB_KEYB", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_KEYBKEYBTEXT, uimsg);
-			GetDlgItemText(Dialog, IDC_KEYBMETATEXT, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_KEYB_META", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_KEYBMETATEXT, uimsg);
-			GetDlgItemText(Dialog, IDC_KEYBDISABLE, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_KEYB_DISABLE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_KEYBDISABLE, uimsg);
-			GetDlgItemText(Dialog, IDC_KEYBAPPKEY, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_KEYB_APPKEY", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_KEYBAPPKEY, uimsg);
-			GetDlgItemText(Dialog, IDC_KEYBAPPCUR, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_KEYB_APPCUR", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_KEYBAPPCUR, uimsg);
-			GetDlgItemText(Dialog, IDOK, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_OK", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDOK, uimsg);
-			GetDlgItemText(Dialog, IDCANCEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_CANCEL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDCANCEL, uimsg);
-			GetDlgItemText(Dialog, IDC_KEYBHELP, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_HELP", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_KEYBHELP, uimsg);
-
 			SetRB(Dialog,ts->BSKey-1,IDC_KEYBBS,IDC_KEYBBS);
 			SetRB(Dialog,ts->DelKey,IDC_KEYBDEL,IDC_KEYBDEL);
 			SetRB(Dialog,ts->MetaKey,IDC_KEYBMETA,IDC_KEYBMETA);
@@ -1311,7 +1059,7 @@
 		case WM_COMMAND:
 			switch (LOWORD(wParam)) {
 				case IDOK:
-					ts = (PTTSet)GetWindowLong(Dialog,DWL_USER);
+					ts = (PTTSet)GetWindowLongPtr(Dialog,DWLP_USER);
 					if ( ts!=NULL ) {
 						WORD w;
 
@@ -1330,16 +1078,10 @@
 						}
 					}
 					EndDialog(Dialog, 1);
-					if (DlgKeybFont != NULL) {
-						DeleteObject(DlgKeybFont);
-					}
 					return TRUE;
 
 				case IDCANCEL:
 					EndDialog(Dialog, 0);
-					if (DlgKeybFont != NULL) {
-						DeleteObject(DlgKeybFont);
-					}
 					return TRUE;
 
 				case IDC_KEYBHELP:
@@ -1354,8 +1096,23 @@
 static PCHAR StopList[] = {"1 bit", "1.5 bit", "2 bit", NULL};
 static PCHAR FlowList[] = {"Xon/Xoff","hardware","none",NULL};
 
-BOOL CALLBACK SerialDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK SerialDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
 {
+	static const DlgTextInfo TextInfos[] = {
+		{ 0, "DLG_SERIAL_TITLE" },
+		{ IDC_SERIALPORT_LABEL, "DLG_SERIAL_PORT" },
+		{ IDC_SERIALBAUD_LEBAL, "DLG_SERIAL_BAUD" },
+		{ IDC_SERIALDATA_LABEL, "DLG_SERIAL_DATA" },
+		{ IDC_SERIALPARITY_LABEL, "DLG_SERIAL_PARITY" },
+		{ IDC_SERIALSTOP_LABEL, "DLG_SERIAL_STOP" },
+		{ IDC_SERIALFLOW_LABEL, "DLG_SERIAL_FLOW" },
+		{ IDC_SERIALDELAY, "DLG_SERIAL_DELAY" },
+		{ IDC_SERIALDELAYCHAR_LABEL, "DLG_SERIAL_DELAYCHAR" },
+		{ IDC_SERIALDELAYLINE_LABEL, "DLG_SERIAL_DELAYLINE" },
+		{ IDOK, "BTN_OK" },
+		{ IDCANCEL, "BTN_CANCEL" },
+		{ IDC_SERIALHELP, "BTN_HELP" },
+	};
 	PTTSet ts;
 	int i, w, sel;
 	char Temp[128];
@@ -1362,83 +1119,14 @@
 	WORD ComPortTable[MAXCOMPORT];
 	static char *ComPortDesc[MAXCOMPORT];
 	int comports;
-	char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
-	LOGFONT logfont;
-	HFONT font;
 
 	switch (Message) {
 		case WM_INITDIALOG:
 			ts = (PTTSet)lParam;
-			SetWindowLong(Dialog, DWL_USER, lParam);
+			SetWindowLongPtr(Dialog, DWLP_USER, lParam);
 
-			font = (HFONT)SendMessage(Dialog, WM_GETFONT, 0, 0);
-			GetObject(font, sizeof(LOGFONT), &logfont);
-			if (get_lang_font("DLG_SYSTEM_FONT", Dialog, &logfont, &DlgSerialFont, UILanguageFile)) {
-				SendDlgItemMessage(Dialog, IDC_SERIALPORT_LABEL, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALPORT, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALBAUD_LEBAL, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALBAUD, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALDATA_LABEL, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALDATA, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALPARITY_LABEL, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALPARITY, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALSTOP_LABEL, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALSTOP, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALFLOW_LABEL, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALFLOW, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALDELAY, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALDELAYCHAR_LABEL, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALDELAYCHAR, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALDELAYLINE_LABEL, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALDELAYLINE, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDOK, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDCANCEL, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALHELP, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-			}
-			else {
-				DlgSerialFont = NULL;
-			}
+			SetDlgTexts(Dialog, TextInfos, _countof(TextInfos), UILanguageFile);
 
-			GetWindowText(Dialog, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_SERIAL_TITLE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetWindowText(Dialog, uimsg);
-			GetDlgItemText(Dialog, IDC_SERIALPORT_LABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_SERIAL_PORT", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_SERIALPORT_LABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_SERIALBAUD_LEBAL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_SERIAL_BAUD", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_SERIALBAUD_LEBAL, uimsg);
-			GetDlgItemText(Dialog, IDC_SERIALDATA_LABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_SERIAL_DATA", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_SERIALDATA_LABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_SERIALPARITY_LABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_SERIAL_PARITY", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_SERIALPARITY_LABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_SERIALSTOP_LABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_SERIAL_STOP", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_SERIALSTOP_LABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_SERIALFLOW_LABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_SERIAL_FLOW", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_SERIALFLOW_LABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_SERIALDELAY, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_SERIAL_DELAY", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_SERIALDELAY, uimsg);
-			GetDlgItemText(Dialog, IDC_SERIALDELAYCHAR_LABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_SERIAL_DELAYCHAR", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_SERIALDELAYCHAR_LABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_SERIALDELAYLINE_LABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_SERIAL_DELAYLINE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_SERIALDELAYLINE_LABEL, uimsg);
-			GetDlgItemText(Dialog, IDOK, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_OK", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDOK, uimsg);
-			GetDlgItemText(Dialog, IDCANCEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_CANCEL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDCANCEL, uimsg);
-			GetDlgItemText(Dialog, IDC_SERIALHELP, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_HELP", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_SERIALHELP, uimsg);
-
 			w = 0;
 
 			if ((comports = DetectComPorts(ComPortTable, ts->MaxComPort, ComPortDesc)) > 0) {
@@ -1543,16 +1231,10 @@
 					}
 
 					EndDialog(Dialog, 1);
-					if (DlgSerialFont != NULL) {
-						DeleteObject(DlgSerialFont);
-					}
 					return TRUE;
 
 				case IDCANCEL:
 					EndDialog(Dialog, 0);
-					if (DlgSerialFont != NULL) {
-						DeleteObject(DlgSerialFont);
-					}
 					return TRUE;
 
 				case IDC_SERIALHELP:
@@ -1562,8 +1244,26 @@
 	return FALSE;
 }
 
-BOOL CALLBACK TCPIPDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK TCPIPDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
 {
+	static const DlgTextInfo TextInfos[] = {
+		{ 0, "DLG_TCPIP_TITLE" },
+		{ IDC_TCPIPHOSTLIST, "DLG_TCPIP_HOSTLIST" },
+		{ IDC_TCPIPADD, "DLG_TCPIP_ADD" },
+		{ IDC_TCPIPUP, "DLG_TCPIP_UP" },
+		{ IDC_TCPIPREMOVE, "DLG_TCPIP_REMOVE" },
+		{ IDC_TCPIPDOWN, "DLG_TCPIP_DOWN" },
+		{ IDC_TCPIPHISTORY, "DLG_TCPIP_HISTORY" },
+		{ IDC_TCPIPAUTOCLOSE, "DLG_TCPIP_AUTOCLOSE" },
+		{ IDC_TCPIPPORTLABEL, "DLG_TCPIP_PORT" },
+		{ IDC_TCPIPTELNET, "DLG_TCPIP_TELNET" },
+		{ IDC_TCPIPTELNETKEEPALIVELABEL, "DLG_TCPIP_KEEPALIVE" },
+		{ IDC_TCPIPTELNETKEEPALIVESEC, "DLG_TCPIP_KEEPALIVE_SEC" },
+		{ IDC_TCPIPTERMTYPELABEL, "DLG_TCPIP_TERMTYPE" },
+		{ IDOK, "BTN_OK" },
+		{ IDCANCEL, "BTN_CANCEL" },
+		{ IDC_TCPIPHELP, "BTN_HELP" },
+	};
 	PTTSet ts;
 	char EntName[10];
 	char TempHost[HostNameMaxLength+1];
@@ -1570,92 +1270,14 @@
 	UINT i, Index;
 	WORD w;
 	BOOL Ok;
-	char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
-	LOGFONT logfont;
-	HFONT font;
 
 	switch (Message) {
 		case WM_INITDIALOG:
 			ts = (PTTSet)lParam;
-			SetWindowLong(Dialog, DWL_USER, lParam);
+			SetWindowLongPtr(Dialog, DWLP_USER, lParam);
 
-			font = (HFONT)SendMessage(Dialog, WM_GETFONT, 0, 0);
-			GetObject(font, sizeof(LOGFONT), &logfont);
-			if (get_lang_font("DLG_SYSTEM_FONT", Dialog, &logfont, &DlgTcpipFont, UILanguageFile)) {
-				SendDlgItemMessage(Dialog, IDC_TCPIPHOSTLIST, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPHOST, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPADD, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPLIST, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPUP, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPREMOVE, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPDOWN, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPTELNETKEEPALIVELABEL, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPTELNETKEEPALIVE, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPTELNETKEEPALIVESEC, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPHISTORY, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPAUTOCLOSE, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPPORTLABEL, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPPORT, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPTELNET, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPTERMTYPELABEL, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPTERMTYPE, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDOK, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDCANCEL, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPHELP, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-			}
-			else {
-				DlgTcpipFont = NULL;
-			}
-
-			GetWindowText(Dialog, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TCPIP_TITLE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetWindowText(Dialog, uimsg);
-			GetDlgItemText(Dialog, IDC_TCPIPHOSTLIST, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TCPIP_HOSTLIST", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TCPIPHOSTLIST, uimsg);
-			GetDlgItemText(Dialog, IDC_TCPIPADD, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TCPIP_ADD", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TCPIPADD, uimsg);
-			GetDlgItemText(Dialog, IDC_TCPIPUP, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TCPIP_UP", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TCPIPUP, uimsg);
-			GetDlgItemText(Dialog, IDC_TCPIPREMOVE, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TCPIP_REMOVE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TCPIPREMOVE, uimsg);
-			GetDlgItemText(Dialog, IDC_TCPIPDOWN, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TCPIP_DOWN", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TCPIPDOWN, uimsg);
-			GetDlgItemText(Dialog, IDC_TCPIPHISTORY, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TCPIP_HISTORY", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TCPIPHISTORY, uimsg);
-			GetDlgItemText(Dialog, IDC_TCPIPAUTOCLOSE, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TCPIP_AUTOCLOSE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TCPIPAUTOCLOSE, uimsg);
-			GetDlgItemText(Dialog, IDC_TCPIPPORTLABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TCPIP_PORT", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TCPIPPORTLABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_TCPIPTELNET, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TCPIP_TELNET", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TCPIPTELNET, uimsg);
-			GetDlgItemText(Dialog, IDC_TCPIPTELNETKEEPALIVELABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TCPIP_KEEPALIVE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TCPIPTELNETKEEPALIVELABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_TCPIPTELNETKEEPALIVESEC, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TCPIP_KEEPALIVE_SEC", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TCPIPTELNETKEEPALIVESEC, uimsg);
-			GetDlgItemText(Dialog, IDC_TCPIPTERMTYPELABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TCPIP_TERMTYPE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TCPIPTERMTYPELABEL, uimsg);
-			GetDlgItemText(Dialog, IDOK, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_OK", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDOK, uimsg);
-			GetDlgItemText(Dialog, IDCANCEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_CANCEL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDCANCEL, uimsg);
-			GetDlgItemText(Dialog, IDC_TCPIPHELP, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_HELP", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TCPIPHELP, uimsg);
-
+			SetDlgTexts(Dialog, TextInfos, _countof(TextInfos), UILanguageFile);
+				
 			SendDlgItemMessage(Dialog, IDC_TCPIPHOST, EM_LIMITTEXT,
 			                   HostNameMaxLength-1, 0);
 
@@ -1722,16 +1344,10 @@
 						               sizeof(ts->TermType));
 					}
 					EndDialog(Dialog, 1);
-					if (DlgTcpipFont != NULL) {
-						DeleteObject(DlgTcpipFont);
-					}
 					return TRUE;
 
 				case IDCANCEL:
 					EndDialog(Dialog, 0);
-					if (DlgTcpipFont != NULL) {
-						DeleteObject(DlgTcpipFont);
-					}
 					return TRUE;
 
 				case IDC_TCPIPHOST:
@@ -1864,8 +1480,19 @@
 	return FALSE;
 }
 
-BOOL CALLBACK HostDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK HostDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
 {
+	static const DlgTextInfo TextInfos[] = {
+		{ 0, "DLG_HOST_TITLE" },
+		{ IDC_HOSTNAMELABEL, "DLG_HOST_TCPIPHOST" },
+		{ IDC_HOSTTCPPORTLABEL, "DLG_HOST_TCPIPPORT" },
+		{ IDC_HOSTTCPPROTOCOLLABEL, "DLG_HOST_TCPIPPROTOCOL" },
+		{ IDC_HOSTSERIAL, "DLG_HOST_SERIAL" },
+		{ IDC_HOSTCOMLABEL, "DLG_HOST_SERIALPORT" },
+		{ IDOK, "BTN_OK" },
+		{ IDCANCEL, "BTN_CANCEL" },
+		{ IDC_HOSTHELP, "BTN_HELP" },
+	};
 	PGetHNRec GetHNRec;
 	char EntName[128];
 	char TempHost[HostNameMaxLength+1];
@@ -1874,65 +1501,14 @@
 	WORD ComPortTable[MAXCOMPORT];
 	static char *ComPortDesc[MAXCOMPORT];
 	int comports;
-	char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
-	LOGFONT logfont;
-	HFONT font;
 
 	switch (Message) {
 		case WM_INITDIALOG:
 			GetHNRec = (PGetHNRec)lParam;
-			SetWindowLong(Dialog, DWL_USER, lParam);
+			SetWindowLongPtr(Dialog, DWLP_USER, lParam);
 
-			font = (HFONT)SendMessage(Dialog, WM_GETFONT, 0, 0);
-			GetObject(font, sizeof(LOGFONT), &logfont);
-			if (get_lang_font("DLG_SYSTEM_FONT", Dialog, &logfont, &DlgHostFont, UILanguageFile)) {
-				SendDlgItemMessage(Dialog, IDC_HOSTTCPIP, WM_SETFONT, (WPARAM)DlgHostFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_HOSTNAMELABEL, WM_SETFONT, (WPARAM)DlgHostFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_HOSTNAME, WM_SETFONT, (WPARAM)DlgHostFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_HOSTTELNET, WM_SETFONT, (WPARAM)DlgHostFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_HOSTTCPPORTLABEL, WM_SETFONT, (WPARAM)DlgHostFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_HOSTTCPPORT, WM_SETFONT, (WPARAM)DlgHostFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_HOSTTCPPROTOCOLLABEL, WM_SETFONT, (WPARAM)DlgHostFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_HOSTTCPPROTOCOL, WM_SETFONT, (WPARAM)DlgHostFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_HOSTSERIAL, WM_SETFONT, (WPARAM)DlgHostFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_HOSTCOMLABEL, WM_SETFONT, (WPARAM)DlgHostFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_HOSTCOM, WM_SETFONT, (WPARAM)DlgHostFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDOK, WM_SETFONT, (WPARAM)DlgHostFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDCANCEL, WM_SETFONT, (WPARAM)DlgHostFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_HOSTHELP, WM_SETFONT, (WPARAM)DlgHostFont, MAKELPARAM(TRUE,0));
-			}
-			else {
-				DlgHostFont = NULL;
-			}
-
-			GetWindowText(Dialog, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_HOST_TITLE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetWindowText(Dialog, uimsg);
-			GetDlgItemText(Dialog, IDC_HOSTNAMELABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_HOST_TCPIPHOST", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_HOSTNAMELABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_HOSTTCPPORTLABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_HOST_TCPIPPORT", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_HOSTTCPPORTLABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_HOSTTCPPROTOCOLLABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_HOST_TCPIPPROTOCOL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_HOSTTCPPROTOCOLLABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_HOSTSERIAL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_HOST_SERIAL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_HOSTSERIAL, uimsg);
-			GetDlgItemText(Dialog, IDC_HOSTCOMLABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_HOST_SERIALPORT", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_HOSTCOMLABEL, uimsg);
-			GetDlgItemText(Dialog, IDOK, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_OK", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDOK, uimsg);
-			GetDlgItemText(Dialog, IDCANCEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_CANCEL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDCANCEL, uimsg);
-			GetDlgItemText(Dialog, IDC_HOSTHELP, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_HELP", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_HOSTHELP, uimsg);
-
+			SetDlgTexts(Dialog, TextInfos, _countof(TextInfos), UILanguageFile);
+		
 			// \x83t\x83@\x83C\x83\x8B\x82\xA8\x82\xE6\x82і\xBC\x91O\x95t\x82\xAB\x83p\x83C\x83v\x82̏ꍇ\x81ATCP/IP\x88\xB5\x82\xA2\x82Ƃ\xB7\x82\xE9\x81B
 			if ( GetHNRec->PortType==IdFile ||
 				 GetHNRec->PortType==IdNamedPipe
@@ -2074,16 +1650,10 @@
 						}
 					}
 					EndDialog(Dialog, 1);
-					if (DlgHostFont != NULL) {
-						DeleteObject(DlgHostFont);
-					}
 					return TRUE;
 
 				case IDCANCEL:
 					EndDialog(Dialog, 0);
-					if (DlgHostFont != NULL) {
-						DeleteObject(DlgHostFont);
-					}
 					return TRUE;
 
 				case IDC_HOSTTCPIP:
@@ -2138,8 +1708,16 @@
 	return FALSE;
 }
 
-BOOL CALLBACK DirDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK DirDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
 {
+	static const DlgTextInfo TextInfos[] = {
+		{ 0, "DLG_DIR_TITLE" },
+		{ IDC_DIRCURRENT_LABEL, "DLG_DIR_CURRENT" },
+		{ IDC_DIRNEW_LABEL, "DLG_DIR_NEW" },
+		{ IDOK, "BTN_OK" },
+		{ IDCANCEL, "BTN_CANCEL" },
+		{ IDC_DIRHELP, "BTN_HELP" },
+	};
 	PCHAR CurDir;
 	char HomeDir[MAXPATHLEN];
 	char TmpDir[MAXPATHLEN];
@@ -2151,47 +1729,14 @@
 	int WX, WY, WW, WH, CW, DW, DH, BW, BH, SW, SH;
 	char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
 	char buf[MAX_PATH], buf2[MAX_PATH];
-	LOGFONT logfont;
-	HFONT font;
 
 	switch (Message) {
 		case WM_INITDIALOG:
-			font = (HFONT)SendMessage(Dialog, WM_GETFONT, 0, 0);
-			GetObject(font, sizeof(LOGFONT), &logfont);
-			if (get_lang_font("DLG_SYSTEM_FONT", Dialog, &logfont, &DlgDirFont, UILanguageFile)) {
-				SendDlgItemMessage(Dialog, IDC_DIRCURRENT_LABEL, WM_SETFONT, (WPARAM)DlgDirFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_DIRCURRENT, WM_SETFONT, (WPARAM)DlgDirFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_DIRNEW_LABEL, WM_SETFONT, (WPARAM)DlgDirFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_DIRNEW, WM_SETFONT, (WPARAM)DlgDirFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDOK, WM_SETFONT, (WPARAM)DlgDirFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDCANCEL, WM_SETFONT, (WPARAM)DlgDirFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_DIRHELP, WM_SETFONT, (WPARAM)DlgDirFont, MAKELPARAM(TRUE,0));
-			}
-			else {
-				DlgDirFont = NULL;
-			}
 
-			GetWindowText(Dialog, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_DIR_TITLE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetWindowText(Dialog, uimsg);
-			GetDlgItemText(Dialog, IDC_DIRCURRENT_LABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_DIR_CURRENT", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_DIRCURRENT_LABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_DIRNEW_LABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_DIR_NEW", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_DIRNEW_LABEL, uimsg);
-			GetDlgItemText(Dialog, IDOK, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_OK", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDOK, uimsg);
-			GetDlgItemText(Dialog, IDCANCEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_CANCEL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDCANCEL, uimsg);
-			GetDlgItemText(Dialog, IDC_DIRHELP, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_HELP", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_DIRHELP, uimsg);
-
+			SetDlgTexts(Dialog, TextInfos, _countof(TextInfos), UILanguageFile);
+				
 			CurDir = (PCHAR)(lParam);
-			SetWindowLong(Dialog, DWL_USER, lParam);
+			SetWindowLongPtr(Dialog, DWLP_USER, lParam);
 
 			SetDlgItemText(Dialog, IDC_DIRCURRENT, CurDir);
 			SendDlgItemMessage(Dialog, IDC_DIRNEW, EM_LIMITTEXT,
@@ -2288,16 +1833,10 @@
 						_chdir(HomeDir);
 					}
 					EndDialog(Dialog, 1);
-					if (DlgDirFont != NULL) {
-						DeleteObject(DlgDirFont);
-					}
 					return TRUE;
 
 				case IDCANCEL:
 					EndDialog(Dialog, 0);
-					if (DlgDirFont != NULL) {
-						DeleteObject(DlgDirFont);
-					}
 					return TRUE;
 
 				case IDC_SELECT_DIR:
@@ -2494,7 +2033,6 @@
 {
 	HFONT hFont;
 	LOGFONT lf;
-	LONG_PTR lptr;
 
 	//SetCapture(hWnd);
 
@@ -2503,7 +2041,7 @@
 	}
 
 	// \x90e\x82̃v\x83\x8D\x83V\x81[\x83W\x83\x83\x82\xF0\x83T\x83u\x83N\x83\x89\x83X\x82\xA9\x82\xE7\x8EQ\x8FƂł\xAB\x82\xE9\x82悤\x82ɁA\x83|\x83C\x83\x93\x83^\x82\xF0\x93o\x98^\x82\xB5\x82Ă\xA8\x82\xAD\x81B
-	lptr = SetWindowLongPtr( hWnd, GWLP_USERDATA, (LONG_PTR)parent );
+	SetWindowLongPtr( hWnd, GWLP_USERDATA, (LONG_PTR)parent );
 	// \x83T\x83u\x83N\x83\x89\x83X\x82̃v\x83\x8D\x83V\x81[\x83W\x83\x83\x82\xF0\x93o\x98^\x82\xB7\x82\xE9\x81B
 	parent->proc = (WNDPROC)SetWindowLongPtr( hWnd, GWLP_WNDPROC, (LONG_PTR)UrlWndProc);
 
@@ -2521,8 +2059,11 @@
 }
 
 
-BOOL CALLBACK AboutDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK AboutDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
 {
+	static const DlgTextInfo TextInfos[] = {
+		{ 0, "DLG_ABOUT_TITLE" },
+	};
 	char buf[128], tmpbuf[128];
 	HDC hdc;
 	HWND hwnd;
@@ -2530,9 +2071,7 @@
 	DWORD dwExt;
 	WORD w, h;
 	POINT point;
-	char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
-	LOGFONT logfont;
-	HFONT font;
+	char uimsg[MAX_UIMSG];
 	int msc_ver, vs_ver, msc_low_ver;
 
 #if defined(EFFECT_ENABLED) || defined(TEXTURE_ENABLED)
@@ -2559,31 +2098,6 @@
 
 	switch (Message) {
 		case WM_INITDIALOG:
-
-			font = (HFONT)SendMessage(Dialog, WM_GETFONT, 0, 0);
-			GetObject(font, sizeof(LOGFONT), &logfont);
-			if (get_lang_font("DLG_SYSTEM_FONT", Dialog, &logfont, &DlgAboutFont, UILanguageFile)) {
-				SendDlgItemMessage(Dialog, IDC_TT_PRO, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TT_VERSION, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_INLUCDE_LABEL, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_ONIGURUMA_LABEL, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TT23_LABEL, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TT23DATE_LABEL, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERANISHI_LABEL, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_PROJECT_LABEL, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_RIGHTS_LABEL, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_AUTHOR_LABEL, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_AUTHOR_URL, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_FORUM_LABEL, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_FORUM_URL, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_BUILDTIME, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_BUILDTOOL, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDOK, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-			}
-			else {
-				DlgAboutFont = NULL;
-			}
-
 			// \x83A\x83C\x83R\x83\x93\x82𓮓I\x82ɃZ\x83b\x83g
 			{
 				int fuLoad = LR_DEFAULTCOLOR;
@@ -2606,9 +2120,7 @@
 #endif
 			}
 
-			GetWindowText(Dialog, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_ABOUT_TITLE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetWindowText(Dialog, uimsg);
+			SetDlgTexts(Dialog, TextInfos, _countof(TextInfos), UILanguageFile);
 
 			// Tera Term \x96{\x91̂̃o\x81[\x83W\x83\x87\x83\x93
 			_snprintf_s(buf, sizeof(buf), _TRUNCATE, "Version %d.%d", TT_VERSION_MAJOR, TT_VERSION_MINOR);
@@ -2619,7 +2131,7 @@
 			_snprintf_s(tmpbuf, sizeof(tmpbuf), _TRUNCATE, " (SVN# UNK)");
 			strncat_s(buf, sizeof(buf), tmpbuf, _TRUNCATE);
 #endif
-			SendMessage(GetDlgItem(Dialog, IDC_TT_VERSION), WM_SETTEXT, 0, (LPARAM)buf);
+			SetDlgItemTextA(Dialog, IDC_TT_VERSION, buf);
 
 			// Oniguruma\x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x90ݒ肷\x82\xE9
 			// \x83o\x81[\x83W\x83\x87\x83\x93\x82̎擾\x82\xCD onig_version() \x82\xF0\x8CĂяo\x82\xB7\x82̂\xAA\x93K\x90؂\xBE\x82\xAA\x81A\x82\xBB\x82̂\xBD\x82߂\xBE\x82\xAF\x82Ƀ\x89\x83C\x83u\x83\x89\x83\x8A\x82\xF0
@@ -2629,7 +2141,7 @@
 			// \x83\x89\x83C\x83u\x83\x89\x83\x8A\x82\xF0\x83\x8A\x83\x93\x83N\x82\xB5\x81A\x90\xB3\x8BK\x82̎菇\x82Ńo\x81[\x83W\x83\x87\x83\x93\x82𓾂邱\x82Ƃɂ\xB5\x82\xBD\x81B
 			// (2006.7.24 yutaka)
 			_snprintf_s(buf, sizeof(buf), _TRUNCATE, "Oniguruma %s", onig_version());
-			SendMessage(GetDlgItem(Dialog, IDC_ONIGURUMA_LABEL), WM_SETTEXT, 0, (LPARAM)buf);
+			SetDlgItemTextA(Dialog, IDC_ONIGURUMA_LABEL, buf);
 
 			// \x83r\x83\x8B\x83h\x82\xB5\x82\xBD\x82Ƃ\xAB\x82Ɏg\x82\xED\x82ꂽVisual C++\x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x90ݒ肷\x82\xE9\x81B(2009.3.3 yutaka)
 			_snprintf_s(buf, sizeof(buf), _TRUNCATE, "Built using Microsoft Visual C++");
@@ -2684,7 +2196,7 @@
 			// static text \x82̃T\x83C\x83Y\x82\xF0\x95ύX (2007.4.16 maya)
 			hwnd = GetDlgItem(Dialog, IDC_AUTHOR_URL);
 			hdc = GetDC(hwnd);
-			SelectObject(hdc, DlgAboutFont);
+			SelectObject(hdc, (HFONT)SendMessage(Dialog, WM_GETFONT, 0, 0));
 			GetDlgItemText(Dialog, IDC_AUTHOR_URL, uimsg, sizeof(uimsg));
 			dwExt = GetTabbedTextExtent(hdc,uimsg,strlen(uimsg),0,NULL);
 			w = LOWORD(dwExt) + 5; // \x95\x9D\x82\xAA\x8E኱\x91\xAB\x82\xE8\x82Ȃ\xA2\x82̂ŕ␳
@@ -2697,7 +2209,7 @@
 
 			hwnd = GetDlgItem(Dialog, IDC_FORUM_URL);
 			hdc = GetDC(hwnd);
-			SelectObject(hdc, DlgAboutFont);
+			SelectObject(hdc, (HFONT)SendMessage(Dialog, WM_GETFONT, 0, 0));
 			GetDlgItemText(Dialog, IDC_FORUM_URL, uimsg, sizeof(uimsg));
 			dwExt = GetTabbedTextExtent(hdc,uimsg,strlen(uimsg),0,NULL);
 			w = LOWORD(dwExt) + 5; // \x95\x9D\x82\xAA\x8E኱\x91\xAB\x82\xE8\x82Ȃ\xA2\x82̂ŕ␳
@@ -2803,9 +2315,6 @@
 					return TRUE;
 			}
 #endif
-			if (DlgAboutFont != NULL) {
-				DeleteObject(DlgAboutFont);
-			}
 			break;
 
 #if defined(EFFECT_ENABLED) || defined(TEXTURE_ENABLED)
@@ -2991,65 +2500,34 @@
 	return (n + 1);  // 1origin
 }
 
-BOOL CALLBACK GenDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static BOOL CALLBACK GenDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
 {
+	static const DlgTextInfo TextInfos[] = {
+		{ 0, "DLG_GEN_TITLE" },
+		{ IDC_GENPORT_LABEL, "DLG_GEN_PORT" },
+		{ IDC_GENLANGLABEL, "DLG_GEN_LANG" },
+		{ IDC_GENLANGUI_LABEL, "DLG_GEN_LANG_UI" },
+		{ IDOK, "BTN_OK" },
+		{ IDCANCEL, "BTN_CANCEL" },
+		{ IDC_GENHELP, "BTN_HELP" },
+	};
 	static int langui_sel = 1, uilist_count = 0;
 	PTTSet ts;
 	WORD w;
-	char Temp[8];
-	char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
-	LOGFONT logfont;
-	HFONT font;
 
 	switch (Message) {
 		case WM_INITDIALOG:
 			ts = (PTTSet)lParam;
-			SetWindowLong(Dialog, DWL_USER, lParam);
+			SetWindowLongPtr(Dialog, DWLP_USER, lParam);
 
-			font = (HFONT)SendMessage(Dialog, WM_GETFONT, 0, 0);
-			GetObject(font, sizeof(LOGFONT), &logfont);
-			if (get_lang_font("DLG_SYSTEM_FONT", Dialog, &logfont, &DlgGenFont, UILanguageFile)) {
-				SendDlgItemMessage(Dialog, IDC_GENPORT_LABEL, WM_SETFONT, (WPARAM)DlgGenFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_GENPORT, WM_SETFONT, (WPARAM)DlgGenFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_GENLANGLABEL, WM_SETFONT, (WPARAM)DlgGenFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_GENLANG, WM_SETFONT, (WPARAM)DlgGenFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_GENLANGUI_LABEL, WM_SETFONT, (WPARAM)DlgGenFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_GENLANG_UI, WM_SETFONT, (WPARAM)DlgGenFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDOK, WM_SETFONT, (WPARAM)DlgGenFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDCANCEL, WM_SETFONT, (WPARAM)DlgGenFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_GENHELP, WM_SETFONT, (WPARAM)DlgGenFont, MAKELPARAM(TRUE,0));
-			}
-			else {
-				DlgGenFont = NULL;
-			}
-
-			GetWindowText(Dialog, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_GEN_TITLE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetWindowText(Dialog, uimsg);
-			GetDlgItemText(Dialog, IDC_GENPORT_LABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_GEN_PORT", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_GENPORT_LABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_GENLANGLABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_GEN_LANG", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_GENLANGLABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_GENLANGUI_LABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_GEN_LANG_UI", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_GENLANGUI_LABEL, uimsg);
-			GetDlgItemText(Dialog, IDOK, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_OK", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDOK, uimsg);
-			GetDlgItemText(Dialog, IDCANCEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_CANCEL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDCANCEL, uimsg);
-			GetDlgItemText(Dialog, IDC_GENHELP, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_HELP", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_GENHELP, uimsg);
-
-			SendDlgItemMessage(Dialog, IDC_GENPORT, CB_ADDSTRING,
+			SetDlgTexts(Dialog, TextInfos, _countof(TextInfos), UILanguageFile);
+		
+			SendDlgItemMessageA(Dialog, IDC_GENPORT, CB_ADDSTRING,
 			                   0, (LPARAM)"TCP/IP");
 			for (w=1;w<=ts->MaxComPort;w++) {
+				char Temp[8];
 				_snprintf_s(Temp, sizeof(Temp), _TRUNCATE, "COM%d", w);
-				SendDlgItemMessage(Dialog, IDC_GENPORT, CB_ADDSTRING,
+				SendDlgItemMessageA(Dialog, IDC_GENPORT, CB_ADDSTRING,
 				                   0, (LPARAM)Temp);
 			}
 			if (ts->PortType==IdSerial) {
@@ -3134,16 +2612,10 @@
 					PostMessage(GetParent(Dialog),WM_USER_CHANGEMENU,0,0);
 
 					EndDialog(Dialog, 1);
-					if (DlgGenFont != NULL) {
-						DeleteObject(DlgGenFont);
-					}
 					return TRUE;
 
 				case IDCANCEL:
 					EndDialog(Dialog, 0);
-					if (DlgGenFont != NULL) {
-						DeleteObject(DlgGenFont);
-					}
 					return TRUE;
 
 				case IDC_GENHELP:
@@ -3158,53 +2630,27 @@
 	return FALSE;
 }
 
-BOOL CALLBACK WinListDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static BOOL CALLBACK WinListDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
 {
+	static const DlgTextInfo TextInfos[] = {
+		{ 0, "DLG_WINLIST_TITLE" },
+		{ IDC_WINLISTLABEL, "DLG_WINLIST_LABEL" },
+		{ IDOK, "DLG_WINLIST_OPEN" },
+		{ IDCANCEL, "BTN_CANCEL" },
+		{ IDC_WINLISTCLOSE, "DLG_WINLIST_CLOSEWIN" },
+		{ IDC_WINLISTHELP, "BTN_HELP" },
+	};
 	PBOOL Close;
 	int n;
 	HWND Hw;
-	char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
-	LOGFONT logfont;
-	HFONT font;
 
 	switch (Message) {
 		case WM_INITDIALOG:
 			Close = (PBOOL)lParam;
-			SetWindowLong(Dialog, DWL_USER, lParam);
+			SetWindowLongPtr(Dialog, DWLP_USER, lParam);
 
-			font = (HFONT)SendMessage(Dialog, WM_GETFONT, 0, 0);
-			GetObject(font, sizeof(LOGFONT), &logfont);
-			if (get_lang_font("DLG_SYSTEM_FONT", Dialog, &logfont, &DlgWinlistFont, UILanguageFile)) {
-				SendDlgItemMessage(Dialog, IDC_WINLISTLABEL, WM_SETFONT, (WPARAM)DlgWinlistFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINLISTLIST, WM_SETFONT, (WPARAM)DlgWinlistFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDOK, WM_SETFONT, (WPARAM)DlgWinlistFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDCANCEL, WM_SETFONT, (WPARAM)DlgWinlistFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINLISTCLOSE, WM_SETFONT, (WPARAM)DlgWinlistFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINLISTHELP, WM_SETFONT, (WPARAM)DlgWinlistFont, MAKELPARAM(TRUE,0));
-			}
-			else {
-				DlgWinlistFont = NULL;
-			}
-
-			GetWindowText(Dialog, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WINLIST_TITLE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetWindowText(Dialog, uimsg);
-			GetDlgItemText(Dialog, IDC_WINLISTLABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WINLIST_LABEL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINLISTLABEL, uimsg);
-			GetDlgItemText(Dialog, IDOK, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WINLIST_OPEN", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDOK, uimsg);
-			GetDlgItemText(Dialog, IDCANCEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_CANCEL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDCANCEL, uimsg);
-			GetDlgItemText(Dialog, IDC_WINLISTCLOSE, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WINLIST_CLOSEWIN", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINLISTCLOSE, uimsg);
-			GetDlgItemText(Dialog, IDC_WINLISTHELP, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_HELP", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINLISTHELP, uimsg);
-
+			SetDlgTexts(Dialog, TextInfos, _countof(TextInfos), UILanguageFile);
+		
 			SetWinList(GetParent(Dialog),Dialog,IDC_WINLISTLIST);
 			return TRUE;
 
@@ -3217,16 +2663,10 @@
 						SelectWin(n);
 					}
 					EndDialog(Dialog, 1);
-					if (DlgWinlistFont != NULL) {
-						DeleteObject(DlgWinlistFont);
-					}
 					return TRUE;
 
 				case IDCANCEL:
 					EndDialog(Dialog, 0);
-					if (DlgWinlistFont != NULL) {
-						DeleteObject(DlgWinlistFont);
-					}
 					return TRUE;
 
 				case IDC_WINLISTLIST:
@@ -3250,9 +2690,6 @@
 						SendDlgItemMessage(Dialog,IDC_WINLISTLIST,
 						                   LB_DELETESTRING,n,0);
 						PostMessage(Hw,WM_SYSCOMMAND,SC_CLOSE,0);
-						if (DlgWinlistFont != NULL) {
-							DeleteObject(DlgWinlistFont);
-						}
 					}
 					else {
 						Close = (PBOOL)GetWindowLong(Dialog,DWL_USER);
@@ -3260,9 +2697,6 @@
 							*Close = TRUE;
 						}
 						EndDialog(Dialog, 1);
-						if (DlgWinlistFont != NULL) {
-							DeleteObject(DlgWinlistFont);
-						}
 						return TRUE;
 					}
 					break;
@@ -3274,7 +2708,7 @@
 	return FALSE;
 }
 
-BOOL WINAPI SetupTerminal(HWND WndParent, PTTSet ts)
+BOOL WINAPI _SetupTerminal(HWND WndParent, PTTSet ts)
 {
 	int i;
 
@@ -3299,7 +2733,7 @@
 		                     WndParent, TermDlg, (LPARAM)ts);
 }
 
-BOOL WINAPI SetupWin(HWND WndParent, PTTSet ts)
+BOOL WINAPI _SetupWin(HWND WndParent, PTTSet ts)
 {
 	return
 		(BOOL)DialogBoxParam(hInst,
@@ -3307,7 +2741,7 @@
 		                     WndParent, WinDlg, (LPARAM)ts);
 }
 
-BOOL WINAPI SetupKeyboard(HWND WndParent, PTTSet ts)
+BOOL WINAPI _SetupKeyboard(HWND WndParent, PTTSet ts)
 {
 	return
 		(BOOL)DialogBoxParam(hInst,
@@ -3315,7 +2749,7 @@
 		                     WndParent, KeybDlg, (LPARAM)ts);
 }
 
-BOOL WINAPI SetupSerialPort(HWND WndParent, PTTSet ts)
+BOOL WINAPI _SetupSerialPort(HWND WndParent, PTTSet ts)
 {
 	return
 		(BOOL)DialogBoxParam(hInst,
@@ -3323,7 +2757,7 @@
 		                     WndParent, SerialDlg, (LPARAM)ts);
 }
 
-BOOL WINAPI SetupTCPIP(HWND WndParent, PTTSet ts)
+BOOL WINAPI _SetupTCPIP(HWND WndParent, PTTSet ts)
 {
 	return
 		(BOOL)DialogBoxParam(hInst,
@@ -3331,7 +2765,7 @@
 		                     WndParent, TCPIPDlg, (LPARAM)ts);
 }
 
-BOOL WINAPI GetHostName(HWND WndParent, PGetHNRec GetHNRec)
+BOOL WINAPI _GetHostName(HWND WndParent, PGetHNRec GetHNRec)
 {
 	return
 		(BOOL)DialogBoxParam(hInst,
@@ -3339,7 +2773,7 @@
 		                     WndParent, HostDlg, (LPARAM)GetHNRec);
 }
 
-BOOL WINAPI ChangeDirectory(HWND WndParent, PCHAR CurDir)
+BOOL WINAPI _ChangeDirectory(HWND WndParent, PCHAR CurDir)
 {
 	return
 		(BOOL)DialogBoxParam(hInst,
@@ -3347,7 +2781,7 @@
 		                     WndParent, DirDlg, (LPARAM)CurDir);
 }
 
-BOOL WINAPI AboutDialog(HWND WndParent)
+BOOL WINAPI _AboutDialog(HWND WndParent)
 {
 	return
 		(BOOL)DialogBox(hInst,
@@ -3400,7 +2834,7 @@
 #ifndef CF_INACTIVEFONTS
 #define CF_INACTIVEFONTS 0x02000000L
 #endif
-BOOL WINAPI ChooseFontDlg(HWND WndParent, LPLOGFONT LogFont, PTTSet ts)
+BOOL WINAPI _ChooseFontDlg(HWND WndParent, LPLOGFONTA LogFont, PTTSet ts)
 {
 	CHOOSEFONT cf;
 	BOOL Ok;
@@ -3423,7 +2857,7 @@
 	return Ok;
 }
 
-BOOL WINAPI SetupGeneral(HWND WndParent, PTTSet ts)
+BOOL WINAPI _SetupGeneral(HWND WndParent, PTTSet ts)
 {
 	return
 		(BOOL)DialogBoxParam(hInst,
@@ -3431,7 +2865,7 @@
 		                     WndParent, (DLGPROC)&GenDlg, (LPARAM)ts);
 }
 
-BOOL WINAPI WindowWindow(HWND WndParent, PBOOL Close)
+BOOL WINAPI _WindowWindow(HWND WndParent, PBOOL Close)
 {
 	*Close = FALSE;
 	return
@@ -3441,11 +2875,13 @@
 		                     (DLGPROC)&WinListDlg, (LPARAM)Close);
 }
 
-void WINAPI TTDLGSetUILanguageFile(char *file)
+BOOL WINAPI _TTDLGSetUILanguageFile(char *file)
 {
 	strncpy_s(UILanguageFile, sizeof(UILanguageFile), file, _TRUNCATE);
+	return TRUE;
 }
 
+#if 0
 BOOL WINAPI DllMain(HANDLE hInstance,
                     ULONG ul_reason_for_call,
                     LPVOID lpReserved)
@@ -3468,3 +2904,4 @@
 	}
 	return TRUE;
 }
+#endif

Added: trunk/teraterm/ttpdlg/ttdlg.h
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.h	                        (rev 0)
+++ trunk/teraterm/ttpdlg/ttdlg.h	2019-03-26 15:42:43 UTC (rev 7515)
@@ -0,0 +1,43 @@
+/*
+ * (C) 2018-2019 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "teraterm.h"
+#include "tttypes.h"
+
+BOOL WINAPI _SetupTerminal(HWND WndParent, PTTSet ts);
+BOOL WINAPI _SetupWin(HWND WndParent, PTTSet ts);
+BOOL WINAPI _SetupKeyboard(HWND WndParent, PTTSet ts);
+BOOL WINAPI _SetupSerialPort(HWND WndParent, PTTSet ts);
+BOOL WINAPI _SetupTCPIP(HWND WndParent, PTTSet ts);
+BOOL WINAPI _GetHostName(HWND WndParent, PGetHNRec GetHNRec);
+BOOL WINAPI _ChangeDirectory(HWND WndParent, PCHAR CurDir);
+BOOL WINAPI _AboutDialog(HWND WndParent);
+BOOL WINAPI _ChooseFontDlg(HWND WndParent, LPLOGFONTA LogFont, PTTSet ts);
+BOOL WINAPI _SetupGeneral(HWND WndParent, PTTSet ts);
+BOOL WINAPI _WindowWindow(HWND WndParent, PBOOL Close);
+BOOL WINAPI _TTDLGSetUILanguageFile(char *file);

Deleted: trunk/teraterm/ttpdlg/ttpdlg-version.rc
===================================================================
--- trunk/teraterm/ttpdlg/ttpdlg-version.rc	2019-03-26 15:42:29 UTC (rev 7514)
+++ trunk/teraterm/ttpdlg/ttpdlg-version.rc	2019-03-26 15:42:43 UTC (rev 7515)
@@ -1,39 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-#include "tt-version.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION TT_VERSION_MAJOR,TT_VERSION_MINOR,0,0
- PRODUCTVERSION TT_VERSION_MAJOR,TT_VERSION_MINOR,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", "T. Teranishi, TeraTerm Project"
-            VALUE "FileDescription", "Tera Term Dialog Routines"
-            VALUE "FileVersion", TT_RES_VERSION_STR
-            VALUE "InternalName", "TTPDLG"
-            VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2019 TeraTerm Project"
-            VALUE "OriginalFilename", "TTPDLG.dll"
-            VALUE "ProductName", "Tera Term"
-            VALUE "ProductVersion", TT_RES_VERSION_STR
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END

Modified: trunk/teraterm/ttpdlg/ttpdlg.rc
===================================================================
--- trunk/teraterm/ttpdlg/ttpdlg.rc	2019-03-26 15:42:29 UTC (rev 7514)
+++ trunk/teraterm/ttpdlg/ttpdlg.rc	2019-03-26 15:42:43 UTC (rev 7515)
@@ -42,7 +42,6 @@
 
 3 TEXTINCLUDE 
 BEGIN
-    "#include ""ttpdlg-version.rc""\r\n"
     "\0"
 END
 
@@ -413,7 +412,6 @@
     IDD_ABOUTDLG, DIALOG
     BEGIN
         RIGHTMARGIN, 186
-        BOTTOMMARGIN, 125
     END
 
     IDD_GENDLG, DIALOG
@@ -436,27 +434,7 @@
 END
 #endif    // APSTUDIO_INVOKED
 
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_TTERM               ICON                    "..\\common\\teraterm.ico"
 #endif    // \x89p\x8C\xEA (\x95č\x91) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#include "ttpdlg-version.rc"
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

From scmnotify ＠ osdn.net  Wed Mar 27 00:42:57 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Wed, 27 Mar 2019 00:42:57 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc1MTZdIOmWouaVsOOCkuenu+WLlQ==?=
Message-ID: <1553614977.683239.49635.nullmailer@users.osdn.me>

Revision: 7516
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7516
Author:   zmatsuo
Date:     2019-03-27 00:42:57 +0900 (Wed, 27 Mar 2019)
Log Message:
-----------
関数を移動
GetMessageboxFont() dlglib.cからttlib.cへ移動
SetDialogFont() dlglib.cからdlglib_cpp.cppへ移動

Modified Paths:
--------------
    trunk/teraterm/common/dlglib.c
    trunk/teraterm/common/dlglib_cpp.cpp
    trunk/teraterm/common/tipwin.cpp
    trunk/teraterm/common/ttlib.c
    trunk/teraterm/common/ttlib.h
    trunk/teraterm/ttpcmn/ttpcmn.def

-------------- next part --------------
Modified: trunk/teraterm/common/dlglib.c
===================================================================
--- trunk/teraterm/common/dlglib.c	2019-03-26 15:42:43 UTC (rev 7515)
+++ trunk/teraterm/common/dlglib.c	2019-03-26 15:42:57 UTC (rev 7516)
@@ -430,97 +430,6 @@
 	return info.found;
 }
 
-/**
- *	\x83_\x83C\x83A\x83\x8D\x83O\x83t\x83H\x83\x93\x83g\x82\xF0\x8E擾\x82\xB7\x82\xE9
- *	\x83G\x83\x89\x81[\x82͔\xAD\x90\xB6\x82\xB5\x82Ȃ\xA2
- */
-void GetMessageboxFont(LOGFONT *logfont)
-{
-	NONCLIENTMETRICS nci;
-	const int st_size = CCSIZEOF_STRUCT(NONCLIENTMETRICS, lfMessageFont);
-	BOOL r;
-
-	memset(&nci, 0, sizeof(nci));
-	nci.cbSize = st_size;
-	r = SystemParametersInfo(SPI_GETNONCLIENTMETRICS, st_size, &nci, 0);
-	assert(r == TRUE);
-	*logfont = nci.lfStatusFont;
-}
-
-/**
- *	\x8Eg\x97p\x82\xB7\x82\xE9\x83_\x83C\x83A\x83\x8D\x83O\x83t\x83H\x83\x93\x83g\x82\xF0\x8C\x88\x92肷\x82\xE9
- */
-void SetDialogFont(const char *SetupFName,
-				   const char *UILanguageFile, const char *Section)
-{
-	// teraterm.ini\x82̎w\x92\xE8
-	if (SetupFName != NULL) {
-		LOGFONTA logfont;
-		BOOL result;
-		result = GetI18nLogfont("Tera Term", "DlgFont", &logfont, 0, SetupFName);
-		if (result == TRUE) {
-			result = IsExistFontA(logfont.lfFaceName, logfont.lfCharSet, TRUE);
-			if (result == TRUE) {
-				TTSetDlgFontA(logfont.lfFaceName, logfont.lfHeight, logfont.lfCharSet);
-				return;
-			}
-		}
-	}
-
-	// .lng\x82̎w\x92\xE8
-	if (UILanguageFile != NULL) {
-		static const char *dlg_font_keys[] = {
-			"DLG_FONT",
-			"DLG_TAHOMA_FONT",
-			"DLG_SYSTEM_FONT",
-		};
-		BOOL result = FALSE;
-		LOGFONTA logfont;
-		size_t i;
-		if (Section != NULL) {
-			for (i = 0; i < _countof(dlg_font_keys); i++) {
-				result = GetI18nLogfont(Section, dlg_font_keys[i], &logfont, 0, UILanguageFile);
-				if (result == FALSE) {
-					continue;
-				}
-				if (logfont.lfFaceName[0] == '\0') {
-					break;
-				}
-				if (IsExistFontA(logfont.lfFaceName, logfont.lfCharSet, TRUE)) {
-					break;
-				}
-			}
-		}
-		if (result == FALSE) {
-			for (i = 0; i < _countof(dlg_font_keys); i++) {
-				result = GetI18nLogfont("Tera Term", dlg_font_keys[i], &logfont, 0, UILanguageFile);
-				if (result == FALSE) {
-					continue;
-				}
-				if (logfont.lfFaceName[0] == '\0') {
-					break;
-				}
-				if (IsExistFontA(logfont.lfFaceName, logfont.lfCharSet, TRUE)) {
-					break;
-				}
-			}
-		}
-		if (result == TRUE) {
-			TTSetDlgFontA(logfont.lfFaceName, logfont.lfHeight, logfont.lfCharSet);
-			return;
-		}
-	}
-
-	// ini,lng\x82Ŏw\x92肳\x82ꂽ\x83t\x83H\x83\x93\x83g\x82\xAA\x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA9\x82\xC1\x82\xBD\x82Ƃ\xAB\x81A
-	// \x95\xB6\x8E\x9A\x89\xBB\x82\xAF\x82Ő\xB3\x82\xB5\x82\xAD\x95\\x8E\xA6\x82\xB3\x82\xEA\x82Ȃ\xA2\x8E\x96\x91ԂƂȂ\xE9
-	// messagebox()\x82̃t\x83H\x83\x93\x83g\x82\xF0\x82Ƃ肠\x82\xA6\x82\xB8\x91I\x91\xF0\x82\xB5\x82Ă\xA8\x82\xAD
-	{
-		LOGFONT logfont;
-		GetMessageboxFont(&logfont);
-		TTSetDlgFont(logfont.lfFaceName, logfont.lfHeight, logfont.lfCharSet);
-	}
-}
-
 HFONT SetDlgFonts(HWND hDlg, const int nIDDlgItems[], int nIDDlgItemCount,
                   const char *UILanguageFile, PCHAR key)
 {

Modified: trunk/teraterm/common/dlglib_cpp.cpp
===================================================================
--- trunk/teraterm/common/dlglib_cpp.cpp	2019-03-26 15:42:43 UTC (rev 7515)
+++ trunk/teraterm/common/dlglib_cpp.cpp	2019-03-26 15:42:57 UTC (rev 7516)
@@ -30,6 +30,7 @@
 
 #include <windows.h>
 #include "dlglib.h"
+#include "ttlib.h"
 
 // \x83_\x83C\x83A\x83\x8D\x83O\x83\x82\x81[\x83_\x83\x8B\x8F\xF3\x91Ԃ̎\x9E\x81AOnIdle()\x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9
 //#define ENABLE_CALL_IDLE_MODAL	1
@@ -240,3 +241,77 @@
 		hInstance, lpTemplateName,
 		hWndParent, lpDialogFunc, (LPARAM)NULL);
 }
+
+/**
+ *	\x8Eg\x97p\x82\xB7\x82\xE9\x83_\x83C\x83A\x83\x8D\x83O\x83t\x83H\x83\x93\x83g\x82\xF0\x8C\x88\x92肷\x82\xE9
+ */
+void SetDialogFont(const char *SetupFName,
+				   const char *UILanguageFile, const char *Section)
+{
+	// teraterm.ini\x82̎w\x92\xE8
+	if (SetupFName != NULL) {
+		LOGFONTA logfont;
+		BOOL result;
+		result = GetI18nLogfont("Tera Term", "DlgFont", &logfont, 0, SetupFName);
+		if (result == TRUE) {
+			result = IsExistFontA(logfont.lfFaceName, logfont.lfCharSet, TRUE);
+			if (result == TRUE) {
+				TTSetDlgFontA(logfont.lfFaceName, logfont.lfHeight, logfont.lfCharSet);
+				return;
+			}
+		}
+	}
+
+	// .lng\x82̎w\x92\xE8
+	if (UILanguageFile != NULL) {
+		static const char *dlg_font_keys[] = {
+			"DLG_FONT",
+			"DLG_TAHOMA_FONT",
+			"DLG_SYSTEM_FONT",
+		};
+		BOOL result = FALSE;
+		LOGFONTA logfont;
+		size_t i;
+		if (Section != NULL) {
+			for (i = 0; i < _countof(dlg_font_keys); i++) {
+				result = GetI18nLogfont(Section, dlg_font_keys[i], &logfont, 0, UILanguageFile);
+				if (result == FALSE) {
+					continue;
+				}
+				if (logfont.lfFaceName[0] == '\0') {
+					break;
+				}
+				if (IsExistFontA(logfont.lfFaceName, logfont.lfCharSet, TRUE)) {
+					break;
+				}
+			}
+		}
+		if (result == FALSE) {
+			for (i = 0; i < _countof(dlg_font_keys); i++) {
+				result = GetI18nLogfont("Tera Term", dlg_font_keys[i], &logfont, 0, UILanguageFile);
+				if (result == FALSE) {
+					continue;
+				}
+				if (logfont.lfFaceName[0] == '\0') {
+					break;
+				}
+				if (IsExistFontA(logfont.lfFaceName, logfont.lfCharSet, TRUE)) {
+					break;
+				}
+			}
+		}
+		if (result == TRUE) {
+			TTSetDlgFontA(logfont.lfFaceName, logfont.lfHeight, logfont.lfCharSet);
+			return;
+		}
+	}
+
+	// ini,lng\x82Ŏw\x92肳\x82ꂽ\x83t\x83H\x83\x93\x83g\x82\xAA\x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA9\x82\xC1\x82\xBD\x82Ƃ\xAB\x81A
+	// \x95\xB6\x8E\x9A\x89\xBB\x82\xAF\x82Ő\xB3\x82\xB5\x82\xAD\x95\\x8E\xA6\x82\xB3\x82\xEA\x82Ȃ\xA2\x8E\x96\x91ԂƂȂ\xE9
+	// messagebox()\x82̃t\x83H\x83\x93\x83g\x82\xF0\x82Ƃ肠\x82\xA6\x82\xB8\x91I\x91\xF0\x82\xB5\x82Ă\xA8\x82\xAD
+	{
+		LOGFONT logfont;
+		GetMessageboxFont(&logfont);
+		TTSetDlgFont(logfont.lfFaceName, logfont.lfHeight, logfont.lfCharSet);
+	}
+}

Modified: trunk/teraterm/common/tipwin.cpp
===================================================================
--- trunk/teraterm/common/tipwin.cpp	2019-03-26 15:42:43 UTC (rev 7515)
+++ trunk/teraterm/common/tipwin.cpp	2019-03-26 15:42:57 UTC (rev 7516)
@@ -58,9 +58,10 @@
 #include <windows.h>
 #include <stdio.h>
 #include <tchar.h>
-#include <commctrl.h>	// for CCSIZEOF_STRUCT()
 #include <assert.h>
 
+#include "ttlib.h"		// for GetMessageboxFont()
+
 #include "TipWin.h"
 
 #define	FRAME_WIDTH	6
@@ -190,20 +191,6 @@
 	return DefWindowProc(hWnd, nMsg, wParam, lParam);
 }
 
-// todo: dlglib.c\x82ɓ\xAF\x93\x99\x82ȃR\x81[\x83h\x82\xA0\x82\xE8
-void GetMessageboxFont(LOGFONT *logfont)
-{
-	NONCLIENTMETRICS nci;
-	const int st_size = CCSIZEOF_STRUCT(NONCLIENTMETRICS, lfMessageFont);
-	BOOL r;
-
-	memset(&nci, 0, sizeof(nci));
-	nci.cbSize = st_size;
-	r = SystemParametersInfo(SPI_GETNONCLIENTMETRICS, st_size, &nci, 0);
-	assert(r == TRUE);
-	*logfont = nci.lfStatusFont;
-}
-
 static void register_class(HINSTANCE hInst)
 {
 	if (!tip_class) {

Modified: trunk/teraterm/common/ttlib.c
===================================================================
--- trunk/teraterm/common/ttlib.c	2019-03-26 15:42:43 UTC (rev 7515)
+++ trunk/teraterm/common/ttlib.c	2019-03-26 15:42:57 UTC (rev 7516)
@@ -28,18 +28,19 @@
  */
 
 /* misc. routines  */
-#include "teraterm.h"
+
 #include <sys/stat.h>
 #include <sys/utime.h>
 #include <string.h>
 #include <time.h>
 #include <stdio.h>
-#include "tttypes.h"
 #include <shlobj.h>
 #include <ctype.h>
+#include <mbctype.h>	// for _ismbblead
+#include <assert.h>
 
-// for _ismbblead
-#include <mbctype.h>
+#include "teraterm.h"
+#include "tttypes.h"
 
 /* OS version with GetVersionEx(*1)
 
@@ -1805,3 +1806,20 @@
 {
 	SetI18MenuStrs("Tera Term", hMenu, infos, infoCount, UILanguageFile);
 }
+
+/**
+ *	\x83_\x83C\x83A\x83\x8D\x83O\x83t\x83H\x83\x93\x83g\x82\xF0\x8E擾\x82\xB7\x82\xE9
+ *	\x83G\x83\x89\x81[\x82͔\xAD\x90\xB6\x82\xB5\x82Ȃ\xA2
+ */
+void GetMessageboxFont(LOGFONT *logfont)
+{
+	NONCLIENTMETRICS nci;
+	const int st_size = CCSIZEOF_STRUCT(NONCLIENTMETRICS, lfMessageFont);
+	BOOL r;
+
+	memset(&nci, 0, sizeof(nci));
+	nci.cbSize = st_size;
+	r = SystemParametersInfo(SPI_GETNONCLIENTMETRICS, st_size, &nci, 0);
+	assert(r == TRUE);
+	*logfont = nci.lfStatusFont;
+}

Modified: trunk/teraterm/common/ttlib.h
===================================================================
--- trunk/teraterm/common/ttlib.h	2019-03-26 15:42:43 UTC (rev 7515)
+++ trunk/teraterm/common/ttlib.h	2019-03-26 15:42:57 UTC (rev 7516)
@@ -108,6 +108,7 @@
 BOOL GetPositionOnWindow(
 	HWND hWnd, const POINT *point,
 	BOOL *InWindow, BOOL *InClient, BOOL *InTitleBar);
+void GetMessageboxFont(LOGFONTA *logfont);
 
 #define CheckFlag(var, flag)	(((var) & (flag)) != 0)
 

Modified: trunk/teraterm/ttpcmn/ttpcmn.def
===================================================================
--- trunk/teraterm/ttpcmn/ttpcmn.def	2019-03-26 15:42:43 UTC (rev 7515)
+++ trunk/teraterm/ttpcmn/ttpcmn.def	2019-03-26 15:42:57 UTC (rev 7516)
@@ -94,3 +94,4 @@
 
   SetI18DlgStrs
   SetI18MenuStrs
+  GetMessageboxFont

From scmnotify ＠ osdn.net  Wed Mar 27 00:43:12 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Wed, 27 Mar 2019 00:43:12 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc1MTddIOODl+ODreOCuOOCp+OCr+ODiA==?=
 =?utf-8?b?44OV44Kh44Kk44Or5L+d5a6I?=
Message-ID: <1553614992.302826.49843.nullmailer@users.osdn.me>

Revision: 7517
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7517
Author:   zmatsuo
Date:     2019-03-27 00:43:12 +0900 (Wed, 27 Mar 2019)
Log Message:
-----------
プロジェクトファイル保守
VS2005とVS2017はビルドできる、その他は未調整

Modified Paths:
--------------
    trunk/teraterm/teraterm/ttermpro.v10.vcxproj
    trunk/teraterm/teraterm/ttermpro.v11.vcxproj
    trunk/teraterm/teraterm/ttermpro.v12.vcxproj
    trunk/teraterm/teraterm/ttermpro.v14.vcxproj
    trunk/teraterm/teraterm/ttermpro.v15.vcxproj
    trunk/teraterm/teraterm/ttermpro.vcproj
    trunk/teraterm/ttermpro.sln
    trunk/teraterm/ttermpro.v10.sln
    trunk/teraterm/ttermpro.v11.sln
    trunk/teraterm/ttermpro.v12.sln
    trunk/teraterm/ttermpro.v14.sln
    trunk/teraterm/ttermpro.v15.sln
    trunk/teraterm/ttermpro.v9.sln
    trunk/teraterm/ttpcmn/ttpcmn.vcproj
    trunk/ttssh2/ttxssh/ttxssh.v15.vcxproj
    trunk/ttssh2/ttxssh/ttxssh.v15.vcxproj.filters

Removed Paths:
-------------
    trunk/teraterm/ttpdlg/ttpdlg.def
    trunk/teraterm/ttpdlg/ttpdlg.dsp
    trunk/teraterm/ttpdlg/ttpdlg.v10.vcxproj
    trunk/teraterm/ttpdlg/ttpdlg.v10.vcxproj.filters
    trunk/teraterm/ttpdlg/ttpdlg.v11.vcxproj
    trunk/teraterm/ttpdlg/ttpdlg.v11.vcxproj.filters
    trunk/teraterm/ttpdlg/ttpdlg.v12.vcxproj
    trunk/teraterm/ttpdlg/ttpdlg.v12.vcxproj.filters
    trunk/teraterm/ttpdlg/ttpdlg.v14.vcxproj
    trunk/teraterm/ttpdlg/ttpdlg.v14.vcxproj.filters
    trunk/teraterm/ttpdlg/ttpdlg.v15.vcxproj
    trunk/teraterm/ttpdlg/ttpdlg.v15.vcxproj.filters
    trunk/teraterm/ttpdlg/ttpdlg.v9.vcproj
    trunk/teraterm/ttpdlg/ttpdlg.vcproj

-------------- next part --------------
Modified: trunk/teraterm/teraterm/ttermpro.v10.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v10.vcxproj	2019-03-26 15:42:57 UTC (rev 7516)
+++ trunk/teraterm/teraterm/ttermpro.v10.vcxproj	2019-03-26 15:43:12 UTC (rev 7517)
@@ -194,10 +194,6 @@
       <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\ttpdlg\ttpdlg.v10.vcxproj">
-      <Project>{47cb840d-85c8-460f-9101-beb54bef9d56}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="..\ttpfile\ttpfile.v10.vcxproj">
       <Project>{311f2b21-aec4-4384-8209-bb83b54749b4}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

Modified: trunk/teraterm/teraterm/ttermpro.v11.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v11.vcxproj	2019-03-26 15:42:57 UTC (rev 7516)
+++ trunk/teraterm/teraterm/ttermpro.v11.vcxproj	2019-03-26 15:43:12 UTC (rev 7517)
@@ -191,10 +191,6 @@
       <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\ttpdlg\ttpdlg.v11.vcxproj">
-      <Project>{47cb840d-85c8-460f-9101-beb54bef9d56}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="..\ttpfile\ttpfile.v11.vcxproj">
       <Project>{311f2b21-aec4-4384-8209-bb83b54749b4}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

Modified: trunk/teraterm/teraterm/ttermpro.v12.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v12.vcxproj	2019-03-26 15:42:57 UTC (rev 7516)
+++ trunk/teraterm/teraterm/ttermpro.v12.vcxproj	2019-03-26 15:43:12 UTC (rev 7517)
@@ -193,10 +193,6 @@
       <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\ttpdlg\ttpdlg.v12.vcxproj">
-      <Project>{47cb840d-85c8-460f-9101-beb54bef9d56}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="..\ttpfile\ttpfile.v12.vcxproj">
       <Project>{311f2b21-aec4-4384-8209-bb83b54749b4}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

Modified: trunk/teraterm/teraterm/ttermpro.v14.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v14.vcxproj	2019-03-26 15:42:57 UTC (rev 7516)
+++ trunk/teraterm/teraterm/ttermpro.v14.vcxproj	2019-03-26 15:43:12 UTC (rev 7517)
@@ -195,10 +195,6 @@
       <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\ttpdlg\ttpdlg.v14.vcxproj">
-      <Project>{47cb840d-85c8-460f-9101-beb54bef9d56}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="..\ttpfile\ttpfile.v14.vcxproj">
       <Project>{311f2b21-aec4-4384-8209-bb83b54749b4}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

Modified: trunk/teraterm/teraterm/ttermpro.v15.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v15.vcxproj	2019-03-26 15:42:57 UTC (rev 7516)
+++ trunk/teraterm/teraterm/ttermpro.v15.vcxproj	2019-03-26 15:43:12 UTC (rev 7517)
@@ -64,7 +64,7 @@
     <ClCompile>
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)common;$(SolutionDir)ttpfile;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <BrowseInformation />
@@ -77,12 +77,12 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0411</Culture>
-      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -106,7 +106,7 @@
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(SolutionDir)common;$(SolutionDir)ttpfile;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -124,7 +124,7 @@
     <Link>
       <AdditionalDependencies>nafxcw.lib;LIBCMT.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -175,6 +175,9 @@
     <ClCompile Include="vtwin.cpp" />
     <ClCompile Include="winjump.c" />
     <ClCompile Include="WSAAsyncGetAddrInfo.c" />
+    <ClCompile Include="../ttpdlg/dlg_res.h" />
+    <ClCompile Include="../ttpdlg/ttdlg.c" />
+    <ClCompile Include="../ttpdlg/ttdlg.h" />
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\..\cygterm\cygterm.ico" />
@@ -189,6 +192,7 @@
   <ItemGroup>
     <ResourceCompile Include="tt-version.rc" />
     <ResourceCompile Include="ttermpro.rc" />
+    <ResourceCompile Include="../ttpdlg/ttpdlg.rc" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\common\compat_w95.h" />
@@ -237,10 +241,6 @@
       <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\ttpdlg\ttpdlg.v15.vcxproj">
-      <Project>{47cb840d-85c8-460f-9101-beb54bef9d56}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="..\ttpfile\ttpfile.v15.vcxproj">
       <Project>{311f2b21-aec4-4384-8209-bb83b54749b4}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

Modified: trunk/teraterm/teraterm/ttermpro.vcproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.vcproj	2019-03-26 15:42:57 UTC (rev 7516)
+++ trunk/teraterm/teraterm/ttermpro.vcproj	2019-03-26 15:43:12 UTC (rev 7517)
@@ -48,7 +48,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D&quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)common;$(SolutionDir)ttpfile"
+				AdditionalIncludeDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				RuntimeLibrary="1"
 				BrowseInformation="0"
@@ -71,10 +71,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib imagehlp.lib"
+				AdditionalDependencies="onig_sd.lib ws2_32.lib imagehlp.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(OutDir)"
+				AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(OutDir)"
 				GenerateManifest="false"
 				DelayLoadDLLs="imagehlp.dll;user32.dll;shell32.dll"
 				GenerateDebugInformation="true"
@@ -141,7 +141,7 @@
 				AdditionalOptions="/D&quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="$(SolutionDir)common;$(SolutionDir)ttpfile"
+				AdditionalIncludeDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -164,10 +164,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib imagehlp.lib"
+				AdditionalDependencies="onig_s.lib ws2_32.lib imagehlp.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(OutDir)"
+				AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(OutDir)"
 				GenerateManifest="false"
 				DelayLoadDLLs="imagehlp.dll;user32.dll;shell32.dll"
 				GenerateDebugInformation="true"
@@ -213,14 +213,22 @@
 				>
 			</File>
 			<File
-				RelativePath="dnddlg.cpp"
+				RelativePath="..\common\dlglib.c"
 				>
 			</File>
 			<File
-				RelativePath="..\common\dlglib.c"
+				RelativePath="..\common\dlglib_cpp.cpp"
 				>
 			</File>
 			<File
+				RelativePath="..\common\dlglib_tmpl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="dnddlg.cpp"
+				>
+			</File>
+			<File
 				RelativePath="filesys.cpp"
 				>
 			</File>
@@ -314,10 +322,22 @@
 				>
 			</File>
 			<File
+				RelativePath="..\common\codeconv.cpp"
+				>
+			</File>
+			<File
 				RelativePath="commlib.c"
 				>
 			</File>
 			<File
+				RelativePath="..\common\compat_win.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\common\dllutil.cpp"
+				>
+			</File>
+			<File
 				RelativePath="keyboard.c"
 				>
 			</File>
@@ -334,6 +354,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\common\tipwin.cpp"
+				>
+			</File>
+			<File
 				RelativePath="ttdde.c"
 				>
 			</File>
@@ -378,6 +402,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\common\win16api.c"
+				>
+			</File>
+			<File
 				RelativePath="winjump.c"
 				>
 			</File>
@@ -385,55 +413,59 @@
 				RelativePath="WSAAsyncGetAddrInfo.c"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
 			<File
-				RelativePath="..\common\win16api.c"
+				RelativePath="addsetting.h"
 				>
 			</File>
 			<File
-				RelativePath="..\common\compat_win.cpp"
+				RelativePath="dnddlg.h"
 				>
 			</File>
 			<File
-				RelativePath="..\common\dllutil.cpp"
+				RelativePath="sizetip.h"
 				>
 			</File>
 			<File
-				RelativePath="..\common\codeconv.cpp"
+				RelativePath="..\common\tt_res.h"
 				>
 			</File>
 			<File
-				RelativePath="..\common\tipwin.cpp"
+				RelativePath="ttfileio.h"
 				>
 			</File>
+			<File
+				RelativePath="..\common\win16api.h"
+				>
+			</File>
 		</Filter>
 		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
+			Name="ttdlg"
 			>
 			<File
-				RelativePath="addsetting.h"
+				RelativePath="..\ttpdlg\dlg_res.h"
 				>
 			</File>
 			<File
-				RelativePath="dnddlg.h"
+				RelativePath="..\ttpdlg\svnversion.h"
 				>
 			</File>
 			<File
-				RelativePath="sizetip.h"
+				RelativePath="..\ttpdlg\ttdlg.c"
 				>
 			</File>
 			<File
-				RelativePath="..\common\tt_res.h"
+				RelativePath="..\ttpdlg\ttdlg.h"
 				>
 			</File>
 			<File
-				RelativePath="ttfileio.h"
+				RelativePath="..\ttpdlg\ttpdlg.rc"
 				>
 			</File>
-			<File
-				RelativePath="..\common\win16api.h"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>

Modified: trunk/teraterm/ttermpro.sln
===================================================================
--- trunk/teraterm/ttermpro.sln	2019-03-26 15:42:57 UTC (rev 7516)
+++ trunk/teraterm/ttermpro.sln	2019-03-26 15:43:12 UTC (rev 7517)
@@ -2,7 +2,6 @@
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttermpro", "teraterm\ttermpro.vcproj", "{BC4CDBE3-6269-47A8-BD74-EEB3A6160E06}"
 	ProjectSection(ProjectDependencies) = postProject
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56} = {47CB840D-85C8-460F-9101-BEB54BEF9D56}
 		{BA519362-A2C2-4B1A-905B-F00791F9038A} = {BA519362-A2C2-4B1A-905B-F00791F9038A}
 		{5CF58947-E861-4A5C-B0B1-E85486F149CD} = {5CF58947-E861-4A5C-B0B1-E85486F149CD}
 		{6D08053B-1C68-4A7E-8766-3553F5AF010B} = {6D08053B-1C68-4A7E-8766-3553F5AF010B}
@@ -14,12 +13,6 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpcmn", "ttpcmn\ttpcmn.vcproj", "{118E0D32-5553-4F73-9927-E873C1C500E4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpdlg", "ttpdlg\ttpdlg.vcproj", "{47CB840D-85C8-460F-9101-BEB54BEF9D56}"
-	ProjectSection(ProjectDependencies) = postProject
-		{80F1C3F0-A213-4D48-85C8-A265990D19A7} = {80F1C3F0-A213-4D48-85C8-A265990D19A7}
-		{118E0D32-5553-4F73-9927-E873C1C500E4} = {118E0D32-5553-4F73-9927-E873C1C500E4}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpfile", "ttpfile\ttpfile.vcproj", "{311F2B21-AEC4-4384-8209-BB83B54749B4}"
 	ProjectSection(ProjectDependencies) = postProject
 		{118E0D32-5553-4F73-9927-E873C1C500E4} = {118E0D32-5553-4F73-9927-E873C1C500E4}
@@ -60,10 +53,6 @@
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Debug|Win32.Build.0 = Debug|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.ActiveCfg = Release|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.Build.0 = Release|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.ActiveCfg = Debug|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.Build.0 = Debug|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.ActiveCfg = Release|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.Build.0 = Release|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.Build.0 = Debug|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Release|Win32.ActiveCfg = Release|Win32

Modified: trunk/teraterm/ttermpro.v10.sln
===================================================================
--- trunk/teraterm/ttermpro.v10.sln	2019-03-26 15:42:57 UTC (rev 7516)
+++ trunk/teraterm/ttermpro.v10.sln	2019-03-26 15:43:12 UTC (rev 7517)
@@ -6,8 +6,6 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpcmn", "ttpcmn\ttpcmn.v10.vcxproj", "{118E0D32-5553-4F73-9927-E873C1C500E4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpdlg", "ttpdlg\ttpdlg.v10.vcxproj", "{47CB840D-85C8-460F-9101-BEB54BEF9D56}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpfile", "ttpfile\ttpfile.v10.vcxproj", "{311F2B21-AEC4-4384-8209-BB83B54749B4}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpmacro", "ttpmacro\ttpmacro.v10.vcxproj", "{BA519362-A2C2-4B1A-905B-F00791F9038A}"
@@ -36,10 +34,6 @@
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Debug|Win32.Build.0 = Debug|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.ActiveCfg = Release|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.Build.0 = Release|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.ActiveCfg = Debug|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.Build.0 = Debug|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.ActiveCfg = Release|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.Build.0 = Release|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.Build.0 = Debug|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Release|Win32.ActiveCfg = Release|Win32

Modified: trunk/teraterm/ttermpro.v11.sln
===================================================================
--- trunk/teraterm/ttermpro.v11.sln	2019-03-26 15:42:57 UTC (rev 7516)
+++ trunk/teraterm/ttermpro.v11.sln	2019-03-26 15:43:12 UTC (rev 7517)
@@ -6,8 +6,6 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpcmn", "ttpcmn\ttpcmn.v11.vcxproj", "{118E0D32-5553-4F73-9927-E873C1C500E4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpdlg", "ttpdlg\ttpdlg.v11.vcxproj", "{47CB840D-85C8-460F-9101-BEB54BEF9D56}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpfile", "ttpfile\ttpfile.v11.vcxproj", "{311F2B21-AEC4-4384-8209-BB83B54749B4}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpmacro", "ttpmacro\ttpmacro.v11.vcxproj", "{BA519362-A2C2-4B1A-905B-F00791F9038A}"
@@ -36,10 +34,6 @@
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Debug|Win32.Build.0 = Debug|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.ActiveCfg = Release|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.Build.0 = Release|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.ActiveCfg = Debug|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.Build.0 = Debug|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.ActiveCfg = Release|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.Build.0 = Release|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.Build.0 = Debug|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Release|Win32.ActiveCfg = Release|Win32

Modified: trunk/teraterm/ttermpro.v12.sln
===================================================================
--- trunk/teraterm/ttermpro.v12.sln	2019-03-26 15:42:57 UTC (rev 7516)
+++ trunk/teraterm/ttermpro.v12.sln	2019-03-26 15:43:12 UTC (rev 7517)
@@ -8,8 +8,6 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpcmn", "ttpcmn\ttpcmn.v12.vcxproj", "{118E0D32-5553-4F73-9927-E873C1C500E4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpdlg", "ttpdlg\ttpdlg.v12.vcxproj", "{47CB840D-85C8-460F-9101-BEB54BEF9D56}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpfile", "ttpfile\ttpfile.v12.vcxproj", "{311F2B21-AEC4-4384-8209-BB83B54749B4}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpmacro", "ttpmacro\ttpmacro.v12.vcxproj", "{BA519362-A2C2-4B1A-905B-F00791F9038A}"
@@ -38,10 +36,6 @@
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Debug|Win32.Build.0 = Debug|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.ActiveCfg = Release|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.Build.0 = Release|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.ActiveCfg = Debug|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.Build.0 = Debug|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.ActiveCfg = Release|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.Build.0 = Release|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.Build.0 = Debug|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Release|Win32.ActiveCfg = Release|Win32

Modified: trunk/teraterm/ttermpro.v14.sln
===================================================================
--- trunk/teraterm/ttermpro.v14.sln	2019-03-26 15:42:57 UTC (rev 7516)
+++ trunk/teraterm/ttermpro.v14.sln	2019-03-26 15:43:12 UTC (rev 7517)
@@ -8,8 +8,6 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpcmn", "ttpcmn\ttpcmn.v14.vcxproj", "{118E0D32-5553-4F73-9927-E873C1C500E4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpdlg", "ttpdlg\ttpdlg.v14.vcxproj", "{47CB840D-85C8-460F-9101-BEB54BEF9D56}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpfile", "ttpfile\ttpfile.v14.vcxproj", "{311F2B21-AEC4-4384-8209-BB83B54749B4}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpmacro", "ttpmacro\ttpmacro.v14.vcxproj", "{BA519362-A2C2-4B1A-905B-F00791F9038A}"
@@ -38,10 +36,6 @@
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Debug|Win32.Build.0 = Debug|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.ActiveCfg = Release|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.Build.0 = Release|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.ActiveCfg = Debug|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.Build.0 = Debug|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.ActiveCfg = Release|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.Build.0 = Release|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.Build.0 = Debug|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Release|Win32.ActiveCfg = Release|Win32

Modified: trunk/teraterm/ttermpro.v15.sln
===================================================================
--- trunk/teraterm/ttermpro.v15.sln	2019-03-26 15:42:57 UTC (rev 7516)
+++ trunk/teraterm/ttermpro.v15.sln	2019-03-26 15:43:12 UTC (rev 7517)
@@ -8,8 +8,6 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpcmn", "ttpcmn\ttpcmn.v15.vcxproj", "{118E0D32-5553-4F73-9927-E873C1C500E4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpdlg", "ttpdlg\ttpdlg.v15.vcxproj", "{47CB840D-85C8-460F-9101-BEB54BEF9D56}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpfile", "ttpfile\ttpfile.v15.vcxproj", "{311F2B21-AEC4-4384-8209-BB83B54749B4}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpmacro", "ttpmacro\ttpmacro.v15.vcxproj", "{BA519362-A2C2-4B1A-905B-F00791F9038A}"
@@ -38,10 +36,6 @@
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Debug|Win32.Build.0 = Debug|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.ActiveCfg = Release|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.Build.0 = Release|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.ActiveCfg = Debug|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.Build.0 = Debug|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.ActiveCfg = Release|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.Build.0 = Release|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.Build.0 = Debug|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Release|Win32.ActiveCfg = Release|Win32

Modified: trunk/teraterm/ttermpro.v9.sln
===================================================================
--- trunk/teraterm/ttermpro.v9.sln	2019-03-26 15:42:57 UTC (rev 7516)
+++ trunk/teraterm/ttermpro.v9.sln	2019-03-26 15:43:12 UTC (rev 7517)
@@ -2,7 +2,6 @@
 # Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttermpro", "teraterm\ttermpro.v9.vcproj", "{BC4CDBE3-6269-47A8-BD74-EEB3A6160E06}"
 	ProjectSection(ProjectDependencies) = postProject
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56} = {47CB840D-85C8-460F-9101-BEB54BEF9D56}
 		{BA519362-A2C2-4B1A-905B-F00791F9038A} = {BA519362-A2C2-4B1A-905B-F00791F9038A}
 		{5CF58947-E861-4A5C-B0B1-E85486F149CD} = {5CF58947-E861-4A5C-B0B1-E85486F149CD}
 		{6D08053B-1C68-4A7E-8766-3553F5AF010B} = {6D08053B-1C68-4A7E-8766-3553F5AF010B}
@@ -14,12 +13,6 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpcmn", "ttpcmn\ttpcmn.v9.vcproj", "{118E0D32-5553-4F73-9927-E873C1C500E4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpdlg", "ttpdlg\ttpdlg.v9.vcproj", "{47CB840D-85C8-460F-9101-BEB54BEF9D56}"
-	ProjectSection(ProjectDependencies) = postProject
-		{80F1C3F0-A213-4D48-85C8-A265990D19A7} = {80F1C3F0-A213-4D48-85C8-A265990D19A7}
-		{118E0D32-5553-4F73-9927-E873C1C500E4} = {118E0D32-5553-4F73-9927-E873C1C500E4}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpfile", "ttpfile\ttpfile.v9.vcproj", "{311F2B21-AEC4-4384-8209-BB83B54749B4}"
 	ProjectSection(ProjectDependencies) = postProject
 		{118E0D32-5553-4F73-9927-E873C1C500E4} = {118E0D32-5553-4F73-9927-E873C1C500E4}
@@ -60,10 +53,6 @@
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Debug|Win32.Build.0 = Debug|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.ActiveCfg = Release|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.Build.0 = Release|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.ActiveCfg = Debug|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.Build.0 = Debug|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.ActiveCfg = Release|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.Build.0 = Release|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.Build.0 = Debug|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Release|Win32.ActiveCfg = Release|Win32

Modified: trunk/teraterm/ttpcmn/ttpcmn.vcproj
===================================================================
--- trunk/teraterm/ttpcmn/ttpcmn.vcproj	2019-03-26 15:42:57 UTC (rev 7516)
+++ trunk/teraterm/ttpcmn/ttpcmn.vcproj	2019-03-26 15:43:12 UTC (rev 7517)
@@ -213,6 +213,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\common\dlglib.c"
+				>
+			</File>
+			<File
 				RelativePath="..\common\i18n.c"
 				>
 			</File>

Deleted: trunk/teraterm/ttpdlg/ttpdlg.def
===================================================================
--- trunk/teraterm/ttpdlg/ttpdlg.def	2019-03-26 15:42:57 UTC (rev 7516)
+++ trunk/teraterm/ttpdlg/ttpdlg.def	2019-03-26 15:43:12 UTC (rev 7517)
@@ -1,14 +0,0 @@
-EXPORTS
-  SetupTerminal @1
-  SetupWin @2
-  SetupKeyboard @3
-  SetupSerialPort @4
-  SetupTCPIP @5
-  GetHostName @6
-  ChangeDirectory @7
-  AboutDialog @8
-  ChooseFontDlg @9
-  SetupGeneral @10
-  WindowWindow @11
-
-  TTDLGSetUILanguageFile @12

Deleted: trunk/teraterm/ttpdlg/ttpdlg.dsp
===================================================================
--- trunk/teraterm/ttpdlg/ttpdlg.dsp	2019-03-26 15:42:57 UTC (rev 7516)
+++ trunk/teraterm/ttpdlg/ttpdlg.dsp	2019-03-26 15:43:12 UTC (rev 7517)
@@ -1,158 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ttpdlg" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=ttpdlg - Win32 Release
-!MESSAGE NMAKE /f "ttpdlg.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE on this makefile
-!MESSAGE by defining the macro CFG on the command line.  For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ttpdlg.mak" CFG="ttpdlg - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ttpdlg - Win32 Release" ("Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ttpdlg - Win32 Debug" ("Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ttpdlg - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Release"
-# PROP BASE Intermediate_Dir ".\Release"
-# PROP BASE Target_Dir "."
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\bin\Release"
-# PROP Intermediate_Dir ".\Release"
-# PROP Target_Dir "."
-# ADD BASE CPP /nologo /MT /W3 /GX /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\source\common" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x411 /d "NDEBUG"
-# ADD RSC /l 0x409 /i "..\..\source\common" /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib comdlg32.lib /nologo /subsystem:windows /dll /machine:I386
-
-!ELSEIF  "$(CFG)" == "ttpdlg - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Debug"
-# PROP BASE Intermediate_Dir ".\Debug"
-# PROP BASE Target_Dir "."
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\bin\Debug"
-# PROP Intermediate_Dir ".\Debug"
-# PROP Target_Dir "."
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\source\common" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x411 /d "_DEBUG"
-# ADD RSC /l 0x409 /i "..\..\source\common" /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib comdlg32.lib /nologo /subsystem:windows /dll /debug /machine:I386
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ttpdlg - Win32 Release"
-# Name "ttpdlg - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-# Begin Source File
-
-SOURCE=..\..\source\common\dlglib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\ttdlg\ttdlg.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\common\ttlib.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\..\source\common\dlglib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\common\ttlib.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=..\..\Source\Common\Teraterm.ico
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Source\Ttdlg\ttpdlg.rc
-
-!IF  "$(CFG)" == "ttpdlg - Win32 Release"
-
-# ADD BASE RSC /l 0x411 /i "\DEV\TERATERM\Source\Ttdlg"
-# SUBTRACT BASE RSC /i "..\..\source\common"
-# ADD RSC /l 0x411 /i "\DEV\TERATERM\Source\Ttdlg" /i "C:\DEV\TERATERM\source\ttdlg"
-# SUBTRACT RSC /i "..\..\source\common"
-
-!ELSEIF  "$(CFG)" == "ttpdlg - Win32 Debug"
-
-# ADD BASE RSC /l 0x411 /i "\DEV\TERATERM\Source\Ttdlg"
-# SUBTRACT BASE RSC /i "..\..\source\common"
-# ADD RSC /l 0x411 /i "\DEV\TERATERM\Source\Ttdlg" /i "C:\DEV\TERATERM\source\ttdlg"
-# SUBTRACT RSC /i "..\..\source\common"
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "Lib Files"
-
-# PROP Default_Filter "lib"
-# Begin Source File
-
-SOURCE=..\bin\Release\ttpcmn.lib
-# End Source File
-# End Group
-# Begin Group "Def File"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\ttpdlg.def
-# End Source File
-# End Group
-# End Target
-# End Project

Deleted: trunk/teraterm/ttpdlg/ttpdlg.v10.vcxproj
===================================================================
--- trunk/teraterm/ttpdlg/ttpdlg.v10.vcxproj	2019-03-26 15:42:57 UTC (rev 7516)
+++ trunk/teraterm/ttpdlg/ttpdlg.v10.vcxproj	2019-03-26 15:43:12 UTC (rev 7517)
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{47CB840D-85C8-460F-9101-BEB54BEF9D56}</ProjectGuid>
-    <RootNamespace>ttpdlg</RootNamespace>
-    <ProjectName>ttpdlg</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>onig_s.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PreBuildEvent>
-      <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>onig_sd.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\common\dlglib.c" />
-    <ClCompile Include="ttdlg.c" />
-    <ClCompile Include="..\common\ttlib.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="dlg_res.h" />
-    <ClInclude Include="..\common\dlglib.h" />
-    <ClInclude Include="svnversion.h" />
-    <ClInclude Include="..\common\ttlib.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\common\teraterm.ico" />
-    <None Include="ttpdlg.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="ttpdlg-version.rc" />
-    <ResourceCompile Include="ttpdlg.rc">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">0x0411</Culture>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">0x0411</Culture>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\svnrev\svnrev.v10.vcxproj">
-      <Project>{80f1c3f0-a213-4d48-85c8-a265990d19a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\ttpcmn\ttpcmn.v10.vcxproj">
-      <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

Deleted: trunk/teraterm/ttpdlg/ttpdlg.v10.vcxproj.filters
===================================================================
--- trunk/teraterm/ttpdlg/ttpdlg.v10.vcxproj.filters	2019-03-26 15:42:57 UTC (rev 7516)
+++ trunk/teraterm/ttpdlg/ttpdlg.v10.vcxproj.filters	2019-03-26 15:43:12 UTC (rev 7517)
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{a9d1d40f-5c05-4158-82bb-0972cdbe171d}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{228fa5d0-626b-4dca-8b13-65d5b0967f80}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{cdb5aa6f-4c6b-4835-bdb1-bbdbff43c147}</UniqueIdentifier>
-      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-    <Filter Include="Def File">
-      <UniqueIdentifier>{c62d2476-c393-4f76-87ef-23b6db378623}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\common\dlglib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ttdlg.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\common\ttlib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="dlg_res.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\common\dlglib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="svnversion.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\common\ttlib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\common\teraterm.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="ttpdlg.def">
-      <Filter>Def File</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="ttpdlg-version.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-    <ResourceCompile Include="ttpdlg.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>

Deleted: trunk/teraterm/ttpdlg/ttpdlg.v11.vcxproj
===================================================================
--- trunk/teraterm/ttpdlg/ttpdlg.v11.vcxproj	2019-03-26 15:42:57 UTC (rev 7516)
+++ trunk/teraterm/ttpdlg/ttpdlg.v11.vcxproj	2019-03-26 15:43:12 UTC (rev 7517)
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{47CB840D-85C8-460F-9101-BEB54BEF9D56}</ProjectGuid>
-    <RootNamespace>ttpdlg</RootNamespace>
-    <ProjectName>ttpdlg</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.61030.0</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
-      <HeaderFileName />
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>onig_s.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PreBuildEvent>
-      <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
-      <HeaderFileName />
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>onig_sd.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\common\dlglib.c" />
-    <ClCompile Include="ttdlg.c" />
-    <ClCompile Include="..\common\ttlib.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="dlg_res.h" />
-    <ClInclude Include="..\common\dlglib.h" />
-    <ClInclude Include="svnversion.h" />
-    <ClInclude Include="..\common\ttlib.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="..\common\teraterm.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="ttpdlg-version.rc" />
-    <ResourceCompile Include="ttpdlg.rc">
-      <Culture Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">0x0411</Culture>
-      <Culture Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">0x0411</Culture>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ttpdlg.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\svnrev\svnrev.v11.vcxproj">
-      <Project>{80f1c3f0-a213-4d48-85c8-a265990d19a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\ttpcmn\ttpcmn.v11.vcxproj">
-      <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

Deleted: trunk/teraterm/ttpdlg/ttpdlg.v11.vcxproj.filters
===================================================================
--- trunk/teraterm/ttpdlg/ttpdlg.v11.vcxproj.filters	2019-03-26 15:42:57 UTC (rev 7516)
+++ trunk/teraterm/ttpdlg/ttpdlg.v11.vcxproj.filters	2019-03-26 15:43:12 UTC (rev 7517)
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{b3e15d89-5e14-47cd-8c9d-1ef9ff14665e}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{db058bf4-3500-4713-9e3f-ae4709a5302a}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{bfa7a861-6702-43a8-a781-299131a60b57}</UniqueIdentifier>
-      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-    <Filter Include="Def File">
-      <UniqueIdentifier>{9d7a7614-70d2-495c-ab4a-33b9dbeeab51}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\common\dlglib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ttdlg.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\common\ttlib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="dlg_res.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\common\dlglib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="svnversion.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\common\ttlib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="..\common\teraterm.ico">
-      <Filter>Resource Files</Filter>
-    </Image>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="ttpdlg-version.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-    <ResourceCompile Include="ttpdlg.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ttpdlg.def">
-      <Filter>Def File</Filter>
-    </None>
-  </ItemGroup>
-</Project>

Deleted: trunk/teraterm/ttpdlg/ttpdlg.v12.vcxproj
===================================================================
--- trunk/teraterm/ttpdlg/ttpdlg.v12.vcxproj	2019-03-26 15:42:57 UTC (rev 7516)
+++ trunk/teraterm/ttpdlg/ttpdlg.v12.vcxproj	2019-03-26 15:43:12 UTC (rev 7517)
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{47CB840D-85C8-460F-9101-BEB54BEF9D56}</ProjectGuid>
-    <RootNamespace>ttpdlg</RootNamespace>
-    <ProjectName>ttpdlg</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
-      <HeaderFileName />
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>onig_s.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PreBuildEvent>
-      <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
-      <HeaderFileName />
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>onig_sd.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\common\dlglib.c" />
-    <ClCompile Include="..\common\ttlib.c" />
-    <ClCompile Include="ttdlg.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\common\dlglib.h" />
-    <ClInclude Include="..\common\ttlib.h" />
-    <ClInclude Include="dlg_res.h" />
-    <ClInclude Include="svnversion.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="..\common\teraterm.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="ttpdlg-version.rc" />
-    <ResourceCompile Include="ttpdlg.rc">
-      <Culture Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">0x0411</Culture>
-      <Culture Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">0x0411</Culture>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ttpdlg.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\svnrev\svnrev.v12.vcxproj">
-      <Project>{80f1c3f0-a213-4d48-85c8-a265990d19a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\ttpcmn\ttpcmn.v12.vcxproj">
-      <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

Deleted: trunk/teraterm/ttpdlg/ttpdlg.v12.vcxproj.filters
===================================================================
--- trunk/teraterm/ttpdlg/ttpdlg.v12.vcxproj.filters	2019-03-26 15:42:57 UTC (rev 7516)
+++ trunk/teraterm/ttpdlg/ttpdlg.v12.vcxproj.filters	2019-03-26 15:43:12 UTC (rev 7517)
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{15850657-55f9-472f-ad74-1d01fd452e41}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{98e74669-55df-4889-8952-a63e1847bbed}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{7c254054-88fc-4c73-bb1e-b929eeeb4771}</UniqueIdentifier>
-      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-    <Filter Include="Def File">
-      <UniqueIdentifier>{9170a72d-c12a-4df1-8c20-12e277e36076}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\common\dlglib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ttdlg.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\common\ttlib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="dlg_res.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\common\dlglib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="svnversion.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\common\ttlib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="..\common\teraterm.ico">
-      <Filter>Resource Files</Filter>
-    </Image>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="ttpdlg-version.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-    <ResourceCompile Include="ttpdlg.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ttpdlg.def">
-      <Filter>Def File</Filter>
-    </None>
-  </ItemGroup>
-</Project>

Deleted: trunk/teraterm/ttpdlg/ttpdlg.v14.vcxproj
===================================================================
--- trunk/teraterm/ttpdlg/ttpdlg.v14.vcxproj	2019-03-26 15:42:57 UTC (rev 7516)
+++ trunk/teraterm/ttpdlg/ttpdlg.v14.vcxproj	2019-03-26 15:43:12 UTC (rev 7517)
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{47CB840D-85C8-460F-9101-BEB54BEF9D56}</ProjectGuid>
-    <RootNamespace>ttpdlg</RootNamespace>
-    <ProjectName>ttpdlg</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
-      <HeaderFileName />
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>onig_s.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PreBuildEvent>
-      <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
-      <HeaderFileName />
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>onig_sd.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\common\dlglib.c" />
-    <ClCompile Include="..\common\ttlib.c" />
-    <ClCompile Include="ttdlg.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\common\dlglib.h" />
-    <ClInclude Include="..\common\ttlib.h" />
-    <ClInclude Include="dlg_res.h" />
-    <ClInclude Include="svnversion.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="..\common\teraterm.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="ttpdlg-version.rc" />
-    <ResourceCompile Include="ttpdlg.rc">
-      <Culture Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">0x0411</Culture>
-      <Culture Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">0x0411</Culture>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ttpdlg.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\svnrev\svnrev.v14.vcxproj">
-      <Project>{80f1c3f0-a213-4d48-85c8-a265990d19a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\ttpcmn\ttpcmn.v14.vcxproj">
-      <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

Deleted: trunk/teraterm/ttpdlg/ttpdlg.v14.vcxproj.filters
===================================================================
--- trunk/teraterm/ttpdlg/ttpdlg.v14.vcxproj.filters	2019-03-26 15:42:57 UTC (rev 7516)
+++ trunk/teraterm/ttpdlg/ttpdlg.v14.vcxproj.filters	2019-03-26 15:43:12 UTC (rev 7517)
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{15850657-55f9-472f-ad74-1d01fd452e41}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{98e74669-55df-4889-8952-a63e1847bbed}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{7c254054-88fc-4c73-bb1e-b929eeeb4771}</UniqueIdentifier>
-      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-    <Filter Include="Def File">
-      <UniqueIdentifier>{9170a72d-c12a-4df1-8c20-12e277e36076}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\common\dlglib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ttdlg.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\common\ttlib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="dlg_res.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\common\dlglib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="svnversion.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\common\ttlib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="..\common\teraterm.ico">
-      <Filter>Resource Files</Filter>
-    </Image>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="ttpdlg-version.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-    <ResourceCompile Include="ttpdlg.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ttpdlg.def">
-      <Filter>Def File</Filter>
-    </None>
-  </ItemGroup>
-</Project>

Deleted: trunk/teraterm/ttpdlg/ttpdlg.v15.vcxproj
===================================================================
--- trunk/teraterm/ttpdlg/ttpdlg.v15.vcxproj	2019-03-26 15:42:57 UTC (rev 7516)
+++ trunk/teraterm/ttpdlg/ttpdlg.v15.vcxproj	2019-03-26 15:43:12 UTC (rev 7517)
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{47CB840D-85C8-460F-9101-BEB54BEF9D56}</ProjectGuid>
-    <RootNamespace>ttpdlg</RootNamespace>
-    <ProjectName>ttpdlg</ProjectName>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
-      <HeaderFileName />
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>onig_s.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PreBuildEvent>
-      <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
-      <HeaderFileName />
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>onig_sd.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\common\dlglib.c" />
-    <ClCompile Include="..\common\dlglib_tmpl.cpp" />
-    <ClCompile Include="..\common\ttlib.c" />
-    <ClCompile Include="ttdlg.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\common\dlglib.h" />
-    <ClInclude Include="..\common\ttlib.h" />
-    <ClInclude Include="dlg_res.h" />
-    <ClInclude Include="svnversion.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="..\common\teraterm.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="ttpdlg-version.rc" />
-    <ResourceCompile Include="ttpdlg.rc">
-      <Culture Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">0x0411</Culture>
-      <Culture Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">0x0411</Culture>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ttpdlg.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\svnrev\svnrev.v15.vcxproj">
-      <Project>{80f1c3f0-a213-4d48-85c8-a265990d19a7}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\ttpcmn\ttpcmn.v15.vcxproj">
-      <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

Deleted: trunk/teraterm/ttpdlg/ttpdlg.v15.vcxproj.filters
===================================================================
--- trunk/teraterm/ttpdlg/ttpdlg.v15.vcxproj.filters	2019-03-26 15:42:57 UTC (rev 7516)
+++ trunk/teraterm/ttpdlg/ttpdlg.v15.vcxproj.filters	2019-03-26 15:43:12 UTC (rev 7517)
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{15850657-55f9-472f-ad74-1d01fd452e41}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{98e74669-55df-4889-8952-a63e1847bbed}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{7c254054-88fc-4c73-bb1e-b929eeeb4771}</UniqueIdentifier>
-      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-    <Filter Include="Def File">
-      <UniqueIdentifier>{9170a72d-c12a-4df1-8c20-12e277e36076}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="ttdlg.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\common\ttlib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\common\dlglib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="dlg_res.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\common\dlglib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="svnversion.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\common\ttlib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="..\common\teraterm.ico">
-      <Filter>Resource Files</Filter>
-    </Image>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="ttpdlg-version.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-    <ResourceCompile Include="ttpdlg.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ttpdlg.def">
-      <Filter>Def File</Filter>
-    </None>
-  </ItemGroup>
-</Project>

Deleted: trunk/teraterm/ttpdlg/ttpdlg.v9.vcproj
===================================================================
--- trunk/teraterm/ttpdlg/ttpdlg.v9.vcproj	2019-03-26 15:42:57 UTC (rev 7516)
+++ trunk/teraterm/ttpdlg/ttpdlg.v9.vcproj	2019-03-26 15:43:12 UTC (rev 7517)
@@ -1,288 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="ttpdlg"
-	ProjectGUID="{47CB840D-85C8-460F-9101-BEB54BEF9D56}"
-	RootNamespace="ttpdlg"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="&quot;$(OutDir)\svnrev.exe&quot; &quot;$(SolutionDir)..\libs\svn\bin\svnversion.exe&quot; &quot;$(SolutionDir)..&quot; &quot;$(ProjectDir)svnversion.h&quot;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="$(OutDir)\$(ProjectName).tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D&quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories="$(SolutionDir)common"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="onig_s.lib ttpcmn.lib"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(OutDir)"
-				ModuleDefinitionFile="$(ProjectName).def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)\$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="&quot;$(OutDir)\svnrev.exe&quot; &quot;$(SolutionDir)..\libs\svn\bin\svnversion.exe&quot; &quot;$(SolutionDir)..&quot; &quot;$(ProjectDir)svnversion.h&quot;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="$(OutDir)\$(ProjectName).tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D&quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				RuntimeLibrary="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories="$(SolutionDir)common"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="onig_sd.lib ttpcmn.lib"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(OutDir)"
-				ModuleDefinitionFile="$(ProjectName).def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)\$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-			>
-			<File
-				RelativePath="..\common\dlglib.c"
-				>
-			</File>
-			<File
-				RelativePath="ttdlg.c"
-				>
-			</File>
-			<File
-				RelativePath="..\common\ttlib.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;fi;fd"
-			>
-			<File
-				RelativePath="dlg_res.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\dlglib.h"
-				>
-			</File>
-			<File
-				RelativePath="svnversion.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\ttlib.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-			>
-			<File
-				RelativePath="..\common\teraterm.ico"
-				>
-			</File>
-			<File
-				RelativePath="ttpdlg-version.rc"
-				>
-			</File>
-			<File
-				RelativePath="ttpdlg.rc"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						Culture="1041"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						Culture="1041"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Def File"
-			>
-			<File
-				RelativePath="ttpdlg.def"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

Deleted: trunk/teraterm/ttpdlg/ttpdlg.vcproj
===================================================================
--- trunk/teraterm/ttpdlg/ttpdlg.vcproj	2019-03-26 15:42:57 UTC (rev 7516)
+++ trunk/teraterm/ttpdlg/ttpdlg.vcproj	2019-03-26 15:43:12 UTC (rev 7517)
@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="ttpdlg"
-	ProjectGUID="{47CB840D-85C8-460F-9101-BEB54BEF9D56}"
-	RootNamespace="ttpdlg"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="&quot;$(OutDir)\svnrev.exe&quot; &quot;$(SolutionDir)..\libs\svn\bin\svnversion.exe&quot; &quot;$(SolutionDir)..&quot; &quot;$(ProjectDir)svnversion.h&quot;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="$(OutDir)\$(ProjectName).tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D&quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories="$(SolutionDir)common"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="onig_s.lib ttpcmn.lib"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(OutDir)"
-				ModuleDefinitionFile="$(ProjectName).def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)\$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="&quot;$(OutDir)\svnrev.exe&quot; &quot;$(SolutionDir)..\libs\svn\bin\svnversion.exe&quot; &quot;$(SolutionDir)..&quot; &quot;$(ProjectDir)svnversion.h&quot;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="$(OutDir)\$(ProjectName).tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D&quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				RuntimeLibrary="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories="$(SolutionDir)common"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="onig_sd.lib ttpcmn.lib"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(OutDir)"
-				ModuleDefinitionFile="$(ProjectName).def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)\$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-			>
-			<File
-				RelativePath="..\common\dlglib.c"
-				>
-			</File>
-			<File
-				RelativePath="ttdlg.c"
-				>
-			</File>
-			<File
-				RelativePath="..\common\ttlib.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;fi;fd"
-			>
-			<File
-				RelativePath="dlg_res.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\dlglib.h"
-				>
-			</File>
-			<File
-				RelativePath="svnversion.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\ttlib.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-			>
-			<File
-				RelativePath="..\common\teraterm.ico"
-				>
-			</File>
-			<File
-				RelativePath="ttpdlg-version.rc"
-				>
-			</File>
-			<File
-				RelativePath="ttpdlg.rc"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						Culture="1041"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						Culture="1041"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Def File"
-			>
-			<File
-				RelativePath="ttpdlg.def"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

Modified: trunk/ttssh2/ttxssh/ttxssh.v15.vcxproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v15.vcxproj	2019-03-26 15:42:57 UTC (rev 7516)
+++ trunk/ttssh2/ttxssh/ttxssh.v15.vcxproj	2019-03-26 15:43:12 UTC (rev 7517)
@@ -141,6 +141,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\teraterm\common\tipwin.cpp" />
     <ClCompile Include="..\..\teraterm\teraterm\WSAAsyncGetAddrInfo.c" />
     <ClCompile Include="..\matcher\matcher.c" />
     <ClCompile Include="arc4random.c" />
@@ -228,4 +229,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

Modified: trunk/ttssh2/ttxssh/ttxssh.v15.vcxproj.filters
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v15.vcxproj.filters	2019-03-26 15:42:57 UTC (rev 7516)
+++ trunk/ttssh2/ttxssh/ttxssh.v15.vcxproj.filters	2019-03-26 15:43:12 UTC (rev 7517)
@@ -94,6 +94,9 @@
     <ClCompile Include="..\..\teraterm\teraterm\WSAAsyncGetAddrInfo.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\tipwin.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="arc4random.h">
@@ -221,4 +224,4 @@
       <Filter>Def File</Filter>
     </None>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file

From scmnotify ＠ osdn.net  Wed Mar 27 23:53:58 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Wed, 27 Mar 2019 23:53:58 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc1MThdIOODl+ODreOCuOOCp+OCr+ODiA==?=
 =?utf-8?b?44OV44Kh44Kk44Or5L+d5a6I?=
Message-ID: <1553698438.077624.81311.nullmailer@users.osdn.me>

Revision: 7518
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7518
Author:   zmatsuo
Date:     2019-03-27 23:53:57 +0900 (Wed, 27 Mar 2019)
Log Message:
-----------
プロジェクトファイル保守
ttpmenuでビルドが通らなくなっていた

Modified Paths:
--------------
    trunk/ttpmenu/ttpmenu.v10.vcxproj
    trunk/ttpmenu/ttpmenu.v11.vcxproj
    trunk/ttpmenu/ttpmenu.v12.vcxproj
    trunk/ttpmenu/ttpmenu.v14.vcxproj
    trunk/ttpmenu/ttpmenu.v15.vcxproj
    trunk/ttpmenu/ttpmenu.v9.vcproj
    trunk/ttpmenu/ttpmenu.vcproj

-------------- next part --------------
Modified: trunk/ttpmenu/ttpmenu.v10.vcxproj
===================================================================
--- trunk/ttpmenu/ttpmenu.v10.vcxproj	2019-03-26 15:43:12 UTC (rev 7517)
+++ trunk/ttpmenu/ttpmenu.v10.vcxproj	2019-03-27 14:53:57 UTC (rev 7518)
@@ -113,7 +113,9 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\teraterm\common\codeconv.cpp" />
     <ClCompile Include="..\teraterm\common\i18n.c" />
+    <ClCompile Include="..\teraterm\common\ttlib.c" />
     <ClCompile Include="registry.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MinSpace</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -120,7 +122,6 @@
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\teraterm\common\ttlib.c" />
     <ClCompile Include="ttpmenu.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MinSpace</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -141,7 +142,10 @@
     <None Include="ttpmenu.ico" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\teraterm\common\codeconv.h" />
+    <ClInclude Include="..\teraterm\common\i18n.h" />
     <ClInclude Include="resource.h" />
+    <ClInclude Include="ttpmenu.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpmenu.rc" />

Modified: trunk/ttpmenu/ttpmenu.v11.vcxproj
===================================================================
--- trunk/ttpmenu/ttpmenu.v11.vcxproj	2019-03-26 15:43:12 UTC (rev 7517)
+++ trunk/ttpmenu/ttpmenu.v11.vcxproj	2019-03-27 14:53:57 UTC (rev 7518)
@@ -117,12 +117,13 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\teraterm\common\codeconv.cpp" />
     <ClCompile Include="..\teraterm\common\i18n.c" />
+    <ClCompile Include="..\teraterm\common\ttlib.c" />
     <ClCompile Include="registry.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MinSpace</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
     </ClCompile>
-    <ClCompile Include="..\teraterm\common\ttlib.c" />
     <ClCompile Include="ttpmenu.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MinSpace</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
@@ -139,7 +140,10 @@
     <Image Include="ttpmenu.ico" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\teraterm\common\codeconv.h" />
+    <ClInclude Include="..\teraterm\common\i18n.h" />
     <ClInclude Include="resource.h" />
+    <ClInclude Include="ttpmenu.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpmenu.rc" />

Modified: trunk/ttpmenu/ttpmenu.v12.vcxproj
===================================================================
--- trunk/ttpmenu/ttpmenu.v12.vcxproj	2019-03-26 15:43:12 UTC (rev 7517)
+++ trunk/ttpmenu/ttpmenu.v12.vcxproj	2019-03-27 14:53:57 UTC (rev 7518)
@@ -117,6 +117,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\teraterm\common\codeconv.cpp" />
     <ClCompile Include="..\teraterm\common\i18n.c" />
     <ClCompile Include="..\teraterm\common\ttlib.c" />
     <ClCompile Include="registry.cpp">
@@ -139,7 +140,10 @@
     <Image Include="ttpmenu.ico" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\teraterm\common\codeconv.h" />
+    <ClInclude Include="..\teraterm\common\i18n.h" />
     <ClInclude Include="resource.h" />
+    <ClInclude Include="ttpmenu.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpmenu.rc" />

Modified: trunk/ttpmenu/ttpmenu.v14.vcxproj
===================================================================
--- trunk/ttpmenu/ttpmenu.v14.vcxproj	2019-03-26 15:43:12 UTC (rev 7517)
+++ trunk/ttpmenu/ttpmenu.v14.vcxproj	2019-03-27 14:53:57 UTC (rev 7518)
@@ -117,6 +117,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\teraterm\common\codeconv.cpp" />
     <ClCompile Include="..\teraterm\common\i18n.c" />
     <ClCompile Include="..\teraterm\common\ttlib.c" />
     <ClCompile Include="registry.cpp">
@@ -139,7 +140,10 @@
     <Image Include="ttpmenu.ico" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\teraterm\common\codeconv.h" />
+    <ClInclude Include="..\teraterm\common\i18n.h" />
     <ClInclude Include="resource.h" />
+    <ClInclude Include="ttpmenu.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpmenu.rc" />

Modified: trunk/ttpmenu/ttpmenu.v15.vcxproj
===================================================================
--- trunk/ttpmenu/ttpmenu.v15.vcxproj	2019-03-26 15:43:12 UTC (rev 7517)
+++ trunk/ttpmenu/ttpmenu.v15.vcxproj	2019-03-27 14:53:57 UTC (rev 7518)
@@ -117,6 +117,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\teraterm\common\codeconv.cpp" />
     <ClCompile Include="..\teraterm\common\i18n.c" />
     <ClCompile Include="..\teraterm\common\ttlib.c" />
     <ClCompile Include="registry.cpp">
@@ -139,7 +140,10 @@
     <Image Include="ttpmenu.ico" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\teraterm\common\codeconv.h" />
+    <ClInclude Include="..\teraterm\common\i18n.h" />
     <ClInclude Include="resource.h" />
+    <ClInclude Include="ttpmenu.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpmenu.rc" />

Modified: trunk/ttpmenu/ttpmenu.v9.vcproj
===================================================================
--- trunk/ttpmenu/ttpmenu.v9.vcproj	2019-03-26 15:43:12 UTC (rev 7517)
+++ trunk/ttpmenu/ttpmenu.v9.vcproj	2019-03-27 14:53:57 UTC (rev 7518)
@@ -193,6 +193,14 @@
 	</References>
 	<Files>
 		<File
+			RelativePath="..\teraterm\common\codeconv.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\teraterm\common\codeconv.h"
+			>
+		</File>
+		<File
 			RelativePath="..\teraterm\common\i18n.c"
 			>
 		</File>

Modified: trunk/ttpmenu/ttpmenu.vcproj
===================================================================
--- trunk/ttpmenu/ttpmenu.vcproj	2019-03-26 15:43:12 UTC (rev 7517)
+++ trunk/ttpmenu/ttpmenu.vcproj	2019-03-27 14:53:57 UTC (rev 7518)
@@ -194,6 +194,14 @@
 	</References>
 	<Files>
 		<File
+			RelativePath="..\teraterm\common\codeconv.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\teraterm\common\codeconv.h"
+			>
+		</File>
+		<File
 			RelativePath="..\teraterm\common\i18n.c"
 			>
 		</File>

From scmnotify ＠ osdn.net  Wed Mar 27 23:54:10 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Wed, 27 Mar 2019 23:54:10 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc1MTldIHB1dHR5bGli44GncHV0dHnjga4=?=
 =?utf-8?b?44OV44Kh44Kk44Or44KS44OV44Kp44Or44OA44Gr5YiG6aGe44GX44Gf?=
Message-ID: <1553698450.504930.82481.nullmailer@users.osdn.me>

Revision: 7519
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7519
Author:   zmatsuo
Date:     2019-03-27 23:54:10 +0900 (Wed, 27 Mar 2019)
Log Message:
-----------
puttylibでputtyのファイルをフォルダに分類した

Modified Paths:
--------------
    trunk/ttssh2/putty/CMakeLists.txt

-------------- next part --------------
Modified: trunk/ttssh2/putty/CMakeLists.txt
===================================================================
--- trunk/ttssh2/putty/CMakeLists.txt	2019-03-27 14:53:57 UTC (rev 7518)
+++ trunk/ttssh2/putty/CMakeLists.txt	2019-03-27 14:54:10 UTC (rev 7519)
@@ -6,14 +6,29 @@
   add_definitions("-D_WINDOWS")
 endif()
 
-set(SRC
+set(PUTTY_SRC
+  ../../libs/putty/putty.h
+  ../../libs/putty/pageant.h
   ../../libs/putty/conf.c
+  ../../libs/putty/misc.h
   ../../libs/putty/misc.c
+  ../../libs/putty/tree234.h
   ../../libs/putty/tree234.c
+  ../../libs/putty/version.h
   ../../libs/putty/version.c
   ../../libs/putty/windows/winmisc.c
   ../../libs/putty/windows/winpgntc.c
+  ../../libs/putty/windows/winsecur.h
   ../../libs/putty/windows/winsecur.c
+  )
+
+source_group(
+  "putty"
+  FILES
+  ${PUTTY_SRC}
+  )
+
+set(SRC
   libputty.c
   libputty.h
   )
@@ -27,4 +42,5 @@
 add_library(
   libputty
   ${SRC}
+  ${PUTTY_SRC}
   )

From scmnotify ＠ osdn.net  Thu Mar 28 00:24:33 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Thu, 28 Mar 2019 00:24:33 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc1MjBdIOODgOOCpOOCouODreOCsOS4ig==?=
 =?utf-8?b?44Gu44OB44Kn44OD44Kv44Oc44OD44Kv44K544Gu5qmf6IO944KS5LiA6YCa?=
 =?utf-8?b?44KK5a6f6KOF44GX44Gf?=
Message-ID: <1553700273.060282.138205.nullmailer@users.osdn.me>

Revision: 7520
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7520
Author:   zmatsuo
Date:     2019-03-28 00:24:32 +0900 (Thu, 28 Mar 2019)
Log Message:
-----------
ダイアログ上のチェックボックスの機能を一通り実装した
- クリップボードからのペースト後にクリップボードをクリアする/しない
- パスフレーズで制御文字を使用する/しない
- パスフレーズを表示する/しない
- ユーザー名にwindowsのユーザー名をペーストするボタンを追加

Modified Paths:
--------------
    branches/ssh_auth_dialog/ttssh2/ttxssh/auth.c
    branches/ssh_auth_dialog/ttssh2/ttxssh/resource.h
    branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.rc

-------------- next part --------------
Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/auth.c
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/auth.c	2019-03-27 14:54:10 UTC (rev 7519)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/auth.c	2019-03-27 15:24:32 UTC (rev 7520)
@@ -37,6 +37,7 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <errno.h>
+#include <Lmcons.h>		// for UNLEN
 
 #include "resource.h"
 #include "keyfiles.h"
@@ -66,6 +67,7 @@
 	-1, -1, -1, -1, -1, -1, -1, -1, -1, IDC_SSHUSEPAGEANT, -1
 };
 static TipWin *tipwin;
+static BOOL UseControlChar = TRUE;
 
 LRESULT CALLBACK password_wnd_proc(HWND control, UINT msg,
                                    WPARAM wParam, LPARAM lParam)
@@ -72,6 +74,10 @@
 {
 	switch (msg) {
 	case WM_CHAR:
+		if (!UseControlChar) {
+			// \x90\xA7\x8C䕶\x8E\x9A\x82͎g\x97p\x82\xB5\x82Ȃ\xA2
+			break;
+		}
 		if ((GetKeyState(VK_CONTROL) & 0x8000) != 0) {
 			TCHAR chars[] = { (TCHAR) wParam, 0 };
 
@@ -807,6 +813,9 @@
 		else {
 			DlgAuthFont = NULL;
 		}
+		UseControlChar = TRUE;
+		CheckDlgButton(dlg, IDC_USE_CONTROL_CHARACTER, UseControlChar ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(dlg, IDC_CLEAR_CLIPBOARD, BST_UNCHECKED);
 
 		// SSH2 autologin\x82\xAA\x97L\x8C\xF8\x82̏ꍇ\x82́A\x83^\x83C\x83}\x82\xF0\x8Ed\x8A|\x82\xAF\x82\xE9\x81B (2004.12.1 yutaka)
 		if (pvar->ssh2_autologin == 1) {
@@ -1013,16 +1022,64 @@
 			return TRUE;
 
 		case IDC_FROM_CLIPBOARD: {
-			char *clipboard = GetClipboardTextA(dlg, TRUE);
+			char *clipboard = GetClipboardTextA(dlg, IsDlgButtonChecked(dlg, IDC_CLEAR_CLIPBOARD) != BST_UNCHECKED);
 			if (clipboard != NULL) {
 				SetDlgItemTextA(dlg, IDC_SSHPASSWORD, clipboard);
 				free(clipboard);
-				SendMessage(dlg, WM_NEXTDLGCTL, (WPARAM)GetDlgItem(dlg, IDOK), TRUE);
+				SendDlgItemMessage(dlg, IDC_SSHPASSWORD, EM_SETSEL, 0, -1);
+				SendMessage(dlg, WM_NEXTDLGCTL, (WPARAM)GetDlgItem(dlg, IDC_SSHPASSWORD), TRUE);
 				return FALSE;
 			}
 			return TRUE;
 		}
 
+		case IDC_SHOW_PASSPHRASE: {
+			// \x95\x9A\x82\xB9\x8E\x9A on/off \x82\xF0\x90؂\xE8\x91ւ\xA6\x82\xE9
+			HWND hWnd = GetDlgItem(dlg, IDC_SSHPASSWORD);
+			static wchar_t password_char;
+			if (password_char == 0) {
+				wchar_t c = (wchar_t)SendMessage(hWnd, EM_GETPASSWORDCHAR, 0, 0);
+				password_char = c;
+			}
+			if (IsDlgButtonChecked(dlg, IDC_SHOW_PASSPHRASE) != BST_UNCHECKED) {
+				SendMessage(hWnd, EM_SETPASSWORDCHAR, 0, 0);
+			} else {
+#if !defined(UNICODE)
+				if (password_char < 0x100) {
+					SendMessageA(hWnd, EM_SETPASSWORDCHAR, (WPARAM)password_char, 0);
+				} else {
+					// TODO W\x8Cn\x92\xBC\x8CĂ\xD1 \x81\xAB\x82\xA4\x82܂\xAD\x82\xA2\x82\xA9\x82Ȃ\xA2
+					//SendMessageW(hWnd, EM_SETPASSWORDCHAR, (WPARAM)password_char, 0);
+					SendMessageA(hWnd, EM_SETPASSWORDCHAR, (WPARAM)'*', 0);
+				}
+#else
+				SendMessageW(hWnd, EM_SETPASSWORDCHAR, (WPARAM)password_char, 0);
+#endif
+			}
+			//InvalidateRect(hWnd, NULL, TRUE);
+			SendDlgItemMessage(dlg, IDC_SSHPASSWORD, EM_SETSEL, 0, -1);
+			SendMessage(dlg, WM_NEXTDLGCTL, (WPARAM)GetDlgItem(dlg, IDC_SSHPASSWORD), TRUE);
+			return TRUE;
+		}
+
+		case IDC_FROM_GETUSERNAME: {
+			TCHAR user_name[UNLEN+1];
+			DWORD len = _countof(user_name);
+			BOOL r = GetUserName(user_name, &len);
+			if (r != 0) {
+				SetDlgItemText(dlg, IDC_SSHUSERNAME, user_name);
+				SendDlgItemMessage(dlg, IDC_SSHUSERNAME, EM_SETSEL, 0, -1);
+				SendMessage(dlg, WM_NEXTDLGCTL, (WPARAM)GetDlgItem(dlg, IDC_SSHUSERNAME), TRUE);
+			}
+			return TRUE;
+		}
+
+		case IDC_USE_CONTROL_CHARACTER: {
+			UseControlChar =
+				(IsDlgButtonChecked(dlg, IDC_USE_CONTROL_CHARACTER) != BST_UNCHECKED) ?
+				TRUE : FALSE;
+			break;
+		}
 		default:
 			return FALSE;
 		}

Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/resource.h
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/resource.h	2019-03-27 14:54:10 UTC (rev 7519)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/resource.h	2019-03-27 15:24:32 UTC (rev 7520)
@@ -230,12 +230,13 @@
 #define IDC_USE_CONTROL_CHARACTER       1234
 #define IDC_HOSTRSAFILENAMELABEL        1235
 #define IDC_RSAFILENAMELABEL            1236
+#define IDC_FROM_GETUSERNAME            1237
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        116
+#define _APS_NEXT_RESOURCE_VALUE        117
 #define _APS_NEXT_COMMAND_VALUE         40001
 #define _APS_NEXT_CONTROL_VALUE         1237
 #define _APS_NEXT_SYMED_VALUE           101

Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.rc	2019-03-27 14:54:10 UTC (rev 7519)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.rc	2019-03-27 15:24:32 UTC (rev 7520)
@@ -16,10 +16,8 @@
 // \x89p\x8C\xEA (\x95č\x91) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #pragma code_page(1252)
-#endif //_WIN32
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -48,7 +46,7 @@
     DEFPUSHBUTTON   "OK",IDOK,112,310,50,14
 END
 
-IDD_SSHAUTH DIALOGEX 0, 0, 331, 402
+IDD_SSHAUTH DIALOGEX 0, 0, 331, 415
 STYLE DS_SETFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "SSH Authentication"
 FONT 8, "Tahoma", 0, 0, 0x0
@@ -57,36 +55,37 @@
     LTEXT           "Authentication required.",IDC_SSHAUTHBANNER2,6,16,319,10
     LTEXT           "User &name:",IDC_SSHUSERNAMELABEL,17,31,57,8
     EDITTEXT        IDC_SSHUSERNAME,28,44,145,12,ES_AUTOHSCROLL
-    LTEXT           "&Passphrase:",IDC_SSHPASSWORDCAPTION,17,62,56,8
-    EDITTEXT        IDC_SSHPASSWORD,28,76,145,12,ES_PASSWORD | ES_AUTOHSCROLL
-    PUSHBUTTON      "Paste from &clipboard",IDC_FROM_CLIPBOARD,28,92,80,14
+    PUSHBUTTON      "Paste &Windows Username",IDC_FROM_GETUSERNAME,28,60,95,14
+    LTEXT           "&Passphrase:",IDC_SSHPASSWORDCAPTION,17,77,56,8
+    EDITTEXT        IDC_SSHPASSWORD,28,91,145,12,ES_PASSWORD | ES_AUTOHSCROLL
+    PUSHBUTTON      "Paste from &clipboard",IDC_FROM_CLIPBOARD,28,107,80,14
     CONTROL         "Cl&ear clipboard after paste",IDC_CLEAR_CLIPBOARD,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,40,110,132,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,40,125,132,10
     CONTROL         "Use control characters",IDC_USE_CONTROL_CHARACTER,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,28,125,132,10
-    CONTROL         "&Show passphrase",IDC_SHOW_PASSPHRASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,28,140,132,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,28,140,132,10
+    CONTROL         "&Show passphrase",IDC_SHOW_PASSPHRASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,28,155,132,10
     CONTROL         "Remember password in &memory",IDC_REMEMBER_PASSWORD,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,157,132,10
-    CONTROL         "F&orward agent",IDC_FORWARD_AGENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,173,132,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,172,132,10
+    CONTROL         "F&orward agent",IDC_FORWARD_AGENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,188,132,10
     CONTROL         "Use p&lain password to log in",IDC_SSHUSEPASSWORD,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,27,204,219,10
+                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,27,219,219,10
     CONTROL         "Use &RSA/DSA/ECDSA/ED25519 key to log in",IDC_SSHUSERSA,
-                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,27,222,152,10
-    CONTROL         "Use r&hosts to log in (SSH1)",IDC_SSHUSERHOSTS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,27,272,99,10
+                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,27,237,152,10
+    CONTROL         "Use r&hosts to log in (SSH1)",IDC_SSHUSERHOSTS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,27,287,99,10
     CONTROL         "Use SSH1:challenge/response(&TIS) / SSH2:keyboard-interactive to log in",IDC_SSHUSETIS,
-                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,27,341,260,10
-    CONTROL         "Use P&ageant to log in",IDC_SSHUSEPAGEANT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,27,358,276,10
-    LTEXT           "Private &key file:",IDC_RSAFILENAMELABEL,38,238,91,8
-    EDITTEXT        IDC_RSAFILENAME,50,250,150,13,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDC_CHOOSERSAFILE,207,249,14,14,WS_GROUP
-    LTEXT           "Local &user name:",IDC_LOCALUSERNAMELABEL,38,284,91,8
-    EDITTEXT        IDC_LOCALUSERNAME,50,296,106,13,ES_AUTOHSCROLL
-    LTEXT           "Host private key &file:",IDC_HOSTRSAFILENAMELABEL,38,312,91,8
-    EDITTEXT        IDC_HOSTRSAFILENAME,50,326,151,13,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDC_CHOOSEHOSTRSAFILE,208,325,17,14
-    DEFPUSHBUTTON   "OK",IDOK,217,382,50,14,WS_GROUP
-    PUSHBUTTON      "&Disconnect",IDCANCEL,275,382,50,14
-    GROUPBOX        "authentication methods ",IDC_STATIC,17,191,300,185
+                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,27,356,260,10
+    CONTROL         "Use P&ageant to log in",IDC_SSHUSEPAGEANT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,27,373,276,10
+    LTEXT           "Private &key file:",IDC_RSAFILENAMELABEL,38,253,91,8
+    EDITTEXT        IDC_RSAFILENAME,50,265,150,13,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_CHOOSERSAFILE,207,264,14,14,WS_GROUP
+    LTEXT           "Local &user name:",IDC_LOCALUSERNAMELABEL,38,299,91,8
+    EDITTEXT        IDC_LOCALUSERNAME,50,311,106,13,ES_AUTOHSCROLL
+    LTEXT           "Host private key &file:",IDC_HOSTRSAFILENAMELABEL,38,327,91,8
+    EDITTEXT        IDC_HOSTRSAFILENAME,50,341,151,13,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_CHOOSEHOSTRSAFILE,208,340,17,14
+    DEFPUSHBUTTON   "OK",IDOK,217,395,50,14,WS_GROUP
+    PUSHBUTTON      "&Disconnect",IDCANCEL,275,395,50,14
+    GROUPBOX        "Authentication methods ",IDC_STATIC,17,206,300,185
 END
 
 IDD_HOSTDLG DIALOGEX 20, 20, 240, 128
@@ -628,8 +627,22 @@
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 IDI_SECURETT            ICON                    "ttsecure.ico"
+
 IDI_SECURETT_GREEN      ICON                    "ttsecure_green.ico"
+
 IDI_SECURETT_YELLOW     ICON                    "ttsecure_yellow.ico"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// AFX_DIALOG_LAYOUT
+//
+
+IDD_SSHAUTH AFX_DIALOG_LAYOUT
+BEGIN
+    0
+END
+
 #endif    // \x89p\x8C\xEA (\x95č\x91) resources
 /////////////////////////////////////////////////////////////////////////////
 

From scmnotify ＠ osdn.net  Thu Mar 28 07:04:22 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Thu, 28 Mar 2019 07:04:22 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc1MjFdIHR0cGRsZy5kbGwg44GM44Gq44GP?=
 =?utf-8?b?44Gq44Gj44Gf44Gu44Gn44CB44Kk44Oz44K544OI44O844Or5pmC44Gr5YmK?=
 =?utf-8?b?6Zmk44GZ44KL44KI44GG44Gr44GX44Gf?=
Message-ID: <1553724262.035184.10686.nullmailer@users.osdn.me>

Revision: 7521
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7521
Author:   maya
Date:     2019-03-28 07:04:21 +0900 (Thu, 28 Mar 2019)
Log Message:
-----------
ttpdlg.dll がなくなったので、インストール時に削除するようにした

Modified Paths:
--------------
    trunk/installer/teraterm.iss

-------------- next part --------------
Modified: trunk/installer/teraterm.iss
===================================================================
--- trunk/installer/teraterm.iss	2019-03-27 15:24:32 UTC (rev 7520)
+++ trunk/installer/teraterm.iss	2019-03-27 22:04:21 UTC (rev 7521)
@@ -67,7 +67,6 @@
 [Files]
 Source: ..\teraterm\release\ttermpro.exe; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
 Source: ..\teraterm\release\ttpcmn.dll; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
-Source: ..\teraterm\release\ttpdlg.dll; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
 Source: ..\teraterm\release\ttpfile.dll; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
 Source: ..\teraterm\release\ttpset.dll; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
 Source: ..\teraterm\release\ttptek.dll; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
@@ -963,6 +962,7 @@
 Name: {app}\copyfont.pif; Type: files
 Name: {app}\libeay.txt; Type: files
 Name: {app}\cygterm+-x86_64\cyglaunch.exe; Type: files
+Name: {app}\ttpdlg.dll; Type: files
 
 [UninstallDelete]
 Name: {app}\cygterm.exe; Type: files

From scmnotify ＠ osdn.net  Thu Mar 28 07:16:48 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Thu, 28 Mar 2019 07:16:48 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc1MjJdIOODgOOCpOOCouODreOCsOS4ig==?=
 =?utf-8?b?44Gu44Kz44Oz44OI44Ot44O844Or44GM6KKr44Gj44Gm44GE44KL44Gu44KS?=
 =?utf-8?b?6Kq/5pW0?=
Message-ID: <1553725008.363378.28062.nullmailer@users.osdn.me>

Revision: 7522
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7522
Author:   maya
Date:     2019-03-28 07:16:48 +0900 (Thu, 28 Mar 2019)
Log Message:
-----------
ダイアログ上のコントロールが被っているのを調整

Modified Paths:
--------------
    trunk/teraterm/ttpdlg/ttpdlg.rc

-------------- next part --------------
Modified: trunk/teraterm/ttpdlg/ttpdlg.rc
===================================================================
--- trunk/teraterm/ttpdlg/ttpdlg.rc	2019-03-27 22:04:21 UTC (rev 7521)
+++ trunk/teraterm/ttpdlg/ttpdlg.rc	2019-03-27 22:16:48 UTC (rev 7522)
@@ -110,10 +110,10 @@
     CONTROL         "A&uto switch (VT<->TEK)",IDC_TERMAUTOSWITCH,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,123,80,110,12
     GROUPBOX        "&Kanji (receive)",IDC_TERMKANJILABEL,7,96,71,40
     COMBOBOX        IDC_TERMKANJI,11,107,39,58,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Hal&f-width kana",IDC_TERMKANA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,120,67,12
+    CONTROL         "Hal&f-width kana",IDC_TERMKANA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,120,65,12
     GROUPBOX        "Kan&ji (transmit)",IDC_TERMKANJISENDLABEL,82,96,158,40
     COMBOBOX        IDC_TERMKANJISEND,86,107,40,58,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Half-wi&dth kana",IDC_TERMKANASEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,85,120,68,12
+    CONTROL         "Half-wi&dth kana",IDC_TERMKANASEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,120,68,12
     CONTROL         "Kanji-i&n:",IDC_TERMKINTEXT,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,150,109,48,11
     COMBOBOX        IDC_TERMKIN,203,107,32,58,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Kanji-&out:",IDC_TERMKOUTTEXT,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,150,122,48,11
@@ -297,9 +297,9 @@
     COMBOBOX        IDC_KEYBKEYB,57,47,44,58,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
     CONTROL         "&Meta key:",IDC_KEYBMETATEXT,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,12,63,44,9
     COMBOBOX        IDC_KEYBMETA,57,61,44,58,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Disabled mode:",IDC_KEYBDISABLE,10,74,130,35
-    CONTROL         "&Application Keypad",IDC_KEYBAPPKEY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,83,115,12
-    CONTROL         "Application &Cursor",IDC_KEYBAPPCUR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,96,115,12
+    GROUPBOX        "Disabled mode:",IDC_KEYBDISABLE,10,76,130,35
+    CONTROL         "&Application Keypad",IDC_KEYBAPPKEY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,85,115,12
+    CONTROL         "Application &Cursor",IDC_KEYBAPPCUR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,98,115,12
     DEFPUSHBUTTON   "OK",IDOK,107,7,40,14,WS_GROUP
     PUSHBUTTON      "Cancel",IDCANCEL,107,26,40,14
     PUSHBUTTON      "&Help",IDC_KEYBHELP,107,55,40,14

From scmnotify ＠ osdn.net  Thu Mar 28 20:47:43 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Thu, 28 Mar 2019 20:47:43 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B7523=5D_VS2017_release_build?=
 =?utf-8?b?44GnT25pZ3VydW1h44GuaW5jbHVkZeODkeOCuea8j+OCjOOCkuS/ruatow==?=
 =?utf-8?b?44GX44Gf44CC?=
Message-ID: <1553773663.344860.132990.nullmailer@users.osdn.me>

Revision: 7523
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7523
Author:   yutakapon
Date:     2019-03-28 20:47:42 +0900 (Thu, 28 Mar 2019)
Log Message:
-----------
VS2017 release buildでOnigurumaのincludeパス漏れを修正した。

Modified Paths:
--------------
    trunk/teraterm/teraterm/ttermpro.v15.vcxproj

-------------- next part --------------
Modified: trunk/teraterm/teraterm/ttermpro.v15.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v15.vcxproj	2019-03-27 22:16:48 UTC (rev 7522)
+++ trunk/teraterm/teraterm/ttermpro.v15.vcxproj	2019-03-28 11:47:42 UTC (rev 7523)
@@ -106,7 +106,7 @@
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -266,4 +266,4 @@
       <UserProperties RESOURCE_FILE="ttermpro.rc" />
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>
\ No newline at end of file

From scmnotify ＠ osdn.net  Fri Mar 29 01:09:46 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Fri, 29 Mar 2019 01:09:46 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc1MjRdIOODl+ODreOCuOOCp+OCr+ODiA==?=
 =?utf-8?b?44OV44Kh44Kk44Or5L+d5a6IIFZTMjAxNw==?=
Message-ID: <1553789386.215245.118089.nullmailer@users.osdn.me>

Revision: 7524
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7524
Author:   zmatsuo
Date:     2019-03-29 01:09:45 +0900 (Fri, 29 Mar 2019)
Log Message:
-----------
プロジェクトファイル保守 VS2017

Modified Paths:
--------------
    trunk/teraterm/teraterm/ttermpro.v15.vcxproj
    trunk/teraterm/teraterm/ttermpro.v15.vcxproj.filters
    trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj

-------------- next part --------------
Modified: trunk/teraterm/teraterm/ttermpro.v15.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v15.vcxproj	2019-03-28 11:47:42 UTC (rev 7523)
+++ trunk/teraterm/teraterm/ttermpro.v15.vcxproj	2019-03-28 16:09:45 UTC (rev 7524)
@@ -15,6 +15,7 @@
     <RootNamespace>ttermpro</RootNamespace>
     <Keyword>MFCProj</Keyword>
     <ProjectName>ttermpro</ProjectName>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -64,7 +65,7 @@
     <ClCompile>
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <BrowseInformation />
@@ -77,10 +78,10 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0411</Culture>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;onig_sd.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -87,11 +88,15 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib</IgnoreSpecificDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib;libcmt.lib</IgnoreSpecificDefaultLibraries>
     </Link>
     <Manifest>
       <AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
     </Manifest>
+    <PreBuildEvent>
+      <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command>
+      <Message>creating "$(ProjectDir)svnversion.h"</Message>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>
@@ -106,7 +111,7 @@
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -122,7 +127,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>nafxcw.lib;LIBCMT.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>nafxcw.lib;LIBCMT.lib;onig_s.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -134,6 +139,10 @@
     <Manifest>
       <AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
     </Manifest>
+    <PreBuildEvent>
+      <Message>creating "$(ProjectDir)svnversion.h"</Message>
+      <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\common\dlglib.c" />
@@ -175,9 +184,9 @@
     <ClCompile Include="vtwin.cpp" />
     <ClCompile Include="winjump.c" />
     <ClCompile Include="WSAAsyncGetAddrInfo.c" />
-    <ClCompile Include="../ttpdlg/dlg_res.h" />
+    <ClInclude Include="../ttpdlg/dlg_res.h" />
     <ClCompile Include="../ttpdlg/ttdlg.c" />
-    <ClCompile Include="../ttpdlg/ttdlg.h" />
+    <ClInclude Include="../ttpdlg/ttdlg.h" />
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\..\cygterm\cygterm.ico" />
@@ -237,6 +246,9 @@
     <ClInclude Include="vtwin.h" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\svnrev\svnrev.v15.vcxproj">
+      <Project>{80f1c3f0-a213-4d48-85c8-a265990d19a7}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v15.vcxproj">
       <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

Modified: trunk/teraterm/teraterm/ttermpro.v15.vcxproj.filters
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v15.vcxproj.filters	2019-03-28 11:47:42 UTC (rev 7523)
+++ trunk/teraterm/teraterm/ttermpro.v15.vcxproj.filters	2019-03-28 16:09:45 UTC (rev 7524)
@@ -19,6 +19,9 @@
     <Filter Include="dialog">
       <UniqueIdentifier>{23d7c62e-eff4-4a0d-b8b4-7fc703717c0e}</UniqueIdentifier>
     </Filter>
+    <Filter Include="ttpdlg">
+      <UniqueIdentifier>{1cdaec4a-75c1-4600-b434-45286f5bec80}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="filesys.cpp">
@@ -120,6 +123,27 @@
     <ClCompile Include="..\common\win16api.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\common\dlglib_cpp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\dlglib_tmpl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\tipwin.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\codeconv.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\dllutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\compat_win.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="../ttpdlg/ttdlg.c">
+      <Filter>ttpdlg</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\..\cygterm\cygterm.ico">
@@ -154,6 +178,9 @@
     <ResourceCompile Include="ttermpro.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
+    <ResourceCompile Include="../ttpdlg/ttpdlg.rc">
+      <Filter>ttpdlg</Filter>
+    </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="sizetip.h">
@@ -276,5 +303,11 @@
     <ClInclude Include="..\common\win16api.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="../ttpdlg/dlg_res.h">
+      <Filter>ttpdlg</Filter>
+    </ClInclude>
+    <ClInclude Include="../ttpdlg/ttdlg.h">
+      <Filter>ttpdlg</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

Modified: trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj	2019-03-28 11:47:42 UTC (rev 7523)
+++ trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj	2019-03-28 16:09:45 UTC (rev 7524)
@@ -125,7 +125,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib</IgnoreSpecificDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib;libcmt.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -199,4 +199,4 @@
       <UserProperties RESOURCE_FILE="ttpmacro.rc" />
     </VisualStudio>
   </ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>

From scmnotify ＠ osdn.net  Fri Mar 29 01:38:29 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Fri, 29 Mar 2019 01:38:29 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc1MjZdIOODleOCoeOCpOODq+i7oumAgQ==?=
 =?utf-8?b?6Zai6YCj44KS6auYRFBJ5YyW?=
Message-ID: <1553791109.526962.52842.nullmailer@users.osdn.me>

Revision: 7526
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7526
Author:   zmatsuo
Date:     2019-03-29 01:38:29 +0900 (Fri, 29 Mar 2019)
Log Message:
-----------
ファイル転送関連を高DPI化

Modified Paths:
--------------
    trunk/teraterm/teraterm/filesys.cpp
    trunk/teraterm/teraterm/ftdlg.cpp
    trunk/teraterm/teraterm/ftdlg.h
    trunk/teraterm/teraterm/protodlg.cpp
    trunk/teraterm/teraterm/protodlg.h

-------------- next part --------------
Modified: trunk/teraterm/teraterm/filesys.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys.cpp	2019-03-28 16:38:16 UTC (rev 7525)
+++ trunk/teraterm/teraterm/filesys.cpp	2019-03-28 16:38:29 UTC (rev 7526)
@@ -28,7 +28,10 @@
  */
 
 /* TERATERM.EXE, file transfer routines */
-#include "stdafx.h"
+#include <stdio.h>
+#include <io.h>
+#include <process.h>
+
 #include "teraterm.h"
 #include "tttypes.h"
 #include "ttftypes.h"
@@ -255,11 +258,9 @@
 static PFileTransDlg SendDlg = NULL;
 static PProtoDlg PtDlg = NULL;
 
-BOOL OpenFTDlg(PFileVar fv)
+static BOOL OpenFTDlg(PFileVar fv)
 {
 	PFileTransDlg FTDlg;
-	HWND HFTDlg;
-	char uimsg[MAX_UIMSG];
 
 	FTDlg = new CFileTransDlg();
 
@@ -272,7 +273,7 @@
 
 	if (FTDlg!=NULL)
 	{
-		FTDlg->Create(fv, &cv, &ts);
+		FTDlg->Create(hInst, HVTWin, fv, &cv, &ts);
 		FTDlg->RefreshNum();
 		if (fv->OpId == OpLog) {
 			HWndLog = FTDlg->m_hWnd; // steven add
@@ -284,32 +285,9 @@
 	else
 		SendDlg = FTDlg; /* File send */
 
-	HFTDlg=FTDlg->GetSafeHwnd();
-
-	GetDlgItemText(HFTDlg, IDC_TRANS_FILENAME, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_FILETRANS_FILENAME", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(HFTDlg, IDC_TRANS_FILENAME, ts.UIMsg);
-	GetDlgItemText(HFTDlg, IDC_FULLPATH_LABEL, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_FILETRANS_FULLPATH", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(HFTDlg, IDC_FULLPATH_LABEL, ts.UIMsg);
-	GetDlgItemText(HFTDlg, IDC_TRANS_TRANS, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_FILETRANS_TRNAS", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(HFTDlg, IDC_TRANS_TRANS, ts.UIMsg);
-	GetDlgItemText(HFTDlg, IDC_TRANS_ELAPSED, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_FILETRANS_ELAPSED", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(HFTDlg, IDC_TRANS_ELAPSED, ts.UIMsg);
-	GetDlgItemText(HFTDlg, IDCANCEL, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_FILETRANS_CLOSE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(HFTDlg, IDCANCEL, ts.UIMsg);
-	GetDlgItemText(HFTDlg, IDC_TRANSPAUSESTART, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_FILETRANS_PAUSE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(HFTDlg, IDC_TRANSPAUSESTART, ts.UIMsg);
-	GetDlgItemText(HFTDlg, IDC_TRANSHELP, uimsg, sizeof(uimsg));
-	get_lang_msg("BTN_HELP", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(HFTDlg, IDC_TRANSHELP, ts.UIMsg);
-
 	fv->StartTime = GetTickCount();
 	if (fv->OpId == OpSendFile) {
+		HWND HFTDlg = FTDlg->GetSafeHwnd();
 		InitDlgProgress(HFTDlg, IDC_TRANSPROGRESS, &fv->ProgStat);
 		ShowWindow(GetDlgItem(HFTDlg, IDC_TRANS_ELAPSED), SW_SHOW);
 	}
@@ -1479,8 +1457,6 @@
 {
 	int vsize;
 	PProtoDlg pd;
-	HWND Hpd;
-	char uimsg[MAX_UIMSG];
 
 	ProtoId = IdProto;
 
@@ -1540,29 +1516,8 @@
 		ProtoVar = NULL;
 		return FALSE;
 	}
-	pd->Create(fv,&ts);
+	pd->Create(hInst, HVTWin, fv, &ts);
 
-	Hpd=pd->GetSafeHwnd();
-
-	GetDlgItemText(Hpd, IDC_PROT_FILENAME, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_PROT_FILENAME", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(Hpd, IDC_PROT_FILENAME, ts.UIMsg);
-	GetDlgItemText(Hpd, IDC_PROT_PROT, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_PROT_PROTO", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(Hpd, IDC_PROT_PROT, ts.UIMsg);
-	GetDlgItemText(Hpd, IDC_PROT_PACKET, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_PROT_PACKET", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(Hpd, IDC_PROT_PACKET, ts.UIMsg);
-	GetDlgItemText(Hpd, IDC_PROT_TRANS, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_PROT_TRANS", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(Hpd, IDC_PROT_TRANS, ts.UIMsg);
-	GetDlgItemText(Hpd, IDC_PROT_ELAPSED, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_PROT_ELAPSED", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(Hpd, IDC_PROT_ELAPSED, ts.UIMsg);
-	GetDlgItemText(Hpd, IDCANCEL, uimsg, sizeof(uimsg));
-	get_lang_msg("BTN_CANCEL", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(Hpd, IDCANCEL, ts.UIMsg);
-
 	(*ProtoInit)(ProtoId,FileVar,ProtoVar,&cv,&ts);
 
 	PtDlg = pd;

Modified: trunk/teraterm/teraterm/ftdlg.cpp
===================================================================
--- trunk/teraterm/teraterm/ftdlg.cpp	2019-03-28 16:38:16 UTC (rev 7525)
+++ trunk/teraterm/teraterm/ftdlg.cpp	2019-03-28 16:38:29 UTC (rev 7526)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2007-2017 TeraTerm Project
+ * (C) 2007-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,11 +28,15 @@
  */
 
 /* TERATERM.EXE, file transfer dialog box */
-#include "stdafx.h"
+#include <stdio.h>
+#include <windows.h>
+#include <commctrl.h>
+#include <tchar.h>
 #include "teraterm.h"
 #include "tttypes.h"
 #include "ttftypes.h"
 #include "ttlib.h"
+#include "dlglib.h"
 #include "tt_res.h"
 #include "ftdlg.h"
 
@@ -45,15 +49,9 @@
 /////////////////////////////////////////////////////////////////////////////
 // CFileTransDlg dialog
 
-BEGIN_MESSAGE_MAP(CFileTransDlg, CDialog)
-	//{{AFX_MSG_MAP(CFileTransDlg)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-BOOL CFileTransDlg::Create(PFileVar pfv, PComVar pcv, PTTSet pts)
+BOOL CFileTransDlg::Create(HINSTANCE hInstance, HWND hParent, PFileVar pfv, PComVar pcv, PTTSet pts)
 {
 	BOOL Ok;
-	WNDCLASS wc;
 	int fuLoad = LR_DEFAULTCOLOR;
 	HWND hwnd;
 
@@ -61,28 +59,14 @@
 	cv = pcv;
 	cv->FilePause &= ~fv->OpId;
 	ts = pts;
-	LOGFONT logfont;
-	HFONT font;
 
-	wc.style = CS_PARENTDC;
-	wc.lpfnWndProc = AfxWndProc;
-	wc.cbClsExtra = 0;
-	wc.cbWndExtra = DLGWINDOWEXTRA;
-	wc.hInstance = AfxGetInstanceHandle();
-	wc.hIcon = NULL;
-	wc.hCursor = LoadCursor(NULL,IDC_ARROW);
-	wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1);
-	wc.lpszMenuName = NULL;
-	wc.lpszClassName = "FTDlg32";
-	RegisterClass(&wc);
-
 	Pause = FALSE;
-	hwnd = GetForegroundWindow()->GetSafeHwnd();
+	hwnd = GetForegroundWindow();
 	if (fv->OpId == OpLog) { // parent window is desktop
-		Ok = CDialog::Create(CFileTransDlg::IDD, GetDesktopWindow());
+		Ok = TTCDialog::Create(hInstance, GetDesktopWindow(), CFileTransDlg::IDD);
 	}
 	else { // parent window is VT window
-		Ok = CDialog::Create(CFileTransDlg::IDD, NULL);
+		Ok = TTCDialog::Create(hInstance, NULL, CFileTransDlg::IDD);
 	}
 
 	if (!fv->HideDialog) {
@@ -100,22 +84,6 @@
 
 	fv->HWin = GetSafeHwnd();
 
-	font = (HFONT)SendMessage(WM_GETFONT, 0, 0);
-	GetObject(font, sizeof(LOGFONT), &logfont);
-	if (get_lang_font("DLG_SYSTEM_FONT", fv->HWin, &logfont, &DlgFont, ts->UILanguageFile)) {
-		SendDlgItemMessage(IDC_TRANS_FILENAME, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_TRANSFNAME, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_FULLPATH_LABEL, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_EDIT_FULLPATH, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_TRANS_TRANS, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_TRANSBYTES, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_TRANS_ELAPSED, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_TRANS_ETIME, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_TRANSPAUSESTART, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDCANCEL, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_TRANSHELP, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-	}
-
 	return Ok;
 }
 
@@ -182,9 +150,21 @@
 
 /////////////////////////////////////////////////////////////////////////////
 // CFileTransDlg message handler
+#define AddModalHandle(p1)		// TODO
+#define	RemoveModalHandle(p1)
 
 BOOL CFileTransDlg::OnInitDialog()
 {
+	static const DlgTextInfo TextInfos[] = {
+		{ IDC_TRANS_FILENAME, "DLG_FILETRANS_FILENAME" },
+		{ IDC_FULLPATH_LABEL, "DLG_FILETRANS_FULLPATH" },
+		{ IDC_TRANS_TRANS, "DLG_FILETRANS_TRNAS" },
+		{ IDC_TRANS_ELAPSED, "DLG_FILETRANS_ELAPSED" },
+		{ IDCANCEL, "DLG_FILETRANS_CLOSE" },
+		{ IDC_TRANSPAUSESTART, "DLG_FILETRANS_PAUSE" },
+		{ IDC_TRANSHELP, "BTN_HELP" },
+	};
+
 	int fuLoad = LR_DEFAULTCOLOR;
 
 	if (fv->HideDialog) {
@@ -202,27 +182,32 @@
 	// \x83\x8D\x83O\x83t\x83@\x83C\x83\x8B\x82̓t\x83\x8B\x83p\x83X\x95\\x8E\xA6\x82ɂ\xB7\x82\xE9(2004.8.6 yutaka)
 	SetDlgItemText(IDC_EDIT_FULLPATH, &(fv->FullName[0]));
 
+	SetDlgTexts(m_hWnd, TextInfos, _countof(TextInfos), ts->UILanguageFile);
+
 	if (IsWindowsNT4()) {
 		fuLoad = LR_VGACOLOR;
 	}
-	SmallIcon = LoadImage(AfxGetInstanceHandle(),
-		MAKEINTRESOURCE(IDI_TTERM),
-		IMAGE_ICON, 16, 16, fuLoad);
+	SmallIcon = LoadImage(m_hInst,
+						  MAKEINTRESOURCE(IDI_TTERM),
+						  IMAGE_ICON, 16, 16, fuLoad);
 	::PostMessage(GetSafeHwnd(), WM_SETICON, ICON_SMALL,
-		(LPARAM)SmallIcon);
+				  (LPARAM)SmallIcon);
 
-	BigIcon = LoadImage(AfxGetInstanceHandle(),
-			MAKEINTRESOURCE(IDI_TTERM),
-			IMAGE_ICON, 0, 0, fuLoad);
+	BigIcon = LoadImage(m_hInst,
+						MAKEINTRESOURCE(IDI_TTERM),
+						IMAGE_ICON, 0, 0, fuLoad);
 	::PostMessage(GetSafeHwnd(), WM_SETICON, ICON_BIG,
-		(LPARAM)BigIcon);
+				  (LPARAM)BigIcon);
 
-	return 1;
+	AddModalHandle(m_hWnd);
+
+	return TRUE;
 }
 
-void CFileTransDlg::OnCancel( )
+BOOL CFileTransDlg::OnCancel( )
 {
 	::PostMessage(fv->HMainWin,WM_USER_FTCANCEL,fv->OpId,0);
+	return TRUE;
 }
 
 BOOL CFileTransDlg::OnCommand(WPARAM wParam, LPARAM lParam)
@@ -238,21 +223,15 @@
 			::PostMessage(fv->HMainWin,WM_USER_DLGHELP2,0,0);
 			return TRUE;
 		default:
-			return (CDialog::OnCommand(wParam,lParam));
+			return (TTCDialog::OnCommand(wParam,lParam));
 	}
 }
 
-void CFileTransDlg::PostNcDestroy()
+BOOL CFileTransDlg::PostNcDestroy()
 {
 	// logopen\x82\xC6logclose\x82\xF0\x8CJ\x82\xE8\x95Ԃ\xB7\x82ƁAGDI\x83\x8A\x83\\x81[\x83X\x83\x8A\x81[\x83N\x82ƂȂ\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B
-	//   - CreateFontIndirect()\x82ō쐬\x82\xB5\x82\xBD\x98_\x97\x9D\x83t\x83H\x83\x93\x83g\x82\xF0\x8D폜\x82\xB7\x82\xE9\x81B
 	//   - LoadImage()\x82ɂ\xE6\x82\xE9\x83A\x83C\x83R\x83\x93\x83\x8A\x83\\x81[\x83X\x82\xF0\x89\xF0\x95\xFA\x82\xB7\x82\xE9\x81B
 	// (2016.10.5 yutaka)
-	if (DlgFont) {
-		DeleteObject(DlgFont);
-		DlgFont = NULL;
-	}
-
 	if (SmallIcon) {
 		DestroyIcon((HICON)SmallIcon);
 		SmallIcon = NULL;
@@ -263,10 +242,8 @@
 		BigIcon = NULL;
 	}
 
+	RemoveModalHandle(m_hWnd);
+
 	delete this;
+	return TRUE;
 }
-
-LRESULT CFileTransDlg::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)
-{
-	return DefDlgProc(GetSafeHwnd(),message,wParam,lParam);
-}

Modified: trunk/teraterm/teraterm/ftdlg.h
===================================================================
--- trunk/teraterm/teraterm/ftdlg.h	2019-03-28 16:38:16 UTC (rev 7525)
+++ trunk/teraterm/teraterm/ftdlg.h	2019-03-28 16:38:29 UTC (rev 7526)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2007-2017 TeraTerm Project
+ * (C) 2007-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,55 +29,38 @@
 
 /* TERATERM.EXE, file transfer dialog box */
 
+#include "tmfc.h"
+
 /////////////////////////////////////////////////////////////////////////////
 // CFileTransDlg dialog
 
-class CFileTransDlg : public CDialog
+class CFileTransDlg : public TTCDialog
 {
-private:
-	PFileVar fv;
-	PComVar cv;
-	BOOL Pause;
-#ifndef NO_I18N
-	PTTSet ts;
-	HFONT DlgFont;
-#endif
-	HANDLE SmallIcon;
-	HANDLE BigIcon;
-
 public:
 	CFileTransDlg() {
-		DlgFont = NULL;
 		SmallIcon = NULL;
 		BigIcon = NULL;
 	}
 
-#ifndef NO_I18N
-	BOOL Create(PFileVar pfv, PComVar pcv, PTTSet pts);
-#else
-	BOOL Create(PFileVar pfv, PComVar pcv);
-#endif
+	BOOL Create(HINSTANCE hInstance, HWND hParent, PFileVar pfv, PComVar pcv, PTTSet pts);
 	void ChangeButton(BOOL PauseFlag);
 	void RefreshNum();
 
-	//{{AFX_DATA(CFileTransDlg)
 	enum { IDD = IDD_FILETRANSDLG };
-	//}}AFX_DATA
 
-	//{{AFX_VIRTUAL(CFileTransDlg)
-	protected:
-	virtual void OnCancel( );
+protected:
+	virtual BOOL OnCancel();
 	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
-	virtual void PostNcDestroy();
-	virtual LRESULT DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam);
-	//}}AFX_VIRTUAL
+	virtual BOOL PostNcDestroy();
+	virtual BOOL OnInitDialog();
 
-protected:
-
-	//{{AFX_MSG(CFileTransDlg)
-	virtual BOOL OnInitDialog();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
+private:
+	PFileVar fv;
+	PComVar cv;
+	BOOL Pause;
+	PTTSet ts;
+	HANDLE SmallIcon;
+	HANDLE BigIcon;
 };
 
 typedef CFileTransDlg *PFileTransDlg;

Modified: trunk/teraterm/teraterm/protodlg.cpp
===================================================================
--- trunk/teraterm/teraterm/protodlg.cpp	2019-03-28 16:38:16 UTC (rev 7525)
+++ trunk/teraterm/teraterm/protodlg.cpp	2019-03-28 16:38:29 UTC (rev 7526)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2007-2017 TeraTerm Project
+ * (C) 2007-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,7 +28,6 @@
  */
 
 /* TERATERM.EXE, file-transfer-protocol dialog box */
-#include "stdafx.h"
 #include "teraterm.h"
 #include "tt_res.h"
 #include "tttypes.h"
@@ -46,39 +45,14 @@
 /////////////////////////////////////////////////////////////////////////////
 // CProtoDlg dialog
 
-BEGIN_MESSAGE_MAP(CProtoDlg, CDialog)
-	//{{AFX_MSG_MAP(CProtoDlg)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-BOOL CProtoDlg::Create(PFileVar pfv, PTTSet pts)
+BOOL CProtoDlg::Create(HINSTANCE hInstance, HWND hParent, PFileVar pfv, PTTSet pts)
 {
-	BOOL Ok;
-	LOGFONT logfont;
-	HFONT font;
-
+	m_pts = pts;
 	fv = pfv;
 
-	Ok = CDialog::Create(CProtoDlg::IDD, NULL);
+	BOOL Ok = TTCDialog::Create(hInstance, hParent, CProtoDlg::IDD);
 	fv->HWin = GetSafeHwnd();
 
-	font = (HFONT)SendMessage(WM_GETFONT, 0, 0);
-	GetObject(font, sizeof(LOGFONT), &logfont);
-	if (get_lang_font("DLG_SYSTEM_FONT", GetSafeHwnd(), &logfont, &DlgFont, pts->UILanguageFile)) {
-		SendDlgItemMessage(IDC_PROT_FILENAME, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_PROTOFNAME, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_PROT_PROT, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_PROTOPROT, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_PROT_PACKET, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_PROTOPKTNUM, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_PROT_TRANS, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_PROTOBYTECOUNT, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_PROT_ELAPSED, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_PROTOELAPSEDTIME, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_PROTOPERCENT, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDCANCEL, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-	}
-
 	return Ok;
 }
 
@@ -85,9 +59,25 @@
 /////////////////////////////////////////////////////////////////////////////
 // CProtoDlg message handler
 
-void CProtoDlg::OnCancel( )
+BOOL CProtoDlg::OnInitDialog()
 {
+	static const DlgTextInfo TextInfos[] = {
+		{ IDC_PROT_FILENAME, "DLG_PROT_FILENAME" },
+		{ IDC_PROT_PROT, "DLG_PROT_PROTO" },
+		{ IDC_PROT_PACKET, "DLG_PROT_PACKET"},
+		{ IDC_PROT_TRANS, "DLG_PROT_TRANS" },
+		{ IDC_PROT_ELAPSED, "DLG_PROT_ELAPSED" },
+		{ IDCANCEL, "BTN_CANCEL" },
+	};
+	SetDlgTexts(m_hWnd, TextInfos, _countof(TextInfos), m_pts->UILanguageFile);
+	return TRUE;
+}
+
+
+BOOL CProtoDlg::OnCancel()
+{
 	::PostMessage(fv->HMainWin,WM_USER_PROTOCANCEL,0,0);
+	return TRUE;
 }
 
 BOOL CProtoDlg::OnCommand(WPARAM wParam, LPARAM lParam)
@@ -97,11 +87,12 @@
 			::PostMessage(fv->HMainWin,WM_USER_PROTOCANCEL,0,0);
 			return TRUE;
 		default:
-			return (CDialog::OnCommand(wParam,lParam));
+			return (TTCDialog::OnCommand(wParam,lParam));
 	}
 }
 
-void CProtoDlg::PostNcDestroy()
+BOOL CProtoDlg::PostNcDestroy()
 {
 	delete this;
+	return TRUE;
 }

Modified: trunk/teraterm/teraterm/protodlg.h
===================================================================
--- trunk/teraterm/teraterm/protodlg.h	2019-03-28 16:38:16 UTC (rev 7525)
+++ trunk/teraterm/teraterm/protodlg.h	2019-03-28 16:38:29 UTC (rev 7526)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2007-2017 TeraTerm Project
+ * (C) 2007-2018 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,39 +28,25 @@
  */
 
 /* TERATERM.EXE, file-transfer-protocol dialog box */
+#include "tmfc.h"
+#include "tttypes.h"
 
 // CProtoDlg dialog
-class CProtoDlg : public CDialog
+class CProtoDlg : public TTCDialog
 {
-private:
-  PFileVar fv;
-#ifndef NO_I18N
-	HFONT DlgFont;
-#endif
 
 public:
-#ifndef NO_I18N
-	BOOL Create(PFileVar pfv, PTTSet pts);
-#else
-	BOOL Create(PFileVar pfv);
-#endif
+	BOOL Create(HINSTANCE hInstance, HWND hParent, PFileVar pfv, PTTSet pts);
 
-	//{{AFX_DATA(CProtoDlg)
 	enum { IDD = IDD_PROTDLG };
-	//}}AFX_DATA
-
-	//{{AFX_VIRTUAL(CProtoDlg)
-	protected:
-	virtual void OnCancel( );
+protected:
+	virtual BOOL OnCancel();
 	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
-	virtual void PostNcDestroy();
-	//}}AFX_VIRTUAL
-
-protected:
-
-	//{{AFX_MSG(CProtoDlg)
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
+	virtual BOOL OnInitDialog();
+	virtual BOOL PostNcDestroy();
+private:
+	PFileVar fv;
+	TTTSet *m_pts;
 };
 
 typedef CProtoDlg *PProtoDlg;

From scmnotify ＠ osdn.net  Fri Mar 29 01:38:17 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Fri, 29 Mar 2019 01:38:17 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc1MjVdIOOBneOBruS7luOBruioreWumg==?=
 =?utf-8?b?44OA44Kk44Ki44Ot44Kw44KS6auYRFBJ5YyW?=
Message-ID: <1553791097.224405.52652.nullmailer@users.osdn.me>

Revision: 7525
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7525
Author:   zmatsuo
Date:     2019-03-29 01:38:16 +0900 (Fri, 29 Mar 2019)
Log Message:
-----------
その他の設定ダイアログを高DPI化

Modified Paths:
--------------
    trunk/teraterm/teraterm/CMakeLists.txt
    trunk/teraterm/teraterm/addsetting.cpp
    trunk/teraterm/teraterm/addsetting.h
    trunk/teraterm/teraterm/vtwin.cpp

Added Paths:
-----------
    trunk/teraterm/common/tmfc.cpp
    trunk/teraterm/common/tmfc.h
    trunk/teraterm/common/tmfc_frame.cpp

-------------- next part --------------
Added: trunk/teraterm/common/tmfc.cpp
===================================================================
--- trunk/teraterm/common/tmfc.cpp	                        (rev 0)
+++ trunk/teraterm/common/tmfc.cpp	2019-03-28 16:38:16 UTC (rev 7525)
@@ -0,0 +1,807 @@
+/*
+ * Copyright (C) 2018 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Tera term Micro Framework class
+ */
+#include "tmfc.h"
+
+#include <windowsx.h>
+#include <assert.h>
+#include <tchar.h>
+#include "dlglib.h"
+#include "ttlib.h"
+
+// \x83e\x83\x93\x83v\x83\x8C\x81[\x83g\x82̏\x91\x82\xAB\x8A\xB7\x82\xA6\x82\xF0\x8Ds\x82\xA4
+#define REWRITE_TEMPLATE
+
+#if (defined(_MSC_VER) && (_MSC_VER <= 1500)) || \
+	(__cplusplus <= 199711L)
+#define nullptr NULL	// C++11,nullptr / > VS2010
+#endif
+
+TTCWnd::TTCWnd()
+{
+	m_hWnd = nullptr;
+	m_hInst = nullptr;
+	m_hAccel = nullptr;
+	m_hParentWnd = nullptr;
+}
+
+LRESULT TTCWnd::SendMessage(UINT msg, WPARAM wp, LPARAM lp)
+{
+	return ::SendMessage(m_hWnd, msg, wp, lp);
+}
+
+HWND TTCWnd::GetDlgItem(int id)
+{
+	return ::GetDlgItem(m_hWnd, id);
+}
+
+LRESULT TTCWnd::SendDlgItemMessageT(int id, UINT msg, WPARAM wp, LPARAM lp)
+{
+	return ::SendDlgItemMessage(m_hWnd, id, msg, wp, lp);
+}
+
+#if defined(UNICODE)
+LRESULT TTCWnd::SendDlgItemMessageW(int id, UINT msg, WPARAM wp, LPARAM lp)
+{
+	return ::SendDlgItemMessageW(m_hWnd, id, msg, wp, lp);
+}
+#endif
+
+LRESULT TTCWnd::SendDlgItemMessageA(int id, UINT msg, WPARAM wp, LPARAM lp)
+{
+	return ::SendDlgItemMessageA(m_hWnd, id, msg, wp, lp);
+}
+
+void TTCWnd::GetDlgItemTextT(int id, TCHAR *buf, size_t size)
+{
+	::GetDlgItemText(m_hWnd, id, buf, (int)size);
+}
+
+#if defined(UNICODE)
+void TTCWnd::GetDlgItemTextW(int id, wchar_t *buf, size_t size)
+{
+	::GetDlgItemTextW(m_hWnd, id, buf, (int)size);
+}
+#endif
+
+void TTCWnd::GetDlgItemTextA(int id, char *buf, size_t size)
+{
+	::GetDlgItemTextA(m_hWnd, id, buf, (int)size);
+}
+
+void TTCWnd::SetDlgItemTextT(int id, const TCHAR *str)
+{
+	::SetDlgItemText(m_hWnd, id, str);
+}
+
+#if defined(UNICODE)
+void TTCWnd::SetDlgItemTextW(int id, const wchar_t *str)
+{
+	::SetDlgItemTextW(m_hWnd, id, str);
+}
+#endif
+
+void TTCWnd::SetDlgItemTextA(int id, const char *str)
+{
+	::SetDlgItemTextA(m_hWnd, id, str);
+}
+
+void TTCWnd::SetDlgItemNum(int id, LONG Num)
+{
+	SetDlgNum(m_hWnd, id, Num);
+}
+
+// nCheck	BST_UNCHECKED / BST_CHECKED / BST_INDETERMINATE
+void TTCWnd::SetCheck(int id, int nCheck)
+{
+	::SendMessage(GetDlgItem(id), BM_SETCHECK, nCheck, 0);
+}
+
+UINT TTCWnd::GetCheck(int id)
+{
+	return ::IsDlgButtonChecked(m_hWnd, id);
+}
+
+void TTCWnd::SetCurSel(int id, int no)
+{
+	HWND hWnd = GetDlgItem(id);
+	assert(hWnd != 0);
+	TCHAR ClassName[32];
+	int r = GetClassName(hWnd, ClassName, _countof(ClassName));
+	assert(r != 0); (void)r;
+	UINT msg =
+		(_tcscmp(ClassName, _T("ListBox")) == 0) ? LB_SETCURSEL :
+		(_tcscmp(ClassName, _T("ComboBox")) == 0) ? CB_SETCURSEL : 0;
+	assert(msg != 0);
+	::SendMessage(hWnd, msg, no, 0);
+}
+
+int TTCWnd::GetCurSel(int id)
+{
+	HWND hWnd = GetDlgItem(id);
+	assert(hWnd != 0);
+	TCHAR ClassName[32];
+	int r = GetClassName(hWnd, ClassName, _countof(ClassName));
+	assert(r != 0); (void)r;
+	UINT msg =
+		(_tcscmp(ClassName, _T("ListBox")) == 0) ? LB_GETCURSEL :
+		(_tcscmp(ClassName, _T("ComboBox")) == 0) ? CB_GETCURSEL : 0;
+	assert(msg != 0);
+	LRESULT lResult = ::SendMessage(hWnd, msg, 0, 0);
+	return (int)lResult;
+}
+
+void TTCWnd::EnableDlgItem(int id, BOOL enable)
+{
+	::EnableWindow(GetDlgItem(id), enable);
+}
+
+void TTCWnd::SetDlgItemInt(int id, UINT val, BOOL bSigned)
+{
+	::SetDlgItemInt(m_hWnd, id, val, bSigned);
+}
+
+UINT TTCWnd::GetDlgItemInt(int id, BOOL* lpTrans, BOOL bSigned) const
+{
+	return ::GetDlgItemInt(m_hWnd, id, lpTrans, bSigned);
+}
+
+void TTCWnd::ShowWindow(int nCmdShow)
+{
+	::ShowWindow(m_hWnd, nCmdShow);
+}
+
+void TTCWnd::SetWindowTextT(const TCHAR *str)
+{
+	::SetWindowText(m_hWnd, str);
+}
+
+#if defined(UNICODE)
+void TTCWnd::SetWindowTextW(const wchar_t *str)
+{
+	::SetWindowTextW(m_hWnd, str);
+}
+#endif
+
+void TTCWnd::SetWindowTextA(const char *str)
+{
+	::SetWindowTextA(m_hWnd, str);
+}
+
+LONG_PTR TTCWnd::SetWindowLongPtr(int nIndex, LONG_PTR dwNewLong)
+{
+	return ::SetWindowLongPtr(m_hWnd, nIndex, dwNewLong);
+}
+
+LONG_PTR TTCWnd::GetWindowLongPtr(int nIndex)
+{
+	return ::GetWindowLongPtr(m_hWnd, nIndex);
+}
+
+void TTCWnd::ModifyStyleCom(int nStyleOffset,
+							DWORD dwRemove, DWORD dwAdd, UINT nFlags)
+{
+	const LONG_PTR dwStyle = GetWindowLongPtr(nStyleOffset);
+	const LONG_PTR add = dwAdd;
+	const LONG_PTR remove = dwRemove;
+	const LONG_PTR dwNewStyle = (dwStyle & ~remove) | add;
+	if (dwStyle != dwNewStyle) {
+		SetWindowLongPtr(nStyleOffset, dwNewStyle);
+	}
+	if (nFlags != 0)
+	{
+		SetWindowPos(nullptr, 0, 0, 0, 0,
+					 SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | nFlags);
+	}
+}
+
+void TTCWnd::ModifyStyle(DWORD dwRemove, DWORD dwAdd, UINT nFlags)
+{
+	ModifyStyleCom(GWL_STYLE, dwRemove, dwAdd, nFlags);
+}
+
+void TTCWnd::ModifyStyleEx(DWORD dwRemove, DWORD dwAdd, UINT nFlags)
+{
+	ModifyStyleCom(GWL_EXSTYLE, dwRemove, dwAdd, nFlags);
+}
+
+int TTCWnd::MessageBoxT(LPCTSTR lpText, LPCTSTR lpCaption, UINT uType)
+{
+	return ::MessageBox(m_hWnd, lpText, lpCaption, uType);
+}
+
+int TTCWnd::MessageBoxA(const char *lpText, const char *lpCaption, UINT uType)
+{
+	return ::MessageBoxA(m_hWnd, lpText, lpCaption, uType);
+}
+
+#if defined(UNICODE)
+int TTCWnd::MessageBoxW(const wchar_t *lpText, const wchar_t *lpCaption, UINT uType)
+{
+	return ::MessageBoxW(m_hWnd, lpText, lpCaption, uType);
+}
+#endif
+
+BOOL TTCWnd::GetWindowRect(RECT *R)
+{
+	return ::GetWindowRect(m_hWnd, R);
+}
+
+BOOL TTCWnd::SetWindowPos(HWND hWndInsertAfter, int X, int Y, int cx, int cy, UINT uFlags)
+{
+	return ::SetWindowPos(m_hWnd, hWndInsertAfter, X, Y, cx, cy, uFlags);
+}
+
+BOOL TTCWnd::GetClientRect(RECT *R)
+{
+	return ::GetClientRect(m_hWnd, R);
+}
+
+BOOL TTCWnd::InvalidateRect(RECT *R, BOOL bErase)
+{
+	return ::InvalidateRect(m_hWnd, R, bErase);
+}
+
+BOOL TTCWnd::EndDialog(int nResult)
+{
+	return ::EndDialog(m_hWnd, nResult);
+}
+
+void TTCWnd::DestroyWindow()
+{
+	::DestroyWindow(m_hWnd);
+}
+
+HDC TTCWnd::BeginPaint(LPPAINTSTRUCT lpPaint)
+{
+	return ::BeginPaint(m_hWnd, lpPaint);
+}
+
+BOOL TTCWnd::EndPaint(LPPAINTSTRUCT lpPaint)
+{
+	return ::EndPaint(m_hWnd, lpPaint);
+}
+
+LRESULT TTCWnd::DefWindowProc(UINT msg, WPARAM wParam, LPARAM lParam)
+{
+	return ::DefWindowProc(m_hWnd, msg, wParam, lParam);
+}
+
+////////////////////////////////////////
+
+TTCDialog *TTCDialog::pseudoPtr;
+
+TTCDialog::TTCDialog()
+{
+}
+
+TTCDialog::~TTCDialog()
+{
+}
+
+/**
+ * \x83_\x83C\x83A\x83\x8D\x83O\x8F\x89\x8A\xFA\x89\xBB
+ * @retval	TRUE	\x8F\x88\x97\x9D\x82\xAA\x8Ds\x82\xED\x82ꂽ(\x8E\x9F\x82̃\x81\x83b\x83Z\x81[\x83W\x8F\x88\x97\x9D\x82͌Ăяo\x82\xB3\x82\xEA\x82Ȃ\xA2)
+ * @retval	FALSE	\x8E\x9F\x82̃\x81\x83b\x83Z\x81[\x83W\x8F\x88\x97\x9D\x82͌Ăяo\x82\xB3\x82\xEA\x82\xE9
+ *
+ * \x8E\x9F\x82̃\x81\x83b\x83Z\x81[\x83W\x8F\x88\x97\x9D
+ *		TTCDialog::DlgProc(msg=WM_INITDIALOG)
+ */
+BOOL TTCDialog::OnInitDialog()
+{
+	return FALSE;
+}
+
+/**
+ * OK\x83{\x83^\x83\x93
+ * @retval	TRUE	\x8F\x88\x97\x9D\x82\xAA\x8Ds\x82\xED\x82ꂽ(\x8E\x9F\x82̃\x81\x83b\x83Z\x81[\x83W\x8F\x88\x97\x9D\x82͌Ăяo\x82\xB3\x82\xEA\x82Ȃ\xA2)
+ * @retval	FALSE	\x8E\x9F\x82̃\x81\x83b\x83Z\x81[\x83W\x8F\x88\x97\x9D\x82͌Ăяo\x82\xB3\x82\xEA\x82\xE9
+ *
+ * \x8E\x9F\x82̃\x81\x83b\x83Z\x81[\x83W\x8F\x88\x97\x9D
+ *		TTCDialog::OnCommand()
+ */
+BOOL TTCDialog::OnOK()
+{
+	EndDialog(IDOK);
+	return TRUE;
+}
+
+/**
+ * CANCEL\x83{\x83^\x83\x93
+ * @retval	TRUE	\x8F\x88\x97\x9D\x82\xAA\x8Ds\x82\xED\x82ꂽ(\x8E\x9F\x82̃\x81\x83b\x83Z\x81[\x83W\x8F\x88\x97\x9D\x82͌Ăяo\x82\xB3\x82\xEA\x82Ȃ\xA2)
+ * @retval	FALSE	\x8E\x9F\x82̃\x81\x83b\x83Z\x81[\x83W\x8F\x88\x97\x9D\x82͌Ăяo\x82\xB3\x82\xEA\x82\xE9
+ *
+ * \x8E\x9F\x82̃\x81\x83b\x83Z\x81[\x83W\x8F\x88\x97\x9D
+ *		TTCDialog::OnCommand()
+ */
+BOOL TTCDialog::OnCancel()
+{
+	EndDialog(IDCANCEL);
+	return TRUE;
+}
+
+BOOL TTCDialog::OnCommand(WPARAM wp, LPARAM lp)
+{
+	return FALSE;
+}
+
+/**
+ * WM_CLOSE\x83\x81\x83b\x83Z\x81[\x83W\x8F\x88\x97\x9D
+ * @retval	TRUE	\x8F\x88\x97\x9D\x82\xAA\x8Ds\x82\xED\x82ꂽ(\x8E\x9F\x82̃\x81\x83b\x83Z\x81[\x83W\x8F\x88\x97\x9D\x82͌Ăяo\x82\xB3\x82\xEA\x82Ȃ\xA2)
+ * @retval	FALSE	\x8E\x9F\x82̃\x81\x83b\x83Z\x81[\x83W\x8F\x88\x97\x9D\x82͌Ăяo\x82\xB3\x82\xEA\x82\xE9
+ *
+ * \x8E\x9F\x82̃\x81\x83b\x83Z\x81[\x83W\x8F\x88\x97\x9D
+ *		TTCDialog::OnCancel()
+ */
+BOOL TTCDialog::OnClose()
+{
+	return FALSE;
+}
+
+/**
+ * WM_NCDESTROY\x83\x81\x83b\x83Z\x81[\x83W\x8F\x88\x97\x9D
+ * @retval	TRUE	\x8F\x88\x97\x9D\x82\xAA\x8Ds\x82\xED\x82ꂽ(\x8E\x9F\x82̃\x81\x83b\x83Z\x81[\x83W\x8F\x88\x97\x9D\x82͌Ăяo\x82\xB3\x82\xEA\x82Ȃ\xA2)
+ * @retval	FALSE	\x8E\x9F\x82̃\x81\x83b\x83Z\x81[\x83W\x8F\x88\x97\x9D\x82͌Ăяo\x82\xB3\x82\xEA\x82\xE9
+ *
+ * \x8E\x9F\x82̃\x81\x83b\x83Z\x81[\x83W\x8F\x88\x97\x9D
+ *		TTCDialog::DlgProc()
+ */
+BOOL TTCDialog::PostNcDestroy()
+{
+	return FALSE;
+}
+
+/*
+ * @retval	TRUE	\x83\x81\x83b\x83Z\x81[\x83W\x82\xF0\x8F\x88\x97\x9D\x82\xB5\x82\xBD\x8E\x9E
+ * @retval	FALSE	\x83\x81\x83b\x83Z\x81[\x83W\x82\xF0\x8F\x88\x97\x9D\x82\xB5\x82Ȃ\xA9\x82\xC1\x82\xBD\x8E\x9E
+ * @retval	\x82\xBB\x82̑\xBC	\x83\x81\x83b\x83Z\x81[\x83W\x82ɂ\xE6\x82\xC1\x82ĈقȂ邱\x82Ƃ\xAA\x82\xA0\x82\xE9
+ */
+LRESULT TTCDialog::DlgProc(UINT msg, WPARAM wp, LPARAM lp)
+{
+	(void)msg;
+	(void)wp;
+	(void)lp;
+	return (LRESULT)FALSE;
+}
+
+/*
+ * @retval	TRUE	\x83\x81\x83b\x83Z\x81[\x83W\x82\xF0\x8F\x88\x97\x9D\x82\xB5\x82\xBD\x8E\x9E
+ * @retval	FALSE	\x83\x81\x83b\x83Z\x81[\x83W\x82\xF0\x8F\x88\x97\x9D\x82\xB5\x82Ȃ\xA9\x82\xC1\x82\xBD\x8E\x9E
+ */
+LRESULT TTCDialog::DlgProcBase(UINT msg, WPARAM wp, LPARAM lp)
+{
+	BOOL Processed = FALSE;
+	switch (msg) {
+	case WM_INITDIALOG:
+		Processed = OnInitDialog();
+		break;
+	case WM_COMMAND:
+	{
+		const WORD wID = GET_WM_COMMAND_ID(wp, lp);
+		switch (wID) {
+		case IDOK:
+			Processed = OnOK();
+			//self->DestroyWindow();
+			//SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, lResult)
+			// return TRUE
+			break;
+		case IDCANCEL:
+			Processed = OnCancel();
+			break;
+		}
+
+		if (Processed == FALSE) {
+			Processed = OnCommand(wp, lp);
+		}
+		break;
+	}
+	case WM_NCDESTROY:
+		Processed = PostNcDestroy();
+		break;
+	case WM_CLOSE:
+		// CLOSE\x83{\x83^\x83\x93\x82\xF0\x89\x9F\x82\xB5\x82\xBD\x8E\x9E\x81A
+		Processed = OnClose();
+		if (Processed == FALSE) {
+			//	\x83I\x81[\x83o\x81[\x83\x89\x83C\x83h\x82\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xAF\x82\xEA\x82\xCE
+			//	dialog\x82Ȃ\xE7OnCancel()\x82\xAA\x94\xAD\x90\xB6\x82\xB7\x82\xE9
+			Processed = OnCancel();
+		}
+		break;
+	default:
+		Processed = FALSE;
+		break;
+	}
+
+	if (Processed == TRUE) {
+		// \x8F\x88\x97\x9D\x82\xB5\x82\xBD
+		return TRUE;
+	}
+
+	// \x8DŌ\xE3\x82̃\x81\x83b\x83Z\x81[\x83W\x8F\x88\x97\x9D
+	return DlgProc(msg, wp, lp);
+}
+
+LRESULT TTCDialog::WndProcBase(UINT msg, WPARAM wp, LPARAM lp)
+{
+	BOOL Processed = FALSE;
+	switch (msg) {
+	case WM_INITDIALOG:
+		Processed = OnInitDialog();
+		break;
+	case WM_COMMAND:
+	{
+		const WORD wID = GET_WM_COMMAND_ID(wp, lp);
+		switch (wID) {
+		case IDOK:
+			Processed = OnOK();
+			//self->DestroyWindow();
+			//SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, lResult)
+			// return TRUE
+			break;
+		case IDCANCEL:
+			Processed = OnCancel();
+			break;
+		}
+
+		if (Processed == FALSE) {
+			Processed = OnCommand(wp, lp);
+		}
+		break;
+	}
+	case WM_NCDESTROY:
+		Processed = PostNcDestroy();
+		break;
+	case WM_CLOSE:
+		// CLOSE\x83{\x83^\x83\x93\x82\xF0\x89\x9F\x82\xB5\x82\xBD\x8E\x9E\x81A
+		Processed = OnClose();
+		if (Processed == FALSE) {
+			//	\x83I\x81[\x83o\x81[\x83\x89\x83C\x83h\x82\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xAF\x82\xEA\x82\xCE
+			//	dialog\x82Ȃ\xE7OnCancel()\x82\xAA\x94\xAD\x90\xB6\x82\xB7\x82\xE9
+			Processed = OnCancel();
+		}
+		break;
+	default:
+		Processed = FALSE;
+		break;
+	}
+
+	if (Processed == TRUE) {
+		// \x8F\x88\x97\x9D\x82\xB5\x82\xBD
+		return TRUE;
+	}
+
+	// DlgProc\x82\xF0\x83I\x81[\x83o\x83\x89\x83C\x83h\x82\xB7\x82\xE9\x82̂ł͂Ȃ\xAD\x81A
+	// DefWindowProc\x82\xF0\x83I\x81[\x83o\x81[\x83\x89\x83C\x83h\x82\xB7\x82邱\x82\xC6
+	return DefWindowProc(msg, wp, lp);
+}
+
+/**
+ * for modal dialog
+ */
+INT_PTR TTCDialog::DoModal(HINSTANCE hInstance, HWND hParent, int idd)
+{
+	pseudoPtr = this;
+#if defined(REWRITE_TEMPLATE)
+	INT_PTR result =
+		TTDialogBoxParam(hInstance,
+						 MAKEINTRESOURCE(idd),
+						 hParent,
+						 (DLGPROC)&DlgProcStub, (LPARAM)this);
+#else
+	INT_PTR result =
+		DialogBoxParam(hInstance,
+					   MAKEINTRESOURCE(idd),
+					   hParent,
+					   (DLGPROC)&DlgProcStub, (LPARAM)this);
+#endif
+	pseudoPtr = nullptr;
+	return result;
+}
+
+/**
+ * for modeless dialog
+ */
+BOOL TTCDialog::Create(HINSTANCE hInstance, HWND hParent, int idd)
+{
+	m_hInst = hInstance;
+	m_hParentWnd = hParent;
+#if defined(REWRITE_TEMPLATE)
+	DLGTEMPLATE *lpTemplate = TTGetDlgTemplate(hInstance, MAKEINTRESOURCE(idd));
+#else
+	HRSRC hResource = ::FindResource(hInstance, MAKEINTRESOURCE(idd), RT_DIALOG);
+	HANDLE hDlgTemplate = ::LoadResource(hInstance, hResource);
+	DLGTEMPLATE *lpTemplate = (DLGTEMPLATE *)::LockResource(hDlgTemplate);
+#endif
+	DLGPROC dlgproc = (DLGPROC)DlgProcStub;
+	const wchar_t *dialog_class = TTGetClassName(lpTemplate);
+	if (dialog_class != nullptr) {
+		// Modaless Dialog & Dialog application
+		//  WNDCLASS.lpfnWndProc = TTCDialog::WndProcBase
+		dlgproc = nullptr;
+	}
+	pseudoPtr = this;
+	HWND hWnd = ::CreateDialogIndirectParam(
+		hInstance, lpTemplate, hParent,
+		dlgproc, (LPARAM)this);
+	pseudoPtr = nullptr;
+	if (hWnd == nullptr)
+	{
+#if defined(_DEBUG)
+		DWORD e = GetLastError();
+#endif
+		assert(false);
+		return FALSE;
+	}
+
+	m_hParentWnd = hParent;
+	m_hWnd = hWnd;
+	m_hInst = hInstance;
+//	::EnableWindow(hParent,FALSE);
+//	::ShowWindow(hWnd, SW_SHOW);		// TODO \x8AO\x82ł\xE2\x82\xE9\x82̂\xAA\x97ǂ\xB3\x82\xBB\x82\xA4
+//	::EnableWindow(m_hWnd,TRUE);
+
+	return TRUE;
+}
+
+/*
+ * @retval	TRUE	\x83\x81\x83b\x83Z\x81[\x83W\x82\xF0\x8F\x88\x97\x9D\x82\xB5\x82\xBD\x8E\x9E
+ * @retval	FALSE	\x83\x81\x83b\x83Z\x81[\x83W\x82\xF0\x8F\x88\x97\x9D\x82\xB5\x82Ȃ\xA9\x82\xC1\x82\xBD\x8E\x9E
+ */
+LRESULT CALLBACK TTCDialog::DlgProcStub(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
+{
+	TTCDialog *self = (TTCDialog *)::GetWindowLongPtr(hWnd, DWLP_USER);
+	if (self == nullptr) {
+		self = pseudoPtr;
+		self->m_hWnd = hWnd;
+		if (msg == WM_INITDIALOG) {
+			::SetWindowLongPtr(hWnd, DWLP_USER, (LONG_PTR)self);
+			pseudoPtr = nullptr;
+		}
+	}
+	assert(self != nullptr);
+
+	LRESULT result = self->DlgProcBase(msg, wp, lp);
+	return result;
+}
+
+/*
+ * @retval	TRUE	\x83\x81\x83b\x83Z\x81[\x83W\x82\xF0\x8F\x88\x97\x9D\x82\xB5\x82\xBD\x8E\x9E
+ * @retval	FALSE	\x83\x81\x83b\x83Z\x81[\x83W\x82\xF0\x8F\x88\x97\x9D\x82\xB5\x82Ȃ\xA9\x82\xC1\x82\xBD\x8E\x9E
+ */
+LRESULT CALLBACK TTCDialog::WndProcStub(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
+{
+	TTCDialog *self = (TTCDialog *)::GetWindowLongPtr(hWnd, GWLP_USERDATA);
+	if (self == nullptr) {
+		assert(pseudoPtr != nullptr);
+		self = pseudoPtr;
+		self->m_hWnd = hWnd;
+		if (msg == WM_CREATE) {
+			::SetWindowLongPtr(hWnd, GWLP_USERDATA, (LONG_PTR)self);
+			pseudoPtr = nullptr;
+		}
+	}
+	assert(self != nullptr);
+
+	return self->WndProcBase(msg, wp, lp);
+}
+
+void TTCDialog::DestroyWindow()
+{
+	if (m_hWnd != nullptr) {
+		::EnableWindow(m_hParentWnd,TRUE);
+		::SetFocus(m_hParentWnd);
+		::DestroyWindow(m_hWnd);
+		m_hWnd = nullptr;
+	}
+}
+
+////////////////////////////////////////
+
+// quick hack :-(
+static HINSTANCE ghInstance;
+static class TTCPropertySheet *gTTCPS;
+
+TTCPropertyPage::TTCPropertyPage(HINSTANCE inst, int id, TTCPropertySheet *sheet)
+{
+	memset(&m_psp, 0, sizeof(m_psp));
+	m_psp.dwSize = sizeof(m_psp);
+	m_psp.dwFlags = PSP_DEFAULT;
+	m_psp.hInstance = inst;
+	m_psp.pszTemplate = MAKEINTRESOURCE(id);
+#if defined(REWRITE_TEMPLATE)
+	m_psp.dwFlags |= PSP_DLGINDIRECT;
+	m_psp.pResource = TTGetDlgTemplate(inst, m_psp.pszTemplate);
+#endif
+//	m_psp.pfnDlgProc = (DLGPROC)Proc;
+	m_psp.pfnDlgProc = Proc;
+	m_psp.lParam = (LPARAM)this;
+
+	m_pSheet = sheet;
+}
+
+TTCPropertyPage::~TTCPropertyPage()
+{
+	free((void *)m_psp.pResource);
+}
+
+void TTCPropertyPage::OnInitDialog()
+{
+}
+
+void TTCPropertyPage::OnOK()
+{
+}
+
+BOOL TTCPropertyPage::OnCommand(WPARAM wp, LPARAM lp)
+{
+	return TRUE;
+}
+
+HBRUSH TTCPropertyPage::OnCtlColor(HDC hDC, HWND hWnd)
+{
+	return (HBRUSH)::DefWindowProc(m_hWnd, WM_CTLCOLORSTATIC, (WPARAM)hDC, (LPARAM)hWnd);
+}
+
+UINT CALLBACK TTCPropertyPage::PropSheetPageProc(HWND hwnd, UINT uMsg, LPPROPSHEETPAGE ppsp)
+{
+	return 0;
+}
+
+INT_PTR CALLBACK TTCPropertyPage::Proc(HWND hDlgWnd, UINT msg, WPARAM wp, LPARAM lp)
+{
+	TTCPropertyPage *self = (TTCPropertyPage *)::GetWindowLongPtr(hDlgWnd, DWLP_USER);
+	switch (msg)
+	{
+	case WM_INITDIALOG:
+		self = (TTCPropertyPage *)(((PROPSHEETPAGE *)lp)->lParam);
+		::SetWindowLongPtr(hDlgWnd, DWLP_USER, (LONG_PTR)self);
+		self->m_hWnd = hDlgWnd;
+		self->OnInitDialog();
+		break;
+	case WM_NOTIFY:
+	{
+		NMHDR * nmhdr = (NMHDR *)lp;
+		switch (nmhdr->code)
+		{
+		case PSN_APPLY:
+			self->OnOK();
+			break;
+		default:
+			break;
+		}
+		break;
+	}
+	case WM_COMMAND:
+		self->OnCommand(wp, lp);
+		break;
+	case WM_CTLCOLORSTATIC:
+		return (INT_PTR)self->OnCtlColor((HDC)wp, (HWND)lp);
+	}
+	return FALSE;
+}
+
+////////////////////////////////////////
+
+TTCPropertySheet::TTCPropertySheet(HINSTANCE hInstance, LPCTSTR pszCaption, HWND hParentWnd)
+{
+	m_hInst = hInstance;
+	memset(&m_psh, 0, sizeof(m_psh));
+	m_psh.dwSize = sizeof(m_psh);
+	m_psh.dwFlags = PSH_DEFAULT | PSH_NOAPPLYNOW | PSH_USECALLBACK;	// | PSH_MODELESS
+	if (pszCaption != nullptr) {
+		m_psh.pszCaption = pszCaption;
+		//m_psh.dwFlags |= PSH_PROPTITLE;		// \x81u\x82̃v\x83\x8D\x83p\x83e\x83B\x81[\x81v\x82\xAA\x92lj\xC1\x82\xB3\x82\xEA\x82\xE9?
+	}
+	m_psh.hwndParent = hParentWnd;
+	m_psh.pfnCallback = PropSheetProc;
+}
+
+TTCPropertySheet::~TTCPropertySheet()
+{
+}
+
+INT_PTR TTCPropertySheet::DoModal()
+{
+	ghInstance = m_hInst;
+	gTTCPS = this;
+	return PropertySheet(&m_psh);
+
+	// \x83\x82\x81[\x83_\x83\x8C\x83X\x82ɂ\xB7\x82\xE9\x82ƃ^\x83u\x82̓\xAE\x82\xAB\x82\xAA\x82\xA8\x82\xA9\x82\xB5\x82\xA2
+#if 0
+	// \x83\x82\x81[\x83h\x83\x8C\x83X\x83_\x83C\x83A\x83\x8D\x83O\x83{\x83b\x83N\x83X\x82̏ꍇ\x82̓E\x83B\x83\x93\x83h\x83E\x82̃n\x83\x93\x83h\x83\x8B
+	m_hWnd = (HWND)::PropertySheet(&m_psh);
+//	ShowWindow(m_hWnd, SW_SHOW);
+
+//	::ModifyStyle(m_hWnd, TCS_MULTILINE, TCS_SINGLELINE, 0);
+
+	ModalResult = 0;
+	HWND hDlgWnd = m_hWnd;
+	for(;;) {
+		if (ModalResult != 0) {
+			break;
+		}
+		MSG Msg;
+		BOOL quit = !::GetMessage(&Msg, nullptr, nullptr, nullptr);
+		if (quit) {
+			// QM_QUIT
+			PostQuitMessage(0);
+			return IDCANCEL;
+		}
+		if ((hDlgWnd == Msg.hwnd) ||
+			::SendMessage(hDlgWnd, PSM_ISDIALOGMESSAGE, nullptr, (LPARAM)&Msg))
+		{
+			// \x83_\x83C\x83A\x83\x8D\x83O\x88ȊO\x82̏\x88\x97\x9D
+			::TranslateMessage(&Msg);
+			::DispatchMessage(&Msg);
+		}
+		if (!SendMessage(hDlgWnd, PSM_GETCURRENTPAGEHWND, 0, 0)) {
+			// \x83v\x83\x8D\x83p\x83e\x83B\x81[\x83V\x81[\x83g\x8FI\x97\xB9
+			break;
+		}
+	}
+	return ModalResult;
+#endif
+}
+
+int CALLBACK TTCPropertySheet::PropSheetProc(HWND hWnd, UINT msg, LPARAM lp)
+{
+	switch (msg) {
+	case PSCB_PRECREATE:
+	{
+#if defined(REWRITE_TEMPLATE)
+		// \x83e\x83\x93\x83v\x83\x8C\x81[\x83g\x82̓\xE0\x97e\x82\xF0\x8F\x91\x82\xAB\x8A\xB7\x82\xA6\x82\xE9 \x8A댯
+		// http://home.att.ne.jp/banana/akatsuki/doc/atlwtl/atlwtl15-01/index.html
+		size_t PrevTemplSize;
+		size_t NewTemplSize;
+		DLGTEMPLATE *NewTempl =
+			TTGetNewDlgTemplate(ghInstance, (DLGTEMPLATE *)lp,
+								&PrevTemplSize, &NewTemplSize);
+		NewTempl->style &= ~DS_CONTEXTHELP;		// check DLGTEMPLATEEX
+		memcpy((void *)lp, NewTempl, NewTemplSize);
+		free(NewTempl);
+#endif
+		break;
+	}
+	case PSCB_INITIALIZED:
+	{
+		//TTCPropertySheet *self = (TTCPropertySheet *)lp;
+		TTCPropertySheet *self = gTTCPS;
+		self->m_hWnd = hWnd;
+		self->OnInitDialog();
+		break;
+	}
+	}
+	return 0;
+}
+
+void TTCPropertySheet::OnInitDialog()
+{
+}

Added: trunk/teraterm/common/tmfc.h
===================================================================
--- trunk/teraterm/common/tmfc.h	                        (rev 0)
+++ trunk/teraterm/common/tmfc.h	2019-03-28 16:38:16 UTC (rev 7525)
@@ -0,0 +1,186 @@
+/*
+ * Copyright (C) 2018 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Tera term Micro Framework class
+ */
+#pragma once
+#include <windows.h>
+
+class TTCWnd
+{
+public:
+	HWND m_hWnd;
+	HINSTANCE m_hInst;
+	HACCEL m_hAccel;
+	HWND m_hParentWnd;
+
+	TTCWnd();
+	void DestroyWindow();
+	HWND GetSafeHwnd() const {return m_hWnd;}
+	HWND GetSafeHwnd() { return m_hWnd; }
+	HDC BeginPaint(LPPAINTSTRUCT lpPaint);
+	BOOL EndPaint(LPPAINTSTRUCT lpPaint);
+	LRESULT SendMessage(UINT msg, WPARAM wp, LPARAM lp);
+	void ShowWindow(int nCmdShow);
+	void SetWindowTextT(const TCHAR *str);
+#if defined(UNICODE)
+	void SetWindowTextW(const wchar_t *str);
+#endif
+	void SetWindowTextA(const char *str);
+	LONG_PTR SetWindowLongPtr(int nIndex, LONG_PTR dwNewLong);
+	LONG_PTR GetWindowLongPtr(int nIndex);
+	void ModifyStyle(DWORD dwRemove, DWORD dwAdd, UINT nFlags = 0);
+	void ModifyStyleEx(DWORD dwRemove, DWORD dwAdd, UINT nFlags = 0);
+	int MessageBoxT(LPCTSTR lpText, LPCTSTR lpCaption, UINT uType);
+	int MessageBoxA(const char * lpText, const char *lpCaption, UINT uType);
+#if defined(UNICODE)
+	int MessageBoxW(const wchar_t * lpText, const wchar_t *lpCaption, UINT uType);
+#endif
+	//virtual LRESULT DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam);
+	LRESULT DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam);
+	BOOL GetWindowRect(RECT *R);
+	BOOL SetWindowPos(HWND hWndInsertAfter, int X, int Y, int cx, int cy, UINT uFlags);
+	BOOL GetClientRect(RECT *R);
+	BOOL InvalidateRect(RECT *R, BOOL bErase = TRUE);
+	BOOL EndDialog(int nResult);
+	// for controls
+	HWND GetDlgItem(int id);
+	LRESULT SendDlgItemMessageT(int id, UINT msg, WPARAM wp, LPARAM lp);
+#if defined(UNICODE)
+	LRESULT SendDlgItemMessageW(int id, UINT msg, WPARAM wp, LPARAM lp);
+#endif
+	LRESULT SendDlgItemMessageA(int id, UINT msg, WPARAM wp, LPARAM lp);
+	void GetDlgItemTextT(int id, TCHAR *buf, size_t size);
+#if defined(UNICODE)
+	void GetDlgItemTextW(int id, wchar_t *buf, size_t size);
+#endif
+	void GetDlgItemTextA(int id, char *buf, size_t size);
+	void SetDlgItemTextT(int id, const TCHAR *str);
+#if defined(UNICODE)
+	void SetDlgItemTextW(int id, const wchar_t *str);
+#endif
+	void SetDlgItemTextA(int id, const char *str);
+	void SetDlgItemNum(int id, LONG Num);
+	void SetCheck(int id, int nCheck);
+	UINT GetCheck(int id);
+	void SetCurSel(int id, int no);
+	int GetCurSel(int id);
+	void SetDlgItemInt(int id, UINT val, BOOL bSigned = TRUE);
+	UINT GetDlgItemInt(int id, BOOL* lpTrans = NULL, BOOL bSigned = TRUE) const;
+	void EnableDlgItem(int id, BOOL enable);
+private:
+	void ModifyStyleCom(int nStyleOffset, DWORD dwRemove, DWORD dwAdd, UINT nFlags = 0);
+};
+
+class TTCFrameWnd : public TTCWnd
+{
+public:
+	TTCFrameWnd();
+	virtual ~TTCFrameWnd();
+	static TTCFrameWnd *pseudoPtr;
+	static LRESULT CALLBACK ProcStub(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp);
+	virtual BOOL Create(HINSTANCE hInstance,
+						LPCTSTR lpszClassName,
+						LPCTSTR lpszWindowName,
+						DWORD dwStyle = WS_OVERLAPPEDWINDOW,
+						const RECT& rect = rectDefault,
+						HWND pParentWnd = NULL,        // != NULL for popups
+						LPCTSTR lpszMenuName = NULL,
+						DWORD dwExStyle = 0);//,
+						//CCreateContext* pContext = NULL);
+	virtual LRESULT Proc(UINT msg, WPARAM wp, LPARAM lp) = 0;
+	static const RECT rectDefault;
+	///
+	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
+	///
+#if 1
+	void OnKillFocus(HWND hNewWnd);
+	void OnDestroy();
+	void OnSetFocus(HWND hOldWnd);
+	void OnSysCommand(UINT nID, LPARAM lParam);
+	void OnClose();
+#endif
+	void OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
+	void OnSysKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags);
+};
+
+class TTCDialog : public TTCWnd
+{
+public:
+	TTCDialog();
+	virtual ~TTCDialog();
+	BOOL Create(HINSTANCE hInstance, HWND hParent, int idd);
+	INT_PTR DoModal(HINSTANCE hInstance, HWND hParent, int idd);
+	void DestroyWindow();
+	virtual BOOL OnInitDialog();
+	virtual	BOOL OnOK();
+	virtual BOOL OnCancel();
+	virtual BOOL OnCommand(WPARAM wp, LPARAM lp);
+	virtual BOOL OnClose();
+	virtual BOOL PostNcDestroy();
+	virtual LRESULT DlgProc(UINT msg, WPARAM wp, LPARAM lp);
+
+	static LRESULT CALLBACK DlgProcStub(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp);
+	static LRESULT CALLBACK WndProcStub(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp);
+private:
+
+	LRESULT DlgProcBase(UINT msg, WPARAM wp, LPARAM lp);
+	LRESULT WndProcBase(UINT msg, WPARAM wp, LPARAM lp);
+	static TTCDialog *pseudoPtr;
+};
+
+class TTCPropertySheet
+{
+public:
+	TTCPropertySheet(HINSTANCE hInstance, LPCTSTR pszCaption, HWND hParentWnd);
+	virtual ~TTCPropertySheet();
+	virtual void OnInitDialog();
+	INT_PTR DoModal();
+	PROPSHEETHEADER m_psh;
+	HWND m_hWnd;
+	static int CALLBACK PropSheetProc(HWND hWnd, UINT msg, LPARAM lParam);
+	HINSTANCE m_hInst;
+};
+
+class TTCPropertyPage : public TTCWnd
+{
+public:
+	TTCPropertyPage(HINSTANCE inst, int id, TTCPropertySheet *sheet);
+	virtual ~TTCPropertyPage();
+	virtual void OnInitDialog();
+	virtual void OnOK();
+	virtual BOOL OnCommand(WPARAM wp, LPARAM lp);
+	virtual HBRUSH OnCtlColor(HDC hDC, HWND hWnd);
+
+	PROPSHEETPAGE m_psp;
+	static INT_PTR CALLBACK Proc(HWND hDlgWnd, UINT msg, WPARAM wp, LPARAM lp);
+	static UINT CALLBACK PropSheetPageProc(HWND hwnd, UINT uMsg, LPPROPSHEETPAGE ppsp);
+	TTCPropertySheet *m_pSheet;
+};
+

Added: trunk/teraterm/common/tmfc_frame.cpp
===================================================================
--- trunk/teraterm/common/tmfc_frame.cpp	                        (rev 0)
+++ trunk/teraterm/common/tmfc_frame.cpp	2019-03-28 16:38:16 UTC (rev 7525)
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2018 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Tera term Micro Framework class
+ */
+#include "tmfc.h"
+#include "ttlib.h"
+
+#if (defined(_MSC_VER) && (_MSC_VER <= 1500)) || \
+	(__cplusplus <= 199711L)
+#define nullptr NULL	// C++11,nullptr / > VS2010
+#endif
+
+const RECT TTCFrameWnd::rectDefault =
+{
+	CW_USEDEFAULT, CW_USEDEFAULT,
+//	2*CW_USEDEFAULT, 2*CW_USEDEFAULTg
+	0, 0
+};
+
+TTCFrameWnd::TTCFrameWnd()
+{
+}
+
+TTCFrameWnd::~TTCFrameWnd()
+{
+}
+
+BOOL TTCFrameWnd::Create(
+	HINSTANCE hInstance,
+	LPCTSTR lpszClassName,
+	LPCTSTR lpszWindowName,
+	DWORD dwStyle,
+	const RECT& rect,
+	HWND hParentWnd,
+	LPCTSTR lpszMenuName,
+	DWORD dwExStyle)
+{
+	m_hInst = hInstance;
+	m_hParentWnd = hParentWnd;
+	pseudoPtr = this;
+	HWND hWnd = ::CreateWindowEx(
+		0,
+		lpszClassName,
+		lpszWindowName,
+		dwStyle,
+		rect.left, rect.top,
+		rect.right - rect.left, rect.bottom - rect.top,
+		hParentWnd,
+		nullptr,
+		hInstance,
+		nullptr);
+	pseudoPtr = nullptr;
+	if (hWnd == nullptr) {
+		OutputDebugPrintf("CreateWindow %d\n", GetLastError());
+		return FALSE;
+	} else {
+		m_hWnd = hWnd;
+		SetWindowLongPtr(GWLP_USERDATA, (LONG_PTR)this);
+		return TRUE;
+	}
+}
+
+TTCFrameWnd *TTCFrameWnd::pseudoPtr;
+
+LRESULT TTCFrameWnd::ProcStub(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
+{
+	TTCFrameWnd *self;
+	if (pseudoPtr != nullptr) {
+		self = pseudoPtr;
+		self->m_hWnd = hWnd;
+	} else {
+		self = (TTCFrameWnd *)::GetWindowLongPtr(hWnd, GWLP_USERDATA);
+	}
+	return self->Proc(msg, wp, lp);
+}
+
+BOOL TTCFrameWnd::OnCommand(WPARAM wParam, LPARAM lParam)
+{
+	return FALSE;
+}
+
+void TTCFrameWnd::OnKillFocus(HWND hNewWnd)
+{}
+
+void TTCFrameWnd::OnDestroy()
+{}
+
+void TTCFrameWnd::OnSetFocus(HWND hOldWnd)
+{}
+
+void TTCFrameWnd::OnSysCommand(UINT nID, LPARAM lParam)
+{}
+
+void TTCFrameWnd::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
+{
+	DefWindowProc(WM_SYSKEYDOWN, (WPARAM)nChar, MAKELONG(nRepCnt, nFlags));
+}
+
+void TTCFrameWnd::OnSysKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags)
+{
+	DefWindowProc(WM_SYSKEYUP, (WPARAM)nChar, MAKELONG(nRepCnt, nFlags));
+}
+
+void TTCFrameWnd::OnClose()
+{}

Modified: trunk/teraterm/teraterm/CMakeLists.txt
===================================================================
--- trunk/teraterm/teraterm/CMakeLists.txt	2019-03-28 16:09:45 UTC (rev 7524)
+++ trunk/teraterm/teraterm/CMakeLists.txt	2019-03-28 16:38:16 UTC (rev 7525)
@@ -34,6 +34,9 @@
   ../common/compat_w95.h
   ../common/compat_win.h
   ../common/compat_win.cpp
+  ../common/tmfc.cpp
+  ../common/tmfc.h
+  ../common/tmfc_frame.cpp
   ../common/i18n.h
   ../common/dllutil.cpp
   ../common/dllutil.h

Modified: trunk/teraterm/teraterm/addsetting.cpp
===================================================================
--- trunk/teraterm/teraterm/addsetting.cpp	2019-03-28 16:09:45 UTC (rev 7524)
+++ trunk/teraterm/teraterm/addsetting.cpp	2019-03-28 16:38:16 UTC (rev 7525)
@@ -30,19 +30,28 @@
  * Additional settings dialog
  */
 
-#include <afxwin.h>
-#include <afxdlgs.h>
-#include <afxcmn.h>
+#include <stdio.h>
+#include <tchar.h>
+#include <windows.h>
 #include <commctrl.h>
+#include <time.h>
+#include <tchar.h>
 
 #include "addsetting.h"
 #include "teraterm.h"
 #include "tttypes.h"
-#include "ttwinman.h"
+#include "ttwinman.h"	// for ts
 #include "ttcommon.h"
 #include "ttftypes.h"
+#include "dlglib.h"
+#include "compat_win.h"
 
-mouse_cursor_t MouseCursor[] = {
+#undef GetDlgItemText
+#define GetDlgItemText GetDlgItemTextA
+#undef SetDlgItemText
+#define SetDlgItemText SetDlgItemTextA
+
+const mouse_cursor_t MouseCursor[] = {
 	{"ARROW", IDC_ARROW},
 	{"IBEAM", IDC_IBEAM},
 	{"CROSS", IDC_CROSS},
@@ -51,475 +60,275 @@
 };
 #define MOUSE_CURSOR_MAX (sizeof(MouseCursor)/sizeof(MouseCursor[0]) - 1)
 
-// \x96{\x91̂\xCD vtwin.cpp
-extern void SetWindowStyle(TTTSet *ts);
-
-
-static void SetupRGBbox(HWND hDlgWnd, int index)
+void CVisualPropPageDlg::SetupRGBbox(int index)
 {
-	HWND hWnd;
 	BYTE c;
-	char buf[10];
 
-	hWnd = GetDlgItem(hDlgWnd, IDC_COLOR_RED);
 	c = GetRValue(ts.ANSIColor[index]);
-	_snprintf_s(buf, sizeof(buf), _TRUNCATE, "%d", c);
-	SendMessage(hWnd, WM_SETTEXT , 0, (LPARAM)buf);
+	SetDlgItemNum(IDC_COLOR_RED, c);
 
-	hWnd = GetDlgItem(hDlgWnd, IDC_COLOR_GREEN);
 	c = GetGValue(ts.ANSIColor[index]);
-	_snprintf_s(buf, sizeof(buf), _TRUNCATE, "%d", c);
-	SendMessage(hWnd, WM_SETTEXT , 0, (LPARAM)buf);
+	SetDlgItemNum(IDC_COLOR_GREEN, c);
 
-	hWnd = GetDlgItem(hDlgWnd, IDC_COLOR_BLUE);
 	c = GetBValue(ts.ANSIColor[index]);
-	_snprintf_s(buf, sizeof(buf), _TRUNCATE, "%d", c);
-	SendMessage(hWnd, WM_SETTEXT , 0, (LPARAM)buf);
+	SetDlgItemNum(IDC_COLOR_BLUE, c);
 }
 
-
-
 // CGeneralPropPageDlg \x83_\x83C\x83A\x83\x8D\x83O
 
-IMPLEMENT_DYNAMIC(CGeneralPropPageDlg, CPropertyPage)
-
-CGeneralPropPageDlg::CGeneralPropPageDlg()
-	: CPropertyPage(CGeneralPropPageDlg::IDD)
+CGeneralPropPageDlg::CGeneralPropPageDlg(HINSTANCE inst, TTCPropertySheet *sheet)
+	: TTCPropertyPage(inst, CGeneralPropPageDlg::IDD, sheet)
 {
+	TCHAR UIMsg[MAX_UIMSG];
+	get_lang_msgT("DLG_TABSHEET_TITLE_GENERAL", UIMsg, _countof(UIMsg),
+	             _T("General"), ts.UILanguageFile);
+	m_psp.pszTitle = _tcsdup(UIMsg);
+	m_psp.dwFlags |= PSP_USETITLE;
 }
 
 CGeneralPropPageDlg::~CGeneralPropPageDlg()
 {
-	if (DlgGeneralFont != NULL) {
-		DeleteObject(DlgGeneralFont);
-	}
+	free((void *)m_psp.pszTitle);
 }
 
-BEGIN_MESSAGE_MAP(CGeneralPropPageDlg, CPropertyPage)
-END_MESSAGE_MAP()
-
 // CGeneralPropPageDlg \x83\x81\x83b\x83Z\x81[\x83W \x83n\x83\x93\x83h\x83\x89
 
-BOOL CGeneralPropPageDlg::OnInitDialog()
+void CGeneralPropPageDlg::OnInitDialog()
 {
-	char uimsg[MAX_UIMSG];
-	char buf[64];
-	CButton *btn;
+	TTCPropertyPage::OnInitDialog();
 
-	CPropertyPage::OnInitDialog();
+	static const DlgTextInfo TextInfos[] = {
+		{ IDC_CLICKABLE_URL, "DLG_TAB_GENERAL_CLICKURL" },
+		{ IDC_DISABLE_SENDBREAK, "DLG_TAB_GENERAL_DISABLESENDBREAK" },
+		{ IDC_ACCEPT_BROADCAST, "DLG_TAB_GENERAL_ACCEPTBROADCAST" },
+		{ IDC_MOUSEWHEEL_SCROLL_LINE, "DLG_TAB_GENERAL_MOUSEWHEEL_SCROLL_LINE" },
+		{ IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE, "DLG_TAB_GENERAL_AUTOSCROLL_ONLY_IN_BOTTOM_LINE" },
+		{ IDC_CLEAR_ON_RESIZE, "DLG_TAB_GENERAL_CLEAR_ON_RESIZE" },
+		{ IDC_CURSOR_CHANGE_IME, "DLG_TAB_GENERAL_CURSOR_CHANGE_IME" },
+		{ IDC_LIST_HIDDEN_FONTS, "DLG_TAB_GENERAL_LIST_HIDDEN_FONTS" },
+		{ IDC_TITLEFMT_GROUP, "DLG_TAB_GENERAL_TITLEFMT_GROUP" },
+		{ IDC_TITLEFMT_DISPHOSTNAME, "DLG_TAB_GENERAL_TITLEFMT_DISPHOSTNAME" },
+		{ IDC_TITLEFMT_DISPSESSION, "DLG_TAB_GENERAL_TITLEFMT_DISPSESSION" },
+		{ IDC_TITLEFMT_DISPVTTEK, "DLG_TAB_GENERAL_TITLEFMT_DISPVTTEK" },
+		{ IDC_TITLEFMT_SWAPHOSTTITLE, "DLG_TAB_GENERAL_TITLEFMT_SWAPHOSTTITLE" },
+		{ IDC_TITLEFMT_DISPTCPPORT, "DLG_TAB_GENERAL_TITLEFMT_DISPTCPPORT" },
+		{ IDC_TITLEFMT_DISPSERIALSPEED, "DLG_TAB_GENERAL_TITLEFMT_DISPSERIALSPEED" }
+	};
+	SetDlgTexts(m_hWnd, TextInfos, _countof(TextInfos), ts.UILanguageFile);
 
-	font = (HFONT)SendMessage(WM_GETFONT, 0, 0);
-	GetObject(font, sizeof(LOGFONT), &logfont);
-	if (get_lang_font("DLG_TAHOMA_FONT", GetSafeHwnd(), &logfont, &DlgGeneralFont, ts.UILanguageFile)) {
-		SendDlgItemMessage(IDC_CLICKABLE_URL, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_DISABLE_SENDBREAK, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_ACCEPT_BROADCAST, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0)); // 337: 2007/03/20
-		SendDlgItemMessage(IDC_MOUSEWHEEL_SCROLL_LINE, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_SCROLL_LINE, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_CLEAR_ON_RESIZE, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_CURSOR_CHANGE_IME, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_LIST_HIDDEN_FONTS, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_TITLEFMT_GROUP, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_TITLEFMT_DISPHOSTNAME, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_TITLEFMT_DISPSESSION, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_TITLEFMT_DISPVTTEK, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_TITLEFMT_SWAPHOSTTITLE, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_TITLEFMT_DISPTCPPORT, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_TITLEFMT_DISPSERIALSPEED, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
-	}
-	else {
-		DlgGeneralFont = NULL;
-	}
-
-	GetDlgItemText(IDC_CLICKABLE_URL, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_GENERAL_CLICKURL", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_CLICKABLE_URL, ts.UIMsg);
-	GetDlgItemText(IDC_DISABLE_SENDBREAK, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_GENERAL_DISABLESENDBREAK", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_DISABLE_SENDBREAK, ts.UIMsg);
-	GetDlgItemText(IDC_ACCEPT_BROADCAST, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_GENERAL_ACCEPTBROADCAST", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_ACCEPT_BROADCAST, ts.UIMsg);
-	GetDlgItemText(IDC_MOUSEWHEEL_SCROLL_LINE, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_GENERAL_MOUSEWHEEL_SCROLL_LINE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_MOUSEWHEEL_SCROLL_LINE, ts.UIMsg);
-	GetDlgItemText(IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_GENERAL_AUTOSCROLL_ONLY_IN_BOTTOM_LINE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE, ts.UIMsg);
-	GetDlgItemText(IDC_CLEAR_ON_RESIZE, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_GENERAL_CLEAR_ON_RESIZE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_CLEAR_ON_RESIZE, ts.UIMsg);
-	GetDlgItemText(IDC_CURSOR_CHANGE_IME, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_GENERAL_CURSOR_CHANGE_IME", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_CURSOR_CHANGE_IME, ts.UIMsg);
-	GetDlgItemText(IDC_LIST_HIDDEN_FONTS, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_GENERAL_LIST_HIDDEN_FONTS", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_LIST_HIDDEN_FONTS, ts.UIMsg);
-
-	GetDlgItemText(IDC_TITLEFMT_GROUP, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_GENERAL_TITLEFMT_GROUP", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_TITLEFMT_GROUP, ts.UIMsg);
-	GetDlgItemText(IDC_TITLEFMT_DISPHOSTNAME, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_GENERAL_TITLEFMT_DISPHOSTNAME", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_TITLEFMT_DISPHOSTNAME, ts.UIMsg);
-	GetDlgItemText(IDC_TITLEFMT_DISPSESSION, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_GENERAL_TITLEFMT_DISPSESSION", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_TITLEFMT_DISPSESSION, ts.UIMsg);
-	GetDlgItemText(IDC_TITLEFMT_DISPVTTEK, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_GENERAL_TITLEFMT_DISPVTTEK", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_TITLEFMT_DISPVTTEK, ts.UIMsg);
-	GetDlgItemText(IDC_TITLEFMT_SWAPHOSTTITLE, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_GENERAL_TITLEFMT_SWAPHOSTTITLE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_TITLEFMT_SWAPHOSTTITLE, ts.UIMsg);
-	GetDlgItemText(IDC_TITLEFMT_DISPTCPPORT, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_GENERAL_TITLEFMT_DISPTCPPORT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_TITLEFMT_DISPTCPPORT, ts.UIMsg);
-	GetDlgItemText(IDC_TITLEFMT_DISPSERIALSPEED, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_GENERAL_TITLEFMT_DISPSERIALSPEED", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_TITLEFMT_DISPSERIALSPEED, ts.UIMsg);
-
 	// (1)DisableAcceleratorSendBreak
-	btn = (CButton *)GetDlgItem(IDC_DISABLE_SENDBREAK);
-	btn->SetCheck(ts.DisableAcceleratorSendBreak);
+	SetCheck(IDC_DISABLE_SENDBREAK, ts.DisableAcceleratorSendBreak);
 
 	// (2)EnableClickableUrl
-	btn = (CButton *)GetDlgItem(IDC_CLICKABLE_URL);
-	btn->SetCheck(ts.EnableClickableUrl);
+	SetCheck(IDC_CLICKABLE_URL, ts.EnableClickableUrl);
 
 	// (3)AcceptBroadcast 337: 2007/03/20
-	btn = (CButton *)GetDlgItem(IDC_ACCEPT_BROADCAST);
-	btn->SetCheck(ts.AcceptBroadcast);
+	SetCheck(IDC_ACCEPT_BROADCAST, ts.AcceptBroadcast);
 
 	// (4)IDC_MOUSEWHEEL_SCROLL_LINE
-	_snprintf_s(buf, sizeof(buf), "%d", ts.MouseWheelScrollLine);
-	SetDlgItemText(IDC_SCROLL_LINE, buf);
+	SetDlgItemNum(IDC_SCROLL_LINE, ts.MouseWheelScrollLine);
 
 	// (5)IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE
-	btn = (CButton *)GetDlgItem(IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE);
-	btn->SetCheck(ts.AutoScrollOnlyInBottomLine);
+	SetCheck(IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE, ts.AutoScrollOnlyInBottomLine);
 
 	// (6)IDC_CLEAR_ON_RESIZE
-	btn = (CButton *)GetDlgItem(IDC_CLEAR_ON_RESIZE);
-	btn->SetCheck((ts.TermFlag & TF_CLEARONRESIZE) != 0);
+	SetCheck(IDC_CLEAR_ON_RESIZE, (ts.TermFlag & TF_CLEARONRESIZE) != 0);
 
 	// (7)IDC_CURSOR_CHANGE_IME
-	btn = (CButton *)GetDlgItem(IDC_CURSOR_CHANGE_IME);
-	btn->SetCheck((ts.WindowFlag & WF_IMECURSORCHANGE) != 0);
+	SetCheck(IDC_CURSOR_CHANGE_IME, (ts.WindowFlag & WF_IMECURSORCHANGE) != 0);
 
 	// (8)IDC_LIST_HIDDEN_FONTS
-	btn = (CButton *)GetDlgItem(IDC_LIST_HIDDEN_FONTS);
-	btn->SetCheck(ts.ListHiddenFonts);
+	SetCheck(IDC_LIST_HIDDEN_FONTS, ts.ListHiddenFonts);
 
 	// (9) Title Format
-	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_DISPHOSTNAME);
-	btn->SetCheck((ts.TitleFormat & 1) != 0);
+	SetCheck(IDC_TITLEFMT_DISPHOSTNAME, (ts.TitleFormat & 1) != 0);
+	SetCheck(IDC_TITLEFMT_DISPSESSION, (ts.TitleFormat & (1<<1)) != 0);
+	SetCheck(IDC_TITLEFMT_DISPVTTEK, (ts.TitleFormat & (1<<2)) != 0);
+	SetCheck(IDC_TITLEFMT_SWAPHOSTTITLE, (ts.TitleFormat & (1<<3)) != 0);
+	SetCheck(IDC_TITLEFMT_DISPTCPPORT, (ts.TitleFormat & (1<<4)) != 0);
+	SetCheck(IDC_TITLEFMT_DISPSERIALSPEED, (ts.TitleFormat & (1<<5)) != 0);
 
-	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_DISPSESSION);
-	btn->SetCheck((ts.TitleFormat & (1<<1)) != 0);
-
-	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_DISPVTTEK);
-	btn->SetCheck((ts.TitleFormat & (1<<2)) != 0);
-
-	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_SWAPHOSTTITLE);
-	btn->SetCheck((ts.TitleFormat & (1<<3)) != 0);
-
-	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_DISPTCPPORT);
-	btn->SetCheck((ts.TitleFormat & (1<<4)) != 0);
-
-	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_DISPSERIALSPEED);
-	btn->SetCheck((ts.TitleFormat & (1<<5)) != 0);
-
 	// \x83_\x83C\x83A\x83\x8D\x83O\x82Ƀt\x83H\x81[\x83J\x83X\x82𓖂Ă\xE9 (2004.12.7 yutaka)
 	::SetFocus(::GetDlgItem(GetSafeHwnd(), IDC_CLICKABLE_URL));
-
-	return FALSE;
 }
 
 void CGeneralPropPageDlg::OnOK()
 {
-	CButton *btn;
-	char buf[64];
+	TCHAR buf[64];
 	int val;
 
 	// (1)
-	btn = (CButton *)GetDlgItem(IDC_DISABLE_SENDBREAK);
-	ts.DisableAcceleratorSendBreak = btn->GetCheck();
+	ts.DisableAcceleratorSendBreak = GetCheck(IDC_DISABLE_SENDBREAK);
 
 	// (2)
-	btn = (CButton *)GetDlgItem(IDC_CLICKABLE_URL);
-	ts.EnableClickableUrl = btn->GetCheck();
+	ts.EnableClickableUrl = GetCheck(IDC_CLICKABLE_URL);
 
 	// (3) 337: 2007/03/20
-	btn = (CButton *)GetDlgItem(IDC_ACCEPT_BROADCAST);
-	ts.AcceptBroadcast = btn->GetCheck();
+	ts.AcceptBroadcast = GetCheck(IDC_ACCEPT_BROADCAST);
 
 	// (4)IDC_MOUSEWHEEL_SCROLL_LINE
-	GetDlgItemText(IDC_SCROLL_LINE, buf, sizeof(buf));
-	val = atoi(buf);
+	GetDlgItemTextT(IDC_SCROLL_LINE, buf, _countof(buf));
+	val = _tstoi(buf);
 	if (val > 0)
 		ts.MouseWheelScrollLine = val;
 
 	// (5)IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE
-	btn = (CButton *)GetDlgItem(IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE);
-	ts.AutoScrollOnlyInBottomLine = btn->GetCheck();
+	ts.AutoScrollOnlyInBottomLine = GetCheck(IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE);
 
 	// (6)IDC_CLEAR_ON_RESIZE
-	btn = (CButton *)GetDlgItem(IDC_CLEAR_ON_RESIZE);
-	if (((ts.TermFlag & TF_CLEARONRESIZE) != 0) != btn->GetCheck()) {
+	if (((ts.TermFlag & TF_CLEARONRESIZE) != 0) != GetCheck(IDC_CLEAR_ON_RESIZE)) {
 		ts.TermFlag ^= TF_CLEARONRESIZE;
 	}
 
 	// (7)IDC_CURSOR_CHANGE_IME
-	btn = (CButton *)GetDlgItem(IDC_CURSOR_CHANGE_IME);
-	if (((ts.WindowFlag & WF_IMECURSORCHANGE) != 0) != btn->GetCheck()) {
+	if (((ts.WindowFlag & WF_IMECURSORCHANGE) != 0) != GetCheck(IDC_CURSOR_CHANGE_IME)) {
 		ts.WindowFlag ^= WF_IMECURSORCHANGE;
 	}
 
 	// (8)IDC_LIST_HIDDEN_FONTS
-	btn = (CButton *)GetDlgItem(IDC_LIST_HIDDEN_FONTS);
-	ts.ListHiddenFonts = btn->GetCheck();
+	ts.ListHiddenFonts = GetCheck(IDC_LIST_HIDDEN_FONTS);
 
 	// (9) Title Format
-	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_DISPHOSTNAME);
-	ts.TitleFormat = (btn->GetCheck() == BST_CHECKED);
-	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_DISPSESSION);
-	ts.TitleFormat |= ((btn->GetCheck() == BST_CHECKED) << 1);
-	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_DISPVTTEK);
-	ts.TitleFormat |= ((btn->GetCheck() == BST_CHECKED) << 2);
-	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_SWAPHOSTTITLE);
-	ts.TitleFormat |= ((btn->GetCheck() == BST_CHECKED) << 3);
-	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_DISPTCPPORT);
-	ts.TitleFormat |= ((btn->GetCheck() == BST_CHECKED) << 4);
-	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_DISPSERIALSPEED);
-	ts.TitleFormat |= ((btn->GetCheck() == BST_CHECKED) << 5);
+	ts.TitleFormat = GetCheck(IDC_TITLEFMT_DISPHOSTNAME) == BST_CHECKED;
+	ts.TitleFormat |= (GetCheck(IDC_TITLEFMT_DISPSESSION) == BST_CHECKED) << 1;
+	ts.TitleFormat |= (GetCheck(IDC_TITLEFMT_DISPVTTEK) == BST_CHECKED) << 2;
+	ts.TitleFormat |= (GetCheck(IDC_TITLEFMT_SWAPHOSTTITLE) == BST_CHECKED) << 3;
+	ts.TitleFormat |= (GetCheck(IDC_TITLEFMT_DISPTCPPORT) == BST_CHECKED) << 4;
+	ts.TitleFormat |= (GetCheck(IDC_TITLEFMT_DISPSERIALSPEED) == BST_CHECKED) << 5;
 }
 
-
-
 // CSequencePropPageDlg \x83_\x83C\x83A\x83\x8D\x83O
 
-IMPLEMENT_DYNAMIC(CSequencePropPageDlg, CPropertyPage)
-
-CSequencePropPageDlg::CSequencePropPageDlg()
-	: CPropertyPage(CSequencePropPageDlg::IDD)
+CSequencePropPageDlg::CSequencePropPageDlg(HINSTANCE inst, TTCPropertySheet *sheet)
+	: TTCPropertyPage(inst, CSequencePropPageDlg::IDD, sheet)
 {
+	TCHAR UIMsg[MAX_UIMSG];
+	get_lang_msgT("DLG_TABSHEET_TITLE_SEQUENCE", UIMsg, _countof(UIMsg),
+	             _T("Control Sequence"), ts.UILanguageFile);
+	m_psp.pszTitle = _tcsdup(UIMsg);
+	m_psp.dwFlags |= PSP_USETITLE;
 }
 
 CSequencePropPageDlg::~CSequencePropPageDlg()
 {
-	if (DlgSequenceFont != NULL) {
-		DeleteObject(DlgSequenceFont);
-	}
+	free((void *)m_psp.pszTitle);
 }
 
-BEGIN_MESSAGE_MAP(CSequencePropPageDlg, CPropertyPage)
-END_MESSAGE_MAP()
-
 // CSequencePropPageDlg \x83\x81\x83b\x83Z\x81[\x83W \x83n\x83\x93\x83h\x83\x89
 
-BOOL CSequencePropPageDlg::OnInitDialog()
+void CSequencePropPageDlg::OnInitDialog()
 {
-	char uimsg[MAX_UIMSG];
-	CButton *btn, *btn2;
-	CComboBox *cmb;
+	TTCPropertyPage::OnInitDialog();
 
-	CPropertyPage::OnInitDialog();
+	static const DlgTextInfo TextInfos[] = {
+		{ IDC_ACCEPT_MOUSE_EVENT_TRACKING, "DLG_TAB_SEQUENCE_ACCEPT_MOUSE_EVENT_TRACKING" },
+		{ IDC_DISABLE_MOUSE_TRACKING_CTRL, "DLG_TAB_SEQUENCE_DISABLE_MOUSE_TRACKING_CTRL" },
+		{ IDC_ACCEPT_TITLE_CHANGING_LABEL, "DLG_TAB_SEQUENCE_ACCEPT_TITLE_CHANGING" },
 
-	font = (HFONT)SendMessage(WM_GETFONT, 0, 0);
-	GetObject(font, sizeof(LOGFONT), &logfont);
-	if (get_lang_font("DLG_TAHOMA_FONT", GetSafeHwnd(), &logfont, &DlgSequenceFont, ts.UILanguageFile)) {
-		SendDlgItemMessage(IDC_ACCEPT_MOUSE_EVENT_TRACKING, WM_SETFONT, (WPARAM)DlgSequenceFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_DISABLE_MOUSE_TRACKING_CTRL, WM_SETFONT, (WPARAM)DlgSequenceFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING_LABEL, WM_SETFONT, (WPARAM)DlgSequenceFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, WM_SETFONT, (WPARAM)DlgSequenceFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_TITLE_REPORT_LABEL, WM_SETFONT, (WPARAM)DlgSequenceFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_TITLE_REPORT, WM_SETFONT, (WPARAM)DlgSequenceFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_WINDOW_CTRL, WM_SETFONT, (WPARAM)DlgSequenceFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_WINDOW_REPORT, WM_SETFONT, (WPARAM)DlgSequenceFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_CURSOR_CTRL_SEQ, WM_SETFONT, (WPARAM)DlgSequenceFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_CLIPBOARD_ACCESS_LABEL, WM_SETFONT, (WPARAM)DlgSequenceFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_CLIPBOARD_ACCESS, WM_SETFONT, (WPARAM)DlgSequenceFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_CLIPBOARD_NOTIFY, WM_SETFONT, (WPARAM)DlgSequenceFont, MAKELPARAM(TRUE,0));
-	}
-	else {
-		DlgSequenceFont = NULL;
-	}
+		{ IDC_CURSOR_CTRL_SEQ, "DLG_TAB_SEQUENCE_CURSOR_CTRL" },
+		{ IDC_WINDOW_CTRL, "DLG_TAB_SEQUENCE_WINDOW_CTRL" },
+		{ IDC_WINDOW_REPORT, "DLG_TAB_SEQUENCE_WINDOW_REPORT" },
+		{ IDC_TITLE_REPORT_LABEL, "DLG_TAB_SEQUENCE_TITLE_REPORT" },
 
-	GetDlgItemText(IDC_ACCEPT_MOUSE_EVENT_TRACKING, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_SEQUENCE_ACCEPT_MOUSE_EVENT_TRACKING", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_ACCEPT_MOUSE_EVENT_TRACKING, ts.UIMsg);
-	GetDlgItemText(IDC_DISABLE_MOUSE_TRACKING_CTRL, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_SEQUENCE_DISABLE_MOUSE_TRACKING_CTRL", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_DISABLE_MOUSE_TRACKING_CTRL, ts.UIMsg);
-	GetDlgItemText(IDC_ACCEPT_TITLE_CHANGING_LABEL, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_SEQUENCE_ACCEPT_TITLE_CHANGING", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_ACCEPT_TITLE_CHANGING_LABEL, ts.UIMsg);
+		{ IDC_CLIPBOARD_ACCESS_LABEL, "DLG_TAB_SEQUENCE_CLIPBOARD_ACCESS" },
 
-	get_lang_msg("DLG_TAB_SEQUENCE_ACCEPT_TITLE_CHANGING_OFF", ts.UIMsg, sizeof(ts.UIMsg), "off", ts.UILanguageFile);
-	SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
-	get_lang_msg("DLG_TAB_SEQUENCE_ACCEPT_TITLE_CHANGING_OVERWRITE", ts.UIMsg, sizeof(ts.UIMsg), "overwrite", ts.UILanguageFile);
-	SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
-	get_lang_msg("DLG_TAB_SEQUENCE_ACCEPT_TITLE_CHANGING_AHEAD", ts.UIMsg, sizeof(ts.UIMsg), "ahead", ts.UILanguageFile);
-	SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
-	get_lang_msg("DLG_TAB_SEQUENCE_ACCEPT_TITLE_CHANGING_LAST", ts.UIMsg, sizeof(ts.UIMsg), "last", ts.UILanguageFile);
-	SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
+		{ IDC_CLIPBOARD_NOTIFY, "DLG_TAB_SEQUENCE_CLIPBOARD_NOTIFY" },
+	};
+	SetDlgTexts(m_hWnd, TextInfos, _countof(TextInfos), ts.UILanguageFile);
 
-	GetDlgItemText(IDC_CURSOR_CTRL_SEQ, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_SEQUENCE_CURSOR_CTRL", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_CURSOR_CTRL_SEQ, ts.UIMsg);
-	GetDlgItemText(IDC_WINDOW_CTRL, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_SEQUENCE_WINDOW_CTRL", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_WINDOW_CTRL, ts.UIMsg);
-	GetDlgItemText(IDC_WINDOW_REPORT, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_SEQUENCE_WINDOW_REPORT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_WINDOW_REPORT, ts.UIMsg);
-	GetDlgItemText(IDC_TITLE_REPORT_LABEL, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_SEQUENCE_TITLE_REPORT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_TITLE_REPORT_LABEL, ts.UIMsg);
+	TCHAR uimsg[MAX_UIMSG];
+	get_lang_msgT("DLG_TAB_SEQUENCE_ACCEPT_TITLE_CHANGING_OFF", uimsg, _countof(uimsg), _T("off"), ts.UILanguageFile);
+	SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)uimsg);
+	get_lang_msgT("DLG_TAB_SEQUENCE_ACCEPT_TITLE_CHANGING_OVERWRITE", uimsg, _countof(uimsg), _T("overwrite"), ts.UILanguageFile);
+	SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)uimsg);
+	get_lang_msgT("DLG_TAB_SEQUENCE_ACCEPT_TITLE_CHANGING_AHEAD", uimsg, _countof(uimsg), _T("ahead"), ts.UILanguageFile);
+	SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)uimsg);
+	get_lang_msgT("DLG_TAB_SEQUENCE_ACCEPT_TITLE_CHANGING_LAST", uimsg, _countof(uimsg), _T("last"), ts.UILanguageFile);
+	SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)uimsg);
 
-	get_lang_msg("DLG_TAB_SEQUENCE_TITLE_REPORT_IGNORE", ts.UIMsg, sizeof(ts.UIMsg), "ignore", ts.UILanguageFile);
-	SendDlgItemMessage(IDC_TITLE_REPORT, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
-	get_lang_msg("DLG_TAB_SEQUENCE_TITLE_REPORT_ACCEPT", ts.UIMsg, sizeof(ts.UIMsg), "accept", ts.UILanguageFile);
-	SendDlgItemMessage(IDC_TITLE_REPORT, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
-	get_lang_msg("DLG_TAB_SEQUENCE_TITLE_REPORT_EMPTY", ts.UIMsg, sizeof(ts.UIMsg), "empty", ts.UILanguageFile);
-	SendDlgItemMessage(IDC_TITLE_REPORT, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
+	get_lang_msgT("DLG_TAB_SEQUENCE_TITLE_REPORT_IGNORE", uimsg, _countof(uimsg), _T("ignore"), ts.UILanguageFile);
+	SendDlgItemMessage(IDC_TITLE_REPORT, CB_ADDSTRING, 0, (LPARAM)uimsg);
+	get_lang_msgT("DLG_TAB_SEQUENCE_TITLE_REPORT_ACCEPT", uimsg, _countof(uimsg), _T("accept"), ts.UILanguageFile);
+	SendDlgItemMessage(IDC_TITLE_REPORT, CB_ADDSTRING, 0, (LPARAM)uimsg);
+	get_lang_msgT("DLG_TAB_SEQUENCE_TITLE_REPORT_EMPTY", uimsg, _countof(uimsg), _T("empty"), ts.UILanguageFile);
+	SendDlgItemMessage(IDC_TITLE_REPORT, CB_ADDSTRING, 0, (LPARAM)uimsg);
 
-	GetDlgItemText(IDC_CLIPBOARD_ACCESS_LABEL, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_SEQUENCE_CLIPBOARD_ACCESS", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_CLIPBOARD_ACCESS_LABEL, ts.UIMsg);
+	get_lang_msgT("DLG_TAB_SEQUENCE_CLIPBOARD_ACCESS_OFF", uimsg, _countof(uimsg), _T("off"), ts.UILanguageFile);
+	SendDlgItemMessage(IDC_CLIPBOARD_ACCESS, CB_ADDSTRING, 0, (LPARAM)uimsg);
+	get_lang_msgT("DLG_TAB_SEQUENCE_CLIPBOARD_ACCESS_WRITE", uimsg, _countof(uimsg), _T("write only"), ts.UILanguageFile);
+	SendDlgItemMessage(IDC_CLIPBOARD_ACCESS, CB_ADDSTRING, 0, (LPARAM)uimsg);
+	get_lang_msgT("DLG_TAB_SEQUENCE_CLIPBOARD_ACCESS_READ", uimsg, _countof(uimsg), _T("read only"), ts.UILanguageFile);
+	SendDlgItemMessage(IDC_CLIPBOARD_ACCESS, CB_ADDSTRING, 0, (LPARAM)uimsg);
+	get_lang_msgT("DLG_TAB_SEQUENCE_CLIPBOARD_ACCESS_ON", uimsg, _countof(uimsg), _T("read/write"), ts.UILanguageFile);
+	SendDlgItemMessage(IDC_CLIPBOARD_ACCESS, CB_ADDSTRING, 0, (LPARAM)uimsg);
 
-	get_lang_msg("DLG_TAB_SEQUENCE_CLIPBOARD_ACCESS_OFF", ts.UIMsg, sizeof(ts.UIMsg), "off", ts.UILanguageFile);
-	SendDlgItemMessage(IDC_CLIPBOARD_ACCESS, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
-	get_lang_msg("DLG_TAB_SEQUENCE_CLIPBOARD_ACCESS_WRITE", ts.UIMsg, sizeof(ts.UIMsg), "write only", ts.UILanguageFile);
-	SendDlgItemMessage(IDC_CLIPBOARD_ACCESS, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
-	get_lang_msg("DLG_TAB_SEQUENCE_CLIPBOARD_ACCESS_READ", ts.UIMsg, sizeof(ts.UIMsg), "read only", ts.UILanguageFile);
-	SendDlgItemMessage(IDC_CLIPBOARD_ACCESS, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
-	get_lang_msg("DLG_TAB_SEQUENCE_CLIPBOARD_ACCESS_ON", ts.UIMsg, sizeof(ts.UIMsg), "read/write", ts.UILanguageFile);
-	SendDlgItemMessage(IDC_CLIPBOARD_ACCESS, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
-
-	GetDlgItemText(IDC_CLIPBOARD_NOTIFY, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_SEQUENCE_CLIPBOARD_NOTIFY", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_CLIPBOARD_NOTIFY, ts.UIMsg);
-
 	// (1)IDC_ACCEPT_MOUSE_EVENT_TRACKING
-	btn = (CButton *)GetDlgItem(IDC_ACCEPT_MOUSE_EVENT_TRACKING);
-	btn2 = (CButton *)GetDlgItem(IDC_DISABLE_MOUSE_TRACKING_CTRL);
-	btn->SetCheck(ts.MouseEventTracking);
-	if (ts.MouseEventTracking) {
-		btn2->EnableWindow(TRUE);
-	} else {
-		btn2->EnableWindow(FALSE);
-	}
+	SetCheck(IDC_ACCEPT_MOUSE_EVENT_TRACKING, ts.MouseEventTracking);
+	EnableDlgItem(IDC_DISABLE_MOUSE_TRACKING_CTRL, ts.MouseEventTracking ? TRUE : FALSE);
 
 	// (2)IDC_DISABLE_MOUSE_TRACKING_CTRL
-	btn2->SetCheck(ts.DisableMouseTrackingByCtrl);
+	SetCheck(IDC_DISABLE_MOUSE_TRACKING_CTRL, ts.DisableMouseTrackingByCtrl);
 
 	// (3)IDC_ACCEPT_TITLE_CHANGING
-	cmb = (CComboBox *)GetDlgItem(IDC_ACCEPT_TITLE_CHANGING);
-	cmb->SetCurSel(ts.AcceptTitleChangeRequest);
+	SetCurSel(IDC_ACCEPT_TITLE_CHANGING, ts.AcceptTitleChangeRequest);
 
 	// (4)IDC_TITLE_REPORT
-	cmb = (CComboBox *)GetDlgItem(IDC_TITLE_REPORT);
-	switch (ts.WindowFlag & WF_TITLEREPORT) {
-		case IdTitleReportIgnore:
-			cmb->SetCurSel(0);
-			break;
-		case IdTitleReportAccept:
-			cmb->SetCurSel(1);
-			break;
-		default: // IdTitleReportEmpty
-			cmb->SetCurSel(2);
-			break;
-	}
+	SetCurSel(IDC_TITLE_REPORT,
+			  (ts.WindowFlag & WF_TITLEREPORT) == IdTitleReportIgnore ? 0 :
+			  (ts.WindowFlag & WF_TITLEREPORT) == IdTitleReportAccept ? 1
+			  /*(ts.WindowFlag & WF_TITLEREPORT) == IdTitleReportEmptye ? */ : 2);
 
 	// (5)IDC_WINDOW_CTRL
-	btn = (CButton *)GetDlgItem(IDC_WINDOW_CTRL);
-	btn->SetCheck((ts.WindowFlag & WF_WINDOWCHANGE) != 0);
+	SetCheck(IDC_WINDOW_CTRL, (ts.WindowFlag & WF_WINDOWCHANGE) != 0);
 
 	// (6)IDC_WINDOW_REPORT
-	btn = (CButton *)GetDlgItem(IDC_WINDOW_REPORT);
-	btn->SetCheck((ts.WindowFlag & WF_WINDOWREPORT) != 0);
+	SetCheck(IDC_WINDOW_REPORT, (ts.WindowFlag & WF_WINDOWREPORT) != 0);
 
 	// (7)IDC_CURSOR_CTRL_SEQ
-	btn = (CButton *)GetDlgItem(IDC_CURSOR_CTRL_SEQ);
-	btn->SetCheck((ts.WindowFlag & WF_CURSORCHANGE) != 0);
+	SetCheck(IDC_CURSOR_CTRL_SEQ, (ts.WindowFlag & WF_CURSORCHANGE) != 0);
 
 	// (8)IDC_CLIPBOARD_ACCESS
-	cmb = (CComboBox *)GetDlgItem(IDC_CLIPBOARD_ACCESS);
-	switch (ts.CtrlFlag & CSF_CBRW) {
-		case CSF_CBRW:
-			cmb->SetCurSel(3);
-			break;
-		case CSF_CBREAD:
-			cmb->SetCurSel(2);
-			break;
-		case CSF_CBWRITE:
-			cmb->SetCurSel(1);
-			break;
-		default: // off
-			cmb->SetCurSel(0);
-			break;
-	}
+	SetCurSel(IDC_CLIPBOARD_ACCESS,
+			  (ts.CtrlFlag & CSF_CBRW) == CSF_CBRW ? 3 :
+			  (ts.CtrlFlag & CSF_CBRW) == CSF_CBREAD ? 2 :
+			  (ts.CtrlFlag & CSF_CBRW) == CSF_CBWRITE ? 1 :
+			  0);	// off
 
 	// (9)IDC_CLIPBOARD_NOTIFY
-	btn = (CButton *)GetDlgItem(IDC_CLIPBOARD_NOTIFY);
-	btn->SetCheck(ts.NotifyClipboardAccess);
-	if (HasBalloonTipSupport()) {
-		btn->EnableWindow(TRUE);
-	}
-	else {
-		btn->EnableWindow(FALSE);
-	}
+	SetCheck(IDC_CLIPBOARD_NOTIFY, ts.NotifyClipboardAccess);
+	EnableDlgItem(IDC_CLIPBOARD_NOTIFY, HasBalloonTipSupport() ? TRUE : FALSE);
 
 	// \x83_\x83C\x83A\x83\x8D\x83O\x82Ƀt\x83H\x81[\x83J\x83X\x82𓖂Ă\xE9 (2004.12.7 yutaka)
 	::SetFocus(::GetDlgItem(GetSafeHwnd(), IDC_ACCEPT_MOUSE_EVENT_TRACKING));
-
-	return FALSE;
 }
 
 BOOL CSequencePropPageDlg::OnCommand(WPARAM wParam, LPARAM lParam)
 {
-	CButton *btn, *btn2;
-
 	switch (wParam) {
 		case IDC_ACCEPT_MOUSE_EVENT_TRACKING | (BN_CLICKED << 16):
-			btn = (CButton *)GetDlgItem(IDC_ACCEPT_MOUSE_EVENT_TRACKING);
-			btn2 = (CButton *)GetDlgItem(IDC_DISABLE_MOUSE_TRACKING_CTRL);
-			if (btn->GetCheck()) {
-				btn2->EnableWindow(TRUE);
-			} else {
-				btn2->EnableWindow(FALSE);
-			}
+			EnableDlgItem(IDC_DISABLE_MOUSE_TRACKING_CTRL, 
+						  GetCheck(IDC_ACCEPT_MOUSE_EVENT_TRACKING) ? TRUE : FALSE);
 			return TRUE;
 	}
-	return CPropertyPage::OnCommand(wParam, lParam);
+	return TTCPropertyPage::OnCommand(wParam, lParam);
 }
 
 void CSequencePropPageDlg::OnOK()
 {
-	CButton *btn;
-	CComboBox *cmb;
-	int sel;
-
 	// (1)IDC_ACCEPT_MOUSE_EVENT_TRACKING
-	btn = (CButton *)GetDlgItem(IDC_ACCEPT_MOUSE_EVENT_TRACKING);
-	ts.MouseEventTracking = btn->GetCheck();
+	ts.MouseEventTracking = GetCheck(IDC_ACCEPT_MOUSE_EVENT_TRACKING);
 
 	// (2)IDC_DISABLE_MOUSE_TRACKING_CTRL
-	btn = (CButton *)GetDlgItem(IDC_DISABLE_MOUSE_TRACKING_CTRL);
-	ts.DisableMouseTrackingByCtrl = btn->GetCheck();
+	ts.DisableMouseTrackingByCtrl = GetCheck(IDC_DISABLE_MOUSE_TRACKING_CTRL);
 
 	// (3)IDC_ACCEPT_TITLE_CHANGING
-	cmb = (CComboBox *)GetDlgItem(IDC_ACCEPT_TITLE_CHANGING);
-	sel = cmb->GetCurSel();
+	int sel = GetCurSel(IDC_ACCEPT_TITLE_CHANGING);
 	if (0 <= sel && sel <= IdTitleChangeRequestMax) {
 		ts.AcceptTitleChangeRequest = sel;
 	}
 
 	// (4)IDC_TITLE_REPORT
-	cmb = (CComboBox *)GetDlgItem(IDC_TITLE_REPORT);
-	switch (cmb->GetCurSel()) {
+	switch (GetCurSel(IDC_TITLE_REPORT)) {
 		case 0:
 			ts.WindowFlag &= ~WF_TITLEREPORT;
 			break;
@@ -535,26 +344,22 @@
 	}
 
 	// (5)IDC_WINDOW_CTRL
-	btn = (CButton *)GetDlgItem(IDC_WINDOW_CTRL);
-	if (((ts.WindowFlag & WF_WINDOWCHANGE) != 0) != btn->GetCheck()) {
+	if (((ts.WindowFlag & WF_WINDOWCHANGE) != 0) != GetCheck(IDC_WINDOW_CTRL)) {
 		ts.WindowFlag ^= WF_WINDOWCHANGE;
 	}
 
 	// (6)IDC_WINDOW_REPORT
-	btn = (CButton *)GetDlgItem(IDC_WINDOW_REPORT);
-	if (((ts.WindowFlag & WF_WINDOWREPORT) != 0) != btn->GetCheck()) {
+	if (((ts.WindowFlag & WF_WINDOWREPORT) != 0) != GetCheck(IDC_WINDOW_REPORT)) {
 		ts.WindowFlag ^= WF_WINDOWREPORT;
 	}
 
 	// (7)IDC_CURSOR_CTRL_SEQ
-	btn = (CButton *)GetDlgItem(IDC_CURSOR_CTRL_SEQ);
-	if (((ts.WindowFlag & WF_CURSORCHANGE) != 0) != btn->GetCheck()) {
+	if (((ts.WindowFlag & WF_CURSORCHANGE) != 0) != GetCheck(IDC_CURSOR_CTRL_SEQ)) {
 		ts.WindowFlag ^= WF_CURSORCHANGE;
 	}
 
 	// (8)IDC_CLIPBOARD_ACCESS
-	cmb = (CComboBox *)GetDlgItem(IDC_CLIPBOARD_ACCESS);
-	switch (cmb->GetCurSel()) {
+	switch (GetCurSel(IDC_CLIPBOARD_ACCESS)) {
 		case 0: // off
 			ts.CtrlFlag &= ~CSF_CBRW;
 			break;
@@ -574,202 +379,127 @@
 	}
 
 	// (9)IDC_CLIPBOARD_ACCESS
-	btn = (CButton *)GetDlgItem(IDC_CLIPBOARD_NOTIFY);
-	ts.NotifyClipboardAccess = btn->GetCheck();
+	ts.NotifyClipboardAccess = GetCheck(IDC_CLIPBOARD_NOTIFY);
 }
 
 
-
 // CCopypastePropPageDlg \x83_\x83C\x83A\x83\x8D\x83O
 
-IMPLEMENT_DYNAMIC(CCopypastePropPageDlg, CPropertyPage)
-
-CCopypastePropPageDlg::CCopypastePropPageDlg()
-	: CPropertyPage(CCopypastePropPageDlg::IDD)
+CCopypastePropPageDlg::CCopypastePropPageDlg(HINSTANCE inst, TTCPropertySheet *sheet)
+	: TTCPropertyPage(inst, CCopypastePropPageDlg::IDD, sheet)
 {
+	TCHAR UIMsg[MAX_UIMSG];
+	get_lang_msgT("DLG_TABSHEET_TITLE_COPYPASTE", UIMsg, _countof(UIMsg),
+				  _T("Copy and Paste"), ts.UILanguageFile);
+	m_psp.pszTitle = _tcsdup(UIMsg);
+	m_psp.dwFlags |= PSP_USETITLE;
 }
 
 CCopypastePropPageDlg::~CCopypastePropPageDlg()
 {
-	if (DlgCopypasteFont != NULL) {
-		DeleteObject(DlgCopypasteFont);
-	}
+	free((void *)m_psp.pszTitle);
 }
 
-BEGIN_MESSAGE_MAP(CCopypastePropPageDlg, CPropertyPage)
-END_MESSAGE_MAP()
-
 // CCopypastePropPageDlg \x83\x81\x83b\x83Z\x81[\x83W \x83n\x83\x93\x83h\x83\x89
 
-BOOL CCopypastePropPageDlg::OnInitDialog()
+void CCopypastePropPageDlg::OnInitDialog()
 {
-	char uimsg[MAX_UIMSG];
-	CButton *btn, *btn2;
-	CEdit *edit;
-	char buf[64];
+	TTCPropertyPage::OnInitDialog();
 
-	CPropertyPage::OnInitDialog();
+	static const DlgTextInfo TextInfos[] = {
+		{ IDC_LINECOPY, "DLG_TAB_COPYPASTE_CONTINUE" },
+		{ IDC_DISABLE_PASTE_RBUTTON, "DLG_TAB_COPYPASTE_MOUSEPASTE" },
+		{ IDC_CONFIRM_PASTE_RBUTTON, "DLG_TAB_COPYPASTE_CONFIRMPASTE" },
+		{ IDC_DISABLE_PASTE_MBUTTON, "DLG_TAB_COPYPASTE_MOUSEPASTEM" },
+		{ IDC_SELECT_LBUTTON, "DLG_TAB_COPYPASTE_SELECTLBUTTON" },
+		{ IDC_TRIMNLCHAR, "DLG_TAB_COPYPASTE_TRIM_TRAILING_NL" },
+		{ IDC_NORMALIZE_LINEBREAK, "DLG_TAB_COPYPASTE_NORMALIZE_LINEBREAK" },
+		{ IDC_CONFIRM_CHANGE_PASTE, "DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE" },
+		{ IDC_CONFIRM_STRING_FILE_LABEL, "DLG_TAB_COPYPASTE_STRINGFILE" },
+		{ IDC_DELIMITER, "DLG_TAB_COPYPASTE_DELIMITER" },
+		{ IDC_PASTEDELAY_LABEL, "DLG_TAB_COPYPASTE_PASTEDELAY" },
+		{ IDC_PASTEDELAY_LABEL2, "DLG_TAB_COPYPASTE_PASTEDELAY2" }
+	};
+	SetDlgTexts(m_hWnd, TextInfos, _countof(TextInfos), ts.UILanguageFile);
 
-	font = (HFONT)SendMessage(WM_GETFONT, 0, 0);
-	GetObject(font, sizeof(LOGFONT), &logfont);
-	if (get_lang_font("DLG_TAHOMA_FONT", GetSafeHwnd(), &logfont, &DlgCopypasteFont, ts.UILanguageFile)) {
-		SendDlgItemMessage(IDC_LINECOPY, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_DISABLE_PASTE_RBUTTON, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_CONFIRM_PASTE_RBUTTON, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_DISABLE_PASTE_MBUTTON, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_SELECT_LBUTTON, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_TRIMNLCHAR, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_NORMALIZE_LINEBREAK, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_CONFIRM_CHANGE_PASTE, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_CONFIRM_STRING_FILE_LABEL, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_CONFIRM_STRING_FILE, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_CONFIRM_STRING_FILE_PATH, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_DELIMITER, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_DELIM_LIST, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_PASTEDELAY_LABEL, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_PASTEDELAY_EDIT, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_PASTEDELAY_LABEL2, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
-	}
-	else {
-		DlgCopypasteFont = NULL;
-	}
-
-	GetDlgItemText(IDC_LINECOPY, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_COPYPASTE_CONTINUE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_LINECOPY, ts.UIMsg);
-	GetDlgItemText(IDC_DISABLE_PASTE_RBUTTON, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_COPYPASTE_MOUSEPASTE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_DISABLE_PASTE_RBUTTON, ts.UIMsg);
-	GetDlgItemText(IDC_CONFIRM_PASTE_RBUTTON, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_COPYPASTE_CONFIRMPASTE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_CONFIRM_PASTE_RBUTTON, ts.UIMsg);
-	GetDlgItemText(IDC_DISABLE_PASTE_MBUTTON, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_COPYPASTE_MOUSEPASTEM", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_DISABLE_PASTE_MBUTTON, ts.UIMsg);
-	GetDlgItemText(IDC_SELECT_LBUTTON, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_COPYPASTE_SELECTLBUTTON", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_SELECT_LBUTTON, ts.UIMsg);
-	GetDlgItemText(IDC_TRIMNLCHAR, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_COPYPASTE_TRIM_TRAILING_NL", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_TRIMNLCHAR, ts.UIMsg);
-	GetDlgItemText(IDC_NORMALIZE_LINEBREAK, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_COPYPASTE_NORMALIZE_LINEBREAK", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_NORMALIZE_LINEBREAK, ts.UIMsg);
-	GetDlgItemText(IDC_CONFIRM_CHANGE_PASTE, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_CONFIRM_CHANGE_PASTE, ts.UIMsg);
-	GetDlgItemText(IDC_CONFIRM_STRING_FILE_LABEL, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_COPYPASTE_STRINGFILE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_CONFIRM_STRING_FILE_LABEL, ts.UIMsg);
-	GetDlgItemText(IDC_DELIMITER, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_COPYPASTE_DELIMITER", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_DELIMITER, ts.UIMsg);
-	GetDlgItemText(IDC_PASTEDELAY_LABEL, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_COPYPASTE_PASTEDELAY", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_PASTEDELAY_LABEL, ts.UIMsg);
-	GetDlgItemText(IDC_PASTEDELAY_LABEL2, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_COPYPASTE_PASTEDELAY2", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_PASTEDELAY_LABEL2, ts.UIMsg);
-
 	// (1)Enable continued-line copy
-	btn = (CButton *)GetDlgItem(IDC_LINECOPY);
-	btn->SetCheck(ts.EnableContinuedLineCopy);
+	SetCheck(IDC_LINECOPY, ts.EnableContinuedLineCopy);
 
 	// (2)DisablePasteMouseRButton
-	btn = (CButton *)GetDlgItem(IDC_DISABLE_PASTE_RBUTTON);
-	btn2 = (CButton *)GetDlgItem(IDC_CONFIRM_PASTE_RBUTTON);
 	if (ts.PasteFlag & CPF_DISABLE_RBUTTON) {
-		btn->SetCheck(BST_CHECKED);
-		btn2->EnableWindow(FALSE);
+		SetCheck(IDC_DISABLE_PASTE_RBUTTON, BST_CHECKED);
+		EnableDlgItem(IDC_CONFIRM_PASTE_RBUTTON, FALSE);
 	} else {
-		btn->SetCheck(BST_UNCHECKED);
-		btn2->EnableWindow(TRUE);
+		SetCheck(IDC_DISABLE_PASTE_RBUTTON, BST_UNCHECKED);
+		EnableDlgItem(IDC_CONFIRM_PASTE_RBUTTON, TRUE);
 	}
 
 	// (3)ConfirmPasteMouseRButton
-	btn2->SetCheck((ts.PasteFlag & CPF_CONFIRM_RBUTTON)?BST_CHECKED:BST_UNCHECKED);
+	SetCheck(IDC_CONFIRM_PASTE_RBUTTON, (ts.PasteFlag & CPF_CONFIRM_RBUTTON)?BST_CHECKED:BST_UNCHECKED);
 
 	// (4)DisablePasteMouseMButton
-	btn = (CButton *)GetDlgItem(IDC_DISABLE_PASTE_MBUTTON);
-	btn->SetCheck((ts.PasteFlag & CPF_DISABLE_MBUTTON)?BST_CHECKED:BST_UNCHECKED);
+	SetCheck(IDC_DISABLE_PASTE_MBUTTON, (ts.PasteFlag & CPF_DISABLE_MBUTTON)?BST_CHECKED:BST_UNCHECKED);
 
 	// (5)SelectOnlyByLButton
-	btn = (CButton *)GetDlgItem(IDC_SELECT_LBUTTON);
-	btn->SetCheck(ts.SelectOnlyByLButton);
+	SetCheck(IDC_SELECT_LBUTTON, ts.SelectOnlyByLButton);
 
 	// (6)TrimTrailingNLonPaste
-	btn = (CButton *)GetDlgItem(IDC_TRIMNLCHAR);
-	btn->SetCheck((ts.PasteFlag & CPF_TRIM_TRAILING_NL)?BST_CHECKED:BST_UNCHECKED);
+	SetCheck(IDC_TRIMNLCHAR, (ts.PasteFlag & CPF_TRIM_TRAILING_NL)?BST_CHECKED:BST_UNCHECKED);
 
 	// (7)NormalizeLineBreak
-	btn = (CButton *)GetDlgItem(IDC_NORMALIZE_LINEBREAK);
-	btn->SetCheck((ts.PasteFlag & CPF_NORMALIZE_LINEBREAK)?BST_CHECKED:BST_UNCHECKED);
+	SetCheck(IDC_NORMALIZE_LINEBREAK, (ts.PasteFlag & CPF_NORMALIZE_LINEBREAK)?BST_CHECKED:BST_UNCHECKED);
 
 	// (8)ConfirmChangePaste
-	btn = (CButton *)GetDlgItem(IDC_CONFIRM_CHANGE_PASTE);
-	btn->SetCheck((ts.PasteFlag & CPF_CONFIRM_CHANGEPASTE)?BST_CHECKED:BST_UNCHECKED);
+	SetCheck(IDC_CONFIRM_CHANGE_PASTE, (ts.PasteFlag & CPF_CONFIRM_CHANGEPASTE)?BST_CHECKED:BST_UNCHECKED);
 
 	// \x83t\x83@\x83C\x83\x8B\x83p\x83X
-	SetDlgItemText(IDC_CONFIRM_STRING_FILE, ts.ConfirmChangePasteStringFile);
-	edit = (CEdit *)GetDlgItem(IDC_CONFIRM_STRING_FILE);
-	btn = (CButton *)GetDlgItem(IDC_CONFIRM_STRING_FILE_PATH);
+	SetDlgItemTextA(IDC_CONFIRM_STRING_FILE, ts.ConfirmChangePasteStringFile);
 	if (ts.PasteFlag & CPF_CONFIRM_CHANGEPASTE) {
-		edit->EnableWindow(TRUE);
-		btn->EnableWindow(TRUE);
+		EnableDlgItem(IDC_CONFIRM_STRING_FILE, TRUE);
+		EnableDlgItem(IDC_CONFIRM_STRING_FILE_PATH, TRUE);
 	} else {
-		edit->EnableWindow(FALSE);
-		btn->EnableWindow(FALSE);
+		EnableDlgItem(IDC_CONFIRM_STRING_FILE, FALSE);
+		EnableDlgItem(IDC_CONFIRM_STRING_FILE_PATH, FALSE);
 	}
 
 	// (9)delimiter characters
-	SetDlgItemText(IDC_DELIM_LIST, ts.DelimList);
+	SetDlgItemTextA(IDC_DELIM_LIST, ts.DelimList);
 
 	// (10)PasteDelayPerLine
+	char buf[64];
 	_snprintf_s(buf, sizeof(buf), "%d", ts.PasteDelayPerLine);
-	SetDlgItemText(IDC_PASTEDELAY_EDIT, buf);
+	SetDlgItemNum(IDC_PASTEDELAY_EDIT, ts.PasteDelayPerLine);
 
 	// \x83_\x83C\x83A\x83\x8D\x83O\x82Ƀt\x83H\x81[\x83J\x83X\x82𓖂Ă\xE9
 	::SetFocus(::GetDlgItem(GetSafeHwnd(), IDC_LINECOPY));
-
-	return FALSE;
 }
 
 BOOL CCopypastePropPageDlg::OnCommand(WPARAM wParam, LPARAM lParam)
 {
-	CButton *btn, *btn2;
-	CEdit *edit;
 	char uimsg[MAX_UIMSG];
 
 	switch (wParam) {
 		case IDC_DISABLE_PASTE_RBUTTON | (BN_CLICKED << 16):
-			btn = (CButton *)GetDlgItem(IDC_DISABLE_PASTE_RBUTTON);
-			btn2 = (CButton *)GetDlgItem(IDC_CONFIRM_PASTE_RBUTTON);
-			if (btn->GetCheck()) {
-				btn2->EnableWindow(FALSE);
-			} else {
-				btn2->EnableWindow(TRUE);
-			}
+			EnableDlgItem(IDC_CONFIRM_PASTE_RBUTTON,
+						  GetCheck(IDC_DISABLE_PASTE_RBUTTON) ? FALSE : TRUE);
 			return TRUE;
 
 		case IDC_CONFIRM_CHANGE_PASTE | (BN_CLICKED << 16):
-			btn2 = (CButton *)GetDlgItem(IDC_CONFIRM_CHANGE_PASTE);
-			btn = (CButton *)GetDlgItem(IDC_CONFIRM_STRING_FILE_PATH);
-			edit = (CEdit *)GetDlgItem(IDC_CONFIRM_STRING_FILE);
-			if (btn2->GetCheck()) {
-				edit->EnableWindow(TRUE);
-				btn->EnableWindow(TRUE);
+			if (GetCheck(IDC_CONFIRM_CHANGE_PASTE)) {
+				EnableDlgItem(IDC_CONFIRM_STRING_FILE, TRUE);
+				EnableDlgItem(IDC_CONFIRM_STRING_FILE_PATH, TRUE);
 			} else {
-				edit->EnableWindow(FALSE);
-				btn->EnableWindow(FALSE);
+				EnableDlgItem(IDC_CONFIRM_STRING_FILE, FALSE);
+				EnableDlgItem(IDC_CONFIRM_STRING_FILE_PATH, FALSE);
 			}
 			return TRUE;
 
 		case IDC_CONFIRM_STRING_FILE_PATH | (BN_CLICKED << 16):
 			{
-				OPENFILENAME ofn;
+				OPENFILENAMEA ofn;
 
-				ZeroMemory(&ofn, sizeof(ofn));
-				ofn.lStructSize = get_OPENFILENAME_SIZE();
+				memset(&ofn, 0, sizeof(ofn));
+				ofn.lStructSize = get_OPENFILENAME_SIZEA();
 				ofn.hwndOwner = GetSafeHwnd();
 				get_lang_msg("FILEDLG_SELECT_CONFIRM_STRING_APP_FILTER", ts.UIMsg, sizeof(ts.UIMsg),
 				             "txt(*.txt)\\0*.txt\\0all(*.*)\\0*.*\\0\\0", ts.UILanguageFile);
@@ -780,29 +510,26 @@
 				             "Choose a file including strings for ConfirmChangePaste", ts.UILanguageFile);
 				ofn.lpstrTitle = uimsg;
 				ofn.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_FORCESHOWHIDDEN | OFN_HIDEREADONLY;
-				if (GetOpenFileName(&ofn) != 0) {
-					SetDlgItemText(IDC_CONFIRM_STRING_FILE, ts.ConfirmChangePasteStringFile);
+				if (GetOpenFileNameA(&ofn) != 0) {
+					SetDlgItemTextA(IDC_CONFIRM_STRING_FILE, ts.ConfirmChangePasteStringFile);
 				}
 			}
 			return TRUE;
 	}
 
-	return CPropertyPage::OnCommand(wParam, lParam);
+	return TTCPropertyPage::OnCommand(wParam, lParam);
 }
 
 void CCopypastePropPageDlg::OnOK()
 {
-	CButton *btn;
 	char buf[64];
 	int val;
 
 	// (1)
-	btn = (CButton *)GetDlgItem(IDC_LINECOPY);
-	ts.EnableContinuedLineCopy = btn->GetCheck();
+	ts.EnableContinuedLineCopy = GetCheck(IDC_LINECOPY);
 
 	// (2)
-	btn = (CButton *)GetDlgItem(IDC_DISABLE_PASTE_RBUTTON);
-	if (btn->GetCheck()) {
+	if (GetCheck(IDC_DISABLE_PASTE_RBUTTON)) {
 		ts.PasteFlag |= CPF_DISABLE_RBUTTON;
 	}
 	else {
@@ -810,8 +537,7 @@
 	}
 
 	// (3)
-	btn = (CButton *)GetDlgItem(IDC_CONFIRM_PASTE_RBUTTON);
-	if (btn->GetCheck()) {
+	if (GetCheck(IDC_CONFIRM_PASTE_RBUTTON)) {
 		ts.PasteFlag |= CPF_CONFIRM_RBUTTON;
 	}
 	else {
@@ -819,8 +545,7 @@
 	}
 
 	// (4)
-	btn = (CButton *)GetDlgItem(IDC_DISABLE_PASTE_MBUTTON);
-	if (btn->GetCheck()) {
+	if (GetCheck(IDC_DISABLE_PASTE_MBUTTON)) {
 		ts.PasteFlag |= CPF_DISABLE_MBUTTON;
 	}
 	else {
@@ -828,12 +553,10 @@
 	}
 
 	// (5)
-	btn = (CButton *)GetDlgItem(IDC_SELECT_LBUTTON);
-	ts.SelectOnlyByLButton = btn->GetCheck();
+	ts.SelectOnlyByLButton = GetCheck(IDC_SELECT_LBUTTON);
 
 	// (6)
-	btn = (CButton *)GetDlgItem(IDC_TRIMNLCHAR);
-	if (btn->GetCheck()) {
+	if (GetCheck(IDC_TRIMNLCHAR)) {
 		ts.PasteFlag |= CPF_TRIM_TRAILING_NL;
 	}
 	else {
@@ -841,8 +564,7 @@
 	}
 
 	// (7)
-	btn = (CButton *)GetDlgItem(IDC_NORMALIZE_LINEBREAK);
-	if (btn->GetCheck()) {
+	if (GetCheck(IDC_NORMALIZE_LINEBREAK)) {
 		ts.PasteFlag |= CPF_NORMALIZE_LINEBREAK;
 	}
 	else {
@@ -850,340 +572,246 @@
 	}
 
 	// (8)IDC_CONFIRM_CHANGE_PASTE
-	btn = (CButton *)GetDlgItem(IDC_CONFIRM_CHANGE_PASTE);
-	if (btn->GetCheck()) {
+	if (GetCheck(IDC_CONFIRM_CHANGE_PASTE)) {
 		ts.PasteFlag |= CPF_CONFIRM_CHANGEPASTE;
 	}
 	else {
 		ts.PasteFlag &= ~CPF_CONFIRM_CHANGEPASTE;
 	}
-	GetDlgItemText(IDC_CONFIRM_STRING_FILE, ts.ConfirmChangePasteStringFile, sizeof(ts.ConfirmChangePasteStringFile));
+	GetDlgItemTextA(IDC_CONFIRM_STRING_FILE, ts.ConfirmChangePasteStringFile, sizeof(ts.ConfirmChangePasteStringFile));
 
 	// (9)
-	GetDlgItemText(IDC_DELIM_LIST, ts.DelimList, sizeof(ts.DelimList));
+	GetDlgItemTextA(IDC_DELIM_LIST, ts.DelimList, sizeof(ts.DelimList));
 
 	// (10)
-	GetDlgItemText(IDC_PASTEDELAY_EDIT, buf, sizeof(buf));
+	GetDlgItemTextA(IDC_PASTEDELAY_EDIT, buf, sizeof(buf));
 	val = atoi(buf);
-	ts.PasteDelayPerLine = min(max(0, val), 5000);
+	ts.PasteDelayPerLine =
+		(val < 0) ? 0 :
+		(val > 5000) ? 5000 : val;
 }
 
 
-
 // CVisualPropPageDlg \x83_\x83C\x83A\x83\x8D\x83O
 
-IMPLEMENT_DYNAMIC(CVisualPropPageDlg, CPropertyPage)
-
-CVisualPropPageDlg::CVisualPropPageDlg()
-	: CPropertyPage(CVisualPropPageDlg::IDD)
+CVisualPropPageDlg::CVisualPropPageDlg(HINSTANCE inst, TTCPropertySheet *sheet)
+	: TTCPropertyPage(inst, CVisualPropPageDlg::IDD, sheet)
 {
-
+	TCHAR UIMsg[MAX_UIMSG];
+	get_lang_msgT("DLG_TABSHEET_TITLE_VISUAL", UIMsg, _countof(UIMsg),
+	             _T("Visual"), ts.UILanguageFile);
+	m_psp.pszTitle = _tcsdup(UIMsg);
+	m_psp.dwFlags |= PSP_USETITLE;
 }
 
 CVisualPropPageDlg::~CVisualPropPageDlg()
 {
-	if (DlgVisualFont != NULL) {
-		DeleteObject(DlgVisualFont);
-	}
+	free((void *)m_psp.pszTitle);
 }
 
-BEGIN_MESSAGE_MAP(CVisualPropPageDlg, CPropertyPage)
-END_MESSAGE_MAP()
-
 // CVisualPropPageDlg \x83\x81\x83b\x83Z\x81[\x83W \x83n\x83\x93\x83h\x83\x89
 
-BOOL CVisualPropPageDlg::OnInitDialog()
+void CVisualPropPageDlg::OnInitDialog()
 {
 	char buf[MAXPATHLEN];
-	char uimsg[MAX_UIMSG];
-	CListBox *listbox;
-	CButton *btn;
-	CComboBox *cmb;
-	int i;
 
-	CPropertyPage::OnInitDialog();
+	TTCPropertyPage::OnInitDialog();
 
-	font = (HFONT)SendMessage(WM_GETFONT, 0, 0);
-	GetObject(font, sizeof(LOGFONT), &logfont);
-	if (get_lang_font("DLG_TAHOMA_FONT", GetSafeHwnd(), &logfont, &DlgVisualFont, ts.UILanguageFile)) {
-		SendDlgItemMessage(IDC_ALPHABLEND, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE, 0));
-		SendDlgItemMessage(IDC_ALPHA_BLEND_ACTIVE, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE, 0));
-		SendDlgItemMessage(IDC_ALPHA_BLEND_INACTIVE, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE, 0));
-		SendDlgItemMessage(IDC_ALPHA_BLEND_ACTIVE_LABEL, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE, 0));
-		SendDlgItemMessage(IDC_ALPHA_BLEND_INACTIVE_LABEL, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE, 0));
-		SendDlgItemMessage(IDC_ETERM_LOOKFEEL, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_MOUSE, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_MOUSE_CURSOR, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_FONT_QUALITY_LABEL, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_FONT_QUALITY, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_ANSICOLOR, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_ANSI_COLOR, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_RED, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_COLOR_RED, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_GREEN, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_COLOR_GREEN, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_BLUE, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_COLOR_BLUE, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_SAMPLE_COLOR, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_ENABLE_ATTR_COLOR_BOLD, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_ENABLE_ATTR_COLOR_BLINK, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_ENABLE_ATTR_COLOR_REVERSE, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_ENABLE_URL_COLOR, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_ENABLE_ANSI_COLOR, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_URL_UNDERLINE, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_BGIMG_CHECK, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_BGIMG_EDIT, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_BGIMG_BUTTON, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_RESTART, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_BGIMG_BRIGHTNESS, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE, 0));
-		SendDlgItemMessage(IDC_EDIT_BGIMG_BRIGHTNESS, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE, 0));
-	}
-	else {
-		DlgVisualFont = NULL;
-	}
+	static const DlgTextInfo TextInfos[] = {
+		{ IDC_ALPHABLEND, "DLG_TAB_VISUAL_ALPHA" },
+		{ IDC_ALPHA_BLEND_ACTIVE_LABEL, "DLG_TAB_VISUAL_ALPHA_ACTIVE_LABEL" },
+		{ IDC_ALPHA_BLEND_INACTIVE_LABEL, "DLG_TAB_VISUAL_ALPHA_INACTIVE_LABEL" },
+		{ IDC_ETERM_LOOKFEEL, "DLG_TAB_VISUAL_ETERM" },
+		{ IDC_BGIMG_CHECK, "DLG_TAB_VISUAL_BGIMG" },
+		{ IDC_BGIMG_BRIGHTNESS, "DLG_TAB_VISUAL_BGIMG_BRIGHTNESS" },
+		{ IDC_MOUSE, "DLG_TAB_VISUAL_MOUSE" },
+		{ IDC_FONT_QUALITY_LABEL, "DLG_TAB_VISUAL_FONT_QUALITY" },
+		{ IDC_ANSICOLOR, "DLG_TAB_VISUAL_ANSICOLOR" },
+		{ IDC_RED, "DLG_TAB_VISUAL_RED" },
+		{ IDC_GREEN, "DLG_TAB_VISUAL_GREEN" },
+		{ IDC_BLUE, "DLG_TAB_VISUAL_BLUE" },
+		{ IDC_ENABLE_ATTR_COLOR_BOLD, "DLG_TAB_VISUAL_BOLD" },
+		{ IDC_ENABLE_ATTR_COLOR_BLINK, "DLG_TAB_VISUAL_BLINK" },
+		{ IDC_ENABLE_ATTR_COLOR_REVERSE, "DLG_TAB_VISUAL_REVERSE" },
+		{ IDC_ENABLE_URL_COLOR, "DLG_TAB_VISUAL_URL" },
+		{ IDC_ENABLE_ANSI_COLOR, "DLG_TAB_VISUAL_ANSI" },
+		{ IDC_URL_UNDERLINE, "DLG_TAB_VISUAL_URLUL" },
+		{ IDC_RESTART, "DLG_TAB_VISUAL_RESTART" },
+	};
+	SetDlgTexts(m_hWnd, TextInfos, _countof(TextInfos), ts.UILanguageFile);
 
-	GetDlgItemText(IDC_ALPHABLEND, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_VISUAL_ALPHA", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_ALPHABLEND, ts.UIMsg);
-	GetDlgItemText(IDC_ALPHA_BLEND_ACTIVE_LABEL, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_VISUAL_ALPHA_ACTIVE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_ALPHA_BLEND_ACTIVE_LABEL, ts.UIMsg);
-	GetDlgItemText(IDC_ALPHA_BLEND_INACTIVE_LABEL, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_VISUAL_ALPHA_INACTIVE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_ALPHA_BLEND_INACTIVE_LABEL, ts.UIMsg);
-	GetDlgItemText(IDC_ETERM_LOOKFEEL, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_VISUAL_ETERM", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_ETERM_LOOKFEEL, ts.UIMsg);
-	GetDlgItemText(IDC_BGIMG_CHECK, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_VISUAL_BGIMG", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_BGIMG_CHECK, ts.UIMsg);
-	GetDlgItemText(IDC_BGIMG_BRIGHTNESS, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_VISUAL_BGIMG_BRIGHTNESS", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_BGIMG_BRIGHTNESS, ts.UIMsg);
-	GetDlgItemText(IDC_MOUSE, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_VISUAL_MOUSE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_MOUSE, ts.UIMsg);
-	GetDlgItemText(IDC_FONT_QUALITY_LABEL, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_VISUAL_FONT_QUALITY", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_FONT_QUALITY_LABEL, ts.UIMsg);
-	GetDlgItemText(IDC_ANSICOLOR, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_VISUAL_ANSICOLOR", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_ANSICOLOR, ts.UIMsg);
-	GetDlgItemText(IDC_RED, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_VISUAL_RED", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_RED, ts.UIMsg);
-	GetDlgItemText(IDC_GREEN, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_VISUAL_GREEN", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_GREEN, ts.UIMsg);
-	GetDlgItemText(IDC_BLUE, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_VISUAL_BLUE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_BLUE, ts.UIMsg);
-	GetDlgItemText(IDC_ENABLE_ATTR_COLOR_BOLD, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_VISUAL_BOLD", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_ENABLE_ATTR_COLOR_BOLD, ts.UIMsg);
-	GetDlgItemText(IDC_ENABLE_ATTR_COLOR_BLINK, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_VISUAL_BLINK", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_ENABLE_ATTR_COLOR_BLINK, ts.UIMsg);
-	GetDlgItemText(IDC_ENABLE_ATTR_COLOR_REVERSE, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_VISUAL_REVERSE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_ENABLE_ATTR_COLOR_REVERSE, ts.UIMsg);
-	GetDlgItemText(IDC_ENABLE_URL_COLOR, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_VISUAL_URL", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_ENABLE_URL_COLOR, ts.UIMsg);
-	GetDlgItemText(IDC_ENABLE_ANSI_COLOR, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_VISUAL_ANSI", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_ENABLE_ANSI_COLOR, ts.UIMsg);
-	GetDlgItemText(IDC_URL_UNDERLINE, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_VISUAL_URLUL", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_URL_UNDERLINE, ts.UIMsg);
-	GetDlgItemText(IDC_RESTART, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_VISUAL_RESTART", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_RESTART, ts.UIMsg);
+	TCHAR uimsg[MAX_UIMSG];
+	get_lang_msgT("DLG_TAB_VISUAL_FONT_QUALITY_DEFAULT",
+				  uimsg, _countof(uimsg), _T("Default"), ts.UILanguageFile);
+	SendDlgItemMessage(IDC_FONT_QUALITY, CB_ADDSTRING, 0, (LPARAM)uimsg);
+	get_lang_msgT("DLG_TAB_VISUAL_FONT_QUALITY_NONANTIALIASED",
+				  uimsg, _countof(uimsg), _T("Non-Antialiased"), ts.UILanguageFile);
+	SendDlgItemMessage(IDC_FONT_QUALITY, CB_ADDSTRING, 0, (LPARAM)uimsg);
+	get_lang_msgT("DLG_TAB_VISUAL_FONT_QUALITY_ANTIALIASED",
+				  uimsg, _countof(uimsg), _T("Antialiased"), ts.UILanguageFile);
+	SendDlgItemMessage(IDC_FONT_QUALITY, CB_ADDSTRING, 0, (LPARAM)uimsg);
+	get_lang_msgT("DLG_TAB_VISUAL_FONT_QUALITY_CLEARTYPE",
+				  uimsg, _countof(uimsg), _T("ClearType"), ts.UILanguageFile);
+	SendDlgItemMessage(IDC_FONT_QUALITY, CB_ADDSTRING, 0, (LPARAM)uimsg);
 
-	get_lang_msg("DLG_TAB_VISUAL_FONT_QUALITY_DEFAULT", ts.UIMsg, sizeof(ts.UIMsg), "Default", ts.UILanguageFile);
-	SendDlgItemMessage(IDC_FONT_QUALITY, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
-	get_lang_msg("DLG_TAB_VISUAL_FONT_QUALITY_NONANTIALIASED", ts.UIMsg, sizeof(ts.UIMsg), "Non-Antialiased", ts.UILanguageFile);
-	SendDlgItemMessage(IDC_FONT_QUALITY, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
-	get_lang_msg("DLG_TAB_VISUAL_FONT_QUALITY_ANTIALIASED", ts.UIMsg, sizeof(ts.UIMsg), "Antialiased", ts.UILanguageFile);
-	SendDlgItemMessage(IDC_FONT_QUALITY, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
-	get_lang_msg("DLG_TAB_VISUAL_FONT_QUALITY_CLEARTYPE", ts.UIMsg, sizeof(ts.UIMsg), "ClearType", ts.UILanguageFile);
-	SendDlgItemMessage(IDC_FONT_QUALITY, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
-
 	// (1)AlphaBlend
-	_snprintf_s(buf, sizeof(buf), _TRUNCATE, "%d", ts.AlphaBlendActive);
-	SetDlgItemText(IDC_ALPHA_BLEND_ACTIVE, buf);
-	_snprintf_s(buf, sizeof(buf), _TRUNCATE, "%d", ts.AlphaBlendInactive);
-	SetDlgItemText(IDC_ALPHA_BLEND_INACTIVE, buf);
 
+	SetDlgItemNum(IDC_ALPHA_BLEND_ACTIVE, ts.AlphaBlendActive);
+
+	SetDlgItemNum(IDC_ALPHA_BLEND_INACTIVE, ts.AlphaBlendInactive);
+
 	// (2)[BG] BGEnable
-	btn = (CButton *)GetDlgItem(IDC_ETERM_LOOKFEEL);
-	btn->SetCheck(ts.EtermLookfeel.BGEnable);
+	SetCheck(IDC_ETERM_LOOKFEEL, ts.EtermLookfeel.BGEnable);
 
 	// Eterm look-feel\x82̔w\x8Ci\x89摜\x8Ew\x92\xE8\x81B
-	SetDlgItemText(IDC_BGIMG_EDIT, ts.BGImageFilePath);
+	SetDlgItemTextA(IDC_BGIMG_EDIT, ts.BGImageFilePath);
 
 	_snprintf_s(buf, sizeof(buf), _TRUNCATE, "%d", ts.BGImgBrightness);
-	SetDlgItemText(IDC_EDIT_BGIMG_BRIGHTNESS, buf);
+	SetDlgItemNum(IDC_EDIT_BGIMG_BRIGHTNESS, ts.BGImgBrightness);
 
 	if (ts.EtermLookfeel.BGEnable) {
-		GetDlgItem(IDC_BGIMG_CHECK)->EnableWindow(TRUE);
+		EnableDlgItem(IDC_BGIMG_CHECK, TRUE);
 
-		btn = (CButton *)GetDlgItem(IDC_BGIMG_CHECK);
 		if (strcmp(ts.EtermLookfeel.BGThemeFile, BG_THEME_IMAGEFILE) == 0) {
-			btn->SetCheck(BST_CHECKED);
-			GetDlgItem(IDC_BGIMG_EDIT)->EnableWindow(TRUE);
-			GetDlgItem(IDC_BGIMG_BUTTON)->EnableWindow(TRUE);
+			SetCheck(IDC_BGIMG_CHECK, BST_CHECKED);
+			EnableDlgItem(IDC_BGIMG_EDIT, TRUE);
+			EnableDlgItem(IDC_BGIMG_BUTTON, TRUE);
 
-			GetDlgItem(IDC_BGIMG_BRIGHTNESS)->EnableWindow(TRUE);
-			GetDlgItem(IDC_EDIT_BGIMG_BRIGHTNESS)->EnableWindow(TRUE);
+			EnableDlgItem(IDC_BGIMG_BRIGHTNESS, TRUE);
+			EnableDlgItem(IDC_EDIT_BGIMG_BRIGHTNESS, TRUE);
 		} else {
-			btn->SetCheck(BST_UNCHECKED);
-			GetDlgItem(IDC_BGIMG_EDIT)->EnableWindow(FALSE);
-			GetDlgItem(IDC_BGIMG_BUTTON)->EnableWindow(FALSE);
+			SetCheck(IDC_BGIMG_CHECK, BST_UNCHECKED);
+			EnableDlgItem(IDC_BGIMG_EDIT, FALSE);
+			EnableDlgItem(IDC_BGIMG_BUTTON, FALSE);
 
-			GetDlgItem(IDC_BGIMG_BRIGHTNESS)->EnableWindow(FALSE);
-			GetDlgItem(IDC_EDIT_BGIMG_BRIGHTNESS)->EnableWindow(FALSE);
+			EnableDlgItem(IDC_BGIMG_BRIGHTNESS, FALSE);
+			EnableDlgItem(IDC_EDIT_BGIMG_BRIGHTNESS, FALSE);
 		}
 	} else {
-		GetDlgItem(IDC_BGIMG_CHECK)->EnableWindow(FALSE);
-		GetDlgItem(IDC_BGIMG_EDIT)->EnableWindow(FALSE);
-		GetDlgItem(IDC_BGIMG_BUTTON)->EnableWindow(FALSE);
+		EnableDlgItem(IDC_BGIMG_CHECK, FALSE);
+		EnableDlgItem(IDC_BGIMG_EDIT, FALSE);
+		EnableDlgItem(IDC_BGIMG_BUTTON, FALSE);
 
-		GetDlgItem(IDC_BGIMG_BRIGHTNESS)->EnableWindow(FALSE);
-		GetDlgItem(IDC_EDIT_BGIMG_BRIGHTNESS)->EnableWindow(FALSE);
+		EnableDlgItem(IDC_BGIMG_BRIGHTNESS, FALSE);
+		EnableDlgItem(IDC_EDIT_BGIMG_BRIGHTNESS, FALSE);
 	}
 
 	// (3)Mouse cursor type
-	cmb = (CComboBox *)GetDlgItem(IDC_MOUSE_CURSOR);
-	for (i = 0 ; MouseCursor[i].name ; i++) {
-		cmb->InsertString(i, MouseCursor[i].name);
+	int sel = 0;
+	for (int i = 0 ; MouseCursor[i].name ; i++) {
+		const char *name = MouseCursor[i].name;
+		SendDlgItemMessageA(IDC_MOUSE_CURSOR, CB_ADDSTRING, i, (LPARAM)name);
+		if (strcmp(name, ts.MouseCursorName) == 0) {
+			sel = i;
+		}
 	}
-	cmb->SelectString(0, ts.MouseCursorName);
+	SetCurSel(IDC_MOUSE_CURSOR, sel);
 
 	// (4)Font quality
-	cmb = (CComboBox *)GetDlgItem(IDC_FONT_QUALITY);
 	switch (ts.FontQuality) {
 		case DEFAULT_QUALITY:
-			cmb->SetCurSel(0);
+			SetCurSel(IDC_FONT_QUALITY, 0);
 			break;
 		case NONANTIALIASED_QUALITY:
-			cmb->SetCurSel(1);
+			SetCurSel(IDC_FONT_QUALITY, 1);
 			break;
 		case ANTIALIASED_QUALITY:
-			cmb->SetCurSel(2);
+			SetCurSel(IDC_FONT_QUALITY, 2);
 			break;
 		default: // CLEARTYPE_QUALITY
-			cmb->SetCurSel(3);
+			SetCurSel(IDC_FONT_QUALITY, 3);
 			break;
 	}
 
 	// (5)ANSI color
-	listbox = (CListBox *)GetDlgItem(IDC_ANSI_COLOR);
-	for (i = 0 ; i < 16 ; i++) {
+	for (int i = 0 ; i < 16 ; i++) {
 		_snprintf_s(buf, sizeof(buf), _TRUNCATE, "%d", i);
-		listbox->InsertString(i, buf);
+		SendDlgItemMessageA(IDC_ANSI_COLOR, LB_INSERTSTRING, i, (LPARAM)buf);
 	}
-	SetupRGBbox(GetSafeHwnd(), 0);
-#if 0
-	SendMessage(WM_CTLCOLORSTATIC,
-	            (WPARAM)label_hdc,
-	            (LPARAM)GetDlgItem(IDC_SAMPLE_COLOR));
-#endif
+	SetupRGBbox(0);
+	SendDlgItemMessage(IDC_ANSI_COLOR, LB_SETCURSEL, 0, 0);
+	::InvalidateRect(GetDlgItem(IDC_SAMPLE_COLOR), NULL, TRUE);
 
 	// (6)Bold Attr Color
-	btn = (CButton *)GetDlgItem(IDC_ENABLE_ATTR_COLOR_BOLD);
-	btn->SetCheck((ts.ColorFlag&CF_BOLDCOLOR) != 0);
+	SetCheck(IDC_ENABLE_ATTR_COLOR_BOLD, (ts.ColorFlag&CF_BOLDCOLOR) != 0);
 
 	// (7)Blink Attr Color
-	btn = (CButton *)GetDlgItem(IDC_ENABLE_ATTR_COLOR_BLINK);
-	btn->SetCheck((ts.ColorFlag&CF_BLINKCOLOR) != 0);
+	SetCheck(IDC_ENABLE_ATTR_COLOR_BLINK, (ts.ColorFlag&CF_BLINKCOLOR) != 0);
 
 	// (8)Reverse Attr Color
-	btn = (CButton *)GetDlgItem(IDC_ENABLE_ATTR_COLOR_REVERSE);
-	btn->SetCheck((ts.ColorFlag&CF_REVERSECOLOR) != 0);
+	SetCheck(IDC_ENABLE_ATTR_COLOR_REVERSE, (ts.ColorFlag&CF_REVERSECOLOR) != 0);
 
 	// (9)URL Color
-	btn = (CButton *)GetDlgItem(IDC_ENABLE_URL_COLOR);
-	btn->SetCheck((ts.ColorFlag&CF_URLCOLOR) != 0);
+	SetCheck(IDC_ENABLE_URL_COLOR, (ts.ColorFlag&CF_URLCOLOR) != 0);
 
 	// (10)Color
-	btn = (CButton *)GetDlgItem(IDC_ENABLE_ANSI_COLOR);
-	btn->SetCheck((ts.ColorFlag&CF_ANSICOLOR) != 0);
+	SetCheck(IDC_ENABLE_ANSI_COLOR, (ts.ColorFlag&CF_ANSICOLOR) != 0);
 
 	// (11)URL Underline
-	btn = (CButton *)GetDlgItem(IDC_URL_UNDERLINE);
-	btn->SetCheck((ts.FontFlag&FF_URLUNDERLINE) != 0);
+	SetCheck(IDC_URL_UNDERLINE, (ts.FontFlag&FF_URLUNDERLINE) != 0);
 
 	// \x83_\x83C\x83A\x83\x8D\x83O\x82Ƀt\x83H\x81[\x83J\x83X\x82𓖂Ă\xE9
-	::SetFocus(::GetDlgItem(GetSafeHwnd(), IDC_ALPHA_BLEND_ACTIVE));
-
-	return FALSE;
+	::SetFocus(GetDlgItem(IDC_ALPHA_BLEND_ACTIVE));
 }
 
 BOOL CVisualPropPageDlg::OnCommand(WPARAM wParam, LPARAM lParam)
 {
-	CListBox *listbox;
 	int sel;
-	char buf[MAXPATHLEN];
-	CButton *btn;
 
 	switch (wParam) {
-		case IDC_ETERM_LOOKFEEL:
+	case IDC_ETERM_LOOKFEEL:
 			// \x83`\x83F\x83b\x83N\x82\xB3\x82ꂽ\x82\xE7 Enable/Disable \x82\xF0\x83g\x83O\x83\x8B\x82\xB7\x82\xE9\x81B
-			btn = (CButton *)GetDlgItem(IDC_ETERM_LOOKFEEL);
-			if (btn->GetCheck()) {
-				GetDlgItem(IDC_BGIMG_CHECK)->EnableWindow(TRUE);
-				btn = (CButton *)GetDlgItem(IDC_BGIMG_CHECK);
-				if (btn->GetCheck()) {
-					GetDlgItem(IDC_BGIMG_EDIT)->EnableWindow(TRUE);
-					GetDlgItem(IDC_BGIMG_BUTTON)->EnableWindow(TRUE);
+			if (GetCheck(IDC_ETERM_LOOKFEEL)) {
+				EnableDlgItem(IDC_BGIMG_CHECK, TRUE);
+				if (GetCheck(IDC_BGIMG_CHECK)) {
+					EnableDlgItem(IDC_BGIMG_EDIT, TRUE);
+					EnableDlgItem(IDC_BGIMG_BUTTON, TRUE);
 
-					GetDlgItem(IDC_BGIMG_BRIGHTNESS)->EnableWindow(TRUE);
-					GetDlgItem(IDC_EDIT_BGIMG_BRIGHTNESS)->EnableWindow(TRUE);
+					EnableDlgItem(IDC_BGIMG_BRIGHTNESS, TRUE);
+					EnableDlgItem(IDC_EDIT_BGIMG_BRIGHTNESS, TRUE);
 				} else {
-					GetDlgItem(IDC_BGIMG_EDIT)->EnableWindow(FALSE);
-					GetDlgItem(IDC_BGIMG_BUTTON)->EnableWindow(FALSE);
+					EnableDlgItem(IDC_BGIMG_EDIT, FALSE);
+					EnableDlgItem(IDC_BGIMG_BUTTON, FALSE);
 
-					GetDlgItem(IDC_BGIMG_BRIGHTNESS)->EnableWindow(FALSE);
-					GetDlgItem(IDC_EDIT_BGIMG_BRIGHTNESS)->EnableWindow(FALSE);
+					EnableDlgItem(IDC_BGIMG_BRIGHTNESS, FALSE);
+					EnableDlgItem(IDC_EDIT_BGIMG_BRIGHTNESS, FALSE);
 				}
 			} else {
-				GetDlgItem(IDC_BGIMG_CHECK)->EnableWindow(FALSE);
-				GetDlgItem(IDC_BGIMG_EDIT)->EnableWindow(FALSE);
-				GetDlgItem(IDC_BGIMG_BUTTON)->EnableWindow(FALSE);
+				EnableDlgItem(IDC_BGIMG_CHECK, FALSE);
+				EnableDlgItem(IDC_BGIMG_EDIT, FALSE);
+				EnableDlgItem(IDC_BGIMG_BUTTON, FALSE);
 
-				GetDlgItem(IDC_BGIMG_BRIGHTNESS)->EnableWindow(FALSE);
-				GetDlgItem(IDC_EDIT_BGIMG_BRIGHTNESS)->EnableWindow(FALSE);
+				EnableDlgItem(IDC_BGIMG_BRIGHTNESS, FALSE);
+				EnableDlgItem(IDC_EDIT_BGIMG_BRIGHTNESS, FALSE);
 
 				// \x96\xB3\x8C\x{27B0B3}\x82ꂽ\x82\xE7\x81ABGThemeFile \x82\xF0\x8C\xB3\x82ɖ߂\xB7\x81B
 				strncpy_s(ts.EtermLookfeel.BGThemeFile, BG_THEME_IMAGEFILE_DEFAULT, sizeof(ts.EtermLookfeel.BGThemeFile));
 				// \x94w\x8Ci\x89摜\x82\xE0\x96\xB3\x8C\x{27B0B7}\x82\xE9\x81B
-				SetDlgItemText(IDC_BGIMG_EDIT, "");
+				SetDlgItemTextT(IDC_BGIMG_EDIT, _T(""));
 				SetDlgItemInt(IDC_EDIT_BGIMG_BRIGHTNESS, BG_THEME_IMAGE_BRIGHTNESS_DEFAULT);
 			}
 			return TRUE;
 
 		case IDC_BGIMG_CHECK:
-			btn = (CButton *)GetDlgItem(IDC_BGIMG_CHECK);
-			if (btn->GetCheck()) {
-				GetDlgItem(IDC_BGIMG_EDIT)->EnableWindow(TRUE);
-				GetDlgItem(IDC_BGIMG_BUTTON)->EnableWindow(TRUE);
+			if (GetCheck(IDC_BGIMG_CHECK)) {
+				EnableDlgItem(IDC_BGIMG_EDIT, TRUE);
+				EnableDlgItem(IDC_BGIMG_BUTTON, TRUE);
 
-				GetDlgItem(IDC_BGIMG_BRIGHTNESS)->EnableWindow(TRUE);
-				GetDlgItem(IDC_EDIT_BGIMG_BRIGHTNESS)->EnableWindow(TRUE);
+				EnableDlgItem(IDC_BGIMG_BRIGHTNESS, TRUE);
+				EnableDlgItem(IDC_EDIT_BGIMG_BRIGHTNESS, TRUE);
 
 				strncpy_s(ts.EtermLookfeel.BGThemeFile, BG_THEME_IMAGEFILE, sizeof(ts.EtermLookfeel.BGThemeFile));
 			} else {
-				GetDlgItem(IDC_BGIMG_EDIT)->EnableWindow(FALSE);
-				GetDlgItem(IDC_BGIMG_BUTTON)->EnableWindow(FALSE);
+				EnableDlgItem(IDC_BGIMG_EDIT, FALSE);
+				EnableDlgItem(IDC_BGIMG_BUTTON, FALSE);
 
-				GetDlgItem(IDC_BGIMG_BRIGHTNESS)->EnableWindow(FALSE);
-				GetDlgItem(IDC_EDIT_BGIMG_BRIGHTNESS)->EnableWindow(FALSE);
+				EnableDlgItem(IDC_BGIMG_BRIGHTNESS, FALSE);
+				EnableDlgItem(IDC_EDIT_BGIMG_BRIGHTNESS, FALSE);
 
 				// \x96\xB3\x8C\x{27B0B3}\x82ꂽ\x82\xE7\x81ABGThemeFile \x82\xF0\x8C\xB3\x82ɖ߂\xB7\x81B
 				strncpy_s(ts.EtermLookfeel.BGThemeFile, BG_THEME_IMAGEFILE_DEFAULT, sizeof(ts.EtermLookfeel.BGThemeFile));
 				// \x94w\x8Ci\x89摜\x82\xE0\x96\xB3\x8C\x{27B0B7}\x82\xE9\x81B
-				SetDlgItemText(IDC_BGIMG_EDIT, "");
+				SetDlgItemTextT(IDC_BGIMG_EDIT, _T(""));
 				SetDlgItemInt(IDC_EDIT_BGIMG_BRIGHTNESS, BG_THEME_IMAGE_BRIGHTNESS_DEFAULT);
 			}
 			return TRUE;
@@ -1191,25 +819,29 @@
 		case IDC_BGIMG_BUTTON | (BN_CLICKED << 16):
 			// \x94w\x8Ci\x89摜\x82\xF0\x83_\x83C\x83A\x83\x8D\x83O\x82Ŏw\x92肷\x82\xE9\x81B
 			{
-				CString         filter("Image Files(*.jpg;*.jpeg;*.bmp)|*.jpg;*.jpeg;*.bmp|All Files(*.*)|*.*||");
-				CFileDialog     selDlg(TRUE, NULL, NULL, OFN_HIDEREADONLY, filter);
-				if (selDlg.DoModal() == IDOK) {
-					// \x94w\x8Ci\x89摜\x8Ew\x92肪\x88Ӑ}\x93I\x82ɍs\x82\xED\x82ꂽ\x82\xE7\x81ABGThemeFile \x82\xF0\x8CŒ艻\x82\xB7\x82\xE9\x81B
-					SetDlgItemText(IDC_BGIMG_EDIT, selDlg.GetPathName());
+				OPENFILENAMEA ofn;
+				char szFile[MAX_PATH];
+
+				memset(&ofn, 0, sizeof(ofn));
+				memset(szFile, 0, sizeof(szFile));
+				ofn.lStructSize = get_OPENFILENAME_SIZEA();
+				ofn.hwndOwner = m_pSheet->m_hWnd;
+				ofn.lpstrFilter = "Image Files(*.jpg;*.jpeg;*.bmp)\0*.jpg;*.jpeg;*.bmp\0All Files(*.*)\0*.*\0";
+				ofn.lpstrFile = szFile;
+				ofn.nMaxFile = _countof(szFile);
+				ofn.lpstrTitle = "select image file";
+				ofn.Flags = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY;
+				if (GetOpenFileNameA(&ofn) != 0) {
+					SetDlgItemTextA(IDC_BGIMG_EDIT, szFile);
 				}
 			}
 			return TRUE;
 
 		case IDC_ANSI_COLOR | (LBN_SELCHANGE << 16):
-			listbox = (CListBox *)GetDlgItem(IDC_ANSI_COLOR);
-			sel = listbox->GetCurSel();
+			sel = SendDlgItemMessage(IDC_ANSI_COLOR, LB_GETCURSEL, 0, 0);
 			if (sel != -1) {
-				SetupRGBbox(GetSafeHwnd(), sel);
-#if 0
-				SendMessage(WM_CTLCOLORSTATIC,
-				            (WPARAM)label_hdc,
-				            (LPARAM)GetDlgItem(IDC_SAMPLE_COLOR));
-#endif
+				SetupRGBbox(sel);
+				::InvalidateRect(GetDlgItem(IDC_SAMPLE_COLOR), NULL, TRUE);
 			}
 			return TRUE;
 
@@ -1218,81 +850,61 @@
 		case IDC_COLOR_BLUE | (EN_KILLFOCUS << 16):
 			{
 				BYTE r, g, b;
+				char buf[8];
 
-				listbox = (CListBox *)GetDlgItem(IDC_ANSI_COLOR);
-				sel = listbox->GetCurSel();
+				sel = GetCurSel(IDC_ANSI_COLOR);
 				if (sel < 0 && sel > sizeof(ts.ANSIColor)-1) {
 					return TRUE;
 				}
 
-				GetDlgItemText(IDC_COLOR_RED, buf, sizeof(buf));
+				GetDlgItemTextA(IDC_COLOR_RED, buf, sizeof(buf));
 				r = atoi(buf);
 
-				GetDlgItemText(IDC_COLOR_GREEN, buf, sizeof(buf));
+				GetDlgItemTextA(IDC_COLOR_GREEN, buf, sizeof(buf));
 				g = atoi(buf);
 
-				GetDlgItemText(IDC_COLOR_BLUE, buf, sizeof(buf));
+				GetDlgItemTextA(IDC_COLOR_BLUE, buf, sizeof(buf));
 				b = atoi(buf);
 
 				ts.ANSIColor[sel] = RGB(r, g, b);
 
 				// 255\x82𒴂\xA6\x82\xBDRGB\x92l\x82͕␳\x82\xB3\x82\xEA\x82\xE9\x82̂ŁA\x82\xBB\x82\xEA\x82\xF0Edit\x82ɕ\\x8E\xA6\x82\xB7\x82\xE9 (2007.2.18 maya)
-				SetupRGBbox(GetSafeHwnd(), sel);
-#if 0
-				SendMessage(WM_CTLCOLORSTATIC,
-				            (WPARAM)label_hdc,
-				            (LPARAM)GetDlgItem(IDC_SAMPLE_COLOR));
-#endif
+				SetupRGBbox(sel);
+
+				::InvalidateRect(GetDlgItem(IDC_SAMPLE_COLOR), NULL, TRUE);
 			}
 
 			return TRUE;
-#if 0
-		case WM_CTLCOLORSTATIC:
-			{
-				HDC hDC = (HDC)wp;
-				HWND hWnd = (HWND)lp;
+	}
 
-				//if (label_hdc == NULL) {
-					hDC = GetWindowDC(GetDlgItem(hDlgWnd, IDC_SAMPLE_COLOR));
-				//	label_hdc = hDC;
-				//}
+	return TTCPropertyPage::OnCommand(wParam, lParam);
+}
 
-				if ( hWnd == GetDlgItem(hDlgWnd, IDC_SAMPLE_COLOR) ) {
-					BYTE r, g, b;
+HBRUSH CVisualPropPageDlg::OnCtlColor(HDC hDC, HWND hWnd)
+{
+	if ( hWnd == GetDlgItem(IDC_SAMPLE_COLOR) ) {
+		BYTE r, g, b;
+		char buf[8];
 
-					hWnd = GetDlgItem(hDlgWnd, IDC_COLOR_RED);
-					SendMessage(hWnd, WM_GETTEXT , sizeof(buf), (LPARAM)buf);
-					r = atoi(buf);
+		GetDlgItemTextA(IDC_COLOR_RED, buf, sizeof(buf));
+		r = atoi(buf);
 
-					hWnd = GetDlgItem(hDlgWnd, IDC_COLOR_GREEN);
-					SendMessage(hWnd, WM_GETTEXT , sizeof(buf), (LPARAM)buf);
-					g = atoi(buf);
+		GetDlgItemTextA(IDC_COLOR_GREEN, buf, sizeof(buf));
+		g = atoi(buf);
 
-					hWnd = GetDlgItem(hDlgWnd, IDC_COLOR_BLUE);
-					SendMessage(hWnd, WM_GETTEXT , sizeof(buf), (LPARAM)buf);
-					b = atoi(buf);
+		GetDlgItemTextA(IDC_COLOR_BLUE, buf, sizeof(buf));
+		b = atoi(buf);
 
-					OutputDebugPrintf("%06x\n", RGB(r, g, b));
+		SetBkMode(hDC, TRANSPARENT);
+		SetTextColor(hDC, RGB(r, g, b) );
 
-					SetBkMode(hDC, TRANSPARENT);
-					SetTextColor(hDC, RGB(r, g, b) );
-					ReleaseDC(hDlgWnd, hDC);
-
-					return (BOOL)(HBRUSH)GetStockObject(NULL_BRUSH);
-				}
-				return FALSE;
-			}
-			break ;
-#endif
+		return (HBRUSH)GetStockObject(NULL_BRUSH);
 	}
-
-	return CPropertyPage::OnCommand(wParam, lParam);
+	return TTCPropertyPage::OnCtlColor(hDC, hWnd);
 }
 
 void CVisualPropPageDlg::OnOK()
 {
-	CButton *btn;
-	CComboBox *cmb;
 	int sel;
 	char buf[MAXPATHLEN];
 	COLORREF TmpColor;
@@ -1299,7 +911,7 @@
 	int flag_changed = 0;
 
 	// (1)
-	GetDlgItemText(IDC_ALPHA_BLEND_ACTIVE, buf, sizeof(buf));
+	GetDlgItemTextA(IDC_ALPHA_BLEND_ACTIVE, buf, sizeof(buf));
 	if (isdigit(buf[0])) {
 		int i = atoi(buf);
 		ts.AlphaBlendActive =
@@ -1306,10 +918,10 @@
 			(i < 0) ? 0 :
 			(i > 255) ? 255 : i;
 	}
-	GetDlgItemText(IDC_ALPHA_BLEND_INACTIVE, buf, sizeof(buf));
+	GetDlgItemTextA(IDC_ALPHA_BLEND_INACTIVE, buf, sizeof(buf));
 	if (isdigit(buf[0])) {
 		int i = atoi(buf);
-		ts.AlphaBlendInactive =
+		ts.AlphaBlendInactive = 
 			(i < 0) ? 0 :
 			(i > 255) ? 255 : i;
 	}
@@ -1317,35 +929,32 @@
 	// (2)
 	// \x83O\x83\x8D\x81[\x83o\x83\x8B\x95ϐ\x94 BGEnable \x82𒼐ڏ\x91\x82\xAB\x8A\xB7\x82\xA6\x82\xE9\x82ƁA\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82\xAA\x97\x8E\x82\xBF\x82邱\x82Ƃ\xAA
 	// \x82\xA0\x82\xE9\x82̂ŃR\x83s\x81[\x82\xF0\x8FC\x90\xB3\x82\xB7\x82\xE9\x82݂̂Ƃ\xB7\x82\xE9\x81B(2005.4.24 yutaka)
-	btn = (CButton *)GetDlgItem(IDC_ETERM_LOOKFEEL);
-	if (ts.EtermLookfeel.BGEnable != btn->GetCheck()) {
+	if (ts.EtermLookfeel.BGEnable != GetCheck(IDC_ETERM_LOOKFEEL)) {
 		flag_changed = 1;
-		ts.EtermLookfeel.BGEnable = btn->GetCheck();
+		ts.EtermLookfeel.BGEnable = GetCheck(IDC_ETERM_LOOKFEEL);
 	}
-
 	if (ts.EtermLookfeel.BGEnable) {
-		GetDlgItemText(IDC_BGIMG_EDIT, ts.BGImageFilePath, sizeof(ts.BGImageFilePath));
+		GetDlgItemTextA(IDC_BGIMG_EDIT, ts.BGImageFilePath, sizeof(ts.BGImageFilePath));
 	} else {
 		strncpy_s(ts.BGImageFilePath, sizeof(ts.BGImageFilePath), "%SystemRoot%\\Web\\Wallpaper\\*.bmp", _TRUNCATE);
 	}
 
-	GetDlgItemText(IDC_EDIT_BGIMG_BRIGHTNESS, buf, sizeof(buf));
+	GetDlgItemTextA(IDC_EDIT_BGIMG_BRIGHTNESS, buf, sizeof(buf));
 	if (isdigit(buf[0])) {
-		ts.BGImgBrightness = atoi(buf);
-		ts.BGImgBrightness = max(0, ts.BGImgBrightness);
-		ts.BGImgBrightness = min(255, ts.BGImgBrightness);
+		int i = atoi(buf);
+		ts.BGImgBrightness = 
+			(i < 0) ? 0 :
+			(i > 255) ? 255 : i;
 	}
 
 	// (3)
-	cmb = (CComboBox *)GetDlgItem(IDC_MOUSE_CURSOR);
-	sel = cmb->GetCurSel();
+	sel = GetCurSel(IDC_MOUSE_CURSOR);
 	if (sel >= 0 && sel < MOUSE_CURSOR_MAX) {
 		strncpy_s(ts.MouseCursorName, sizeof(ts.MouseCursorName), MouseCursor[sel].name, _TRUNCATE);
 	}
 
 	// (4)Font quality
-	cmb = (CComboBox *)GetDlgItem(IDC_FONT_QUALITY);
-	switch (cmb->GetCurSel()) {
+	switch (GetCurSel(IDC_FONT_QUALITY)) {
 		case 0:
 			ts.FontQuality = DEFAULT_QUALITY;
 			break;
@@ -1363,22 +972,19 @@
 	}
 
 	// (6) Attr Bold Color
-	btn = (CButton *)GetDlgItem(IDC_ENABLE_ATTR_COLOR_BOLD);
-	if (((ts.ColorFlag & CF_BOLDCOLOR) != 0) != btn->GetCheck()) {
+	if (((ts.ColorFlag & CF_BOLDCOLOR) != 0) != GetCheck(IDC_ENABLE_ATTR_COLOR_BOLD)) {
 		ts.ColorFlag ^= CF_BOLDCOLOR;
 	}
 
 	// (7) Attr Blink Color
-	btn = (CButton *)GetDlgItem(IDC_ENABLE_ATTR_COLOR_BLINK);
-	if (((ts.ColorFlag & CF_BLINKCOLOR) != 0) != btn->GetCheck()) {
+	if (((ts.ColorFlag & CF_BLINKCOLOR) != 0) != GetCheck(IDC_ENABLE_ATTR_COLOR_BLINK)) {
 		ts.ColorFlag ^= CF_BLINKCOLOR;
 	}
 
 	// (8) Attr Reverse Color
-	btn = (CButton *)GetDlgItem(IDC_ENABLE_ATTR_COLOR_REVERSE);
 	if (ts.ColorFlag & CF_REVERSEVIDEO) { // Reverse Video\x83\x82\x81[\x83h(DECSCNM)\x8E\x9E\x82͏\x88\x97\x9D\x82\xF0\x95ς\xA6\x82\xE9
 		if (ts.ColorFlag & CF_REVERSECOLOR) {
-			if (!btn->GetCheck()) {
+			if (!GetCheck(IDC_ENABLE_ATTR_COLOR_REVERSE)) {
 				TmpColor = ts.VTColor[0];
 				ts.VTColor[0] = ts.VTReverseColor[1];
 				ts.VTReverseColor[1] = ts.VTColor[1];
@@ -1387,7 +993,7 @@
 				ts.ColorFlag ^= CF_REVERSECOLOR;
 			}
 		}
-		else if (btn->GetCheck()) {
+		else if (GetCheck(IDC_ENABLE_ATTR_COLOR_REVERSE)) {
 			TmpColor = ts.VTColor[0];
 			ts.VTColor[0] = ts.VTReverseColor[0];
 			ts.VTReverseColor[0] = ts.VTColor[1];
@@ -1396,25 +1002,22 @@
 			ts.ColorFlag ^= CF_REVERSECOLOR;
 		}
 	}
-	else if (((ts.ColorFlag & CF_REVERSECOLOR) != 0) != btn->GetCheck()) {
+	else if (((ts.ColorFlag & CF_REVERSECOLOR) != 0) != GetCheck(IDC_ENABLE_ATTR_COLOR_REVERSE)) {
 		ts.ColorFlag ^= CF_REVERSECOLOR;
 	}
 
 	// (9) URL Color
-	btn = (CButton *)GetDlgItem(IDC_ENABLE_URL_COLOR);
-	if (((ts.ColorFlag & CF_URLCOLOR) != 0) != btn->GetCheck()) {
+	if (((ts.ColorFlag & CF_URLCOLOR) != 0) != GetCheck(IDC_ENABLE_URL_COLOR)) {
 		ts.ColorFlag ^= CF_URLCOLOR;
 	}
 
 	// (10) Color
-	btn = (CButton *)GetDlgItem(IDC_ENABLE_ANSI_COLOR);
-	if (((ts.ColorFlag & CF_ANSICOLOR) != 0) != btn->GetCheck()) {
+	if (((ts.ColorFlag & CF_ANSICOLOR) != 0) != GetCheck(IDC_ENABLE_ANSI_COLOR)) {
 		ts.ColorFlag ^= CF_ANSICOLOR;
 	}
 
 	// (11) URL Underline
-	btn = (CButton *)GetDlgItem(IDC_URL_UNDERLINE);
-	if (((ts.FontFlag & FF_URLUNDERLINE) != 0) != btn->GetCheck()) {
+	if (((ts.FontFlag & FF_URLUNDERLINE) != 0) != GetCheck(IDC_URL_UNDERLINE)) {
 		ts.FontFlag ^= FF_URLUNDERLINE;
 	}
 
@@ -1428,32 +1031,29 @@
 
 // CLogPropPageDlg \x83_\x83C\x83A\x83\x8D\x83O
 
-IMPLEMENT_DYNAMIC(CLogPropPageDlg, CPropertyPage)
-
-CLogPropPageDlg::CLogPropPageDlg()
-	: CPropertyPage(CLogPropPageDlg::IDD)
+CLogPropPageDlg::CLogPropPageDlg(HINSTANCE inst, TTCPropertySheet *sheet)
+	: TTCPropertyPage(inst, CLogPropPageDlg::IDD, sheet)
 {
-
+	TCHAR UIMsg[MAX_UIMSG];
+	get_lang_msgT("DLG_TABSHEET_TITLE_Log", UIMsg, _countof(UIMsg),
+	             _T("Log"), ts.UILanguageFile);
+	m_psp.pszTitle = _tcsdup(UIMsg);
+	m_psp.dwFlags |= PSP_USETITLE;
 }
 
 CLogPropPageDlg::~CLogPropPageDlg()
 {
-	if (DlgLogFont != NULL) {
-		DeleteObject(DlgLogFont);
-	}
+	free((void *)m_psp.pszTitle);
 }
 
-BEGIN_MESSAGE_MAP(CLogPropPageDlg, CPropertyPage)
-END_MESSAGE_MAP()
-
 // CLogPropPageDlg \x83\x81\x83b\x83Z\x81[\x83W \x83n\x83\x93\x83h\x83\x89
 
 #define LOG_ROTATE_SIZETYPE_NUM 3
-static char *LogRotateSizeType[] = {
+static const char *LogRotateSizeType[] = {
 	"Byte", "KB", "MB"
 };
 
-static char *GetLogRotateSizeType(int val)
+static const char *GetLogRotateSizeType(int val)
 {
 	if (val >= LOG_ROTATE_SIZETYPE_NUM)
 		val = 0;
@@ -1461,175 +1061,101 @@
 	return LogRotateSizeType[val];
 }
 
-BOOL CLogPropPageDlg::OnInitDialog()
+void CLogPropPageDlg::OnInitDialog()
 {
-	char uimsg[MAX_UIMSG];
-	CButton *btn;
-	CComboBox *combo;
-	int i, TmpLogRotateSize;
+	TTCPropertyPage::OnInitDialog();
 
-	CPropertyPage::OnInitDialog();
-
-	font = (HFONT)SendMessage(WM_GETFONT, 0, 0);
-	GetObject(font, sizeof(LOGFONT), &logfont);
-	if (get_lang_font("DLG_TAHOMA_FONT", GetSafeHwnd(), &logfont, &DlgLogFont, ts.UILanguageFile)) {
-		SendDlgItemMessage(IDC_VIEWLOG_LABEL, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_VIEWLOG_EDITOR, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_VIEWLOG_PATH, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_DEFAULTNAME_LABEL, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_DEFAULTNAME_EDITOR, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_DEFAULTPATH_LABEL, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_DEFAULTPATH_EDITOR, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_DEFAULTPATH_PUSH, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_AUTOSTART, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
-
+	static const DlgTextInfo TextInfos[] = {
+		{ IDC_VIEWLOG_LABEL, "DLG_TAB_LOG_EDITOR" },
+		{ IDC_DEFAULTNAME_LABEL, "DLG_TAB_LOG_FILENAME" },
+		{ IDC_DEFAULTPATH_LABEL, "DLG_TAB_LOG_FILEPATH" },
+		{ IDC_AUTOSTART, "DLG_TAB_LOG_AUTOSTART" },
 		// Log rotate
-		SendDlgItemMessage(IDC_LOG_ROTATE, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_ROTATE_SIZE_TEXT, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_ROTATE_SIZE, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_ROTATE_SIZE_TYPE, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_ROTATE_STEP_TEXT, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_ROTATE_STEP, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
-
+		{ IDC_LOG_ROTATE, "DLG_TAB_LOG_ROTATE" },
+		{ IDC_ROTATE_SIZE_TEXT, "DLG_TAB_LOG_ROTATE_SIZE_TEXT" },
+		{ IDC_ROTATE_STEP_TEXT, "DLG_TAB_LOG_ROTATESTEP" },
 		// Log options
-		SendDlgItemMessage(IDC_LOG_OPTION_GROUP, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_OPT_BINARY, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_OPT_APPEND, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_OPT_PLAINTEXT, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_OPT_TIMESTAMP, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_OPT_HIDEDLG, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_OPT_INCBUF, WM_SETFONT, (WPARAM)DlgLogFont, MAKELPARAM(TRUE,0));
-	}
-	else {
-		DlgLogFont = NULL;
-	}
+		// FIXME: \x83\x81\x83b\x83Z\x81[\x83W\x83J\x83^\x83\x8D\x83O\x82͊\xF9\x91\xB6\x82̃\x8D\x83O\x83I\x83v\x83V\x83\x87\x83\x93\x82̂\xE0\x82̂𗬗p\x82\xB5\x82\xBD\x82\xAA\x81A\x83A\x83N\x83Z\x83\x89\x83\x8C\x81[\x83^\x83L\x81[\x82\xAA\x8Fd\x95\xA1\x82\xB7\x82邩\x82\xE0\x82\xB5\x82\xEA\x82Ȃ\xA2\x81B
+		{ IDC_LOG_OPTION_GROUP, "DLG_FOPT" },
+		{ IDC_OPT_BINARY, "DLG_FOPT_BINARY" },
+		{ IDC_OPT_APPEND, "DLG_FOPT_APPEND" },
+		{ IDC_OPT_PLAINTEXT, "DLG_FOPT_PLAIN" },
+		{ IDC_OPT_HIDEDLG, "DLG_FOPT_HIDEDIALOG" },
+		{ IDC_OPT_INCBUF, "DLG_FOPT_ALLBUFFINFIRST" },
+		{ IDC_OPT_TIMESTAMP, "DLG_FOPT_TIMESTAMP" },
+	};
+	SetDlgTexts(m_hWnd, TextInfos, _countof(TextInfos), ts.UILanguageFile);
 
-	GetDlgItemText(IDC_VIEWLOG_LABEL, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_LOG_EDITOR", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_VIEWLOG_LABEL, ts.UIMsg);
-	GetDlgItemText(IDC_DEFAULTNAME_LABEL, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_LOG_FILENAME", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_DEFAULTNAME_LABEL, ts.UIMsg);
-	GetDlgItemText(IDC_DEFAULTPATH_LABEL, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_LOG_FILEPATH", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_DEFAULTPATH_LABEL, ts.UIMsg);
-	GetDlgItemText(IDC_AUTOSTART, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_LOG_AUTOSTART", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_AUTOSTART, ts.UIMsg);
-	// Log rotate
-	GetDlgItemText(IDC_LOG_ROTATE, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_LOG_ROTATE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_LOG_ROTATE, ts.UIMsg);
-	GetDlgItemText(IDC_ROTATE_SIZE_TEXT, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_LOG_ROTATE_SIZE_TEXT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_ROTATE_SIZE_TEXT, ts.UIMsg);
-	GetDlgItemText(IDC_ROTATE_STEP_TEXT, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_LOG_ROTATESTEP", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_ROTATE_STEP_TEXT, ts.UIMsg);
-	// Log options
-	// FIXME: \x83\x81\x83b\x83Z\x81[\x83W\x83J\x83^\x83\x8D\x83O\x82͊\xF9\x91\xB6\x82̃\x8D\x83O\x83I\x83v\x83V\x83\x87\x83\x93\x82̂\xE0\x82̂𗬗p\x82\xB5\x82\xBD\x82\xAA\x81A\x83A\x83N\x83Z\x83\x89\x83\x8C\x81[\x83^\x83L\x81[\x82\xAA\x8Fd\x95\xA1\x82\xB7\x82邩\x82\xE0\x82\xB5\x82\xEA\x82Ȃ\xA2\x81B
-	GetDlgItemText(IDC_LOG_OPTION_GROUP, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_FOPT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_LOG_OPTION_GROUP, ts.UIMsg);
-	GetDlgItemText(IDC_OPT_BINARY, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_FOPT_BINARY", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_OPT_BINARY, ts.UIMsg);
-	GetDlgItemText(IDC_OPT_APPEND, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_FOPT_APPEND", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_OPT_APPEND, ts.UIMsg);
-	GetDlgItemText(IDC_OPT_PLAINTEXT, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_FOPT_PLAIN", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_OPT_PLAINTEXT, ts.UIMsg);
-	GetDlgItemText(IDC_OPT_HIDEDLG, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_FOPT_HIDEDIALOG", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_OPT_HIDEDLG, ts.UIMsg);
-	GetDlgItemText(IDC_OPT_INCBUF, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_FOPT_ALLBUFFINFIRST", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_OPT_INCBUF, ts.UIMsg);
-	GetDlgItemText(IDC_OPT_TIMESTAMP, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_FOPT_TIMESTAMP", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_OPT_TIMESTAMP, ts.UIMsg);
+	TCHAR UIMsg[MAX_UIMSG];
+	get_lang_msgT("DLG_FOPT_TIMESTAMP_LOCAL", UIMsg, _countof(UIMsg), _T("Local Time"), ts.UILanguageFile);
+	SendDlgItemMessage(IDC_OPT_TIMESTAMP_TYPE, CB_ADDSTRING, 0, (LPARAM)UIMsg);
+	get_lang_msgT("DLG_FOPT_TIMESTAMP_UTC", UIMsg, _countof(UIMsg), _T("UTC"), ts.UILanguageFile);
+	SendDlgItemMessage(IDC_OPT_TIMESTAMP_TYPE, CB_ADDSTRING, 0, (LPARAM)UIMsg);
+	get_lang_msgT("DLG_FOPT_TIMESTAMP_ELAPSED_LOGGING", UIMsg, _countof(UIMsg), _T("Elapsed Time (Logging)"), ts.UILanguageFile);
+	SendDlgItemMessage(IDC_OPT_TIMESTAMP_TYPE, CB_ADDSTRING, 0, (LPARAM)UIMsg);
+	get_lang_msgT("DLG_FOPT_TIMESTAMP_ELAPSED_CONNECTION", UIMsg, _countof(UIMsg), _T("Elapsed Time (Connection)"), ts.UILanguageFile);
+	SendDlgItemMessage(IDC_OPT_TIMESTAMP_TYPE, CB_ADDSTRING, 0, (LPARAM)UIMsg);
 
-	get_lang_msg("DLG_FOPT_TIMESTAMP_LOCAL", ts.UIMsg, sizeof(ts.UIMsg), "Local Time", ts.UILanguageFile);
-	SendDlgItemMessage(IDC_OPT_TIMESTAMP_TYPE, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
-	get_lang_msg("DLG_FOPT_TIMESTAMP_UTC", ts.UIMsg, sizeof(ts.UIMsg), "UTC", ts.UILanguageFile);
-	SendDlgItemMessage(IDC_OPT_TIMESTAMP_TYPE, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
-	get_lang_msg("DLG_FOPT_TIMESTAMP_ELAPSED_LOGGING", ts.UIMsg, sizeof(ts.UIMsg), "Elapsed Time (Logging)", ts.UILanguageFile);
-	SendDlgItemMessage(IDC_OPT_TIMESTAMP_TYPE, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
-	get_lang_msg("DLG_FOPT_TIMESTAMP_ELAPSED_CONNECTION", ts.UIMsg, sizeof(ts.UIMsg), "Elapsed Time (Connection)", ts.UILanguageFile);
-	SendDlgItemMessage(IDC_OPT_TIMESTAMP_TYPE, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
 
-
 	// Viewlog Editor path (2005.1.29 yutaka)
-	SetDlgItemText(IDC_VIEWLOG_EDITOR, ts.ViewlogEditor);
+	SetDlgItemTextA(IDC_VIEWLOG_EDITOR, ts.ViewlogEditor);
 
 	// Log Default File Name (2006.8.28 maya)
-	SetDlgItemText(IDC_DEFAULTNAME_EDITOR, ts.LogDefaultName);
+	SetDlgItemTextA(IDC_DEFAULTNAME_EDITOR, ts.LogDefaultName);
 
 	// Log Default File Path (2007.5.30 maya)
-	SetDlgItemText(IDC_DEFAULTPATH_EDITOR, ts.LogDefaultPath);
+	SetDlgItemTextA(IDC_DEFAULTPATH_EDITOR, ts.LogDefaultPath);
 
 	/* Auto start logging (2007.5.31 maya) */
-	btn = (CButton *)GetDlgItem(IDC_AUTOSTART);
-	btn->SetCheck(ts.LogAutoStart);
+	SetCheck(IDC_AUTOSTART, ts.LogAutoStart);
 
 	// Log rotate
-	btn = (CButton *)GetDlgItem(IDC_LOG_ROTATE);
-	btn->SetCheck(ts.LogRotate != ROTATE_NONE);
+	SetCheck(IDC_LOG_ROTATE, ts.LogRotate != ROTATE_NONE);
 
-	combo = (CComboBox *)GetDlgItem(IDC_ROTATE_SIZE_TYPE);
-	for (i = 0 ; i < LOG_ROTATE_SIZETYPE_NUM ; i++) {
-		combo->AddString(LogRotateSizeType[i]);
+	for (int i = 0 ; i < LOG_ROTATE_SIZETYPE_NUM ; i++) {
+		SendDlgItemMessageA(IDC_ROTATE_SIZE_TYPE, CB_ADDSTRING, 0, (LPARAM)LogRotateSizeType[i]);
 	}
-
-	TmpLogRotateSize = ts.LogRotateSize;
-	for (i = 0 ; i < ts.LogRotateSizeType ; i++)
+	int TmpLogRotateSize = ts.LogRotateSize;
+	for (int i = 0 ; i < ts.LogRotateSizeType ; i++)
 		TmpLogRotateSize /= 1024;
 	SetDlgItemInt(IDC_ROTATE_SIZE, TmpLogRotateSize, FALSE);
-	combo->SelectString(-1, GetLogRotateSizeType(ts.LogRotateSizeType));
+	SendDlgItemMessageA(IDC_ROTATE_SIZE_TYPE, CB_SELECTSTRING, -1, (LPARAM)GetLogRotateSizeType(ts.LogRotateSizeType));
 	SetDlgItemInt(IDC_ROTATE_STEP, ts.LogRotateStep, FALSE);
 	if (ts.LogRotate == ROTATE_NONE) {
-		GetDlgItem(IDC_ROTATE_SIZE_TEXT)->EnableWindow(FALSE);
-		GetDlgItem(IDC_ROTATE_SIZE)->EnableWindow(FALSE);
-		GetDlgItem(IDC_ROTATE_SIZE_TYPE)->EnableWindow(FALSE);
-		GetDlgItem(IDC_ROTATE_STEP_TEXT)->EnableWindow(FALSE);
-		GetDlgItem(IDC_ROTATE_STEP)->EnableWindow(FALSE);
+		EnableDlgItem(IDC_ROTATE_SIZE_TEXT, FALSE);
+		EnableDlgItem(IDC_ROTATE_SIZE, FALSE);
+		EnableDlgItem(IDC_ROTATE_SIZE_TYPE, FALSE);
+		EnableDlgItem(IDC_ROTATE_STEP_TEXT, FALSE);
+		EnableDlgItem(IDC_ROTATE_STEP, FALSE);
 	} else {
-		GetDlgItem(IDC_ROTATE_SIZE_TEXT)->EnableWindow(TRUE);
-		GetDlgItem(IDC_ROTATE_SIZE)->EnableWindow(TRUE);
-		GetDlgItem(IDC_ROTATE_SIZE_TYPE)->EnableWindow(TRUE);
-		GetDlgItem(IDC_ROTATE_STEP_TEXT)->EnableWindow(TRUE);
-		GetDlgItem(IDC_ROTATE_STEP)->EnableWindow(TRUE);
+		EnableDlgItem(IDC_ROTATE_SIZE_TEXT, TRUE);
+		EnableDlgItem(IDC_ROTATE_SIZE, TRUE);
+		EnableDlgItem(IDC_ROTATE_SIZE_TYPE, TRUE);
+		EnableDlgItem(IDC_ROTATE_STEP_TEXT, TRUE);
+		EnableDlgItem(IDC_ROTATE_STEP, TRUE);
 	}
 
 	// Log options
-	btn = (CButton *)GetDlgItem(IDC_OPT_BINARY);
-	btn->SetCheck(ts.LogBinary != 0);
+	SetCheck(IDC_OPT_BINARY, ts.LogBinary != 0);
 	if (ts.LogBinary) {
-		GetDlgItem(IDC_OPT_PLAINTEXT)->EnableWindow(FALSE);
-		GetDlgItem(IDC_OPT_TIMESTAMP)->EnableWindow(FALSE);
+		EnableDlgItem(IDC_OPT_PLAINTEXT, FALSE);
+		EnableDlgItem(IDC_OPT_TIMESTAMP, FALSE);
 	} else {
-		GetDlgItem(IDC_OPT_PLAINTEXT)->EnableWindow(TRUE);
-		GetDlgItem(IDC_OPT_TIMESTAMP)->EnableWindow(TRUE);
+		EnableDlgItem(IDC_OPT_PLAINTEXT, TRUE);
+		EnableDlgItem(IDC_OPT_TIMESTAMP, TRUE);
 	}
-	btn = (CButton *)GetDlgItem(IDC_OPT_APPEND);
-	btn->SetCheck(ts.Append != 0);
-	btn = (CButton *)GetDlgItem(IDC_OPT_PLAINTEXT);
-	btn->SetCheck(ts.LogTypePlainText != 0);
-	btn = (CButton *)GetDlgItem(IDC_OPT_HIDEDLG);
-	btn->SetCheck(ts.LogHideDialog != 0);
-	btn = (CButton *)GetDlgItem(IDC_OPT_INCBUF);
-	btn->SetCheck(ts.LogAllBuffIncludedInFirst != 0);
-	btn = (CButton *)GetDlgItem(IDC_OPT_TIMESTAMP);
-	btn->SetCheck(ts.LogTimestamp != 0);
+	SetCheck(IDC_OPT_APPEND, ts.Append != 0);
+	SetCheck(IDC_OPT_PLAINTEXT, ts.LogTypePlainText != 0);
+	SetCheck(IDC_OPT_HIDEDLG, ts.LogHideDialog != 0);
+	SetCheck(IDC_OPT_INCBUF, ts.LogAllBuffIncludedInFirst != 0);
+	SetCheck(IDC_OPT_TIMESTAMP, ts.LogTimestamp != 0);
 
-	combo = (CComboBox *)GetDlgItem(IDC_OPT_TIMESTAMP_TYPE);
-	combo->SetCurSel(ts.LogTimestampType);
+	SetCurSel(IDC_OPT_TIMESTAMP_TYPE, ts.LogTimestampType);
 	if (ts.LogBinary || !ts.LogTimestamp) {
-		GetDlgItem(IDC_OPT_TIMESTAMP_TYPE)->EnableWindow(FALSE);
+		EnableDlgItem(IDC_OPT_TIMESTAMP_TYPE, FALSE);
 	}
 	else {
-		GetDlgItem(IDC_OPT_TIMESTAMP_TYPE)->EnableWindow(TRUE);
+		EnableDlgItem(IDC_OPT_TIMESTAMP_TYPE, TRUE);
 	}
 /*
 	switch (ts.LogTimestampType) {
@@ -1650,22 +1176,21 @@
 
 	// \x83_\x83C\x83A\x83\x8D\x83O\x82Ƀt\x83H\x81[\x83J\x83X\x82𓖂Ă\xE9
 	::SetFocus(::GetDlgItem(GetSafeHwnd(), IDC_VIEWLOG_EDITOR));
-
-	return FALSE;
 }
 
 BOOL CLogPropPageDlg::OnCommand(WPARAM wParam, LPARAM lParam)
 {
 	char uimsg[MAX_UIMSG];
-	char buf[MAX_PATH], buf2[MAX_PATH];
+	char buf[MAX_PATH];
+	char buf2[MAX_PATH];
 
 	switch (wParam) {
 		case IDC_VIEWLOG_PATH | (BN_CLICKED << 16):
 			{
-				OPENFILENAME ofn;
+				OPENFILENAMEA ofn;
 
 				ZeroMemory(&ofn, sizeof(ofn));
-				ofn.lStructSize = get_OPENFILENAME_SIZE();
+				ofn.lStructSize = get_OPENFILENAME_SIZEA();
 				ofn.hwndOwner = GetSafeHwnd();
 				get_lang_msg("FILEDLG_SELECT_LOGVIEW_APP_FILTER", ts.UIMsg, sizeof(ts.UIMsg),
 				             "exe(*.exe)\\0*.exe\\0all(*.*)\\0*.*\\0\\0", ts.UILanguageFile);
@@ -1676,8 +1201,8 @@
 				             "Choose a executing file with launching logging file", ts.UILanguageFile);
 				ofn.lpstrTitle = uimsg;
 				ofn.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_FORCESHOWHIDDEN | OFN_HIDEREADONLY;
-				if (GetOpenFileName(&ofn) != 0) {
-					SetDlgItemText(IDC_VIEWLOG_EDITOR, ts.ViewlogEditor);
+				if (GetOpenFileNameA(&ofn) != 0) {
+					SetDlgItemTextA(IDC_VIEWLOG_EDITOR, ts.ViewlogEditor);
 				}
 			}
 			return TRUE;
@@ -1695,20 +1220,18 @@
 
 		case IDC_LOG_ROTATE | (BN_CLICKED << 16):
 			{
-				CButton *btn;
-				btn = (CButton *)GetDlgItem(IDC_LOG_ROTATE);
-				if (btn->GetCheck()) {
-					GetDlgItem(IDC_ROTATE_SIZE_TEXT)->EnableWindow(TRUE);
-					GetDlgItem(IDC_ROTATE_SIZE)->EnableWindow(TRUE);
-					GetDlgItem(IDC_ROTATE_SIZE_TYPE)->EnableWindow(TRUE);
-					GetDlgItem(IDC_ROTATE_STEP_TEXT)->EnableWindow(TRUE);
-					GetDlgItem(IDC_ROTATE_STEP)->EnableWindow(TRUE);
+				if (GetCheck(IDC_LOG_ROTATE)) {
+					EnableDlgItem(IDC_ROTATE_SIZE_TEXT, TRUE);
+					EnableDlgItem(IDC_ROTATE_SIZE, TRUE);
+					EnableDlgItem(IDC_ROTATE_SIZE_TYPE, TRUE);
+					EnableDlgItem(IDC_ROTATE_STEP_TEXT, TRUE);
+					EnableDlgItem(IDC_ROTATE_STEP, TRUE);
 				} else {
-					GetDlgItem(IDC_ROTATE_SIZE_TEXT)->EnableWindow(FALSE);
-					GetDlgItem(IDC_ROTATE_SIZE)->EnableWindow(FALSE);
-					GetDlgItem(IDC_ROTATE_SIZE_TYPE)->EnableWindow(FALSE);
-					GetDlgItem(IDC_ROTATE_STEP_TEXT)->EnableWindow(FALSE);
-					GetDlgItem(IDC_ROTATE_STEP)->EnableWindow(FALSE);
+					EnableDlgItem(IDC_ROTATE_SIZE_TEXT, FALSE);
+					EnableDlgItem(IDC_ROTATE_SIZE, FALSE);
+					EnableDlgItem(IDC_ROTATE_SIZE_TYPE, FALSE);
+					EnableDlgItem(IDC_ROTATE_STEP_TEXT, FALSE);
+					EnableDlgItem(IDC_ROTATE_STEP, FALSE);
 				}
 
 			}
@@ -1716,19 +1239,16 @@
 
 		case IDC_OPT_BINARY | (BN_CLICKED << 16):
 			{
-				CButton *btn;
-				btn = (CButton *)GetDlgItem(IDC_OPT_BINARY);
-				if (btn->GetCheck()) {
-					GetDlgItem(IDC_OPT_PLAINTEXT)->EnableWindow(FALSE);
-					GetDlgItem(IDC_OPT_TIMESTAMP)->EnableWindow(FALSE);
-					GetDlgItem(IDC_OPT_TIMESTAMP_TYPE)->EnableWindow(FALSE);
+				if (GetCheck(IDC_OPT_BINARY)) {
+					EnableDlgItem(IDC_OPT_PLAINTEXT, FALSE);
+					EnableDlgItem(IDC_OPT_TIMESTAMP, FALSE);
+					EnableDlgItem(IDC_OPT_TIMESTAMP_TYPE, FALSE);
 				} else {
-					GetDlgItem(IDC_OPT_PLAINTEXT)->EnableWindow(TRUE);
-					GetDlgItem(IDC_OPT_TIMESTAMP)->EnableWindow(TRUE);
+					EnableDlgItem(IDC_OPT_PLAINTEXT, TRUE);
+					EnableDlgItem(IDC_OPT_TIMESTAMP, TRUE);
 
-					btn = (CButton *)GetDlgItem(IDC_OPT_TIMESTAMP);
-					if (btn->GetCheck()) {
-						GetDlgItem(IDC_OPT_TIMESTAMP_TYPE)->EnableWindow(TRUE);
+					if (GetCheck(IDC_OPT_TIMESTAMP)) {
+						EnableDlgItem(IDC_OPT_TIMESTAMP_TYPE, TRUE);
 					}
 				}
 			}
@@ -1736,18 +1256,16 @@
 
 		case IDC_OPT_TIMESTAMP | (BN_CLICKED << 16):
 			{
-				CButton *btn;
-				btn = (CButton *)GetDlgItem(IDC_OPT_TIMESTAMP);
-				if (btn->GetCheck()) {
-					GetDlgItem(IDC_OPT_TIMESTAMP_TYPE)->EnableWindow(TRUE);
+				if (GetCheck(IDC_OPT_TIMESTAMP)) {
+					EnableDlgItem(IDC_OPT_TIMESTAMP_TYPE, TRUE);
 				} else {
-					GetDlgItem(IDC_OPT_TIMESTAMP_TYPE)->EnableWindow(FALSE);
+					EnableDlgItem(IDC_OPT_TIMESTAMP_TYPE, FALSE);
 				}
 			}
 			return TRUE;
 	}
 
-	return CPropertyPage::OnCommand(wParam, lParam);
+	return TTCPropertyPage::OnCommand(wParam, lParam);
 }
 
 void CLogPropPageDlg::OnOK()
@@ -1755,67 +1273,61 @@
 	char buf[80], buf2[80];
 	time_t time_local;
 	struct tm *tm_local;
-	char uimsg[MAX_UIMSG];
-	CButton *btn;
-	CString str;
-	CComboBox *cmb;
-	int i;
+	TCHAR uimsg[MAX_UIMSG];
+	TCHAR uimsg2[MAX_UIMSG];
 
 	// Viewlog Editor path (2005.1.29 yutaka)
-	GetDlgItemText(IDC_VIEWLOG_EDITOR, ts.ViewlogEditor, sizeof(ts.ViewlogEditor));
+	GetDlgItemText(IDC_VIEWLOG_EDITOR, ts.ViewlogEditor, _countof(ts.ViewlogEditor));
 
 	// Log Default File Name (2006.8.28 maya)
-	GetDlgItemText(IDC_DEFAULTNAME_EDITOR, buf, sizeof(buf));
+	GetDlgItemTextA(IDC_DEFAULTNAME_EDITOR, buf, sizeof(buf));
 	if (isInvalidStrftimeChar(buf)) {
-		get_lang_msg("MSG_ERROR", uimsg, sizeof(uimsg), "ERROR", ts.UILanguageFile);
-		get_lang_msg("MSG_LOGFILE_INVALID_CHAR_ERROR", ts.UIMsg, sizeof(ts.UIMsg),
-		             "Invalid character is included in log file name.", ts.UILanguageFile);
-		MessageBox(ts.UIMsg, uimsg, MB_ICONEXCLAMATION);
+		get_lang_msgT("MSG_ERROR", uimsg, _countof(uimsg), _T("ERROR"), ts.UILanguageFile);
+		get_lang_msgT("MSG_LOGFILE_INVALID_CHAR_ERROR", uimsg2, _countof(uimsg2),
+		              _T("Invalid character is included in log file name."), ts.UILanguageFile);
+		MessageBox(uimsg2, uimsg, MB_ICONEXCLAMATION);
 		return;
 	}
+
 	// \x8C\xBB\x8Dݎ\x9E\x8D\x8F\x82\xF0\x8E擾
 	time(&time_local);
 	tm_local = localtime(&time_local);
 	// \x8E\x9E\x8D\x8F\x95\xB6\x8E\x9A\x97\xF1\x82ɕϊ\xB7
 	if (strlen(buf) != 0 && strftime(buf2, sizeof(buf2), buf, tm_local) == 0) {
-		get_lang_msg("MSG_ERROR", uimsg, sizeof(uimsg), "ERROR", ts.UILanguageFile);
-		get_lang_msg("MSG_LOGFILE_TOOLONG_ERROR", ts.UIMsg, sizeof(ts.UIMsg),
-		             "The log file name is too long.", ts.UILanguageFile);
-		MessageBox(ts.UIMsg, uimsg, MB_ICONEXCLAMATION);
+		get_lang_msgT("MSG_ERROR", uimsg, _countof(uimsg), _T("ERROR"), ts.UILanguageFile);
+		get_lang_msgT("MSG_LOGFILE_TOOLONG_ERROR", uimsg2, _countof(uimsg2),
+					  _T("The log file name is too long."), ts.UILanguageFile);
+		MessageBox(uimsg2, uimsg, MB_ICONEXCLAMATION);
 		return;
 	}
 	if (isInvalidFileNameChar(buf2)) {
-		get_lang_msg("MSG_ERROR", uimsg, sizeof(uimsg), "ERROR", ts.UILanguageFile);
-		get_lang_msg("MSG_LOGFILE_INVALID_CHAR_ERROR", ts.UIMsg, sizeof(ts.UIMsg),
-		             "Invalid character is included in log file name.", ts.UILanguageFile);
-		MessageBox(ts.UIMsg, uimsg, MB_ICONEXCLAMATION);
+		get_lang_msgT("MSG_ERROR", uimsg, _countof(uimsg), _T("ERROR"), ts.UILanguageFile);
+		get_lang_msgT("MSG_LOGFILE_INVALID_CHAR_ERROR", uimsg2, _countof(uimsg2),
+					  _T("Invalid character is included in log file name."), ts.UILanguageFile);
+		MessageBox(uimsg2, uimsg, MB_ICONEXCLAMATION);
 		return;
 	}
 	strncpy_s(ts.LogDefaultName, sizeof(ts.LogDefaultName), buf, _TRUNCATE);
 
 	// Log Default File Path (2007.5.30 maya)
-	GetDlgItemText(IDC_DEFAULTPATH_EDITOR, ts.LogDefaultPath, sizeof(ts.LogDefaultPath));
+	GetDlgItemText(IDC_DEFAULTPATH_EDITOR, ts.LogDefaultPath, _countof(ts.LogDefaultPath));
 
 	/* Auto start logging (2007.5.31 maya) */
-	btn = (CButton *)GetDlgItem(IDC_AUTOSTART);
-	ts.LogAutoStart = btn->GetCheck();
+	ts.LogAutoStart = GetCheck(IDC_AUTOSTART);
 
 	/* Log Rotate */
-	btn = (CButton *)GetDlgItem(IDC_LOG_ROTATE);
-	if (btn->GetCheck()) {  /* on */
+	if (GetCheck(IDC_LOG_ROTATE)) {  /* on */
 		ts.LogRotate = ROTATE_SIZE;
-
-		((CComboBox*)GetDlgItem(IDC_ROTATE_SIZE_TYPE))->GetWindowText(str);
-		for (i = 0 ; i < LOG_ROTATE_SIZETYPE_NUM ; i++) {
-			if (strcmp(str, LogRotateSizeType[i]) == 0)
+		GetDlgItemText(IDC_ROTATE_SIZE_TYPE, buf, _countof(buf));
+		ts.LogRotateSizeType = 0;
+		for (int i = 0 ; i < LOG_ROTATE_SIZETYPE_NUM ; i++) {
+			if (strcmp(buf, LogRotateSizeType[i]) == 0) {
+				ts.LogRotateSizeType = i;
 				break;
+			}
 		}
-		if (i >= LOG_ROTATE_SIZETYPE_NUM)
-			i = 0;
-		ts.LogRotateSizeType = i;
-
 		ts.LogRotateSize = GetDlgItemInt(IDC_ROTATE_SIZE);
-		for (i = 0 ; i < ts.LogRotateSizeType ; i++)
+		for (int i = 0 ; i < ts.LogRotateSizeType ; i++)
 			ts.LogRotateSize *= 1024;
 
 		ts.LogRotateStep = GetDlgItemInt(IDC_ROTATE_STEP);
@@ -1826,8 +1338,7 @@
 	}
 
 	// Log Options
-	btn = (CButton *)GetDlgItem(IDC_OPT_BINARY);
-	if (btn->GetCheck()) {
+	if (GetCheck(IDC_OPT_BINARY)) {
 		ts.LogBinary = 1;
 	}
 	else {
@@ -1834,8 +1345,7 @@
 		ts.LogBinary = 0;
 	}
 
-	btn = (CButton *)GetDlgItem(IDC_OPT_APPEND);
-	if (btn->GetCheck()) {
+	if (GetCheck(IDC_OPT_APPEND)) {
 		ts.Append = 1;
 	}
 	else {
@@ -1842,8 +1352,7 @@
 		ts.Append = 0;
 	}
 
-	btn = (CButton *)GetDlgItem(IDC_OPT_PLAINTEXT);
-	if (btn->GetCheck()) {
+	if (GetCheck(IDC_OPT_PLAINTEXT)) {
 		ts.LogTypePlainText = 1;
 	}
 	else {
@@ -1850,8 +1359,7 @@
 		ts.LogTypePlainText = 0;
 	}
 
-	btn = (CButton *)GetDlgItem(IDC_OPT_HIDEDLG);
-	if (btn->GetCheck()) {
+	if (GetCheck(IDC_OPT_HIDEDLG)) {
 		ts.LogHideDialog = 1;
 	}
 	else {
@@ -1858,8 +1366,7 @@
 		ts.LogHideDialog = 0;
 	}
 
-	btn = (CButton *)GetDlgItem(IDC_OPT_INCBUF);
-	if (btn->GetCheck()) {
+	if (GetCheck(IDC_OPT_INCBUF)) {
 		ts.LogAllBuffIncludedInFirst = 1;
 	}
 	else {
@@ -1866,8 +1373,7 @@
 		ts.LogAllBuffIncludedInFirst = 0;
 	}
 
-	btn = (CButton *)GetDlgItem(IDC_OPT_TIMESTAMP);
-	if (btn->GetCheck()) {
+	if (GetCheck(IDC_OPT_TIMESTAMP)) {
 		ts.LogTimestamp = 1;
 	}
 	else {
@@ -1874,95 +1380,58 @@
 		ts.LogTimestamp = 0;
 	}
 
-	cmb = (CComboBox *)GetDlgItem(IDC_OPT_TIMESTAMP_TYPE);
-	ts.LogTimestampType = cmb->GetCurSel();
+	ts.LogTimestampType = GetCurSel(IDC_OPT_TIMESTAMP_TYPE);
 }
 
+/////////////////////////////
 
 // CCygwinPropPageDlg \x83_\x83C\x83A\x83\x8D\x83O
 
-IMPLEMENT_DYNAMIC(CCygwinPropPageDlg, CPropertyPage)
-
-CCygwinPropPageDlg::CCygwinPropPageDlg()
-	: CPropertyPage(CCygwinPropPageDlg::IDD)
+CCygwinPropPageDlg::CCygwinPropPageDlg(HINSTANCE inst, TTCPropertySheet *sheet)
+	: TTCPropertyPage(inst, CCygwinPropPageDlg::IDD, sheet)
 {
+	TCHAR UIMsg[MAX_UIMSG];
+	get_lang_msgT("DLG_TABSHEET_TITLE_CYGWIN", UIMsg, _countof(UIMsg),
+	             _T("Cygwin"), ts.UILanguageFile);
+	m_psp.pszTitle = _tcsdup(UIMsg);
+	m_psp.dwFlags |= PSP_USETITLE;
 }
 
 CCygwinPropPageDlg::~CCygwinPropPageDlg()
 {
-	if (DlgCygwinFont != NULL) {
-		DeleteObject(DlgCygwinFont);
-	}
+	free((void *)m_psp.pszTitle);
 }
 
-BEGIN_MESSAGE_MAP(CCygwinPropPageDlg, CPropertyPage)
-END_MESSAGE_MAP()
-
 // CCygwinPropPageDlg \x83\x81\x83b\x83Z\x81[\x83W \x83n\x83\x93\x83h\x83\x89
 
-BOOL CCygwinPropPageDlg::OnInitDialog()
+void CCygwinPropPageDlg::OnInitDialog()
 {
-	char uimsg[MAX_UIMSG];
-	CButton *btn;
+	TTCPropertyPage::OnInitDialog();
 
-	CPropertyPage::OnInitDialog();
+	static const DlgTextInfo TextInfos[] = {
+		{ IDC_CYGWIN_PATH_LABEL, "DLG_TAB_CYGWIN_PATH" }
+	};
+	SetDlgTexts(m_hWnd, TextInfos, _countof(TextInfos), ts.UILanguageFile);
 
-	font = (HFONT)SendMessage(WM_GETFONT, 0, 0);
-	GetObject(font, sizeof(LOGFONT), &logfont);
-	if (get_lang_font("DLG_TAHOMA_FONT", GetSafeHwnd(), &logfont, &DlgCygwinFont, ts.UILanguageFile)) {
-		SendDlgItemMessage(IDC_CYGWIN_PATH_LABEL, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_CYGWIN_PATH, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_SELECT_FILE, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_CYGWIN, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_TERM_LABEL, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_TERM_EDIT, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_TERMTYPE_LABEL, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_TERM_TYPE, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_PORTSTART_LABEL, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_PORT_START, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_PORTRANGE_LABEL, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_PORT_RANGE, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_SHELL_LABEL, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_SHELL, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_ENV1_LABEL, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_ENV1, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_ENV2_LABEL, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_ENV2, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_LOGIN_SHELL, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_HOME_CHDIR, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_AGENT_PROXY, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));
-	}
-	else {
-		DlgCygwinFont = NULL;
-	}
+	memcpy(&settings, &ts.CygtermSettings, sizeof(cygterm_t));
 
-	GetDlgItemText(IDC_CYGWIN_PATH_LABEL, uimsg, sizeof(uimsg));
-	get_lang_msg("DLG_TAB_CYGWIN_PATH", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	SetDlgItemText(IDC_CYGWIN_PATH_LABEL, ts.UIMsg);
+	SetDlgItemTextA(IDC_TERM_EDIT, settings.term);
+	SetDlgItemTextA(IDC_TERM_TYPE, settings.term_type);
+	SetDlgItemTextA(IDC_PORT_START, settings.port_start);
+	SetDlgItemTextA(IDC_PORT_RANGE, settings.port_range);
+	SetDlgItemTextA(IDC_SHELL, settings.shell);
+	SetDlgItemTextA(IDC_ENV1, settings.env1);
+	SetDlgItemTextA(IDC_ENV2, settings.env2);
 
-	memcpy(&settings, &ts.CygtermSettings, sizeof(cygterm_t));
+	SetCheck(IDC_LOGIN_SHELL, settings.login_shell);
+	SetCheck(IDC_HOME_CHDIR, settings.home_chdir);
+	SetCheck(IDC_AGENT_PROXY, settings.agent_proxy);
 
-	SetDlgItemText(IDC_TERM_EDIT, settings.term);
-	SetDlgItemText(IDC_TERM_TYPE, settings.term_type);
-	SetDlgItemText(IDC_PORT_START, settings.port_start);
-	SetDlgItemText(IDC_PORT_RANGE, settings.port_range);
-	SetDlgItemText(IDC_SHELL, settings.shell);
-	SetDlgItemText(IDC_ENV1, settings.env1);
-	SetDlgItemText(IDC_ENV2, settings.env2);
-	btn = (CButton *)GetDlgItem(IDC_LOGIN_SHELL);
-	btn->SetCheck(settings.login_shell);
-	btn = (CButton *)GetDlgItem(IDC_HOME_CHDIR);
-	btn->SetCheck(settings.home_chdir);
-	btn = (CButton *)GetDlgItem(IDC_AGENT_PROXY);
-	btn->SetCheck(settings.agent_proxy);
-
 	// Cygwin install path
-	SetDlgItemText(IDC_CYGWIN_PATH, ts.CygwinDirectory);
+	SetDlgItemTextA(IDC_CYGWIN_PATH, ts.CygwinDirectory);
 
 	// \x83_\x83C\x83A\x83\x8D\x83O\x82Ƀt\x83H\x81[\x83J\x83X\x82𓖂Ă\xE9
 	::SetFocus(::GetDlgItem(GetSafeHwnd(), IDC_CYGWIN_PATH));
-
-	return FALSE;
 }
 
 BOOL CCygwinPropPageDlg::OnCommand(WPARAM wParam, LPARAM lParam)
@@ -1974,35 +1443,31 @@
 			// Cygwin install \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82̑I\x91\xF0\x83_\x83C\x83A\x83\x8D\x83O
 			get_lang_msg("DIRDLG_CYGTERM_DIR_TITLE", ts.UIMsg, sizeof(ts.UIMsg),
 			             "Select Cygwin directory", ts.UILanguageFile);
-			GetDlgItemText(IDC_CYGWIN_PATH, buf, sizeof(buf));
+			GetDlgItemTextA(IDC_CYGWIN_PATH, buf, sizeof(buf));
 			if (doSelectFolder(GetSafeHwnd(), buf2, sizeof(buf2), buf, ts.UIMsg)) {
-				SetDlgItemText(IDC_CYGWIN_PATH, buf2);
+				SetDlgItemTextA(IDC_CYGWIN_PATH, buf2);
 			}
 			return TRUE;
 	}
 
-	return CPropertyPage::OnCommand(wParam, lParam);
+	return TTCPropertyPage::OnCommand(wParam, lParam);
 }
 
 void CCygwinPropPageDlg::OnOK()
 {
-	CButton *btn;
-
 	// writing to CygTerm config file
-	GetDlgItemText(IDC_TERM_EDIT, settings.term, sizeof(settings.term));
-	GetDlgItemText(IDC_TERM_TYPE, settings.term_type, sizeof(settings.term_type));
-	GetDlgItemText(IDC_PORT_START, settings.port_start, sizeof(settings.port_start));
-	GetDlgItemText(IDC_PORT_RANGE, settings.port_range, sizeof(settings.port_range));
-	GetDlgItemText(IDC_SHELL, settings.shell, sizeof(settings.shell));
-	GetDlgItemText(IDC_ENV1, settings.env1, sizeof(settings.env1));
-	GetDlgItemText(IDC_ENV2, settings.env2, sizeof(settings.env2));
-	btn = (CButton *)GetDlgItem(IDC_LOGIN_SHELL);
-	settings.login_shell = btn->GetCheck();
-	btn = (CButton *)GetDlgItem(IDC_HOME_CHDIR);
-	settings.home_chdir = btn->GetCheck();
-	btn = (CButton *)GetDlgItem(IDC_AGENT_PROXY);
-	settings.agent_proxy = btn->GetCheck();
+	GetDlgItemTextA(IDC_TERM_EDIT, settings.term, sizeof(settings.term));
+	GetDlgItemTextA(IDC_TERM_TYPE, settings.term_type, sizeof(settings.term_type));
+	GetDlgItemTextA(IDC_PORT_START, settings.port_start, sizeof(settings.port_start));
+	GetDlgItemTextA(IDC_PORT_RANGE, settings.port_range, sizeof(settings.port_range));
+	GetDlgItemTextA(IDC_SHELL, settings.shell, sizeof(settings.shell));
+	GetDlgItemTextA(IDC_ENV1, settings.env1, sizeof(settings.env1));
+	GetDlgItemTextA(IDC_ENV2, settings.env2, sizeof(settings.env2));
 
+	settings.login_shell = GetCheck(IDC_LOGIN_SHELL);
+	settings.home_chdir = GetCheck(IDC_HOME_CHDIR);
+	settings.agent_proxy = GetCheck(IDC_AGENT_PROXY);
+
 	memcpy(&ts.CygtermSettings, &settings, sizeof(cygterm_t));
 
 	// \x90ݒ\xE8\x82\xF0\x8F\x91\x82\xAB\x8D\x9E\x82ނ\xBD\x82߃t\x83\x89\x83O\x82𗧂ĂĂ\xA8\x82\xAD\x81B
@@ -2009,93 +1474,44 @@
 	ts.CygtermSettings.update_flag = TRUE;
 
 	// Cygwin install path
-	GetDlgItemText(IDC_CYGWIN_PATH, ts.CygwinDirectory, sizeof(ts.CygwinDirectory));
+	GetDlgItemTextA(IDC_CYGWIN_PATH, ts.CygwinDirectory, sizeof(ts.CygwinDirectory));
 }
 
-
-
 // CAddSettingPropSheetDlg
-
-IMPLEMENT_DYNAMIC(CAddSettingPropSheetDlg, CPropertySheet)
-
-CAddSettingPropSheetDlg::CAddSettingPropSheetDlg(UINT nIDCaption, CWnd* pParentWnd, UINT iSelectPage)
-	:CPropertySheet(nIDCaption, pParentWnd, iSelectPage)
+CAddSettingPropSheetDlg::CAddSettingPropSheetDlg(
+	HINSTANCE hInstance, LPCTSTR pszCaption, HWND hParentWnd) :
+	TTCPropertySheet(hInstance, pszCaption, hParentWnd)
 {
-	AddPage(&m_GeneralPage);
-	AddPage(&m_SequencePage);
-	AddPage(&m_CopypastePage);
-	AddPage(&m_VisualPage);
-	AddPage(&m_LogPage);
-	AddPage(&m_CygwinPage);
+	m_GeneralPage = new CGeneralPropPageDlg(hInstance, this);
+	m_SequencePage = new CSequencePropPageDlg(hInstance, this);
+	m_CopypastePage = new CCopypastePropPageDlg(hInstance, this);
+	m_VisualPage = new CVisualPropPageDlg(hInstance, this);
+	m_LogPage = new CLogPropPageDlg(hInstance, this);
+	m_CygwinPage = new CCygwinPropPageDlg(hInstance, this);
+		
+	hPsp[0] = CreatePropertySheetPage(&m_GeneralPage->m_psp);
+	hPsp[1] = CreatePropertySheetPage(&m_SequencePage->m_psp);
+	hPsp[2] = CreatePropertySheetPage(&m_CopypastePage->m_psp);
+	hPsp[3] = CreatePropertySheetPage(&m_VisualPage->m_psp);
+	hPsp[4] = CreatePropertySheetPage(&m_LogPage->m_psp);
+	hPsp[5] = CreatePropertySheetPage(&m_CygwinPage->m_psp);
+	m_psh.nPages = 6;
+	m_psh.phpage = hPsp;
 
-	m_psh.dwFlags |= PSH_NOAPPLYNOW;
+	TCHAR UIMsg[MAX_UIMSG];
+	get_lang_msgT("DLG_TABSHEET_TITLE", UIMsg, _countof(UIMsg),
+				 pszCaption, ts.UILanguageFile);
+	m_psh.pszCaption = _tcsdup(UIMsg);
 }
 
-CAddSettingPropSheetDlg::CAddSettingPropSheetDlg(LPCTSTR pszCaption, CWnd* pParentWnd, UINT iSelectPage)
-	:CPropertySheet(pszCaption, pParentWnd, iSelectPage)
-{
-	AddPage(&m_GeneralPage);
-	AddPage(&m_SequencePage);
-	AddPage(&m_CopypastePage);
-	AddPage(&m_VisualPage);
-	AddPage(&m_LogPage);
-	AddPage(&m_CygwinPage);
-
-	m_psh.dwFlags |= PSH_NOAPPLYNOW;
-}
-
 CAddSettingPropSheetDlg::~CAddSettingPropSheetDlg()
 {
+	free((void*)m_psh.pszCaption);
+	delete m_GeneralPage;
+	delete m_SequencePage;
+	delete m_CopypastePage;
+	delete m_VisualPage;
+	delete m_LogPage;
+	delete m_CygwinPage;
 }
 
-
-BEGIN_MESSAGE_MAP(CAddSettingPropSheetDlg, CPropertySheet)
-END_MESSAGE_MAP()
-
-
-// CAddSettingPropSheetDlg \x83\x81\x83b\x83Z\x81[\x83W \x83n\x83\x93\x83h\x83\x89
-
-BOOL CAddSettingPropSheetDlg::OnInitDialog()
-{
-	CPropertySheet::OnInitDialog();
-
-	get_lang_msg("DLG_TABSHEET_TITLE", ts.UIMsg, sizeof(ts.UIMsg),
-	             "Tera Term: Additional settings", ts.UILanguageFile);
-	SetWindowText(ts.UIMsg);
-
-	CTabCtrl *tab = GetTabControl();
-	TCITEM tc;
-	tc.mask = TCIF_TEXT;
-
-	get_lang_msg("DLG_TABSHEET_TITLE_GENERAL", ts.UIMsg, sizeof(ts.UIMsg),
-	             "General", ts.UILanguageFile);
-	tc.pszText = ts.UIMsg;
-	tab->SetItem(0, &tc);
-
-	get_lang_msg("DLG_TABSHEET_TITLE_SEQUENCE", ts.UIMsg, sizeof(ts.UIMsg),
-	             "Control Sequence", ts.UILanguageFile);
-	tc.pszText = ts.UIMsg;
-	tab->SetItem(1, &tc);
-
-	get_lang_msg("DLG_TABSHEET_TITLE_COPYPASTE", ts.UIMsg, sizeof(ts.UIMsg),
-	             "Copy and Paste", ts.UILanguageFile);
-	tc.pszText = ts.UIMsg;
-	tab->SetItem(2, &tc);
-
-	get_lang_msg("DLG_TABSHEET_TITLE_VISUAL", ts.UIMsg, sizeof(ts.UIMsg),
-	             "Visual", ts.UILanguageFile);
-	tc.pszText = ts.UIMsg;
-	tab->SetItem(3, &tc);
-
-	get_lang_msg("DLG_TABSHEET_TITLE_Log", ts.UIMsg, sizeof(ts.UIMsg),
-	             "Log", ts.UILanguageFile);
-	tc.pszText = ts.UIMsg;
-	tab->SetItem(4, &tc);
-
-	get_lang_msg("DLG_TABSHEET_TITLE_CYGWIN", ts.UIMsg, sizeof(ts.UIMsg),
-	             "Cygwin", ts.UILanguageFile);
-	tc.pszText = ts.UIMsg;
-	tab->SetItem(5, &tc);
-
-	return FALSE;
-}

Modified: trunk/teraterm/teraterm/addsetting.h
===================================================================
--- trunk/teraterm/teraterm/addsetting.h	2019-03-28 16:09:45 UTC (rev 7524)
+++ trunk/teraterm/teraterm/addsetting.h	2019-03-28 16:38:16 UTC (rev 7525)
@@ -1,5 +1,5 @@
 /*
- * (C) 2008-2017 TeraTerm Project
+ * (C) 2008-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,191 +28,110 @@
 
 #pragma once
 
+#include "tmfc.h"
 #include "tt_res.h"
 #include "teraterm.h"
 
-
 typedef struct {
-	char *name;
+	const char *name;
 	LPCTSTR id;
 } mouse_cursor_t;
 
+extern const mouse_cursor_t MouseCursor[];
 
-
 // General Page
-class CGeneralPropPageDlg : public CPropertyPage
+class CGeneralPropPageDlg : public TTCPropertyPage
 {
-	DECLARE_DYNAMIC(CGeneralPropPageDlg)
-
 public:
-	CGeneralPropPageDlg();
+	CGeneralPropPageDlg(HINSTANCE inst, TTCPropertySheet *sheet);
 	virtual ~CGeneralPropPageDlg();
-	BOOL OnInitDialog();
+private:
+	void OnInitDialog();
 	void OnOK();
-
 	enum { IDD = IDD_TABSHEET_GENERAL };
-
-private:
-	HFONT DlgGeneralFont;
-	LOGFONT logfont;
-	HFONT font;
-
-protected:
-	DECLARE_MESSAGE_MAP()
 };
 
-
-
 // Control Sequence Page
-class CSequencePropPageDlg : public CPropertyPage
+class CSequencePropPageDlg : public TTCPropertyPage
 {
-	DECLARE_DYNAMIC(CSequencePropPageDlg)
-
 public:
-	CSequencePropPageDlg();
+	CSequencePropPageDlg(HINSTANCE inst, TTCPropertySheet *sheet);
 	virtual ~CSequencePropPageDlg();
-	BOOL OnInitDialog();
+private:
+	void OnInitDialog();
 	void OnOK();
-
 	enum { IDD = IDD_TABSHEET_SEQUENCE };
-
-private:
-	HFONT DlgSequenceFont;
-	LOGFONT logfont;
-	HFONT font;
-
-protected:
-	DECLARE_MESSAGE_MAP()
-	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
+	BOOL OnCommand(WPARAM wParam, LPARAM lParam);
 };
 
-
-
 // Copypaste Page
-class CCopypastePropPageDlg : public CPropertyPage
+class CCopypastePropPageDlg : public TTCPropertyPage
 {
-	DECLARE_DYNAMIC(CCopypastePropPageDlg)
-
 public:
-	CCopypastePropPageDlg();
+	CCopypastePropPageDlg(HINSTANCE inst, TTCPropertySheet *sheet);
 	virtual ~CCopypastePropPageDlg();
-	BOOL OnInitDialog();
+private:
+	void OnInitDialog();
 	void OnOK();
-
 	enum { IDD = IDD_TABSHEET_COPYPASTE };
-
-private:
-	HFONT DlgCopypasteFont;
-	LOGFONT logfont;
-	HFONT font;
-
-protected:
-	DECLARE_MESSAGE_MAP()
-	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
+	BOOL OnCommand(WPARAM wParam, LPARAM lParam);
 };
 
-
-
 // Visual Page
-class CVisualPropPageDlg : public CPropertyPage
+class CVisualPropPageDlg : public TTCPropertyPage
 {
-	DECLARE_DYNAMIC(CVisualPropPageDlg)
-
 public:
-	CVisualPropPageDlg();
+	CVisualPropPageDlg(HINSTANCE inst, TTCPropertySheet *sheet);
 	virtual ~CVisualPropPageDlg();
-	BOOL OnInitDialog();
+private:
+	void OnInitDialog();
 	void OnOK();
-
+	HBRUSH OnCtlColor(HDC hDC, HWND hWnd);
 	enum { IDD = IDD_TABSHEET_VISUAL };
-
-private:
-	HFONT DlgVisualFont;
-	LOGFONT logfont;
-	HFONT font;
-
-protected:
-	DECLARE_MESSAGE_MAP()
-	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
+	BOOL OnCommand(WPARAM wParam, LPARAM lParam);
+	void SetupRGBbox(int index);
 };
 
-
-
 // Log Page
-class CLogPropPageDlg : public CPropertyPage
+class CLogPropPageDlg : public TTCPropertyPage
 {
-	DECLARE_DYNAMIC(CLogPropPageDlg)
-
 public:
-	CLogPropPageDlg();
+	CLogPropPageDlg(HINSTANCE inst, TTCPropertySheet *sheet);
 	virtual ~CLogPropPageDlg();
-	BOOL OnInitDialog();
+private:
+	void OnInitDialog();
 	void OnOK();
-
 	enum { IDD = IDD_TABSHEET_LOG };
-
-private:
-	HFONT DlgLogFont;
-	LOGFONT logfont;
-	HFONT font;
-
-protected:
-	DECLARE_MESSAGE_MAP()
-	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
+	BOOL OnCommand(WPARAM wParam, LPARAM lParam);
 };
 
-
-
 // Cygwin Page
-class CCygwinPropPageDlg : public CPropertyPage
+class CCygwinPropPageDlg : public TTCPropertyPage
 {
-	DECLARE_DYNAMIC(CCygwinPropPageDlg)
-
 public:
-	CCygwinPropPageDlg();
+	CCygwinPropPageDlg(HINSTANCE inst, TTCPropertySheet *sheet);
 	virtual ~CCygwinPropPageDlg();
-	BOOL OnInitDialog();
+private:
+	void OnInitDialog();
 	void OnOK();
-
 	enum { IDD = IDD_TABSHEET_CYGWIN };
-
-private:
-	HFONT DlgCygwinFont;
-	LOGFONT logfont;
-	HFONT font;
 	cygterm_t settings;
-
-protected:
-	DECLARE_MESSAGE_MAP()
-	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
+	BOOL OnCommand(WPARAM wParam, LPARAM lParam);
 };
 
-
-
 // Property Sheet
-class CAddSettingPropSheetDlg : public CPropertySheet
+class CAddSettingPropSheetDlg : public TTCPropertySheet
 {
-	DECLARE_DYNAMIC(CAddSettingPropSheetDlg)
-
 public:
-	CAddSettingPropSheetDlg(UINT nIDCaption, CWnd* pParentWnd = NULL, UINT iSelectPage = 0);
-	CAddSettingPropSheetDlg(LPCTSTR pszCaption, CWnd* pParentWnd = NULL, UINT iSelectPage = 0);
+	CAddSettingPropSheetDlg(HINSTANCE hInstance, LPCTSTR pszCaption, HWND hParentWnd);
 	virtual ~CAddSettingPropSheetDlg();
-	BOOL OnInitDialog();
-
 private:
-	HFONT DlgAdditionalFont;
-	LOGFONT logfont;
-	HFONT font;
-
-protected:
-	DECLARE_MESSAGE_MAP()
-
-public:
-	CGeneralPropPageDlg   m_GeneralPage;
-	CSequencePropPageDlg  m_SequencePage;
-	CCopypastePropPageDlg m_CopypastePage;
-	CVisualPropPageDlg    m_VisualPage;
-	CLogPropPageDlg       m_LogPage;
-	CCygwinPropPageDlg    m_CygwinPage;
+	HPROPSHEETPAGE hPsp[6];
+	
+	CGeneralPropPageDlg   *m_GeneralPage;
+	CSequencePropPageDlg  *m_SequencePage;
+	CCopypastePropPageDlg *m_CopypastePage;
+	CVisualPropPageDlg    *m_VisualPage;
+	CLogPropPageDlg       *m_LogPage;
+	CCygwinPropPageDlg    *m_CygwinPage;
 };

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2019-03-28 16:09:45 UTC (rev 7524)
+++ trunk/teraterm/teraterm/vtwin.cpp	2019-03-28 16:38:16 UTC (rev 7525)
@@ -116,9 +116,6 @@
 
 static int AutoDisconnectedPort = -1;
 
-// \x96{\x91̂\xCD addsetting.cpp
-extern mouse_cursor_t MouseCursor[];
-
 #ifndef WM_IME_COMPOSITION
 #define WM_IME_COMPOSITION              0x010F
 #endif
@@ -4568,11 +4565,10 @@
 {
 	DWORD ret;
 
-	CAddSettingPropSheetDlg CAddSetting("", CWnd::FromHandle(HVTWin));
-	CAddSetting.EnableStackedTabs(FALSE);
+	CAddSettingPropSheetDlg CAddSetting(hInst, _T("Tera Term: Additional settings"), HVTWin);
 	ret = CAddSetting.DoModal();
 	switch (ret) {
-		case -1:
+		case (DWORD)-1:
 		case IDABORT:
 			ret = GetLastError();
 			break;

From scmnotify ＠ osdn.net  Fri Mar 29 01:38:41 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Fri, 29 Mar 2019 01:38:41 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc1MjddIHRla3dpbuOBp01GQ+OCkuS9vw==?=
 =?utf-8?b?55So44GX44Gq44GE44KI44GG44Gr44GX44Gf?=
Message-ID: <1553791121.371240.53005.nullmailer@users.osdn.me>

Revision: 7527
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7527
Author:   zmatsuo
Date:     2019-03-29 01:38:41 +0900 (Fri, 29 Mar 2019)
Log Message:
-----------
tekwinでMFCを使用しないようにした

Modified Paths:
--------------
    trunk/teraterm/common/ttlib.h
    trunk/teraterm/teraterm/tekwin.cpp
    trunk/teraterm/teraterm/tekwin.h
    trunk/teraterm/teraterm/teraprn.cpp
    trunk/teraterm/teraterm/vtwin.cpp

-------------- next part --------------
Modified: trunk/teraterm/common/ttlib.h
===================================================================
--- trunk/teraterm/common/ttlib.h	2019-03-28 16:38:29 UTC (rev 7526)
+++ trunk/teraterm/common/ttlib.h	2019-03-28 16:38:41 UTC (rev 7527)
@@ -113,6 +113,8 @@
 #define CheckFlag(var, flag)	(((var) & (flag)) != 0)
 
 void SetDlgTexts(HWND hDlgWnd, const DlgTextInfo *infos, int infoCount, const char *UILanguageFile);
+void SetDlgMenuTexts(HMENU hMenu, const DlgTextInfo *infos, int infoCount, const char *UILanguageFile);
+
 #if defined(_UNICODE)
 #define	get_lang_msgT(p1, p2, p3, p4, p5) get_lang_msgW(p1, p2, p3, p4, p5)
 #define	get_OPENFILENAME_SIZE() get_OPENFILENAME_SIZEW()

Modified: trunk/teraterm/teraterm/tekwin.cpp
===================================================================
--- trunk/teraterm/teraterm/tekwin.cpp	2019-03-28 16:38:29 UTC (rev 7526)
+++ trunk/teraterm/teraterm/tekwin.cpp	2019-03-28 16:38:41 UTC (rev 7527)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2006-2017 TeraTerm Project
+ * (C) 2006-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,7 +28,7 @@
  */
 
 /* TERATERM.EXE, TEK window */
-#include "stdafx.h"
+#include <windowsx.h>
 #include "teraterm.h"
 #include "tttypes.h"
 #include "tektypes.h"
@@ -43,9 +43,15 @@
 #include "tt_res.h"
 #include "tekwin.h"
 #include "ttlib.h"
+#include <htmlhelp.h>
+#include "dlglib.h"
+#include <tchar.h>
 
-#define TEKClassName "TEKWin32"
+#define CWnd	TTCWnd
+#define CFrameWnd	TTCFrameWnd
 
+#define TEKClassName _T("TEKWin32")
+
 #ifdef _DEBUG
 #define new DEBUG_NEW
 #undef THIS_FILE
@@ -52,6 +58,11 @@
 static char THIS_FILE[] = __FILE__;
 #endif
 
+static HINSTANCE AfxGetInstanceHandle()
+{
+	return hInst;
+}
+
 /////////////////////////////////////////////////////////////////////////////
 // CTEKWindow
 
@@ -76,7 +87,7 @@
 	}
 
 	wc.style = CS_HREDRAW | CS_VREDRAW;
-	wc.lpfnWndProc = AfxWndProc;
+	wc.lpfnWndProc = (WNDPROC)ProcStub;
 	wc.cbClsExtra = 0;
 	wc.cbWndExtra = 0;
 	wc.hInstance = AfxGetInstanceHandle();
@@ -97,7 +108,7 @@
 		rect.right = rect.left + 640; //temporary width
 		rect.bottom = rect.top + 400; //temporary height
 	}
-	Create(TEKClassName, "Tera Term", Style, rect, GetDesktopWindow(), NULL);
+	Create(hInst, TEKClassName, _T("Tera Term"), Style, rect, ::GetDesktopWindow(), NULL);
 //--------------------------------------------------------
 	HTEKWin = GetSafeHwnd();
 	if (HTEKWin == NULL) {
@@ -151,6 +162,33 @@
 
 void CTEKWindow::InitMenu(HMENU *Menu)
 {
+	static const DlgTextInfo MenuTextInfo[] = {
+		{ 0, "TEKMENU_FILE" },
+		{ 1, "TEKMENU_EDIT" },
+		{ 2, "TEKMENU_SETUP" },
+		{ ID_TEKVTWIN, "TEKMENU_VTWIN"},
+		{ 4, "TEKMENU_HELP"},
+	};
+	static const DlgTextInfo FileMenuTextInfo[] = {
+		{ ID_TEKFILE_PRINT, "TEKMENU_FILE_PRINT" },
+		{ ID_TEKFILE_EXIT, "TEKMENU_FILE_EXIT" },
+	};
+	static const DlgTextInfo EditMenuTextInfo[] = {
+		{ ID_TEKEDIT_COPY, "TEKMENU_EDIT_COPY" },
+		{ ID_TEKEDIT_COPYSCREEN, "TEKMENU_EDIT_COPYSCREEN" },
+		{ ID_TEKEDIT_PASTE, "TEKMENU_EDIT_PASTE" },
+		{ ID_TEKEDIT_PASTECR, "TEKMENU_EDIT_PASTECR" },
+		{ ID_TEKEDIT_CLEARSCREEN, "TEKMENU_EDIT_CLSCREEN" },
+	};
+	static const DlgTextInfo SetupMenuTextInfo[] = {
+		{ ID_TEKSETUP_WINDOW, "TEKMENU_SETUP_WINDOW" },
+		{ ID_TEKSETUP_FONT, "TEKMENU_SETUP_FONT" },
+	};
+	static const DlgTextInfo HelpMenuTextInfo[] = {
+		{ ID_TEKHELP_INDEX, "TEKMENU_HELP_INDEX" },
+		{ ID_TEKHELP_ABOUT, "TEKMENU_HELP_ABOUT" },
+	};
+
 	*Menu = ::LoadMenu(AfxGetInstanceHandle(),
 	                   MAKEINTRESOURCE(IDR_TEKMENU));
 	EditMenu = GetSubMenu(MainMenu,1);
@@ -157,66 +195,19 @@
 	FileMenu = GetSubMenu(MainMenu,0);
 	SetupMenu = GetSubMenu(MainMenu,2);
 	HelpMenu = GetSubMenu(MainMenu,4);
-	char uimsg[MAX_UIMSG];
 
-	GetMenuString(*Menu, 0, uimsg, sizeof(uimsg), MF_BYPOSITION);
-	get_lang_msg("TEKMENU_FILE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	ModifyMenu(*Menu, 0, MF_BYPOSITION, 0, ts.UIMsg);
-	GetMenuString(FileMenu, ID_TEKFILE_PRINT, uimsg, sizeof(uimsg), MF_BYCOMMAND);
-	get_lang_msg("TEKMENU_FILE_PRINT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	ModifyMenu(FileMenu, ID_TEKFILE_PRINT, MF_BYCOMMAND, ID_TEKFILE_PRINT, ts.UIMsg);
-	GetMenuString(FileMenu, ID_TEKFILE_EXIT, uimsg, sizeof(uimsg), MF_BYCOMMAND);
-	get_lang_msg("TEKMENU_FILE_EXIT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	ModifyMenu(FileMenu, ID_TEKFILE_EXIT, MF_BYCOMMAND, ID_TEKFILE_EXIT, ts.UIMsg);
+	SetDlgMenuTexts(*Menu, MenuTextInfo, _countof(MenuTextInfo), ts.UILanguageFile);
+	SetDlgMenuTexts(FileMenu, FileMenuTextInfo, _countof(FileMenuTextInfo), ts.UILanguageFile);
+	SetDlgMenuTexts(EditMenu, EditMenuTextInfo, _countof(EditMenuTextInfo), ts.UILanguageFile);
+	SetDlgMenuTexts(SetupMenu, SetupMenuTextInfo, _countof(SetupMenuTextInfo), ts.UILanguageFile);
+	SetDlgMenuTexts(HelpMenu, HelpMenuTextInfo, _countof(HelpMenuTextInfo), ts.UILanguageFile);
 
-	GetMenuString(*Menu, 1, uimsg, sizeof(uimsg), MF_BYPOSITION);
-	get_lang_msg("TEKMENU_EDIT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	ModifyMenu(*Menu, 1, MF_BYPOSITION, 1, ts.UIMsg);
-	GetMenuString(EditMenu, ID_TEKEDIT_COPY, uimsg, sizeof(uimsg), MF_BYCOMMAND);
-	get_lang_msg("TEKMENU_EDIT_COPY", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	ModifyMenu(EditMenu, ID_TEKEDIT_COPY, MF_BYCOMMAND, ID_TEKEDIT_COPY, ts.UIMsg);
-	GetMenuString(EditMenu, ID_TEKEDIT_COPYSCREEN, uimsg, sizeof(uimsg), MF_BYCOMMAND);
-	get_lang_msg("TEKMENU_EDIT_COPYSCREEN", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	ModifyMenu(EditMenu, ID_TEKEDIT_COPYSCREEN, MF_BYCOMMAND, ID_TEKEDIT_COPYSCREEN, ts.UIMsg);
-	GetMenuString(EditMenu, ID_TEKEDIT_PASTE, uimsg, sizeof(uimsg), MF_BYCOMMAND);
-	get_lang_msg("TEKMENU_EDIT_PASTE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	ModifyMenu(EditMenu, ID_TEKEDIT_PASTE, MF_BYCOMMAND, ID_TEKEDIT_PASTE, ts.UIMsg);
-	GetMenuString(EditMenu, ID_TEKEDIT_PASTECR, uimsg, sizeof(uimsg), MF_BYCOMMAND);
-	get_lang_msg("TEKMENU_EDIT_PASTECR", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	ModifyMenu(EditMenu, ID_TEKEDIT_PASTECR, MF_BYCOMMAND, ID_TEKEDIT_PASTECR, ts.UIMsg);
-	GetMenuString(EditMenu, ID_TEKEDIT_CLEARSCREEN, uimsg, sizeof(uimsg), MF_BYCOMMAND);
-	get_lang_msg("TEKMENU_EDIT_CLSCREEN", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	ModifyMenu(EditMenu, ID_TEKEDIT_CLEARSCREEN, MF_BYCOMMAND, ID_TEKEDIT_CLEARSCREEN, ts.UIMsg);
-
-	GetMenuString(*Menu, 2, uimsg, sizeof(uimsg), MF_BYPOSITION);
-	get_lang_msg("TEKMENU_SETUP", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	ModifyMenu(*Menu, 2, MF_BYPOSITION, 2, ts.UIMsg);
-	GetMenuString(SetupMenu, ID_TEKSETUP_WINDOW, uimsg, sizeof(uimsg), MF_BYCOMMAND);
-	get_lang_msg("TEKMENU_SETUP_WINDOW", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	ModifyMenu(SetupMenu, ID_TEKSETUP_WINDOW, MF_BYCOMMAND, ID_TEKSETUP_WINDOW, ts.UIMsg);
-	GetMenuString(SetupMenu, ID_TEKSETUP_FONT, uimsg, sizeof(uimsg), MF_BYCOMMAND);
-	get_lang_msg("TEKMENU_SETUP_FONT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	ModifyMenu(SetupMenu, ID_TEKSETUP_FONT, MF_BYCOMMAND, ID_TEKSETUP_FONT, ts.UIMsg);
-
-	GetMenuString(*Menu, ID_TEKVTWIN, uimsg, sizeof(uimsg), MF_BYCOMMAND);
-	get_lang_msg("TEKMENU_VTWIN", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	ModifyMenu(*Menu, ID_TEKVTWIN, MF_BYCOMMAND, ID_TEKVTWIN, ts.UIMsg);
-
-	GetMenuString(*Menu, 4, uimsg, sizeof(uimsg), MF_BYPOSITION);
-	get_lang_msg("TEKMENU_HELP", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	ModifyMenu(*Menu, 4, MF_BYPOSITION, 4, ts.UIMsg);
-	GetMenuString(HelpMenu, ID_TEKHELP_INDEX, uimsg, sizeof(uimsg), MF_BYCOMMAND);
-	get_lang_msg("TEKMENU_HELP_INDEX", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	ModifyMenu(HelpMenu, ID_TEKHELP_INDEX, MF_BYCOMMAND, ID_TEKHELP_INDEX, ts.UIMsg);
-	GetMenuString(HelpMenu, ID_TEKHELP_ABOUT, uimsg, sizeof(uimsg), MF_BYCOMMAND);
-	get_lang_msg("TEKMENU_HELP_ABOUT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	ModifyMenu(HelpMenu, ID_TEKHELP_ABOUT, MF_BYCOMMAND, ID_TEKHELP_ABOUT, ts.UIMsg);
-
 	if ((ts.MenuFlag & MF_SHOWWINMENU) !=0) {
+		TCHAR uimsg[MAX_UIMSG];
 		WinMenu = CreatePopupMenu();
-		get_lang_msg("TEKMENU_WINDOW", ts.UIMsg, sizeof(ts.UIMsg), "&Window", ts.UILanguageFile);
+		get_lang_msgT("TEKMENU_WINDOW", uimsg, _countof(uimsg), _T("&Window"), ts.UILanguageFile);
 		::InsertMenu(*Menu,4,MF_STRING | MF_ENABLED | MF_POPUP | MF_BYPOSITION,
-		             (int)WinMenu, ts.UIMsg);
+		             (UINT_PTR)WinMenu, uimsg);
 	}
 }
 
@@ -246,6 +237,7 @@
 	}
 }
 
+#if 0
 BEGIN_MESSAGE_MAP(CTEKWindow, CFrameWnd)
 	//{{AFX_MSG_MAP(CTEKWindow)
 	ON_WM_ACTIVATE()
@@ -291,6 +283,7 @@
 	ON_WM_TIMER()
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
+#endif
 
 /////////////////////////////////////////////////////////////////////////////
 // CTEKWindow message handler
@@ -326,7 +319,7 @@
 	}
 }
 
-void CTEKWindow::OnActivate(UINT nState, CWnd* pWndOther, BOOL bMinimized)
+void CTEKWindow::OnActivate(UINT nState, HWND pWndOther, BOOL bMinimized)
 {
 	if (nState!=WA_INACTIVE) {
 		tk.Active = TRUE;
@@ -382,9 +375,9 @@
 	lpMMI->ptMaxTrackSize.y = 10000;
 }
 
-void CTEKWindow::OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu)
+void CTEKWindow::OnInitMenuPopup(HMENU hPopupMenu, UINT nIndex, BOOL bSysMenu)
 {
-	InitMenuPopup(pPopupMenu->m_hMenu);
+	InitMenuPopup(hPopupMenu);
 }
 
 void CTEKWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
@@ -397,13 +390,13 @@
 	KeyUp(nChar);
 }
 
-void CTEKWindow::OnKillFocus(CWnd* pNewWnd)
+void CTEKWindow::OnKillFocus(HWND hNewWnd)
 {
 	TEKDestroyCaret(&tk,&ts);
-	CFrameWnd::OnKillFocus(pNewWnd);
+	CFrameWnd::OnKillFocus(hNewWnd);
 }
 
-void CTEKWindow::OnLButtonDown(UINT nFlags, CPoint point)
+void CTEKWindow::OnLButtonDown(UINT nFlags, POINTS point)
 {
 	POINT p;
 	HMENU PopupMenu, PopupBase;
@@ -414,6 +407,7 @@
 	// popup menu
 	if (ControlKey() && (MainMenu==NULL))
 	{
+		TCHAR uimsg[MAX_UIMSG];
 		InitMenu(&PopupMenu);
 		InitMenuPopup(EditMenu);
 		if (WinMenu!=NULL) {
@@ -420,26 +414,26 @@
 			InitMenuPopup(WinMenu);
 		}
 		PopupBase = CreatePopupMenu();
-		get_lang_msg("MENU_CONTROL", ts.UIMsg, sizeof(ts.UIMsg), "&File", ts.UILanguageFile);
+		get_lang_msgT("MENU_CONTROL", uimsg, _countof(uimsg), _T("&File"), ts.UILanguageFile);
 		AppendMenu(PopupBase, MF_STRING | MF_ENABLED | MF_POPUP,
-		           (UINT)GetSubMenu(PopupMenu,0), ts.UIMsg);
-		get_lang_msg("TEKMENU_EDIT", ts.UIMsg, sizeof(ts.UIMsg), "&Edit", ts.UILanguageFile);
+		           (UINT_PTR)GetSubMenu(PopupMenu,0), uimsg);
+		get_lang_msgT("TEKMENU_EDIT", uimsg, _countof(uimsg), _T("&Edit"), ts.UILanguageFile);
 		AppendMenu(PopupBase, MF_STRING | MF_ENABLED | MF_POPUP,
-		           (UINT)EditMenu, ts.UIMsg);
-		get_lang_msg("TEKMENU_SETUP", ts.UIMsg, sizeof(ts.UIMsg), "&Setup", ts.UILanguageFile);
+		           (UINT_PTR)EditMenu, uimsg);
+		get_lang_msgT("TEKMENU_SETUP", uimsg, _countof(uimsg), _T("&Setup"), ts.UILanguageFile);
 		AppendMenu(PopupBase, MF_STRING | MF_ENABLED | MF_POPUP,
-		           (UINT)GetSubMenu(PopupMenu,2), ts.UIMsg);
-		get_lang_msg("TEKMENU_VTWIN", ts.UIMsg, sizeof(ts.UIMsg), "VT-Wind&ow", ts.UILanguageFile);
+		           (UINT_PTR)GetSubMenu(PopupMenu,2), uimsg);
+		get_lang_msgT("TEKMENU_VTWIN", uimsg, _countof(uimsg), _T("VT-Wind&ow"), ts.UILanguageFile);
 		AppendMenu(PopupBase, MF_STRING | MF_ENABLED,
-		           ID_TEKVTWIN, ts.UIMsg);
+		           ID_TEKVTWIN, uimsg);
 		if (WinMenu!=NULL) {
-			get_lang_msg("TEKMENU_WINDOW", ts.UIMsg, sizeof(ts.UIMsg), "&Window", ts.UILanguageFile);
+			get_lang_msgT("TEKMENU_WINDOW", uimsg, _countof(uimsg), _T("&Window"), ts.UILanguageFile);
 			AppendMenu(PopupBase, MF_STRING | MF_ENABLED | MF_POPUP,
-			           (UINT)WinMenu, ts.UIMsg);
+			           (UINT_PTR)WinMenu, uimsg);
 		}
-		get_lang_msg("TEKMENU_HELP", ts.UIMsg, sizeof(ts.UIMsg), "&Help", ts.UILanguageFile);
+		get_lang_msgT("TEKMENU_HELP", uimsg, _countof(uimsg), _T("&Help"), ts.UILanguageFile);
 		AppendMenu(PopupBase, MF_STRING | MF_ENABLED | MF_POPUP,
-		           (UINT)GetSubMenu(PopupMenu,4), ts.UIMsg);
+		           (UINT_PTR)GetSubMenu(PopupMenu,4), uimsg);
 		::ClientToScreen(tk.HWin, &p);
 		TrackPopupMenu(PopupBase,TPM_LEFTALIGN | TPM_LEFTBUTTON,
 		               p.x,p.y,0,tk.HWin,NULL);
@@ -455,17 +449,17 @@
 	TEKWMLButtonDown(&tk,&ts,&cv,p);
 }
 
-void CTEKWindow::OnLButtonUp(UINT nFlags, CPoint point)
+void CTEKWindow::OnLButtonUp(UINT nFlags, POINTS point)
 {
 	TEKWMLButtonUp(&tk,&ts);
 }
 
-void CTEKWindow::OnMButtonUp(UINT nFlags, CPoint point)
+void CTEKWindow::OnMButtonUp(UINT nFlags, POINTS point)
 {
 	//OnRButtonUp(nFlags,point);
 }
 
-int CTEKWindow::OnMouseActivate(CWnd* pDesktopWnd, UINT nHitTest, UINT message)
+int CTEKWindow::OnMouseActivate(HWND pDesktopWnd, UINT nHitTest, UINT message)
 {
 	if ((ts.SelOnActive==0) &&
 	    (nHitTest==HTCLIENT)) { //disable mouse event for text selection
@@ -476,7 +470,7 @@
 	}
 }
 
-void CTEKWindow::OnMouseMove(UINT nFlags, CPoint point)
+void CTEKWindow::OnMouseMove(UINT nFlags, POINTS point)
 {
 	POINT p;
 
@@ -497,11 +491,9 @@
 void CTEKWindow::OnPaint()
 {
 	PAINTSTRUCT ps;
-	CDC *cdc;
 	HDC PaintDC;
 
-	cdc = BeginPaint(&ps);
-	PaintDC = cdc->GetSafeHdc();
+	PaintDC = BeginPaint(&ps);
 
 	TEKPaint(&tk,&ts,PaintDC,&ps);
 
@@ -508,15 +500,15 @@
 	EndPaint(&ps);
 }
 
-void CTEKWindow::OnRButtonUp(UINT nFlags, CPoint point)
+void CTEKWindow::OnRButtonUp(UINT nFlags, POINTS point)
 {
 	CBStartPaste(tk.HWin, FALSE, FALSE);
 }
 
-void CTEKWindow::OnSetFocus(CWnd* pOldWnd)
+void CTEKWindow::OnSetFocus(HWND hOldWnd)
 {
 	TEKChangeCaret(&tk,&ts);
-	CFrameWnd::OnSetFocus(pOldWnd);
+	CFrameWnd::OnSetFocus(hOldWnd);
 }
 
 void CTEKWindow::OnSize(UINT nType, int cx, int cy)
@@ -571,7 +563,7 @@
 	}
 }
 
-void CTEKWindow::OnTimer(UINT nIDEvent)
+void CTEKWindow::OnTimer(UINT_PTR nIDEvent)
 {
 	UINT T;
 
@@ -590,7 +582,7 @@
 	}
 }
 
-LONG CTEKWindow::OnAccelCommand(UINT wParam, LONG lParam)
+LRESULT CTEKWindow::OnAccelCommand(WPARAM wParam, LPARAM lParam)
 {
 	switch (wParam) {
 		case IdPrint:
@@ -632,7 +624,7 @@
 	return 0;
 }
 
-LONG CTEKWindow::OnChangeMenu(UINT wParam, LONG lParam)
+LRESULT CTEKWindow::OnChangeMenu(WPARAM wParam, LPARAM lParam)
 {
 	HMENU SysMenu;
 	BOOL Show, B1, B2;
@@ -661,11 +653,12 @@
 	if ((MainMenu!=NULL) &&
 	    (B1 != B2)) {
 		if (WinMenu==NULL) {
+			TCHAR uimsg[MAX_UIMSG];
 			WinMenu = CreatePopupMenu();
-			get_lang_msg("TEKMENU_WINDOW", ts.UIMsg, sizeof(ts.UIMsg), "&Window", ts.UILanguageFile);
+			get_lang_msgT("TEKMENU_WINDOW", uimsg, _countof(uimsg), _T("&Window"), ts.UILanguageFile);
 			::InsertMenu(MainMenu,4,
 			             MF_STRING | MF_ENABLED | MF_POPUP | MF_BYPOSITION,
-			             (int)WinMenu, ts.UIMsg);
+			             (UINT_PTR)WinMenu, uimsg);
 		}
 		else {
 			RemoveMenu(MainMenu,4,MF_BYPOSITION);
@@ -677,21 +670,22 @@
 
 	::GetSystemMenu(tk.HWin,TRUE);
 	if ((! Show) && ((ts.MenuFlag & MF_NOSHOWMENU)==0)) {
+		TCHAR uimsg[MAX_UIMSG];
 		SysMenu = ::GetSystemMenu(tk.HWin,FALSE);
 		AppendMenu(SysMenu, MF_SEPARATOR, 0, NULL);
-		get_lang_msg("TEKMENU_SHOW_MENUBAR", ts.UIMsg, sizeof(ts.UIMsg), "Show menu &bar", ts.UILanguageFile);
-		AppendMenu(SysMenu, MF_STRING, ID_SHOWMENUBAR, ts.UIMsg);
+		get_lang_msgT("TEKMENU_SHOW_MENUBAR", uimsg, _countof(uimsg), _T("Show menu &bar"), ts.UILanguageFile);
+		AppendMenu(SysMenu, MF_STRING, ID_SHOWMENUBAR, uimsg);
 	}
 	return 0;
 }
 
-LONG CTEKWindow::OnChangeTBar(UINT wParam, LONG lParam)
+LRESULT CTEKWindow::OnChangeTBar(WPARAM wParam, LPARAM lParam)
 {
 	BOOL TBar;
 	DWORD Style;
 	HMENU SysMenu;
 
-	Style = GetWindowLong (HTEKWin, GWL_STYLE);
+	Style = GetWindowLongPtr (GWL_STYLE);
 	TBar = ((Style & WS_SYSMENU)!=0);
 	if (TBar == (ts.HideTitle==0)) {
 		return 0;
@@ -704,7 +698,7 @@
 		Style = Style & ~WS_POPUP | WS_SYSMENU | WS_CAPTION | WS_MINIMIZEBOX;
 	}
 	tk.AdjustSize = TRUE;
-	SetWindowLong (HTEKWin, GWL_STYLE, Style);
+	SetWindowLongPtr (GWL_STYLE, Style);
 	::SetWindowPos (HTEKWin, NULL, 0, 0, 0, 0,
 	                SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED);
 	::ShowWindow (HTEKWin, SW_SHOW);
@@ -711,21 +705,22 @@
 
 	if ((ts.HideTitle==0) && (MainMenu==NULL) &&
 	    ((ts.MenuFlag & MF_NOSHOWMENU) == 0)) {
+		TCHAR uimsg[MAX_UIMSG];
 		SysMenu = ::GetSystemMenu(HTEKWin,FALSE);
 		AppendMenu(SysMenu, MF_SEPARATOR, 0, NULL);
-		get_lang_msg("TEKMENU_SHOW_MENUBAR", ts.UIMsg, sizeof(ts.UIMsg), "Show menu &bar", ts.UILanguageFile);
-		AppendMenu(SysMenu, MF_STRING, ID_SHOWMENUBAR, ts.UIMsg);
+		get_lang_msgT("TEKMENU_SHOW_MENUBAR", uimsg, _countof(uimsg), _T("Show menu &bar"), ts.UILanguageFile);
+		AppendMenu(SysMenu, MF_STRING, ID_SHOWMENUBAR, uimsg);
 	}
 	return 0;
 }
 
-LONG CTEKWindow::OnDlgHelp(UINT wParam, LONG lParam)
+LRESULT CTEKWindow::OnDlgHelp(WPARAM wParam, LPARAM lParam)
 {
 	OpenHelp(HH_HELP_CONTEXT, HelpId, ts.UILanguageFile);
 	return 0;
 }
 
-LONG CTEKWindow::OnGetSerialNo(UINT wParam, LONG lParam)
+LRESULT CTEKWindow::OnGetSerialNo(WPARAM wParam, LPARAM lParam)
 {
 	return (LONG)SerialNo;
 }
@@ -855,3 +850,123 @@
 	(*AboutDialog)(tk.HWin);
 	FreeTTDLG();
 }
+
+LRESULT CTEKWindow::Proc(UINT msg, WPARAM wp, LPARAM lp)
+{
+	LRESULT retval = 0;
+	switch(msg)
+	{
+	case WM_ACTIVATE:
+		OnActivate(wp & 0xFFFF, (HWND)wp, (wp >> 16) & 0xFFFF);
+		break;
+	case WM_CHAR:
+		OnChar(wp, LOWORD(lp), HIWORD(lp));
+		break;
+	case WM_DESTROY:
+		OnDestroy();
+		PostQuitMessage(0);
+		break;
+	case WM_GETMINMAXINFO:
+		OnGetMinMaxInfo((MINMAXINFO *)lp);
+		break;
+	case WM_INITMENUPOPUP:
+		OnInitMenuPopup((HMENU)wp, LOWORD(lp), HIWORD(lp));
+		break;
+	case WM_KEYDOWN:
+		OnKeyDown(wp, LOWORD(lp), HIWORD(lp));
+		break;
+	case WM_KEYUP:
+		OnKeyUp(wp, LOWORD(lp), HIWORD(lp));
+		break;
+	case WM_KILLFOCUS:
+		OnKillFocus((HWND)wp);
+		break;
+	case WM_LBUTTONDOWN:
+		OnLButtonDown(wp, MAKEPOINTS(lp));
+		break;
+	case WM_LBUTTONUP:
+		OnLButtonUp(wp, MAKEPOINTS(lp));
+		break;
+	case WM_MBUTTONUP:
+		OnMButtonUp(wp, MAKEPOINTS(lp));
+		break;
+	case WM_MOUSEACTIVATE:
+		OnMouseActivate((HWND)wp, LOWORD(lp), HIWORD(lp));
+		break;
+	case WM_MOUSEMOVE:
+		OnMouseMove(wp, MAKEPOINTS(lp));
+		break;
+	case WM_MOVE:
+		OnMove(LOWORD(lp), HIWORD(lp));
+		break;
+	case WM_PAINT:
+		OnPaint();
+		break;
+	case WM_RBUTTONUP:
+		OnRButtonUp((UINT)wp, MAKEPOINTS(lp));
+		break;
+	case WM_SETFOCUS:
+		OnSetFocus((HWND)wp);
+		DefWindowProc(msg, wp, lp);
+		break;
+	case WM_SIZE:
+		OnSize(wp, LOWORD(lp), HIWORD(lp));
+		break;
+	case WM_SYSCOMMAND:
+		OnSysCommand(wp, lp);
+		DefWindowProc(msg, wp, lp);
+		break;
+	case WM_SYSKEYDOWN:
+		OnSysKeyDown(wp, LOWORD(lp), HIWORD(lp));
+		break;
+	case WM_SYSKEYUP:
+		OnSysKeyUp(wp, LOWORD(lp), HIWORD(lp));
+		break;
+	case WM_TIMER:
+		OnTimer(wp);
+		break;
+	case WM_USER_ACCELCOMMAND:
+		OnAccelCommand(wp, lp);
+		break;
+	case WM_USER_CHANGEMENU:
+		OnChangeMenu(wp, lp);
+		break;
+	case WM_USER_CHANGETBAR:
+		OnChangeTBar(wp, lp);
+		break;
+	case WM_USER_DLGHELP2:
+		OnDlgHelp(wp, lp);
+		break;
+	case WM_USER_GETSERIALNO:
+		OnGetSerialNo(wp, lp);
+		break;
+	case WM_COMMAND:
+	{
+		const WORD wID = GET_WM_COMMAND_ID(wp, lp);
+		switch (wID) {
+		case ID_TEKFILE_PRINT: OnFilePrint(); break;
+		case ID_TEKFILE_EXIT: OnFileExit(); break;
+		case ID_TEKEDIT_COPY: OnEditCopy(); break;
+		case ID_TEKEDIT_COPYSCREEN: OnEditCopyScreen(); break;
+		case ID_TEKEDIT_PASTE: OnEditPaste(); break;
+		case ID_TEKEDIT_PASTECR: OnEditPasteCR(); break;
+		case ID_TEKEDIT_CLEARSCREEN: OnEditClearScreen(); break;
+		case ID_TEKSETUP_WINDOW: OnSetupWindow(); break;
+		case ID_TEKSETUP_FONT: OnSetupFont(); break;
+		case ID_TEKVTWIN: OnVTWin(); break;
+		case ID_TEKWINDOW_WINDOW: OnWindowWindow(); break;
+		case ID_TEKHELP_INDEX: OnHelpIndex(); break;
+		case ID_TEKHELP_ABOUT: OnHelpAbout(); break;
+		default:
+			OnCommand(wp, lp);
+			break;
+		}
+		break;
+	}
+	default:
+		retval = DefWindowProc(msg, wp, lp);
+		break;
+	}
+				
+	return retval;
+}

Modified: trunk/teraterm/teraterm/tekwin.h
===================================================================
--- trunk/teraterm/teraterm/tekwin.h	2019-03-28 16:38:29 UTC (rev 7526)
+++ trunk/teraterm/teraterm/tekwin.h	2019-03-28 16:38:41 UTC (rev 7527)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2006-2017 TeraTerm Project
+ * (C) 2006-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,17 +31,13 @@
 
 /////////////////////////////////////////////////////////////////////////////
 // CTEKWindow
-
-class CTEKWindow : public CFrameWnd
+#include "tmfc.h"
+class CTEKWindow : public TTCFrameWnd
 {
 private:
   TTEKVar tk;
-#ifndef NO_I18N
   HMENU MainMenu, EditMenu, WinMenu,
     FileMenu, SetupMenu, HelpMenu;
-#else
-  HMENU MainMenu, EditMenu, WinMenu;
-#endif
 
 public:
 	CTEKWindow();
@@ -61,33 +57,34 @@
 
 protected:
 	//{{AFX_MSG(CTEKWindow)
-	afx_msg void OnActivate(UINT nState, CWnd* pWndOther, BOOL bMinimized);
+#define afx_msg
+	afx_msg void OnActivate(UINT nState, HWND pWndOther, BOOL bMinimized);
 	afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags);
 	afx_msg void OnDestroy();
 	afx_msg void OnGetMinMaxInfo(MINMAXINFO *lpMMI);
-	afx_msg void OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu);
+	afx_msg void OnInitMenuPopup(HMENU hPopupMenu, UINT nIndex, BOOL bSysMenu);
 	afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
 	afx_msg void OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnKillFocus(CWnd* pNewWnd);
-	afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
-	afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
-	afx_msg void OnMButtonUp(UINT nFlags, CPoint point);
-	afx_msg int OnMouseActivate(CWnd* pDesktopWnd, UINT nHitTest, UINT message);
-	afx_msg void OnMouseMove(UINT nFlags, CPoint point);
+	afx_msg void OnKillFocus(HWND hNewWnd);
+	afx_msg void OnLButtonDown(UINT nFlags, POINTS point);
+	afx_msg void OnLButtonUp(UINT nFlags, POINTS point);
+	afx_msg void OnMButtonUp(UINT nFlags, POINTS point);
+	afx_msg int OnMouseActivate(HWND hDesktopWnd, UINT nHitTest, UINT message);
+	afx_msg void OnMouseMove(UINT nFlags, POINTS point);
 	afx_msg void OnMove(int x, int y);
 	afx_msg void OnPaint();
-	afx_msg void OnRButtonUp(UINT nFlags, CPoint point);
-	afx_msg void OnSetFocus(CWnd* pOldWnd);
+	afx_msg void OnRButtonUp(UINT nFlags, POINTS point);
+	afx_msg void OnSetFocus(HWND hOldWnd);
 	afx_msg void OnSize(UINT nType, int cx, int cy);
 	afx_msg void OnSysCommand(UINT nID, LPARAM lParam);
 	afx_msg void OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
 	afx_msg void OnSysKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnTimer(UINT nIDEvent);
-	afx_msg LONG OnAccelCommand(UINT wParam, LONG lParam);
-	afx_msg LONG OnChangeMenu(UINT wParam, LONG lParam);
-	afx_msg LONG OnChangeTBar(UINT wParam, LONG lParam);
-	afx_msg LONG OnDlgHelp(UINT wParam, LONG lParam);
-	afx_msg LONG OnGetSerialNo(UINT wParam, LONG lParam);
+	afx_msg void OnTimer(UINT_PTR nIDEvent);
+	afx_msg LRESULT OnAccelCommand(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnChangeMenu(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnChangeTBar(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnDlgHelp(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnGetSerialNo(WPARAM wParam, LPARAM lParam);
 	afx_msg void OnFilePrint();
 	afx_msg void OnFileExit();
 	afx_msg void OnEditCopy();
@@ -103,5 +100,7 @@
 	afx_msg void OnHelpUsing();
 	afx_msg void OnHelpAbout();
 	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
+//	DECLARE_MESSAGE_MAP()
+#undef afx_msg
+	virtual LRESULT Proc(UINT msg, WPARAM wp, LPARAM lp);
 };

Modified: trunk/teraterm/teraterm/teraprn.cpp
===================================================================
--- trunk/teraterm/teraterm/teraprn.cpp	2019-03-28 16:38:29 UTC (rev 7526)
+++ trunk/teraterm/teraterm/teraprn.cpp	2019-03-28 16:38:41 UTC (rev 7527)
@@ -45,16 +45,18 @@
 
 #include "teraprn.h"
 
-#ifdef _DEBUG
+#if 0 //def _DEBUG
 #define new DEBUG_NEW
 #undef THIS_FILE
 static char THIS_FILE[] = __FILE__;
 #endif
 
+//#define CWnd TTCWnd
+
 static PRINTDLG PrnDlg;
 
 static HDC PrintDC;
-static LOGFONT Prnlf;
+static LOGFONTA Prnlf;
 static HFONT PrnFont[AttrFontMask+1];
 static int PrnFW, PrnFH;
 static RECT Margin;
@@ -124,7 +126,7 @@
 
 BOOL PrnStart(LPSTR DocumentName)
 {
-	DOCINFO Doc;
+	DOCINFOA Doc;
 	char DocName[50];
 	CWnd* pParent;
 
@@ -146,13 +148,13 @@
 
 	SetAbortProc(PrintDC,PrnAbortProc);
 
-	Doc.cbSize = sizeof(DOCINFO);
+	Doc.cbSize = sizeof(Doc);
 	strncpy_s(DocName,sizeof(DocName),DocumentName,_TRUNCATE);
 	Doc.lpszDocName = DocName;
 	Doc.lpszOutput = NULL;
 	Doc.lpszDatatype = NULL;
 	Doc.fwType = 0;
-	if (StartDoc(PrintDC, &Doc) > 0) {
+	if (StartDocA(PrintDC, &Doc) > 0) {
 		Printing = TRUE;
 	}
 	else {
@@ -243,7 +245,7 @@
 	                 (int)((float)ts.PrnMargin[3] / 100.0 * (float)PPI.y);
 
 	/* create test font */
-	memset(&Prnlf, 0, sizeof(LOGFONT));
+	memset(&Prnlf, 0, sizeof(Prnlf));
 
 	if (ts.PrnFont[0]==0) {
 		Prnlf.lfHeight = ts.VTFontSize.y;
@@ -266,7 +268,7 @@
 	Prnlf.lfQuality = DEFAULT_QUALITY;
 	Prnlf.lfPitchAndFamily = FIXED_PITCH | FF_DONTCARE;
 
-	PrnFont[0] = CreateFontIndirect(&Prnlf);
+	PrnFont[0] = CreateFontIndirectA(&Prnlf);
 
 	DC = GetDC(HVTWin);
 	SelectObject(DC, PrnFont[0]);
@@ -285,7 +287,7 @@
 	/* Normal Font */
 	Prnlf.lfWeight = FW_NORMAL;
 	Prnlf.lfUnderline = 0;
-	PrnFont[0] = CreateFontIndirect(&Prnlf);
+	PrnFont[0] = CreateFontIndirectA(&Prnlf);
 	SelectObject(PrintDC,PrnFont[0]);
 	GetTextMetrics(PrintDC, &Metrics);
 	PrnFW = Metrics.tmAveCharWidth;
@@ -292,16 +294,16 @@
 	PrnFH = Metrics.tmHeight;
 	/* Under line */
 	Prnlf.lfUnderline = 1;
-	PrnFont[AttrUnder] = CreateFontIndirect(&Prnlf);
+	PrnFont[AttrUnder] = CreateFontIndirectA(&Prnlf);
 
 	if (ts.FontFlag & FF_BOLD) {
 		/* Bold */
 		Prnlf.lfUnderline = 0;
 		Prnlf.lfWeight = FW_BOLD;
-		PrnFont[AttrBold] = CreateFontIndirect(&Prnlf);
+		PrnFont[AttrBold] = CreateFontIndirectA(&Prnlf);
 		/* Bold + Underline */
 		Prnlf.lfUnderline = 1;
-		PrnFont[AttrBold | AttrUnder] = CreateFontIndirect(&Prnlf);
+		PrnFont[AttrBold | AttrUnder] = CreateFontIndirectA(&Prnlf);
 	}
 	else {
 		PrnFont[AttrBold] = PrnFont[AttrDefault];
@@ -315,7 +317,7 @@
 	Prnlf.lfCharSet = SYMBOL_CHARSET;
 
 	strncpy_s(Prnlf.lfFaceName, sizeof(Prnlf.lfFaceName),"Tera Special", _TRUNCATE);
-	PrnFont[AttrSpecial] = CreateFontIndirect(&Prnlf);
+	PrnFont[AttrSpecial] = CreateFontIndirectA(&Prnlf);
 	PrnFont[AttrSpecial | AttrBold] = PrnFont[AttrSpecial];
 	PrnFont[AttrSpecial | AttrUnder] = PrnFont[AttrSpecial];
 	PrnFont[AttrSpecial | AttrBold | AttrUnder] = PrnFont[AttrSpecial];
@@ -416,7 +418,7 @@
 			Ptr2 = Ptr;
 			do {
 				Ptr1 = Ptr2;
-				Ptr2 = CharNext(Ptr1);
+				Ptr2 = CharNextA(Ptr1);
 			} while ((Ptr2!=NULL) && ((Ptr2-Ptr)<=i));
 			i = Ptr1-Ptr;
 			if (i<=0) {
@@ -428,7 +430,7 @@
 		RText.right = PrnX + i*PrnFW;
 		RText.top = PrnY;
 		RText.bottom = PrnY+PrnFH;
-		ExtTextOut(PrintDC,PrnX,PrnY,6,&RText,Ptr,i,&PrnDx[0]);
+		ExtTextOutA(PrintDC,PrnX,PrnY,6,&RText,Ptr,i,&PrnDx[0]);
 		PrnX = RText.right;
 		Count=Count-i;
 		Ptr = Ptr + i;
@@ -474,8 +476,8 @@
 		return;
 	}
 	if (PrnFName[0] == 0) {
-		GetTempPath(sizeof(Temp),Temp);
-		if (GetTempFileName(Temp,"tmp",0,PrnFName)==0) {
+		GetTempPathA(sizeof(Temp),Temp);
+		if (GetTempFileNameA(Temp,"tmp",0,PrnFName)==0) {
 			return;
 		}
 		HPrnFile = _lcreat(PrnFName,0);

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2019-03-28 16:38:29 UTC (rev 7526)
+++ trunk/teraterm/teraterm/vtwin.cpp	2019-03-28 16:38:41 UTC (rev 7527)
@@ -49,7 +49,6 @@
 #include "filesys.h"
 #include "telnet.h"
 #include "tektypes.h"
-#include "tekwin.h"
 #include "ttdde.h"
 #include "ttlib.h"
 #include "helpid.h"
@@ -79,6 +78,7 @@
 #include "winjump.h"
 #include "sizetip.h"
 #include "dnddlg.h"
+#include "tekwin.h"
 #include "compat_win.h"
 
 #include "initguid.h"

From scmnotify ＠ osdn.net  Fri Mar 29 01:38:54 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Fri, 29 Mar 2019 01:38:54 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc1MjhdIHZ0d2luLHRlcmF0ZXJt44GnTUZD?=
 =?utf-8?b?44KS5L2/55So44GX44Gq44GE44KI44GG44Gr44GX44Gf?=
Message-ID: <1553791134.569724.54189.nullmailer@users.osdn.me>

Revision: 7528
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7528
Author:   zmatsuo
Date:     2019-03-29 01:38:54 +0900 (Fri, 29 Mar 2019)
Log Message:
-----------
vtwin,teratermでMFCを使用しないようにした

Modified Paths:
--------------
    trunk/teraterm/common/tt_res.h
    trunk/teraterm/teraterm/ftdlg.cpp
    trunk/teraterm/teraterm/teraprn.cpp
    trunk/teraterm/teraterm/teraterm.cpp
    trunk/teraterm/teraterm/ttermpro.rc
    trunk/teraterm/teraterm/vtdisp.c
    trunk/teraterm/teraterm/vtdisp.h
    trunk/teraterm/teraterm/vtwin.cpp
    trunk/teraterm/teraterm/vtwin.h

Added Paths:
-----------
    trunk/teraterm/teraterm/teraterml.h

Removed Paths:
-------------
    trunk/teraterm/common/stdafx.cpp

-------------- next part --------------
Deleted: trunk/teraterm/common/stdafx.cpp
===================================================================
--- trunk/teraterm/common/stdafx.cpp	2019-03-28 16:38:41 UTC (rev 7527)
+++ trunk/teraterm/common/stdafx.cpp	2019-03-28 16:38:54 UTC (rev 7528)
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2011-2017 TeraTerm Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "stdafx.h"
-

Modified: trunk/teraterm/common/tt_res.h
===================================================================
--- trunk/teraterm/common/tt_res.h	2019-03-28 16:38:41 UTC (rev 7527)
+++ trunk/teraterm/common/tt_res.h	2019-03-28 16:38:54 UTC (rev 7528)
@@ -289,6 +289,7 @@
 #define ID_SETUP_TERMINAL               50310
 #define ID_SETUP_WINDOW                 50320
 #define ID_SETUP_FONT                   50330
+#define ID_SETUP_DLG_FONT               50331
 #define ID_SETUP_KEYBOARD               50340
 #define ID_SETUP_SERIALPORT             50350
 #define ID_SETUP_TCPIP                  50360

Modified: trunk/teraterm/teraterm/ftdlg.cpp
===================================================================
--- trunk/teraterm/teraterm/ftdlg.cpp	2019-03-28 16:38:41 UTC (rev 7527)
+++ trunk/teraterm/teraterm/ftdlg.cpp	2019-03-28 16:38:54 UTC (rev 7528)
@@ -39,6 +39,7 @@
 #include "dlglib.h"
 #include "tt_res.h"
 #include "ftdlg.h"
+#include "teraterml.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -150,8 +151,6 @@
 
 /////////////////////////////////////////////////////////////////////////////
 // CFileTransDlg message handler
-#define AddModalHandle(p1)		// TODO
-#define	RemoveModalHandle(p1)
 
 BOOL CFileTransDlg::OnInitDialog()
 {

Modified: trunk/teraterm/teraterm/teraprn.cpp
===================================================================
--- trunk/teraterm/teraterm/teraprn.cpp	2019-03-28 16:38:41 UTC (rev 7527)
+++ trunk/teraterm/teraterm/teraprn.cpp	2019-03-28 16:38:54 UTC (rev 7528)
@@ -28,7 +28,6 @@
  */
 
 /* TERATERM.EXE, Printing routines */
-#include "stdafx.h"
 #include "teraterm.h"
 #include "tttypes.h"
 #include <commdlg.h>
@@ -41,6 +40,7 @@
 #include "win16api.h"
 
 #include "tt_res.h"
+#include "tmfc.h"
 #include "prnabort.h"
 
 #include "teraprn.h"
@@ -51,7 +51,7 @@
 static char THIS_FILE[] = __FILE__;
 #endif
 
-//#define CWnd TTCWnd
+#define CWnd TTCWnd
 
 static PRINTDLG PrnDlg;
 

Modified: trunk/teraterm/teraterm/teraterm.cpp
===================================================================
--- trunk/teraterm/teraterm/teraterm.cpp	2019-03-28 16:38:41 UTC (rev 7527)
+++ trunk/teraterm/teraterm/teraterm.cpp	2019-03-28 16:38:54 UTC (rev 7528)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2006-2017 TeraTerm Project
+ * (C) 2006-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,8 @@
 
 /* TERATERM.EXE, main */
 
-#include "stdafx.h"
+#include <crtdbg.h>
+#include <tchar.h>
 #include "teraterm.h"
 #include "tttypes.h"
 #include "commlib.h"
@@ -47,11 +48,9 @@
 #include "keyboard.h"
 #include "dllutil.h"
 #include "compat_win.h"
-
-#include "teraapp.h"
-
 #include "compat_w95.h"
 #include "dlglib.h"
+#include "teraterml.h"
 
 #if 0
 //#ifdef _DEBUG
@@ -61,11 +60,6 @@
 #define new ::new(_NORMAL_BLOCK, __FILE__, __LINE__)
 #endif
 
-BEGIN_MESSAGE_MAP(CTeraApp, CWinApp)
-	//{{AFX_MSG_MAP(CTeraApp)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
 static BOOL AddFontFlag;
 static TCHAR TSpecialFont[MAX_PATH];
 
@@ -122,39 +116,8 @@
 	LoadSpecialFont();
 }
 
-CTeraApp::CTeraApp()
-{
-	init();
-}
-
-// CTeraApp instance
-CTeraApp theApp;
-
-
-
-
-
-// CTeraApp initialization
-BOOL CTeraApp::InitInstance()
-{
-	hInst = m_hInstance;
-	m_pMainWnd = new CVTWindow();
-	pVTWin = m_pMainWnd;
-	// [Tera Term]\x83Z\x83N\x83V\x83\x87\x83\x93\x82\xCCDlgFont=\x82\xAA\x82Ȃ\xA2\x8Fꍇ\x82\xCD
-	// [TTSH]\x83Z\x83N\x83V\x83\x87\x83\x93\x82̃t\x83H\x83\x93\x83g\x90ݒ\xE8\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9
-	SetDialogFont(ts.SetupFName, ts.UILanguageFile, "TTSSH");
-	return TRUE;
-}
-
-int CTeraApp::ExitInstance()
-{
-	UnloadSpecialFont();
-	DLLExit();
-	return CWinApp::ExitInstance();
-}
-
 // Tera Term main engine
-BOOL CTeraApp::OnIdle(LONG lCount)
+static BOOL OnIdle(LONG lCount)
 {
 	static int Busy = 2;
 	int Change, nx, ny;
@@ -280,12 +243,98 @@
 	return (Busy>0);
 }
 
-BOOL CTeraApp::PreTranslateMessage(MSG* pMsg)
+BOOL CallOnIdle(LONG lCount)
 {
-	if (MetaKey(ts.MetaKey)) {
-		return FALSE; /* ignore accelerator keys */
+	return OnIdle(lCount);
+}
+
+HINSTANCE GetInstance()
+{
+	return hInst;
+}
+
+static HWND main_window;
+HWND GetHWND()
+{
+	return main_window;
+}
+
+static HWND hModalWnd;
+
+void AddModalHandle(HWND hWnd)
+{
+	hModalWnd = hWnd;
+}
+
+void RemoveModalHandle(HWND hWnd)
+{
+	hModalWnd = 0;
+}
+
+int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPreInst,
+                   LPSTR lpszCmdLine, int nCmdShow)
+{
+#ifdef _DEBUG
+	::_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
+#endif
+
+	LONG lCount = 0;
+	DWORD SleepTick = 1;
+	init();
+	hInst = hInstance;
+	CVTWindow *m_pMainWnd = new CVTWindow();
+	pVTWin = m_pMainWnd;
+	main_window = m_pMainWnd->m_hWnd;
+	// [Tera Term]\x83Z\x83N\x83V\x83\x87\x83\x93\x82\xCCDlgFont=\x82\xAA\x82Ȃ\xA2\x8Fꍇ\x82\xCD
+	// [TTSSH]\x83Z\x83N\x83V\x83\x87\x83\x93\x82̃t\x83H\x83\x93\x83g\x90ݒ\xE8\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9
+	SetDialogFont(ts.SetupFName, ts.UILanguageFile, "TTSSH");
+
+	MSG msg;
+	while (GetMessage(&msg, NULL, 0, 0)) {
+		if (hModalWnd != 0) {
+			if (IsDialogMessage(hModalWnd, &msg)) {
+				continue;
+			}
+		}
+
+		bool message_processed = false;
+
+		if (m_pMainWnd->m_hAccel != NULL) {
+			if (!MetaKey(ts.MetaKey)) {
+				// matakey\x82\xAA\x89\x9F\x82\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA2
+				if (TranslateAccelerator(m_pMainWnd->m_hWnd , m_pMainWnd->m_hAccel, &msg)) {
+					// \x83A\x83N\x83Z\x83\x89\x83\x8C\x81[\x83^\x81[\x83L\x81[\x82\xF0\x8F\x88\x97\x9D\x82\xB5\x82\xBD
+					message_processed = true;
+				}
+			}
+		}
+
+		if (!message_processed) {
+			TranslateMessage(&msg);
+			DispatchMessage(&msg);
+		}
+
+		while (!PeekMessage(&msg, NULL, NULL, NULL, PM_NOREMOVE)) {
+			// \x83\x81\x83b\x83Z\x81[\x83W\x82\xAA\x82Ȃ\xA2
+			if (!OnIdle(lCount)) {
+				// idle\x95s\x97v
+				if (SleepTick < 500) {	// \x8Dő\xE5 501ms\x96\xA2\x96\x9E
+					SleepTick += 2;
+				}
+				lCount = 0;
+				Sleep(SleepTick);
+			} else {
+				// \x97vidle
+				SleepTick = 0;
+				lCount++;
+			}
+		}
 	}
-	else {
-		return CWinApp::PreTranslateMessage(pMsg);
-	}
+	delete m_pMainWnd;
+	m_pMainWnd = NULL;
+
+	UnloadSpecialFont();
+	DLLExit();
+
+    return msg.wParam;
 }

Copied: trunk/teraterm/teraterm/teraterml.h (from rev 7527, trunk/teraterm/common/stdafx.cpp)
===================================================================
--- trunk/teraterm/teraterm/teraterml.h	                        (rev 0)
+++ trunk/teraterm/teraterm/teraterml.h	2019-03-28 16:38:54 UTC (rev 7528)
@@ -0,0 +1,33 @@
+/*
+ * (C) 2019 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* teraterm local header   */
+/*	teraterm/ folder only  */
+
+void AddModalHandle(HWND hWnd);
+void RemoveModalHandle(HWND hWnd);

Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc	2019-03-28 16:38:41 UTC (rev 7527)
+++ trunk/teraterm/teraterm/ttermpro.rc	2019-03-28 16:38:54 UTC (rev 7528)
@@ -274,7 +274,6 @@
 
 IDD_FILETRANSDLG DIALOGEX 20, 20, 176, 96
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CLASS "FTDlg32"
 FONT 14, "System", 0, 0, 0x0
 BEGIN
     CONTROL         "Filename:",IDC_TRANS_FILENAME,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,15,12,38,10
@@ -578,7 +577,11 @@
     BEGIN
         MENUITEM "&Terminal...",                ID_SETUP_TERMINAL
         MENUITEM "&Window...",                  ID_SETUP_WINDOW
-        MENUITEM "&Font...",                    ID_SETUP_FONT
+		POPUP "&Font"
+        BEGIN
+			MENUITEM "&Font...",                ID_SETUP_FONT
+			MENUITEM "&Dialog Font...",         ID_SETUP_DLG_FONT
+	END
         MENUITEM "&Keyboard...",                ID_SETUP_KEYBOARD
         MENUITEM "S&erial port...",             ID_SETUP_SERIALPORT
         MENUITEM "T&CP/IP...",                  ID_SETUP_TCPIP

Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c	2019-03-28 16:38:41 UTC (rev 7527)
+++ trunk/teraterm/teraterm/vtdisp.c	2019-03-28 16:38:54 UTC (rev 7528)
@@ -3902,3 +3902,10 @@
 	}
 	return color;
 }
+
+void DpiChanged(void)
+{
+  ChangeFont();
+  DispChangeWinSize(WinWidth,WinHeight);
+  ChangeCaret();
+}

Modified: trunk/teraterm/teraterm/vtdisp.h
===================================================================
--- trunk/teraterm/teraterm/vtdisp.h	2019-03-28 16:38:41 UTC (rev 7527)
+++ trunk/teraterm/teraterm/vtdisp.h	2019-03-28 16:38:54 UTC (rev 7528)
@@ -55,7 +55,7 @@
   (int Xw, int Yw, int *Xs, int *Ys, PBOOL Right);
 void DispConvScreenToWin
   (int Xs, int Ys, int *Xw, int *Yw);
-void SetLogFont();
+//void SetLogFont();
 void ChangeFont();
 void ResetIME();
 void ChangeCaret();
@@ -116,6 +116,7 @@
 void DispGetRootWinSize(int *x, int *y, BOOL inPixels);
 int DispFindClosestColor(int red, int green, int blue);
 void UpdateBGBrush(void);
+void DpiChanged(void);
 
 extern int WinWidth, WinHeight;
 extern HFONT VTFont[AttrFontMask+1];

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2019-03-28 16:38:41 UTC (rev 7527)
+++ trunk/teraterm/teraterm/vtwin.cpp	2019-03-28 16:38:54 UTC (rev 7528)
@@ -30,7 +30,6 @@
 
 /* TERATERM.EXE, VT window */
 
-#include "stdafx.h"
 #include "teraterm.h"
 #include "tttypes.h"
 
@@ -51,6 +50,7 @@
 #include "tektypes.h"
 #include "ttdde.h"
 #include "ttlib.h"
+#include "dlglib.h"
 #include "helpid.h"
 #include "teraprn.h"
 #include <winsock2.h>
@@ -61,11 +61,13 @@
 #include <stdlib.h>
 #include <string.h>
 #include <locale.h>
+#include <tchar.h>
 
 #include <shlobj.h>
 #include <io.h>
 #include <errno.h>
 #include <imagehlp.h>
+#include <crtdbg.h>
 
 #include <windowsx.h>
 #include <imm.h>
@@ -79,6 +81,7 @@
 #include "sizetip.h"
 #include "dnddlg.h"
 #include "tekwin.h"
+#include <htmlhelp.h>
 #include "compat_win.h"
 
 #include "initguid.h"
@@ -86,12 +89,34 @@
 DEFINE_GUID(GUID_DEVINTERFACE_USB_DEVICE, 0xA5DCBF10L, 0x6530, 0x11D2, 0x90, 0x1F, 0x00, \
              0xC0, 0x4F, 0xB9, 0x51, 0xED);
 
-#define VTClassName "VTWin32"
+#define CFrameWnd	TTCFrameWnd
 
+#define VTClassName _T("VTWin32")
+
+#undef SetDlgItemText
+#define SetDlgItemText SetDlgItemTextA
+#undef CreateProcess
+#define CreateProcess CreateProcessA
+#undef STARTUPINFO
+#define STARTUPINFO STARTUPINFOA
+#undef GetStartupInfo
+#define GetStartupInfo GetStartupInfoA
+
+#if defined(UNICODE)
+#define CreateProcessT CreateProcessW
+#define GetStartupInfoT GetStartupInfoW
+#define STARTUPINFOT STARTUPINFOW
+#define SetDlgItemTextT SetDlgItemTextW
+#else
+#define CreateProcessT CreateProcessA
+#define GetStartupInfoT GetStartupInfoA
+#define STARTUPINFOT STARTUPINFOA
+#define SetDlgItemTextT SetDlgItemTextA
+#endif
+
 #ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
+#define malloc(l)   _malloc_dbg((l), _NORMAL_BLOCK, __FILE__, __LINE__)
+#define new  		::new(_NORMAL_BLOCK, __FILE__, __LINE__)
 #endif
 
 // \x83E\x83B\x83\x93\x83h\x83E\x8Dő剻\x83{\x83^\x83\x93\x82\xF0\x97L\x8C\xF8\x82ɂ\xB7\x82\xE9 (2005.1.15 yutaka)
@@ -103,10 +128,6 @@
 
 #define BROADCAST_LOGFILE "broadcast.log"
 
-static HFONT DlgBroadcastFont;
-static HFONT DlgCommentFont;
-static HFONT DlgSetupdirFont;
-
 static BOOL TCPLocalEchoUsed = FALSE;
 static BOOL TCPCRSendUsed = FALSE;
 
@@ -123,6 +144,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // CVTWindow
 
+#if 0
 BEGIN_MESSAGE_MAP(CVTWindow, CFrameWnd)
 	//{{AFX_MSG_MAP(CVTWindow)
 	ON_WM_ACTIVATE()
@@ -261,11 +283,18 @@
 	ON_COMMAND(ID_HELP_INDEX2, OnHelpIndex)
 	ON_COMMAND(ID_HELP_ABOUT, OnHelpAbout)
 	ON_MESSAGE(WM_USER_DROPNOTIFY, OnDropNotify)
+	ON_MESSAGE(WM_DPICHANGED, OnDpiChanged)
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
+#endif
 
+static HINSTANCE AfxGetInstanceHandle()
+{
+	return hInst;
+}
+
 // Tera Term\x8BN\x93\xAE\x8E\x9E\x82\xC6URL\x95\xB6\x8E\x9A\x97\xF1mouse over\x8E\x9E\x82ɌĂ΂\xEA\x82\xE9 (2005.4.2 yutaka)
-void SetMouseCursor(char *cursor)
+static void SetMouseCursor(const char *cursor)
 {
 	HCURSOR hc;
 	LPCTSTR name = NULL;
@@ -300,7 +329,7 @@
 	if (Alpha == alpha) {
 		return;	// \x95ω\xBB\x82Ȃ\xB5\x82Ȃ牽\x82\xE0\x82\xB5\x82Ȃ\xA2
 	}
-	LONG_PTR lp = ::GetWindowLongPtr(HVTWin, GWL_EXSTYLE);
+	LONG_PTR lp = GetWindowLongPtr(GWL_EXSTYLE);
 	if (lp == 0) {
 		return;
 	}
@@ -784,7 +813,7 @@
 #endif
 
 	wc.style = CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW;
-	wc.lpfnWndProc = AfxWndProc;
+	wc.lpfnWndProc = (WNDPROC)ProcStub;
 	wc.cbClsExtra = 0;
 	wc.cbWndExtra = 0;
 	wc.hInstance = AfxGetInstanceHandle();
@@ -796,7 +825,7 @@
 	wc.lpszClassName = VTClassName;
 
 	RegisterClass(&wc);
-	LoadAccelTable(MAKEINTRESOURCE(IDR_ACC));
+	m_hAccel = ::LoadAccelerators(hInst, MAKEINTRESOURCE(IDR_ACC));
 
 	if (ts.VTPos.x==CW_USEDEFAULT) {
 		rect = rectDefault;
@@ -807,7 +836,7 @@
 		rect.right = rect.left + 100;
 		rect.bottom = rect.top + 100;
 	}
-	Create(VTClassName, "Tera Term", Style, rect, NULL, NULL);
+	Create(hInst, VTClassName, _T("Tera Term"), Style, rect, NULL, NULL);
 
 	/*--------- Init2 -----------------*/
 	HVTWin = GetSafeHwnd();
@@ -824,9 +853,9 @@
 #ifdef ALPHABLEND_TYPE2
 //<!--by AKASI
 	if(BGNoFrame && ts.HideTitle > 0) {
-		ExStyle  = GetWindowLong(HVTWin,GWL_EXSTYLE);
+		ExStyle  = ::GetWindowLongPtr(HVTWin,GWL_EXSTYLE);
 		ExStyle &= ~WS_EX_CLIENTEDGE;
-		SetWindowLong(HVTWin,GWL_EXSTYLE,ExStyle);
+		::SetWindowLongPtr(HVTWin,GWL_EXSTYLE,ExStyle);
 	}
 //-->
 #endif
@@ -906,7 +935,7 @@
 
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef _DEBUG
+#if 0 //def _DEBUG
 void CVTWindow::AssertValid() const
 {
 	CFrameWnd::AssertValid();
@@ -1012,8 +1041,9 @@
 		return;
 	}
 
-	if (mousereport = MouseReport(IdMouseEventBtnDown, LMR, p.x, p.y)) {
-		SetCapture();
+	mousereport = MouseReport(IdMouseEventBtnDown, LMR, p.x, p.y);
+	if (mousereport) {
+		::SetCapture(m_hWnd);
 		return;
 	}
 
@@ -1853,7 +1883,7 @@
 	}
 }
 
-void CVTWindow::OnActivate(UINT nState, CWnd* pWndOther, BOOL bMinimized)
+void CVTWindow::OnActivate(UINT nState, HWND pWndOther, BOOL bMinimized)
 {
 	DispSetActive(nState!=WA_INACTIVE);
 	if (nState == WA_INACTIVE) {
@@ -2238,6 +2268,7 @@
 				ts.TransBin = DropType == DROP_TYPE_SEND_FILE ? 0 : 1;
 				FileSendStart();
 #if 0
+#if 0
 				goto finish;	// send file\x82͘A\x91\xB1\x82\xB5\x82Ăł\xAB\x82Ȃ\xA2
 #else
 				{
@@ -2251,6 +2282,7 @@
 					}
 				}
 #endif
+#endif
 			}
 			break;
 		case DROP_TYPE_PASTE_FILENAME:
@@ -2320,7 +2352,7 @@
 #endif
 }
 
-void CVTWindow::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar)
+void CVTWindow::OnHScroll(UINT nSBCode, UINT nPos, HWND pScrollBar)
 {
 	int Func;
 
@@ -2355,9 +2387,9 @@
 	DispHScroll(Func,nPos);
 }
 
-void CVTWindow::OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu)
+void CVTWindow::OnInitMenuPopup(HMENU hPopupMenu, UINT nIndex, BOOL bSysMenu)
 {
-	InitMenuPopup(pPopupMenu->m_hMenu);
+	InitMenuPopup(hPopupMenu);
 }
 
 void CVTWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
@@ -2399,11 +2431,11 @@
 	KeyUp(nChar);
 }
 
-void CVTWindow::OnKillFocus(CWnd* pNewWnd)
+void CVTWindow::OnKillFocus(HWND hNewWnd)
 {
 	DispDestroyCaret();
 	FocusReport(FALSE);
-	CFrameWnd::OnKillFocus(pNewWnd);
+//	CFrameWnd::OnKillFocus(hNewWnd);		// TODO
 
 	if (IsCaretOn()) {
 		CaretKillFocus(TRUE);
@@ -2410,7 +2442,7 @@
 	}
 }
 
-void CVTWindow::OnLButtonDblClk(UINT nFlags, CPoint point)
+void CVTWindow::OnLButtonDblClk(UINT nFlags, POINTS point)
 {
 	if (LButton || MButton || RButton) {
 		return;
@@ -2439,7 +2471,7 @@
 	::SetTimer(HVTWin, IdScrollTimer, 100, NULL);
 }
 
-void CVTWindow::OnLButtonDown(UINT nFlags, CPoint point)
+void CVTWindow::OnLButtonDown(UINT nFlags, POINTS point)
 {
 	POINT p;
 
@@ -2448,7 +2480,7 @@
 	ButtonDown(p,IdLeftButton);
 }
 
-void CVTWindow::OnLButtonUp(UINT nFlags, CPoint point)
+void CVTWindow::OnLButtonUp(UINT nFlags, POINTS point)
 {
 	if (IgnoreRelease)
 		IgnoreRelease = FALSE;
@@ -2463,7 +2495,7 @@
 	ButtonUp(FALSE);
 }
 
-void CVTWindow::OnMButtonDown(UINT nFlags, CPoint point)
+void CVTWindow::OnMButtonDown(UINT nFlags, POINTS point)
 {
 	POINT p;
 
@@ -2472,7 +2504,7 @@
 	ButtonDown(p,IdMiddleButton);
 }
 
-void CVTWindow::OnMButtonUp(UINT nFlags, CPoint point)
+void CVTWindow::OnMButtonUp(UINT nFlags, POINTS point)
 {
 	if (IgnoreRelease)
 		IgnoreRelease = FALSE;
@@ -2493,7 +2525,7 @@
 	}
 }
 
-int CVTWindow::OnMouseActivate(CWnd* pDesktopWnd, UINT nHitTest, UINT message)
+int CVTWindow::OnMouseActivate(HWND pDesktopWnd, UINT nHitTest, UINT message)
 {
 	if ((ts.SelOnActive==0) && (nHitTest==HTCLIENT)) { //disable mouse event for text selection
 		IgnoreRelease = TRUE;
@@ -2504,7 +2536,7 @@
 	}
 }
 
-void CVTWindow::OnMouseMove(UINT nFlags, CPoint point)
+void CVTWindow::OnMouseMove(UINT nFlags, POINTS point)
 {
 	int i;
 	BOOL mousereport;
@@ -2550,9 +2582,13 @@
 BOOL CVTWindow::OnMouseWheel(
 	UINT nFlags,   // \x89\xBC\x91z\x83L\x81[
 	short zDelta,  // \x89\xF1\x93]\x8B\x97\x97\xA3
-	CPoint pt      // \x83J\x81[\x83\\x83\x8B\x88ʒu
+	POINTS pts     // \x83J\x81[\x83\\x83\x8B\x88ʒu
 )
 {
+	POINT pt;
+	pt.x = pts.x;
+	pt.y = pts.y;
+
 	int line, i;
 
 	if (pSetLayeredWindowAttributes != NULL) {
@@ -2606,23 +2642,23 @@
 	return (TRUE);
 }
 
+#if 0
+// \x89\xBD\x82\xE0\x82\xB5\x82Ă\xA2\x82Ȃ\xA2
 void CVTWindow::OnNcCalcSize(BOOL valid, NCCALCSIZE_PARAMS *sizeinfo)
 {
 	CWnd::OnNcCalcSize(valid, sizeinfo);
 	return;
 }
+#endif
 
-void CVTWindow::OnNcLButtonDblClk(UINT nHitTest, CPoint point)
+void CVTWindow::OnNcLButtonDblClk(UINT nHitTest, POINTS point)
 {
 	if (! Minimized && !ts.TermIsWin && (nHitTest == HTCAPTION)) {
 		DispRestoreWinSize();
 	}
-	else {
-		CFrameWnd::OnNcLButtonDblClk(nHitTest,point);
-	}
 }
 
-void CVTWindow::OnNcRButtonDown(UINT nHitTest, CPoint point)
+void CVTWindow::OnNcRButtonDown(UINT nHitTest, POINTS point)
 {
 	if ((nHitTest==HTCAPTION) &&
 	    (ts.HideTitle>0) &&
@@ -2634,12 +2670,11 @@
 void CVTWindow::OnPaint()
 {
 	PAINTSTRUCT ps;
-	CDC *cdc;
 	HDC PaintDC;
 	int Xs, Ys, Xe, Ye;
 
 	// \x95\\x8E\xA6\x82\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xAD\x82Ă\xE0WM_PAINT\x82\xAA\x94\xAD\x90\xB6\x82\xB7\x82\xE9\x83P\x81[\x83X\x91΍\xF4
-	if (IsWindowVisible() == 0) {
+	if (::IsWindowVisible(m_hWnd) == 0) {
 		return;
 	}
 
@@ -2649,8 +2684,7 @@
 //-->
 #endif
 
-	cdc = BeginPaint(&ps);
-	PaintDC = cdc->GetSafeHdc();
+	PaintDC = BeginPaint(&ps);
 
 	PaintWindow(PaintDC,ps.rcPaint,ps.fErase, &Xs,&Ys,&Xe,&Ye);
 	LockBuffer();
@@ -2670,7 +2704,7 @@
 	}
 }
 
-void CVTWindow::OnRButtonDown(UINT nFlags, CPoint point)
+void CVTWindow::OnRButtonDown(UINT nFlags, POINTS point)
 {
 	POINT p;
 
@@ -2679,7 +2713,7 @@
 	ButtonDown(p,IdRightButton);
 }
 
-void CVTWindow::OnRButtonUp(UINT nFlags, CPoint point)
+void CVTWindow::OnRButtonUp(UINT nFlags, POINTS point)
 {
 	if (IgnoreRelease)
 		IgnoreRelease = FALSE;
@@ -2704,11 +2738,10 @@
 	}
 }
 
-void CVTWindow::OnSetFocus(CWnd* pOldWnd)
+void CVTWindow::OnSetFocus(HWND hOldWnd)
 {
 	ChangeCaret();
 	FocusReport(TRUE);
-	CFrameWnd::OnSetFocus(pOldWnd);
 }
 
 void CVTWindow::OnSize(UINT nType, int cx, int cy)
@@ -2862,7 +2895,7 @@
 		break;
 	}
 
-	CFrameWnd::OnSizing(fwSide, pRect);
+//TODO	CFrameWnd::OnSizing(fwSide, pRect);
 }
 
 void CVTWindow::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags)
@@ -2875,7 +2908,7 @@
 	// ALT + x\x82\xF0\x89\x9F\x89\xBA\x82\xB7\x82\xE9\x82\xC6 WM_SYSCHAR \x82\xAA\x94\xF2\x82\xF1\x82ł\xAD\x82\xE9\x81B
 	// ALT + Enter\x82ŃE\x83B\x83\x93\x83h\x83E\x82̍ő剻 (2005.4.24 yutaka)
 	if ((nFlags&0x2000) != 0 && nChar == CR) {
-		if (IsZoomed()) { // window is maximum
+		if (::IsZoomed(m_hWnd)) { // window is maximum
 			ShowWindow(SW_RESTORE);
 		} else {
 			ShowWindow(SW_MAXIMIZE);
@@ -2914,13 +2947,16 @@
 		return;
 	}
 
-	CFrameWnd::OnSysChar(nChar, nRepCnt, nFlags);
+	CFrameWnd::DefWindowProc(WM_SYSCHAR, nChar, MAKELONG(nRepCnt, nFlags));
 }
 
+// \x89\xBD\x82\xE0\x82\xB5\x82Ă\xA2\x82Ȃ\xA2\x81A\x95s\x97v
+#if 0
 void CVTWindow::OnSysColorChange()
 {
 	CFrameWnd::OnSysColorChange();
 }
+#endif
 
 void CVTWindow::OnSysCommand(UINT nID, LPARAM lParam)
 {
@@ -2933,9 +2969,11 @@
 		// now getting host address (see CommOpen() in commlib.c)
 		::PostMessage(HVTWin,WM_SYSCOMMAND,nID,lParam);
 	}
+#if 0
 	else {
 		CFrameWnd::OnSysCommand(nID,lParam);
 	}
+#endif
 }
 
 void CVTWindow::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
@@ -2959,7 +2997,7 @@
 	}
 }
 
-void CVTWindow::OnTimer(UINT nIDEvent)
+void CVTWindow::OnTimer(UINT_PTR nIDEvent)
 {
 	POINT Point;
 	WORD PortType;
@@ -3009,7 +3047,7 @@
 		case IdComEndTimer:
 			if (! CommCanClose(&cv)) {
 				// wait if received data remains
-				SetTimer(IdComEndTimer,1,NULL);
+				::SetTimer(m_hWnd, IdComEndTimer,1,NULL);
 				break;
 			}
 			cv.Ready = FALSE;
@@ -3045,7 +3083,7 @@
 	}
 }
 
-void CVTWindow::OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar)
+void CVTWindow::OnVScroll(UINT nSBCode, UINT nPos, HWND pScrollBar)
 {
 	int Func;
 	SCROLLINFO si;
@@ -3156,12 +3194,11 @@
 		}
 		break;
 	}
-
-	return CFrameWnd::OnDeviceChange(nEventType, dwData);
+	return TRUE;
 }
 
 //<!--by AKASI
-LONG CVTWindow::OnWindowPosChanging(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnWindowPosChanging(WPARAM wParam, LPARAM lParam)
 {
 #ifdef ALPHABLEND_TYPE2
 	if(BGEnable && BGNoCopyBits) {
@@ -3172,7 +3209,7 @@
 	return CFrameWnd::DefWindowProc(WM_WINDOWPOSCHANGING,wParam,lParam);
 }
 
-LONG CVTWindow::OnSettingChange(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnSettingChange(WPARAM wParam, LPARAM lParam)
 {
 #ifdef ALPHABLEND_TYPE2
 	BGOnSettingChange();
@@ -3180,7 +3217,7 @@
 	return CFrameWnd::DefWindowProc(WM_SETTINGCHANGE,wParam,lParam);
 }
 
-LONG CVTWindow::OnEnterSizeMove(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnEnterSizeMove(WPARAM wParam, LPARAM lParam)
 {
 	EnableSizeTip(1);
 
@@ -3190,7 +3227,7 @@
 	return CFrameWnd::DefWindowProc(WM_ENTERSIZEMOVE,wParam,lParam);
 }
 
-LONG CVTWindow::OnExitSizeMove(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnExitSizeMove(WPARAM wParam, LPARAM lParam)
 {
 #ifdef ALPHABLEND_TYPE2
 	BGOnExitSizeMove();
@@ -3532,14 +3569,14 @@
 	return 0;
 }
 
-LONG CVTWindow::OnChangeTBar(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnChangeTBar(WPARAM wParam, LPARAM lParam)
 {
 	BOOL TBar;
 	DWORD Style,ExStyle;
 	HMENU SysMenu;
 
-	Style = GetWindowLong (HVTWin, GWL_STYLE);
-	ExStyle = GetWindowLong (HVTWin, GWL_EXSTYLE);
+	Style = ::GetWindowLongPtr (HVTWin, GWL_STYLE);
+	ExStyle = ::GetWindowLongPtr (HVTWin, GWL_EXSTYLE);
 	TBar = ((Style & WS_SYSMENU)!=0);
 	if (TBar == (ts.HideTitle==0)) {
 		return 0;
@@ -3575,9 +3612,9 @@
 #endif
 
 	AdjustSize = TRUE;
-	SetWindowLong(HVTWin, GWL_STYLE, Style);
+	::SetWindowLongPtr(HVTWin, GWL_STYLE, Style);
 #ifdef ALPHABLEND_TYPE2
-	SetWindowLong(HVTWin, GWL_EXSTYLE, ExStyle);
+	::SetWindowLongPtr(HVTWin, GWL_EXSTYLE, ExStyle);
 #endif
 	::SetWindowPos(HVTWin, NULL, 0, 0, 0, 0,
 	               SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED);
@@ -3594,7 +3631,7 @@
 	return 0;
 }
 
-LONG CVTWindow::OnCommNotify(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnCommNotify(WPARAM wParam, LPARAM lParam)
 {
 	switch (LOWORD(lParam)) {
 		case FD_READ:  // TCP/IP
@@ -3618,13 +3655,13 @@
 			cv.OutBuffCount = 0;
 			cv.LineModeBuffCount = 0;
 			cv.FlushLen = 0;
-			SetTimer(IdComEndTimer,1,NULL);
+			::SetTimer(m_hWnd, IdComEndTimer,1,NULL);
 			break;
 	}
 	return 0;
 }
 
-LONG CVTWindow::OnCommOpen(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnCommOpen(WPARAM wParam, LPARAM lParam)
 {
 	AutoDisconnectedPort = -1;
 
@@ -3719,7 +3756,7 @@
 	return 0;
 }
 
-LONG CVTWindow::OnCommStart(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnCommStart(WPARAM wParam, LPARAM lParam)
 {
 	// \x8E\xA9\x93\xAE\x90ڑ\xB1\x82\xAA\x96\xB3\x8C\xF8\x82̂Ƃ\xAB\x82\xE0\x90ڑ\xB1\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x8Fo\x82\xB7\x82悤\x82ɂ\xB5\x82\xBD (2006.9.15 maya)
 	if (((ts.PortType!=IdSerial) && (ts.HostName[0]==0)) ||
@@ -3745,7 +3782,7 @@
 	return 0;
 }
 
-LONG CVTWindow::OnDdeEnd(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnDdeEnd(WPARAM wParam, LPARAM lParam)
 {
 	EndDDE();
 	if (CloseTT) {
@@ -3754,42 +3791,42 @@
 	return 0;
 }
 
-LONG CVTWindow::OnDlgHelp(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnDlgHelp(WPARAM wParam, LPARAM lParam)
 {
 	OpenHelp(HH_HELP_CONTEXT, HelpId, ts.UILanguageFile);
 	return 0;
 }
 
-LONG CVTWindow::OnFileTransEnd(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnFileTransEnd(WPARAM wParam, LPARAM lParam)
 {
 	FileTransEnd(wParam);
 	return 0;
 }
 
-LONG CVTWindow::OnGetSerialNo(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnGetSerialNo(WPARAM wParam, LPARAM lParam)
 {
 	return (LONG)SerialNo;
 }
 
-LONG CVTWindow::OnKeyCode(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnKeyCode(WPARAM wParam, LPARAM lParam)
 {
 	KeyCodeSend(wParam,(WORD)lParam);
 	return 0;
 }
 
-LONG CVTWindow::OnProtoEnd(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnProtoEnd(WPARAM wParam, LPARAM lParam)
 {
 	ProtoDlgCancel();
 	return 0;
 }
 
-LONG CVTWindow::OnChangeTitle(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnChangeTitle(WPARAM wParam, LPARAM lParam)
 {
 	ChangeTitle();
 	return 0;
 }
 
-LONG CVTWindow::OnNotifyIcon(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnNotifyIcon(WPARAM wParam, LPARAM lParam)
 {
 	if (wParam == 1) {
 		switch (lParam) {
@@ -4176,11 +4213,12 @@
 
 static LRESULT CALLBACK OnCommentDlgProc(HWND hDlgWnd, UINT msg, WPARAM wp, LPARAM lp)
 {
+	static const DlgTextInfo TextInfos[] = {
+		{ 0, "DLG_COMMENT_TITLE" },
+		{ IDOK, "BTN_OK" }
+	};
 	char buf[256];
 	UINT ret;
-	LOGFONT logfont;
-	HFONT font;
-	char uimsg[MAX_UIMSG];
 
 	switch (msg) {
 		case WM_INITDIALOG:
@@ -4187,24 +4225,7 @@
 			//SetDlgItemText(hDlgWnd, IDC_EDIT_COMMENT, "\x83T\x83\x93\x83v\x83\x8B");
 			// \x83G\x83f\x83B\x83b\x83g\x83R\x83\x93\x83g\x83\x8D\x81[\x83\x8B\x82Ƀt\x83H\x81[\x83J\x83X\x82\xF0\x82\xA0\x82Ă\xE9
 			SetFocus(GetDlgItem(hDlgWnd, IDC_EDIT_COMMENT));
-
-			font = (HFONT)SendMessage(hDlgWnd, WM_GETFONT, 0, 0);
-			GetObject(font, sizeof(LOGFONT), &logfont);
-			if (get_lang_font("DLG_SYSTEM_FONT", hDlgWnd, &logfont, &DlgCommentFont, ts.UILanguageFile)) {
-				SendDlgItemMessage(hDlgWnd, IDC_EDIT_COMMENT, WM_SETFONT, (WPARAM)DlgCommentFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(hDlgWnd, IDOK, WM_SETFONT, (WPARAM)DlgCommentFont, MAKELPARAM(TRUE,0));
-			}
-			else {
-				DlgCommentFont = NULL;
-			}
-
-			GetWindowText(hDlgWnd, uimsg, sizeof(uimsg));
-			get_lang_msg("DLG_COMMENT_TITLE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-			SetWindowText(hDlgWnd, ts.UIMsg);
-			GetDlgItemText(hDlgWnd, IDOK, uimsg, sizeof(uimsg));
-			get_lang_msg("BTN_OK", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-			SetDlgItemText(hDlgWnd, IDOK, ts.UIMsg);
-
+			SetDlgTexts(hDlgWnd, TextInfos, _countof(TextInfos), ts.UILanguageFile);
 			return FALSE;
 
 		case WM_COMMAND:
@@ -4211,21 +4232,18 @@
 			switch (LOWORD(wp)) {
 				case IDOK:
 					memset(buf, 0, sizeof(buf));
-					ret = GetDlgItemText(hDlgWnd, IDC_EDIT_COMMENT, buf, sizeof(buf) - 1);
+					ret = GetDlgItemTextA(hDlgWnd, IDC_EDIT_COMMENT, buf, sizeof(buf) - 1);
 					if (ret > 0) { // \x83e\x83L\x83X\x83g\x8E擾\x90\xAC\x8C\xF7
 						//buf[sizeof(buf) - 1] = '\0';  // null-terminate
 						CommentLogToFile(buf, ret);
 					}
-					if (DlgCommentFont != NULL) {
-						DeleteObject(DlgCommentFont);
-					}
-					EndDialog(hDlgWnd, IDOK);
+					TTEndDialog(hDlgWnd, IDOK);
 					break;
 				default:
 					return FALSE;
 			}
 		case WM_CLOSE:
-			EndDialog(hDlgWnd, 0);
+			TTEndDialog(hDlgWnd, 0);
 			return TRUE;
 
 		default:
@@ -4236,18 +4254,11 @@
 
 void CVTWindow::OnCommentToLog()
 {
-	DWORD ret;
-
 	// \x83\x8D\x83O\x83t\x83@\x83C\x83\x8B\x82փR\x83\x81\x83\x93\x83g\x82\xF0\x92lj\xC1\x82\xB7\x82\xE9 (2004.8.6 yutaka)
-	ret = DialogBox(hInst, MAKEINTRESOURCE(IDD_COMMENT_DIALOG),
-	                HVTWin, (DLGPROC)OnCommentDlgProc);
-	if (ret == 0 || ret == -1) {
-		ret = GetLastError();
-	}
-
+	TTDialogBox(hInst, MAKEINTRESOURCE(IDD_COMMENT_DIALOG),
+				HVTWin, (DLGPROC)OnCommentDlgProc);
 }
 
-
 // \x83\x8D\x83O\x82̉{\x97\x97 (2005.1.29 yutaka)
 void CVTWindow::OnViewLog()
 {
@@ -4666,6 +4677,55 @@
 	DispSetupFontDlg();
 }
 
+static BOOL CALLBACK TFontHook(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+{
+	if (Message == WM_INITDIALOG) {
+		TCHAR uimsg[MAX_UIMSG];
+		get_lang_msgT("DLG_CHOOSEFONT_STC6", uimsg, _countof(uimsg),
+					  _T("\"Font style\" selection here won't affect actual font appearance."), ts.UILanguageFile);
+		SetDlgItemTextT(Dialog, stc6, uimsg);
+	}
+	return FALSE;
+}
+
+void CVTWindow::OnSetupDlgFont()
+{
+	LOGFONTA LogFont;
+	CHOOSEFONTA cf;
+	BOOL result;
+	result = GetI18nLogfont("Tera Term", "DlgFont", &LogFont, 0, ts.SetupFName);
+	if (result == FALSE) {
+		memset(&LogFont, 0, sizeof(LogFont));
+	}
+
+	memset(&cf, 0, sizeof(cf));
+	cf.lStructSize = sizeof(cf);
+	cf.hwndOwner = HVTWin;
+	cf.lpLogFont = &LogFont;
+	cf.Flags =
+		CF_SCREENFONTS | CF_INITTOLOGFONTSTRUCT |
+		CF_SHOWHELP | CF_NOVERTFONTS |
+		CF_ENABLEHOOK;
+#if (WINVER >= _WIN32_WINNT_WIN7) && defined(CF_INACTIVEFONTS)
+	if (IsWindows7OrLater() && ts.ListHiddenFonts) {
+		cf.Flags |= CF_INACTIVEFONTS;
+	}
+#endif
+	cf.lpfnHook = (LPCFHOOKPROC)(&TFontHook);
+	cf.nFontType = REGULAR_FONTTYPE;
+	cf.hInstance = hInst;
+	HelpId = HlpSetupFont;
+	result = ChooseFontA(&cf);
+	if (result) {
+		char Temp[80];
+		_snprintf_s(Temp, sizeof(Temp), _TRUNCATE, "%s,%d,%d",
+					LogFont.lfFaceName, LogFont.lfHeight, LogFont.lfCharSet);
+		WritePrivateProfileStringA("Tera Term", "DlgFont", Temp, ts.SetupFName);
+
+		SetDialogFont(ts.SetupFName, ts.UILanguageFile, "TTSSH");
+	}
+}
+
 void CVTWindow::OnSetupKeyboard()
 {
 	BOOL Ok;
@@ -4774,7 +4834,7 @@
 		int w, h;
 
 #ifdef WINDOW_MAXMIMUM_ENABLED
-		if (IsZoomed()) {
+		if (::IsZoomed(m_hWnd)) {
 			w = ts.TerminalWidth;
 			h = ts.TerminalHeight;
 			ts.TerminalWidth = ts.TerminalOldWidth;
@@ -4790,7 +4850,7 @@
 		FreeTTSET();
 
 #ifdef WINDOW_MAXMIMUM_ENABLED
-		if (IsZoomed()) {
+		if (::IsZoomed(m_hWnd)) {
 			ts.TerminalWidth = w;
 			ts.TerminalHeight = h;
 		}
@@ -5012,11 +5072,18 @@
 
 static LRESULT CALLBACK OnSetupDirectoryDlgProc(HWND hDlgWnd, UINT msg, WPARAM wp, LPARAM lp)
 {
+	static const DlgTextInfo TextInfos[] = {
+		{ 0, "DLG_SETUPDIR_TITLE" },
+		{ IDC_INI_SETUPDIR_GROUP, "DLG_SETUPDIR_INIFILE" },
+		{ IDC_KEYCNF_SETUPDIR_GROUP, "DLG_SETUPDIR_KEYBOARDFILE" },
+		{ IDC_CYGTERM_SETUPDIR_GROUP, "DLG_SETUPDIR_CYGTERMFILE" },
+		{ IDC_SSH_SETUPDIR_GROUP, "DLG_SETUPDIR_KNOWNHOSTSFILE" },
+	};
 	static char teratermexepath[MAX_PATH];
 	static char inipath[MAX_PATH], inifilename[MAX_PATH], inipath_vstore[1024];
 	static char keycnfpath[MAX_PATH], keycnffilename[MAX_PATH], keycnfpath_vstore[1024];
 	static char cygtermpath[MAX_PATH], cygtermfilename[MAX_PATH], cygtermpath_vstore[1024];
-	static char eterm1path[MAX_PATH], eterm1filename[MAX_PATH], eterm1path_vstore[1024];
+//	static char eterm1path[MAX_PATH], eterm1filename[MAX_PATH], eterm1path_vstore[1024];
 	char temp[MAX_PATH];
 	char tmpbuf[1024];
 	typedef int (CALLBACK *PSSH_read_known_hosts_file)(char *, int);
@@ -5027,65 +5094,13 @@
 	BOOL open_dir, ret;
 	int button_pressed;
 	HWND hWnd;
-	LOGFONT logfont;
-	HFONT font;
-	char uimsg[MAX_UIMSG];
 
 	switch (msg) {
 	case WM_INITDIALOG:
 		// I18N
-		font = (HFONT)SendMessage(hDlgWnd, WM_GETFONT, 0, 0);
-		GetObject(font, sizeof(LOGFONT), &logfont);
-		if (get_lang_font("DLG_TAHOMA_FONT", hDlgWnd, &logfont, &DlgSetupdirFont, ts.UILanguageFile)) {
-			SendDlgItemMessage(hDlgWnd, IDC_INI_SETUPDIR_GROUP, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_INI_SETUPDIR_EDIT, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_INI_SETUPDIR_BUTTON, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_INI_SETUPDIR_BUTTON_FILE, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_INI_SETUPDIR_STATIC_VSTORE, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_INI_SETUPDIR_EDIT_VSTORE, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_KEYCNF_SETUPDIR_GROUP, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_KEYCNF_SETUPDIR_EDIT, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_KEYCNF_SETUPDIR_BUTTON, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_KEYCNF_SETUPDIR_BUTTON_FILE, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_KEYCNF_SETUPDIR_STATIC_VSTORE, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_KEYCNF_SETUPDIR_EDIT_VSTORE, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_CYGTERM_SETUPDIR_GROUP, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_CYGTERM_SETUPDIR_EDIT, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_CYGTERM_SETUPDIR_BUTTON, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_CYGTERM_SETUPDIR_BUTTON_FILE, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_CYGTERM_SETUPDIR_STATIC_VSTORE, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_CYGTERM_SETUPDIR_EDIT_VSTORE, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_SSH_SETUPDIR_GROUP, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_SSH_SETUPDIR_EDIT, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_SSH_SETUPDIR_BUTTON, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_SSH_SETUPDIR_BUTTON_FILE, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_SSH_SETUPDIR_STATIC_VSTORE, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_SSH_SETUPDIR_EDIT_VSTORE, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-		} else {
-			DlgSetupdirFont = NULL;
-		}
+		SetDlgTexts(hDlgWnd, TextInfos, _countof(TextInfos), ts.UILanguageFile);
 
-		GetWindowText(hDlgWnd, uimsg, sizeof(uimsg));
-		get_lang_msg("DLG_SETUPDIR_TITLE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-		SetWindowText(hDlgWnd, ts.UIMsg);
-
-		GetDlgItemText(hDlgWnd, IDC_INI_SETUPDIR_GROUP, uimsg, sizeof(uimsg));
-		get_lang_msg("DLG_SETUPDIR_INIFILE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-		SetDlgItemText(hDlgWnd, IDC_INI_SETUPDIR_GROUP, ts.UIMsg);
-
-		GetDlgItemText(hDlgWnd, IDC_KEYCNF_SETUPDIR_GROUP, uimsg, sizeof(uimsg));
-		get_lang_msg("DLG_SETUPDIR_KEYBOARDFILE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-		SetDlgItemText(hDlgWnd, IDC_KEYCNF_SETUPDIR_GROUP, ts.UIMsg);
-
-		GetDlgItemText(hDlgWnd, IDC_CYGTERM_SETUPDIR_GROUP, uimsg, sizeof(uimsg));
-		get_lang_msg("DLG_SETUPDIR_CYGTERMFILE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-		SetDlgItemText(hDlgWnd, IDC_CYGTERM_SETUPDIR_GROUP, ts.UIMsg);
-
-		GetDlgItemText(hDlgWnd, IDC_SSH_SETUPDIR_GROUP, uimsg, sizeof(uimsg));
-		get_lang_msg("DLG_SETUPDIR_KNOWNHOSTSFILE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-		SetDlgItemText(hDlgWnd, IDC_SSH_SETUPDIR_GROUP, ts.UIMsg);
-
-		if (GetModuleFileName(NULL, temp, sizeof(temp)) != 0) {
+		if (GetModuleFileNameA(NULL, temp, sizeof(temp)) != 0) {
 			ExtractDirName(temp, teratermexepath);
 		}
 
@@ -5299,10 +5314,7 @@
 			break;
 
 		case IDCANCEL:
-			if (DlgSetupdirFont != NULL) {
-				DeleteObject(DlgSetupdirFont);
-			}
-			EndDialog(hDlgWnd, IDCANCEL);
+			TTEndDialog(hDlgWnd, IDCANCEL);
 			break;
 
 		default:
@@ -5322,7 +5334,7 @@
 		}
 
 	case WM_CLOSE:
-		EndDialog(hDlgWnd, 0);
+		TTEndDialog(hDlgWnd, 0);
 		return TRUE;
 
 	default:
@@ -5339,11 +5351,8 @@
 //
 void CVTWindow::OnOpenSetupDirectory()
 {
-	int ret;
-
-	ret = DialogBox(hInst, MAKEINTRESOURCE(IDD_SETUP_DIR_DIALOG),
-		HVTWin, (DLGPROC)OnSetupDirectoryDlgProc);
-
+	TTDialogBox(hInst, MAKEINTRESOURCE(IDD_SETUP_DIR_DIALOG),
+	            HVTWin, (DLGPROC)OnSetupDirectoryDlgProc);
 }
 
 void CVTWindow::OnSetupLoadKeyMap()
@@ -5662,13 +5671,19 @@
 //
 static LRESULT CALLBACK BroadcastCommandDlgProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
 {
+	static const DlgTextInfo TextInfos[] = {
+		{ 0, "DLG_BROADCAST_TITLE" },
+		{ IDC_HISTORY_CHECK, "DLG_BROADCAST_HISTORY" },
+		{ IDC_ENTERKEY_CHECK, "DLG_BROADCAST_ENTER" },
+		{ IDC_PARENT_ONLY, "DLG_BROADCAST_PARENTONLY" },
+		{ IDC_REALTIME_CHECK, "DLG_BROADCAST_REALTIME" },
+		{ IDOK, "DLG_BROADCAST_SUBMIT" },
+		{ IDCANCEL, "BTN_CLOSE" },
+	};
 	char buf[256 + 3];
 	UINT ret;
 	LRESULT checked;
 	LRESULT history;
-	LOGFONT logfont;
-	HFONT font;
-	char uimsg[MAX_UIMSG];
 	char historyfile[MAX_PATH];
 	static HWND hwndBroadcast     = NULL; // Broadcast dropdown
 	static HWND hwndBroadcastEdit = NULL; // Edit control on Broadcast dropdown
@@ -5711,8 +5726,8 @@
 			// \x83T\x83u\x83N\x83\x89\x83X\x89\xBB\x82\xB3\x82\xB9\x82ă\x8A\x83A\x83\x8B\x83^\x83C\x83\x80\x83\x82\x81[\x83h\x82ɂ\xB7\x82\xE9 (2008.1.21 yutaka)
 			hwndBroadcast = GetDlgItem(hWnd, IDC_COMMAND_EDIT);
 			hwndBroadcastEdit = GetWindow(hwndBroadcast, GW_CHILD);
-			OrigBroadcastEditProc = (WNDPROC)GetWindowLong(hwndBroadcastEdit, GWL_WNDPROC);
-			SetWindowLong(hwndBroadcastEdit, GWL_WNDPROC, (LONG)BroadcastEditProc);
+			OrigBroadcastEditProc = (WNDPROC)GetWindowLongPtr(hwndBroadcastEdit, GWLP_WNDPROC);
+			SetWindowLongPtr(hwndBroadcastEdit, GWLP_WNDPROC, (LONG_PTR)BroadcastEditProc);
 			// \x83f\x83t\x83H\x83\x8B\x83g\x82\xCDon\x81B\x8Ec\x82\xE8\x82\xCDdisable\x81B
 			SendMessage(GetDlgItem(hWnd, IDC_REALTIME_CHECK), BM_SETCHECK, BST_CHECKED, 0);  // default on
 			EnableWindow(GetDlgItem(hWnd, IDC_HISTORY_CHECK), FALSE);
@@ -5726,44 +5741,8 @@
 			BroadcastWindowList = GetDlgItem(hWnd, IDC_LIST);
 			UpdateBroadcastWindowList(BroadcastWindowList);
 
-			font = (HFONT)SendMessage(hWnd, WM_GETFONT, 0, 0);
-			GetObject(font, sizeof(LOGFONT), &logfont);
-			if (get_lang_font("DLG_SYSTEM_FONT", hWnd, &logfont, &DlgBroadcastFont, ts.UILanguageFile)) {
-				SendDlgItemMessage(hWnd, IDC_COMMAND_EDIT, WM_SETFONT, (WPARAM)DlgBroadcastFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(hWnd, IDC_HISTORY_CHECK, WM_SETFONT, (WPARAM)DlgBroadcastFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(hWnd, IDC_RADIO_CRLF, WM_SETFONT, (WPARAM)DlgBroadcastFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(hWnd, IDC_RADIO_CR, WM_SETFONT, (WPARAM)DlgBroadcastFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(hWnd, IDC_RADIO_LF, WM_SETFONT, (WPARAM)DlgBroadcastFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(hWnd, IDC_ENTERKEY_CHECK, WM_SETFONT, (WPARAM)DlgBroadcastFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(hWnd, IDC_PARENT_ONLY, WM_SETFONT, (WPARAM)DlgBroadcastFont, MAKELPARAM(TRUE,0));	// 337: 2007/03/20
-				SendDlgItemMessage(hWnd, IDC_REALTIME_CHECK, WM_SETFONT, (WPARAM)DlgBroadcastFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(hWnd, IDOK, WM_SETFONT, (WPARAM)DlgBroadcastFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(hWnd, IDCANCEL, WM_SETFONT, (WPARAM)DlgBroadcastFont, MAKELPARAM(TRUE,0));
-			}
-			else {
-				DlgBroadcastFont = NULL;
-			}
-			GetWindowText(hWnd, uimsg, sizeof(uimsg));
-			get_lang_msg("DLG_BROADCAST_TITLE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-			SetWindowText(hWnd, ts.UIMsg);
-			GetDlgItemText(hWnd, IDC_HISTORY_CHECK, uimsg, sizeof(uimsg));
-			get_lang_msg("DLG_BROADCAST_HISTORY", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-			SetDlgItemText(hWnd, IDC_HISTORY_CHECK, ts.UIMsg);
-			GetDlgItemText(hWnd, IDC_ENTERKEY_CHECK, uimsg, sizeof(uimsg));
-			get_lang_msg("DLG_BROADCAST_ENTER", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-			SetDlgItemText(hWnd, IDC_ENTERKEY_CHECK, ts.UIMsg);
-			GetDlgItemText(hWnd, IDC_PARENT_ONLY, uimsg, sizeof(uimsg));
-			get_lang_msg("DLG_BROADCAST_PARENTONLY", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-			SetDlgItemText(hWnd, IDC_PARENT_ONLY, ts.UIMsg);
-			GetDlgItemText(hWnd, IDC_REALTIME_CHECK, uimsg, sizeof(uimsg));
-			get_lang_msg("DLG_BROADCAST_REALTIME", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-			SetDlgItemText(hWnd, IDC_REALTIME_CHECK, ts.UIMsg);
-			GetDlgItemText(hWnd, IDOK, uimsg, sizeof(uimsg));
-			get_lang_msg("DLG_BROADCAST_SUBMIT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-			SetDlgItemText(hWnd, IDOK, ts.UIMsg);
-			GetDlgItemText(hWnd, IDCANCEL, uimsg, sizeof(uimsg));
-			get_lang_msg("BTN_CLOSE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-			SetDlgItemText(hWnd, IDCANCEL, ts.UIMsg);
+			// I18N
+			SetDlgTexts(hWnd, TextInfos, _countof(TextInfos), ts.UILanguageFile);
 
 			// \x83_\x83C\x83A\x83\x8D\x83O\x82̏\x89\x8A\xFA\x83T\x83C\x83Y\x82\xF0\x95ۑ\xB6
 			GetWindowRect(hWnd, &rc_dlg);
@@ -5823,8 +5802,8 @@
 					// new handler
 					hwndBroadcast = GetDlgItem(hWnd, IDC_COMMAND_EDIT);
 					hwndBroadcastEdit = GetWindow(hwndBroadcast, GW_CHILD);
-					OrigBroadcastEditProc = (WNDPROC)GetWindowLong(hwndBroadcastEdit, GWL_WNDPROC);
-					SetWindowLong(hwndBroadcastEdit, GWL_WNDPROC, (LONG)BroadcastEditProc);
+					OrigBroadcastEditProc = (WNDPROC)GetWindowLongPtr(hwndBroadcastEdit, GWLP_WNDPROC);
+					SetWindowLongPtr(hwndBroadcastEdit, GWLP_WNDPROC, (LONG_PTR)BroadcastEditProc);
 
 					EnableWindow(GetDlgItem(hWnd, IDC_HISTORY_CHECK), FALSE);
 					EnableWindow(GetDlgItem(hWnd, IDC_RADIO_CRLF), FALSE);
@@ -5835,7 +5814,7 @@
 					EnableWindow(GetDlgItem(hWnd, IDC_LIST), TRUE);  // true
 				} else {
 					// restore old handler
-					SetWindowLong(hwndBroadcastEdit, GWL_WNDPROC, (LONG)OrigBroadcastEditProc);
+					SetWindowLongPtr(hwndBroadcastEdit, GWLP_WNDPROC, (LONG_PTR)OrigBroadcastEditProc);
 
 					EnableWindow(GetDlgItem(hWnd, IDC_HISTORY_CHECK), TRUE);
 					EnableWindow(GetDlgItem(hWnd, IDC_RADIO_CRLF), TRUE);
@@ -5910,7 +5889,7 @@
 					// \x83\x82\x81[\x83h\x83\x8C\x83X\x83_\x83C\x83A\x83\x8D\x83O\x82͈\xEA\x93x\x90\xB6\x90\xAC\x82\xB3\x82\xEA\x82\xE9\x82ƁA\x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82\xAA\x8FI\x97\xB9\x82\xB7\x82\xE9\x82܂\xC5
 					// \x94j\x8A\xFC\x82\xB3\x82\xEA\x82Ȃ\xA2\x82̂ŁA\x88ȉ\xBA\x82́u\x83E\x83B\x83\x93\x83h\x83E\x83v\x83\x8D\x83V\x81[\x83W\x83\x83\x96߂\xB5\x81v\x82͕s\x97v\x82Ǝv\x82\xED\x82\xEA\x82\xE9\x81B(yutaka)
 #if 0
-					SetWindowLong(hwndBroadcastEdit, GWL_WNDPROC, (LONG)OrigBroadcastEditProc);
+					SetWindowLongPtr(hwndBroadcastEdit, GWLP_WNDPROC, (LONG_PTR)OrigBroadcastEditProc);
 #endif
 
 					//EndDialog(hDlgWnd, IDOK);
@@ -5962,9 +5941,6 @@
 		case WM_CLOSE:
 			//DestroyWindow(hWnd);
 			EndDialog(hWnd, 0);
-			if (DlgBroadcastFont != NULL) {
-				DeleteObject(DlgBroadcastFont);
-			}
 			return TRUE;
 
 		case WM_SIZE:
@@ -6162,7 +6138,7 @@
 	// \x82\xE6\x82\xC1\x82čs\x82\xED\x82\xEA\x82\xE9\x81B
 	// \x82\xB5\x82\xA9\x82\xB5\x94\xF1\x83A\x83N\x83e\x83B\x83u\x82ȃE\x83B\x83\x93\x83h\x83E\x82ł\xCD OnIdle() \x82\xAA\x8CĂ΂\xEA\x82Ȃ\xA2\x82̂ŁA
 	// \x8B\xF3\x82̃\x81\x83b\x83Z\x81[\x83W\x82𑗂\xC1\x82\xC4 OnIdle() \x82\xAA\x8CĂ΂\xEA\x82\xE9\x82悤\x82ɂ\xB7\x82\xE9\x81B
-	PostMessage(WM_NULL, 0, 0);
+	::PostMessage(m_hWnd, WM_NULL, 0, 0);
 
 	return 1; // \x91\x97\x90M\x82ł\xAB\x82\xBD\x8Fꍇ\x82\xCD1\x82\xF0\x95Ԃ\xB7
 }
@@ -6251,3 +6227,334 @@
 	(*AboutDialog)(HVTWin);
 	FreeTTDLG();
 }
+
+LRESULT CVTWindow::OnDpiChanged(WPARAM wParam, LPARAM lParam)
+{
+	static DWORD preTime = 0;
+	DWORD currentTime = GetTickCount();
+	if (currentTime - preTime < 1000) {
+		return 0;
+	}
+	preTime = currentTime;
+
+	DpiChanged();
+	return TRUE;
+}
+
+LRESULT CVTWindow::Proc(UINT msg, WPARAM wp, LPARAM lp)
+{
+	LRESULT retval = 0;
+	if (msg == MsgDlgHelp) {
+		OnDlgHelp(wp,lp);
+		return 0;
+	}
+	switch(msg)
+	{
+	case WM_ACTIVATE:
+		OnActivate(wp & 0xFFFF, (HWND)wp, (wp >> 16) & 0xFFFF);
+		break;
+	case WM_CHAR:
+		OnChar(wp, LOWORD(lp), HIWORD(lp));
+		break;
+	case WM_CLOSE:
+		OnClose();
+		break;
+	case WM_DESTROY:
+		OnDestroy();
+		PostQuitMessage(0);
+		break;
+	case WM_DROPFILES:
+		OnDropFiles((HDROP)wp);
+		break;
+	case WM_GETMINMAXINFO:
+		OnGetMinMaxInfo((MINMAXINFO *)lp);
+		break;
+	case WM_HSCROLL:
+		OnHScroll(LOWORD(wp), HIWORD(wp), (HWND)lp);
+		break;
+	case WM_INITMENUPOPUP:
+		OnInitMenuPopup((HMENU)wp, LOWORD(lp), HIWORD(lp));
+		break;
+	case WM_KEYDOWN:
+		OnKeyDown(wp, LOWORD(lp), HIWORD(lp));
+		break;
+	case WM_KEYUP:
+		OnKeyUp(wp, LOWORD(lp), HIWORD(lp));
+		break;
+	case WM_KILLFOCUS:
+		OnKillFocus((HWND)wp);
+		break;
+	case WM_LBUTTONDBLCLK:
+		OnLButtonDblClk(wp, MAKEPOINTS(lp));
+		break;
+	case WM_LBUTTONDOWN:
+		OnLButtonDown(wp, MAKEPOINTS(lp));
+		break;
+	case WM_LBUTTONUP:
+		OnLButtonUp(wp, MAKEPOINTS(lp));
+		break;
+	case WM_MBUTTONDOWN:
+		OnMButtonDown(wp, MAKEPOINTS(lp));
+		break;
+	case WM_MBUTTONUP:
+		OnMButtonUp(wp, MAKEPOINTS(lp));
+		break;
+	case WM_MOUSEACTIVATE:
+		OnMouseActivate((HWND)wp, LOWORD(lp), HIWORD(lp));
+		break;
+	case WM_MOUSEMOVE:
+		OnMouseMove(wp, MAKEPOINTS(lp));
+		break;
+	case WM_MOUSEWHEEL:
+		OnMouseWheel(GET_KEYSTATE_WPARAM(wp), GET_WHEEL_DELTA_WPARAM(wp), MAKEPOINTS(lp));
+		break;
+	case WM_MOVE:
+		OnMove(LOWORD(lp), HIWORD(lp));
+		break;
+	case WM_NCLBUTTONDBLCLK:
+		OnNcLButtonDblClk((UINT)wp, MAKEPOINTS(lp));
+		DefWindowProc(msg, wp, lp);
+		break;
+	case WM_NCRBUTTONDOWN:
+		OnNcRButtonDown((UINT)wp, MAKEPOINTS(lp));
+		break;
+#if 0
+		// \x89\xBD\x82\xE0\x82\xB5\x82Ă\xA2\x82Ȃ\xA2
+	case WM_NCCALCSIZE:
+		break;
+#endif
+	case WM_PAINT:
+		OnPaint();
+		break;
+	case WM_RBUTTONDOWN:
+		OnRButtonDown((UINT)wp, MAKEPOINTS(lp));
+		break;
+	case WM_RBUTTONUP:
+		OnRButtonUp((UINT)wp, MAKEPOINTS(lp));
+		break;
+	case WM_SETFOCUS:
+		OnSetFocus((HWND)wp);
+		DefWindowProc(msg, wp, lp);
+		break;
+	case WM_SIZE:
+		OnSize(wp, LOWORD(lp), HIWORD(lp));
+		break;
+	case WM_SIZING:
+		OnSizing(wp, (LPRECT)lp);
+		break;
+#if 1
+	case WM_SYSCHAR:
+		OnSysChar(wp, LOWORD(lp), HIWORD(lp));
+		break;
+#endif
+#if 0	// \x89\xBD\x82\xE0\x82\xB5\x82Ă\xA2\x82Ȃ\xA2\x81A\x95s\x97v
+	case WM_SYSCOLORCHANGE:
+		break;
+#endif
+	case WM_SYSCOMMAND:
+		OnSysCommand(wp, lp);
+		DefWindowProc(msg, wp, lp);
+		break;
+	case WM_SYSKEYDOWN:
+		OnSysKeyDown(wp, LOWORD(lp), HIWORD(lp));
+		break;
+	case WM_SYSKEYUP:
+		OnSysKeyUp(wp, LOWORD(lp), HIWORD(lp));
+		break;
+	case WM_TIMER:
+		OnTimer(wp);
+		break;
+	case WM_VSCROLL:
+		OnVScroll(LOWORD(wp), HIWORD(wp), (HWND)lp);
+		break;
+	case WM_DEVICECHANGE:
+		OnDeviceChange((UINT)wp, (DWORD_PTR)lp);
+		DefWindowProc(msg, wp, lp);
+		break;
+	case WM_IME_STARTCOMPOSITION :
+		OnIMEStartComposition(wp, lp);
+		break;
+	case WM_IME_ENDCOMPOSITION :
+		OnIMEEndComposition(wp, lp);
+		break;
+	case WM_IME_COMPOSITION:
+		OnIMEComposition(wp, lp);
+		break;
+	case WM_INPUTLANGCHANGE:
+		OnIMEInputChange(wp, lp);
+		break;
+	case WM_IME_NOTIFY:
+		OnIMENotify(wp, lp);
+		break;
+	case WM_IME_REQUEST:
+		OnIMERequest(wp, lp);
+		break;
+	case WM_WINDOWPOSCHANGING:
+		OnWindowPosChanging(wp, lp);
+		break;
+	case WM_SETTINGCHANGE:
+		OnSettingChange(wp, lp);
+		break;
+	case WM_ENTERSIZEMOVE:
+		OnEnterSizeMove(wp, lp);
+		break;
+	case WM_EXITSIZEMOVE :
+		OnExitSizeMove(wp, lp);
+		break;
+	case WM_USER_ACCELCOMMAND:
+		OnAccelCommand(wp, lp);
+		break;
+	case WM_USER_CHANGEMENU:
+		OnChangeMenu(wp, lp);
+		break;
+	case WM_USER_CHANGETBAR:
+		OnChangeTBar(wp, lp);
+		break;
+	case WM_USER_COMMNOTIFY:
+		OnCommNotify(wp, lp);
+		break;
+	case WM_USER_COMMOPEN:
+		OnCommOpen(wp, lp);
+		break;
+	case WM_USER_COMMSTART:
+		OnCommStart(wp, lp);
+		break;
+	case WM_USER_DDEEND:
+		OnDdeEnd(wp, lp);
+		break;
+	case WM_USER_DLGHELP2:
+		OnDlgHelp(wp, lp);
+		break;
+	case WM_USER_FTCANCEL:
+		OnFileTransEnd(wp, lp);
+		break;
+	case WM_USER_GETSERIALNO:
+		OnGetSerialNo(wp, lp);
+		break;
+	case WM_USER_KEYCODE:
+		OnKeyCode(wp, lp);
+		break;
+	case WM_USER_PROTOCANCEL:
+		OnProtoEnd(wp, lp);
+		break;
+	case WM_USER_CHANGETITLE:
+		OnChangeTitle(wp, lp);
+		break;
+	case WM_COPYDATA:
+		OnReceiveIpcMessage(wp, lp);
+		break;
+	case WM_USER_NONCONFIRM_CLOSE:
+		OnNonConfirmClose(wp, lp);
+		break;
+	case WM_USER_NOTIFYICON:
+		OnNotifyIcon(wp, lp);
+		break;
+	case WM_USER_DROPNOTIFY:
+		OnDropNotify(wp, lp);
+		break;
+	case WM_DPICHANGED:
+		OnDpiChanged(wp, lp);
+		break;
+	case WM_COMMAND:
+	{
+		const WORD wID = GET_WM_COMMAND_ID(wp, lp);
+		switch (wID) {
+		case ID_FILE_NEWCONNECTION: OnFileNewConnection(); break;
+		case ID_FILE_DUPLICATESESSION: OnDuplicateSession(); break;
+		case ID_FILE_CYGWINCONNECTION: OnCygwinConnection(); break;
+		case ID_FILE_TERATERMMENU: OnTTMenuLaunch(); break;
+		case ID_FILE_LOGMEIN: OnLogMeInLaunch(); break;
+		case ID_FILE_LOG: OnFileLog(); break;
+		case ID_FILE_COMMENTTOLOG: OnCommentToLog(); break;
+		case ID_FILE_VIEWLOG: OnViewLog(); break;
+		case ID_FILE_SHOWLOGDIALOG: OnShowLogDialog(); break;
+		case ID_FILE_REPLAYLOG: OnReplayLog(); break;
+		case ID_FILE_SENDFILE: OnFileSend(); break;
+		case ID_FILE_KERMITRCV: OnFileKermitRcv(); break;
+		case ID_FILE_KERMITGET: OnFileKermitGet(); break;
+		case ID_FILE_KERMITSEND: OnFileKermitSend(); break;
+		case ID_FILE_KERMITFINISH: OnFileKermitFinish(); break;
+		case ID_FILE_XRCV: OnFileXRcv(); break;
+		case ID_FILE_XSEND: OnFileXSend(); break;
+		case ID_FILE_YRCV: OnFileYRcv(); break;
+		case ID_FILE_YSEND: OnFileYSend(); break;
+		case ID_FILE_ZRCV: OnFileZRcv(); break;
+		case ID_FILE_ZSEND: OnFileZSend(); break;
+		case ID_FILE_BPRCV: OnFileBPRcv(); break;
+		case ID_FILE_BPSEND: OnFileBPSend(); break;
+		case ID_FILE_QVRCV: OnFileQVRcv(); break;
+		case ID_FILE_QVSEND: OnFileQVSend(); break;
+		case ID_FILE_CHANGEDIR: OnFileChangeDir(); break;
+		case ID_FILE_PRINT2: OnFilePrint(); break;
+		case ID_FILE_DISCONNECT: OnFileDisconnect(); break;
+		case ID_FILE_EXIT: OnFileExit(); break;
+		case ID_FILE_EXITALL: OnAllClose(); break;
+		case ID_EDIT_COPY2: OnEditCopy(); break;
+		case ID_EDIT_COPYTABLE: OnEditCopyTable(); break;
+		case ID_EDIT_PASTE2: OnEditPaste(); break;
+		case ID_EDIT_PASTECR: OnEditPasteCR(); break;
+		case ID_EDIT_CLEARSCREEN: OnEditClearScreen(); break;
+		case ID_EDIT_CLEARBUFFER: OnEditClearBuffer(); break;
+		case ID_EDIT_CANCELSELECT: OnEditCancelSelection(); break;
+		case ID_EDIT_SELECTALL: OnEditSelectAllBuffer(); break;
+		case ID_EDIT_SELECTSCREEN: OnEditSelectScreenBuffer(); break;
+		case ID_SETUP_ADDITIONALSETTINGS: OnExternalSetup(); break;
+		case ID_SETUP_TERMINAL: OnSetupTerminal(); break;
+		case ID_SETUP_WINDOW: OnSetupWindow(); break;
+		case ID_SETUP_FONT: OnSetupFont(); break;
+		case ID_SETUP_DLG_FONT: OnSetupDlgFont(); break;
+		case ID_SETUP_KEYBOARD: OnSetupKeyboard(); break;
+		case ID_SETUP_SERIALPORT: OnSetupSerialPort(); break;
+		case ID_SETUP_TCPIP: OnSetupTCPIP(); break;
+		case ID_SETUP_GENERAL: OnSetupGeneral(); break;
+		case ID_SETUP_SAVE: OnSetupSave(); break;
+		case ID_SETUP_RESTORE: OnSetupRestore(); break;
+		case ID_OPEN_SETUP: OnOpenSetupDirectory(); break;
+		case ID_SETUP_LOADKEYMAP: OnSetupLoadKeyMap(); break;
+		case ID_CONTROL_RESETTERMINAL: OnControlResetTerminal(); break;
+		case ID_CONTROL_RESETREMOTETITLE: OnControlResetRemoteTitle(); break;
+		case ID_CONTROL_AREYOUTHERE: OnControlAreYouThere(); break;
+		case ID_CONTROL_SENDBREAK: OnControlSendBreak(); break;
+		case ID_CONTROL_RESETPORT: OnControlResetPort(); break;
+		case ID_CONTROL_BROADCASTCOMMAND: OnControlBroadcastCommand(); break;
+		case ID_CONTROL_OPENTEK: OnControlOpenTEK(); break;
+		case ID_CONTROL_CLOSETEK: OnControlCloseTEK(); break;
+		case ID_CONTROL_MACRO: OnControlMacro(); break;
+		case ID_CONTROL_SHOW_MACRO: OnShowMacroWindow(); break;
+		case ID_WINDOW_WINDOW: OnWindowWindow(); break;
+		case ID_WINDOW_MINIMIZEALL: OnWindowMinimizeAll(); break;
+		case ID_WINDOW_CASCADEALL: OnWindowCascade(); break;
+		case ID_WINDOW_STACKED: OnWindowStacked(); break;
+		case ID_WINDOW_SIDEBYSIDE: OnWindowSidebySide(); break;
+		case ID_WINDOW_RESTOREALL: OnWindowRestoreAll(); break;
+		case ID_WINDOW_UNDO: OnWindowUndo(); break;
+		case ID_HELP_INDEX2: OnHelpIndex(); break;
+		case ID_HELP_ABOUT: OnHelpAbout(); break;
+		default:
+			OnCommand(wp, lp);
+			break;
+		}
+		break;
+	}
+	case WM_NCHITTEST: {
+		retval = CFrameWnd::DefWindowProc(msg, wp ,lp);
+		if (ts.HideTitle>0) {
+			if ((retval == HTCLIENT) && AltKey()) {
+#ifdef ALPHABLEND_TYPE2
+			if(ShiftKey())
+				retval = HTBOTTOMRIGHT;
+			else
+				retval = HTCAPTION;
+#else
+			retval = HTCAPTION;
+#endif
+			}
+		}
+	}
+		break;
+	default:
+		retval = DefWindowProc(msg, wp, lp);
+		break;
+	}
+	return retval;
+}

Modified: trunk/teraterm/teraterm/vtwin.h
===================================================================
--- trunk/teraterm/teraterm/vtwin.h	2019-03-28 16:38:41 UTC (rev 7527)
+++ trunk/teraterm/teraterm/vtwin.h	2019-03-28 16:38:54 UTC (rev 7528)
@@ -31,7 +31,9 @@
 
 #ifdef __cplusplus
 
-class CVTWindow : public CFrameWnd
+#include "tmfc.h"
+
+class CVTWindow : public TTCFrameWnd
 {
 private:
   BOOL FirstPaint, Minimized;
@@ -51,11 +53,9 @@
     SetupMenu, ControlMenu, WinMenu, HelpMenu;
 
   // drag and drop handle
-  char **DropLists;
+  TCHAR **DropLists;
   int DropListCount;
   void DropListFree();
-  bool DropWithLeftbutton;
-  bool DropWithRightbutton;
 
   // window attribute
   BYTE Alpha;
@@ -79,19 +79,19 @@
 
 	//{{AFX_VIRTUAL(CVTWindow)
 	protected:
-	virtual LRESULT DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam);
 	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
 	//}}AFX_VIRTUAL
 
 public:
-#ifdef _DEBUG
+#if 0 //def _DEBUG
 	virtual void AssertValid() const;
-	virtual void Dump(CDumpContext& dc) const;
+//	virtual void Dump(CDumpContext& dc) const;
 #endif
 
 protected:
 	//{{AFX_MSG(CVTWindow)
-	afx_msg void OnActivate(UINT nState, CWnd* pWndOther, BOOL bMinimized);
+#define afx_msg
+	afx_msg void OnActivate(UINT nState, HWND pWndOther, BOOL bMinimized);
 	afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags);
 	afx_msg void OnClose();
 	afx_msg void OnAllClose();
@@ -98,65 +98,65 @@
 	afx_msg void OnDestroy();
 	afx_msg void OnDropFiles(HDROP hDropInfo);
 	afx_msg void OnGetMinMaxInfo(MINMAXINFO *lpMMI);
-	afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
-	afx_msg void OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu);
+	afx_msg void OnHScroll(UINT nSBCode, UINT nPos, HWND pScrollBar);
+	afx_msg void OnInitMenuPopup(HMENU hPopupMenu, UINT nIndex, BOOL bSysMenu);
 	afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
 	afx_msg void OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnKillFocus(CWnd* pNewWnd);
-	afx_msg void OnLButtonDblClk(UINT nFlags, CPoint point);
-	afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
-	afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
-	afx_msg void OnMButtonDown(UINT nFlags, CPoint point);
-	afx_msg void OnMButtonUp(UINT nFlags, CPoint point);
-	afx_msg int OnMouseActivate(CWnd* pDesktopWnd, UINT nHitTest, UINT message);
-	afx_msg void OnMouseMove(UINT nFlags, CPoint point);
+	afx_msg void OnKillFocus(HWND hNewWnd);
+	afx_msg void OnLButtonDblClk(UINT nFlags, POINTS point);
+	afx_msg void OnLButtonDown(UINT nFlags, POINTS point);
+	afx_msg void OnLButtonUp(UINT nFlags, POINTS point);
+	afx_msg void OnMButtonDown(UINT nFlags, POINTS point);
+	afx_msg void OnMButtonUp(UINT nFlags, POINTS point);
+	afx_msg int OnMouseActivate(HWND pDesktopWnd, UINT nHitTest, UINT message);
+	afx_msg void OnMouseMove(UINT nFlags, POINTS point);
 	afx_msg void OnMove(int x, int y);
-	afx_msg BOOL OnMouseWheel(UINT nFlags, short zDelta, CPoint pt);
-	afx_msg void OnNcCalcSize(BOOL valid, NCCALCSIZE_PARAMS *calcsize);
-	afx_msg void OnNcLButtonDblClk(UINT nHitTest, CPoint point);
-	afx_msg void OnNcRButtonDown(UINT nHitTest, CPoint point);
+	afx_msg BOOL OnMouseWheel(UINT nFlags, short zDelta, POINTS pt);
+//	afx_msg void OnNcCalcSize(BOOL valid, NCCALCSIZE_PARAMS *calcsize); // \x89\xBD\x82\xE0\x82\xB5\x82Ă\xA2\x82Ȃ\xA2\x81A\x95s\x97v
+	afx_msg void OnNcLButtonDblClk(UINT nHitTest, POINTS point);
+	afx_msg void OnNcRButtonDown(UINT nHitTest, POINTS point);
 	afx_msg void OnPaint();
-	afx_msg void OnRButtonDown(UINT nFlags, CPoint point);
-	afx_msg void OnRButtonUp(UINT nFlags, CPoint point);
-	afx_msg void OnSetFocus(CWnd* pOldWnd);
+	afx_msg void OnRButtonDown(UINT nFlags, POINTS point);
+	afx_msg void OnRButtonUp(UINT nFlags, POINTS point);
+	afx_msg void OnSetFocus(HWND hOldWnd);
 	afx_msg void OnSize(UINT nType, int cx, int cy);
 	afx_msg void OnSizing(UINT fwSide, LPRECT pRect);
 	afx_msg void OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnSysColorChange();
+//	afx_msg void OnSysColorChange();		// \x89\xBD\x82\xE0\x82\xB5\x82Ă\xA2\x82Ȃ\xA2\x81A\x95s\x97v
 	afx_msg void OnSysCommand(UINT nID, LPARAM lParam);
 	afx_msg void OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
 	afx_msg void OnSysKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnTimer(UINT nIDEvent);
-	afx_msg void OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
+	afx_msg void OnTimer(UINT_PTR nIDEvent);
+	afx_msg void OnVScroll(UINT nSBCode, UINT nPos, HWND pScrollBar);
 	afx_msg BOOL OnDeviceChange(UINT nEventType, DWORD_PTR dwData);
 //<!--by AKASI
-	afx_msg LONG OnWindowPosChanging(UINT wParam, LONG lParam);
-	afx_msg LONG OnSettingChange(UINT wParam, LONG lParam);
-	afx_msg LONG OnEnterSizeMove(UINT wParam, LONG lParam);
-	afx_msg LONG  OnExitSizeMove(UINT wParam, LONG lParam);
+	afx_msg LRESULT OnWindowPosChanging(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnSettingChange(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnEnterSizeMove(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnExitSizeMove(WPARAM wParam, LPARAM lParam);
 //-->
 	afx_msg LRESULT OnIMEStartComposition(WPARAM wParam, LPARAM lParam);
 	afx_msg LRESULT OnIMEEndComposition(WPARAM wParam, LPARAM lParam);
-	afx_msg LONG OnIMEComposition(UINT wParam, LONG lParam);
-	afx_msg LONG OnIMEInputChange(UINT wParam, LONG lParam);
-	afx_msg LONG OnIMENotify(UINT wParam, LONG lParam);
-	afx_msg LONG OnIMERequest(UINT wParam, LONG lParam);
-	afx_msg LONG OnAccelCommand(UINT wParam, LONG lParam);
-	afx_msg LONG OnChangeMenu(UINT wParam, LONG lParam);
-	afx_msg LONG OnChangeTBar(UINT wParam, LONG lParam);
-	afx_msg LONG OnCommNotify(UINT wParam, LONG lParam);
-	afx_msg LONG OnCommOpen(UINT wParam, LONG lParam);
-	afx_msg LONG OnCommStart(UINT wParam, LONG lParam);
-	afx_msg LONG OnDdeEnd(UINT wParam, LONG lParam);
-	afx_msg LONG OnDlgHelp(UINT wParam, LONG lParam);
-	afx_msg LONG OnFileTransEnd(UINT wParam, LONG lParam);
-	afx_msg LONG OnGetSerialNo(UINT wParam, LONG lParam);
-	afx_msg LONG OnKeyCode(UINT wParam, LONG lParam);
-	afx_msg LONG OnProtoEnd(UINT wParam, LONG lParam);
-	afx_msg LONG OnChangeTitle(UINT wParam, LONG lParam);
-	afx_msg LONG OnReceiveIpcMessage(UINT wParam, LONG lParam);
-	afx_msg LONG OnNonConfirmClose(UINT wParam, LONG lParam);
-	afx_msg LONG OnNotifyIcon(UINT wParam, LONG lParam);
+	afx_msg LRESULT OnIMEComposition(UINT wParam, LONG lParam);
+	afx_msg LRESULT OnIMEInputChange(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnIMENotify(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnIMERequest(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnAccelCommand(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnChangeMenu(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnChangeTBar(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnCommNotify(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnCommOpen(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnCommStart(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnDdeEnd(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnDlgHelp(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnFileTransEnd(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnGetSerialNo(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnKeyCode(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnProtoEnd(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnChangeTitle(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnReceiveIpcMessage(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnNonConfirmClose(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnNotifyIcon(WPARAM wParam, LPARAM lParam);
 	afx_msg void OnFileNewConnection();
 	afx_msg void OnDuplicateSession();
 	afx_msg void OnCygwinConnection();
@@ -199,6 +199,7 @@
 	afx_msg void OnSetupTerminal();
 	afx_msg void OnSetupWindow();
 	afx_msg void OnSetupFont();
+	afx_msg void OnSetupDlgFont();
 	afx_msg void OnSetupKeyboard();
 	afx_msg void OnSetupSerialPort();
 	afx_msg void OnSetupTCPIP();
@@ -225,12 +226,17 @@
 	afx_msg void OnWindowRestoreAll();
 	afx_msg void OnWindowUndo();
 	afx_msg void OnHelpIndex();
-	afx_msg void OnHelpUsing();
+//	afx_msg void OnHelpUsing();		// \x8E\xC0\x91̂Ȃ\xB5\x95s\x97v
 	afx_msg void OnHelpAbout();
-	afx_msg LONG OnDropNotify(UINT ShowMenu, LONG lParam);
+	afx_msg LRESULT OnDropNotify(WPARAM ShowMenu, LPARAM lParam);
+	afx_msg LRESULT OnDpiChanged(WPARAM wParam, LPARAM lParam);
 	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP();
+//	DECLARE_MESSAGE_MAP();
+#undef afx_msg
 	void Disconnect(BOOL confirm);
+	///
+	LRESULT DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam);
+	virtual LRESULT Proc(UINT msg, WPARAM wp, LPARAM lp);
 };
 #endif
 

From scmnotify ＠ osdn.net  Fri Mar 29 01:39:07 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Fri, 29 Mar 2019 01:39:07 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc1MjldIE1GQ+mWoumAo+WJiumZpA==?=
Message-ID: <1553791147.729095.55947.nullmailer@users.osdn.me>

Revision: 7529
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7529
Author:   zmatsuo
Date:     2019-03-29 01:39:07 +0900 (Fri, 29 Mar 2019)
Log Message:
-----------
MFC関連削除
- ライブラリ指定からMFC関連を削除
- 不要ファイル削除
- VS2017プロジェクトファイル保守

Modified Paths:
--------------
    trunk/teraterm/teraterm/CMakeLists.txt
    trunk/teraterm/teraterm/ttermpro.v15.vcxproj
    trunk/teraterm/teraterm/ttermpro.v15.vcxproj.filters
    trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj
    trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters

Removed Paths:
-------------
    trunk/teraterm/common/stdafx.h
    trunk/teraterm/teraterm/teraapp.h

-------------- next part --------------
Deleted: trunk/teraterm/common/stdafx.h
===================================================================
--- trunk/teraterm/common/stdafx.h	2019-03-28 16:38:54 UTC (rev 7528)
+++ trunk/teraterm/common/stdafx.h	2019-03-28 16:39:07 UTC (rev 7529)
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2009-2017 TeraTerm Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-//
-// stdafx.h
-//
-
-#define VC_EXTRALEAN
-
-#include <afxwin.h>
-#include <afxext.h>
-
-#ifndef __WATCOMC__
-#ifndef _AFX_NO_AFXCMN_SUPPORT
-#include <afxcmn.h>
-#endif // _AFX_NO_AFXCMN_SUPPORT
-#endif

Modified: trunk/teraterm/teraterm/CMakeLists.txt
===================================================================
--- trunk/teraterm/teraterm/CMakeLists.txt	2019-03-28 16:38:54 UTC (rev 7528)
+++ trunk/teraterm/teraterm/CMakeLists.txt	2019-03-28 16:39:07 UTC (rev 7529)
@@ -98,10 +98,10 @@
   tekwin.h
   telnet.c
   telnet.h
-  teraapp.h
   teraprn.cpp
   teraprn.h
   teraterm.cpp
+  teraterml.h
   ttdde.c
   ttdde.h
   ttdialog.c
@@ -157,11 +157,7 @@
   ${SFMT_LIBRARY_DIRS}
   )
 
-set(CMAKE_MFC_FLAG 1)
-
 if (MSVC)
-  set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:nafxcw.lib /NODEFAULTLIB:LIBCMT.lib")
-  set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:nafxcwd.lib /NODEFAULTLIB:LIBCMTD.lib")
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DELAYLOAD:imagehlp.dll /DELAYLOAD:user32.dll /DELAYLOAD:shell32.dll")
 endif()
 
@@ -182,10 +178,6 @@
   ttpfile
   ttpset
   ttptek
-  optimized nafxcw.lib
-  debug nafxcwd.lib
-  optimized LIBCMT.lib
-  debug LIBCMTD.lib
   optimized onig.lib
   debug onigd.lib
   #

Deleted: trunk/teraterm/teraterm/teraapp.h
===================================================================
--- trunk/teraterm/teraterm/teraapp.h	2019-03-28 16:38:54 UTC (rev 7528)
+++ trunk/teraterm/teraterm/teraapp.h	2019-03-28 16:39:07 UTC (rev 7529)
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2009-2017 TeraTerm Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* TERATERM.EXE, Main application class */
-
-class CTeraApp : public CWinApp
-{
-public:
-	CTeraApp();
-
-	//{{AFX_VIRTUAL(CTeraApp)
-	public:
-	virtual BOOL InitInstance();
-	virtual int ExitInstance();
-	virtual BOOL OnIdle(LONG lCount);
-	virtual BOOL PreTranslateMessage(MSG* pMsg);
-	//}}AFX_VIRTUAL
-
-	//{{AFX_MSG(CTeraApp)
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};

Modified: trunk/teraterm/teraterm/ttermpro.v15.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v15.vcxproj	2019-03-28 16:38:54 UTC (rev 7528)
+++ trunk/teraterm/teraterm/ttermpro.v15.vcxproj	2019-03-28 16:39:07 UTC (rev 7529)
@@ -21,12 +21,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v141</PlatformToolset>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v141</PlatformToolset>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -81,7 +81,7 @@
       <AdditionalIncludeDirectories>.;$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;onig_sd.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>LIBCMTD.lib;onig_sd.lib;comctl32.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -88,7 +88,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib;libcmt.lib</IgnoreSpecificDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
     </Link>
     <Manifest>
       <AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
@@ -127,7 +127,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>nafxcw.lib;LIBCMT.lib;onig_s.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>LIBCMT.lib;onig_s.lib;comctl32.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -134,7 +134,8 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreSpecificDefaultLibraries>nafxcw.lib;LIBCMT.lib</IgnoreSpecificDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
     </Link>
     <Manifest>
       <AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
@@ -148,7 +149,8 @@
     <ClCompile Include="..\common\dlglib.c" />
     <ClCompile Include="..\common\dlglib_cpp.cpp" />
     <ClCompile Include="..\common\dlglib_tmpl.cpp" />
-    <ClCompile Include="..\common\stdafx.cpp" />
+    <ClCompile Include="..\common\tmfc.cpp" />
+    <ClCompile Include="..\common\tmfc_frame.cpp" />
     <ClCompile Include="..\common\ttlib.c" />
     <ClCompile Include="..\common\tipwin.cpp" />
     <ClCompile Include="..\common\win16api.c" />
@@ -208,6 +210,7 @@
     <ClInclude Include="..\common\dlglib.h" />
     <ClInclude Include="..\common\tektypes.h" />
     <ClInclude Include="..\common\teraterm.h" />
+    <ClInclude Include="..\common\tmfc.h" />
     <ClInclude Include="..\common\tt-version.h" />
     <ClInclude Include="..\common\ttcommon.h" />
     <ClInclude Include="..\common\ttddecmnd.h" />
@@ -278,4 +281,4 @@
       <UserProperties RESOURCE_FILE="ttermpro.rc" />
     </VisualStudio>
   </ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>

Modified: trunk/teraterm/teraterm/ttermpro.v15.vcxproj.filters
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v15.vcxproj.filters	2019-03-28 16:38:54 UTC (rev 7528)
+++ trunk/teraterm/teraterm/ttermpro.v15.vcxproj.filters	2019-03-28 16:39:07 UTC (rev 7529)
@@ -27,9 +27,6 @@
     <ClCompile Include="filesys.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\stdafx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="tekwin.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -144,6 +141,12 @@
     <ClCompile Include="../ttpdlg/ttdlg.c">
       <Filter>ttpdlg</Filter>
     </ClCompile>
+    <ClCompile Include="..\common\tmfc_frame.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\tmfc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\..\cygterm\cygterm.ico">
@@ -309,5 +312,8 @@
     <ClInclude Include="../ttpdlg/ttdlg.h">
       <Filter>ttpdlg</Filter>
     </ClInclude>
+    <ClInclude Include="..\common\tmfc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

Modified: trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj	2019-03-28 16:38:54 UTC (rev 7528)
+++ trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj	2019-03-28 16:39:07 UTC (rev 7529)
@@ -131,7 +131,6 @@
   <ItemGroup>
     <ClCompile Include="..\common\codeconv.cpp" />
     <ClCompile Include="..\common\i18n.c" />
-    <ClCompile Include="..\common\stdafx.cpp" />
     <ClCompile Include="..\common\ttlib.c" />
     <ClCompile Include="..\common\win16api.c" />
     <ClCompile Include="errdlg.cpp" />
@@ -199,4 +198,4 @@
       <UserProperties RESOURCE_FILE="ttpmacro.rc" />
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>
\ No newline at end of file

Modified: trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters	2019-03-28 16:38:54 UTC (rev 7528)
+++ trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters	2019-03-28 16:39:07 UTC (rev 7529)
@@ -34,9 +34,6 @@
     <ClCompile Include="statdlg.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\stdafx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="ttmacro.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>

From scmnotify ＠ osdn.net  Fri Mar 29 22:34:29 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Fri, 29 Mar 2019 22:34:29 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc1MzBdIOODl+ODreOCuOOCp+OCr+ODiA==?=
 =?utf-8?b?44OV44Kh44Kk44Or5L+d5a6IIFZTMjAwNQ==?=
Message-ID: <1553866469.533648.60737.nullmailer@users.osdn.me>

Revision: 7530
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7530
Author:   zmatsuo
Date:     2019-03-29 22:34:29 +0900 (Fri, 29 Mar 2019)
Log Message:
-----------
プロジェクトファイル保守 VS2005

Modified Paths:
--------------
    trunk/teraterm/teraterm/ttermpro.vcproj
    trunk/teraterm/ttermpro.sln
    trunk/teraterm/ttpmacro/ttpmacro.vcproj

-------------- next part --------------
Modified: trunk/teraterm/teraterm/ttermpro.vcproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.vcproj	2019-03-28 16:39:07 UTC (rev 7529)
+++ trunk/teraterm/teraterm/ttermpro.vcproj	2019-03-29 13:34:29 UTC (rev 7530)
@@ -20,11 +20,13 @@
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
-			UseOfMFC="1"
+			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="creating &quot;$(ProjectDir)svnversion.h&quot;"
+				CommandLine="&quot;$(OutDir)\svnrev.exe&quot; &quot;$(SolutionDir)..\libs\svn\bin\svnversion.exe&quot; &quot;$(SolutionDir)..&quot; &quot;$(ProjectDir)svnversion.h&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -48,7 +50,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D&quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg"
+				AdditionalIncludeDirectories=".;$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				RuntimeLibrary="1"
 				BrowseInformation="0"
@@ -71,7 +73,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="onig_sd.lib ws2_32.lib imagehlp.lib"
+				AdditionalDependencies="onig_sd.lib comctl32.lib ws2_32.lib imagehlp.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(OutDir)"
@@ -112,11 +114,13 @@
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
-			UseOfMFC="1"
+			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="creating &quot;$(ProjectDir)svnversion.h&quot;"
+				CommandLine="&quot;$(OutDir)\svnrev.exe&quot; &quot;$(SolutionDir)..\libs\svn\bin\svnversion.exe&quot; &quot;$(SolutionDir)..&quot; &quot;$(ProjectDir)svnversion.h&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -141,7 +145,7 @@
 				AdditionalOptions="/D&quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg"
+				AdditionalIncludeDirectories=".;$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -164,7 +168,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="onig_s.lib ws2_32.lib imagehlp.lib"
+				AdditionalDependencies="onig_s.lib comctl32.lib ws2_32.lib imagehlp.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(OutDir)"
@@ -245,10 +249,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\common\stdafx.cpp"
-				>
-			</File>
-			<File
 				RelativePath="tekwin.cpp"
 				>
 			</File>
@@ -261,6 +261,18 @@
 				>
 			</File>
 			<File
+				RelativePath="..\common\tmfc.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\common\tmfc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\common\tmfc_frame.cpp"
+				>
+			</File>
+			<File
 				RelativePath="vtwin.cpp"
 				>
 			</File>

Modified: trunk/teraterm/ttermpro.sln
===================================================================
--- trunk/teraterm/ttermpro.sln	2019-03-28 16:39:07 UTC (rev 7529)
+++ trunk/teraterm/ttermpro.sln	2019-03-29 13:34:29 UTC (rev 7530)
@@ -7,6 +7,7 @@
 		{6D08053B-1C68-4A7E-8766-3553F5AF010B} = {6D08053B-1C68-4A7E-8766-3553F5AF010B}
 		{118E0D32-5553-4F73-9927-E873C1C500E4} = {118E0D32-5553-4F73-9927-E873C1C500E4}
 		{311F2B21-AEC4-4384-8209-BB83B54749B4} = {311F2B21-AEC4-4384-8209-BB83B54749B4}
+		{80F1C3F0-A213-4D48-85C8-A265990D19A7} = {80F1C3F0-A213-4D48-85C8-A265990D19A7}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "keycode", "keycode\keycode.vcproj", "{B31BF2E8-79E6-4735-BEA2-C1B4041C2D2E}"

Modified: trunk/teraterm/ttpmacro/ttpmacro.vcproj
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.vcproj	2019-03-28 16:39:07 UTC (rev 7529)
+++ trunk/teraterm/ttpmacro/ttpmacro.vcproj	2019-03-29 13:34:29 UTC (rev 7530)
@@ -231,10 +231,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\common\stdafx.cpp"
-				>
-			</File>
-			<File
 				RelativePath="ttmacro.cpp"
 				>
 			</File>

From scmnotify ＠ osdn.net  Fri Mar 29 22:34:43 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Fri, 29 Mar 2019 22:34:43 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B7531=5D_VS2005_Express_=E5=AF=BE?=
 =?utf-8?b?5b+c?=
Message-ID: <1553866483.539866.60887.nullmailer@users.osdn.me>

Revision: 7531
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7531
Author:   zmatsuo
Date:     2019-03-29 22:34:43 +0900 (Fri, 29 Mar 2019)
Log Message:
-----------
VS2005 Express 対応

Modified Paths:
--------------
    trunk/TTProxy/TTProxy.rc
    trunk/TTXKanjiMenu/ttxkanjimenu.rc
    trunk/teraterm/CMakeLists.txt
    trunk/teraterm/teraterm/ttermpro.rc
    trunk/teraterm/ttpcmn/CMakeLists.txt
    trunk/teraterm/ttptek/CMakeLists.txt
    trunk/ttpmenu/ttpmenu.rc
    trunk/ttssh2/ttssh/ttssh.rc
    trunk/ttssh2/ttxssh/ttxssh.rc

-------------- next part --------------
Modified: trunk/TTProxy/TTProxy.rc
===================================================================
--- trunk/TTProxy/TTProxy.rc	2019-03-29 13:34:29 UTC (rev 7530)
+++ trunk/TTProxy/TTProxy.rc	2019-03-29 13:34:43 UTC (rev 7531)
@@ -7,7 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include <winres.h>
+//#include <winres.h>
 #include <winnt.rh>
 #include <winuser.rh>
 #include <commctrl.rh>

Modified: trunk/TTXKanjiMenu/ttxkanjimenu.rc
===================================================================
--- trunk/TTXKanjiMenu/ttxkanjimenu.rc	2019-03-29 13:34:29 UTC (rev 7530)
+++ trunk/TTXKanjiMenu/ttxkanjimenu.rc	2019-03-29 13:34:43 UTC (rev 7531)
@@ -7,7 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include <windows.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS

Modified: trunk/teraterm/CMakeLists.txt
===================================================================
--- trunk/teraterm/CMakeLists.txt	2019-03-29 13:34:29 UTC (rev 7530)
+++ trunk/teraterm/CMakeLists.txt	2019-03-29 13:34:43 UTC (rev 7531)
@@ -14,10 +14,13 @@
   ttpset
   PROPERTIES FOLDER teraterm)
 
-add_subdirectory(ttpmacro)
-set_target_properties(
-  ttpmacro
-  PROPERTIES FOLDER teraterm)
+if(NOT(${CMAKE_GENERATOR} MATCHES "Visual Studio 8 2005" AND ${CMAKE_MAKE_PROGRAM} MATCHES "VCExpress.exe"))
+  # MFCを使用しているため VS2005 Express ではビルドできない
+  add_subdirectory(ttpmacro)
+  set_target_properties(
+    ttpmacro
+    PROPERTIES FOLDER teraterm)
+endif()
 
 add_subdirectory(ttptek)
 set_target_properties(

Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc	2019-03-29 13:34:29 UTC (rev 7530)
+++ trunk/teraterm/teraterm/ttermpro.rc	2019-03-29 13:34:43 UTC (rev 7531)
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "..\common\tt_res.h"
+#include "tt_res.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -7,8 +7,8 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
-
+#include <winresrc.h>
+#define IDC_STATIC -1
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 
@@ -461,13 +461,13 @@
 
 1 TEXTINCLUDE 
 BEGIN
-    "..\\common\\tt_res.h\0"
+    "tt_res.h\0"
 END
 
 2 TEXTINCLUDE 
 BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
+    "#include <winresrc.h>\r\n"
+    "#define IDC_STATIC -1\0"
 END
 
 3 TEXTINCLUDE 

Modified: trunk/teraterm/ttpcmn/CMakeLists.txt
===================================================================
--- trunk/teraterm/ttpcmn/CMakeLists.txt	2019-03-29 13:34:29 UTC (rev 7530)
+++ trunk/teraterm/ttpcmn/CMakeLists.txt	2019-03-29 13:34:43 UTC (rev 7531)
@@ -36,7 +36,6 @@
   language.h
   ttcmn.c
   ttpcmn-version.rc
-  ttpcmn.rc
   ${COMMON_SRC}
   )
 

Modified: trunk/teraterm/ttptek/CMakeLists.txt
===================================================================
--- trunk/teraterm/ttptek/CMakeLists.txt	2019-03-29 13:34:29 UTC (rev 7530)
+++ trunk/teraterm/ttptek/CMakeLists.txt	2019-03-29 13:34:43 UTC (rev 7531)
@@ -26,7 +26,6 @@
   tekesc.c
   tekesc.h
   ttptek.def
-  ttptek.rc
   ttptek-version.rc
   tttek.h
   tttek.c

Modified: trunk/ttpmenu/ttpmenu.rc
===================================================================
--- trunk/ttpmenu/ttpmenu.rc	2019-03-29 13:34:29 UTC (rev 7530)
+++ trunk/ttpmenu/ttpmenu.rc	2019-03-29 13:34:43 UTC (rev 7531)
@@ -7,7 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include <windows.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS

Modified: trunk/ttssh2/ttssh/ttssh.rc
===================================================================
--- trunk/ttssh2/ttssh/ttssh.rc	2019-03-29 13:34:29 UTC (rev 7530)
+++ trunk/ttssh2/ttssh/ttssh.rc	2019-03-29 13:34:43 UTC (rev 7531)
@@ -7,7 +7,8 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+//#include "afxres.h"
+#include <windows.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS

Modified: trunk/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.rc	2019-03-29 13:34:29 UTC (rev 7530)
+++ trunk/ttssh2/ttxssh/ttxssh.rc	2019-03-29 13:34:43 UTC (rev 7531)
@@ -7,7 +7,10 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include <windows.h>
+#ifndef IDC_STATIC
+#define IDC_STATIC -1
+#endif
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS

From scmnotify ＠ osdn.net  Fri Mar 29 22:58:10 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Fri, 29 Mar 2019 22:58:10 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc1MzJdIGdpdC1zdm7jgIFwdXR0eS5pc3M=?=
 =?utf-8?b?44GM44Gq44GE5aC05ZCI44Gr5a++5b+c44GZ44KL44KI44GG44Gr44GX44Gf?=
Message-ID: <1553867890.135924.123801.nullmailer@users.osdn.me>

Revision: 7532
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7532
Author:   zmatsuo
Date:     2019-03-29 22:58:09 +0900 (Fri, 29 Mar 2019)
Log Message:
-----------
git-svn、putty.issがない場合に対応するようにした

Modified Paths:
--------------
    trunk/CMakeLists.txt
    trunk/ttssh2/ttxssh/CMakeLists.txt

-------------- next part --------------
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2019-03-29 13:34:43 UTC (rev 7531)
+++ trunk/CMakeLists.txt	2019-03-29 13:58:09 UTC (rev 7532)
@@ -57,8 +57,14 @@
   if(Git_FOUND)
     execute_process(
       COMMAND ${GIT_EXECUTABLE} svn log --oneline -1
-      OUTPUT_VARIABLE ov)
-    string(REGEX MATCH "[0-9]+" SVNVERSION ${ov})
+      RESULT_VARIABLE rv
+      OUTPUT_VARIABLE ov
+      ERROR_QUIET)
+    if(${rv})
+      message("git svn error? please check git svn")
+    else()
+      string(REGEX MATCH "[0-9]+" SVNVERSION ${ov})
+    endif()
   endif()
 elseif(EXISTS "${CMAKE_SOURCE_DIR}/.svn")
   # svn

Modified: trunk/ttssh2/ttxssh/CMakeLists.txt
===================================================================
--- trunk/ttssh2/ttxssh/CMakeLists.txt	2019-03-29 13:34:43 UTC (rev 7531)
+++ trunk/ttssh2/ttxssh/CMakeLists.txt	2019-03-29 13:58:09 UTC (rev 7532)
@@ -134,6 +134,11 @@
 
 ### create puttyversion.h
 
+set(PUTTY_ISS "${CMAKE_SOURCE_DIR}/libs/putty/windows/putty.iss")
+if(NOT EXISTS ${PUTTY_ISS})
+  message(FATAL_ERROR "${PUTTY_ISS} not found")
+endif()
+
 file(READ "${CMAKE_SOURCE_DIR}/libs/putty/windows/putty.iss" iis)
 
 string(REGEX MATCH "VersionInfoTextVersion=([^\n]+)\n" _ ${iis})

From scmnotify ＠ osdn.net  Fri Mar 29 23:51:52 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Fri, 29 Mar 2019 23:51:52 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc1MzNdIOaUueeJiOWxpeattOOBruiLsQ==?=
 =?utf-8?b?6Kiz?=
Message-ID: <1553871112.531069.111646.nullmailer@users.osdn.me>

Revision: 7533
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7533
Author:   yutakapon
Date:     2019-03-29 23:51:52 +0900 (Fri, 29 Mar 2019)
Log Message:
-----------
改版履歴の英訳

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2019-03-29 13:58:09 UTC (rev 7532)
+++ trunk/doc/en/html/about/history.html	2019-03-29 14:51:52 UTC (rev 7533)
@@ -35,7 +35,7 @@
 <ul class="history">
   <li>Bug fixes
     <ul>
-      <li><!--IME\x82̕ϊ\xB7\x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82̕\\x8E\xA6\x88ʒu\x82\xAA\x83J\x81[\x83\\x83\x8B\x88ʒu\x82ɒǏ]\x82\xB5\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B-->This bug was introduced in 4.102.</li>
+      <li>Display position of IME's conversion candidate window can not follow cursor position. This bug was introduced in 4.102.</li>
       <li>Can't display character such as U+2014 EM DASH, U+2212 MINUS SIGN, U+301C WAVE DASH etc. This bug was introduced in 4.102.</li>
     </ul>
   </li>

From scmnotify ＠ osdn.net  Sat Mar 30 00:09:43 2019
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sat, 30 Mar 2019 00:09:43 +0900
Subject: [Ttssh2-commit] =?utf-8?b?Wzc1MzRdIOWFpeWKm+a8ouWtl+S9jee9rg==?=
 =?utf-8?b?44GM44Ga44KM44KL5aC05ZCI44GM44GC44Gj44Gf44Gu44Gn5a++5Yem44GX?=
 =?utf-8?b?44Gf?=
Message-ID: <1553872183.240614.17224.nullmailer@users.osdn.me>

Revision: 7534
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7534
Author:   zmatsuo
Date:     2019-03-30 00:09:42 +0900 (Sat, 30 Mar 2019)
Log Message:
-----------
入力漢字位置がずれる場合があったので対処した

Modified Paths:
--------------
    trunk/teraterm/teraterm/vtdisp.c
    trunk/teraterm/teraterm/vtdisp.h
    trunk/teraterm/teraterm/vtwin.cpp

-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c	2019-03-29 14:51:52 UTC (rev 7533)
+++ trunk/teraterm/teraterm/vtdisp.c	2019-03-29 15:09:42 UTC (rev 7534)
@@ -112,7 +112,7 @@
 static int CaretStatus;
 static BOOL CaretEnabled = TRUE;
 BOOL IMEstat;				/* IME Status  TRUE=IME ON */
-BOOL IMEShowingCandidate;	/* \x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x95\\x8E\xA6\x8F\xF3\x8B\xB5 TRUE=\x95\\x8E\xA6\x92\x86 */
+BOOL IMECompositionState;	/* \x95ϊ\xB7\x8F\xF3\x91\xD4 TRUE=\x95ϊ\xB7\x92\x86 */
 
 // ---- device context and status flags
 static HDC VTDC = NULL; /* Device context for VT window */
@@ -2227,11 +2227,11 @@
 		CaretX = (CursorX-WinOrgX)*FontWidth;
 		CaretY = (CursorY-WinOrgY)*FontHeight;
 
-		if (IMEstat && IMEShowingCandidate) {
-			// IME ON && \x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x95\\x8E\xA6\x92\x86\x82̏ꍇ\x82݂̂̏\x88\x97\x9D
-			// \x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82\xAA\x95\\x8E\xA6\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x8F\xF3\x91Ԃ\xC5
+		if (IMEstat && IMECompositionState) {
+			// IME ON && \x95ϊ\xB7\x92\x86\x82̏ꍇ\x82݂̂̏\x88\x97\x9D\x82\xB7\x82\xE9\x81B
+			// \x95ϊ\xB7\x92\x86(\x8A\xBF\x8E\x9A\x82\xE2\x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82\xAA\x95\\x8E\xA6\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x8F\xF3\x91\xD4)\x82\xC5
 			// \x83z\x83X\x83g\x82\xA9\x82\xE7\x82̃G\x83R\x81[\x82\xF0\x8E\xF3\x90M\x82\xB5\x82\xC4caret\x88ʒu\x82\xAA\x95ω\xBB\x82\xB5\x82\xBD\x8Fꍇ\x81A
-			// \x95ϊ\xB7\x83E\x83B\x83\x93\x83h\x83E\x82̈ʒu\x82\xF0\x8DX\x90V\x82\xB7\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE9
+			// \x95ϊ\xB7\x82\xB5\x82Ă\xA2\x82\xE9\x88ʒu\x82\xF0\x8DX\x90V\x82\xB7\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE9\x81B
 			SetConversionWindow(HVTWin,CaretX,CaretY);
 		}
 

Modified: trunk/teraterm/teraterm/vtdisp.h
===================================================================
--- trunk/teraterm/teraterm/vtdisp.h	2019-03-29 14:51:52 UTC (rev 7533)
+++ trunk/teraterm/teraterm/vtdisp.h	2019-03-29 15:09:42 UTC (rev 7534)
@@ -129,7 +129,7 @@
 extern TCharAttr DefCharAttr;
 
 extern BOOL IMEstat;
-extern BOOL IMEShowingCandidate;
+extern BOOL IMECompositionState;
 
 #define SCROLL_BOTTOM	1
 #define SCROLL_LINEDOWN	2

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2019-03-29 14:51:52 UTC (rev 7533)
+++ trunk/teraterm/teraterm/vtwin.cpp	2019-03-29 15:09:42 UTC (rev 7534)
@@ -3241,7 +3241,7 @@
 
 LRESULT CVTWindow::OnIMEStartComposition(WPARAM wParam, LPARAM lParam)
 {
-	IMEShowingCandidate = TRUE;
+	IMECompositionState = TRUE;
 
 	// \x88ʒu\x82\xF0\x92ʒm\x82\xB7\x82\xE9
 	int CaretX = (CursorX-WinOrgX)*FontWidth;
@@ -3253,7 +3253,7 @@
 
 LRESULT CVTWindow::OnIMEEndComposition(WPARAM wParam, LPARAM lParam)
 {
-	IMEShowingCandidate = FALSE;
+	IMECompositionState = FALSE;
 	return CFrameWnd::DefWindowProc(WM_IME_ENDCOMPOSITION,wParam,lParam);
 }
 
@@ -3322,16 +3322,17 @@
 	//  MS IME \x93\xFA\x96{\x8C\xEA(Windows 10 1809)	suport
 	//  Google \x93\xFA\x96{\x8C\xEA\x93\xFC\x97\xCD(2.24.3250.0)	not support
 	//
-	// WM_IME_STARTCOMPOSITION, WM_IME_ENDCOMPOSITION\x82݂̂Ŕ\xBB\x92\xE8\x89”\\x82\xBE\x82\xAA
-	// \x94O\x82ׂ̈\xB1\x82̃\x81\x83b\x83Z\x81[\x83W\x82\xE0\x8F\x88\x97\x9D\x82\xB7\x82\xE9
-	case IMN_OPENCANDIDATE:
+	// WM_IME_STARTCOMPOSITION / WM_IME_ENDCOMPOSITION \x82\xCD
+	// \x8A\xBF\x8E\x9A\x93\xFC\x97͏\xF3\x91Ԃ\xAA\x83X\x83^\x81[\x83g\x82\xB5\x82\xBD / \x8FI\x97\xB9\x82\xB5\x82\xBD\x82Ŕ\xAD\x90\xB6\x82\xB7\x82\xE9\x81B
+	// IME_OPENCANDIDATE / IMN_CLOSECANDIDATE \x82\xCD
+	// \x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82\xAA\x95\\x8E\xA6\x82\xB3\x82ꂽ / \x95‚\xB6\x82\xBD\x82Ŕ\xAD\x90\xB6\x82\xB7\x82\xE9\x81B
+	case IMN_OPENCANDIDATE: {
 		// \x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8AJ\x82\xB1\x82\xA4\x82Ƃ\xB5\x82Ă\xA2\x82\xE9
-		IMEShowingCandidate = TRUE;
+		int CaretX = (CursorX-WinOrgX)*FontWidth;
+		int CaretY = (CursorY-WinOrgY)*FontHeight;
+		SetConversionWindow(HVTWin,CaretX,CaretY);
 		break;
-	case IMN_CLOSECANDIDATE:
-		// \x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x95‚\xB6\x82悤\x82Ƃ\xB5\x82Ă\xA2\x82\xE9
-		IMEShowingCandidate = FALSE;
-		break;
+	}
 	default:
 		break;
 	}