[Ttssh2-commit] [7694] Merge r7686 into cmake

scmno****@osdn***** scmno****@osdn*****
2019年 5月 20日 (月) 00:06:13 JST


Revision: 7694
          https://osdn.net/projects/ttssh2/scm/svn/commits/7694
Author:   zmatsuo
Date:     2019-05-20 00:06:12 +0900 (Mon, 20 May 2019)
Log Message:
-----------
Merge r7686 into cmake

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

Modified Paths:
--------------
    branches/cmake/CMakeLists.txt
    branches/cmake/TTProxy/CMakeLists.txt
    branches/cmake/TTProxy/ProxyWSockHook.h
    branches/cmake/TTProxy/TTProxy.h
    branches/cmake/TTProxy/TTProxy.v10.vcxproj
    branches/cmake/TTProxy/TTProxy.v10.vcxproj.filters
    branches/cmake/TTProxy/TTProxy.v11.vcxproj
    branches/cmake/TTProxy/TTProxy.v11.vcxproj.filters
    branches/cmake/TTProxy/TTProxy.v12.vcxproj
    branches/cmake/TTProxy/TTProxy.v12.vcxproj.filters
    branches/cmake/TTProxy/TTProxy.v14.vcxproj
    branches/cmake/TTProxy/TTProxy.v14.vcxproj.filters
    branches/cmake/TTProxy/TTProxy.v15.vcxproj
    branches/cmake/TTProxy/TTProxy.v15.vcxproj.filters
    branches/cmake/TTProxy/TTProxy.v9.vcproj
    branches/cmake/TTProxy/TTProxy.vcproj
    branches/cmake/TTProxy/YCL/include/YCL/Dialog.h
    branches/cmake/TTProxy/YCL/include/YCL/common.h
    branches/cmake/TTXKanjiMenu/ttxkanjimenu.vcproj
    branches/cmake/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.vcproj
    branches/cmake/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.vcproj
    branches/cmake/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.vcproj
    branches/cmake/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.vcproj
    branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.c
    branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v10.vcxproj
    branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v10.vcxproj.filters
    branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v11.vcxproj
    branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v11.vcxproj.filters
    branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v12.vcxproj
    branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v12.vcxproj.filters
    branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v14.vcxproj
    branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v14.vcxproj.filters
    branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj
    branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj.filters
    branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v9.vcproj
    branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.vcproj
    branches/cmake/TTXSamples/TTXResizeMenu/TTXResizeMenu.vcproj
    branches/cmake/TTXSamples/TTXResizeWin/TTXResizeWin.vcproj
    branches/cmake/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.vcproj
    branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.c
    branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v10.vcxproj
    branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v10.vcxproj.filters
    branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v11.vcxproj
    branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v11.vcxproj.filters
    branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v12.vcxproj
    branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v12.vcxproj.filters
    branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v14.vcxproj
    branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v14.vcxproj.filters
    branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj
    branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj.filters
    branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v9.vcproj
    branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.vcproj
    branches/cmake/TTXSamples/TTXttyrec/TTXttyplay.vcproj
    branches/cmake/TTXSamples/TTXttyrec/TTXttyrec.vcproj
    branches/cmake/TTXSamples/ttxtest/TTXtest.vcproj
    branches/cmake/doc/convtext.bat
    branches/cmake/doc/en/html/about/history.html
    branches/cmake/doc/en/html/image/Authentication.png
    branches/cmake/doc/en/html/index.html
    branches/cmake/doc/en/html/menu/setup-font.html
    branches/cmake/doc/en/html/menu/setup-sshauth.html
    branches/cmake/doc/en/html/reference/develop.txt
    branches/cmake/doc/en/html/reference/sourcecode.html
    branches/cmake/doc/en/html/setup/teraterm-ini.html
    branches/cmake/doc/en/html/usage/ssh.html
    branches/cmake/doc/en/teraterm.hhc
    branches/cmake/doc/ja/html/about/history.html
    branches/cmake/doc/ja/html/image/Authentication.png
    branches/cmake/doc/ja/html/index.html
    branches/cmake/doc/ja/html/menu/setup-font.html
    branches/cmake/doc/ja/html/menu/setup-sshauth.html
    branches/cmake/doc/ja/html/reference/build_with_cmake.md
    branches/cmake/doc/ja/html/reference/develop.txt
    branches/cmake/doc/ja/html/reference/sourcecode.html
    branches/cmake/doc/ja/html/setup/teraterm-ini.html
    branches/cmake/doc/ja/html/usage/ssh.html
    branches/cmake/doc/ja/teraterm.hhc
    branches/cmake/installer/check_sjis_code.pl
    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/libs/SFMT.cmake
    branches/cmake/libs/build_library_with_cmake.md
    branches/cmake/libs/buildall.cmake
    branches/cmake/libs/buildall_cmake.bat
    branches/cmake/libs/oniguruma.cmake
    branches/cmake/libs/openssl.cmake
    branches/cmake/libs/script_support.cmake
    branches/cmake/libs/zlib.cmake
    branches/cmake/teraterm/common/codeconv.cpp
    branches/cmake/teraterm/common/compat_win.h
    branches/cmake/teraterm/common/dlglib.c
    branches/cmake/teraterm/common/dlglib.h
    branches/cmake/teraterm/common/dlglib_cpp.cpp
    branches/cmake/teraterm/common/dlglib_tmpl.cpp
    branches/cmake/teraterm/common/tmfc.cpp
    branches/cmake/teraterm/common/tmfc.h
    branches/cmake/teraterm/common/tmfc_frame.cpp
    branches/cmake/teraterm/common/ttlib.c
    branches/cmake/teraterm/common/ttlib.h
    branches/cmake/teraterm/teraterm/CMakeLists.txt
    branches/cmake/teraterm/teraterm/addsetting.cpp
    branches/cmake/teraterm/teraterm/addsetting.h
    branches/cmake/teraterm/teraterm/dnddlg.cpp
    branches/cmake/teraterm/teraterm/ftdlg.cpp
    branches/cmake/teraterm/teraterm/prnabort.h
    branches/cmake/teraterm/teraterm/tekwin.cpp
    branches/cmake/teraterm/teraterm/teraterm.cpp
    branches/cmake/teraterm/teraterm/ttdialog.c
    branches/cmake/teraterm/teraterm/ttermpro.v10.vcxproj
    branches/cmake/teraterm/teraterm/ttermpro.v10.vcxproj.filters
    branches/cmake/teraterm/teraterm/ttermpro.v11.vcxproj
    branches/cmake/teraterm/teraterm/ttermpro.v11.vcxproj.filters
    branches/cmake/teraterm/teraterm/ttermpro.v12.vcxproj
    branches/cmake/teraterm/teraterm/ttermpro.v12.vcxproj.filters
    branches/cmake/teraterm/teraterm/ttermpro.v14.vcxproj
    branches/cmake/teraterm/teraterm/ttermpro.v14.vcxproj.filters
    branches/cmake/teraterm/teraterm/ttermpro.v15.vcxproj
    branches/cmake/teraterm/teraterm/ttermpro.v15.vcxproj.filters
    branches/cmake/teraterm/teraterm/ttermpro.v9.vcproj
    branches/cmake/teraterm/teraterm/ttermpro.vcproj
    branches/cmake/teraterm/teraterm/vtdisp.c
    branches/cmake/teraterm/teraterm/vtterm.c
    branches/cmake/teraterm/teraterm/vtwin.cpp
    branches/cmake/teraterm/teraterm/winjump.c
    branches/cmake/teraterm/ttpcmn/CMakeLists.txt
    branches/cmake/teraterm/ttpcmn/ttcmn.c
    branches/cmake/teraterm/ttpcmn/ttpcmn-version.rc
    branches/cmake/teraterm/ttpcmn/ttpcmn.v10.vcxproj
    branches/cmake/teraterm/ttpcmn/ttpcmn.v10.vcxproj.filters
    branches/cmake/teraterm/ttpcmn/ttpcmn.v11.vcxproj
    branches/cmake/teraterm/ttpcmn/ttpcmn.v11.vcxproj.filters
    branches/cmake/teraterm/ttpcmn/ttpcmn.v12.vcxproj
    branches/cmake/teraterm/ttpcmn/ttpcmn.v12.vcxproj.filters
    branches/cmake/teraterm/ttpcmn/ttpcmn.v14.vcxproj
    branches/cmake/teraterm/ttpcmn/ttpcmn.v14.vcxproj.filters
    branches/cmake/teraterm/ttpcmn/ttpcmn.v15.vcxproj
    branches/cmake/teraterm/ttpcmn/ttpcmn.v15.vcxproj.filters
    branches/cmake/teraterm/ttpcmn/ttpcmn.v9.vcproj
    branches/cmake/teraterm/ttpcmn/ttpcmn.vcproj
    branches/cmake/teraterm/ttpdlg/ttdlg.c
    branches/cmake/teraterm/ttpfile/ttfile.c
    branches/cmake/teraterm/ttpfile/ttpfile.v10.vcxproj
    branches/cmake/teraterm/ttpfile/ttpfile.v10.vcxproj.filters
    branches/cmake/teraterm/ttpfile/ttpfile.v11.vcxproj
    branches/cmake/teraterm/ttpfile/ttpfile.v11.vcxproj.filters
    branches/cmake/teraterm/ttpfile/ttpfile.v12.vcxproj
    branches/cmake/teraterm/ttpfile/ttpfile.v12.vcxproj.filters
    branches/cmake/teraterm/ttpfile/ttpfile.v14.vcxproj
    branches/cmake/teraterm/ttpfile/ttpfile.v14.vcxproj.filters
    branches/cmake/teraterm/ttpfile/ttpfile.v15.vcxproj
    branches/cmake/teraterm/ttpfile/ttpfile.v15.vcxproj.filters
    branches/cmake/teraterm/ttpfile/ttpfile.v9.vcproj
    branches/cmake/teraterm/ttpfile/ttpfile.vcproj
    branches/cmake/teraterm/ttpmacro/ttl.cpp
    branches/cmake/teraterm/ttpmacro/ttl_gui.cpp
    branches/cmake/teraterm/ttpmacro/ttmacro.cpp
    branches/cmake/teraterm/ttpmacro/ttmdlg.cpp
    branches/cmake/teraterm/ttpmacro/ttmdlg.h
    branches/cmake/teraterm/ttpmacro/ttmmain.cpp
    branches/cmake/teraterm/ttpmacro/ttmparse.c
    branches/cmake/teraterm/ttpmacro/ttmparse.h
    branches/cmake/teraterm/ttpmacro/ttpmacro.v10.vcxproj
    branches/cmake/teraterm/ttpmacro/ttpmacro.v10.vcxproj.filters
    branches/cmake/teraterm/ttpmacro/ttpmacro.v11.vcxproj
    branches/cmake/teraterm/ttpmacro/ttpmacro.v11.vcxproj.filters
    branches/cmake/teraterm/ttpmacro/ttpmacro.v12.vcxproj
    branches/cmake/teraterm/ttpmacro/ttpmacro.v12.vcxproj.filters
    branches/cmake/teraterm/ttpmacro/ttpmacro.v14.vcxproj
    branches/cmake/teraterm/ttpmacro/ttpmacro.v14.vcxproj.filters
    branches/cmake/teraterm/ttpmacro/ttpmacro.v15.vcxproj
    branches/cmake/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters
    branches/cmake/teraterm/ttpmacro/ttpmacro.v9.vcproj
    branches/cmake/teraterm/ttpmacro/ttpmacro.vcproj
    branches/cmake/teraterm/ttpset/ttpset-version.rc
    branches/cmake/teraterm/ttpset/ttpset.v10.vcxproj
    branches/cmake/teraterm/ttpset/ttpset.v10.vcxproj.filters
    branches/cmake/teraterm/ttpset/ttpset.v11.vcxproj
    branches/cmake/teraterm/ttpset/ttpset.v11.vcxproj.filters
    branches/cmake/teraterm/ttpset/ttpset.v12.vcxproj
    branches/cmake/teraterm/ttpset/ttpset.v12.vcxproj.filters
    branches/cmake/teraterm/ttpset/ttpset.v14.vcxproj
    branches/cmake/teraterm/ttpset/ttpset.v14.vcxproj.filters
    branches/cmake/teraterm/ttpset/ttpset.v15.vcxproj
    branches/cmake/teraterm/ttpset/ttpset.v15.vcxproj.filters
    branches/cmake/teraterm/ttpset/ttpset.v9.vcproj
    branches/cmake/teraterm/ttpset/ttpset.vcproj
    branches/cmake/teraterm/ttpset/ttset.c
    branches/cmake/teraterm/ttptek/CMakeLists.txt
    branches/cmake/teraterm/ttptek/ttptek-version.rc
    branches/cmake/teraterm/ttptek/ttptek.v10.vcxproj
    branches/cmake/teraterm/ttptek/ttptek.v10.vcxproj.filters
    branches/cmake/teraterm/ttptek/ttptek.v11.vcxproj
    branches/cmake/teraterm/ttptek/ttptek.v11.vcxproj.filters
    branches/cmake/teraterm/ttptek/ttptek.v12.vcxproj
    branches/cmake/teraterm/ttptek/ttptek.v12.vcxproj.filters
    branches/cmake/teraterm/ttptek/ttptek.v14.vcxproj
    branches/cmake/teraterm/ttptek/ttptek.v14.vcxproj.filters
    branches/cmake/teraterm/ttptek/ttptek.v15.vcxproj
    branches/cmake/teraterm/ttptek/ttptek.v15.vcxproj.filters
    branches/cmake/teraterm/ttptek/ttptek.v9.vcproj
    branches/cmake/teraterm/ttptek/ttptek.vcproj
    branches/cmake/ttpmenu/registry.cpp
    branches/cmake/ttpmenu/ttpmenu.cpp
    branches/cmake/ttpmenu/ttpmenu.v9.vcproj
    branches/cmake/ttpmenu/ttpmenu.vcproj
    branches/cmake/ttssh2/ttxssh/CMakeLists.txt
    branches/cmake/ttssh2/ttxssh/auth.c
    branches/cmake/ttssh2/ttxssh/auth.h
    branches/cmake/ttssh2/ttxssh/buffer.c
    branches/cmake/ttssh2/ttxssh/fwd-socks.c
    branches/cmake/ttssh2/ttxssh/fwd.c
    branches/cmake/ttssh2/ttxssh/fwdui.c
    branches/cmake/ttssh2/ttxssh/hosts.c
    branches/cmake/ttssh2/ttxssh/key.c
    branches/cmake/ttssh2/ttxssh/keyfiles.c
    branches/cmake/ttssh2/ttxssh/resource.h
    branches/cmake/ttssh2/ttxssh/sftp.c
    branches/cmake/ttssh2/ttxssh/ssh.c
    branches/cmake/ttssh2/ttxssh/ttxssh.c
    branches/cmake/ttssh2/ttxssh/ttxssh.h
    branches/cmake/ttssh2/ttxssh/ttxssh.rc
    branches/cmake/ttssh2/ttxssh/ttxssh.v10.vcxproj
    branches/cmake/ttssh2/ttxssh/ttxssh.v10.vcxproj.filters
    branches/cmake/ttssh2/ttxssh/ttxssh.v11.vcxproj
    branches/cmake/ttssh2/ttxssh/ttxssh.v11.vcxproj.filters
    branches/cmake/ttssh2/ttxssh/ttxssh.v12.vcxproj
    branches/cmake/ttssh2/ttxssh/ttxssh.v12.vcxproj.filters
    branches/cmake/ttssh2/ttxssh/ttxssh.v14.vcxproj
    branches/cmake/ttssh2/ttxssh/ttxssh.v14.vcxproj.filters
    branches/cmake/ttssh2/ttxssh/ttxssh.v15.vcxproj
    branches/cmake/ttssh2/ttxssh/ttxssh.v15.vcxproj.filters
    branches/cmake/ttssh2/ttxssh/ttxssh.v9.vcproj
    branches/cmake/ttssh2/ttxssh/ttxssh.vcproj
    branches/cmake/ttssh2/ttxssh/util.c
    branches/cmake/version_info.h.in

Added Paths:
-----------
    branches/cmake/TTProxy/TTProxy.v16.sln
    branches/cmake/TTProxy/TTProxy.v16.vcxproj
    branches/cmake/TTProxy/TTProxy.v16.vcxproj.filters
    branches/cmake/TTXKanjiMenu/ttxkanjimenu.v16.sln
    branches/cmake/TTXKanjiMenu/ttxkanjimenu.v16.vcxproj
    branches/cmake/TTXKanjiMenu/ttxkanjimenu.v16.vcxproj.filters
    branches/cmake/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v16.vcxproj
    branches/cmake/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v16.vcxproj.filters
    branches/cmake/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v16.vcxproj
    branches/cmake/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v16.vcxproj.filters
    branches/cmake/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v16.vcxproj
    branches/cmake/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v16.vcxproj.filters
    branches/cmake/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v16.vcxproj
    branches/cmake/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v16.vcxproj.filters
    branches/cmake/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v16.vcxproj
    branches/cmake/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v16.vcxproj.filters
    branches/cmake/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v16.vcxproj
    branches/cmake/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v16.vcxproj.filters
    branches/cmake/TTXSamples/TTXKcodeChange/TTXKcodeChange.v16.vcxproj
    branches/cmake/TTXSamples/TTXKcodeChange/TTXKcodeChange.v16.vcxproj.filters
    branches/cmake/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v16.vcxproj
    branches/cmake/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v16.vcxproj.filters
    branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v16.vcxproj
    branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v16.vcxproj.filters
    branches/cmake/TTXSamples/TTXResizeMenu/TTXResizeMenu.v16.vcxproj
    branches/cmake/TTXSamples/TTXResizeMenu/TTXResizeMenu.v16.vcxproj.filters
    branches/cmake/TTXSamples/TTXResizeWin/TTXResizeWin.v16.vcxproj
    branches/cmake/TTXSamples/TTXResizeWin/TTXResizeWin.v16.vcxproj.filters
    branches/cmake/TTXSamples/TTXSamples.v16.sln
    branches/cmake/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v16.vcxproj
    branches/cmake/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v16.vcxproj.filters
    branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v16.vcxproj
    branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v16.vcxproj.filters
    branches/cmake/TTXSamples/TTXttyrec/TTXttyplay.v16.vcxproj
    branches/cmake/TTXSamples/TTXttyrec/TTXttyplay.v16.vcxproj.filters
    branches/cmake/TTXSamples/TTXttyrec/TTXttyrec.v16.vcxproj
    branches/cmake/TTXSamples/TTXttyrec/TTXttyrec.v16.vcxproj.filters
    branches/cmake/TTXSamples/ttxtest/TTXtest.v16.vcxproj
    branches/cmake/TTXSamples/ttxtest/TTXtest.v16.vcxproj.filters
    branches/cmake/doc/en/html/reference/build_library_with_cmake.md
    branches/cmake/doc/ja/html/reference/build_library_with_cmake.md
    branches/cmake/teraterm/common/teraterm_conf.h
    branches/cmake/teraterm/keycode/keycode.v16.vcxproj
    branches/cmake/teraterm/keycode/keycode.v16.vcxproj.filters
    branches/cmake/teraterm/svnrev/svnrev.v16.vcxproj
    branches/cmake/teraterm/svnrev/svnrev.v16.vcxproj.filters
    branches/cmake/teraterm/teraterm/ttermpro.v16.vcxproj
    branches/cmake/teraterm/teraterm/ttermpro.v16.vcxproj.filters
    branches/cmake/teraterm/ttermpro.v16.sln
    branches/cmake/teraterm/ttpcmn/ttpcmn.v16.vcxproj
    branches/cmake/teraterm/ttpcmn/ttpcmn.v16.vcxproj.filters
    branches/cmake/teraterm/ttpfile/ttpfile.v16.vcxproj
    branches/cmake/teraterm/ttpfile/ttpfile.v16.vcxproj.filters
    branches/cmake/teraterm/ttpmacro/ttpmacro.v16.vcxproj
    branches/cmake/teraterm/ttpmacro/ttpmacro.v16.vcxproj.filters
    branches/cmake/teraterm/ttpset/ttpset.v16.vcxproj
    branches/cmake/teraterm/ttpset/ttpset.v16.vcxproj.filters
    branches/cmake/teraterm/ttptek/ttptek.v16.vcxproj
    branches/cmake/teraterm/ttptek/ttptek.v16.vcxproj.filters
    branches/cmake/ttpmenu/ttpmenu.v16.sln
    branches/cmake/ttpmenu/ttpmenu.v16.vcxproj
    branches/cmake/ttssh2/matcher/matcher.v16.vcxproj
    branches/cmake/ttssh2/putty/putty.v16.vcxproj
    branches/cmake/ttssh2/putty/putty.v16.vcxproj.filters
    branches/cmake/ttssh2/puttyrev/puttyrev.v16.vcxproj
    branches/cmake/ttssh2/puttyrev/puttyrev.v16.vcxproj.filters
    branches/cmake/ttssh2/ttssh/ttssh.v16.vcxproj
    branches/cmake/ttssh2/ttssh.v16.sln
    branches/cmake/ttssh2/ttxssh/dropdown.ico
    branches/cmake/ttssh2/ttxssh/ttxssh.v16.vcxproj
    branches/cmake/ttssh2/ttxssh/ttxssh.v16.vcxproj.filters

Removed Paths:
-------------
    branches/cmake/teraterm/ttpcmn/cmn_res.h
    branches/cmake/teraterm/ttpset/set_res.h
    branches/cmake/teraterm/ttptek/tek_res.h

-------------- next part --------------
Modified: branches/cmake/CMakeLists.txt
===================================================================
--- branches/cmake/CMakeLists.txt	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/CMakeLists.txt	2019-05-19 15:06:12 UTC (rev 7694)
@@ -3,10 +3,9 @@
 
 project(teraterm_all)
 
-option(ENABLE_DPIAWARENESS "Dpiawareness" ON)
 option(ENABLE_TTXSAMPLES "TTXSamples" ON)
 option(USE_UNICODE_API "unicode" ON)
-option(LINK_UNICOWS "unicode APIs for 9x" OFF)
+option(MORE_WARNING "stronger warning" OFF)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
@@ -21,6 +20,9 @@
 message("_WIN32_WINNT=${_WIN32_WINNT}")
 if(MSVC)
   # https://www.leeholmes.com/blog/2017/02/27/differences-between-visual-studio-2012-2013-and-2015/
+  if(${CMAKE_GENERATOR} MATCHES "Visual Studio 8 2005")
+    set(_WIN32_WINNT "0x0501")
+  endif()
   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})
@@ -27,13 +29,25 @@
   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 "${CMAKE_CXX_FLAGS} /D_CRT_SECURE_NO_DEPRECATE")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D_CRT_SECURE_NO_DEPRECATE")
+  if (MORE_WARNING)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4")
+    if(${MSVC_VERSION} GREATER_EQUAL 1910) # Visual Studio 2017以上の時
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /analyze")
+      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /analyze")
+    endif()
+  else()
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3")
+  endif()
   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")
+  if(${MSVC_VERSION} GREATER_EQUAL 1910)
+    # Visual Studio 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")
@@ -40,10 +54,12 @@
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO")
   endif()
 elseif(MINGW)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_WIN32_WINNT=${_WIN32_WINNT}")
   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_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
+  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
   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++")
@@ -65,7 +81,7 @@
     if(${rv})
       message("git svn error? please check git svn")
     else()
-      string(REGEX MATCH "[0-9]+" SVNVERSION ${ov})
+      string(REGEX MATCH "[0-9]+" SVNVERSION "${ov}")
     endif()
   endif()
 elseif(EXISTS "${CMAKE_SOURCE_DIR}/.svn")

Modified: branches/cmake/TTProxy/CMakeLists.txt
===================================================================
--- branches/cmake/TTProxy/CMakeLists.txt	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTProxy/CMakeLists.txt	2019-05-19 15:06:12 UTC (rev 7694)
@@ -15,7 +15,7 @@
 
 set(COMMON_SRC
   ../teraterm/common/ttlib.h
-  ../teraterm/common/ttlib.c
+#  ../teraterm/common/ttlib.c
   ../teraterm/common/i18n.h
   ../teraterm/common/ttplugin.h
   ../teraterm/common/tttypes.h

Modified: branches/cmake/TTProxy/ProxyWSockHook.h
===================================================================
--- branches/cmake/TTProxy/ProxyWSockHook.h	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTProxy/ProxyWSockHook.h	2019-05-19 15:06:12 UTC (rev 7694)
@@ -35,7 +35,7 @@
 
 void UTIL_set_dialog_font()
 {
-	SetDialogFont(SetupFName, UILanguageFile, "TTProxy");
+	SetDialogFont(SetupFName, UILanguageFile, "TTProxy", "DLG_TAHOMA_FONT");
 }
 
 #if 0
@@ -749,7 +749,7 @@
         Window conn;
         Window erro;
         Window log;
-//        HFONT DlgFont;
+//      HFONT DlgFont;
     protected:
         virtual bool dispatch(int message, int wParam, long lParam) {
             if (message == WM_COMMAND && wParam == MAKEWPARAM(IDC_REFER, BN_CLICKED)) {
@@ -921,6 +921,8 @@
             if (logfile != NULL)
                 log.SetWindowText((tc)logfile);
 
+            CenterWindow((HWND)*this, GetParent());
+
             return true;
         }
         virtual void onOK() {
@@ -990,7 +992,7 @@
         EditBoxCtrl  user;
         EditBoxCtrl  pass;
         bool lock;
-//        HFONT DlgFont;
+//      HFONT DlgFont;
     protected:
         virtual bool dispatch(int message, int wParam, long lParam) {
             if (message == WM_COMMAND) {
@@ -1130,6 +1132,7 @@
             }
             lock = false;
             onChanged(0);
+            CenterWindow((HWND)*this, GetParent());
             return true;
         }
         virtual void onOK() {
@@ -1266,7 +1269,7 @@
 
     class AboutDialog : public Dialog {
     private:
-        HFONT DlgFont;
+//      HFONT DlgFont;
         virtual bool onInitDialog() {
             String buf;
             TCHAR *buf2;
@@ -1315,12 +1318,16 @@
             UTIL_get_lang_msg("BTN_OK", uimsg, _countof(uimsg), _T("OK"));
             SetDlgItemText(IDOK, uimsg);
 
+            CenterWindow((HWND)*this, GetParent());
+
             return true;
         }
         virtual void onOK() {
+#if 0
             if (DlgFont != NULL) {
                 DeleteObject(DlgFont);
             }
+#endif
             Dialog::onOK();
         }
     public :

Modified: branches/cmake/TTProxy/TTProxy.h
===================================================================
--- branches/cmake/TTProxy/TTProxy.h	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTProxy/TTProxy.h	2019-05-19 15:06:12 UTC (rev 7694)
@@ -253,10 +253,16 @@
 		switch (cmd) {
 		case ID_ABOUTMENU:
 			copy_UILanguageFile();
+			SetDialogFont(getInstance().ts->SetupFName,
+						  getInstance().ts->UILanguageFile,
+						  "TTProxy", "DLG_TAHOMA_FONT");
 			ProxyWSockHook::aboutDialog(hWin);
 			return 1;
 		case ID_PROXYSETUPMENU:
 			copy_UILanguageFile();
+			SetDialogFont(getInstance().ts->SetupFName,
+						  getInstance().ts->UILanguageFile,
+						  "TTProxy", "DLG_TAHOMA_FONT");
 			ProxyWSockHook::setupDialog(hWin);
 			return 1;
 		case ID_ASYNCMESSAGEBOX:

Modified: branches/cmake/TTProxy/TTProxy.v10.vcxproj
===================================================================
--- branches/cmake/TTProxy/TTProxy.v10.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTProxy/TTProxy.v10.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -131,6 +131,22 @@
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\teraterm\common\dlglib.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\dlglib_cpp.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\dlglib_tmpl.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\ttlib.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
     <ClCompile Include="StdAfx.cpp">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

Modified: branches/cmake/TTProxy/TTProxy.v10.vcxproj.filters
===================================================================
--- branches/cmake/TTProxy/TTProxy.v10.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTProxy/TTProxy.v10.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -27,6 +27,18 @@
     <ClCompile Include="YCL\include\YCL\libc.cpp">
       <Filter>YCL</Filter>
     </ClCompile>
+    <ClCompile Include="..\teraterm\common\ttlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\dlglib_cpp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\dlglib_tmpl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="TTProxy.rc">

Modified: branches/cmake/TTProxy/TTProxy.v11.vcxproj
===================================================================
--- branches/cmake/TTProxy/TTProxy.v11.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTProxy/TTProxy.v11.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -136,6 +136,22 @@
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\teraterm\common\dlglib.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\dlglib_cpp.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\dlglib_tmpl.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\ttlib.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
     <ClCompile Include="StdAfx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>

Modified: branches/cmake/TTProxy/TTProxy.v11.vcxproj.filters
===================================================================
--- branches/cmake/TTProxy/TTProxy.v11.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTProxy/TTProxy.v11.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -27,6 +27,18 @@
     <ClCompile Include="YCL\include\YCL\libc.cpp">
       <Filter>YCL</Filter>
     </ClCompile>
+    <ClCompile Include="..\teraterm\common\ttlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\dlglib_cpp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\dlglib_tmpl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="TTProxy.rc">

Modified: branches/cmake/TTProxy/TTProxy.v12.vcxproj
===================================================================
--- branches/cmake/TTProxy/TTProxy.v12.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTProxy/TTProxy.v12.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -136,6 +136,22 @@
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\teraterm\common\dlglib.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\dlglib_cpp.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\dlglib_tmpl.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\ttlib.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
     <ClCompile Include="StdAfx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>

Modified: branches/cmake/TTProxy/TTProxy.v12.vcxproj.filters
===================================================================
--- branches/cmake/TTProxy/TTProxy.v12.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTProxy/TTProxy.v12.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -27,6 +27,18 @@
     <ClCompile Include="YCL\include\YCL\libc.cpp">
       <Filter>YCL</Filter>
     </ClCompile>
+    <ClCompile Include="..\teraterm\common\ttlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\dlglib_cpp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\dlglib_tmpl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="TTProxy.rc">

Modified: branches/cmake/TTProxy/TTProxy.v14.vcxproj
===================================================================
--- branches/cmake/TTProxy/TTProxy.v14.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTProxy/TTProxy.v14.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -136,6 +136,22 @@
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\teraterm\common\dlglib.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\dlglib_cpp.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\dlglib_tmpl.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\ttlib.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
     <ClCompile Include="StdAfx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>

Modified: branches/cmake/TTProxy/TTProxy.v14.vcxproj.filters
===================================================================
--- branches/cmake/TTProxy/TTProxy.v14.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTProxy/TTProxy.v14.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -27,6 +27,18 @@
     <ClCompile Include="YCL\include\YCL\libc.cpp">
       <Filter>YCL</Filter>
     </ClCompile>
+    <ClCompile Include="..\teraterm\common\ttlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\dlglib_cpp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\dlglib_tmpl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="TTProxy.rc">

Modified: branches/cmake/TTProxy/TTProxy.v15.vcxproj
===================================================================
--- branches/cmake/TTProxy/TTProxy.v15.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTProxy/TTProxy.v15.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -14,6 +14,7 @@
     <ProjectGuid>{C4DE5FDF-DB00-4C73-9D4F-359BFCA3F2FB}</ProjectGuid>
     <RootNamespace>TTProxy</RootNamespace>
     <ProjectName>TTProxy</ProjectName>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -136,6 +137,22 @@
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\teraterm\common\dlglib.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\dlglib_cpp.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\dlglib_tmpl.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\ttlib.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
     <ClCompile Include="StdAfx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>

Modified: branches/cmake/TTProxy/TTProxy.v15.vcxproj.filters
===================================================================
--- branches/cmake/TTProxy/TTProxy.v15.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTProxy/TTProxy.v15.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -27,6 +27,18 @@
     <ClCompile Include="YCL\include\YCL\libc.cpp">
       <Filter>YCL</Filter>
     </ClCompile>
+    <ClCompile Include="..\teraterm\common\ttlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\dlglib_cpp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\dlglib_tmpl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="TTProxy.rc">

Added: branches/cmake/TTProxy/TTProxy.v16.sln
===================================================================
--- branches/cmake/TTProxy/TTProxy.v16.sln	                        (rev 0)
+++ branches/cmake/TTProxy/TTProxy.v16.sln	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 16
+VisualStudioVersion = 16.0.28803.156
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTProxy", "TTProxy.v16.vcxproj", "{C4DE5FDF-DB00-4C73-9D4F-359BFCA3F2FB}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C4DE5FDF-DB00-4C73-9D4F-359BFCA3F2FB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C4DE5FDF-DB00-4C73-9D4F-359BFCA3F2FB}.Debug|Win32.Build.0 = Debug|Win32
+		{C4DE5FDF-DB00-4C73-9D4F-359BFCA3F2FB}.Release|Win32.ActiveCfg = Release|Win32
+		{C4DE5FDF-DB00-4C73-9D4F-359BFCA3F2FB}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Copied: branches/cmake/TTProxy/TTProxy.v16.vcxproj (from rev 7693, branches/cmake/TTProxy/TTProxy.v15.vcxproj)
===================================================================
--- branches/cmake/TTProxy/TTProxy.v16.vcxproj	                        (rev 0)
+++ branches/cmake/TTProxy/TTProxy.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.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>{C4DE5FDF-DB00-4C73-9D4F-359BFCA3F2FB}</ProjectGuid>
+    <RootNamespace>TTProxy</RootNamespace>
+    <ProjectName>TTProxy</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </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>
+    <IgnoreImportLibrary>true</IgnoreImportLibrary>
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>TTXProxy</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <IgnoreImportLibrary>true</IgnoreImportLibrary>
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>TTXProxy</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;TTX_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0411</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\teraterm\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>TTX.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateMapFile>true</GenerateMapFile>
+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TTX_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0411</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\teraterm\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>TTX.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\teraterm\common\dlglib.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\dlglib_cpp.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\dlglib_tmpl.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\ttlib.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="StdAfx.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="TTProxy.cpp" />
+    <ClCompile Include="YCL\include\YCL\libc.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="TTProxy.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="TTX.def">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Hooker.h" />
+    <ClInclude Include="Logger.h" />
+    <ClInclude Include="ProxyWSockHook.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="SSLSocket.h" />
+    <ClInclude Include="StdAfx.h" />
+    <ClInclude Include="TTProxy.h" />
+    <ClInclude Include="YCL\include\YCL\Array.h" />
+    <ClInclude Include="YCL\include\YCL\ComboBoxCtrl.h" />
+    <ClInclude Include="YCL\include\YCL\common.h" />
+    <ClInclude Include="YCL\include\YCL\Dialog.h" />
+    <ClInclude Include="YCL\include\YCL\DynamicLinkLibrary.h" />
+    <ClInclude Include="YCL\include\YCL\EditBoxCtrl.h" />
+    <ClInclude Include="YCL\include\YCL\Enumeration.h" />
+    <ClInclude Include="YCL\include\YCL\FileVersion.h" />
+    <ClInclude Include="YCL\include\YCL\HASHCODE.h" />
+    <ClInclude Include="YCL\include\YCL\Hashtable.h" />
+    <ClInclude Include="YCL\include\YCL\IniFile.h" />
+    <ClInclude Include="YCL\include\YCL\Integer.h" />
+    <ClInclude Include="YCL\include\YCL\Object.h" />
+    <ClInclude Include="YCL\include\YCL\Pointer.h" />
+    <ClInclude Include="YCL\include\YCL\Resource.h" />
+    <ClInclude Include="YCL\include\YCL\StringBuffer.h" />
+    <ClInclude Include="YCL\include\YCL\StringUtil.h" />
+    <ClInclude Include="YCL\include\YCL\ValueCtrl.h" />
+    <ClInclude Include="YCL\include\YCL\Vector.h" />
+    <ClInclude Include="YCL\include\YCL\Window.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/cmake/TTProxy/TTProxy.v16.vcxproj.filters (from rev 7693, branches/cmake/TTProxy/TTProxy.v15.vcxproj.filters)
===================================================================
--- branches/cmake/TTProxy/TTProxy.v16.vcxproj.filters	                        (rev 0)
+++ branches/cmake/TTProxy/TTProxy.v16.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,136 @@
+<?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>{3cd46c63-801a-45aa-88e0-52572525db2d}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{2a7e6b97-89c1-4fe1-abf6-cdd5617422b1}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
+    <Filter Include="YCL">
+      <UniqueIdentifier>{076290f0-a284-406f-9e4c-8425b4904132}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{f6ee589e-87d8-4a70-b138-b10962385824}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="StdAfx.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TTProxy.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="YCL\include\YCL\libc.cpp">
+      <Filter>YCL</Filter>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\ttlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\dlglib_cpp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\teraterm\common\dlglib_tmpl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="TTProxy.rc">
+      <Filter>Source Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Hooker.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Logger.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ProxyWSockHook.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SSLSocket.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="StdAfx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TTProxy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\Array.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\ComboBoxCtrl.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\common.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\Dialog.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\DynamicLinkLibrary.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\EditBoxCtrl.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\Enumeration.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\FileVersion.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\HASHCODE.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\Hashtable.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\IniFile.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\Integer.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\Object.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\Pointer.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\Resource.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\StringBuffer.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\StringUtil.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\ValueCtrl.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\Vector.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+    <ClInclude Include="YCL\include\YCL\Window.h">
+      <Filter>YCL</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="TTX.def">
+      <Filter>Source Files</Filter>
+    </CustomBuild>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Modified: branches/cmake/TTProxy/TTProxy.v9.vcproj
===================================================================
--- branches/cmake/TTProxy/TTProxy.v9.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTProxy/TTProxy.v9.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -79,6 +79,7 @@
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(SolutionDir)..\teraterm\$(ConfigurationName)"
 				ModuleDefinitionFile="TTX.def"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"
 				RandomizedBaseAddress="1"
@@ -173,6 +174,7 @@
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(SolutionDir)..\teraterm\$(ConfigurationName)"
 				ModuleDefinitionFile="TTX.def"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -211,6 +213,86 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<File
+				RelativePath="..\teraterm\common\dlglib.c"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\teraterm\common\dlglib_cpp.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\teraterm\common\ttlib.c"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\teraterm\common\dlglib_tmpl.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="StdAfx.cpp"
 				>
 				<FileConfiguration

Modified: branches/cmake/TTProxy/TTProxy.vcproj
===================================================================
--- branches/cmake/TTProxy/TTProxy.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTProxy/TTProxy.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -72,12 +72,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
-				AdditionalDependencies="ws2_32.lib ttpcmn.lib"
+				AdditionalDependencies="ws2_32.lib ttpcmn.lib gdi32.lib comdlg32.lib shell32.lib ole32.lib"
 				OutputFile="$(OutDir)\TTXProxy.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(SolutionDir)..\teraterm\$(ConfigurationName)"
 				ModuleDefinitionFile="TTX.def"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"
 				ImportLibrary="$(OutDir)\$(ProjectName).lib"
@@ -167,12 +168,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
-				AdditionalDependencies="ws2_32.lib ttpcmn.lib"
+				AdditionalDependencies="ws2_32.lib ttpcmn.lib gdi32.lib comdlg32.lib shell32.lib ole32.lib"
 				OutputFile="$(OutDir)\TTXProxy.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(SolutionDir)..\teraterm\$(ConfigurationName)"
 				ModuleDefinitionFile="TTX.def"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				ImportLibrary="$(OutDir)\$(ProjectName).lib"
 				TargetMachine="1"
@@ -212,6 +214,66 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<File
+				RelativePath="..\teraterm\common\dlglib.c"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\teraterm\common\dlglib_cpp.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\teraterm\common\dlglib_tmpl.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="StdAfx.cpp"
 				>
 				<FileConfiguration
@@ -236,6 +298,26 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="..\teraterm\common\ttlib.c"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="TTProxy.cpp"
 				>
 				<FileConfiguration

Modified: branches/cmake/TTProxy/YCL/include/YCL/Dialog.h
===================================================================
--- branches/cmake/TTProxy/YCL/include/YCL/Dialog.h	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTProxy/YCL/include/YCL/Dialog.h	2019-05-19 15:06:12 UTC (rev 7694)
@@ -16,8 +16,6 @@
 
 #include "dlglib.h"
 
-#define	DIALOGBOX_REPLACE	1
-
 namespace yebisuya {
 
 class Dialog : virtual public Window {
@@ -117,10 +115,10 @@
 	}
 	int open(HINSTANCE instance, int resourceId, HWND owner = NULL) {
 		YCLVERIFY(prepareOpen(this) == NULL, "Another dialog has been opening yet.");
-#if defined(DIALOGBOX_REPLACE)
-		return ::TTDialogBoxParam(instance, MAKEINTRESOURCE(resourceId), owner, (DLGPROC)DialogProc, NULL);
+#if 0
+		return ::DialogBoxParam(instance, MAKEINTRESOURCE(resourceId), owner, DialogProc, NULL);
 #else
-		return ::DialogBoxParam(instance, MAKEINTRESOURCE(resourceId), owner, (DLGPROC)DialogProc, NULL);
+		return TTDialogBoxParam(instance, MAKEINTRESOURCE(resourceId), owner, DialogProc, NULL);
 #endif
 	}
 protected:

Modified: branches/cmake/TTProxy/YCL/include/YCL/common.h
===================================================================
--- branches/cmake/TTProxy/YCL/include/YCL/common.h	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTProxy/YCL/include/YCL/common.h	2019-05-19 15:06:12 UTC (rev 7694)
@@ -16,6 +16,7 @@
 #include <windows.h>
 #include <malloc.h>
 #include <stdlib.h>
+#include <crtdbg.h>
 
 #ifndef countof
 #define countof(a) (sizeof (a) / sizeof (a)[0])
@@ -75,22 +76,11 @@
 #define YCLASSERT(condition, message) if (YclAssert(condition, message)) {__debugbreak();}
 #define YCLVERIFY(condition, message) if (YclAssert(condition, message)) {__debugbreak();}
 
-#ifdef __cplusplus
-extern "C" {
-#endif//__cplusplus
-void* _malloc_dbg(size_t length, const char* filename, int lineno);
-void* _realloc_dbg(void* pointer, size_t length, const char* filename, int lineno);
-void* _calloc_dbg(size_t num, size_t size, const char* filename, int lineno);
-void _free_dbg(void* pointer, const char* filename, int lineno);
-#ifdef __cplusplus
-}
-#endif//__cplusplus
+#define malloc(l)     _malloc_dbg((l), _NORMAL_BLOCK, __FILE__, __LINE__)
+#define realloc(p, l) _realloc_dbg((p), (l), _NORMAL_BLOCK, __FILE__, __LINE__)
+#define calloc(c, s)  _calloc_dbg((c), (s), _NORMAL_BLOCK, __FILE__, __LINE__)
+#define free(p)       _free_dbg((p), _NORMAL_BLOCK)
 
-#define malloc(l)     _malloc_dbg((l), __FILE__, __LINE__)
-#define realloc(p, l) _realloc_dbg((p), (l), __FILE__, __LINE__)
-#define calloc(c, s)  _calloc_dbg((c), (s), __FILE__, __LINE__)
-#define free(p)       _free_dbg((p), __FILE__, __LINE__)
-
 //}
 #else
 //{

Added: branches/cmake/TTXKanjiMenu/ttxkanjimenu.v16.sln
===================================================================
--- branches/cmake/TTXKanjiMenu/ttxkanjimenu.v16.sln	                        (rev 0)
+++ branches/cmake/TTXKanjiMenu/ttxkanjimenu.v16.sln	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 16
+VisualStudioVersion = 16.0.28803.156
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttxkanjimenu", "ttxkanjimenu.v16.vcxproj", "{DCCE3462-94BD-49E8-8DC9-4EEAC23C04B7}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{DCCE3462-94BD-49E8-8DC9-4EEAC23C04B7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DCCE3462-94BD-49E8-8DC9-4EEAC23C04B7}.Debug|Win32.Build.0 = Debug|Win32
+		{DCCE3462-94BD-49E8-8DC9-4EEAC23C04B7}.Release|Win32.ActiveCfg = Release|Win32
+		{DCCE3462-94BD-49E8-8DC9-4EEAC23C04B7}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Copied: branches/cmake/TTXKanjiMenu/ttxkanjimenu.v16.vcxproj (from rev 7693, branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj)
===================================================================
--- branches/cmake/TTXKanjiMenu/ttxkanjimenu.v16.vcxproj	                        (rev 0)
+++ branches/cmake/TTXKanjiMenu/ttxkanjimenu.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.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>{DCCE3462-94BD-49E8-8DC9-4EEAC23C04B7}</ProjectGuid>
+    <RootNamespace>ttxkanjimenu</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>ttxkanjimenu</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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>
+  <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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TTXENCODE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;TTXENCODE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="ttxkanjimenu.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ttxkanjimenu.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/cmake/TTXKanjiMenu/ttxkanjimenu.v16.vcxproj.filters (from rev 7693, branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v10.vcxproj.filters)
===================================================================
--- branches/cmake/TTXKanjiMenu/ttxkanjimenu.v16.vcxproj.filters	                        (rev 0)
+++ branches/cmake/TTXKanjiMenu/ttxkanjimenu.v16.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,32 @@
+<?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>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="ttxkanjimenu.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ttxkanjimenu.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Modified: branches/cmake/TTXKanjiMenu/ttxkanjimenu.vcproj
===================================================================
--- branches/cmake/TTXKanjiMenu/ttxkanjimenu.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXKanjiMenu/ttxkanjimenu.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -61,7 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib""
+				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -136,7 +136,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib""
+				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"

Copied: branches/cmake/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v16.vcxproj (from rev 7693, branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj)
===================================================================
--- branches/cmake/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v16.vcxproj	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.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>{0ECAF69B-08B4-414A-B822-BE8459E463D8}</ProjectGuid>
+    <RootNamespace>TTXAdditionalTitle</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXAdditionalTitle</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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>
+  <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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXAdditionalTitle.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt" />
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Added: branches/cmake/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v16.vcxproj.filters
===================================================================
--- branches/cmake/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v16.vcxproj.filters	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v16.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,25 @@
+<?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>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="ReadMe">
+      <UniqueIdentifier>{49a19dbf-c584-4494-be1f-8dbe6fdb5357}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXAdditionalTitle.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+    <Text Include="ReadMe.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Modified: branches/cmake/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.vcproj
===================================================================
--- branches/cmake/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -61,7 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib""
+				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -136,7 +136,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib""
+				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"

Copied: branches/cmake/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v16.vcxproj (from rev 7693, branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj)
===================================================================
--- branches/cmake/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v16.vcxproj	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.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>{E86DDB2C-CC00-43D1-8A1A-4B042EC983D6}</ProjectGuid>
+    <RootNamespace>TTXAlwaysOnTop</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXAlwaysOnTop</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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>
+  <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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXAlwaysOnTop.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt" />
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Added: branches/cmake/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v16.vcxproj.filters
===================================================================
--- branches/cmake/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v16.vcxproj.filters	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v16.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,25 @@
+<?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>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="ReadMe">
+      <UniqueIdentifier>{3de8b3b0-0e46-470e-8b42-34e7dc070906}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXAlwaysOnTop.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+    <Text Include="ReadMe.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Modified: branches/cmake/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.vcproj
===================================================================
--- branches/cmake/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -61,7 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib""
+				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -136,7 +136,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib""
+				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"

Copied: branches/cmake/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v16.vcxproj (from rev 7693, branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj)
===================================================================
--- branches/cmake/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v16.vcxproj	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.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>{25709A86-E6B8-4CDA-906C-02D935E05978}</ProjectGuid>
+    <RootNamespace>TTXCallSysMenu</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXCallSysMenu</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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>
+  <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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXCallSysMenu.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt" />
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Added: branches/cmake/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v16.vcxproj.filters
===================================================================
--- branches/cmake/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v16.vcxproj.filters	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v16.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,25 @@
+<?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>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="ReadMe">
+      <UniqueIdentifier>{7db37478-ecb8-4585-bc40-626409df0a4c}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXCallSysMenu.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+    <Text Include="ReadMe.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Modified: branches/cmake/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.vcproj
===================================================================
--- branches/cmake/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -61,6 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="user32.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -135,6 +136,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="user32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"

Copied: branches/cmake/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v16.vcxproj (from rev 7693, branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj)
===================================================================
--- branches/cmake/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v16.vcxproj	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.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>{EE8BFC38-7000-42F1-BBC3-17F19855918A}</ProjectGuid>
+    <RootNamespace>TTXCommandLineOpt</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXCommandLineOpt</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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>
+  <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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXCommandLineOpt.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt" />
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Added: branches/cmake/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v16.vcxproj.filters
===================================================================
--- branches/cmake/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v16.vcxproj.filters	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v16.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,25 @@
+<?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>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="ReadMe">
+      <UniqueIdentifier>{ea93460b-20a9-4d07-acd5-813091583716}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXCommandLineOpt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+    <Text Include="ReadMe.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Copied: branches/cmake/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v16.vcxproj (from rev 7693, branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj)
===================================================================
--- branches/cmake/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v16.vcxproj	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.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>{2B2B8D6E-4A84-49DD-8291-46172FCE422A}</ProjectGuid>
+    <RootNamespace>TTXCopyIniFile</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXCopyIniFile</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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>
+  <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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXCopyIniFile.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt" />
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Added: branches/cmake/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v16.vcxproj.filters
===================================================================
--- branches/cmake/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v16.vcxproj.filters	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v16.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,25 @@
+<?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>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="ReadMe">
+      <UniqueIdentifier>{874b45ff-d6e1-41fa-9990-dc82e1fa2c39}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXCopyIniFile.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+    <Text Include="ReadMe.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Copied: branches/cmake/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v16.vcxproj (from rev 7693, branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj)
===================================================================
--- branches/cmake/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v16.vcxproj	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.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>{3C12BA78-2F6A-4655-B6FF-E1BFF2A191D8}</ProjectGuid>
+    <RootNamespace>TTXFixedWinSize</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXFixedWinSize</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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>
+  <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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXFixedWinSize.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt" />
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Added: branches/cmake/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v16.vcxproj.filters
===================================================================
--- branches/cmake/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v16.vcxproj.filters	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v16.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,25 @@
+<?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>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="ReadMe">
+      <UniqueIdentifier>{c85cfa6a-7901-487a-827f-eab5a026442e}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXFixedWinSize.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+    <Text Include="ReadMe.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Modified: branches/cmake/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.vcproj
===================================================================
--- branches/cmake/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -61,6 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="user32.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -135,6 +136,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="user32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"

Copied: branches/cmake/TTXSamples/TTXKcodeChange/TTXKcodeChange.v16.vcxproj (from rev 7693, branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj)
===================================================================
--- branches/cmake/TTXSamples/TTXKcodeChange/TTXKcodeChange.v16.vcxproj	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXKcodeChange/TTXKcodeChange.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.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>{2E487F50-84E4-404D-A7E1-F9FA4A72BC25}</ProjectGuid>
+    <RootNamespace>TTXKcodeChange</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXKcodeChange</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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>
+  <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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXKcodeChange.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt" />
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Added: branches/cmake/TTXSamples/TTXKcodeChange/TTXKcodeChange.v16.vcxproj.filters
===================================================================
--- branches/cmake/TTXSamples/TTXKcodeChange/TTXKcodeChange.v16.vcxproj.filters	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXKcodeChange/TTXKcodeChange.v16.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,25 @@
+<?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>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="ReadMe">
+      <UniqueIdentifier>{61de082d-3825-47ff-b56b-2afbe6cb421d}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXKcodeChange.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+    <Text Include="ReadMe.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Copied: branches/cmake/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v16.vcxproj (from rev 7693, branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj)
===================================================================
--- branches/cmake/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v16.vcxproj	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.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>{80BE71D1-BEA3-4A5D-8F13-362D6364892D}</ProjectGuid>
+    <RootNamespace>TTXOutputBuffering</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXOutputBuffering</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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>
+  <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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXOutputBuffering.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt" />
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Added: branches/cmake/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v16.vcxproj.filters
===================================================================
--- branches/cmake/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v16.vcxproj.filters	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v16.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,25 @@
+<?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>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="ReadMe">
+      <UniqueIdentifier>{eac98687-8494-4f5a-9a22-74285b3cb27e}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXOutputBuffering.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+    <Text Include="ReadMe.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Modified: branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.c
===================================================================
--- branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.c	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.c	2019-05-19 15:06:12 UTC (rev 7694)
@@ -545,6 +545,8 @@
 		SendMessage(GetDlgItem(dlg, IDC_ADD_NL), BM_SETCHECK,
 		            pvar->add_nl?BST_CHECKED:BST_UNCHECKED, 0);
 
+		CenterWindow(dlg, GetParent(dlg));
+
 		return TRUE;
 	  case WM_COMMAND:
 		switch (LOWORD(wParam)) {
@@ -605,9 +607,11 @@
 static int PASCAL TTXProcessCommand(HWND hWin, WORD cmd) {
 	switch (cmd) {
 	  case ID_MENU_SETUP:
-		SetDialogFont(pvar->ts->SetupFName, pvar->ts->UILanguageFile, "TTXRecurringCommand");
-		switch (DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_SETUP_RECURRINGCOMMAND),
-		                       hWin, RecurringCommandSetting, (LPARAM)NULL)) {
+		SetDialogFont(pvar->ts->SetupFName,
+					  pvar->ts->UILanguageFile,
+					  SECTION, "DLG_TAHOMA_FONT");
+		switch (TTDialogBoxParam(hInst, MAKEINTRESOURCE(IDD_SETUP_RECURRINGCOMMAND),
+								 hWin, RecurringCommandSetting, (LPARAM)NULL)) {
 		  case IDOK:
 			break;
 		  case IDCANCEL:

Modified: branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v10.vcxproj
===================================================================
--- branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v10.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v10.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -60,6 +60,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -77,6 +78,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -85,6 +87,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\teraterm\common\dlglib.c" />
+    <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp" />
+    <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp" />
+    <ClCompile Include="..\..\teraterm\common\ttlib.c" />
     <ClCompile Include="TTXRecurringCommand.c" />
   </ItemGroup>
   <ItemGroup>

Modified: branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v10.vcxproj.filters
===================================================================
--- branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v10.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v10.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -21,6 +21,18 @@
     <ClCompile Include="TTXRecurringCommand.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\ttlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource.h">

Modified: branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v11.vcxproj
===================================================================
--- branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v11.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v11.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -65,6 +65,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -82,6 +83,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -90,6 +92,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\teraterm\common\dlglib.c" />
+    <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp" />
+    <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp" />
+    <ClCompile Include="..\..\teraterm\common\ttlib.c" />
     <ClCompile Include="TTXRecurringCommand.c" />
   </ItemGroup>
   <ItemGroup>

Modified: branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v11.vcxproj.filters
===================================================================
--- branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v11.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v11.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -21,6 +21,18 @@
     <ClCompile Include="TTXRecurringCommand.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\ttlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource.h">

Modified: branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v12.vcxproj
===================================================================
--- branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v12.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v12.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -65,6 +65,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -82,6 +83,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -90,6 +92,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\teraterm\common\dlglib.c" />
+    <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp" />
+    <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp" />
+    <ClCompile Include="..\..\teraterm\common\ttlib.c" />
     <ClCompile Include="TTXRecurringCommand.c" />
   </ItemGroup>
   <ItemGroup>

Modified: branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v12.vcxproj.filters
===================================================================
--- branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v12.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v12.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -21,6 +21,18 @@
     <ClCompile Include="TTXRecurringCommand.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\ttlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource.h">

Modified: branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v14.vcxproj
===================================================================
--- branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v14.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v14.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -65,6 +65,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -82,6 +83,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -90,6 +92,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\teraterm\common\dlglib.c" />
+    <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp" />
+    <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp" />
+    <ClCompile Include="..\..\teraterm\common\ttlib.c" />
     <ClCompile Include="TTXRecurringCommand.c" />
   </ItemGroup>
   <ItemGroup>

Modified: branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v14.vcxproj.filters
===================================================================
--- branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v14.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v14.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -21,6 +21,18 @@
     <ClCompile Include="TTXRecurringCommand.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\ttlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource.h">

Modified: branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj
===================================================================
--- branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -65,6 +65,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -82,6 +83,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -90,6 +92,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\teraterm\common\dlglib.c" />
+    <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp" />
+    <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp" />
+    <ClCompile Include="..\..\teraterm\common\ttlib.c" />
     <ClCompile Include="TTXRecurringCommand.c" />
   </ItemGroup>
   <ItemGroup>

Modified: branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj.filters
===================================================================
--- branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -21,6 +21,18 @@
     <ClCompile Include="TTXRecurringCommand.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\ttlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource.h">

Copied: branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v16.vcxproj (from rev 7693, branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj)
===================================================================
--- branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v16.vcxproj	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.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>{3C656364-FAEA-41D2-B227-52187D3C2529}</ProjectGuid>
+    <RootNamespace>TTXRecurringCommand</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXRecurringCommand</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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>
+  <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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\teraterm\common\dlglib.c" />
+    <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp" />
+    <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp" />
+    <ClCompile Include="..\..\teraterm\common\ttlib.c" />
+    <ClCompile Include="TTXRecurringCommand.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="TTXRecurringCommand.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt" />
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v16.vcxproj.filters (from rev 7693, branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj.filters)
===================================================================
--- branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v16.vcxproj.filters	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v16.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,55 @@
+<?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>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+    <Filter Include="ReadMe">
+      <UniqueIdentifier>{33cf655f-cf52-4333-b6c4-58fa615a79f2}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXRecurringCommand.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\ttlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="TTXRecurringCommand.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+    <Text Include="ReadMe.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Modified: branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v9.vcproj
===================================================================
--- branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v9.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v9.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -64,6 +64,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib""
 				LinkIncremental="2"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -138,6 +139,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib""
 				LinkIncremental="1"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -178,6 +180,22 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
+				RelativePath="..\..\teraterm\common\dlglib.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\teraterm\common\dlglib_cpp.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\teraterm\common\dlglib_tmpl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\teraterm\common\ttlib.c"
+				>
+			</File>
+			<File
 				RelativePath="TTXRecurringCommand.c"
 				>
 			</File>

Modified: branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.vcproj
===================================================================
--- branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -61,8 +61,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib""
+				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib ole32.lib shell32.lib gdi32.lib"
 				LinkIncremental="2"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -136,8 +137,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib""
+				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib ole32.lib shell32.lib gdi32.lib"
 				LinkIncremental="1"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -179,6 +181,22 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
+				RelativePath="..\..\teraterm\common\dlglib.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\teraterm\common\dlglib_cpp.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\teraterm\common\dlglib_tmpl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\teraterm\common\ttlib.c"
+				>
+			</File>
+			<File
 				RelativePath="TTXRecurringCommand.c"
 				>
 			</File>

Copied: branches/cmake/TTXSamples/TTXResizeMenu/TTXResizeMenu.v16.vcxproj (from rev 7693, branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj)
===================================================================
--- branches/cmake/TTXSamples/TTXResizeMenu/TTXResizeMenu.v16.vcxproj	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXResizeMenu/TTXResizeMenu.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.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>{4EA6AEB6-9CCD-4E6D-9531-3F92184EBE67}</ProjectGuid>
+    <RootNamespace>TTXResizeMenu</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXResizeMenu</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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>
+  <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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXResizeMenu.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt" />
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Added: branches/cmake/TTXSamples/TTXResizeMenu/TTXResizeMenu.v16.vcxproj.filters
===================================================================
--- branches/cmake/TTXSamples/TTXResizeMenu/TTXResizeMenu.v16.vcxproj.filters	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXResizeMenu/TTXResizeMenu.v16.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,25 @@
+<?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>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="ReadMe">
+      <UniqueIdentifier>{bc141cd6-562f-4b1b-948c-94914a36ffac}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXResizeMenu.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+    <Text Include="ReadMe.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Modified: branches/cmake/TTXSamples/TTXResizeMenu/TTXResizeMenu.vcproj
===================================================================
--- branches/cmake/TTXSamples/TTXResizeMenu/TTXResizeMenu.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXResizeMenu/TTXResizeMenu.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -61,7 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib""
+				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib"
 				LinkIncremental="2"
 				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
@@ -137,7 +137,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib""
+				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib"
 				LinkIncremental="1"
 				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"

Copied: branches/cmake/TTXSamples/TTXResizeWin/TTXResizeWin.v16.vcxproj (from rev 7693, branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj)
===================================================================
--- branches/cmake/TTXSamples/TTXResizeWin/TTXResizeWin.v16.vcxproj	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXResizeWin/TTXResizeWin.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.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>{11EF5960-4922-49DC-9E64-B0845FC7C88C}</ProjectGuid>
+    <RootNamespace>TTXResizeWin</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXResizeWin</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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>
+  <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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXResizeWin.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt" />
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Added: branches/cmake/TTXSamples/TTXResizeWin/TTXResizeWin.v16.vcxproj.filters
===================================================================
--- branches/cmake/TTXSamples/TTXResizeWin/TTXResizeWin.v16.vcxproj.filters	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXResizeWin/TTXResizeWin.v16.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,25 @@
+<?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>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="ReadMe">
+      <UniqueIdentifier>{b55f30ea-c34a-4cf2-a10f-8389a7654919}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXResizeWin.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+    <Text Include="ReadMe.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Modified: branches/cmake/TTXSamples/TTXResizeWin/TTXResizeWin.vcproj
===================================================================
--- branches/cmake/TTXSamples/TTXResizeWin/TTXResizeWin.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXResizeWin/TTXResizeWin.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -61,6 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="user32.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -135,6 +136,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="user32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"

Added: branches/cmake/TTXSamples/TTXSamples.v16.sln
===================================================================
--- branches/cmake/TTXSamples/TTXSamples.v16.sln	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXSamples.v16.sln	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,111 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 16
+VisualStudioVersion = 16.0.28803.156
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXAlwaysOnTop", "TTXAlwaysOnTop\TTXAlwaysOnTop.v16.vcxproj", "{E86DDB2C-CC00-43D1-8A1A-4B042EC983D6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXResizeWin", "TTXResizeWin\TTXResizeWin.v16.vcxproj", "{11EF5960-4922-49DC-9E64-B0845FC7C88C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXResizeMenu", "TTXResizeMenu\TTXResizeMenu.v16.vcxproj", "{4EA6AEB6-9CCD-4E6D-9531-3F92184EBE67}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXFixedWinSize", "TTXFixedWinSize\TTXFixedWinSize.v16.vcxproj", "{3C12BA78-2F6A-4655-B6FF-E1BFF2A191D8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXttyrec", "TTXttyrec\TTXttyrec.v16.vcxproj", "{5798E37E-0428-457E-A652-EE0A75130327}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXttyplay", "TTXttyrec\TTXttyplay.v16.vcxproj", "{3181E887-2183-4FB8-84CC-CA5B4D48BC71}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXtest", "ttxtest\TTXtest.v16.vcxproj", "{9E20E276-1905-44AE-BC67-C1A1F3C42135}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXKcodeChange", "TTXKcodeChange\TTXKcodeChange.v16.vcxproj", "{2E487F50-84E4-404D-A7E1-F9FA4A72BC25}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXViewMode", "TTXViewMode\TTXViewMode.v16.vcxproj", "{2296FB66-3FA4-4136-8252-ABECEEAC2D70}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXCopyIniFile", "TTXCopyIniFile\TTXCopyIniFile.v16.vcxproj", "{2B2B8D6E-4A84-49DD-8291-46172FCE422A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXAdditionalTitle", "TTXAdditionalTitle\TTXAdditionalTitle.v16.vcxproj", "{0ECAF69B-08B4-414A-B822-BE8459E463D8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXCallSysMenu", "TTXCallSysMenu\TTXCallSysMenu.v16.vcxproj", "{25709A86-E6B8-4CDA-906C-02D935E05978}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXCommandLineOpt", "TTXCommandLineOpt\TTXCommandLineOpt.v16.vcxproj", "{EE8BFC38-7000-42F1-BBC3-17F19855918A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXRecurringCommand", "TTXRecurringCommand\TTXRecurringCommand.v16.vcxproj", "{3C656364-FAEA-41D2-B227-52187D3C2529}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXShowCommandLine", "TTXShowCommandLine\TTXShowCommandLine.v16.vcxproj", "{80ED9927-27F9-473A-802C-FB10DEB5ECC6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXOutputBuffering", "TTXOutputBuffering\TTXOutputBuffering.v16.vcxproj", "{80BE71D1-BEA3-4A5D-8F13-362D6364892D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{E86DDB2C-CC00-43D1-8A1A-4B042EC983D6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E86DDB2C-CC00-43D1-8A1A-4B042EC983D6}.Debug|Win32.Build.0 = Debug|Win32
+		{E86DDB2C-CC00-43D1-8A1A-4B042EC983D6}.Release|Win32.ActiveCfg = Release|Win32
+		{E86DDB2C-CC00-43D1-8A1A-4B042EC983D6}.Release|Win32.Build.0 = Release|Win32
+		{11EF5960-4922-49DC-9E64-B0845FC7C88C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{11EF5960-4922-49DC-9E64-B0845FC7C88C}.Debug|Win32.Build.0 = Debug|Win32
+		{11EF5960-4922-49DC-9E64-B0845FC7C88C}.Release|Win32.ActiveCfg = Release|Win32
+		{11EF5960-4922-49DC-9E64-B0845FC7C88C}.Release|Win32.Build.0 = Release|Win32
+		{4EA6AEB6-9CCD-4E6D-9531-3F92184EBE67}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4EA6AEB6-9CCD-4E6D-9531-3F92184EBE67}.Debug|Win32.Build.0 = Debug|Win32
+		{4EA6AEB6-9CCD-4E6D-9531-3F92184EBE67}.Release|Win32.ActiveCfg = Release|Win32
+		{4EA6AEB6-9CCD-4E6D-9531-3F92184EBE67}.Release|Win32.Build.0 = Release|Win32
+		{3C12BA78-2F6A-4655-B6FF-E1BFF2A191D8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3C12BA78-2F6A-4655-B6FF-E1BFF2A191D8}.Debug|Win32.Build.0 = Debug|Win32
+		{3C12BA78-2F6A-4655-B6FF-E1BFF2A191D8}.Release|Win32.ActiveCfg = Release|Win32
+		{3C12BA78-2F6A-4655-B6FF-E1BFF2A191D8}.Release|Win32.Build.0 = Release|Win32
+		{5798E37E-0428-457E-A652-EE0A75130327}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5798E37E-0428-457E-A652-EE0A75130327}.Debug|Win32.Build.0 = Debug|Win32
+		{5798E37E-0428-457E-A652-EE0A75130327}.Release|Win32.ActiveCfg = Release|Win32
+		{5798E37E-0428-457E-A652-EE0A75130327}.Release|Win32.Build.0 = Release|Win32
+		{3181E887-2183-4FB8-84CC-CA5B4D48BC71}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3181E887-2183-4FB8-84CC-CA5B4D48BC71}.Debug|Win32.Build.0 = Debug|Win32
+		{3181E887-2183-4FB8-84CC-CA5B4D48BC71}.Release|Win32.ActiveCfg = Release|Win32
+		{3181E887-2183-4FB8-84CC-CA5B4D48BC71}.Release|Win32.Build.0 = Release|Win32
+		{9E20E276-1905-44AE-BC67-C1A1F3C42135}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9E20E276-1905-44AE-BC67-C1A1F3C42135}.Debug|Win32.Build.0 = Debug|Win32
+		{9E20E276-1905-44AE-BC67-C1A1F3C42135}.Release|Win32.ActiveCfg = Release|Win32
+		{9E20E276-1905-44AE-BC67-C1A1F3C42135}.Release|Win32.Build.0 = Release|Win32
+		{2E487F50-84E4-404D-A7E1-F9FA4A72BC25}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2E487F50-84E4-404D-A7E1-F9FA4A72BC25}.Debug|Win32.Build.0 = Debug|Win32
+		{2E487F50-84E4-404D-A7E1-F9FA4A72BC25}.Release|Win32.ActiveCfg = Release|Win32
+		{2E487F50-84E4-404D-A7E1-F9FA4A72BC25}.Release|Win32.Build.0 = Release|Win32
+		{2296FB66-3FA4-4136-8252-ABECEEAC2D70}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2296FB66-3FA4-4136-8252-ABECEEAC2D70}.Debug|Win32.Build.0 = Debug|Win32
+		{2296FB66-3FA4-4136-8252-ABECEEAC2D70}.Release|Win32.ActiveCfg = Release|Win32
+		{2296FB66-3FA4-4136-8252-ABECEEAC2D70}.Release|Win32.Build.0 = Release|Win32
+		{2B2B8D6E-4A84-49DD-8291-46172FCE422A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2B2B8D6E-4A84-49DD-8291-46172FCE422A}.Debug|Win32.Build.0 = Debug|Win32
+		{2B2B8D6E-4A84-49DD-8291-46172FCE422A}.Release|Win32.ActiveCfg = Release|Win32
+		{2B2B8D6E-4A84-49DD-8291-46172FCE422A}.Release|Win32.Build.0 = Release|Win32
+		{0ECAF69B-08B4-414A-B822-BE8459E463D8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0ECAF69B-08B4-414A-B822-BE8459E463D8}.Debug|Win32.Build.0 = Debug|Win32
+		{0ECAF69B-08B4-414A-B822-BE8459E463D8}.Release|Win32.ActiveCfg = Release|Win32
+		{0ECAF69B-08B4-414A-B822-BE8459E463D8}.Release|Win32.Build.0 = Release|Win32
+		{25709A86-E6B8-4CDA-906C-02D935E05978}.Debug|Win32.ActiveCfg = Debug|Win32
+		{25709A86-E6B8-4CDA-906C-02D935E05978}.Debug|Win32.Build.0 = Debug|Win32
+		{25709A86-E6B8-4CDA-906C-02D935E05978}.Release|Win32.ActiveCfg = Release|Win32
+		{25709A86-E6B8-4CDA-906C-02D935E05978}.Release|Win32.Build.0 = Release|Win32
+		{EE8BFC38-7000-42F1-BBC3-17F19855918A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EE8BFC38-7000-42F1-BBC3-17F19855918A}.Debug|Win32.Build.0 = Debug|Win32
+		{EE8BFC38-7000-42F1-BBC3-17F19855918A}.Release|Win32.ActiveCfg = Release|Win32
+		{EE8BFC38-7000-42F1-BBC3-17F19855918A}.Release|Win32.Build.0 = Release|Win32
+		{3C656364-FAEA-41D2-B227-52187D3C2529}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3C656364-FAEA-41D2-B227-52187D3C2529}.Debug|Win32.Build.0 = Debug|Win32
+		{3C656364-FAEA-41D2-B227-52187D3C2529}.Release|Win32.ActiveCfg = Release|Win32
+		{3C656364-FAEA-41D2-B227-52187D3C2529}.Release|Win32.Build.0 = Release|Win32
+		{80ED9927-27F9-473A-802C-FB10DEB5ECC6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{80ED9927-27F9-473A-802C-FB10DEB5ECC6}.Debug|Win32.Build.0 = Debug|Win32
+		{80ED9927-27F9-473A-802C-FB10DEB5ECC6}.Release|Win32.ActiveCfg = Release|Win32
+		{80ED9927-27F9-473A-802C-FB10DEB5ECC6}.Release|Win32.Build.0 = Release|Win32
+		{80BE71D1-BEA3-4A5D-8F13-362D6364892D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{80BE71D1-BEA3-4A5D-8F13-362D6364892D}.Debug|Win32.Build.0 = Debug|Win32
+		{80BE71D1-BEA3-4A5D-8F13-362D6364892D}.Release|Win32.ActiveCfg = Release|Win32
+		{80BE71D1-BEA3-4A5D-8F13-362D6364892D}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Copied: branches/cmake/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v16.vcxproj (from rev 7693, branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj)
===================================================================
--- branches/cmake/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v16.vcxproj	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.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>{80ED9927-27F9-473A-802C-FB10DEB5ECC6}</ProjectGuid>
+    <RootNamespace>TTXShowCommandLine</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXShowCommandLine</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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>
+  <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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXShowCommandLine.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt" />
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Added: branches/cmake/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v16.vcxproj.filters
===================================================================
--- branches/cmake/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v16.vcxproj.filters	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v16.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,25 @@
+<?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>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="ReadMe">
+      <UniqueIdentifier>{e155f1a7-bb1c-4c4a-81fe-475778200096}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXShowCommandLine.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+    <Text Include="ReadMe.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Modified: branches/cmake/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.vcproj
===================================================================
--- branches/cmake/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -61,6 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="user32.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -135,6 +136,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="user32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"

Modified: branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.c
===================================================================
--- branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.c	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.c	2019-05-19 15:06:12 UTC (rev 7694)
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <windows.h>
+#include "dlglib.h"
 
 #include "compat_w95.h"
 
@@ -156,7 +157,7 @@
   
   switch (msg) {
     case WM_INITDIALOG:
-      /* nothing to do */
+      CenterWindow(dlg, GetParent(dlg));
       return TRUE;
     case WM_COMMAND:
       switch (LOWORD(wParam)) {
@@ -163,15 +164,15 @@
         case IDOK:
 	  GetDlgItemText(dlg, IDC_CURPASS, password, sizeof(password));
 	  if (strcmp(pvar->password, password) == 0) {
-	    EndDialog(dlg, IDOK);
+	    TTEndDialog(dlg, IDOK);
 	  }
 	  else {
 	    MessageBox(NULL, "Invalid Password", "Invalid Password", MB_OK | MB_ICONEXCLAMATION);
-	    EndDialog(dlg, IDCANCEL);
+	    TTEndDialog(dlg, IDCANCEL);
 	  }
 	  return TRUE;
 	case IDCANCEL:
-	  EndDialog(dlg, IDCANCEL);
+	  TTEndDialog(dlg, IDCANCEL);
 	  return TRUE;
       }
       break;
@@ -184,7 +185,7 @@
 
   switch (msg) {
     case WM_INITDIALOG:
-      /* nothing to do */
+      CenterWindow(dlg, GetParent(dlg));
       return TRUE;
     case WM_COMMAND:
       switch (LOWORD(wParam)) {
@@ -196,20 +197,20 @@
 	    if (strcmp(passwd1, passwd2) == 0) {
 	      strncpy_s(pvar->password, sizeof(pvar->password), passwd1, _TRUNCATE);
 	      MessageBox(NULL, "Password changed", "TTXViewMode", MB_OK | MB_ICONEXCLAMATION);
-	      EndDialog(dlg, IDOK);
+	      TTEndDialog(dlg, IDOK);
 	    }
 	    else {
 	      MessageBox(NULL, "New password not matched.", "TTXViewMode", MB_OK | MB_ICONEXCLAMATION);
-	      EndDialog(dlg, IDCANCEL);
+	      TTEndDialog(dlg, IDCANCEL);
 	    }
 	  }
 	  else {
 	    MessageBox(NULL, "Invalid Password", "TTXViewMode", MB_OK | MB_ICONEXCLAMATION);
-	    EndDialog(dlg, IDCANCEL);
+	    TTEndDialog(dlg, IDCANCEL);
 	  }
 	  return TRUE;
 	case IDCANCEL:
-	  EndDialog(dlg, IDCANCEL);
+	  TTEndDialog(dlg, IDCANCEL);
 	  return TRUE;
       }
       break;
@@ -222,7 +223,9 @@
     case ID_MENU_VIEWMODE:
       if (pvar->enable) {
         if (strcmp(pvar->password, "") != 0) {
-          switch (DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_INPUT_PASSWORD), hWin, ViewModeInputPass, (LPARAM)NULL)) {
+          SetDialogFont(pvar->ts->SetupFName, pvar->ts->UILanguageFile,
+                        "TTXViewMode", "DLG_TAHOMA_FONT");
+          switch (TTDialogBoxParam(hInst, MAKEINTRESOURCE(IDD_INPUT_PASSWORD), hWin, ViewModeInputPass, (LPARAM)NULL)) {
             case IDOK:
               pvar->enable = FALSE;
 	      CheckMenuItem(pvar->ControlMenu, ID_MENU_VIEWMODE, MF_BYCOMMAND | MF_UNCHECKED);
@@ -247,7 +250,9 @@
       }
       return 1;
     case ID_MENU_SETPASS:
-      switch (DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_SET_PASSWORD), hWin, ViewModeSetPass, (LPARAM)NULL)) {
+      SetDialogFont(pvar->ts->SetupFName, pvar->ts->UILanguageFile,
+                    "TTXViewMode", "DLG_TAHOMA_FONT");
+      switch (TTDialogBoxParam(hInst, MAKEINTRESOURCE(IDD_SET_PASSWORD), hWin, ViewModeSetPass, (LPARAM)NULL)) {
 	case IDOK:
 	  break;
 	case IDCANCEL:

Modified: branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v10.vcxproj
===================================================================
--- branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v10.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v10.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -59,6 +59,8 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -75,6 +77,8 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -83,6 +87,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\teraterm\common\dlglib.c" />
+    <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp" />
+    <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp" />
+    <ClCompile Include="..\..\teraterm\common\ttlib.c" />
     <ClCompile Include="TTXViewMode.c" />
   </ItemGroup>
   <ItemGroup>

Modified: branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v10.vcxproj.filters
===================================================================
--- branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v10.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v10.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -21,6 +21,18 @@
     <ClCompile Include="TTXViewMode.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\ttlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource.h">

Modified: branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v11.vcxproj
===================================================================
--- branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v11.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v11.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -64,6 +64,8 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -80,6 +82,8 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -88,6 +92,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\teraterm\common\dlglib.c" />
+    <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp" />
+    <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp" />
+    <ClCompile Include="..\..\teraterm\common\ttlib.c" />
     <ClCompile Include="TTXViewMode.c" />
   </ItemGroup>
   <ItemGroup>

Modified: branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v11.vcxproj.filters
===================================================================
--- branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v11.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v11.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -21,6 +21,18 @@
     <ClCompile Include="TTXViewMode.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\ttlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource.h">

Modified: branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v12.vcxproj
===================================================================
--- branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v12.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v12.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -64,6 +64,8 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -80,6 +82,8 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -88,6 +92,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\teraterm\common\dlglib.c" />
+    <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp" />
+    <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp" />
+    <ClCompile Include="..\..\teraterm\common\ttlib.c" />
     <ClCompile Include="TTXViewMode.c" />
   </ItemGroup>
   <ItemGroup>

Modified: branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v12.vcxproj.filters
===================================================================
--- branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v12.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v12.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -21,6 +21,18 @@
     <ClCompile Include="TTXViewMode.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\ttlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource.h">

Modified: branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v14.vcxproj
===================================================================
--- branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v14.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v14.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -64,6 +64,8 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -80,6 +82,8 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -88,6 +92,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\teraterm\common\dlglib.c" />
+    <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp" />
+    <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp" />
+    <ClCompile Include="..\..\teraterm\common\ttlib.c" />
     <ClCompile Include="TTXViewMode.c" />
   </ItemGroup>
   <ItemGroup>

Modified: branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v14.vcxproj.filters
===================================================================
--- branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v14.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v14.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -21,6 +21,18 @@
     <ClCompile Include="TTXViewMode.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\ttlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource.h">

Modified: branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj
===================================================================
--- branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -64,6 +64,8 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -80,6 +82,8 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -88,6 +92,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\teraterm\common\dlglib.c" />
+    <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp" />
+    <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp" />
+    <ClCompile Include="..\..\teraterm\common\ttlib.c" />
     <ClCompile Include="TTXViewMode.c" />
   </ItemGroup>
   <ItemGroup>

Modified: branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj.filters
===================================================================
--- branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -21,6 +21,18 @@
     <ClCompile Include="TTXViewMode.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\ttlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource.h">

Copied: branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v16.vcxproj (from rev 7693, branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj)
===================================================================
--- branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v16.vcxproj	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.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>{2296FB66-3FA4-4136-8252-ABECEEAC2D70}</ProjectGuid>
+    <RootNamespace>TTXViewMode</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXViewMode</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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>
+  <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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\teraterm\common\dlglib.c" />
+    <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp" />
+    <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp" />
+    <ClCompile Include="..\..\teraterm\common\ttlib.c" />
+    <ClCompile Include="TTXViewMode.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="TTXViewMode.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt" />
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v16.vcxproj.filters (from rev 7693, branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v12.vcxproj.filters)
===================================================================
--- branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v16.vcxproj.filters	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v16.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,55 @@
+<?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>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+    <Filter Include="ReadMe">
+      <UniqueIdentifier>{207e9925-fb82-42d1-a276-7ac21274c358}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXViewMode.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\ttlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="TTXViewMode.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+    <Text Include="ReadMe.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Modified: branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v9.vcproj
===================================================================
--- branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v9.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v9.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -62,7 +62,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib ole32.lib shell32.lib gdi32.lib"
 				LinkIncremental="2"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -135,7 +137,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib ole32.lib shell32.lib gdi32.lib"
 				LinkIncremental="1"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -176,6 +180,22 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
+				RelativePath="..\..\teraterm\common\dlglib.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\teraterm\common\dlglib_cpp.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\teraterm\common\dlglib_tmpl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\teraterm\common\ttlib.c"
+				>
+			</File>
+			<File
 				RelativePath="TTXViewMode.c"
 				>
 			</File>

Modified: branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.vcproj
===================================================================
--- branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -61,7 +61,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib ole32.lib shell32.lib gdi32.lib"
 				LinkIncremental="2"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -135,7 +137,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib ole32.lib shell32.lib gdi32.lib"
 				LinkIncremental="1"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -177,6 +181,22 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
+				RelativePath="..\..\teraterm\common\dlglib.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\teraterm\common\dlglib_cpp.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\teraterm\common\dlglib_tmpl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\teraterm\common\ttlib.c"
+				>
+			</File>
+			<File
 				RelativePath="TTXViewMode.c"
 				>
 			</File>

Copied: branches/cmake/TTXSamples/TTXttyrec/TTXttyplay.v16.vcxproj (from rev 7693, branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj)
===================================================================
--- branches/cmake/TTXSamples/TTXttyrec/TTXttyplay.v16.vcxproj	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXttyrec/TTXttyplay.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.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>{3181E887-2183-4FB8-84CC-CA5B4D48BC71}</ProjectGuid>
+    <RootNamespace>TTXttyplay</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXttyplay</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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>
+  <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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>play.$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>play.$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="gettimeofday.c" />
+    <ClCompile Include="TTXttyplay.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt" />
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="gettimeofday.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/cmake/TTXSamples/TTXttyrec/TTXttyplay.v16.vcxproj.filters (from rev 7693, branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v11.vcxproj.filters)
===================================================================
--- branches/cmake/TTXSamples/TTXttyrec/TTXttyplay.v16.vcxproj.filters	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXttyrec/TTXttyplay.v16.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,36 @@
+<?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>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="ReadMe">
+      <UniqueIdentifier>{9ecc9ed6-14bd-4931-8e17-5de779b005f2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{b5b0513b-87e3-414c-9535-6e4b8451b4cb}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="gettimeofday.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TTXttyplay.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+    <Text Include="ReadMe.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="gettimeofday.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Modified: branches/cmake/TTXSamples/TTXttyrec/TTXttyplay.vcproj
===================================================================
--- branches/cmake/TTXSamples/TTXttyrec/TTXttyplay.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXttyrec/TTXttyplay.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -61,7 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib""
+				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib comdlg32.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -136,7 +136,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib""
+				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib comdlg32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"

Copied: branches/cmake/TTXSamples/TTXttyrec/TTXttyrec.v16.vcxproj (from rev 7693, branches/cmake/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj)
===================================================================
--- branches/cmake/TTXSamples/TTXttyrec/TTXttyrec.v16.vcxproj	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXttyrec/TTXttyrec.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.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>{5798E37E-0428-457E-A652-EE0A75130327}</ProjectGuid>
+    <RootNamespace>TTXttyrec</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXttyrec</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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>
+  <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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>rec.$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>rec.$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="gettimeofday.c" />
+    <ClCompile Include="TTXttyrec.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt" />
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="gettimeofday.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/cmake/TTXSamples/TTXttyrec/TTXttyrec.v16.vcxproj.filters (from rev 7693, branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v11.vcxproj.filters)
===================================================================
--- branches/cmake/TTXSamples/TTXttyrec/TTXttyrec.v16.vcxproj.filters	                        (rev 0)
+++ branches/cmake/TTXSamples/TTXttyrec/TTXttyrec.v16.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,36 @@
+<?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>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="ReadMe">
+      <UniqueIdentifier>{83b91709-fa4b-4165-be9e-bb0b43840a4a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{d0ccabca-8574-4219-b8be-8b7d7e127248}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="gettimeofday.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TTXttyrec.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe-ja.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+    <Text Include="ReadMe.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="gettimeofday.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Modified: branches/cmake/TTXSamples/TTXttyrec/TTXttyrec.vcproj
===================================================================
--- branches/cmake/TTXSamples/TTXttyrec/TTXttyrec.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/TTXttyrec/TTXttyrec.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -61,7 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib""
+				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib comdlg32.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -136,7 +136,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib""
+				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib comdlg32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"

Copied: branches/cmake/TTXSamples/ttxtest/TTXtest.v16.vcxproj (from rev 7693, branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj)
===================================================================
--- branches/cmake/TTXSamples/ttxtest/TTXtest.v16.vcxproj	                        (rev 0)
+++ branches/cmake/TTXSamples/ttxtest/TTXtest.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.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>{9E20E276-1905-44AE-BC67-C1A1F3C42135}</ProjectGuid>
+    <RootNamespace>TTXtest</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>TTXtest</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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>
+  <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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="ttxtest.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Added: branches/cmake/TTXSamples/ttxtest/TTXtest.v16.vcxproj.filters
===================================================================
--- branches/cmake/TTXSamples/ttxtest/TTXtest.v16.vcxproj.filters	                        (rev 0)
+++ branches/cmake/TTXSamples/ttxtest/TTXtest.v16.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,14 @@
+<?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>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="ttxtest.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Modified: branches/cmake/TTXSamples/ttxtest/TTXtest.vcproj
===================================================================
--- branches/cmake/TTXSamples/ttxtest/TTXtest.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/TTXSamples/ttxtest/TTXtest.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -61,6 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="user32.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -135,6 +136,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="user32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"

Modified: branches/cmake/doc/convtext.bat
===================================================================
--- branches/cmake/doc/convtext.bat	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/doc/convtext.bat	2019-05-19 15:06:12 UTC (rev 7694)
@@ -21,3 +21,8 @@
 %TOSJIS% -i ja/html/reference/build_with_cmake_utf8.html -o ja/html/reference/build_with_cmake.html  -c utf8
 perl -C -pe 'tr/\x{feff}//d' en/html/reference/build_with_cmake.md | perl Markdown_1.0.1/Markdown.pl > en/html/reference/build_with_cmake_utf8.html
 %TOSJIS% -i en/html/reference/build_with_cmake_utf8.html -o en/html/reference/build_with_cmake.html  -c utf8
+
+perl -C -pe 'tr/\x{feff}//d' ja/html/reference/build_library_with_cmake.md | perl Markdown_1.0.1/Markdown.pl > ja/html/reference/build_library_with_cmake_utf8.html
+%TOSJIS% -i ja/html/reference/build_library_with_cmake_utf8.html -o ja/html/reference/build_library_with_cmake.html  -c utf8
+perl -C -pe 'tr/\x{feff}//d' en/html/reference/build_library_with_cmake.md | perl Markdown_1.0.1/Markdown.pl > en/html/reference/build_library_with_cmake_utf8.html
+%TOSJIS% -i en/html/reference/build_library_with_cmake_utf8.html -o en/html/reference/build_library_with_cmake.html  -c utf8

Modified: branches/cmake/doc/en/html/about/history.html
===================================================================
--- branches/cmake/doc/en/html/about/history.html	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/doc/en/html/about/history.html	2019-05-19 15:06:12 UTC (rev 7694)
@@ -33,6 +33,13 @@
 
 <h3 id="teraterm_4.103">2019.xx.xx (Ver 4.103)</h3>
 <ul class="history">
+  <li>Changes
+    <ul>
+      <li>added support for High DPI experimentally. The default setting is disabled. When DPIAware=1 is set in [Tera Term] of teraterm.ini file, this feature is enabled. However, this is only available for Windows 10 Version 1703 or later.</li>
+      <li>added support for configure the dialog font(<a href="../menu/setup-font.html">[Setup]/[Font])</a>. The font submenu is newly added. The default font is same as before.</li>
+      <li>When the font file(TSPECIAL1.TTF) displaying ruled line is not installed, the file is loaded from same directory as ttermpro.exe.</li>
+    </ul>
+  </li>
   <li>Bug fixes
     <ul>
       <li>Display position of IME's conversion candidate window can not follow cursor position. This bug was introduced in 4.102.</li>

Modified: branches/cmake/doc/en/html/image/Authentication.png
===================================================================
(Binary files differ)

Modified: branches/cmake/doc/en/html/index.html
===================================================================
--- branches/cmake/doc/en/html/index.html	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/doc/en/html/index.html	2019-05-19 15:06:12 UTC (rev 7694)
@@ -145,7 +145,11 @@
  <LI><A HREF="reference/CygTerm+-LICENSE.txt">License of CygTerm+</A></LI>
  <LI><A HREF="reference/develop.txt">For developer</A>
  <UL>
-   <LI><A HREF="reference/build_with_cmake.html">build with CMake (experimental)</A></LI>
+   <LI>build with CMake (experimental)</LI>
+   <UL>
+	 <LI><A HREF="reference/build_library_with_cmake.html">library</A></LI>
+	 <LI><A HREF="reference/build_with_cmake.html">Tera Term</A></LI>
+   </UL>
  </UL>
  <LI><A HREF="reference/sourcecode.html">Source Code Overview</A></LI>
 </UL>

Modified: branches/cmake/doc/en/html/menu/setup-font.html
===================================================================
--- branches/cmake/doc/en/html/menu/setup-font.html	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/doc/en/html/menu/setup-font.html	2019-05-19 15:06:12 UTC (rev 7694)
@@ -51,5 +51,9 @@
       <li>
 	The font quality can be selected by using the <a href="setup-additional.html#FontQuality">Font quality</a> on the Visual tab of <a href="setup-additional.html">Additional settings dialog</a>.
       </li>
+      <li>
+	When the dialog font is set to very large size and wide font, 
+	displayed font may be corrupted, and also you may not press [ok] button because the dialog goes out of screen.
+      </li>
   </body>
 </html>

Modified: branches/cmake/doc/en/html/menu/setup-sshauth.html
===================================================================
--- branches/cmake/doc/en/html/menu/setup-sshauth.html	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/doc/en/html/menu/setup-sshauth.html	2019-05-19 15:06:12 UTC (rev 7694)
@@ -15,91 +15,92 @@
     <dl>
       <dt id="DefaultUserName">User name</dt>
       <dd>
-        Specify user name to be used for SSH connection.
+		Specify user name to be used for SSH connection.<br />
+		When <a href="#CheckAuthListFirst">Check the supported authentication methods before login</a> was checked, you can not change user name.
+
+		<dl>
+		  <dt>Do not enter username</dt>
+		  <dd>
+			Do not enter username.
+		  </dd>
+
+		  <dt>Use following username</dt>
+		  <dd>
+			Use the username entered in the edit box.<br />
+			However, nothing will be input if the edit box is empty.
+		  </dd>
+
+		  <dt>Use system username</dt>
+		  <dd>
+			User system username, Windows logon username.
+		  </dd>
+		</dl>
+
       </dd>
 
       <dt id="DefaultAuthMethod">Specify default authentication method.</dt>
       <dd>
 
-        <ul>
-          <li>
+        <dl>
+          <dt>Use plain password to log in</dt>
+          <dd>
+            Specify Password if a password authentication is used.
+          </dd>
+          
+          <dt>Use RSA/DSA/ECDSA/ED25519 key to login</dt>
+          <dd>
+            Choose an authentication method using RSA/DSA/ECDSA/ED25519 key which are previously generated.<br />
             <dl>
-              <dt>Use plain password to log in</dt>
+              <dt id="DefaultRSAPrivateKeyFile">Private key file<dt>
               <dd>
-                Specify Password if a password authentication is used.
+                Specify OpenSSH format private key file.<br />
+                TTSSH 2.63(Tera Term 4.76) later can support the PuTTY format and SECSH(ssh.com) format of the SSH2 private key.
               </dd>
             </dl>
-          </li>
-
-          <li>
+          </dd>
+          
+          <dt>Use rhost to login (SSH1)</dt>
+          <dd>
+            Specify if rhost connection is allowed by Host.
             <dl>
-              <dt>Use RSA/DSA/ECDSA/ED25519 key to login</dt>
+              <dt id="DefaultRhostsLocalUserName">Local user name<dt>
               <dd>
-                Choose an authentication method using RSA/DSA/ECDSA/ED25519 key which are previously generated.<br />
-                <dl>
-                  <dt id="DefaultRSAPrivateKeyFile">Private key file<dt>
-                  <dd>
-                    Specify OpenSSH format private key file.<br />
-                    TTSSH 2.63(Tera Term 4.76) later can support the PuTTY format and SECSH(ssh.com) format of the SSH2 private key.
-                  </dd>
-                </dl>
+                Specify user name.
               </dd>
-            </dl>
-          </li>
-
-          <li>
-            <dl>
-              <dt>Use rhost to login (SSH1)</dt>
+              <dt id="DefaultRhostsHostPrivateKeyFile">Host private key file<dt>
               <dd>
-                Specify if rhost connection is allowed by Host.
-                <dl>
-                  <dt id="DefaultRhostsLocalUserName">Local user name<dt>
-                  <dd>
-                    Specify user name.
-                  </dd>
-                  <dt id="DefaultRhostsHostPrivateKeyFile">Host private key file<dt>
-                  <dd>
-                    Specify OpenSSH format private key file.
-                  </dd>
-                </dl>
+                Specify OpenSSH format private key file.
               </dd>
             </dl>
-          </li>
-
-          <li>
+          </dd>
+          
+          <dt>Use SSH1:challenge/response(TIS) / SSH2:keyboard-interactive to log in</dt>
+          <dd>
             <dl>
-              <dt>Use SSH1:challenge/response(TIS) / SSH2:keyboard-interactive to log in</dt>
+              <dt>SSH1</dt>
               <dd>
-                <dl>
-                  <dt>SSH1</dt>
-                  <dd>
-                    Choose if Challenge/Response authentication is available.
-                    It may be S/Key authentication depending on the server.
-                  </dd>
-                  <dt>SSH2</dt>
-                  <dd>
-                    Choose if keyboard-interactive authentication is available.
-                    This authentication method is used to log in to the server by using your password 
-                    that has disabled password authentication such as FreeBSD. <br>
-                    Encrypted input data are sent to the server with the method.
-                    When a password is input for authentication, same as password authentication,
-                    encrypted password passes through.
-                    
-                  </dd>
-                </dl>
+                Choose if Challenge/Response authentication is available.
+                It may be S/Key authentication depending on the server.
               </dd>
-            </dl>
-          </li>
-
-          <li>
-            <dl>
-              <dt>Use Pageant</dt>
+              <dt>SSH2</dt>
               <dd>
-                Choose an authentication method using RSA/DSA key with Pageant.<br>
-                TTSSH does not handle a private key file.
+                Choose if keyboard-interactive authentication is available.
+                This authentication method is used to log in to the server by using your password 
+                that has disabled password authentication such as FreeBSD. <br>
+                Encrypted input data are sent to the server with the method.
+                When a password is input for authentication, same as password authentication,
+                encrypted password passes through.
+                
               </dd>
             </dl>
-          </li>
+          </dd>
+          
+          <dt>Use Pageant</dt>
+          <dd>
+            Choose an authentication method using RSA/DSA key with Pageant.<br>
+            TTSSH does not handle a private key file.
+          </dd>
+        </dl>
 
       </dd>
 

Added: branches/cmake/doc/en/html/reference/build_library_with_cmake.md
===================================================================
--- branches/cmake/doc/en/html/reference/build_library_with_cmake.md	                        (rev 0)
+++ branches/cmake/doc/en/html/reference/build_library_with_cmake.md	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,94 @@
+
+# libs directory
+
+- This directory for storing external libraries to build Tera Term.
+- Source, library and executable file are stored for each compiler.
+- Library is generated only once in advance.
+
+# Preparing
+
+## Visual Studio
+
+- cmake
+	- It is OK if PATH is passed.
+	- Do not use Cygwin's cmake(Not supporting for Visual Studio).
+	- Use cmake 3.11.4 when Visual Studio 2005 is used.
+- perl
+	- It is necessary for compiling OpenSSL, and converting character code of document and code of carriage return.
+	- ActivePerl 5.8 or later, also cygwin perl.
+	- It will be searched automatically if PATH is not passed.
+
+## MinGW common (experimental)
+
+- Can be built with MinGW on Cygwin,MSYS2,linux(wsl).
+- The cmake,make,(MinGW)gcc,(clang) and perl that work in each environment are required.
+
+# How to build
+
+You need to use Internet service because some archives are automatically downloaded.
+
+## Case of Visual Studio
+
+### By using batch file
+
+Execute buildall_cmake.bat, and select Visual Studio.
+
+    1. Visual Studio 16 2019
+    2. Visual Studio 15 2017
+    3. Visual Studio 14 2015
+    4. Visual Studio 12 2013
+    5. Visual Studio 11 2012
+    6. Visual Studio 10 2010
+    7. Visual Studio 9 2008
+    8. Visual Studio 8 2005
+    select no
+
+When VS2005 is selected, you can download cmake 3.11.4 and install into `libs\cmake-3.11.4-win32-x86`.
+
+### By using cmake
+
+Case of Visual Studio 2019 x86
+
+    cmake -DCMAKE_GENERATOR="Visual Studio 16 2019" -DARCHITECTURE=Win32 -P buildall.cmake
+
+Case of Visual Studio 2017 x86
+
+    cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -P buildall.cmake
+
+Case of Visual Studio 2017 x64
+
+    cmake -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64" -P buildall.cmake`
+
+When Visual Studio 2005 is used, cmake 3.11.4 or earlier(if cmake is installed in 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 common
+
+Using cmake in each environment.
+
+    cmake -DCMAKE_GENERATOR="Unix Makefiles" -P buildall.cmake
+
+# Regarding each directory
+
+## Library directory generated
+
+- Library `*.h` and `*.lib` are created in the following:
+	- `oniguruma_{compiler}`
+	- `openssl_{compiler}`
+	- `putty`
+	- `SFMT_{compiler}`
+	- `zlib_{compiler}`
+
+## Downloaded archive directory
+
+- Downloaded archives are stored.
+- Downloading automatically.
+- Re-use these archives downloaded already.
+- Can be removed if these archives do not need after building.
+
+## Build directory
+
+- Building under `build/oniguruma/{compiler}/`.
+- Remove it in advance if rebuliding.
+- Can be removed if this do not need after building.

Modified: branches/cmake/doc/en/html/reference/develop.txt
===================================================================
--- branches/cmake/doc/en/html/reference/develop.txt	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/doc/en/html/reference/develop.txt	2019-05-19 15:06:12 UTC (rev 7694)
@@ -10,6 +10,8 @@
          e.g. INCLUDE "C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Include"
               LIB     "C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Lib"
 - Supported Compiler
+-- Visual Studio 2005 Express Edition
+   Note: Added support from Tera Term 4.103.
 -- Visual Studio 2008 SP1 Standard Edition (or higher edition)
    Note: The executable program which was compiled by this version does not work on Windows NT 4.0, 95, 98 and Me.
 -- Visual Studio 2010 SP1 Professional Edition (or higher edition)

Modified: branches/cmake/doc/en/html/reference/sourcecode.html
===================================================================
--- branches/cmake/doc/en/html/reference/sourcecode.html	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/doc/en/html/reference/sourcecode.html	2019-05-19 15:06:12 UTC (rev 7694)
@@ -434,7 +434,7 @@
 	char tmp[1024];
 	va_list arg;
 	va_start(arg, fmt);
-	_vsnprintf(tmp, sizeof(tmp), fmt, arg);
+	_vsnprintf_s(tmp, sizeof(tmp), _TRUNCATE, fmt, arg);
 	OutputDebugString(tmp);
 }
 </pre>

Modified: branches/cmake/doc/en/html/setup/teraterm-ini.html
===================================================================
--- branches/cmake/doc/en/html/setup/teraterm-ini.html	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/doc/en/html/setup/teraterm-ini.html	2019-05-19 15:06:12 UTC (rev 7694)
@@ -488,6 +488,12 @@
 		<td></td>
 	</tr>
 	<tr>
+		<td id="DlgFont"><a href="../menu/setup-font.html">DlgFont</a></td>
+		<td style="width:250px;"></td>
+		<td style="width:250px;"><-</td>
+		<td></td>
+	</tr>
+	<tr>
 		<td id="EnableANSIColor"><a href="../menu/setup-additional.html#EnableANSIColor">EnableANSIColor</a></td>
 		<td style="width:250px;">on</td>
 		<td style="width:250px;"><-</td>
@@ -1621,6 +1627,12 @@
 		<td></td>
 	</tr>
 	<tr>
+		<td id="DefaultUserType"><a href="../menu/setup-sshauth.html#DefaultUserType">DefaultUserType</a></td>
+		<td style="width:250px;">1</td>
+		<td style="width:250px;"><-</td>
+		<td></td>
+	</tr>
+	<tr>
 		<td id="DisablePopupMessage">DisablePopupMessage</td>
 		<td style="width:250px;">0</td>
 		<td style="width:250px;"><-</td>

Modified: branches/cmake/doc/en/html/usage/ssh.html
===================================================================
--- branches/cmake/doc/en/html/usage/ssh.html	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/doc/en/html/usage/ssh.html	2019-05-19 15:06:12 UTC (rev 7694)
@@ -49,7 +49,8 @@
     </p>
 
     <p id="ssh_auth_dialog">
-      Once connected, then you will be prompted to select authentication method in a dialog.
+      Once connected, then you will be prompted to select authentication method in a dialog.<br />
+	  You can change default value in <a href="../menu/setup-sshauth.html">"TTSSH: Authentication Setup" dialog</a>
     </p>
     <div class="img"><img src="../image/Authentication.png" alt="Authentication method"></div>
     <p>
@@ -66,6 +67,25 @@
       <li>When the Pageant is used, check the [Use Pageant] and input your user name.</li>
     </ul>
 
+    <h3 id="username_input">Inputing Username</h3>
+	<p>
+	  When this dialog is displayed,
+	  username was entered according the <a href="../menu/setup-sshauth.html#DefaultUserName">setting</a>.
+	</p>
+	<p>
+	  In addition, when the username is entered, or when the focus is moved from the input field after inputing username,
+	  the server is accessed according to the <a href="../menu/setup-sshauth.html#CheckAuthListFirst">setting</a>.
+	</p>
+	<p>
+	  You can select an option by pushing the button next to the username box.
+	  If username is empty, tab key moves focus to this button.
+	  If username was enterd, tab key moves focus to password and passphrase input box.
+	  <dl>
+		<dt>Paste Windows usename</dt>
+		<dd>Windows username was entered</dd>
+	  </dl>
+	</p>
+
     <h3 id="passwd_input">Inputing Password and Passphrase</h3>
     <p>
       The password and passphrase input box differs from normal dialog box.
@@ -74,7 +94,27 @@
       <li>Control character(0x01 - 0x1F) can be inputted by Control + A - Z, [, \, ], ^ and _.</li>
       <li>Control + V can not be used because the key equals SYN (0x16). Please use Shift + Insert combination for pasting.</li>
     </ul>
+	<p>
+	  You can select an option by pushing the button next to the username field.
+	  <dl>
+		<dt>Paste from clipboard</dt>
+		<dd>Paste from clipboard to password input box</dd>
 
+		<dt>Paste from clipboard and clear clipboard</dt>
+		<dd>Paste from clipboard to password input box, And clear clipboard</dd>
+
+		<dt>Use control charactors</dt>
+		<dd>If checked, you can enter control characters,
+		  but you can not perform operations such as paste clipboard paste with Control + V.
+		  If it is not checked, you can not enter control characters,
+		  but you can perform operations such as paste the clipboard with Control + V.
+		</dd>
+
+		<dt>Show passphrase</dt>
+		<dd>You can choose to display the passphrase or not</dd>
+	  </dl>
+    </p>
+
     <h2 id="securitywarning">Security Warning</h2>
 
     <h3 id="known_hosts">ssh_known_hosts file</h3>

Modified: branches/cmake/doc/en/teraterm.hhc
===================================================================
--- branches/cmake/doc/en/teraterm.hhc	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/doc/en/teraterm.hhc	2019-05-19 15:06:12 UTC (rev 7694)
@@ -583,9 +583,20 @@
 		<UL>
 			<LI> <OBJECT type="text/sitemap">
 				<param name="Name" value="Build with CMake build system (experimental)">
-				<param name="Local" value="html\reference\build_with_cmake.html">
 				<param name="ImageNumber" value="11">
 				</OBJECT>
+			<UL>
+				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="library">
+					<param name="Local" value="html\reference\build_library_with_cmake.html">
+					<param name="ImageNumber" value="11">
+				  </OBJECT>
+				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="Tera Term">
+					<param name="Local" value="html\reference\build_with_cmake.html">
+					<param name="ImageNumber" value="11">
+				  </OBJECT>
+			</UL>
 		</UL>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Source Code Overview">

Modified: branches/cmake/doc/ja/html/about/history.html
===================================================================
--- branches/cmake/doc/ja/html/about/history.html	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/doc/ja/html/about/history.html	2019-05-19 15:06:12 UTC (rev 7694)
@@ -33,6 +33,13 @@
 
 <h3 id="teraterm_4.103">2019.xx.xx (Ver 4.103)</h3>
 <ul class="history">
+  <li>\x95ύX
+    <ul>
+      <li>\x8E\x8E\x8C\xB1\x93I\x82ɍ\x82DPI\x91Ή\x9E\x81B\x83f\x83t\x83H\x83\x8B\x83g\x82\xCDdisable\x81Bteraterm.ini\x82\xCC[Tera Term]\x83Z\x83N\x83V\x83\x87\x83\x93\x82\xC9DPIAware=1\x82Ƃ\xB7\x82\xE9\x82ƗL\x8C\xF8\x82ƂȂ\xE9\x81BWindows 10 Version 1703\x88ȍ~\x82̂ݗL\x8C\xF8\x81B</li>
+      <li>\x83_\x83C\x83A\x83\x8D\x83O\x82̃t\x83H\x83\x93\x83g\x82\xF0\x90ݒ\xE8\x82ł\xAB\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD(<a href="../menu/setup-font.html">[Setup]/[Font])</a>\x81B\x83t\x83H\x83\x93\x83g\x83T\x83u\x83\x81\x83j\x83\x85\x81[\x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B\x83_\x83C\x83A\x83\x8D\x83O\x83t\x83H\x83\x93\x83g\x82̃f\x83t\x83H\x83\x8B\x83g\x82͏]\x97\x88\x82Ɠ\xAF\x82\xB6\x83t\x83H\x83\x93\x83g\x81B</li>
+      <li>\x8Cr\x90\xFC\x82\xF0\x95\\x8E\xA6\x82\xB7\x82邽\x82߂̃t\x83H\x83\x93\x83g\x83t\x83@\x83C\x83\x8B(TSPECIAL1.TTF)\x82\xAA\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x8Fꍇ\x81Attermpro.exe\x82Ɠ\xAF\x88\xEA\x83t\x83H\x83\x8B\x83_\x82\xA9\x82\xE7\x93ǂݍ\x9E\x82ނ悤\x82ɂ\xB5\x82\xBD\x81B</li>
+    </ul>
+  </li>
   <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>

Modified: branches/cmake/doc/ja/html/image/Authentication.png
===================================================================
(Binary files differ)

Modified: branches/cmake/doc/ja/html/index.html
===================================================================
--- branches/cmake/doc/ja/html/index.html	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/doc/ja/html/index.html	2019-05-19 15:06:12 UTC (rev 7694)
@@ -145,7 +145,11 @@
  <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>
+   <LI>CMake\x83r\x83\x8B\x83h\x83V\x83X\x83e\x83\x80\x82\xF0\x8Eg\x97p\x82\xB5\x82\xBD\x83r\x83\x8B\x83h(experimental)</LI>
+   <UL>
+	 <LI><A HREF="reference/build_library_with_cmake.html">\x83\x89\x83C\x83u\x83\x89\x83\x8A\x82̃r\x83\x8B\x83h</A></LI>
+	 <LI><A HREF="reference/build_with_cmake.html">Tera Term\x82̃r\x83\x8B\x83h</A></LI>
+   </UL>
  </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/menu/setup-font.html
===================================================================
--- branches/cmake/doc/ja/html/menu/setup-font.html	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/doc/ja/html/menu/setup-font.html	2019-05-19 15:06:12 UTC (rev 7694)
@@ -11,7 +11,7 @@
   <body>
     <h1>Font ([Setup] \x83\x81\x83j\x83\x85\x81[)</h1>
     <p>
-      \x83t\x83H\x83\x93\x83g\x82\xF0\x95ύX\x82\xB5\x82܂\xB7\x81B
+      VT \x83E\x83B\x83\x93\x83h\x83E\x82ƃ_\x83C\x83A\x83\x8D\x83O\x82̃t\x83H\x83\x93\x83g\x82\xF0\x8Ae\x81X\x95ύX\x82\xB5\x82܂\xB7\x81B
     </p>
 
     <h2>\x83t\x83H\x83\x93\x83g \x83_\x83C\x83A\x83\x8D\x83O\x83{\x83b\x83N\x83X</h2>
@@ -54,6 +54,10 @@
 	<a href="setup-additional.html">Additional settings \x83_\x83C\x83A\x83\x8D\x83O</a> \x82\xCC Visual \x83^\x83u\x82ɂ\xA0\x82\xE9
 	<a href="setup-additional.html#FontQuality">Font quality</a> \x82Ńt\x83H\x83\x93\x83g\x82̕i\x8E\xBF\x82\xF0\x91I\x91\xF0\x82\xB7\x82邱\x82Ƃ\xAA\x82ł\xAB\x82܂\xB7\x81B
       </li>
+      <li>
+	\x83_\x83C\x83A\x83\x8D\x83O\x83t\x83H\x83\x93\x83g\x82ɋɒ[\x82ɑ傫\x82ȃT\x83C\x83Y\x82≡\x95\x9D\x82̍L\x82\xA2\x83t\x83H\x83\x93\x83g\x82\xF0\x90ݒ肷\x82\xE9\x82ƁA
+	\x95\\x8E\xA6\x82\xB3\x82\xEA\x82镶\x8E\x9A\x82\xAA\x8C\x87\x82\xAF\x82\xBD\x82\xE8\x81A\x83_\x83C\x83A\x83\x8D\x83O\x82\xAA\x89\xE6\x96ʂ\xA9\x82\xE7\x82͂ݏo\x82\xB5\x82\xC4[ok]\x83{\x83^\x83\x93\x93\x99\x82\xAA\x89\x9F\x82\xB9\x82Ȃ\xAD\x82Ȃ邱\x82Ƃ\xAA\x82\xA0\x82\xE8\x82܂\xB7\x81B
+      </li>
     </ul>
   </body>
 </html>

Modified: branches/cmake/doc/ja/html/menu/setup-sshauth.html
===================================================================
--- branches/cmake/doc/ja/html/menu/setup-sshauth.html	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/doc/ja/html/menu/setup-sshauth.html	2019-05-19 15:06:12 UTC (rev 7694)
@@ -15,90 +15,91 @@
     <dl>
       <dt id="DefaultUserName">User name</dt>
       <dd>
-        SSH \x90ڑ\xB1\x82ŗp\x82\xA2\x82郆\x81[\x83U\x96\xBC\x82\xF0\x8Ew\x92肵\x82܂\xB7\x81B
+		\x83\x86\x81[\x83U\x96\xBC\x82̎w\x92肪\x82Ȃ\xA2\x82Ƃ\xAB\x82Ƀf\x83t\x83H\x83\x8B\x83g\x82Ŏg\x97p\x82\xB7\x82郆\x81[\x83U\x96\xBC\x82\xF0\x8Ew\x92肵\x82܂\xB7\x81B<br />
+		<a href="#CheckAuthListFirst">Check the supported authentication methods before login</a>\x82\xAA\x83`\x83F\x83b\x83N\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x82ƁA\x83\x86\x81[\x83U\x96\xBC\x82͕ύX\x82ł\xAB\x82Ȃ\xAD\x82Ȃ\xE8\x82܂\xB7\x81B
+
+		<dl>
+		  <dt>\x93\xFC\x97͂\xB5\x82Ȃ\xA2</dt>
+		  <dd>
+			\x93\xFC\x97͂\xB5\x82܂\xB9\x82\xF1\x81B
+		  </dd>
+
+		  <dt>\x8E\x9F\x82̃\x86\x81[\x83U\x96\xBC\x82\xF0\x8Eg\x97p</dt>
+		  <dd>
+			\x83G\x83f\x83B\x83b\x83g\x83{\x83b\x83N\x83X\x82ɓ\xFC\x97͂\xB3\x82ꂽ\x83\x86\x81[\x83U\x96\xBC\x82\xF0\x8Eg\x97p\x82\xB5\x82܂\xB7\x81B<br />
+			\x82\xBD\x82\xBE\x82\xB5\x81A\x83G\x83f\x83B\x83b\x83g\x83{\x83b\x83N\x83X\x82\xAA\x8B\xF3\x82̏ꍇ\x82͉\xBD\x82\xE0\x93\xFC\x97͂\xB3\x82\xEA\x82܂\xB9\x82\xF1
+		  </dd>
+
+		  <dt>\x83V\x83X\x83e\x83\x80\x83\x86\x81[\x83U\x96\xBC\x82\xF0\x8Eg\x97p</dt>
+		  <dd>
+			\x83V\x83X\x83e\x83\x80\x83\x86\x81[\x83U\x96\xBC(Windows\x82̃\x8D\x83O\x83I\x83\x93\x83\x86\x81[\x83U)\x82\xF0\x8Eg\x97p\x82\xB5\x82܂\xB7\x81B
+		  </dd>
+		</dl>
+
       </dd>
 
       <dt id="DefaultAuthMethod">\x83f\x83t\x83H\x83\x8B\x83g\x82Ŏg\x97p\x82\xB7\x82\xE9\x94F\x8Fؕ\xFB\x96@\x82\xF0\x90ݒ肵\x82܂\xB7\x81B</dt>
       <dd>
 
-        <ul>
-          <li>
+        <dl>
+          <dt>Use plain password to log in</dt>
+          <dd>
+            \x83p\x83X\x83\x8F\x81[\x83h\x94F\x8F؂\xF0\x97p\x82\xA2\x82\xE9\x8Fꍇ\x82Ɏw\x92肵\x82܂\xB7\x81B
+          </dd>
+          
+          <dt>Use RSA/DSA/ECDSA/ED25519 key to login</dt>
+          <dd>
+            \x82\xA0\x82炩\x82\xB6\x82ߍ쐬\x82\xB5\x82\xBD RSA/DSA/ECDSA/ED25519 \x8C\xAE\x82\xF0\x97p\x82\xA2\x82\xBD\x94F\x8Fؕ\xFB\x96@\x82\xF0\x91I\x91\xF0\x82\xB5\x82܂\xB7\x81B
             <dl>
-              <dt>Use plain password to log in</dt>
+              <dt id="DefaultRSAPrivateKeyFile">Private key file</dt>
               <dd>
-                \x83p\x83X\x83\x8F\x81[\x83h\x94F\x8F؂\xF0\x97p\x82\xA2\x82\xE9\x8Fꍇ\x82Ɏw\x92肵\x82܂\xB7\x81B
+                OpenSSH \x8C`\x8E\xAE\x82̔閧\x8C\xAE\x83t\x83@\x83C\x83\x8B\x82\xF0\x8Ew\x92肵\x82܂\xB7\x81B<br />
+                TTSSH 2.63(Tera Term 4.76) \x88ȍ~\x82ł\xCD PuTTY \x8C`\x8E\xAE\x81ESECSH(ssh.com) \x8C`\x8E\xAE\x82\xCC SSH2 \x94閧\x8C\xAE\x82ɂ\xE0\x91Ή\x9E\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B
               </dd>
             </dl>
-          </li>
-
-          <li>
+          </dd>
+          
+          <dt>Use rhost to login (SSH1)</dt>
+          <dd>
+            \x83z\x83X\x83g\x82̐ݒ\xE8\x82\xC5 rhost \x82\xAA\x97\x98\x97p\x82ł\xAB\x82\xE9\x8Fꍇ\x82ɑI\x91\xF0\x82\xB5\x82܂\xB7\x81B
             <dl>
-              <dt>Use RSA/DSA/ECDSA/ED25519 key to login</dt>
+              <dt id="DefaultRhostsLocalUserName">Local user name</dt>
               <dd>
-                \x82\xA0\x82炩\x82\xB6\x82ߍ쐬\x82\xB5\x82\xBD RSA/DSA/ECDSA/ED25519 \x8C\xAE\x82\xF0\x97p\x82\xA2\x82\xBD\x94F\x8Fؕ\xFB\x96@\x82\xF0\x91I\x91\xF0\x82\xB5\x82܂\xB7\x81B
-                <dl>
-                  <dt id="DefaultRSAPrivateKeyFile">Private key file<dt>
-                  <dd>
-                    OpenSSH \x8C`\x8E\xAE\x82̔閧\x8C\xAE\x83t\x83@\x83C\x83\x8B\x82\xF0\x8Ew\x92肵\x82܂\xB7\x81B<br />
-                    TTSSH 2.63(Tera Term 4.76) \x88ȍ~\x82ł\xCD PuTTY \x8C`\x8E\xAE\x81ESECSH(ssh.com) \x8C`\x8E\xAE\x82\xCC SSH2 \x94閧\x8C\xAE\x82ɂ\xE0\x91Ή\x9E\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B
-                  </dd>
-                </dl>
+                \x83\x86\x81[\x83U\x96\xBC\x82\xF0\x8Ew\x92肵\x82܂\xB7\x81B
               </dd>
-            </dl>
-          </li>
-
-          <li>
-            <dl>
-              <dt>Use rhost to login (SSH1)</dt>
+              <dt id="DefaultRhostsHostPrivateKeyFile">Host private key file</dt>
               <dd>
-                \x83z\x83X\x83g\x82̐ݒ\xE8\x82\xC5 rhost \x82\xAA\x97\x98\x97p\x82ł\xAB\x82\xE9\x8Fꍇ\x82ɑI\x91\xF0\x82\xB5\x82܂\xB7\x81B
-                <dl>
-                  <dt id="DefaultRhostsLocalUserName">Local user name<dt>
-                  <dd>
-                    \x83\x86\x81[\x83U\x96\xBC\x82\xF0\x8Ew\x92肵\x82܂\xB7\x81B
-                  </dd>
-                  <dt id="DefaultRhostsHostPrivateKeyFile">Host private key file<dt>
-                  <dd>
-                    OpenSSH \x8C`\x8E\xAE\x82̔閧\x8C\xAE\x83t\x83@\x83C\x83\x8B\x82\xF0\x8Ew\x92肵\x82܂\xB7\x81B
-                  </dd>
-                </dl>
+                OpenSSH \x8C`\x8E\xAE\x82̔閧\x8C\xAE\x83t\x83@\x83C\x83\x8B\x82\xF0\x8Ew\x92肵\x82܂\xB7\x81B
               </dd>
             </dl>
-          </li>
-
-          <li>
+          </dd>
+          
+          <dt>Use SSH1:challenge/response(TIS) / SSH2:keyboard-interactive to log in</dt>
+          <dd>
             <dl>
-              <dt>Use SSH1:challenge/response(TIS) / SSH2:keyboard-interactive to log in</dt>
+              <dt>SSH1</dt>
               <dd>
-                <dl>
-                  <dt>SSH1</dt>
-                  <dd>
-                    \x83`\x83\x83\x83\x8C\x83\x93\x83W/\x83\x8C\x83X\x83|\x83\x93\x83X\x94F\x8F\xD8(TIS\x94F\x8F\xD8)\x82\xF0\x97p\x82\xA2\x82\xE9\x8Fꍇ\x82Ɏw\x92肵\x82܂\xB7\x81B
-                    \x83T\x81[\x83o\x82ɂ\xE6\x82\xC1\x82Ă\xCD S/Key \x94F\x8F؂ɂȂ\xE9\x8Fꍇ\x82\xAA\x82\xA0\x82\xE8\x82܂\xB7\x81B
-                  </dd>
-                  <dt>SSH2</dt>
-                  <dd>
-                    \x83L\x81[\x83{\x81[\x83h\x81E\x83C\x83\x93\x83^\x83\x89\x83N\x83e\x83B\x83u\x94F\x8F؂\xF0\x97p\x82\xA2\x82\xE9\x8Fꍇ\x82Ɏw\x92肵\x82܂\xB7\x81B
-                    FreeBSD \x93\x99\x82̃p\x83X\x83\x8F\x81[\x83h\x94F\x8F؂𖳌\xF8\x82ɐݒ肵\x82\xBD\x83T\x81[\x83o\x82ցA\x83p\x83X\x83\x8F\x81[\x83h\x82\xF0\x8Eg\x82\xC1\x82ă\x8D\x83O\x83C\x83\x93\x82\xB7\x82\xE9\x8Fꍇ\x82́A
-                    \x82\xB1\x82̔F\x8Fؕ\xFB\x8E\xAE\x82\xF0\x8Eg\x82\xA2\x82܂\xB7\x81B<br>
-                    \x82\xB1\x82̔F\x8Fؕ\xFB\x8E\xAE\x82ł́A\x93\xFC\x97͂\xB5\x82\xBD\x93\xE0\x97e\x82\xAA\x88Í\x86\x89\xBB\x82\xB3\x82ꂽ\x8F\xF3\x91ԂŃT\x81[\x83o\x82֑\x97\x82\xE7\x82\xEA\x82܂\xB7\x81B
-                    \x94F\x8F؂ׂ̈Ƀp\x83X\x83\x8F\x81[\x83h\x82\xF0\x93\xFC\x97͂\xB5\x82\xBD\x8Fꍇ\x82́A\x83p\x83X\x83\x8F\x81[\x83h\x94F\x8F؂Ɠ\xAF\x82\xB6\x82悤\x82ɁA
-                    \x88Í\x86\x89\xBB\x82\xB3\x82ꂽ\x83p\x83X\x83\x8F\x81[\x83h\x82\xAA\x92ʐM\x98H\x82𗬂\xEA\x82܂\xB7\x81B
-                  </dd>
-                </dl>
+                \x83`\x83\x83\x83\x8C\x83\x93\x83W/\x83\x8C\x83X\x83|\x83\x93\x83X\x94F\x8F\xD8(TIS\x94F\x8F\xD8)\x82\xF0\x97p\x82\xA2\x82\xE9\x8Fꍇ\x82Ɏw\x92肵\x82܂\xB7\x81B
+                \x83T\x81[\x83o\x82ɂ\xE6\x82\xC1\x82Ă\xCD S/Key \x94F\x8F؂ɂȂ\xE9\x8Fꍇ\x82\xAA\x82\xA0\x82\xE8\x82܂\xB7\x81B
               </dd>
-            </dl>
-          </li>
-
-          <li>
-            <dl>
-              <dt>Use Pageant</dt>
+              <dt>SSH2</dt>
               <dd>
-                Pageant \x82ƒʐM\x82\xB5\x82\xC4 RSA/DSA \x8C\xAE\x82\xF0\x97p\x82\xA2\x82\xBD\x94F\x8F؂\xF0\x82\xB7\x82\xE9\x8Fꍇ\x82Ɏw\x92肵\x82܂\xB7\x81B<br>
-                TTSSH \x82͔閧\x8C\xAE\x83t\x83@\x83C\x83\x8B\x82\xF0\x88\xB5\x82\xA2\x82܂\xB9\x82\xF1\x81B
+                \x83L\x81[\x83{\x81[\x83h\x81E\x83C\x83\x93\x83^\x83\x89\x83N\x83e\x83B\x83u\x94F\x8F؂\xF0\x97p\x82\xA2\x82\xE9\x8Fꍇ\x82Ɏw\x92肵\x82܂\xB7\x81B
+                FreeBSD \x93\x99\x82̃p\x83X\x83\x8F\x81[\x83h\x94F\x8F؂𖳌\xF8\x82ɐݒ肵\x82\xBD\x83T\x81[\x83o\x82ցA\x83p\x83X\x83\x8F\x81[\x83h\x82\xF0\x8Eg\x82\xC1\x82ă\x8D\x83O\x83C\x83\x93\x82\xB7\x82\xE9\x8Fꍇ\x82́A
+                \x82\xB1\x82̔F\x8Fؕ\xFB\x8E\xAE\x82\xF0\x8Eg\x82\xA2\x82܂\xB7\x81B<br>
+                \x82\xB1\x82̔F\x8Fؕ\xFB\x8E\xAE\x82ł́A\x93\xFC\x97͂\xB5\x82\xBD\x93\xE0\x97e\x82\xAA\x88Í\x86\x89\xBB\x82\xB3\x82ꂽ\x8F\xF3\x91ԂŃT\x81[\x83o\x82֑\x97\x82\xE7\x82\xEA\x82܂\xB7\x81B
+                \x94F\x8F؂ׂ̈Ƀp\x83X\x83\x8F\x81[\x83h\x82\xF0\x93\xFC\x97͂\xB5\x82\xBD\x8Fꍇ\x82́A\x83p\x83X\x83\x8F\x81[\x83h\x94F\x8F؂Ɠ\xAF\x82\xB6\x82悤\x82ɁA
+                \x88Í\x86\x89\xBB\x82\xB3\x82ꂽ\x83p\x83X\x83\x8F\x81[\x83h\x82\xAA\x92ʐM\x98H\x82𗬂\xEA\x82܂\xB7\x81B
               </dd>
             </dl>
-          </li>
+          </dd>
+          
+          <dt>Use Pageant</dt>
+          <dd>
+            Pageant \x82ƒʐM\x82\xB5\x82\xC4 RSA/DSA \x8C\xAE\x82\xF0\x97p\x82\xA2\x82\xBD\x94F\x8F؂\xF0\x82\xB7\x82\xE9\x8Fꍇ\x82Ɏw\x92肵\x82܂\xB7\x81B<br>
+            TTSSH \x82͔閧\x8C\xAE\x83t\x83@\x83C\x83\x8B\x82\xF0\x88\xB5\x82\xA2\x82܂\xB9\x82\xF1\x81B
+          </dd>
+        </dl>
 
       </dd>
 

Added: branches/cmake/doc/ja/html/reference/build_library_with_cmake.md
===================================================================
--- branches/cmake/doc/ja/html/reference/build_library_with_cmake.md	                        (rev 0)
+++ branches/cmake/doc/ja/html/reference/build_library_with_cmake.md	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,98 @@
+
+# libsフォルダ
+
+- Tera Term のビルドに利用する外部のライブラリを置いておくためのフォルダ
+- 各コンパイラ向けにソース/ライブラリ/実行ファイルを置いておく
+- ライブラリはあらかじめ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,(clang),perlが必要
+
+# ビルド手順
+
+必要なアーカイブを自動的にダウンロードするので、
+インターネットが利用できる環境でビルドする必要がある
+
+## Visual Studioの場合
+
+### batファイルを使用する場合
+
+buildall_cmake.bat を実行して使用する Visual Studioを選ぶ
+
+    1. Visual Studio 16 2019
+    2. Visual Studio 15 2017
+    3. Visual Studio 14 2015
+    4. Visual Studio 12 2013
+    5. Visual Studio 11 2012
+    6. Visual Studio 10 2010
+    7. Visual Studio 9 2008
+    8. Visual Studio 8 2005
+    select no
+
+VS2005を選択した場合、
+このバッチファイルから cmake 3.11.4 をダウンロードして `libs\cmake-3.11.4-win32-x86` に
+インストールできます。
+
+### cmakeを使用する場合
+
+Visual Studio 2019 x86 の場合
+
+    cmake -DCMAKE_GENERATOR="Visual Studio 16 2019" -DARCHITECTURE=Win32 -P buildall.cmake
+
+Visual Studio 2017 x86 の場合
+
+    cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -P buildall.cmake
+
+Visual Studio 2017 x64 の場合
+
+    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}/` などの下でビルドされる
+- 再ビルドするときは、あらかじめ削除すること
+- ビルド後、参照する必要がなければ削除できる

Modified: branches/cmake/doc/ja/html/reference/build_with_cmake.md
===================================================================
--- branches/cmake/doc/ja/html/reference/build_with_cmake.md	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/doc/ja/html/reference/build_with_cmake.md	2019-05-19 15:06:12 UTC (rev 7694)
@@ -6,21 +6,20 @@
 ## cmakeのバージョン
 
 - Visual Studio 2005 をサポートしている cmake の最後のバージョンは 3.11.4 です
-- Visual Studio 2005 Express では ttpmacro.exe をビルドすることができません
 - Visual Studio 2005 (Expressも含む)以外を使用する場合は特に制限はありません
-- Visual Studio 2017 インストーラーで、オプションを選べば cmake をインストールできます
+- Visual Studio 2017,2019 インストーラーで、オプションを選べば cmake をインストールできます
+- cmake 3.14から Visual Studio 2019 をサポートしています
 
 ## MinGW (very experimental)
 
 - MinGW を使用してバイナリを生成することができます
 - 実験的位置づけです
-- MinGW では ttpmacro.exe をビルドすることができません
 
 ## ライブラリのビルド
 
 - teraterm が使用するライブラリをビルドして準備しておきます
-- `lib/build_library_with_cmake.md` を参照してください
-- ライブラリは `develop.txt` を参照してください
+- ビルド方法は [`build_library_with_cmake`](<build_library_with_cmake.html>) を参照してください
+- ライブラリについては [`develop.txt`](<develop.txt>) を参照してください
 
 ## teratermのビルド
 
@@ -37,7 +36,10 @@
 - 生成された sln ファイルから起動したVisual Studioでビルドすると
   CMakeLists.txt を変更を検出してプロジェクトファイルの再生成を自動で行うので
   sln ファイルの生成を手動で行うのは最初の1回だけです
+- Visual Studio 2019 + cmake のとき、`-A` オプションが必要です
 
+    cmake.exe .. -G "Visual Studio 16 2019" -A Win32
+
 ## teratermのビルド(MinGW)
 
 MinGWので使用できるcmakeを使って、

Modified: branches/cmake/doc/ja/html/reference/develop.txt
===================================================================
--- branches/cmake/doc/ja/html/reference/develop.txt	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/doc/ja/html/reference/develop.txt	2019-05-19 15:06:12 UTC (rev 7694)
@@ -10,6 +10,8 @@
        \x97\xE1: INCLUDE "C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Include"
            LIB     "C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Lib"
 - \x83T\x83|\x81[\x83g\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x83R\x83\x93\x83p\x83C\x83\x89
+-- Visual Studio 2005 Express Edition
+   \x92\x8D: Tera Term 4.103\x82\xA9\x82\xE7\x91Ή\x9E\x82\xB5\x82܂\xB5\x82\xBD\x81B
 -- Visual Studio 2008 SP1 (Standard Edition \x88ȏ\xE3)
    \x92\x8D: \x83R\x83\x93\x83p\x83C\x83\x8B\x82\xB3\x82ꂽ\x8E\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xCD Windows NT 4.0, 95, 98, Me \x82œ\xAE\x82\xAB\x82܂\xB9\x82\xF1\x81B
 -- Visual Studio 2010 SP1 (Professional Edition \x88ȏ\xE3)

Modified: branches/cmake/doc/ja/html/reference/sourcecode.html
===================================================================
--- branches/cmake/doc/ja/html/reference/sourcecode.html	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/doc/ja/html/reference/sourcecode.html	2019-05-19 15:06:12 UTC (rev 7694)
@@ -435,7 +435,7 @@
 	char tmp[1024];
 	va_list arg;
 	va_start(arg, fmt);
-	_vsnprintf(tmp, sizeof(tmp), fmt, arg);
+	_vsnprintf_s(tmp, sizeof(tmp), _TRUNCATE, fmt, arg);
 	OutputDebugString(tmp);
 }
 </pre>

Modified: branches/cmake/doc/ja/html/setup/teraterm-ini.html
===================================================================
--- branches/cmake/doc/ja/html/setup/teraterm-ini.html	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/doc/ja/html/setup/teraterm-ini.html	2019-05-19 15:06:12 UTC (rev 7694)
@@ -494,6 +494,12 @@
 		<td></td>
 	</tr>
 	<tr>
+		<td id="DlgFont"><a href="../menu/setup-font.html">DlgFont</a></td>
+		<td style="width:250px;"></td>
+		<td style="width:250px;"><-</td>
+		<td></td>
+	</tr>
+	<tr>
 		<td id="EnableANSIColor"><a href="../menu/setup-additional.html#EnableANSIColor">EnableANSIColor</a></td>
 		<td style="width:250px;">on</td>
 		<td style="width:250px;"><-</td>
@@ -1627,6 +1633,12 @@
 		<td></td>
 	</tr>
 	<tr>
+		<td id="DefaultUserType"><a href="../menu/setup-sshauth.html#DefaultUserType">DefaultUserType</a></td>
+		<td style="width:250px;">1</td>
+		<td style="width:250px;"><-</td>
+		<td></td>
+	</tr>
+	<tr>
 		<td id="DisablePopupMessage">DisablePopupMessage</td>
 		<td style="width:250px;">0</td>
 		<td style="width:250px;"><-</td>

Modified: branches/cmake/doc/ja/html/usage/ssh.html
===================================================================
--- branches/cmake/doc/ja/html/usage/ssh.html	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/doc/ja/html/usage/ssh.html	2019-05-19 15:06:12 UTC (rev 7694)
@@ -3,7 +3,7 @@
 <html>
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
-    <TITLE>SSH \x90ڑ\xB1</title>
+    <title>SSH \x90ڑ\xB1</title>
     <META http-equiv="Content-Style-Type" content="text/css">
     <link rel="stylesheet" href="../style.css" type="text/css">
   </head>
@@ -48,7 +48,8 @@
     </p>
 
     <p id="ssh_auth_dialog">
-      \x90ڑ\xB1\x82\xB7\x82\xE9\x82ƁA\x8D\xA1\x93x\x82͔F\x8Fؕ\xFB\x96@\x82\xF0\x91I\x91\xF0\x82\xB7\x82\xE9\x83_\x83C\x83A\x83\x8D\x83O\x82\xAA\x8C\xBB\x82\xEA\x82܂\xB7\x81B
+      \x90ڑ\xB1\x82\xB7\x82\xE9\x82ƁA\x8D\xA1\x93x\x82͔F\x8Fؕ\xFB\x96@\x82\xF0\x91I\x91\xF0\x82\xB7\x82\xE9\x83_\x83C\x83A\x83\x8D\x83O\x82\xAA\x8C\xBB\x82\xEA\x82܂\xB7\x81B<br />
+	  \x83f\x83t\x83H\x83\x8B\x83g\x92l\x82\xF0<a href="../menu/setup-sshauth.html">"TTSSH: Authentication Setup" \x83_\x83C\x83A\x83\x8D\x83O\x83{\x83b\x83N\x83X</a>\x82Őݒ肷\x82邱\x82Ƃ\xAA\x82ł\xAB\x82܂\xB7\x81B
     </p>
     <div class="img"><img src="../image/Authentication.png" alt="\x94F\x8Fؕ\xFB\x96@"></div>
     <p>
@@ -65,15 +66,57 @@
       <li>Pageant \x82\xF0\x97p\x82\xA2\x82ĔF\x8F؂\xB7\x82\xE9\x8Fꍇ\x82́uUse Pageant\x81v\x82Ƀ`\x83F\x83b\x83N\x82\xF0\x82‚\xAF\x81A\x83\x86\x81[\x83U\x96\xBC\x82\xF0\x93\xFC\x97͂\xB5\x82܂\xB7\x81B</li>
     </ul>
 
+    <h3 id="username_input">\x83\x86\x81[\x83U\x81[\x96\xBC\x93\xFC\x97\xCD</h3>
+	<p>
+	  \x82\xB1\x82̃_\x83C\x83A\x83\x8D\x83O\x82\xAA\x95\\x8E\xA6\x82\xB3\x82ꂽ\x82Ƃ\xAB\x82\xC9
+	  <a href="../menu/setup-sshauth.html#DefaultUserName">\x90ݒ\xE8</a>\x82ɂ\xE6\x82\xC1\x82Ă\xA0\x82炩\x82\xB6\x82\xDF
+	  \x83\x86\x81[\x83U\x81[\x96\xBC\x82\xAA\x93\xFC\x97͂\xB3\x82\xEA\x82܂\xB7\x81B
+	</p>
+	<p>
+	  \x82܂\xBD\x81A
+	  \x83\x86\x81[\x83U\x81[\x96\xBC\x82\xAA\x93\xFC\x97͂\xB3\x82\xEA\x82Ă\xA2\x82\xBD\x8E\x9E\x81A\x82܂\xBD\x82́A\x83\x86\x81[\x83U\x81[\x96\xBC\x82\xF0\x93\xFC\x97͂\xB5\x82ē\xFC\x97͗\x93\x82\xA9\x82\xE7\x83t\x83H\x81[\x83J\x83X\x82\xAA\x88ړ\xAE\x82\xB5\x82\xBD\x8E\x9E\x81A
+	  <a href="../menu/setup-sshauth.html#CheckAuthListFirst">\x90ݒ\xE8</a>\x82ɂ\xE6\x82\xC1\x82ăT\x81[\x83o\x81[\x82փA\x83N\x83Z\x83X\x82\xB5\x82܂\xB7\x81B
+	</p>
+	<p>
+	  \x83\x86\x81[\x83U\x81[\x96\xBC\x82̓\xFC\x97͗\x93\x82̉\xA1\x82̃{\x83^\x83\x93\x82\xF0\x89\x9F\x82\xB7\x82ƃI\x83v\x83V\x83\x87\x83\x93\x82\xF0\x91I\x91\xF0\x82ł\xAB\x82܂\xB7\x81B
+	  \x83\x86\x81[\x83U\x81[\x96\xBC\x82\xAA\x93\xFC\x97͂\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x8Fꍇ\x82́Atab\x83L\x81[\x82ł\xB1\x82̃{\x83^\x83\x93\x82Ƀt\x83H\x81[\x83J\x83X\x82\xAA\x88ړ\xAE\x82\xB5\x82܂\xB7\x81B
+	  \x83\x86\x81[\x83U\x81[\x96\xBC\x82\xAA\x93\xFC\x97͂\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x8Fꍇ\x82́Atab\x83L\x81[\x82Ńp\x83X\x83\x8F\x81[\x83h / \x83p\x83X\x83t\x83\x8C\x81[\x83Y\x82̓\xFC\x97͗\x93\x82\xC9
+	  \x83t\x83H\x81[\x83J\x83X\x82\xAA\x88ړ\xAE\x82\xB5\x82܂\xB7\x81B
+	  <dl>
+		<dt>Paste Windows usename</dt>
+		<dd>Windows\x82̃\x86\x81[\x83U\x81[\x96\xBC\x82\xF0\x93\xFC\x97͂\xB5\x82܂\xB7\x81B</dd>
+	  </dl>
+	</p>
+
     <h3 id="passwd_input">\x83p\x83X\x83\x8F\x81[\x83h / \x83p\x83X\x83t\x83\x8C\x81[\x83Y\x93\xFC\x97\xCD</h3>
     <p>
       \x83p\x83X\x83\x8F\x81[\x83h / \x83p\x83X\x83t\x83\x8C\x81[\x83Y\x82̓\xFC\x97͗\x93\x82́A\x92ʏ\xED\x82̃_\x83C\x83A\x83\x8D\x83O\x82ƈႢ\x88ȉ\xBA\x82̂悤\x82ȓ\xAE\x8D\xEC\x82ƂȂ\xE8\x82܂\xB7\x81B
     </p>
     <ul>
-      <li>Control + A \x81` Z, [, \, ], ^, _ \x82Ő\xA7\x8C䕶\x8E\x9A (0x01 - 0x1F) \x82\xF0\x93\xFC\x97͂ł\xAB\x82܂\xB7\x81B</li>
+      <li>Control + A \x81` Z, [, \, ], ^, _ \x82Ő\xA7\x8C䕶\x8E\x9A (0x01 - 0x1F) \x82\xF0\x93\xFC\x97͂ł\xAB\x82܂\xB7\x81B\x82\xB1\x82̓\xAE\x8D삪\x83f\x83t\x83H\x83\x8B\x83g\x82ł\xB7</li>
       <li>Control + V \x82\xCD SYN (0x16) \x82̓\xFC\x97͂ƂȂ\xE8\x82܂\xB7\x82̂ŁA\x93\\x82\xE8\x95t\x82\xAF\x82ɂ͗\x98\x97p\x82ł\xAB\x82܂\xB9\x82\xF1\x81B\x93\\x82\xE8\x95t\x82\xAF\x82\xF0\x8Ds\x82\xA4\x82ɂ\xCD Shift + Insert \x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B</li>
     </ul>
+	<p>
+	  \x93\xFC\x97͗\x93\x82̉\xA1\x82̃{\x83^\x83\x93\x82\xF0\x89\x9F\x82\xB7\x82ƃI\x83v\x83V\x83\x87\x83\x93\x82\xF0\x91I\x91\xF0\x82ł\xAB\x82܂\xB7\x81B
+	  <dl>
+		<dt>Paste from clipboard</dt>
+		<dd>\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82\xA9\x82\xE7\x83p\x83X\x83t\x83\x8C\x81[\x83Y\x82\xF0\x83y\x81[\x83X\x83g\x82\xB5\x82܂\xB7\x81B</dd>
 
+		<dt>Paste from clipboard and clear clipboard</dt>
+		<dd>\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82\xA9\x82\xE7\x83p\x83X\x83t\x83\x8C\x81[\x83Y\x82\xF0\x83y\x81[\x83X\x83g\x82\xB5\x82ăN\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82\xF0\x8B\xF3\x82ɂ\xB5\x82܂\xB7\x81B</dd>
+
+		<dt>Use control charactors</dt>
+		<dd>\x83`\x83F\x83b\x83N\x82\xAA\x93\xFC\x82\xC1\x82Ă\xA2\x82\xE9\x82Ɛ\xA7\x8C䕶\x8E\x9A\x82\xF0\x93\xFC\x97͂\xB7\x82邱\x82Ƃ\xAA\x82ł\xAB\x82܂\xB7\x82\xAA\x81A
+		  Control + V\x82ŃN\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82̃y\x81[\x83X\x83g\x93\x99\x82̑\x80\x8D\xEC\x82͂ł\xAB\x82܂\xB9\x82\xF1\x81B
+		  \x83`\x83F\x83b\x83N\x82\xAA\x93\xFC\x82\xC1\x82Ă\xA2\x82Ȃ\xA2\x82Ɛ\xA7\x8C䕶\x8E\x9A\x82\xF0\x93\xFC\x97͂ł\xAB\x82܂\xB9\x82񂪁A
+		  Control + V\x82ŃN\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82̃y\x81[\x83X\x83g\x93\x99\x82̑\x80\x8D삪\x89”\\x82ł\xB7\x81B
+		</dd>
+
+		<dt>Show passphrase</dt>
+		<dd>\x83p\x83X\x83t\x83\x8C\x81[\x83Y\x82\xF0\x95\\x8E\xA6\x82\xB7\x82邩\x81A\x95\x9A\x8E\x9A\x82ɂ\xB7\x82邩\x91I\x91\xF0\x82ł\xAB\x82܂\xB7</dd>
+	  </dl>
+    </p>
+
     <h2 id="securitywarning">\x83Z\x83L\x83\x85\x83\x8A\x83e\x83B\x8Cx\x8D\x90</h2>
 
     <h3 id="known_hosts">ssh_known_hosts \x83t\x83@\x83C\x83\x8B</h3>

Modified: branches/cmake/doc/ja/teraterm.hhc
===================================================================
--- branches/cmake/doc/ja/teraterm.hhc	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/doc/ja/teraterm.hhc	2019-05-19 15:06:12 UTC (rev 7694)
@@ -592,9 +592,20 @@
 		<UL>
 			<LI> <OBJECT type="text/sitemap">
 				<param name="Name" value="CMake\x83r\x83\x8B\x83h\x83V\x83X\x83e\x83\x80\x82\xF0\x8Eg\x97p\x82\xB5\x82\xBD\x83r\x83\x8B\x83h(experimental)">
-				<param name="Local" value="html\reference\build_with_cmake.html">
 				<param name="ImageNumber" value="11">
 				</OBJECT>
+			<UL>
+				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="\x83\x89\x83C\x83u\x83\x89\x83\x8A\x82̃r\x83\x8B\x83h">
+					<param name="Local" value="html\reference\build_library_with_cmake.html">
+					<param name="ImageNumber" value="11">
+				  </OBJECT>
+				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="Tera Term\x82̃r\x83\x8B\x83h">
+					<param name="Local" value="html\reference\build_with_cmake.html">
+					<param name="ImageNumber" value="11">
+				  </OBJECT>
+			</UL>
 		</UL>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="\x83\\x81[\x83X\x83R\x81[\x83h\x89\xF0\x90\xE0">

Modified: branches/cmake/installer/check_sjis_code.pl
===================================================================
--- branches/cmake/installer/check_sjis_code.pl	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/installer/check_sjis_code.pl	2019-05-19 15:06:12 UTC (rev 7694)
@@ -84,8 +84,10 @@
 #			printf "%s\n", $enc->name;
 			if ($enc->name !~ /ascii/) {
 #				printf "%s\n", $enc->name;
-				print "$filename:$no: $1\n";
-				print "$line\n";
+				if (!check_skipped_line($line)) {
+					print "$filename:$no: $1\n";
+					print "$line\n";
+				}
 			}
 		}
 #		if ($line =~ /([\xA1-\xDF]|[\x81-\x9F\xE0-\xEF][\x40-\x7E\x80-\xFC])/) {
@@ -97,3 +99,19 @@
 	close(FP);
 }
 
+# \x8Ds\x82\xAA\x91ΏۊO\x82\xA9\x82ǂ\xA4\x82\xA9\x82\xF0\x83`\x83F\x83b\x83N\x82\xB7\x82\xE9
+#   true: \x91ΏۊO\x82ł\xA0\x82\xE9
+#   false: \x91ΏۊO\x82ł͂Ȃ\xA2 
+sub check_skipped_line {
+	my($line) = shift;
+	my($pos);
+	
+#	print "[$line]";
+	
+	# UTF-8 BOM
+	$pos = index($line, pack("C3", 0xef, 0xbb, 0xbf));
+#	print "$pos\n";
+	return 1 if ($pos != -1);	
+
+	return 0;
+}

Modified: branches/cmake/installer/release/lang/English.lng
===================================================================
--- branches/cmake/installer/release/lang/English.lng	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/installer/release/lang/English.lng	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2019-02-28)
+; Updated by TeraTerm Project (2019-04-24)
 
 [Tera Term]
 ;DLG_SYSTEM_FONT=System,14,0
@@ -51,7 +51,9 @@
 MENU_SETUP=&Setup
 MENU_SETUP_TERMINAL=&Terminal...
 MENU_SETUP_WINDOW=&Window...
+MENU_SETUP_FONT_SUBMENU=&Font
 MENU_SETUP_FONT=&Font...
+MENU_SETUP_DIALOG_FONT=&Dialog font...
 MENU_SETUP_KEYBOARD=&Keyboard...
 MENU_SETUP_SERIALPORT=S&erial port...
 MENU_SETUP_TCPIP=T&CP/IP...
@@ -579,7 +581,12 @@
 DLG_AUTH_BANNER2=Authentication required.
 DLG_AUTH_BANNER2_FAILED=Authentication failed. Please retry.
 DLG_AUTH_USERNAME=User &name:
+DLG_AUTH_PASTE_WINDOWS_USERNAME=Paste &Windows Username
 DLG_AUTH_PASSWORD=&Passphrase:
+DLG_AUTH_PASTE_CLIPBOARD=Paste from &clipboard
+DLG_AUTH_CLEAR_CLIPBOARD=Paste from clipboard and cl&ear clipboard
+DLG_AUTH_USE_CONTORL_CHARACTERS=Use control charac&ters
+DLG_AUTH_SHOW_PASSPHRASE=&Show passphrase
 DLG_AUTH_REMEMBER_PASSWORD=Remember password on &memory
 DLG_AUTH_FWDAGENT=F&orward agent
 DLG_AUTH_METHOD_PASSWORD=Use p&lain password to log in
@@ -591,6 +598,8 @@
 DLG_AUTH_PRIVATEKEY=Private &key file:
 DLG_AUTH_LOCALUSER=Local &user name:
 DLG_AUTH_HOST_PRIVATEKEY=Host private key &file:
+DLG_AUTH_TIP_CONTROL_CODE=control character is entered
+DLG_AUTH_TIP_PASTE_KEY=Use Shift + Insert to paste from clipboard
 MSG_PAGEANT_NOTFOUND=Can't find Pageant.
 MSG_PAGEANT_NOKEY=Pageant has no valid key.
 
@@ -597,7 +606,10 @@
 ; dlg auth setup
 DLG_AUTHSETUP_TITLE=TTSSH: Authentication Setup
 DLG_AUTHSETUP_BANNER=Select defaults for authentication:
-DLG_AUTHSETUP_USERNAME=User &name:
+DLG_AUTHSETUP_NO_USERNAME=&Do not enter username
+DLG_AUTHSETUP_USERNAME=U&se following username
+DLG_AUTHSETUP_SYSTEM_USERNAME=Us&e system username
+DLG_AUTHSETUP_SYSTEM_USERNAME_TEXT=urrent username is "%s"
 DLG_AUTHSETUP_METHOD_PASSWORD=Use p&lain password to log in
 DLG_AUTHSETUP_METHOD_RSA=Use &RSA/DSA/ECDSA/ED25519 key to log in
 DLG_AUTHSETUP_METHOD_RHOST=Use r&hosts to log in (SSH1)

Modified: branches/cmake/installer/release/lang/French.lng
===================================================================
--- branches/cmake/installer/release/lang/French.lng	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/installer/release/lang/French.lng	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2019-02-28)
+; Updated by TeraTerm Project (2019-04-24)
 ; Last translated (French language) by Francois MOCQ (2010-07-21)
 
 [Tera Term]
@@ -52,7 +52,9 @@
 MENU_SETUP=Config&uration
 MENU_SETUP_TERMINAL=&Terminal...
 MENU_SETUP_WINDOW=&Fenetre...
+MENU_SETUP_FONT_SUBMENU=&Police
 MENU_SETUP_FONT=&Police...
+MENU_SETUP_DIALOG_FONT=&Dialog font...
 MENU_SETUP_KEYBOARD=&Clavier...
 MENU_SETUP_SERIALPORT=Port Serie...
 MENU_SETUP_TCPIP=T&CP/IP...
@@ -580,7 +582,12 @@
 DLG_AUTH_BANNER2=Authentification requise.
 DLG_AUTH_BANNER2_FAILED=Authentification \xE9chou\xE9e. R\xE9essayez.
 DLG_AUTH_USERNAME=&Nom d'utilisateur:
+DLG_AUTH_PASTE_WINDOWS_USERNAME=Paste &Windows Username
 DLG_AUTH_PASSWORD=&Phrase secr\xE8te:
+DLG_AUTH_PASTE_CLIPBOARD=Paste from &clipboard
+DLG_AUTH_CLEAR_CLIPBOARD=Paste from clipboard and cl&ear clipboard
+DLG_AUTH_USE_CONTORL_CHARACTERS=Use control charac&ters
+DLG_AUTH_SHOW_PASSPHRASE=&Show passphrase
 DLG_AUTH_REMEMBER_PASSWORD=Garder le mot de passe en &m\xE9moire
 DLG_AUTH_FWDAGENT=F&orward agent
 DLG_AUTH_METHOD_PASSWORD=Utiliser mot de passe pour la connexion
@@ -594,6 +601,8 @@
 DLG_AUTH_PRIVATEKEY=Fichier cl\xE9 priv\xE9e
 DLG_AUTH_LOCALUSER=Nom d'utilisateur local:
 DLG_AUTH_HOST_PRIVATEKEY=Fichier cl\xE9 priv\xE9e h\xF4te
+DLG_AUTH_TIP_CONTROL_CODE=control character is entered
+DLG_AUTH_TIP_PASTE_KEY=Use Shift + Insert to paste from clipboard
 MSG_PAGEANT_NOTFOUND=Impossible de trouver Pageant.
 MSG_PAGEANT_NOKEY=Pageant n'a pas de cl\xE9 valide.
 
@@ -600,7 +609,10 @@
 ; dlg auth setup
 DLG_AUTHSETUP_TITLE=TTSSH: Configuration de l'authentification
 DLG_AUTHSETUP_BANNER=Configuration par d\xE9faut:
-DLG_AUTHSETUP_USERNAME=Nom d'utilisateur:
+DLG_AUTHSETUP_NO_USERNAME=&Do not enter username
+DLG_AUTHSETUP_USERNAME=U&se following username
+DLG_AUTHSETUP_SYSTEM_USERNAME=Us&e system username
+DLG_AUTHSETUP_SYSTEM_USERNAME_TEXT=urrent username is "%s"
 DLG_AUTHSETUP_METHOD_PASSWORD=Util. mot de passe pour la conn.
 DLG_AUTHSETUP_METHOD_RSA=Util. cl\xE9 &RSA/DSA/ECDSA/ED25519 pour conn.
 DLG_AUTHSETUP_METHOD_RHOST=Util. r&hosts pour conn.(SSH1)

Modified: branches/cmake/installer/release/lang/German.lng
===================================================================
--- branches/cmake/installer/release/lang/German.lng	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/installer/release/lang/German.lng	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2019-02-28)
+; Updated by TeraTerm Project (2019-04-24)
 ; Last translated (German language) by Frederik Schwarzer (2010-05-17)
 
 [Tera Term]
@@ -52,7 +52,9 @@
 MENU_SETUP=Ein&stellungen
 MENU_SETUP_TERMINAL=&Terminal-Einstellungen
 MENU_SETUP_WINDOW=&Fenster-Einstellungen
+MENU_SETUP_FONT_SUBMENU=&Schriftart
 MENU_SETUP_FONT=&Schriftart...
+MENU_SETUP_DIALOG_FONT=&Dialog font...
 MENU_SETUP_KEYBOARD=&Keyboard-Einstellungen
 MENU_SETUP_SERIALPORT=Serieller Port
 MENU_SETUP_TCPIP=&Hostliste editieren
@@ -580,7 +582,12 @@
 DLG_AUTH_BANNER2=Authentifikation notwendig.
 DLG_AUTH_BANNER2_FAILED=Authentifikation fehlgeschlagen. Bitte versuchen Sie es erneut.
 DLG_AUTH_USERNAME=Benutzername:
+DLG_AUTH_PASTE_WINDOWS_USERNAME=Paste &Windows Username
 DLG_AUTH_PASSWORD=Passphrase:
+DLG_AUTH_PASTE_CLIPBOARD=Paste from &clipboard
+DLG_AUTH_CLEAR_CLIPBOARD=Paste from clipboard and cl&ear clipboard
+DLG_AUTH_USE_CONTORL_CHARACTERS=Use control charac&ters
+DLG_AUTH_SHOW_PASSPHRASE=&Show passphrase
 DLG_AUTH_REMEMBER_PASSWORD=Passphrase speichern
 DLG_AUTH_FWDAGENT=F&orward agent
 DLG_AUTH_METHOD_PASSWORD=Passwortauthentifikation verwenden
@@ -594,6 +601,8 @@
 DLG_AUTH_PRIVATEKEY=Schl\xFCssel:
 DLG_AUTH_LOCALUSER=Lokaler Benutzername:
 DLG_AUTH_HOST_PRIVATEKEY=rhosts-Schl\xFCssel:
+DLG_AUTH_TIP_CONTROL_CODE=control character is entered
+DLG_AUTH_TIP_PASTE_KEY=Use Shift + Insert to paste from clipboard
 MSG_PAGEANT_NOTFOUND=Can't find Pageant.
 MSG_PAGEANT_NOKEY=Pageant has no valid key.
 
@@ -600,7 +609,10 @@
 ; dlg auth setup
 DLG_AUTHSETUP_TITLE=TTSSH: Authentifikation-Einstellungen
 DLG_AUTHSETUP_BANNER=Standard-Einstellungen f\xFCr Authentifikation:
-DLG_AUTHSETUP_USERNAME=Benutzername:
+DLG_AUTHSETUP_NO_USERNAME=&Do not enter username
+DLG_AUTHSETUP_USERNAME=U&se following username
+DLG_AUTHSETUP_SYSTEM_USERNAME=Us&e system username
+DLG_AUTHSETUP_SYSTEM_USERNAME_TEXT=urrent username is "%s"
 DLG_AUTHSETUP_METHOD_PASSWORD=Passwortauthentifikation verwenden
 DLG_AUTHSETUP_METHOD_RSA=DSA/RSA/ECDSA/ED25519-Schl\xFCssel verwenden
 DLG_AUTHSETUP_METHOD_RHOST=rhosts verwenden (SSH1)

Modified: branches/cmake/installer/release/lang/Japanese.lng
===================================================================
--- branches/cmake/installer/release/lang/Japanese.lng	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/installer/release/lang/Japanese.lng	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2019-02-28)
+; Updated by TeraTerm Project (2019-04-24)
 
 [Tera Term]
 ;DLG_SYSTEM_FONT=\x82l\x82r \x82o\x83S\x83V\x83b\x83N,12,128
@@ -51,7 +51,9 @@
 MENU_SETUP=\x90ݒ\xE8(&S)
 MENU_SETUP_TERMINAL=\x92[\x96\x96(&T)...
 MENU_SETUP_WINDOW=\x83E\x83B\x83\x93\x83h\x83E(&W)...
+MENU_SETUP_FONT_SUBMENU=\x83t\x83H\x83\x93\x83g(&F)
 MENU_SETUP_FONT=\x83t\x83H\x83\x93\x83g(&F)...
+MENU_SETUP_DIALOG_FONT=\x83_\x83C\x83A\x83\x8D\x83O\x83t\x83H\x83\x93\x83g(&D)...
 MENU_SETUP_KEYBOARD=\x83L\x81[\x83{\x81[\x83h(&K)...
 MENU_SETUP_SERIALPORT=\x83V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g(&E)...
 MENU_SETUP_TCPIP=T&CP/IP...
@@ -579,7 +581,12 @@
 DLG_AUTH_BANNER2=\x94F\x8F؂\xAA\x95K\x97v\x82ł\xB7.
 DLG_AUTH_BANNER2_FAILED=\x94F\x8F؂Ɏ\xB8\x94s\x82\xB5\x82܂\xB5\x82\xBD. \x8DĎ\x8E\x8Ds\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2.
 DLG_AUTH_USERNAME=\x83\x86\x81[\x83U\x96\xBC(&N):
+DLG_AUTH_PASTE_WINDOWS_USERNAME=\x83V\x83X\x83e\x83\x80\x83\x86\x81[\x83U\x96\xBC\x82\xF0\x83y\x81[\x83X\x83g(&W)
 DLG_AUTH_PASSWORD=\x83p\x83X\x83t\x83\x8C\x81[\x83Y(&P):
+DLG_AUTH_PASTE_CLIPBOARD=\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82\xA9\x82\xE7\x83y\x81[\x83X\x83g(&C)
+DLG_AUTH_CLEAR_CLIPBOARD=\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82\xA9\x82\xE7\x83y\x81[\x83X\x83g\x82\xB5\x82\xBD\x8C\xE3\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82\xF0\x83N\x83\x8A\x83A\x82\xB7\x82\xE9(&E)
+DLG_AUTH_USE_CONTORL_CHARACTERS=\x83p\x83X\x83t\x83\x8C\x81[\x83Y\x82ɐ\xA7\x8C\xE4\x83R\x81[\x83h\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9(&T)
+DLG_AUTH_SHOW_PASSPHRASE=\x83p\x83X\x83t\x83\x8C\x81[\x83Y\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9(&S)
 DLG_AUTH_REMEMBER_PASSWORD=\x83p\x83X\x83\x8F\x81[\x83h\x82\xF0\x83\x81\x83\x82\x83\x8A\x8F\xE3\x82ɋL\x89\xAF\x82\xB7\x82\xE9(&M)
 DLG_AUTH_FWDAGENT=\x83G\x81[\x83W\x83F\x83\x93\x83g\x93]\x91\x97\x82\xB7\x82\xE9(&O)
 DLG_AUTH_METHOD_PASSWORD=\x83v\x83\x8C\x83C\x83\x93\x83p\x83X\x83\x8F\x81[\x83h\x82\xF0\x8Eg\x82\xA4(&L)
@@ -591,6 +598,8 @@
 DLG_AUTH_PRIVATEKEY=\x94閧\x8C\xAE(&K):
 DLG_AUTH_LOCALUSER=\x83\x8D\x81[\x83J\x83\x8B\x82̃\x86\x81[\x83U\x96\xBC(&U):
 DLG_AUTH_HOST_PRIVATEKEY=\x83z\x83X\x83g\x8C\xAE(&F):
+DLG_AUTH_TIP_CONTROL_CODE=\x90\xA7\x8C䕶\x8E\x9A\x82\xAA\x93\xFC\x97͂\xB3\x82\xEA\x82܂\xB5\x82\xBD
+DLG_AUTH_TIP_PASTE_KEY=Shift+Insert\x82ŃN\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82\xA9\x82\xE7\x83y\x81[\x83X\x83g\x82ł\xAB\x82܂\xB7
 MSG_PAGEANT_NOTFOUND=Pageant \x82\xAA\x8C\xA9\x82‚\xA9\x82\xE8\x82܂\xB9\x82\xF1.
 MSG_PAGEANT_NOKEY=Pageant \x82ɗL\x8C\xF8\x82Ȍ\xAE\x82\xAA\x93o\x98^\x82\xB3\x82\xEA\x82Ă\xA2\x82܂\xB9\x82\xF1.
 
@@ -597,7 +606,10 @@
 ; dlg auth setup
 DLG_AUTHSETUP_TITLE=TTSSH: \x94F\x8Fؐݒ\xE8
 DLG_AUTHSETUP_BANNER=\x92ʏ\xED\x8Eg\x97p\x82\xB7\x82\xE9\x94F\x8Fؕ\xFB\x8E\xAE:
-DLG_AUTHSETUP_USERNAME=\x83\x86\x81[\x83U\x96\xBC(&N):
+DLG_AUTHSETUP_NO_USERNAME=\x93\xFC\x97͂\xB5\x82Ȃ\xA2(&D)
+DLG_AUTHSETUP_USERNAME=\x8E\x9F\x82̃\x86\x81[\x83U\x96\xBC\x82\xF0\x8Eg\x97p(&N):
+DLG_AUTHSETUP_SYSTEM_USERNAME=\x83V\x83X\x83e\x83\x80\x82̃\x86\x81[\x83U\x96\xBC\x82\xF0\x8Eg\x97p(&E):
+DLG_AUTHSETUP_SYSTEM_USERNAME_TEXT=\x8C\xBB\x8D݂̃\x8D\x83O\x83C\x83\x93\x83\x86\x81[\x83U\x96\xBC "%s"
 DLG_AUTHSETUP_METHOD_PASSWORD=\x83v\x83\x8C\x83C\x83\x93\x83p\x83X\x83\x8F\x81[\x83h\x82\xF0\x8Eg\x82\xA4(&L)
 DLG_AUTHSETUP_METHOD_RSA=&RSA/DSA/ECDSA/ED25519\x8C\xAE\x82\xF0\x8Eg\x82\xA4
 DLG_AUTHSETUP_METHOD_RHOST=r&hosts\x82\xF0\x8Eg\x82\xA4(SSH1)

Modified: branches/cmake/installer/release/lang/Korean.lng
===================================================================
--- branches/cmake/installer/release/lang/Korean.lng	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/installer/release/lang/Korean.lng	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2019-02-28)
+; Updated by TeraTerm Project (2019-04-24)
 ; Last translated (Korean language) by Daehong Kim (2013-07-25)
 
 [Tera Term]
@@ -52,7 +52,9 @@
 MENU_SETUP=\xBC\xB3\xC1\xA4(&S)
 MENU_SETUP_TERMINAL=\xC5͹̳\xCE(&T)...
 MENU_SETUP_WINDOW=â(&W)...
+MENU_SETUP_FONT_SUBMENU=\xB1۲\xC3(&F)
 MENU_SETUP_FONT=\xB1۲\xC3(&F)...
+MENU_SETUP_DIALOG_FONT=&Dialog font...
 MENU_SETUP_KEYBOARD=Ű\xBA\xB8\xB5\xE5(&K)...
 MENU_SETUP_SERIALPORT=\xBDø\xAE\xBE\xF3\xC6\xF7Ʈ(&E)...
 MENU_SETUP_TCPIP=T&CP/IP...
@@ -580,7 +582,12 @@
 DLG_AUTH_BANNER2=\xC0\xCE\xC1\xF5\xC0\xCC \xC7ʿ\xE4\xC7\xD4.
 DLG_AUTH_BANNER2_FAILED=\xC0\xCF\xC1\xF5 \xBD\xC7\xC6\xD0. \xB4ٽ\xC3 \xBDõ\xB5\xC7\xD8\xC1ּ\xBC\xBF\xE4.
 DLG_AUTH_USERNAME=\xBB\xE7\xBF\xEB\xC0\xDA \xC0̸\xA7(&N):
+DLG_AUTH_PASTE_WINDOWS_USERNAME=Paste &Windows Username
 DLG_AUTH_PASSWORD=\xBE\xCFȣ(&P):
+DLG_AUTH_PASTE_CLIPBOARD=Paste from &clipboard
+DLG_AUTH_CLEAR_CLIPBOARD=Paste from clipboard and cl&ear clipboard
+DLG_AUTH_USE_CONTORL_CHARACTERS=Use control charac&ters
+DLG_AUTH_SHOW_PASSPHRASE=&Show passphrase
 DLG_AUTH_REMEMBER_PASSWORD=\xB8޸𸮿\xA1 \xBE\xCFȣ\xB1\xE2\xBE\xEF(&M)
 DLG_AUTH_FWDAGENT=\xBF\xA1\xC0\xCC\xC0\xFCƮ\xB7\xCE \xC0\xFC\xB4\xDE(&O)
 DLG_AUTH_METHOD_PASSWORD=\xC0Ϲ\xDD\xC5ؽ\xBAƮ \xBE\xCFȣ \xB7α\xD7\xC0\xCE(&L)
@@ -594,6 +601,8 @@
 DLG_AUTH_PRIVATEKEY=\xB0\xB3\xC0\xCEŰ(&K):
 DLG_AUTH_LOCALUSER=\xC1\xF6\xBF\xAA \xBB\xE7\xBF\xEB\xC0\xDA\xC0̸\xA7(&U):
 DLG_AUTH_HOST_PRIVATEKEY=ȣ\xBD\xBAƮ \xB0\xB3\xC0\xCEŰ(&F):
+DLG_AUTH_TIP_CONTROL_CODE=control character is entered
+DLG_AUTH_TIP_PASTE_KEY=Use Shift + Insert to paste from clipboard
 MSG_PAGEANT_NOTFOUND=Pageant\xB8\xA6 ã\xC0\xBB \xBC\xF6 \xBE\xF8\xBD\xC0\xB4ϴ\xD9.
 MSG_PAGEANT_NOKEY=Pageant\xB0\xA1 \xC0\xAFȿ\xC7\xD1 Ű\xB8\xA6 \xB0\xA1\xC1\xF6\xB0\xED \xC0\xD6\xC1\xF6 \xBEʽ\xC0\xB4ϴ\xD9.
 
@@ -600,7 +609,10 @@
 ; dlg auth setup
 DLG_AUTHSETUP_TITLE=TTSSH: \xC0\xCE\xC1\xF5 \xBC\xB3\xC1\xA4
 DLG_AUTHSETUP_BANNER=\xB1⺻ \xC0\xCE\xC1\xF5 \xBC\xB1\xC5\xC3:
-DLG_AUTHSETUP_USERNAME=\xBB\xE7\xBF\xEB\xC0\xDA \xC0̸\xA7(&N):
+DLG_AUTHSETUP_NO_USERNAME=&Do not enter username
+DLG_AUTHSETUP_USERNAME=U&se following username
+DLG_AUTHSETUP_SYSTEM_USERNAME=Us&e system username
+DLG_AUTHSETUP_SYSTEM_USERNAME_TEXT=urrent username is "%s"
 DLG_AUTHSETUP_METHOD_PASSWORD=\xC0Ϲ\xDD\xC5ؽ\xBAƮ \xBE\xCFȣ \xB7α\xD7\xC0\xCE(&L)
 DLG_AUTHSETUP_METHOD_RSA=RSA/DSA/ECDSA/ED25519 Ű \xB7α\xD7\xC0\xCE(&R)
 DLG_AUTHSETUP_METHOD_RHOST=rhosts \xB7α\xD7\xC0\xCE(SSH1)(&H)

Modified: branches/cmake/installer/release/lang/Russian.lng
===================================================================
--- branches/cmake/installer/release/lang/Russian.lng	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/installer/release/lang/Russian.lng	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2019-02-28)
+; Updated by TeraTerm Project (2019-04-24)
 ; Last translated (Russian language) by Ryumik Sergey (2017-07-19)
 
 [Tera Term]
@@ -52,7 +52,9 @@
 MENU_SETUP=&\xCD\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE0
 MENU_SETUP_TERMINAL=&\xD2\xE5\xF0\xEC\xE8\xED\xE0\xEB...
 MENU_SETUP_WINDOW=&\xCE\xEA\xED\xEE...
+MENU_SETUP_FONT_SUBMENU=&\xD8\xF0\xE8\xF4\xF2
 MENU_SETUP_FONT=&\xD8\xF0\xE8\xF4\xF2...
+MENU_SETUP_DIALOG_FONT=&Dialog font...
 MENU_SETUP_KEYBOARD=&\xCA\xEB\xE0\xE2\xE8\xE0\xF2\xF3\xF0\xE0...
 MENU_SETUP_SERIALPORT=&COM-\xEF\xEE\xF0\xF2...
 MENU_SETUP_TCPIP=T&CP/IP...
@@ -580,7 +582,12 @@
 DLG_AUTH_BANNER2=\xD2\xF0\xE5\xE1\xF3\xE5\xF2\xF1\xFF \xE0\xF3\xF2\xE5\xED\xF2\xE8\xF4\xE8\xEA\xE0\xF6\xE8\xFF.
 DLG_AUTH_BANNER2_FAILED=\xCE\xF8\xE8\xE1\xEA\xE0 \xE0\xF3\xF2\xE5\xED\xF2\xE8\xF4\xE8\xEA\xE0\xF6\xE8\xE8. \xCF\xEE\xE2\xF2\xEE\xF0\xE8\xF2\xE5 \xEF\xEE\xEF\xFB\xF2\xEA\xF3.
 DLG_AUTH_USERNAME=&\xC8\xEC\xFF \xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xE5\xEB\xFF:
+DLG_AUTH_PASTE_WINDOWS_USERNAME=Paste &Windows Username
 DLG_AUTH_PASSWORD=&\xD4\xF0\xE0\xE7\xE0 \xEF\xE0\xF0\xEE\xEB\xFF:
+DLG_AUTH_PASTE_CLIPBOARD=Paste from &clipboard
+DLG_AUTH_CLEAR_CLIPBOARD=Paste from clipboard and cl&ear clipboard
+DLG_AUTH_USE_CONTORL_CHARACTERS=Use control charac&ters
+DLG_AUTH_SHOW_PASSPHRASE=&Show passphrase
 DLG_AUTH_REMEMBER_PASSWORD=&\xC7\xE0\xEF\xEE\xEC\xED\xE8\xF2\xFC \xEF\xE0\xF0\xEE\xEB\xFC \xE2 \xEF\xE0\xEC\xFF\xF2\xE8
 DLG_AUTH_FWDAGENT=&\xCF\xE5\xF0\xE2\xFB\xE9 \xE0\xE3\xE5\xED\xF2
 DLG_AUTH_METHOD_PASSWORD=&\xC2\xF5\xEE\xE4 \xF1 \xEF\xF0\xEE\xF1\xF2\xFB\xEC \xEF\xE0\xF0\xEE\xEB\xE5\xEC
@@ -594,6 +601,8 @@
 DLG_AUTH_PRIVATEKEY=&\xC7\xE0\xEA\xF0\xFB\xF2\xFB\xE9 \xEA\xEB\xFE\xF7
 DLG_AUTH_LOCALUSER=&\xD1\xEA\xF0\xFB\xF2\xEE\xE5 \xE8\xEC\xFF:
 DLG_AUTH_HOST_PRIVATEKEY=&\xC7\xE0\xEA\xF0\xFB\xF2\xFB\xE9 \xEA\xEB\xFE\xF7
+DLG_AUTH_TIP_CONTROL_CODE=control character is entered
+DLG_AUTH_TIP_PASTE_KEY=Use Shift + Insert to paste from clipboard
 MSG_PAGEANT_NOTFOUND=\xCD\xE5 \xF3\xE4\xE0\xE5\xF2\xF1\xFF \xED\xE0\xE9\xF2\xE8 Pageant.
 MSG_PAGEANT_NOKEY=\xCD\xE5\xF2 \xE4\xE5\xE9\xF1\xF2\xE2\xF3\xFE\xF9\xE5\xE3\xEE \xEA\xEB\xFE\xF7\xE0 \xEA Pageant.
 
@@ -600,7 +609,10 @@
 ; dlg auth setup
 DLG_AUTHSETUP_TITLE=TTSSH: \xCD\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE0 \xE0\xF3\xF2\xE5\xED\xF2\xE8\xF4\xE8\xEA\xE0\xF6\xE8\xE8
 DLG_AUTHSETUP_BANNER=\xC2\xFB\xE1\xF0\xE0\xF2\xFC \xEF\xEE \xF3\xEC\xEE\xEB\xF7\xE0\xED\xE8\xFE:
-DLG_AUTHSETUP_USERNAME=&\xC8\xEC\xFF:
+DLG_AUTHSETUP_NO_USERNAME=&Do not enter username
+DLG_AUTHSETUP_USERNAME=U&se following username
+DLG_AUTHSETUP_SYSTEM_USERNAME=Us&e system username
+DLG_AUTHSETUP_SYSTEM_USERNAME_TEXT=urrent username is "%s"
 DLG_AUTHSETUP_METHOD_PASSWORD=&\xC2\xF5\xEE\xE4 \xF1 \xEF\xF0\xEE\xF1\xF2\xFB\xEC \xEF\xE0\xF0\xEE\xEB\xE5\xEC
 DLG_AUTHSETUP_METHOD_RSA=&\xC2\xF5\xEE\xE4 \xF1 \xEA\xEB\xFE\xF7\xEE\xEC RSA/DSA/ECDSA/ED25519
 DLG_AUTHSETUP_METHOD_RHOST=&\xC2\xF5\xEE\xE4 \xF1 rhosts (SSH1)

Modified: branches/cmake/installer/release/lang/Simplified Chinese.lng
===================================================================
--- branches/cmake/installer/release/lang/Simplified Chinese.lng	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/installer/release/lang/Simplified Chinese.lng	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2019-02-28)
+; Updated by TeraTerm Project (2019-04-24)
 ; Last translated (Simplified Chinese language) by LiShaohui (2017-04-11)
 
 [Tera Term]
@@ -52,7 +52,9 @@
 MENU_SETUP=\xC9\xE8\xD6\xC3(&S)
 MENU_SETUP_TERMINAL=\xD6ն\xCB(&T)...
 MENU_SETUP_WINDOW=\xB4\xB0\xBF\xDA(&W)...
+MENU_SETUP_FONT_SUBMENU=\xD7\xD6\xCC\xE5(&F)
 MENU_SETUP_FONT=\xD7\xD6\xCC\xE5(&F)...
+MENU_SETUP_DIALOG_FONT=&Dialog font...
 MENU_SETUP_KEYBOARD=\xBC\xFC\xC5\xCC(&K)...
 MENU_SETUP_SERIALPORT=\xB4\xAE\xBF\xDA(&E)...
 MENU_SETUP_TCPIP=T&CP/IP...
@@ -580,7 +582,12 @@
 DLG_AUTH_BANNER2=\xD0\xE8Ҫ\xC8\xCF֤\xA1\xA3
 DLG_AUTH_BANNER2_FAILED=\xC8\xCF֤ʧ\xB0ܣ\xAC\xC7\xEB\xD6\xD8\xCAԡ\xA3
 DLG_AUTH_USERNAME=\xD3û\xA7\xC3\xFB(&N)\xA3\xBA
+DLG_AUTH_PASTE_WINDOWS_USERNAME=Paste &Windows Username
 DLG_AUTH_PASSWORD=\xC3\xDC\xC2\xEB(&P)\xA3\xBA
+DLG_AUTH_PASTE_CLIPBOARD=Paste from &clipboard
+DLG_AUTH_CLEAR_CLIPBOARD=Paste from clipboard and cl&ear clipboard
+DLG_AUTH_USE_CONTORL_CHARACTERS=Use control charac&ters
+DLG_AUTH_SHOW_PASSPHRASE=&Show passphrase
 DLG_AUTH_REMEMBER_PASSWORD=\xBC\xC7ס\xC3\xDC\xC2\xEB(&M)
 DLG_AUTH_FWDAGENT=\xB4\xFA\xC0\xEDת\xB7\xA2(&O)
 DLG_AUTH_METHOD_PASSWORD=ʹ\xD3ü򵥵\xC4\xC3\xDC\xC2\xEB\xC0\xB4\xB5\xC7¼(&L)
@@ -594,6 +601,8 @@
 DLG_AUTH_PRIVATEKEY=\xC3\xDCԿ\xCEļ\xFE(&K)\xA3\xBA
 DLG_AUTH_LOCALUSER=\xB1\xBE\xB5\xD8\xD3û\xA7\xC3\xFB(&U)\xA3\xBA
 DLG_AUTH_HOST_PRIVATEKEY=\xD6\xF7\xBB\xFA\xC3\xDCԿ\xCEļ\xFE(&F)\xA3\xBA
+DLG_AUTH_TIP_CONTROL_CODE=control character is entered
+DLG_AUTH_TIP_PASTE_KEY=Use Shift + Insert to paste from clipboard
 MSG_PAGEANT_NOTFOUND=δ\xD5ҵ\xBD Pageant
 MSG_PAGEANT_NOKEY=Pageant \xB2\xBB\xB0\xFC\xBA\xAC\xD3\xD0Ч\xB5\xC4\xC3\xDCԿ
 
@@ -600,7 +609,10 @@
 ; dlg auth setup
 DLG_AUTHSETUP_TITLE=TTSSH\xA3\xBA\xC8\xCF֤\xC9\xE8\xD6\xC3
 DLG_AUTHSETUP_BANNER=\xC9\xE8\xD6\xC3Ĭ\xC8\xCF\xC8\xCF֤\xD0\xC5Ϣ\xA3\xBA
-DLG_AUTHSETUP_USERNAME=\xD3û\xA7\xC3\xFB(&N)\xA3\xBA
+DLG_AUTHSETUP_NO_USERNAME=&Do not enter username
+DLG_AUTHSETUP_USERNAME=U&se following username
+DLG_AUTHSETUP_SYSTEM_USERNAME=Us&e system username
+DLG_AUTHSETUP_SYSTEM_USERNAME_TEXT=urrent username is "%s"
 DLG_AUTHSETUP_METHOD_PASSWORD=ʹ\xD3ü򵥵\xC4\xC3\xDC\xC2\xEB\xC0\xB4\xB5\xC7¼(&L)
 DLG_AUTHSETUP_METHOD_RSA=ʹ\xD3\xC3 &RSA/DSA/ECDSA/ED25519 \xC3\xDCԿ\xB5\xC7¼
 DLG_AUTHSETUP_METHOD_RHOST=ʹ\xD3\xC3 r&hosts \xB5\xC7¼(SSH1)

Modified: branches/cmake/installer/release/lang/Traditional Chinese.lng
===================================================================
--- branches/cmake/installer/release/lang/Traditional Chinese.lng	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/installer/release/lang/Traditional Chinese.lng	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2019-02-28)
+; Updated by TeraTerm Project (2019-04-24)
 ; Last translated (Traditional Chinese language) by kikiqqp (2014-09-20)
 
 [Tera Term]
@@ -52,7 +52,9 @@
 MENU_SETUP=\xB3]\xA9w(&S)
 MENU_SETUP_TERMINAL=\xB2׺ݾ\xF7(&T)...
 MENU_SETUP_WINDOW=\xB5\xF8\xB5\xA1(&W)...
+MENU_SETUP_FONT_SUBMENU=\xA6r\xAB\xAC(&F)
 MENU_SETUP_FONT=\xA6r\xAB\xAC(&F)...
+MENU_SETUP_DIALOG_FONT=&Dialog font...
 MENU_SETUP_KEYBOARD=\xC1\xE4\xBDL(&K)...
 MENU_SETUP_SERIALPORT=\xB3s\xB1\xB5\xB0\xF0(&E)...
 MENU_SETUP_TCPIP=T&CP/IP...
@@ -580,7 +582,12 @@
 DLG_AUTH_BANNER2=\xBBݭn\xBB{\xC3ҡC
 DLG_AUTH_BANNER2_FAILED=\xBB{\xC3ҥ\xA2\xB1ѡA\xBDЭ\xAB\xB8աC
 DLG_AUTH_USERNAME=\xA5Τ\xE1\xA6W(&N)\xA1G
+DLG_AUTH_PASTE_WINDOWS_USERNAME=Paste &Windows Username
 DLG_AUTH_PASSWORD=\xB1K\xBDX(&P)\xA1G
+DLG_AUTH_PASTE_CLIPBOARD=Paste from &clipboard
+DLG_AUTH_CLEAR_CLIPBOARD=Paste from clipboard and cl&ear clipboard
+DLG_AUTH_USE_CONTORL_CHARACTERS=Use control charac&ters
+DLG_AUTH_SHOW_PASSPHRASE=&Show passphrase
 DLG_AUTH_REMEMBER_PASSWORD=\xB0O\xA6\xED\xB1K\xBDX(&M)
 DLG_AUTH_FWDAGENT=\xA5N\xB2z\xC2\xE0\xB5o(&O)
 DLG_AUTH_METHOD_PASSWORD=\xA8ϥ\xCE²\xB3檺\xB1K\xBDX\xA8ӵn\xBF\xFD(&L)
@@ -594,6 +601,8 @@
 DLG_AUTH_PRIVATEKEY=\xB1K\xC6_\xA4\xE5\xA5\xF3(&K)\xA1G
 DLG_AUTH_LOCALUSER=\xA5\xBB\xA6a\xA5Τ\xE1\xA6W(&U)\xA1G
 DLG_AUTH_HOST_PRIVATEKEY=\xA5D\xBE\xF7\xB1K\xC6_\xA4\xE5\xA5\xF3(&F)\xA1G
+DLG_AUTH_TIP_CONTROL_CODE=control character is entered
+DLG_AUTH_TIP_PASTE_KEY=Use Shift + Insert to paste from clipboard
 MSG_PAGEANT_NOTFOUND=\xA5\xBC\xA7\xE4\xA8\xEC Pageant
 MSG_PAGEANT_NOKEY=Pageant \xA4\xA3\xA5]\xA7t\xA6\xB3\xAEĪ\xBA\xB1K\xC6_
 
@@ -600,7 +609,10 @@
 ; dlg auth setup
 DLG_AUTHSETUP_TITLE=TTSSH\xA1G\xBB{\xC3ҳ]\xA9w
 DLG_AUTHSETUP_BANNER=\xB3]\xA9w\xC0q\xBB{\xBB{\xC3Ҹ\xEA\xB0T\xA1G
-DLG_AUTHSETUP_USERNAME=\xA5Τ\xE1\xA6W(&N)\xA1G
+DLG_AUTHSETUP_NO_USERNAME=&Do not enter username
+DLG_AUTHSETUP_USERNAME=U&se following username
+DLG_AUTHSETUP_SYSTEM_USERNAME=Us&e system username
+DLG_AUTHSETUP_SYSTEM_USERNAME_TEXT=urrent username is "%s"
 DLG_AUTHSETUP_METHOD_PASSWORD=\xA8ϥ\xCE²\xB3檺\xB1K\xBDX\xA8ӵn\xBF\xFD(&L)
 DLG_AUTHSETUP_METHOD_RSA=\xA8ϥ\xCE &RSA/DSA/ECDSA/ED25519 \xB1K\xC6_\xB5n\xBF\xFD
 DLG_AUTHSETUP_METHOD_RHOST=\xA8ϥ\xCE r&hosts \xB5n\xBF\xFD(SSH1)

Modified: branches/cmake/libs/SFMT.cmake
===================================================================
--- branches/cmake/libs/SFMT.cmake	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/libs/SFMT.cmake	2019-05-19 15:06:12 UTC (rev 7694)
@@ -10,6 +10,7 @@
 	  -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
 	  -DCMAKE_CONFIGURATION_TYPE=Release
 	  -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
+	  -DARCHITECTURE=${ARCHITECTURE}
 	  -P SFMT.cmake
 	  )
 	execute_process(
@@ -17,6 +18,7 @@
 	  -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
 	  -DCMAKE_CONFIGURATION_TYPE=Debug
 	  -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
+	  -DARCHITECTURE=${ARCHITECTURE}
 	  -P SFMT.cmake
 	  )
 	return()
@@ -63,7 +65,7 @@
 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"))
+if(("${CMAKE_GENERATOR}" MATCHES "Win64") OR ("${ARCHITECTURE}" MATCHES "x64") OR ("$ENV{MSYSTEM_CHOST}" STREQUAL "x86_64-w64-mingw32"))
   set(BUILD_DIR "${BUILD_DIR}_x64")
   set(INSTALL_DIR "${INSTALL_DIR}_x64")
 endif()
@@ -123,8 +125,11 @@
 
   ######################################## multi configuration
 
+  if(NOT "${ARCHITECTURE}" STREQUAL "")
+	set(CMAKE_A_OPTION -A ${ARCHITECTURE})
+  endif()
   execute_process(
-	COMMAND ${CMAKE_COMMAND} ${SRC_DIR} -G ${CMAKE_GENERATOR}
+	COMMAND ${CMAKE_COMMAND} ${SRC_DIR} -G ${CMAKE_GENERATOR} ${CMAKE_A_OPTION}
 	-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
 	-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
 	${TOOLCHAINFILE}

Modified: branches/cmake/libs/build_library_with_cmake.md
===================================================================
--- branches/cmake/libs/build_library_with_cmake.md	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/libs/build_library_with_cmake.md	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,76 +1,2 @@
 
-# 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}/ などの下でビルドされる
-- ビルド後、参照する必要がなければ削除できる
+Refer to the [build_library_with_cmake.md](<../doc/jp/html/reference/build_library_with_cmake.md>)

Modified: branches/cmake/libs/buildall.cmake
===================================================================
--- branches/cmake/libs/buildall.cmake	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/libs/buildall.cmake	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,5 @@
-# cmake -DCMAKE_GENERATOR="Vsual Studio 15 2017" -P buildall.cmake
+# cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -P buildall.cmake
+# cmake -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64" -P buildall.cmake
 # cmake -DCMAKE_GENERATOR="Unix Makefiles" -P buildall.cmake -DCMAKE_TOOLCHAIN_FILE=../mingw.toolchain.cmake
 
 if("${CMAKE_GENERATOR}" STREQUAL "")
@@ -5,19 +6,28 @@
   message(FATAL_ERROR "set CMAKE_GENERATOR!")
 endif()
 
+if(NOT "${ARCHITECTURE}" STREQUAL "")
+  set(ARCHITECTURE_OPTION -DARCHITECTURE=${ARCHITECTURE})
+endif()
+
 # build
+message("oniguruma")
 execute_process(
-  COMMAND ${CMAKE_COMMAND} -DCMAKE_GENERATOR=${CMAKE_GENERATOR} -P oniguruma.cmake
+  COMMAND ${CMAKE_COMMAND} -DCMAKE_GENERATOR=${CMAKE_GENERATOR} ${ARCHITECTURE_OPTION} -P oniguruma.cmake
   )
+message("zlib")
 execute_process(
-  COMMAND ${CMAKE_COMMAND} -DCMAKE_GENERATOR=${CMAKE_GENERATOR} -P zlib.cmake
+  COMMAND ${CMAKE_COMMAND} -DCMAKE_GENERATOR=${CMAKE_GENERATOR} ${ARCHITECTURE_OPTION} -P zlib.cmake
   )
+message("putty")
 execute_process(
   COMMAND ${CMAKE_COMMAND} -P putty.cmake
   )
+message("SFMT")
 execute_process(
-  COMMAND ${CMAKE_COMMAND} -DCMAKE_GENERATOR=${CMAKE_GENERATOR} -P SFMT.cmake
+  COMMAND ${CMAKE_COMMAND} -DCMAKE_GENERATOR=${CMAKE_GENERATOR} ${ARCHITECTURE_OPTION} -P SFMT.cmake
   )
+message("openssl")
 execute_process(
-  COMMAND ${CMAKE_COMMAND} -DCMAKE_GENERATOR=${CMAKE_GENERATOR} -P openssl.cmake
+  COMMAND ${CMAKE_COMMAND} -DCMAKE_GENERATOR=${CMAKE_GENERATOR} ${ARCHITECTURE_OPTION} -P openssl.cmake
   )

Modified: branches/cmake/libs/buildall_cmake.bat
===================================================================
--- branches/cmake/libs/buildall_cmake.bat	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/libs/buildall_cmake.bat	2019-05-19 15:06:12 UTC (rev 7694)
@@ -2,29 +2,32 @@
 setlocal
 cd /d %~dp0
 
-set CMAKE="cmake.exe2"
-set opt=
+set CMAKE="C:\Program Files\CMake\bin\cmake.exe"
+rem set CMAKE="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe"
+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
+echo 1. Visual Studio 16 2019
+echo 2. Visual Studio 15 2017
+echo 3. Visual Studio 14 2015
+echo 4. Visual Studio 12 2013
+echo 5. Visual Studio 11 2012
+echo 6. Visual Studio 10 2010
+echo 7. Visual Studio 9 2008
+echo 8. 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%" == "1" set GENERATOR="Visual Studio 16 2019" & set OPT=-DARCHITECTURE=Win32 & goto build_all
+if "%no%" == "2" set GENERATOR="Visual Studio 15 2017" & goto build_all
+if "%no%" == "3" set GENERATOR="Visual Studio 14 2015" & goto build_all
+if "%no%" == "4" set GENERATOR="Visual Studio 12 2013" & goto build_all
+if "%no%" == "5" set GENERATOR="Visual Studio 11 2012" & goto build_all
+if "%no%" == "6" set GENERATOR="Visual Studio 10 2010" & goto build_all
+if "%no%" == "7" set GENERATOR="Visual Studio 9 2008" & goto build_all
+if "%no%" == "8" 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
@@ -31,11 +34,10 @@
 goto retry_vs
 
 :build_all
-where %CMAKE%
+if exist %CMAKE% goto build_all_2
+where %CMAKE% 2> nul
 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
+echo cmake not found
 pause
 exit
 

Modified: branches/cmake/libs/oniguruma.cmake
===================================================================
--- branches/cmake/libs/oniguruma.cmake	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/libs/oniguruma.cmake	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,5 +1,7 @@
 # cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -P oniguruma.cmake
 # cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -DCMAKE_CONFIGURATION_TYPE=Release -P oniguruma.cmake
+# cmake -DCMAKE_GENERATOR="Visual Studio 16 2019" -DARCHITECTURE=Win32 -DCMAKE_CONFIGURATION_TYPE=Release -P oniguruma.cmake
+# cmake -DCMAKE_GENERATOR="Visual Studio 16 2019" -DARCHITECTURE=x64 -DCMAKE_CONFIGURATION_TYPE=Release -P oniguruma.cmake
 
 ####
 if(("${CMAKE_BUILD_TYPE}" STREQUAL "") AND ("${CMAKE_CONFIGURATION_TYPE}" STREQUAL ""))
@@ -10,6 +12,7 @@
 	  -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
 	  -DCMAKE_CONFIGURATION_TYPE=Release
 	  -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
+	  -DARCHITECTURE=${ARCHITECTURE}
 	  -P oniguruma.cmake
 	  )
 	execute_process(
@@ -17,6 +20,7 @@
 	  -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
 	  -DCMAKE_CONFIGURATION_TYPE=Debug
 	  -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
+	  -DARCHITECTURE=${ARCHITECTURE}
 	  -P oniguruma.cmake
 	  )
 	return()
@@ -53,10 +57,10 @@
 
 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(SRC_DIR_BASE "onig-6.9.2")
+set(SRC_ARC "onig-6.9.2-rc2.tar.gz")
+set(SRC_URL "https://github.com/kkos/oniguruma/releases/download/v6.9.2_rc2/onig-6.9.2-rc2.tar.gz")
+set(SRC_ARC_HASH_SHA1 e437d4fd70742912ac0e3ef1e7a682943c6ccacb)
 
 set(DOWN_DIR "${CMAKE_SOURCE_DIR}/download/oniguruma")
 set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/oniguruma/src")
@@ -63,7 +67,7 @@
 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"))
+if(("${CMAKE_GENERATOR}" MATCHES "Win64") OR ("${ARCHITECTURE}" MATCHES "x64") OR ("$ENV{MSYSTEM_CHOST}" STREQUAL "x86_64-w64-mingw32"))
   set(BUILD_DIR "${BUILD_DIR}_x64")
   set(INSTALL_DIR "${INSTALL_DIR}_x64")
 endif()
@@ -96,8 +100,11 @@
 
   ######################################## multi configuration
 
+  if(NOT "${ARCHITECTURE}" STREQUAL "")
+	set(CMAKE_A_OPTION -A ${ARCHITECTURE})
+  endif()
   execute_process(
-	COMMAND ${CMAKE_COMMAND} ${SRC_DIR} -G ${CMAKE_GENERATOR}
+	COMMAND ${CMAKE_COMMAND} ${SRC_DIR} -G ${CMAKE_GENERATOR} ${CMAKE_A_OPTION}
 	-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
 	-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
 	${TOOLCHAINFILE}

Modified: branches/cmake/libs/openssl.cmake
===================================================================
--- branches/cmake/libs/openssl.cmake	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/libs/openssl.cmake	2019-05-19 15:06:12 UTC (rev 7694)
@@ -124,6 +124,13 @@
     (${CMAKE_GENERATOR} MATCHES "NMake Makefiles"))
   ######################################## VS
   if(${CMAKE_GENERATOR} MATCHES "NMake Makefiles")
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 16 2019")
+    find_program(
+      VCVARS32 vcvarsall.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Auxiliary/Build"
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2019/Professional/VC/Auxiliary/Build"
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build"
+      )
   elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017")
     find_program(
       VCVARS32 vcvarsall.bat
@@ -181,7 +188,7 @@
   endif()
 
   file(WRITE "${SRC_DIR}/build_cmake.bat"
-    "cd %~dp0\n"
+    "cd /d %~dp0\n"
     "setlocal\n"
     )
   file(TO_NATIVE_PATH ${PERL} PERL_N)
@@ -190,11 +197,10 @@
   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"
+    "set PATH=%windir%\\system32;%windir%\n"
     )
   if(${CMAKE_GENERATOR} MATCHES "Visual Studio 8 2005")
     ## Visual Studio 2005 特別処理
@@ -205,13 +211,17 @@
       "set LIB=%SDK%\\lib;%LIB%\n"
       )
   endif()
-  if(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017 Win64")
+  if(${CMAKE_GENERATOR} MATCHES "Visual Studio 16 2019")
     file(APPEND "${SRC_DIR}/build_cmake.bat"
-      "call \"${VCVARS32_N}\" x86_amd64 10.0.17134.0\n"
+      "call \"${VCVARS32_N}\" x86\n"
       )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017 Win64")
+    file(APPEND "${SRC_DIR}/build_cmake.bat"
+      "call \"${VCVARS32_N}\" amd64\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"
+      "call \"${VCVARS32_N}\" x86\n"
       )
   elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio")
     file(APPEND "${SRC_DIR}/build_cmake.bat"
@@ -219,8 +229,8 @@
       )
   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 PATH=%PATH%;${PERL_N_PATH}\n"
+    "nmake -f ms\\nt.mak install\n"
     )
 
   set(BUILD_CMAKE_BAT "${SRC_DIR}/build_cmake.bat")

Modified: branches/cmake/libs/script_support.cmake
===================================================================
--- branches/cmake/libs/script_support.cmake	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/libs/script_support.cmake	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,6 +1,8 @@
 # TOOLSET	ツールセット名
 if(${CMAKE_GENERATOR} MATCHES "Visual Studio")
-  if(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017")
+  if(${CMAKE_GENERATOR} MATCHES "Visual Studio 16 2019")
+	set(MSVC_TOOLSET_VERSION 142)
+  elseif(${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)

Modified: branches/cmake/libs/zlib.cmake
===================================================================
--- branches/cmake/libs/zlib.cmake	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/libs/zlib.cmake	2019-05-19 15:06:12 UTC (rev 7694)
@@ -10,6 +10,7 @@
 	  -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
 	  -DCMAKE_CONFIGURATION_TYPE=Release
 	  -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
+	  -DARCHITECTURE=${ARCHITECTURE}
 	  -P zlib.cmake
 	  )
 	execute_process(
@@ -17,6 +18,7 @@
 	  -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
 	  -DCMAKE_CONFIGURATION_TYPE=Debug
 	  -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
+	  -DARCHITECTURE=${ARCHITECTURE}
 	  -P zlib.cmake
 	  )
 	return()
@@ -63,7 +65,7 @@
 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"))
+if(("${CMAKE_GENERATOR}" MATCHES "Win64") OR ("${ARCHITECTURE}" MATCHES "x64") OR ("$ENV{MSYSTEM_CHOST}" STREQUAL "x86_64-w64-mingw32"))
   set(BUILD_DIR "${BUILD_DIR}_x64")
   set(INSTALL_DIR "${INSTALL_DIR}_x64")
 endif()
@@ -96,8 +98,11 @@
 
   ######################################## multi configuration
 
+  if(NOT "${ARCHITECTURE}" STREQUAL "")
+	set(CMAKE_A_OPTION -A ${ARCHITECTURE})
+  endif()
   execute_process(
-	COMMAND ${CMAKE_COMMAND} ${SRC_DIR} -G ${CMAKE_GENERATOR}
+	COMMAND ${CMAKE_COMMAND} ${SRC_DIR} -G ${CMAKE_GENERATOR} ${CMAKE_A_OPTION}
 	-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
 	-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
 	${TOOLCHAINFILE}

Modified: branches/cmake/teraterm/common/codeconv.cpp
===================================================================
--- branches/cmake/teraterm/common/codeconv.cpp	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/common/codeconv.cpp	2019-05-19 15:06:12 UTC (rev 7694)
@@ -781,11 +781,15 @@
 				}
 				u16_out = 2;
 			} else {
-				*wstr_ptr++ = '?';
+				if (wstr_ptr != NULL) {
+					*wstr_ptr++ = '?';
+				}
 				u16_out = 1;
 			}
 		} else {
-			*wstr_ptr++ = '?';
+			if (wstr_ptr != NULL) {
+				*wstr_ptr++ = '?';
+			}
 			u16_out = 1;
 		}
 
@@ -1007,6 +1011,7 @@
 
 u8::u8(const u8 &obj)
 {
+	u8str_ = NULL;
 	copy(obj);
 }
 
@@ -1013,6 +1018,7 @@
 #if defined(MOVE_CONSTRUCTOR_ENABLE)
 u8::u8(u8 &&obj) noexcept
 {
+	u8str_ = NULL;
 	move(obj);
 }
 #endif
@@ -1137,6 +1143,7 @@
 
 tc::tc(const tc &obj)
 {
+	tstr_ = NULL;
 	copy(obj);
 }
 

Modified: branches/cmake/teraterm/common/compat_win.h
===================================================================
--- branches/cmake/teraterm/common/compat_win.h	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/common/compat_win.h	2019-05-19 15:06:12 UTC (rev 7694)
@@ -28,6 +28,11 @@
 
 /* compat_win */
 
+/*
+ * \x8Eg\x97p\x82\xB5\x82Ă\xA2\x82\xE9 Windows SDK, Visual Studio \x82̍\xB7\x82\xF0\x82Ȃ\xAD\x82\xB7\x82\xBD\x82߂̃t\x83@\x83C\x83\x8B
+ * windows.h \x82Ȃǂ̃t\x83@\x83C\x83\x8B\x82\xF0 include \x82\xB5\x82\xBD\x8C\xE3\x82\xC9 include \x82\xB7\x82\xE9
+ */
+
 #pragma once
 
 #include <windows.h>
@@ -37,15 +42,21 @@
 #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)
+#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
+#define WM_DPICHANGED					0x02E0
 #endif
+#if !defined(CF_INACTIVEFONTS)
+#define CF_INACTIVEFONTS				0x02000000L
+#endif
+#if !defined(OPENFILENAME_SIZE_VERSION_400A)
+#define OPENFILENAME_SIZE_VERSION_400A	76
+#endif
 
 extern BOOL (WINAPI *pAlphaBlend)(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION);
 extern BOOL (WINAPI *pEnumDisplayMonitors)(HDC,LPCRECT,MONITORENUMPROC,LPARAM);

Modified: branches/cmake/teraterm/common/dlglib.c
===================================================================
--- branches/cmake/teraterm/common/dlglib.c	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/common/dlglib.c	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2008-2018 TeraTerm Project
+ * (C) 2008-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,8 +36,14 @@
 #include <stdio.h>
 #include <commctrl.h>
 #include <tchar.h>
+#include <crtdbg.h>
 #include "ttlib.h"	// for get_lang_font()
 
+#if defined(_DEBUG) && !defined(_CRTDBG_MAP_ALLOC)
+#define malloc(l) _malloc_dbg((l), _NORMAL_BLOCK, __FILE__, __LINE__)
+#define free(p)   _free_dbg((p), _NORMAL_BLOCK)
+#endif
+
 void EnableDlgItem(HWND HDlg, int FirstId, int LastId)
 {
 	int i;

Modified: branches/cmake/teraterm/common/dlglib.h
===================================================================
--- branches/cmake/teraterm/common/dlglib.h	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/common/dlglib.h	2019-05-19 15:06:12 UTC (rev 7694)
@@ -87,10 +87,13 @@
 	LPCTSTR lpTemplateName,
 	HWND hWndParent,
 	DLGPROC lpDialogFunc);
-void SetDialogFont(const char *SetupFName, const char *UILanguageFile, const char *Section);
+void SetDialogFont(const char *SetupFName,
+				   const char *UILanguageFile, const char *Section, const char *Key);
 HFONT SetDlgFonts(HWND hDlg, const int nIDDlgItems[], int nIDDlgItemCount,
 				  const char *UILanguageFile, PCHAR key);
 BOOL IsExistFontA(const char *face, BYTE charset, BOOL strict);
+int GetFontPointFromPixel(HWND hWnd, int pixel);
+int GetFontPixelFromPoint(HWND hWnd, int point);
 
 #if defined(_UNICODE)
 #define TTSetDlgFont(p1,p2,p3)	TTSetDlgFontW(p1,p2,p3)

Modified: branches/cmake/teraterm/common/dlglib_cpp.cpp
===================================================================
--- branches/cmake/teraterm/common/dlglib_cpp.cpp	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/common/dlglib_cpp.cpp	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,5 +1,5 @@
 /*
- * (C) 2005-2018 TeraTerm Project
+ * (C) 2005-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,9 +29,16 @@
 /* Routines for dialog boxes */
 
 #include <windows.h>
+#include <crtdbg.h>
+
 #include "dlglib.h"
 #include "ttlib.h"
 
+#if defined(_DEBUG) && !defined(_CRTDBG_MAP_ALLOC)
+#define malloc(l) _malloc_dbg((l), _NORMAL_BLOCK, __FILE__, __LINE__)
+#define free(p)   _free_dbg((p), _NORMAL_BLOCK)
+#endif
+
 // \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
 
@@ -246,12 +253,13 @@
  *	\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)
+				   const char *UILanguageFile, const char *Section, const char *Key)
 {
+	LOGFONTA logfont;
+	BOOL result;
+
 	// 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);
@@ -263,55 +271,59 @@
 	}
 
 	// .lng\x82̎w\x92\xE8
-	if (UILanguageFile != NULL) {
+	if (UILanguageFile != NULL && Section != NULL && Key != NULL) {
+#if 0
 		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;
-				}
+#endif
+		result = GetI18nLogfont(Section, Key, &logfont, 0, UILanguageFile);
+		if (result == TRUE) {
+			if (IsExistFontA(logfont.lfFaceName, logfont.lfCharSet, TRUE)) {
+				TTSetDlgFontA(logfont.lfFaceName, logfont.lfHeight, logfont.lfCharSet);
+				return;
 			}
 		}
-		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
-	{
-		LOGFONTA logfont;
-		GetMessageboxFont(&logfont);
-		TTSetDlgFontA(logfont.lfFaceName, logfont.lfHeight, logfont.lfCharSet);
+	GetMessageboxFont(&logfont);
+	if (logfont.lfHeight < 0) {
+		logfont.lfHeight = GetFontPointFromPixel(NULL, -logfont.lfHeight);
 	}
+	TTSetDlgFontA(logfont.lfFaceName, logfont.lfHeight, logfont.lfCharSet);
 }
+
+
+/**
+ *	pixel\x90\x94\x82\xF0point\x90\x94\x82ɕϊ\xB7\x82\xB7\x82\xE9(\x83t\x83H\x83\x93\x83g\x97p)
+ *		\x92\x8D 1point = 1/72 inch, \x83t\x83H\x83\x93\x83g\x82̒P\x88\xCA
+ *		\x92\x8D \x83E\x83B\x83\x93\x83h\x83E\x82̕\\x8E\xA6\x8B\x82Ŕ{\x97\xA6\x82\xAA\x95ω\xBB\x82\xB7\x82\xE9\x82̂\xC5 hWnd \x82\xAA\x95K\x97v
+ */
+int GetFontPixelFromPoint(HWND hWnd, int pixel)
+{
+	if (hWnd == NULL) {
+		hWnd = GetDesktopWindow();
+	}
+	HDC DC = GetDC(hWnd);
+	int dpi = GetDeviceCaps(DC, LOGPIXELSY);	// dpi = dot per inch (96DPI)
+	int point = MulDiv(pixel, dpi, 72);			// pixel = point / 72 * dpi
+	ReleaseDC(hWnd, DC);
+	return point;
+}
+
+/**
+ *	point\x90\x94\x82\xF0pixel\x90\x94\x82ɕϊ\xB7\x82\xB7\x82\xE9(\x83t\x83H\x83\x93\x83g\x97p)
+ *		\x92\x8D 1point = 1/72 inch, \x83t\x83H\x83\x93\x83g\x82̒P\x88\xCA
+ */
+int GetFontPointFromPixel(HWND hWnd, int point)
+{
+	HDC DC = GetDC(hWnd);
+	int dpi = GetDeviceCaps(DC, LOGPIXELSY);	// dpi = dot per inch (96DPI)
+	int pixel = MulDiv(point, 72, dpi);			// point = pixel / dpi * 72
+	ReleaseDC(hWnd, DC);
+	return pixel;
+}

Modified: branches/cmake/teraterm/common/dlglib_tmpl.cpp
===================================================================
--- branches/cmake/teraterm/common/dlglib_tmpl.cpp	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/common/dlglib_tmpl.cpp	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,5 +1,5 @@
 /*
- * (C) 2005-2018 TeraTerm Project
+ * (C) 2005-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,9 +34,9 @@
 #include <assert.h>
 #include <crtdbg.h>
 
-#ifdef _DEBUG
+#if defined(_DEBUG) && !defined(_CRTDBG_MAP_ALLOC)
 #define malloc(l) _malloc_dbg((l), _NORMAL_BLOCK, __FILE__, __LINE__)
-#define free(p)   _free_dbg((p), _NORMAL_BLOCK, __FILE__, __LINE__)
+#define free(p)   _free_dbg((p), _NORMAL_BLOCK)
 #endif
 
 //#define	_countof(ary)	(sizeof(ary)/sizeof(ary[0]))
@@ -440,8 +440,13 @@
 static LONG FontHeight;
 static BYTE FontCharSet;
 
+/**
+ *	\x83_\x83C\x83A\x83\x8D\x83O\x82̃t\x83H\x83\x93\x83g\x82\xF0\x90ݒ肷\x82\xE9
+ *	height\x82̒P\x88ʂ̓|\x83C\x83\x93\x83g
+ */
 void TTSetDlgFontW(const wchar_t *face, int height, int charset)
 {
+	assert(height > 0);
 	if (face != NULL) {
 		wcscpy_s(FontFaceName, face);
 	} else {
@@ -451,8 +456,13 @@
 	FontCharSet = (BYTE)charset;
 }
 
+/**
+ *	\x83_\x83C\x83A\x83\x8D\x83O\x82̃t\x83H\x83\x93\x83g\x82\xF0\x90ݒ肷\x82\xE9
+ *	height\x82̒P\x88ʂ̓|\x83C\x83\x93\x83g
+ */
 void TTSetDlgFontA(const char *face, int height, int charset)
 {
+	assert(height > 0);
 	if (face != NULL) {
 		MultiByteToWideChar(CP_ACP, 0, face, -1, FontFaceName, LF_FACESIZE);
 	} else {

Added: branches/cmake/teraterm/common/teraterm_conf.h
===================================================================
--- branches/cmake/teraterm/common/teraterm_conf.h	                        (rev 0)
+++ branches/cmake/teraterm/common/teraterm_conf.h	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,92 @@
+/*
+ * (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_conf.h */
+
+/*
+ * windows.h \x82Ȃǂ\xF0 include \x82\xB7\x82\xE9\x91O\x82\xC9 include \x82\xB7\x82\xE9\x83t\x83@\x83C\x83\x8B
+ * \x95K\x97v\x82Ȓ\xE8\x8B`\x82\xF0\x8Ds\x82\xA4
+ */
+
+#pragma once
+
+/* \x8Eg\x97p\x82\xB7\x82\xE9 Windows SDK \x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x8Ew\x92肷\x82\xE9
+ *		\x81EWindows SDK(header)\x93\xE0\x82̊e\x8E\xED\x92\xE8\x8B`\x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x8Ew\x92肷\x82\xE9
+ *		\x81ETera Term \x93\xE0\x82Ŏg\x97p\x82\xB5\x82Ă\xA2\x82\xE9\x8Ae\x8E\xED\x92\xE8\x8B`\x82\xAASDK\x82ɂȂ\xAF\x82\xEA\x82\xCE
+ *		  compat_win.h \x82Œ\xE8\x8B`\x82\xB3\x82\xEA\x82\xE9
+ */
+#if !defined(_WIN32_WINNT)
+//#define	_WIN32_WINNT 0x0a00		// _WINNT_WIN10	Windows 10
+#define		_WIN32_WINNT 0x0501		// _WINNT_WINXP	Windows XP \x81\xAAbuild ok
+//#define	_WIN32_WINNT 0x0500		// _WINNT_WIN2K	Windows 2000 \x81\xABbuild ng
+//#define	_WIN32_WINNT 0x0400		// _WINNT_NT4	Windows NT 4.0(95)
+#endif
+
+/*
+ * VS2005\x82\xF0\x8Eg\x82\xC1\x82Ă\xA2\x82\xE9\x8Fꍇ\x81A
+ * _WIN32_WINNT \x82\xAA 0x0501 \x82łȂ\xAF\x82\xEA\x82΃G\x83\x89\x81[\x82\xF0\x8Fo\x82\xB7
+ */
+#if _MSC_VER == 1400  // VS2005
+#if _WIN32_WINNT != 0x0501
+#error check _WIN32_WINNT
+#endif
+#endif
+
+/*
+ *	_WIN32_WINNT\x82\xA9\x82玟\x82\xCCdefine\x82\xF0\x93K\x90؂ɐݒ肷\x82\xE9
+ *		NTDDI_VERSION
+ *		WINVER
+ *		_WIN32_IE
+ *	\x82\xB1\x82\xCCdefine\x82͒\xE8\x8B`\x82\xB3\x82\xEA\x82Ȃ\xA2
+ *		_WIN32_WINDOWS
+ */
+//#include <sdkddkver.h>
+
+
+/*
+ *	SDK 7.0
+ *		Windows Server 2003 R2 Platform SDK
+ *		(Microsoft Windows SDK for Windows 7 and .NET Framework 3.5 SP1)
+ *	SDK 7.1
+ *		Microsoft Windows SDK for Windows 7 and .NET Framework 4
+ */
+/*
+ * SDK 7.0 \x91΍\xF4
+ *	7.0 \x82\xCD 7.1 \x88ȍ~\x82Ǝ\x9F\x82̈Ⴂ\x82\xAA\x82\xA0\x82\xE9
+ *	- _WIN32_WINNT \x82\xAA\x92\xE8\x8B`\x82\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x8Fꍇ\x81A\x8E\xA9\x93\xAE\x82Őݒ肵\x82Ȃ\xA2
+ *		_WIN32_IE\x82Ȃǂ\xE0\x8E\xA9\x93\xAE\x82Őݒ肳\x82\xEA\x82Ȃ\xA2
+ *	- sdkddkver.h \x82\xAA\x91\xB6\x8D݂\xB5\x82Ȃ\xA2
+ *		_WIN32_WINNT \x82\xA9\x82\xE7 _WIN32_IE \x82Ȃǂ\xF0\x93K\x90؂Ȓl\x82Ɏ\xA9\x93\xAE\x90ݒ肷\x82\xE9\x83w\x83b\x83_
+ *		\x8E蓮\x82Őݒ肷\x82\xE9
+ *	- WinSDKVer.h \x82\xAA\x91\xB6\x8D݂\xB5\x82Ȃ\xA2
+ *		_WIN32_WINNT_MAXVER \x82\xAA\x82Ȃ\xA2
+ *		\x8Eg\x97p\x82\xB5\x82Ă\xA2\x82\xE9 SDK \x82̃o\x81[\x83W\x83\x87\x83\x93\x82̃q\x83\x93\x83g\x82𓾂\xE7\x82\xEA\x82Ȃ\xA2
+ */
+#if !defined(_WIN32_IE)
+#define _WIN32_IE       0x0600		// _WIN32_IE_XP
+#endif

Modified: branches/cmake/teraterm/common/tmfc.cpp
===================================================================
--- branches/cmake/teraterm/common/tmfc.cpp	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/common/tmfc.cpp	2019-05-19 15:06:12 UTC (rev 7694)
@@ -554,14 +554,10 @@
 	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);
@@ -617,8 +613,10 @@
 {
 	if (m_hWnd != nullptr) {
 		HWND hWnd;
-		::EnableWindow(m_hParentWnd,TRUE);
-		::SetFocus(m_hParentWnd);
+		if (m_hParentWnd != nullptr) {
+			::EnableWindow(m_hParentWnd,TRUE);
+			::SetFocus(m_hParentWnd);
+		}
 		hWnd = m_hWnd;
 		m_hWnd = nullptr;
 		::DestroyWindow(hWnd);
@@ -715,6 +713,8 @@
 TTCPropertySheet::TTCPropertySheet(HINSTANCE hInstance, LPCTSTR pszCaption, HWND hParentWnd)
 {
 	m_hInst = hInstance;
+	m_hWnd = 0;
+	m_hParentWnd = hParentWnd;
 	memset(&m_psh, 0, sizeof(m_psh));
 	m_psh.dwSize = sizeof(m_psh);
 	m_psh.dwFlags = PSH_DEFAULT | PSH_NOAPPLYNOW | PSH_USECALLBACK;	// | PSH_MODELESS

Modified: branches/cmake/teraterm/common/tmfc.h
===================================================================
--- branches/cmake/teraterm/common/tmfc.h	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/common/tmfc.h	2019-05-19 15:06:12 UTC (rev 7694)
@@ -164,6 +164,7 @@
 	INT_PTR DoModal();
 	PROPSHEETHEADER m_psh;
 	HWND m_hWnd;
+	HWND m_hParentWnd;
 	static int CALLBACK PropSheetProc(HWND hWnd, UINT msg, LPARAM lParam);
 	HINSTANCE m_hInst;
 };

Modified: branches/cmake/teraterm/common/tmfc_frame.cpp
===================================================================
--- branches/cmake/teraterm/common/tmfc_frame.cpp	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/common/tmfc_frame.cpp	2019-05-19 15:06:12 UTC (rev 7694)
@@ -66,7 +66,7 @@
 	m_hParentWnd = hParentWnd;
 	pseudoPtr = this;
 	HWND hWnd = ::CreateWindowEx(
-		0,
+		WS_EX_OVERLAPPEDWINDOW,
 		lpszClassName,
 		lpszWindowName,
 		dwStyle,

Modified: branches/cmake/teraterm/common/ttlib.c
===================================================================
--- branches/cmake/teraterm/common/ttlib.c	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/common/ttlib.c	2019-05-19 15:06:12 UTC (rev 7694)
@@ -39,8 +39,10 @@
 #include <mbctype.h>	// for _ismbblead
 #include <assert.h>
 
+#include "teraterm_conf.h"
 #include "teraterm.h"
 #include "tttypes.h"
+#include "compat_win.h"
 
 /* OS version with GetVersionEx(*1)
 
@@ -944,7 +946,7 @@
 	strncpy_s(MyDocSetupFName, sizeof(MyDocSetupFName), MyDoc, _TRUNCATE);
 	AppendSlash(MyDocSetupFName,sizeof(MyDocSetupFName));
 	strncat_s(MyDocSetupFName, sizeof(MyDocSetupFName), file, _TRUNCATE);
-	if (GetFileAttributesA(MyDocSetupFName) != -1) {
+	if (GetFileAttributesA(MyDocSetupFName) != INVALID_FILE_ATTRIBUTES) {
 		strncpy_s(dest, destlen, MyDocSetupFName, _TRUNCATE);
 		return;
 	}
@@ -955,38 +957,69 @@
 	strncat_s(dest, destlen, file, _TRUNCATE);
 }
 
+/*
+ * Get home(exe,dll) directory
+ * @param[in]		hInst		WinMain()\x82\xCC HINSTANCE \x82܂\xBD\x82\xCD NULL
+ * @param[in,out]	HomeDir
+ * @param[out]		HomeDirLen
+ */
+void GetHomeDir(HINSTANCE hInst, char *HomeDir, size_t HomeDirLen)
+{
+	char Temp[MAX_PATH];
+	DWORD result = GetModuleFileNameA(NULL,Temp,sizeof(Temp));
+	if (result == 0 || result == _countof(Temp)) {
+		// \x83p\x83X\x82̎擾\x82Ɏ\xB8\x94s\x82\xB5\x82\xBD\x81B\x92v\x96\xBD\x93I\x81Aabort() \x82\xB7\x82\xE9\x81B
+		abort();
+		// \x82\xB1\x82\xB1\x82\xC5return\x82\xB5\x82Ă\xE0\x83v\x83\x89\x83O\x83C\x83\x93(ttpset.dll)\x82̃\x8D\x81[\x83h\x82Ɏ\xB8\x94s\x82\xB5\x82\xC4abort()\x82\xB7\x82\xE9
+	}
+	ExtractDirName(Temp, Temp);
+	strncpy_s(HomeDir, HomeDirLen, Temp, _TRUNCATE);
+}
+
 // \x83f\x83t\x83H\x83\x8B\x83g\x82\xCC TERATERM.INI \x82̃t\x83\x8B\x83p\x83X\x82\xF0 ttpmacro \x82\xA9\x82\xE7\x82\xE0
 // \x8E擾\x82\xB7\x82邽\x82߂ɒlj\xC1\x82\xB5\x82\xBD\x81B(2007.2.18 maya)
-void GetDefaultSetupFName(char *home, char *dest, int destlen)
+void GetDefaultSetupFName(const char *home, char *dest, int destlen)
 {
 	GetDefaultFName(home, "TERATERM.INI", dest, destlen);
 }
 
+/*
+ *	UILanguageFile\x82̃t\x83\x8B\x83p\x83X\x82\xF0\x8E擾\x82\xB7\x82\xE9
+ *
+ *	@param[in]		HomeDir					exe,dll\x82̑\xB6\x8D݂\xB7\x82\xE9\x83t\x83H\x83\x8B\x83_ GetHomeDir()\x82Ŏ擾\x82ł\xAB\x82\xE9
+ *	@param[in]		UILanguageFileRel		lng\x83t\x83@\x83C\x83\x8B\x81AHomeDir\x82\xA9\x82\xE7\x82̑\x8A\x91΃p\x83X
+ *	@param[in,out]	UILanguageFileFull		lng\x83t\x83@\x83C\x83\x8Bptr\x81A\x83t\x83\x8B\x83p\x83X
+ *	@param[in]		UILanguageFileFullLen	lng\x83t\x83@\x83C\x83\x8Blen\x81A\x83t\x83\x8B\x83p\x83X
+ */
+void GetUILanguageFileFull(const char *HomeDir, const char *UILanguageFileRel,
+						   char *UILanguageFileFull, size_t UILanguageFileFullLen)
+{
+	char CurDir[MAX_PATH];
+
+	/* Get UILanguageFile Full Path */
+	GetCurrentDirectoryA(sizeof(CurDir), CurDir);
+	SetCurrentDirectoryA(HomeDir);
+	_fullpath(UILanguageFileFull, UILanguageFileRel, UILanguageFileFullLen);
+	SetCurrentDirectoryA(CurDir);
+}
+
 void GetUILanguageFile(char *buf, int buflen)
 {
 	char HomeDir[MAX_PATH];
 	char Temp[MAX_PATH];
 	char SetupFName[MAX_PATH];
-	char CurDir[MAX_PATH];
 
 	/* Get home directory */
-	if (GetModuleFileNameA(NULL,Temp,sizeof(Temp)) == 0) {
-		memset(buf, 0, buflen);
-		return;
-	}
-	ExtractDirName(Temp, HomeDir);
+	GetHomeDir(NULL, HomeDir, sizeof(HomeDir));
 
 	/* Get SetupFName */
 	GetDefaultSetupFName(HomeDir, SetupFName, sizeof(SetupFName));
 
 	/* Get LanguageFile name */
-	GetPrivateProfileStringA("Tera Term", "UILanguageFile", "",
+	GetPrivateProfileStringA("Tera Term", "UILanguageFile", "lang\\Default.lng",
 	                        Temp, sizeof(Temp), SetupFName);
 
-	GetCurrentDirectoryA(sizeof(CurDir), CurDir);
-	SetCurrentDirectoryA(HomeDir);
-	_fullpath(buf, Temp, buflen);
-	SetCurrentDirectoryA(CurDir);
+	GetUILanguageFileFull(HomeDir, Temp, buf, buflen);
 }
 
 // \x8Ew\x92肵\x82\xBD\x83G\x83\x93\x83g\x83\x8A\x82\xF0 teraterm.ini \x82\xA9\x82\xE7\x93ǂݎ\xE6\x82\xE9 (2009.3.23 yutaka)
@@ -997,11 +1030,7 @@
 	char SetupFName[MAX_PATH];
 
 	/* Get home directory */
-	if (GetModuleFileNameA(NULL,Temp,sizeof(Temp)) == 0) {
-		strncpy_s(buf, buflen, "off", _TRUNCATE);
-		return;
-	}
-	ExtractDirName(Temp, HomeDir);
+	GetHomeDir(NULL, HomeDir, sizeof(HomeDir));
 
 	/* Get SetupFName */
 	GetDefaultSetupFName(HomeDir, SetupFName, sizeof(SetupFName));
@@ -1151,20 +1180,22 @@
 	char tmp[1024];
 	va_list arg;
 	va_start(arg, fmt);
-	_vsnprintf(tmp, sizeof(tmp), fmt, arg);
+	_vsnprintf_s(tmp, sizeof(tmp), _TRUNCATE, fmt, arg);
 	va_end(arg);
 	OutputDebugStringA(tmp);
 }
 
+#if defined(UNICODE)
 void OutputDebugPrintfW(const wchar_t *fmt, ...)
 {
 	wchar_t tmp[1024];
 	va_list arg;
 	va_start(arg, fmt);
-	_vsnwprintf(tmp, _countof(tmp), fmt, arg);
+	_vsnwprintf_s(tmp, _countof(tmp), _TRUNCATE, fmt, arg);
 	va_end(arg);
 	OutputDebugStringW(tmp);
 }
+#endif
 
 #if (_MSC_VER < 1800)
 BOOL vercmp(
@@ -1535,17 +1566,10 @@
 // OPENFILENAMEA.lStructSize \x82ɑ\xE3\x93\xFC\x82\xB7\x82\xE9\x92l
 DWORD get_OPENFILENAME_SIZEA()
 {
-#if (_WIN32_WINNT >= 0x0500)
-#if !defined(OPENFILENAME_SIZE_VERSION_400A)
-#define OPENFILENAME_SIZE_VERSION_400A 76
-#endif
 	if (IsWindows2000OrLater()) {
 		return sizeof(OPENFILENAMEA);
 	}
 	return OPENFILENAME_SIZE_VERSION_400A;
-#else
-	return sizeof(OPENFILENAMEA);
-#endif
 }
 
 #if defined(UNICODE)
@@ -1933,3 +1957,67 @@
 	assert(r == TRUE);
 	*logfont = nci.lfStatusFont;
 }
+
+/**
+ *	\x83E\x83B\x83\x93\x83h\x83E\x95\\x8E\xA6\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x83f\x83B\x83X\x83v\x83\x8C\x83C\x82̃f\x83X\x83N\x83g\x83b\x83v\x82͈̔͂\xF0\x8E擾\x82\xB7\x82\xE9
+ *	@param[in]		hWnd	\x83E\x83B\x83\x93\x83h\x83E\x82̃n\x83\x93\x83h\x83\x8B
+ *	@param[out]		rect	\x83f\x83X\x83N\x83g\x83b\x83v
+ */
+void GetDesktopRect(HWND hWnd, RECT *rect)
+{
+	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ꍇ
+		MONITORINFO monitorInfo;
+		HMONITOR hMonitor = MonitorFromWindow(hWnd, MONITOR_DEFAULTTONEAREST);
+		monitorInfo.cbSize = sizeof(MONITORINFO);
+		GetMonitorInfo(hMonitor, &monitorInfo);
+		*rect = monitorInfo.rcWork;
+	} else {
+		// \x83}\x83\x8B\x83`\x83\x82\x83j\x83^\x82\xAA\x83T\x83|\x81[\x83g\x82\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x8Fꍇ
+		SystemParametersInfo(SPI_GETWORKAREA, 0, rect, 0);
+	}
+}
+
+/**
+ *	\x8Ew\x92\xE8\x83E\x83B\x83\x93\x83h\x83E\x82̒\x86\x89\x9B\x82ɃE\x83B\x83\x93\x83h\x83E\x82\xF0\x94z\x92u\x82\xB7\x82\xE9
+ *	@param[in]	hWnd		\x88ʒu\x82𒲐\xAE\x82\xB7\x82\xE9\x83E\x83B\x83\x93\x83h\x83E
+ *	@param[in]	hWndParent	\x82\xB1\x82̃E\x83B\x83\x93\x83h\x83E\x82̒\x86\x89\x9B\x82Ɉړ\xAE\x82\xB7\x82\xE9
+ */
+void CenterWindow(HWND hWnd, HWND hWndParent)
+{
+	RECT rcWnd;
+	LONG WndWidth;
+	LONG WndHeight;
+	RECT rcParent;
+	int NewX;
+	int NewY;
+	RECT rcDesktop;
+	BOOL r;
+
+	r = GetWindowRect(hWnd, &rcWnd);
+	assert(r != FALSE); (void)r;
+	WndWidth = rcWnd.right - rcWnd.left;
+	WndHeight = rcWnd.bottom - rcWnd.top;
+	r = GetWindowRect(hWndParent, &rcParent);
+	assert(r != FALSE); (void)r;
+
+	// \x90V\x82\xB5\x82\xA2\x88ʒu
+	NewX = (rcParent.left + rcParent.right) / 2 - WndWidth / 2;
+	NewY = (rcParent.top + rcParent.bottom) / 2 - WndHeight / 2;
+
+	// \x83f\x83X\x83N\x83g\x83b\x83v\x82\xA9\x82\xE7\x82͂ݏo\x82\xB7\x8Fꍇ\x81A\x92\xB2\x90\xAE\x82\xB7\x82\xE9
+	GetDesktopRect(hWndParent, &rcDesktop);
+	if (NewX + WndWidth > rcDesktop.right)
+		NewX = rcDesktop.right - WndWidth;
+	if (NewX < rcDesktop.left)
+		NewX = rcDesktop.left;
+
+	if (NewY + WndHeight > rcDesktop.bottom)
+		NewY = rcDesktop.bottom - WndHeight;
+	if (NewY < rcDesktop.top)
+		NewY = rcDesktop.top;
+
+	// \x88ړ\xAE\x82\xB7\x82\xE9
+	SetWindowPos(hWnd, NULL, NewX, NewY, 0, 0,
+				 SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
+}

Modified: branches/cmake/teraterm/common/ttlib.h
===================================================================
--- branches/cmake/teraterm/common/ttlib.h	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/common/ttlib.h	2019-05-19 15:06:12 UTC (rev 7694)
@@ -82,8 +82,11 @@
 int GetNthNum2(PCHAR Source, int Nth, int defval);
 DllExport void GetDownloadFolder(char *dest, int destlen);
 void WINAPI GetDefaultFName(const char *home, const char *file, char *dest, int destlen);
-void GetDefaultSetupFName(char *home, char *dest, int destlen);
+void GetHomeDir(HINSTANCE hInst, char *HomeDir, size_t HomeDirLen);
+void GetDefaultSetupFName(const char *home, char *dest, int destlen);
 void GetUILanguageFile(char *buf, int buflen);
+void GetUILanguageFileFull(const char *HomeDir, const char *UILanguageFileRel,
+						   char *UILanguageFileFull, size_t UILanguageFileFullLen);
 void GetOnOffEntryInifile(char *entry, char *buf, int buflen);
 DllExport void get_lang_msg(const char *key, PCHAR buf, int buf_len, const char *def, const char *iniFile);
 DllExport void get_lang_msgU8(const char *key, PCHAR buf, int buf_len, const char *def, const char *iniFile);
@@ -129,6 +132,8 @@
 	HWND hWnd, const POINT *point,
 	BOOL *InWindow, BOOL *InClient, BOOL *InTitleBar);
 DllExport void GetMessageboxFont(LOGFONTA *logfont);
+void GetDesktopRect(HWND hWnd, RECT *rect);
+DllExport void CenterWindow(HWND hWnd, HWND hWndParent);
 
 #define CheckFlag(var, flag)	(((var) & (flag)) != 0)
 

Copied: branches/cmake/teraterm/keycode/keycode.v16.vcxproj (from rev 7693, branches/cmake/teraterm/ttptek/ttptek.v14.vcxproj)
===================================================================
--- branches/cmake/teraterm/keycode/keycode.v16.vcxproj	                        (rev 0)
+++ branches/cmake/teraterm/keycode/keycode.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,138 @@
+<?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>{B31BF2E8-79E6-4735-BEA2-C1B4041C2D2E}</ProjectGuid>
+    <RootNamespace>keycode</RootNamespace>
+    <ProjectName>keycode</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</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'">
+    <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>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <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)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>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="keycode.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="keycode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="keycode-version.rc" />
+    <ResourceCompile Include="keycode.rc">
+      <Culture Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">0x0411</Culture>
+      <Culture Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">0x0411</Culture>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="kc_res.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Added: branches/cmake/teraterm/keycode/keycode.v16.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/keycode/keycode.v16.vcxproj.filters	                        (rev 0)
+++ branches/cmake/teraterm/keycode/keycode.v16.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,40 @@
+<?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>{ecd3cbea-075b-4c13-a52a-fd2954d4a8ed}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{30dab4eb-5d58-472d-9cbf-19372fbd61bb}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{2609d358-8047-4097-9b36-5e2502ac3af0}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="keycode.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="keycode.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="keycode-version.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="keycode.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="kc_res.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>

Copied: branches/cmake/teraterm/svnrev/svnrev.v16.vcxproj (from rev 7693, branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v14.vcxproj)
===================================================================
--- branches/cmake/teraterm/svnrev/svnrev.v16.vcxproj	                        (rev 0)
+++ branches/cmake/teraterm/svnrev/svnrev.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,100 @@
+<?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>{80F1C3F0-A213-4D48-85C8-A265990D19A7}</ProjectGuid>
+    <RootNamespace>svnrev</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>svnrev</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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>
+  <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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="svnrev.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="svnrev.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Added: branches/cmake/teraterm/svnrev/svnrev.v16.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/svnrev/svnrev.v16.vcxproj.filters	                        (rev 0)
+++ branches/cmake/teraterm/svnrev/svnrev.v16.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,23 @@
+<?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>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="svnrev.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="svnrev.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Modified: branches/cmake/teraterm/teraterm/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/teraterm/CMakeLists.txt	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/teraterm/CMakeLists.txt	2019-05-19 15:06:12 UTC (rev 7694)
@@ -168,7 +168,7 @@
   ${SFMT_INCLUDE_DIRS}
   ${ONIGURUMA_INCLUDE_DIRS}
   .
-  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}/../ttpdlg
   )
 
 link_directories(
@@ -218,7 +218,8 @@
   )
 
 # copy .lng files
-if(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017")
+if(MSVC AND ("${MSVC_VERSION}" GREATER_EQUAL "1910"))
+  # Visual Studio 2017以上の時
   add_custom_target(
     copy_lang ALL
     DEPENDS

Modified: branches/cmake/teraterm/teraterm/addsetting.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/addsetting.cpp	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/teraterm/addsetting.cpp	2019-05-19 15:06:12 UTC (rev 7694)
@@ -29,6 +29,7 @@
 /*
  * Additional settings dialog
  */
+#include "teraterm_conf.h"
 
 #include <stdio.h>
 #include <tchar.h>
@@ -1515,3 +1516,8 @@
 	delete m_CygwinPage;
 }
 
+void CAddSettingPropSheetDlg::OnInitDialog()
+{
+	TTCPropertySheet::OnInitDialog();
+	CenterWindow(m_hWnd, m_hParentWnd);
+}

Modified: branches/cmake/teraterm/teraterm/addsetting.h
===================================================================
--- branches/cmake/teraterm/teraterm/addsetting.h	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/teraterm/addsetting.h	2019-05-19 15:06:12 UTC (rev 7694)
@@ -126,8 +126,10 @@
 	CAddSettingPropSheetDlg(HINSTANCE hInstance, LPCTSTR pszCaption, HWND hParentWnd);
 	virtual ~CAddSettingPropSheetDlg();
 private:
+	void OnInitDialog();
+
 	HPROPSHEETPAGE hPsp[6];
-	
+
 	CGeneralPropPageDlg   *m_GeneralPage;
 	CSequencePropPageDlg  *m_SequencePage;
 	CCopypastePropPageDlg *m_CopypastePage;

Modified: branches/cmake/teraterm/teraterm/dnddlg.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/dnddlg.cpp	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/teraterm/dnddlg.cpp	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,5 +1,5 @@
 /*
- * (C) 2005-2018 TeraTerm Project
+ * (C) 2005-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -165,6 +165,7 @@
 						(WPARAM)GetDlgItem(hDlgWnd, focus_id), TRUE);
 		}
 
+		CenterWindow(hDlgWnd, GetParent(hDlgWnd));
 		// 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;
 	}

Modified: branches/cmake/teraterm/teraterm/ftdlg.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/ftdlg.cpp	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/teraterm/ftdlg.cpp	2019-05-19 15:06:12 UTC (rev 7694)
@@ -28,10 +28,13 @@
  */
 
 /* TERATERM.EXE, file transfer dialog box */
+#include "teraterm_conf.h"
+
 #include <stdio.h>
 #include <windows.h>
 #include <commctrl.h>
 #include <tchar.h>
+
 #include "teraterm.h"
 #include "tttypes.h"
 #include "ttftypes.h"

Modified: branches/cmake/teraterm/teraterm/prnabort.h
===================================================================
--- branches/cmake/teraterm/teraterm/prnabort.h	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/teraterm/prnabort.h	2019-05-19 15:06:12 UTC (rev 7694)
@@ -43,6 +43,7 @@
 	BOOL OnCancel();
 	BOOL OnInitDialog();
 	BOOL PostNcDestroy();
+//	BOOL DestroyWindow();
 
 private:
 	BOOL *m_pAbort;

Modified: branches/cmake/teraterm/teraterm/tekwin.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/tekwin.cpp	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/teraterm/tekwin.cpp	2019-05-19 15:06:12 UTC (rev 7694)
@@ -789,6 +789,8 @@
 		return;
 	}
 	OldEmu = ts.TEKColorEmu;
+	SetDialogFont(ts.SetupFName,
+				  ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
 	Ok = (*SetupWin)(HTEKWin, &ts);
 	FreeTTDLG();
 	if (Ok) {
@@ -830,6 +832,8 @@
 	if (! LoadTTDLG()) {
 		return;
 	}
+	SetDialogFont(ts.SetupFName,
+				  ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
 	(*WindowWindow)(HTEKWin,&Close);
 	FreeTTDLG();
 	if (Close) {

Modified: branches/cmake/teraterm/teraterm/teraterm.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/teraterm.cpp	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/teraterm/teraterm.cpp	2019-05-19 15:06:12 UTC (rev 7694)
@@ -29,6 +29,8 @@
 
 /* TERATERM.EXE, main */
 
+#include "teraterm_conf.h"
+
 #include <crtdbg.h>
 #include <tchar.h>
 #include "teraterm.h"
@@ -52,6 +54,9 @@
 #include "dlglib.h"
 #include "teraterml.h"
 
+#if defined(_DEBUG) && defined(_MSC_VER)
+#define new ::new(_NORMAL_BLOCK, __FILE__, __LINE__)
+#endif
 
 static BOOL AddFontFlag;
 static TCHAR TSpecialFont[MAX_PATH];
@@ -96,9 +101,6 @@
 
 static void init()
 {
-#ifdef _DEBUG
-	::_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
-#endif
 	DLLInit();
 	WinCompatInit();
 	//SetProcessDPIAware();
@@ -268,7 +270,7 @@
                    LPSTR lpszCmdLine, int nCmdShow)
 {
 #ifdef _DEBUG
-	::_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
+	_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
 #endif
 
 	LONG lCount = 0;
@@ -278,9 +280,8 @@
 	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");
+	// [Tera Term]\x83Z\x83N\x83V\x83\x87\x83\x93\x82\xCCDLG_SYSTEM_FONT\x82\xF0\x82Ƃ肠\x82\xA6\x82\xB8\x83Z\x83b\x83g\x82\xB7\x82\xE9
+	SetDialogFont(ts.SetupFName, ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
 
 	MSG msg;
 	while (GetMessage(&msg, NULL, 0, 0)) {

Modified: branches/cmake/teraterm/teraterm/ttdialog.c
===================================================================
--- branches/cmake/teraterm/teraterm/ttdialog.c	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/teraterm/ttdialog.c	2019-05-19 15:06:12 UTC (rev 7694)
@@ -74,3 +74,4 @@
 {
 	return TRUE;
 }
+

Modified: branches/cmake/teraterm/teraterm/ttermpro.v10.vcxproj
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.v10.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/teraterm/ttermpro.v10.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
@@ -63,7 +63,7 @@
     <ClCompile>
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(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>
@@ -109,7 +109,7 @@
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;%(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>
@@ -124,7 +124,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>onig_sd.lib;comctl32.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>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>
@@ -181,6 +181,7 @@
     <ClCompile Include="vtwin.cpp" />
     <ClCompile Include="winjump.c" />
     <ClCompile Include="WSAAsyncGetAddrInfo.c" />
+    <ClInclude Include="..\ttpdlg\dlg_res.h" />
     <ClCompile Include="../ttpdlg/ttdlg.c" />
     <ClInclude Include="../ttpdlg/ttdlg.h" />
   </ItemGroup>
@@ -188,8 +189,10 @@
     <None Include="..\..\cygterm\cygterm.ico" />
     <None Include="..\common\tek.ico" />
     <None Include="..\common\Teraterm.ico" />
+    <None Include="..\common\teraterm_3d.ico" />
     <None Include="..\common\teraterm_classic.ico" />
     <None Include="..\common\vt.ico" />
+    <None Include="..\common\vt_3d.ico" />
     <None Include="..\common\vt_classic.ico" />
   </ItemGroup>
   <ItemGroup>
@@ -198,11 +201,46 @@
     <ResourceCompile Include="../ttpdlg/ttpdlg.rc" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\common\compat_w95.h" />
+    <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" />
+    <ClInclude Include="..\common\ttftypes.h" />
+    <ClInclude Include="..\common\ttlib.h" />
+    <ClInclude Include="..\common\ttplugin.h" />
+    <ClInclude Include="..\common\tttypes.h" />
+    <ClInclude Include="..\common\tt_res.h" />
+    <ClInclude Include="..\common\win16api.h" />
     <ClInclude Include="addsetting.h" />
+    <ClInclude Include="buffer.h" />
+    <ClInclude Include="clipboar.h" />
+    <ClInclude Include="commlib.h" />
     <ClInclude Include="dnddlg.h" />
+    <ClInclude Include="filesys.h" />
+    <ClInclude Include="ftdlg.h" />
+    <ClInclude Include="keyboard.h" />
+    <ClInclude Include="prnabort.h" />
+    <ClInclude Include="protodlg.h" />
     <ClInclude Include="sizetip.h" />
-    <ClInclude Include="..\common\tt_res.h" />
+    <ClInclude Include="teklib.h" />
+    <ClInclude Include="tekwin.h" />
+    <ClInclude Include="telnet.h" />
+    <ClInclude Include="teraprn.h" />
+    <ClInclude Include="ttdde.h" />
+    <ClInclude Include="ttdialog.h" />
     <ClInclude Include="ttfileio.h" />
+    <ClInclude Include="ttime.h" />
+    <ClInclude Include="ttplug.h" />
+    <ClInclude Include="ttsetup.h" />
+    <ClInclude Include="ttwinman.h" />
+    <ClInclude Include="ttwsk.h" />
+    <ClInclude Include="vtdisp.h" />
+    <ClInclude Include="vtterm.h" />
+    <ClInclude Include="vtwin.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\svnrev\svnrev.v10.vcxproj">

Modified: branches/cmake/teraterm/teraterm/ttermpro.v10.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.v10.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/teraterm/ttermpro.v10.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -16,29 +16,17 @@
       <UniqueIdentifier>{0fe7021a-7e2f-4932-b0fe-1f87c87345cc}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl</Extensions>
     </Filter>
+    <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="addsetting.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\common\dlglib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="filesys.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="ftdlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="prnabort.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="protodlg.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>
@@ -75,9 +63,6 @@
     <ClCompile Include="ttdde.c">
       <Filter>Source Files %28C%29</Filter>
     </ClCompile>
-    <ClCompile Include="ttdialog.c">
-      <Filter>Source Files %28C%29</Filter>
-    </ClCompile>
     <ClCompile Include="ttfileio.c">
       <Filter>Source Files %28C%29</Filter>
     </ClCompile>
@@ -114,6 +99,54 @@
     <ClCompile Include="dnddlg.cpp">
       <Filter>dialog</Filter>
     </ClCompile>
+    <ClCompile Include="ftdlg.cpp">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <ClCompile Include="protodlg.cpp">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <ClCompile Include="prnabort.cpp">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <ClCompile Include="ttdialog.c">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <ClCompile Include="addsetting.cpp">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\dlglib.c">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <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>
+    <ClCompile Include="..\common\tmfc_frame.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\tmfc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\cygterm\cygterm.ico">
@@ -134,6 +167,12 @@
     <None Include="..\common\vt_classic.ico">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="..\common\teraterm_3d.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="..\common\vt_3d.ico">
+      <Filter>Resource Files</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="tt-version.rc">
@@ -142,11 +181,11 @@
     <ResourceCompile Include="ttermpro.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
+    <ResourceCompile Include="../ttpdlg/ttpdlg.rc">
+      <Filter>ttpdlg</Filter>
+    </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="addsetting.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="sizetip.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -156,8 +195,122 @@
     <ClInclude Include="ttfileio.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\common\ttlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttwinman.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttftypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="teklib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\teraterm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\tektypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="tekwin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="telnet.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="teraprn.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttwsk.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttcommon.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttdde.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttddecmnd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttime.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttplug.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttplugin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttsetup.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\tttypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\tt-version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="buffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="clipboar.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="commlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="filesys.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="keyboard.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="vtterm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="vtwin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="vtdisp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\compat_w95.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="dnddlg.h">
       <Filter>dialog</Filter>
     </ClInclude>
+    <ClInclude Include="prnabort.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <ClInclude Include="protodlg.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <ClInclude Include="ttdialog.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\dlglib.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <ClInclude Include="ftdlg.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <ClInclude Include="addsetting.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <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>
+    <ClInclude Include="..\common\tmfc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

Modified: branches/cmake/teraterm/teraterm/ttermpro.v11.vcxproj
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.v11.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/teraterm/ttermpro.v11.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
@@ -62,7 +62,7 @@
     <ClCompile>
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(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 />
@@ -106,7 +106,7 @@
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;%(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>
@@ -121,7 +121,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>onig_sd.lib;comctl32.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>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>
@@ -178,6 +178,7 @@
     <ClCompile Include="vtwin.cpp" />
     <ClCompile Include="winjump.c" />
     <ClCompile Include="WSAAsyncGetAddrInfo.c" />
+    <ClInclude Include="..\ttpdlg\dlg_res.h" />
     <ClCompile Include="../ttpdlg/ttdlg.c" />
     <ClInclude Include="../ttpdlg/ttdlg.h" />
   </ItemGroup>
@@ -185,8 +186,10 @@
     <Image Include="..\..\cygterm\cygterm.ico" />
     <Image Include="..\common\tek.ico" />
     <Image Include="..\common\Teraterm.ico" />
+    <Image Include="..\common\teraterm_3d.ico" />
     <Image Include="..\common\teraterm_classic.ico" />
     <Image Include="..\common\vt.ico" />
+    <Image Include="..\common\vt_3d.ico" />
     <Image Include="..\common\vt_classic.ico" />
   </ItemGroup>
   <ItemGroup>
@@ -195,11 +198,46 @@
     <ResourceCompile Include="../ttpdlg/ttpdlg.rc" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\common\compat_w95.h" />
+    <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" />
+    <ClInclude Include="..\common\ttftypes.h" />
+    <ClInclude Include="..\common\ttlib.h" />
+    <ClInclude Include="..\common\ttplugin.h" />
+    <ClInclude Include="..\common\tttypes.h" />
+    <ClInclude Include="..\common\tt_res.h" />
+    <ClInclude Include="..\common\win16api.h" />
     <ClInclude Include="addsetting.h" />
+    <ClInclude Include="buffer.h" />
+    <ClInclude Include="clipboar.h" />
+    <ClInclude Include="commlib.h" />
     <ClInclude Include="dnddlg.h" />
+    <ClInclude Include="filesys.h" />
+    <ClInclude Include="ftdlg.h" />
+    <ClInclude Include="keyboard.h" />
+    <ClInclude Include="prnabort.h" />
+    <ClInclude Include="protodlg.h" />
     <ClInclude Include="sizetip.h" />
-    <ClInclude Include="..\common\tt_res.h" />
+    <ClInclude Include="teklib.h" />
+    <ClInclude Include="tekwin.h" />
+    <ClInclude Include="telnet.h" />
+    <ClInclude Include="teraprn.h" />
+    <ClInclude Include="ttdde.h" />
+    <ClInclude Include="ttdialog.h" />
     <ClInclude Include="ttfileio.h" />
+    <ClInclude Include="ttime.h" />
+    <ClInclude Include="ttplug.h" />
+    <ClInclude Include="ttsetup.h" />
+    <ClInclude Include="ttwinman.h" />
+    <ClInclude Include="ttwsk.h" />
+    <ClInclude Include="vtdisp.h" />
+    <ClInclude Include="vtterm.h" />
+    <ClInclude Include="vtwin.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\svnrev\svnrev.v11.vcxproj">

Modified: branches/cmake/teraterm/teraterm/ttermpro.v11.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.v11.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/teraterm/ttermpro.v11.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -16,29 +16,17 @@
       <UniqueIdentifier>{883dc207-eaa3-4b15-8b47-14d81f0db9df}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl</Extensions>
     </Filter>
+    <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="addsetting.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\common\dlglib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="filesys.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="ftdlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="prnabort.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="protodlg.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>
@@ -75,9 +63,6 @@
     <ClCompile Include="ttdde.c">
       <Filter>Source Files %28C%29</Filter>
     </ClCompile>
-    <ClCompile Include="ttdialog.c">
-      <Filter>Source Files %28C%29</Filter>
-    </ClCompile>
     <ClCompile Include="ttfileio.c">
       <Filter>Source Files %28C%29</Filter>
     </ClCompile>
@@ -114,6 +99,54 @@
     <ClCompile Include="dnddlg.cpp">
       <Filter>dialog</Filter>
     </ClCompile>
+    <ClCompile Include="ftdlg.cpp">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <ClCompile Include="protodlg.cpp">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <ClCompile Include="prnabort.cpp">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <ClCompile Include="ttdialog.c">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <ClCompile Include="addsetting.cpp">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\dlglib.c">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <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>
+    <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">
@@ -134,6 +167,12 @@
     <Image Include="..\common\vt_classic.ico">
       <Filter>Resource Files</Filter>
     </Image>
+    <Image Include="..\common\teraterm_3d.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="..\common\vt_3d.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="tt-version.rc">
@@ -142,11 +181,11 @@
     <ResourceCompile Include="ttermpro.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
+    <ResourceCompile Include="../ttpdlg/ttpdlg.rc">
+      <Filter>ttpdlg</Filter>
+    </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="addsetting.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="sizetip.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -156,8 +195,122 @@
     <ClInclude Include="ttfileio.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\common\ttlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttwinman.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttftypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="teklib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\teraterm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\tektypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="tekwin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="telnet.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="teraprn.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttwsk.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttcommon.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttdde.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttddecmnd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttime.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttplug.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttplugin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttsetup.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\tttypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\tt-version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="buffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="clipboar.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="commlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="filesys.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="keyboard.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="vtterm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="vtwin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="vtdisp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\compat_w95.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="dnddlg.h">
       <Filter>dialog</Filter>
     </ClInclude>
+    <ClInclude Include="prnabort.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <ClInclude Include="protodlg.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <ClInclude Include="ttdialog.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\dlglib.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <ClInclude Include="ftdlg.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <ClInclude Include="addsetting.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <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>
+    <ClInclude Include="..\common\tmfc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

Modified: branches/cmake/teraterm/teraterm/ttermpro.v12.vcxproj
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.v12.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/teraterm/ttermpro.v12.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
@@ -62,7 +62,7 @@
     <ClCompile>
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(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 />
@@ -84,7 +84,6 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib</IgnoreSpecificDefaultLibraries>
     </Link>
     <Manifest>
       <AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
@@ -107,7 +106,7 @@
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;%(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>
@@ -129,7 +128,6 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreSpecificDefaultLibraries>nafxcw.lib;LIBCMT.lib</IgnoreSpecificDefaultLibraries>
     </Link>
     <Manifest>
       <AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
@@ -180,6 +178,7 @@
     <ClCompile Include="vtwin.cpp" />
     <ClCompile Include="winjump.c" />
     <ClCompile Include="WSAAsyncGetAddrInfo.c" />
+    <ClInclude Include="..\ttpdlg\dlg_res.h" />
     <ClCompile Include="../ttpdlg/ttdlg.c" />
     <ClInclude Include="../ttpdlg/ttdlg.h" />
   </ItemGroup>
@@ -187,8 +186,10 @@
     <Image Include="..\..\cygterm\cygterm.ico" />
     <Image Include="..\common\tek.ico" />
     <Image Include="..\common\Teraterm.ico" />
+    <Image Include="..\common\teraterm_3d.ico" />
     <Image Include="..\common\teraterm_classic.ico" />
     <Image Include="..\common\vt.ico" />
+    <Image Include="..\common\vt_3d.ico" />
     <Image Include="..\common\vt_classic.ico" />
   </ItemGroup>
   <ItemGroup>
@@ -197,11 +198,46 @@
     <ResourceCompile Include="../ttpdlg/ttpdlg.rc" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\common\compat_w95.h" />
+    <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" />
+    <ClInclude Include="..\common\ttftypes.h" />
+    <ClInclude Include="..\common\ttlib.h" />
+    <ClInclude Include="..\common\ttplugin.h" />
+    <ClInclude Include="..\common\tttypes.h" />
     <ClInclude Include="..\common\tt_res.h" />
+    <ClInclude Include="..\common\win16api.h" />
     <ClInclude Include="addsetting.h" />
+    <ClInclude Include="buffer.h" />
+    <ClInclude Include="clipboar.h" />
+    <ClInclude Include="commlib.h" />
     <ClInclude Include="dnddlg.h" />
+    <ClInclude Include="filesys.h" />
+    <ClInclude Include="ftdlg.h" />
+    <ClInclude Include="keyboard.h" />
+    <ClInclude Include="prnabort.h" />
+    <ClInclude Include="protodlg.h" />
     <ClInclude Include="sizetip.h" />
+    <ClInclude Include="teklib.h" />
+    <ClInclude Include="tekwin.h" />
+    <ClInclude Include="telnet.h" />
+    <ClInclude Include="teraprn.h" />
+    <ClInclude Include="ttdde.h" />
+    <ClInclude Include="ttdialog.h" />
     <ClInclude Include="ttfileio.h" />
+    <ClInclude Include="ttime.h" />
+    <ClInclude Include="ttplug.h" />
+    <ClInclude Include="ttsetup.h" />
+    <ClInclude Include="ttwinman.h" />
+    <ClInclude Include="ttwsk.h" />
+    <ClInclude Include="vtdisp.h" />
+    <ClInclude Include="vtterm.h" />
+    <ClInclude Include="vtwin.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\svnrev\svnrev.v12.vcxproj">
@@ -236,4 +272,4 @@
       <UserProperties RESOURCE_FILE="ttermpro.rc" />
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>
\ No newline at end of file

Modified: branches/cmake/teraterm/teraterm/ttermpro.v12.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.v12.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/teraterm/ttermpro.v12.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -16,29 +16,17 @@
       <UniqueIdentifier>{e3efecca-9842-408d-979e-a4c7af432f65}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl</Extensions>
     </Filter>
+    <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="addsetting.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\common\dlglib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="filesys.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="ftdlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="prnabort.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="protodlg.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>
@@ -75,9 +63,6 @@
     <ClCompile Include="ttdde.c">
       <Filter>Source Files %28C%29</Filter>
     </ClCompile>
-    <ClCompile Include="ttdialog.c">
-      <Filter>Source Files %28C%29</Filter>
-    </ClCompile>
     <ClCompile Include="ttfileio.c">
       <Filter>Source Files %28C%29</Filter>
     </ClCompile>
@@ -114,6 +99,54 @@
     <ClCompile Include="dnddlg.cpp">
       <Filter>dialog</Filter>
     </ClCompile>
+    <ClCompile Include="ftdlg.cpp">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <ClCompile Include="protodlg.cpp">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <ClCompile Include="prnabort.cpp">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <ClCompile Include="ttdialog.c">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <ClCompile Include="addsetting.cpp">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\dlglib.c">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <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>
+    <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">
@@ -134,6 +167,12 @@
     <Image Include="..\common\vt_classic.ico">
       <Filter>Resource Files</Filter>
     </Image>
+    <Image Include="..\common\teraterm_3d.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="..\common\vt_3d.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="tt-version.rc">
@@ -142,11 +181,11 @@
     <ResourceCompile Include="ttermpro.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
+    <ResourceCompile Include="../ttpdlg/ttpdlg.rc">
+      <Filter>ttpdlg</Filter>
+    </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="addsetting.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="sizetip.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -156,8 +195,122 @@
     <ClInclude Include="ttfileio.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\common\ttlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttwinman.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttftypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="teklib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\teraterm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\tektypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="tekwin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="telnet.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="teraprn.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttwsk.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttcommon.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttdde.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttddecmnd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttime.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttplug.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttplugin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttsetup.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\tttypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\tt-version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="buffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="clipboar.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="commlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="filesys.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="keyboard.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="vtterm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="vtwin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="vtdisp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\compat_w95.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="dnddlg.h">
       <Filter>dialog</Filter>
     </ClInclude>
+    <ClInclude Include="prnabort.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <ClInclude Include="protodlg.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <ClInclude Include="ttdialog.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\dlglib.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <ClInclude Include="ftdlg.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <ClInclude Include="addsetting.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <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>
+    <ClInclude Include="..\common\tmfc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file

Modified: branches/cmake/teraterm/teraterm/ttermpro.v14.vcxproj
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.v14.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/teraterm/ttermpro.v14.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
@@ -64,7 +64,7 @@
     <ClCompile>
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(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 />
@@ -76,7 +76,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0411</Culture>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>onig_sd.lib;comctl32.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -86,7 +86,6 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib</IgnoreSpecificDefaultLibraries>
     </Link>
     <Manifest>
       <AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
@@ -109,7 +108,7 @@
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;%(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>
@@ -131,7 +130,6 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreSpecificDefaultLibraries>nafxcw.lib;LIBCMT.lib</IgnoreSpecificDefaultLibraries>
     </Link>
     <Manifest>
       <AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
@@ -182,6 +180,7 @@
     <ClCompile Include="vtwin.cpp" />
     <ClCompile Include="winjump.c" />
     <ClCompile Include="WSAAsyncGetAddrInfo.c" />
+    <ClInclude Include="..\ttpdlg\dlg_res.h" />
     <ClCompile Include="../ttpdlg/ttdlg.c" />
     <ClInclude Include="../ttpdlg/ttdlg.h" />
   </ItemGroup>
@@ -189,8 +188,10 @@
     <Image Include="..\..\cygterm\cygterm.ico" />
     <Image Include="..\common\tek.ico" />
     <Image Include="..\common\Teraterm.ico" />
+    <Image Include="..\common\teraterm_3d.ico" />
     <Image Include="..\common\teraterm_classic.ico" />
     <Image Include="..\common\vt.ico" />
+    <Image Include="..\common\vt_3d.ico" />
     <Image Include="..\common\vt_classic.ico" />
   </ItemGroup>
   <ItemGroup>
@@ -199,11 +200,46 @@
     <ResourceCompile Include="../ttpdlg/ttpdlg.rc" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\common\compat_w95.h" />
+    <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" />
+    <ClInclude Include="..\common\ttftypes.h" />
+    <ClInclude Include="..\common\ttlib.h" />
+    <ClInclude Include="..\common\ttplugin.h" />
+    <ClInclude Include="..\common\tttypes.h" />
     <ClInclude Include="..\common\tt_res.h" />
+    <ClInclude Include="..\common\win16api.h" />
     <ClInclude Include="addsetting.h" />
+    <ClInclude Include="buffer.h" />
+    <ClInclude Include="clipboar.h" />
+    <ClInclude Include="commlib.h" />
     <ClInclude Include="dnddlg.h" />
+    <ClInclude Include="filesys.h" />
+    <ClInclude Include="ftdlg.h" />
+    <ClInclude Include="keyboard.h" />
+    <ClInclude Include="prnabort.h" />
+    <ClInclude Include="protodlg.h" />
     <ClInclude Include="sizetip.h" />
+    <ClInclude Include="teklib.h" />
+    <ClInclude Include="tekwin.h" />
+    <ClInclude Include="telnet.h" />
+    <ClInclude Include="teraprn.h" />
+    <ClInclude Include="ttdde.h" />
+    <ClInclude Include="ttdialog.h" />
     <ClInclude Include="ttfileio.h" />
+    <ClInclude Include="ttime.h" />
+    <ClInclude Include="ttplug.h" />
+    <ClInclude Include="ttsetup.h" />
+    <ClInclude Include="ttwinman.h" />
+    <ClInclude Include="ttwsk.h" />
+    <ClInclude Include="vtdisp.h" />
+    <ClInclude Include="vtterm.h" />
+    <ClInclude Include="vtwin.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\svnrev\svnrev.v14.vcxproj">

Modified: branches/cmake/teraterm/teraterm/ttermpro.v14.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.v14.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/teraterm/ttermpro.v14.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -16,29 +16,17 @@
       <UniqueIdentifier>{e3efecca-9842-408d-979e-a4c7af432f65}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl</Extensions>
     </Filter>
+    <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="addsetting.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\common\dlglib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="filesys.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="ftdlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="prnabort.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="protodlg.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>
@@ -75,9 +63,6 @@
     <ClCompile Include="ttdde.c">
       <Filter>Source Files %28C%29</Filter>
     </ClCompile>
-    <ClCompile Include="ttdialog.c">
-      <Filter>Source Files %28C%29</Filter>
-    </ClCompile>
     <ClCompile Include="ttfileio.c">
       <Filter>Source Files %28C%29</Filter>
     </ClCompile>
@@ -114,6 +99,54 @@
     <ClCompile Include="dnddlg.cpp">
       <Filter>dialog</Filter>
     </ClCompile>
+    <ClCompile Include="ftdlg.cpp">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <ClCompile Include="protodlg.cpp">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <ClCompile Include="prnabort.cpp">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <ClCompile Include="ttdialog.c">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <ClCompile Include="addsetting.cpp">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\dlglib.c">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <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>
+    <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">
@@ -134,6 +167,12 @@
     <Image Include="..\common\vt_classic.ico">
       <Filter>Resource Files</Filter>
     </Image>
+    <Image Include="..\common\teraterm_3d.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="..\common\vt_3d.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="tt-version.rc">
@@ -142,11 +181,11 @@
     <ResourceCompile Include="ttermpro.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
+    <ResourceCompile Include="../ttpdlg/ttpdlg.rc">
+      <Filter>ttpdlg</Filter>
+    </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="addsetting.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="sizetip.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -156,8 +195,122 @@
     <ClInclude Include="ttfileio.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\common\ttlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttwinman.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttftypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="teklib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\teraterm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\tektypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="tekwin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="telnet.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="teraprn.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttwsk.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttcommon.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttdde.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttddecmnd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttime.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttplug.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttplugin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttsetup.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\tttypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\tt-version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="buffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="clipboar.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="commlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="filesys.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="keyboard.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="vtterm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="vtwin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="vtdisp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\compat_w95.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="dnddlg.h">
       <Filter>dialog</Filter>
     </ClInclude>
+    <ClInclude Include="prnabort.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <ClInclude Include="protodlg.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <ClInclude Include="ttdialog.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\dlglib.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <ClInclude Include="ftdlg.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <ClInclude Include="addsetting.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <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>
+    <ClInclude Include="..\common\tmfc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

Modified: branches/cmake/teraterm/teraterm/ttermpro.v15.vcxproj
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.v15.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/teraterm/ttermpro.v15.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
@@ -78,7 +78,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0411</Culture>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>onig_sd.lib;comctl32.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -88,7 +88,6 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
     </Link>
     <Manifest>
       <AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
@@ -134,8 +133,6 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
     </Link>
     <Manifest>
       <AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
@@ -236,7 +233,6 @@
     <ClInclude Include="teklib.h" />
     <ClInclude Include="tekwin.h" />
     <ClInclude Include="telnet.h" />
-    <ClInclude Include="teraapp.h" />
     <ClInclude Include="teraprn.h" />
     <ClInclude Include="ttdde.h" />
     <ClInclude Include="ttdialog.h" />

Modified: branches/cmake/teraterm/teraterm/ttermpro.v15.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.v15.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/teraterm/ttermpro.v15.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
@@ -222,9 +222,6 @@
     <ClInclude Include="telnet.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="teraapp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="teraprn.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Copied: branches/cmake/teraterm/teraterm/ttermpro.v16.vcxproj (from rev 7693, branches/cmake/teraterm/teraterm/ttermpro.v15.vcxproj)
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.v16.vcxproj	                        (rev 0)
+++ branches/cmake/teraterm/teraterm/ttermpro.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,280 @@
+<?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>{BC4CDBE3-6269-47A8-BD74-EEB3A6160E06}</ProjectGuid>
+    <RootNamespace>ttermpro</RootNamespace>
+    <Keyword>MFCProj</Keyword>
+    <ProjectName>ttermpro</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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>
+  <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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+    <GenerateManifest>false</GenerateManifest>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+    <GenerateManifest>false</GenerateManifest>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <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;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BrowseInformation />
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0411</Culture>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>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>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Manifest>
+      <AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
+    <PreBuildEvent>
+      <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)..\ttpdlg\svnversion.h"</Command>
+      <Message>creating "$(ProjectDir)..\ttpdlg\svnversion.h"</Message>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <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;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(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;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>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Manifest>
+      <AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
+    <PreBuildEvent>
+      <Message>creating "$(ProjectDir)..\ttpdlg\svnversion.h"</Message>
+      <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)..\ttpdlg\svnversion.h"</Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\common\dlglib.c" />
+    <ClCompile Include="..\common\dlglib_cpp.cpp" />
+    <ClCompile Include="..\common\dlglib_tmpl.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" />
+    <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="ttplug.c" />
+    <ClCompile Include="ttsetup.c" />
+    <ClCompile Include="ttwinman.c" />
+    <ClCompile Include="ttwsk.c" />
+    <ClCompile Include="vtdisp.c" />
+    <ClCompile Include="vtterm.c" />
+    <ClCompile Include="vtwin.cpp" />
+    <ClCompile Include="winjump.c" />
+    <ClCompile Include="WSAAsyncGetAddrInfo.c" />
+    <ClInclude Include="../ttpdlg/dlg_res.h" />
+    <ClCompile Include="../ttpdlg/ttdlg.c" />
+    <ClInclude Include="../ttpdlg/ttdlg.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="..\..\cygterm\cygterm.ico" />
+    <Image Include="..\common\tek.ico" />
+    <Image Include="..\common\Teraterm.ico" />
+    <Image Include="..\common\teraterm_3d.ico" />
+    <Image Include="..\common\teraterm_classic.ico" />
+    <Image Include="..\common\vt.ico" />
+    <Image Include="..\common\vt_3d.ico" />
+    <Image Include="..\common\vt_classic.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="tt-version.rc" />
+    <ResourceCompile Include="ttermpro.rc" />
+    <ResourceCompile Include="../ttpdlg/ttpdlg.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\common\compat_w95.h" />
+    <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" />
+    <ClInclude Include="..\common\ttftypes.h" />
+    <ClInclude Include="..\common\ttlib.h" />
+    <ClInclude Include="..\common\ttplugin.h" />
+    <ClInclude Include="..\common\tttypes.h" />
+    <ClInclude Include="..\common\tt_res.h" />
+    <ClInclude Include="..\common\win16api.h" />
+    <ClInclude Include="addsetting.h" />
+    <ClInclude Include="buffer.h" />
+    <ClInclude Include="clipboar.h" />
+    <ClInclude Include="commlib.h" />
+    <ClInclude Include="dnddlg.h" />
+    <ClInclude Include="filesys.h" />
+    <ClInclude Include="ftdlg.h" />
+    <ClInclude Include="keyboard.h" />
+    <ClInclude Include="prnabort.h" />
+    <ClInclude Include="protodlg.h" />
+    <ClInclude Include="sizetip.h" />
+    <ClInclude Include="teklib.h" />
+    <ClInclude Include="tekwin.h" />
+    <ClInclude Include="telnet.h" />
+    <ClInclude Include="teraprn.h" />
+    <ClInclude Include="ttdde.h" />
+    <ClInclude Include="ttdialog.h" />
+    <ClInclude Include="ttfileio.h" />
+    <ClInclude Include="ttime.h" />
+    <ClInclude Include="ttplug.h" />
+    <ClInclude Include="ttsetup.h" />
+    <ClInclude Include="ttwinman.h" />
+    <ClInclude Include="ttwsk.h" />
+    <ClInclude Include="vtdisp.h" />
+    <ClInclude Include="vtterm.h" />
+    <ClInclude Include="vtwin.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\svnrev\svnrev.v16.vcxproj">
+      <Project>{80f1c3f0-a213-4d48-85c8-a265990d19a7}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\ttpcmn\ttpcmn.v16.vcxproj">
+      <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\ttpfile\ttpfile.v16.vcxproj">
+      <Project>{311f2b21-aec4-4384-8209-bb83b54749b4}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\ttpmacro\ttpmacro.v16.vcxproj">
+      <Project>{ba519362-a2c2-4b1a-905b-f00791f9038a}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\ttpset\ttpset.v16.vcxproj">
+      <Project>{5cf58947-e861-4a5c-b0b1-e85486f149cd}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\ttptek\ttptek.v16.vcxproj">
+      <Project>{6d08053b-1c68-4a7e-8766-3553f5af010b}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties RESOURCE_FILE="ttermpro.rc" />
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file

Copied: branches/cmake/teraterm/teraterm/ttermpro.v16.vcxproj.filters (from rev 7693, branches/cmake/teraterm/teraterm/ttermpro.v15.vcxproj.filters)
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.v16.vcxproj.filters	                        (rev 0)
+++ branches/cmake/teraterm/teraterm/ttermpro.v16.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,316 @@
+<?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>{c944ea9f-5e84-4cb4-9662-58a9031ec1be}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{9f09ffc2-cdc3-4159-92f7-e637db2a2927}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+    <Filter Include="Source Files %28C%29">
+      <UniqueIdentifier>{962df722-a84a-4837-a367-5e66f4d40803}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{e3efecca-9842-408d-979e-a4c7af432f65}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
+    <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">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="tekwin.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="teraprn.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="teraterm.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="vtwin.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="buffer.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="clipboar.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="commlib.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="keyboard.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="sizetip.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="teklib.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="telnet.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="ttdde.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="ttfileio.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="ttime.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\ttlib.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="ttplug.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="ttsetup.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="ttwinman.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="ttwsk.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="vtdisp.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="vtterm.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="winjump.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="WSAAsyncGetAddrInfo.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="dnddlg.cpp">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <ClCompile Include="ftdlg.cpp">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <ClCompile Include="protodlg.cpp">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <ClCompile Include="prnabort.cpp">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <ClCompile Include="ttdialog.c">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <ClCompile Include="addsetting.cpp">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\dlglib.c">
+      <Filter>dialog</Filter>
+    </ClCompile>
+    <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>
+    <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">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="..\common\tek.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="..\common\Teraterm.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="..\common\teraterm_classic.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="..\common\vt.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="..\common\vt_classic.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="..\common\teraterm_3d.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="..\common\vt_3d.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="tt-version.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="ttermpro.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="../ttpdlg/ttpdlg.rc">
+      <Filter>ttpdlg</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="sizetip.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\tt_res.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttfileio.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttwinman.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttftypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="teklib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\teraterm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\tektypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="tekwin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="telnet.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="teraprn.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttwsk.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttcommon.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttdde.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttddecmnd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttime.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttplug.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttplugin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttsetup.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\tttypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\tt-version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="buffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="clipboar.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="commlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="filesys.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="keyboard.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="vtterm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="vtwin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="vtdisp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\compat_w95.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="dnddlg.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <ClInclude Include="prnabort.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <ClInclude Include="protodlg.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <ClInclude Include="ttdialog.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\dlglib.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <ClInclude Include="ftdlg.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <ClInclude Include="addsetting.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <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>
+    <ClInclude Include="..\common\tmfc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Modified: branches/cmake/teraterm/teraterm/ttermpro.v9.vcproj
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.v9.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/teraterm/ttermpro.v9.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -212,11 +212,11 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<File
-				RelativePath="addsetting.cpp"
+				RelativePath="..\common\codeconv.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\common\dlglib.c"
+				RelativePath="..\common\compat_win.cpp"
 				>
 			</File>
 			<File
@@ -228,7 +228,7 @@
 				>
 			</File>
 			<File
-				RelativePath="dnddlg.cpp"
+				RelativePath="..\common\dllutil.cpp"
 				>
 			</File>
 			<File
@@ -236,18 +236,6 @@
 				>
 			</File>
 			<File
-				RelativePath="ftdlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="prnabort.cpp"
-				>
-			</File>
-			<File
-				RelativePath="protodlg.cpp"
-				>
-			</File>
-			<File
 				RelativePath="tekwin.cpp"
 				>
 			</File>
@@ -260,11 +248,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\common\tmfc.cpp"
+				RelativePath="..\common\tipwin.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\common\tmfc.h"
+				RelativePath="..\common\tmfc.cpp"
 				>
 			</File>
 			<File
@@ -275,6 +263,10 @@
 				RelativePath="vtwin.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\common\win16api.c"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -333,18 +325,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\common\codeconv.cpp"
-				>
-			</File>
-			<File
 				RelativePath="commlib.c"
 				>
 			</File>
 			<File
-				RelativePath="..\common\compat_win.cpp"
-				>
-			</File>
-			<File
 				RelativePath="keyboard.c"
 				>
 			</File>
@@ -361,18 +345,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\common\tipwin.cpp"
-				>
-			</File>
-			<File
 				RelativePath="ttdde.c"
 				>
 			</File>
 			<File
-				RelativePath="ttdialog.c"
-				>
-			</File>
-			<File
 				RelativePath="ttfileio.c"
 				>
 			</File>
@@ -413,53 +389,145 @@
 				>
 			</File>
 			<File
-				RelativePath="WSAAsyncGetAddrInfo.c"
+				RelativePath=".\WSAAsyncGetAddrInfo.c"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
 			<File
-				RelativePath="..\common\win16api.c"
+				RelativePath=".\buffer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\common\compat_win.cpp"
+				RelativePath=".\clipboar.h"
 				>
 			</File>
 			<File
-				RelativePath="..\common\dllutil.cpp"
+				RelativePath=".\commlib.h"
 				>
 			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
 			<File
-				RelativePath="addsetting.h"
+				RelativePath="..\common\compat_w95.h"
 				>
 			</File>
 			<File
-				RelativePath="dnddlg.h"
+				RelativePath=".\filesys.h"
 				>
 			</File>
 			<File
+				RelativePath=".\keyboard.h"
+				>
+			</File>
+			<File
 				RelativePath="sizetip.h"
 				>
 			</File>
 			<File
+				RelativePath=".\teklib.h"
+				>
+			</File>
+			<File
+				RelativePath="..\common\tektypes.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tekwin.h"
+				>
+			</File>
+			<File
+				RelativePath=".\telnet.h"
+				>
+			</File>
+			<File
+				RelativePath=".\teraprn.h"
+				>
+			</File>
+			<File
+				RelativePath="..\common\teraterm.h"
+				>
+			</File>
+			<File
+				RelativePath="..\common\tmfc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\common\tt-version.h"
+				>
+			</File>
+			<File
 				RelativePath="..\common\tt_res.h"
 				>
 			</File>
 			<File
+				RelativePath="..\common\ttcommon.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ttdde.h"
+				>
+			</File>
+			<File
+				RelativePath="..\common\ttddecmnd.h"
+				>
+			</File>
+			<File
 				RelativePath="ttfileio.h"
 				>
 			</File>
 			<File
+				RelativePath="..\common\ttftypes.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ttime.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ttplug.h"
+				>
+			</File>
+			<File
+				RelativePath="..\common\ttplugin.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ttsetup.h"
+				>
+			</File>
+			<File
+				RelativePath="..\common\tttypes.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ttwinman.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ttwsk.h"
+				>
+			</File>
+			<File
+				RelativePath=".\vtdisp.h"
+				>
+			</File>
+			<File
+				RelativePath=".\vtterm.h"
+				>
+			</File>
+			<File
+				RelativePath=".\vtwin.h"
+				>
+			</File>
+			<File
 				RelativePath="..\common\win16api.h"
 				>
 			</File>
 		</Filter>
 		<Filter
-			Name="ttdlg"
+			Name="ttpdlg"
 			>
 			<File
 				RelativePath="..\ttpdlg\dlg_res.h"
@@ -466,10 +534,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\ttpdlg\svnversion.h"
-				>
-			</File>
-			<File
 				RelativePath="..\ttpdlg\ttdlg.c"
 				>
 			</File>
@@ -482,6 +546,66 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="dialog"
+			>
+			<File
+				RelativePath="addsetting.cpp"
+				>
+			</File>
+			<File
+				RelativePath="addsetting.h"
+				>
+			</File>
+			<File
+				RelativePath="..\common\dlglib.c"
+				>
+			</File>
+			<File
+				RelativePath="..\common\dlglib.h"
+				>
+			</File>
+			<File
+				RelativePath="dnddlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="dnddlg.h"
+				>
+			</File>
+			<File
+				RelativePath="ftdlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\ftdlg.h"
+				>
+			</File>
+			<File
+				RelativePath="prnabort.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\prnabort.h"
+				>
+			</File>
+			<File
+				RelativePath="protodlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\protodlg.h"
+				>
+			</File>
+			<File
+				RelativePath="ttdialog.c"
+				>
+			</File>
+			<File
+				RelativePath=".\ttdialog.h"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 		<Global

Modified: branches/cmake/teraterm/teraterm/ttermpro.vcproj
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/teraterm/ttermpro.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -213,11 +213,11 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<File
-				RelativePath="addsetting.cpp"
+				RelativePath="..\common\codeconv.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\common\dlglib.c"
+				RelativePath="..\common\compat_win.cpp"
 				>
 			</File>
 			<File
@@ -229,7 +229,7 @@
 				>
 			</File>
 			<File
-				RelativePath="dnddlg.cpp"
+				RelativePath="..\common\dllutil.cpp"
 				>
 			</File>
 			<File
@@ -237,18 +237,6 @@
 				>
 			</File>
 			<File
-				RelativePath="ftdlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="prnabort.cpp"
-				>
-			</File>
-			<File
-				RelativePath="protodlg.cpp"
-				>
-			</File>
-			<File
 				RelativePath="tekwin.cpp"
 				>
 			</File>
@@ -261,11 +249,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\common\tmfc.cpp"
+				RelativePath="..\common\tipwin.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\common\tmfc.h"
+				RelativePath="..\common\tmfc.cpp"
 				>
 			</File>
 			<File
@@ -276,6 +264,10 @@
 				RelativePath="vtwin.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\common\win16api.c"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -334,22 +326,10 @@
 				>
 			</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>
@@ -366,18 +346,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\common\tipwin.cpp"
-				>
-			</File>
-			<File
 				RelativePath="ttdde.c"
 				>
 			</File>
 			<File
-				RelativePath="ttdialog.c"
-				>
-			</File>
-			<File
 				RelativePath="ttfileio.c"
 				>
 			</File>
@@ -414,15 +386,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\common\win16api.c"
-				>
-			</File>
-			<File
 				RelativePath="winjump.c"
 				>
 			</File>
 			<File
-				RelativePath="WSAAsyncGetAddrInfo.c"
+				RelativePath=".\WSAAsyncGetAddrInfo.c"
 				>
 			</File>
 		</Filter>
@@ -431,32 +399,136 @@
 			Filter="h;hpp;hxx;hm;inl"
 			>
 			<File
-				RelativePath="addsetting.h"
+				RelativePath=".\buffer.h"
 				>
 			</File>
 			<File
-				RelativePath="dnddlg.h"
+				RelativePath=".\clipboar.h"
 				>
 			</File>
 			<File
+				RelativePath=".\commlib.h"
+				>
+			</File>
+			<File
+				RelativePath="..\common\compat_w95.h"
+				>
+			</File>
+			<File
+				RelativePath=".\filesys.h"
+				>
+			</File>
+			<File
+				RelativePath=".\keyboard.h"
+				>
+			</File>
+			<File
 				RelativePath="sizetip.h"
 				>
 			</File>
 			<File
+				RelativePath=".\teklib.h"
+				>
+			</File>
+			<File
+				RelativePath="..\common\tektypes.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tekwin.h"
+				>
+			</File>
+			<File
+				RelativePath=".\telnet.h"
+				>
+			</File>
+			<File
+				RelativePath=".\teraprn.h"
+				>
+			</File>
+			<File
+				RelativePath="..\common\teraterm.h"
+				>
+			</File>
+			<File
+				RelativePath="..\common\tmfc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\common\tt-version.h"
+				>
+			</File>
+			<File
 				RelativePath="..\common\tt_res.h"
 				>
 			</File>
 			<File
+				RelativePath="..\common\ttcommon.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ttdde.h"
+				>
+			</File>
+			<File
+				RelativePath="..\common\ttddecmnd.h"
+				>
+			</File>
+			<File
 				RelativePath="ttfileio.h"
 				>
 			</File>
 			<File
+				RelativePath="..\common\ttftypes.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ttime.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ttplug.h"
+				>
+			</File>
+			<File
+				RelativePath="..\common\ttplugin.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ttsetup.h"
+				>
+			</File>
+			<File
+				RelativePath="..\common\tttypes.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ttwinman.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ttwsk.h"
+				>
+			</File>
+			<File
+				RelativePath=".\vtdisp.h"
+				>
+			</File>
+			<File
+				RelativePath=".\vtterm.h"
+				>
+			</File>
+			<File
+				RelativePath=".\vtwin.h"
+				>
+			</File>
+			<File
 				RelativePath="..\common\win16api.h"
 				>
 			</File>
 		</Filter>
 		<Filter
-			Name="ttdlg"
+			Name="ttpdlg"
 			>
 			<File
 				RelativePath="..\ttpdlg\dlg_res.h"
@@ -463,10 +535,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\ttpdlg\svnversion.h"
-				>
-			</File>
-			<File
 				RelativePath="..\ttpdlg\ttdlg.c"
 				>
 			</File>
@@ -479,6 +547,66 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="dialog"
+			>
+			<File
+				RelativePath="addsetting.cpp"
+				>
+			</File>
+			<File
+				RelativePath="addsetting.h"
+				>
+			</File>
+			<File
+				RelativePath="..\common\dlglib.c"
+				>
+			</File>
+			<File
+				RelativePath="..\common\dlglib.h"
+				>
+			</File>
+			<File
+				RelativePath="dnddlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="dnddlg.h"
+				>
+			</File>
+			<File
+				RelativePath="ftdlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\ftdlg.h"
+				>
+			</File>
+			<File
+				RelativePath="prnabort.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\prnabort.h"
+				>
+			</File>
+			<File
+				RelativePath="protodlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\protodlg.h"
+				>
+			</File>
+			<File
+				RelativePath="ttdialog.c"
+				>
+			</File>
+			<File
+				RelativePath=".\ttdialog.h"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 		<Global

Modified: branches/cmake/teraterm/teraterm/vtdisp.c
===================================================================
--- branches/cmake/teraterm/teraterm/vtdisp.c	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/teraterm/vtdisp.c	2019-05-19 15:06:12 UTC (rev 7694)
@@ -275,7 +275,7 @@
   HDC hdc;
 
   #ifdef _DEBUG
-    OutputDebugPrintf("CreateBitmapDC : hbm = %x\n",hbm);
+    OutputDebugPrintf("CreateBitmapDC : hbm = %p\n",hbm);
   #endif
 
   hdc = CreateCompatibleDC(NULL);
@@ -291,7 +291,7 @@
   HBITMAP hbm;
 
   #ifdef _DEBUG
-    OutputDebugPrintf("DeleteBitmapDC : *hdc = %x\n",hdc);
+    OutputDebugPrintf("DeleteBitmapDC : *hdc = %p\n",hdc);
   #endif
 
   if(!hdc)
@@ -317,7 +317,7 @@
   HBRUSH  hBrush;
 
   #ifdef _DEBUG
-    OutputDebugPrintf("FillBitmapDC : hdc = %x color = %x\n",hdc,color);
+    OutputDebugPrintf("FillBitmapDC : hdc = %x color = %p\n",hdc,color);
   #endif
 
   if(!hdc)
@@ -541,7 +541,7 @@
 
 // \x89摜\x93ǂݍ\x9E\x82݊֌W
 
-void BGPreloadPicture(BGSrc *src)
+static void BGPreloadPicture(BGSrc *src)
 {
   char  spiPath[MAX_PATH];
   char  filespec[MAX_PATH];
@@ -595,9 +595,19 @@
       BITMAPINFO *pbmi;
       char       *pbuf;
       char spiFileName[MAX_PATH];
+	  const char *ext;
 
       if(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
         continue;
+	  ext = strrchr(fd.cFileName, '.');
+	  if (ext == NULL) {
+		  // \x8Ag\x92\xA3\x8Eq\x82\xAA\x82Ȃ\xA2\x83t\x83@\x83C\x83\x8B?
+		  continue;
+	  }
+	  if (strcmp(ext, ".dll") != 0 && strcmp(ext, ".spi") != 0) {
+		  // .dll or .spi \x88ȊO\x82̃t\x83@\x83C\x83\x8B
+		  continue;
+	  }
 
       strncpy_s(spiFileName, sizeof(spiFileName), spiPath, _TRUNCATE);
       strncat_s(spiFileName, sizeof(spiFileName), fd.cFileName, _TRUNCATE);
@@ -651,7 +661,7 @@
   }
 }
 
-void BGGetWallpaperInfo(WallpaperInfo *wi)
+static void BGGetWallpaperInfo(WallpaperInfo *wi)
 {
   DWORD length;
   int style;
@@ -865,7 +875,7 @@
     return hbmNew;
 }
 
-void BGPreloadWallpaper(BGSrc *src)
+static void BGPreloadWallpaper(BGSrc *src)
 {
 	HBITMAP       hbm;
 	WallpaperInfo wi;
@@ -959,7 +969,7 @@
 	src->color = GetSysColor(COLOR_DESKTOP);
 }
 
-void BGPreloadSrc(BGSrc *src)
+static void BGPreloadSrc(BGSrc *src)
 {
   DeleteBitmapDC(&(src->hdc));
 
@@ -978,7 +988,7 @@
   }
 }
 
-void BGStretchPicture(HDC hdcDest,BGSrc *src,int x,int y,int width,int height,BOOL bAntiAlias)
+static void BGStretchPicture(HDC hdcDest,BGSrc *src,int x,int y,int width,int height,BOOL bAntiAlias)
 {
 	if(!hdcDest || !src)
 		return;
@@ -1015,7 +1025,7 @@
 	}
 }
 
-void BGLoadPicture(HDC hdcDest,BGSrc *src)
+static void BGLoadPicture(HDC hdcDest,BGSrc *src)
 {
   int x,y,width,height,pattern;
   HDC hdc = NULL;
@@ -1078,7 +1088,7 @@
   BGSrc *src;
 }LoadWallpaperStruct;
 
-BOOL CALLBACK BGLoadWallpaperEnumFunc(HMONITOR hMonitor,HDC hdcMonitor,LPRECT lprcMonitor,LPARAM dwData)
+static BOOL CALLBACK BGLoadWallpaperEnumFunc(HMONITOR hMonitor,HDC hdcMonitor,LPRECT lprcMonitor,LPARAM dwData)
 {
   RECT rectDest;
   RECT rectRgn;
@@ -1183,7 +1193,7 @@
   SetWindowOrgEx(hdcDest,0,0,NULL);
 }
 
-void BGLoadSrc(HDC hdcDest,BGSrc *src)
+static void BGLoadSrc(HDC hdcDest,BGSrc *src)
 {
   switch(src->type)
   {
@@ -1270,7 +1280,7 @@
   }
 }
 
-COLORREF BGGetColor(const char *name,COLORREF defcolor,char *file)
+static COLORREF BGGetColor(char *name,COLORREF defcolor,char *file)
 {
   unsigned int r,g,b;
   char colorstr[256],defstr[256];
@@ -1286,7 +1296,7 @@
   return RGB(r,g,b);
 }
 
-BG_PATTERN BGGetStrIndex(char *name,BG_PATTERN def,char *file,const char *strList[],int nList)
+static BG_PATTERN BGGetStrIndex(char *name,BG_PATTERN def,char *file,char **strList,int nList)
 {
   char defstr[64],str[64];
   int  i;
@@ -1584,7 +1594,7 @@
 	  BGAlphaBlend = AlphaBlendWithoutAPI;
   }
   else {
-    BGAlphaBlend = NULL;
+    BGAlphaBlend = AlphaBlendWithoutAPI;
   }
 
 }
@@ -3819,26 +3829,12 @@
 
 void DispGetRootWinSize(int *x, int *y, BOOL inPixels)
 {
-	HMODULE mod;
-	HMONITOR monitor;
-	MONITORINFO monitorInfo;
 	RECT desktop, win, client;
 
 	GetWindowRect(HVTWin, &win);
 	GetClientRect(HVTWin, &client);
 
-	if (((mod = GetModuleHandleA("user32.dll")) != NULL) &&
-	    (GetProcAddress(mod,"MonitorFromWindow") != NULL)) {
-		// \x83}\x83\x8B\x83`\x83\x82\x83j\x83^\x82\xAA\x83T\x83|\x81[\x83g\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x8Fꍇ
-		monitor = MonitorFromWindow(HVTWin, MONITOR_DEFAULTTONEAREST);
-		monitorInfo.cbSize = sizeof(MONITORINFO);
-		GetMonitorInfo(monitor, &monitorInfo);
-		desktop = monitorInfo.rcWork;
-	}
-	else {
-		// \x83}\x83\x8B\x83`\x83\x82\x83j\x83^\x82\xAA\x83T\x83|\x81[\x83g\x82\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x8Fꍇ
-		SystemParametersInfo(SPI_GETWORKAREA, 0, &desktop, 0);
-	}
+	GetDesktopRect(HVTWin, &desktop);
 
 	if (inPixels) {
 		*x = desktop.right - desktop.left;
@@ -3848,8 +3844,6 @@
 		*x = (desktop.right - desktop.left - (win.right - win.left - client.right)) / FontWidth;
 		*y = (desktop.bottom - desktop.top - (win.bottom - win.top - client.bottom)) / FontHeight;
 	}
-
-	return;
 }
 
 int DispFindClosestColor(int red, int green, int blue)

Modified: branches/cmake/teraterm/teraterm/vtterm.c
===================================================================
--- branches/cmake/teraterm/teraterm/vtterm.c	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/teraterm/vtterm.c	2019-05-19 15:06:12 UTC (rev 7694)
@@ -5718,7 +5718,7 @@
 	if ((buf[0] & 0xf1) == 0xf0 &&
 		(buf[1] & 0xc0) == 0x80 &&
 		(buf[2] & 0xc0) == 0x80 &&
-		(buf[2] & 0xc0) == 0x80)
+		(buf[3] & 0xc0) == 0x80)
 	{	// 4\x83o\x83C\x83g\x83R\x81[\x83h\x82̏ꍇ
 		code = ((buf[0] & 0x07) << 18);
 		code |= ((buf[1] & 0x3f) << 12);

Modified: branches/cmake/teraterm/teraterm/vtwin.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/vtwin.cpp	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/teraterm/vtwin.cpp	2019-05-19 15:06:12 UTC (rev 7694)
@@ -30,6 +30,7 @@
 
 /* TERATERM.EXE, VT window */
 
+#include "teraterm_conf.h"
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #include "teraterm.h"
@@ -56,6 +57,7 @@
 #include "helpid.h"
 #include "teraprn.h"
 #include "ttplug.h"  /* TTPLUG */
+#include "teraterml.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -115,9 +117,12 @@
 #endif
 
 #ifdef _DEBUG
-#define malloc(l)   _malloc_dbg((l), _NORMAL_BLOCK, __FILE__, __LINE__)
+#define malloc(l)	_malloc_dbg((l), _NORMAL_BLOCK, __FILE__, __LINE__)
+#define free(p)		_free_dbg((p), _NORMAL_BLOCK)
+#if defined(_MSC_VER)
 #define new  		::new(_NORMAL_BLOCK, __FILE__, __LINE__)
 #endif
+#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)
 #define WINDOW_MAXMIMUM_ENABLED 1
@@ -768,6 +773,18 @@
 	}
 	FreeTTSET();
 
+	// DPI Aware (\x8D\x82DPI\x91Ή\x9E)
+	{
+		int dip_aware = 0;
+		dip_aware = GetPrivateProfileIntA("Tera Term", "DPIAware", dip_aware, ts.SetupFName);
+		if (dip_aware != 0) {
+			if (pSetThreadDpiAwarenessContext != NULL) {
+				// TODO Windows 10 Version 1703\x88ȍ~\x82̃`\x83F\x83b\x83N\x82\xF0\x93\xFC\x82\xEA\x82\xE9\x82ׂ\xAB\x82\xA9?
+				pSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
+			}
+		}
+	}
+
 	// duplicate session\x82̎w\x92肪\x82\xA0\x82\xE9\x82Ȃ\xE7\x81A\x8B\xA4\x97L\x83\x81\x83\x82\x83\x8A\x82\xA9\x82\xE7\x83R\x83s\x81[\x82\xB7\x82\xE9 (2004.12.7 yutaka)
 	if (ts.DuplicateSession == 1) {
 		CopyShmemToTTSet(&ts);
@@ -2033,7 +2050,7 @@
 	for (int i = 0; i < DropListCount; i++) {
 		const TCHAR *FileName = DropLists[i];
 		const DWORD attr = GetFileAttributes(FileName);
-		if (attr == (DWORD)-1 ) {
+		if (attr == INVALID_FILE_ATTRIBUTES) {
 			FileCount++;
 		} else if (attr & FILE_ATTRIBUTE_DIRECTORY) {
 			DirectoryCount++;
@@ -2115,6 +2132,8 @@
 		if (!DoSameProcess) {
 			bool DoSameProcessNextDrop;
 			bool DoNotShowDialog = !DefaultShowDialog;
+			SetDialogFont(ts.SetupFName,
+						  ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
 			DropType =
 				ShowDropDialogBox(hInst, HVTWin,
 								  FileName, DropType,
@@ -3785,6 +3804,8 @@
 		return;
 	}
 
+	SetDialogFont(ts.SetupFName,
+				  ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
 	if ((*GetHostName)(HVTWin,&GetHNRec)) {
 		if ((GetHNRec.PortType==IdTCPIP) && LoadTTSET()) {
 			if (ts.HistoryList) {
@@ -4346,6 +4367,8 @@
 	if (! LoadTTDLG()) {
 		return;
 	}
+	SetDialogFont(ts.SetupFName,
+				  ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
 	(*ChangeDirectory)(HVTWin,ts.FileDir);
 	FreeTTDLG();
 }
@@ -4483,6 +4506,8 @@
 {
 	DWORD ret;
 
+	SetDialogFont(ts.SetupFName,
+				  ts.UILanguageFile, "Tera Term", "DLG_TAHOMA_FONT");
 	CAddSettingPropSheetDlg CAddSetting(hInst, _T("Tera Term: Additional settings"), HVTWin);
 	ret = CAddSetting.DoModal();
 	switch (ret) {
@@ -4534,6 +4559,8 @@
 	if (! LoadTTDLG()) {
 		return;
 	}
+	SetDialogFont(ts.SetupFName,
+				  ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
 	Ok = (*SetupTerminal)(HVTWin, &ts);
 	FreeTTDLG();
 	if (Ok) {
@@ -4554,6 +4581,8 @@
 		return;
 	}
 
+	SetDialogFont(ts.SetupFName,
+				  ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
 	strncpy_s(orgTitle, sizeof(orgTitle), ts.Title, _TRUNCATE);
 	Ok = (*SetupWin)(HVTWin, &ts);
 	FreeTTDLG();
@@ -4591,6 +4620,10 @@
 		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);
+
+		SetFocus(GetDlgItem(Dialog,cmb1));
+
+		CenterWindow(Dialog, GetParent(Dialog));
 	}
 	return FALSE;
 }
@@ -4600,9 +4633,14 @@
 	LOGFONTA LogFont;
 	CHOOSEFONTA cf;
 	BOOL result;
+
+	// LogFont.lfHeight \x82\xCD point
 	result = GetI18nLogfont("Tera Term", "DlgFont", &LogFont, 0, ts.SetupFName);
-	if (result == FALSE) {
-		memset(&LogFont, 0, sizeof(LogFont));
+	if (result == TRUE) {
+		// pixel\x82ɕϊ\xB7
+		LogFont.lfHeight = -GetFontPixelFromPoint(m_hWnd, LogFont.lfHeight);
+	} else {
+		GetMessageboxFont(&LogFont);
 	}
 
 	memset(&cf, 0, sizeof(cf));
@@ -4613,11 +4651,9 @@
 		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;
@@ -4625,11 +4661,12 @@
 	result = ChooseFontA(&cf);
 	if (result) {
 		char Temp[80];
+		int font_point = cf.iPointSize / 10;	// point \x82ŕۑ\xB6\x82\xB7\x82\xE9
 		_snprintf_s(Temp, sizeof(Temp), _TRUNCATE, "%s,%d,%d",
-					LogFont.lfFaceName, LogFont.lfHeight, LogFont.lfCharSet);
+					LogFont.lfFaceName,
+					font_point,
+					LogFont.lfCharSet);
 		WritePrivateProfileStringA("Tera Term", "DlgFont", Temp, ts.SetupFName);
-
-		SetDialogFont(ts.SetupFName, ts.UILanguageFile, "TTSSH");
 	}
 }
 
@@ -4646,6 +4683,8 @@
 	if (! LoadTTDLG()) {
 		return;
 	}
+	SetDialogFont(ts.SetupFName,
+				  ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
 	Ok = (*SetupKeyboard)(HVTWin, &ts);
 	FreeTTDLG();
 
@@ -4663,6 +4702,8 @@
 	if (! LoadTTDLG()) {
 		return;
 	}
+	SetDialogFont(ts.SetupFName,
+				  ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
 	Ok = (*SetupSerialPort)(HVTWin, &ts);
 	FreeTTDLG();
 
@@ -4688,6 +4729,8 @@
 	if (! LoadTTDLG()) {
 		return;
 	}
+	SetDialogFont(ts.SetupFName,
+				  ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
 	if ((*SetupTCPIP)(HVTWin, &ts)) {
 		TelUpdateKeepAliveInterval();
 	}
@@ -4700,6 +4743,8 @@
 	if (! LoadTTDLG()) {
 		return;
 	}
+	SetDialogFont(ts.SetupFName,
+				  ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
 	if ((*SetupGeneral)(HVTWin,&ts)) {
 		ResetCharSet();
 		ResetIME();
@@ -6088,6 +6133,8 @@
 	if (! LoadTTDLG()) {
 		return;
 	}
+	SetDialogFont(ts.SetupFName,
+				  ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
 	(*WindowWindow)(HVTWin,&Close);
 	FreeTTDLG();
 	if (Close) {
@@ -6135,6 +6182,8 @@
 	if (! LoadTTDLG()) {
 		return;
 	}
+	SetDialogFont(ts.SetupFName,
+				  ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
 	(*AboutDialog)(HVTWin);
 	FreeTTDLG();
 }

Modified: branches/cmake/teraterm/teraterm/winjump.c
===================================================================
--- branches/cmake/teraterm/teraterm/winjump.c	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/teraterm/winjump.c	2019-05-19 15:06:12 UTC (rev 7694)
@@ -46,6 +46,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "teraterm_conf.h"
+
 #undef UNICODE
 #undef _UNICODE
 
@@ -395,7 +397,7 @@
     0x000214ee, 0x0000, 0x0000, {0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46}
 };
 #endif
-#if (NTDDI_VERSION < NTDDI_WIN7)
+#if (_WIN32_WINNT < 0x0601)		// _WIN32_WINNT_WIN7
 static const IID IID_ICustomDestinationList = {
     0x6332debf, 0x87b5, 0x4670, {0x90,0xc0,0x5e,0x57,0xb4,0x08,0xa4,0x9e}
 };

Added: branches/cmake/teraterm/ttermpro.v16.sln
===================================================================
--- branches/cmake/teraterm/ttermpro.v16.sln	                        (rev 0)
+++ branches/cmake/teraterm/ttermpro.v16.sln	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,63 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 16
+VisualStudioVersion = 16.0.28803.156
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttermpro", "teraterm\ttermpro.v16.vcxproj", "{BC4CDBE3-6269-47A8-BD74-EEB3A6160E06}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "keycode", "keycode\keycode.v16.vcxproj", "{B31BF2E8-79E6-4735-BEA2-C1B4041C2D2E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpcmn", "ttpcmn\ttpcmn.v16.vcxproj", "{118E0D32-5553-4F73-9927-E873C1C500E4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpfile", "ttpfile\ttpfile.v16.vcxproj", "{311F2B21-AEC4-4384-8209-BB83B54749B4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpmacro", "ttpmacro\ttpmacro.v16.vcxproj", "{BA519362-A2C2-4B1A-905B-F00791F9038A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpset", "ttpset\ttpset.v16.vcxproj", "{5CF58947-E861-4A5C-B0B1-E85486F149CD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttptek", "ttptek\ttptek.v16.vcxproj", "{6D08053B-1C68-4A7E-8766-3553F5AF010B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "svnrev", "svnrev\svnrev.v16.vcxproj", "{80F1C3F0-A213-4D48-85C8-A265990D19A7}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{BC4CDBE3-6269-47A8-BD74-EEB3A6160E06}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BC4CDBE3-6269-47A8-BD74-EEB3A6160E06}.Debug|Win32.Build.0 = Debug|Win32
+		{BC4CDBE3-6269-47A8-BD74-EEB3A6160E06}.Release|Win32.ActiveCfg = Release|Win32
+		{BC4CDBE3-6269-47A8-BD74-EEB3A6160E06}.Release|Win32.Build.0 = Release|Win32
+		{B31BF2E8-79E6-4735-BEA2-C1B4041C2D2E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B31BF2E8-79E6-4735-BEA2-C1B4041C2D2E}.Debug|Win32.Build.0 = Debug|Win32
+		{B31BF2E8-79E6-4735-BEA2-C1B4041C2D2E}.Release|Win32.ActiveCfg = Release|Win32
+		{B31BF2E8-79E6-4735-BEA2-C1B4041C2D2E}.Release|Win32.Build.0 = Release|Win32
+		{118E0D32-5553-4F73-9927-E873C1C500E4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{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
+		{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
+		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Release|Win32.Build.0 = Release|Win32
+		{BA519362-A2C2-4B1A-905B-F00791F9038A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BA519362-A2C2-4B1A-905B-F00791F9038A}.Debug|Win32.Build.0 = Debug|Win32
+		{BA519362-A2C2-4B1A-905B-F00791F9038A}.Release|Win32.ActiveCfg = Release|Win32
+		{BA519362-A2C2-4B1A-905B-F00791F9038A}.Release|Win32.Build.0 = Release|Win32
+		{5CF58947-E861-4A5C-B0B1-E85486F149CD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5CF58947-E861-4A5C-B0B1-E85486F149CD}.Debug|Win32.Build.0 = Debug|Win32
+		{5CF58947-E861-4A5C-B0B1-E85486F149CD}.Release|Win32.ActiveCfg = Release|Win32
+		{5CF58947-E861-4A5C-B0B1-E85486F149CD}.Release|Win32.Build.0 = Release|Win32
+		{6D08053B-1C68-4A7E-8766-3553F5AF010B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6D08053B-1C68-4A7E-8766-3553F5AF010B}.Debug|Win32.Build.0 = Debug|Win32
+		{6D08053B-1C68-4A7E-8766-3553F5AF010B}.Release|Win32.ActiveCfg = Release|Win32
+		{6D08053B-1C68-4A7E-8766-3553F5AF010B}.Release|Win32.Build.0 = Release|Win32
+		{80F1C3F0-A213-4D48-85C8-A265990D19A7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{80F1C3F0-A213-4D48-85C8-A265990D19A7}.Debug|Win32.Build.0 = Debug|Win32
+		{80F1C3F0-A213-4D48-85C8-A265990D19A7}.Release|Win32.ActiveCfg = Release|Win32
+		{80F1C3F0-A213-4D48-85C8-A265990D19A7}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Modified: branches/cmake/teraterm/ttpcmn/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/ttpcmn/CMakeLists.txt	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpcmn/CMakeLists.txt	2019-05-19 15:06:12 UTC (rev 7694)
@@ -30,12 +30,12 @@
   )
 
 set(SRC
-  cmn_res.h
   language.c
   language.h
   ttcmn.c
   ttcmn_notify.c
   ttpcmn-version.rc
+  ttpcmn.def
   ${COMMON_SRC}
   )
 

Deleted: branches/cmake/teraterm/ttpcmn/cmn_res.h
===================================================================
--- branches/cmake/teraterm/ttpcmn/cmn_res.h	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpcmn/cmn_res.h	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,14 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by ttpcmn.rc
-
-// \x90V\x82\xB5\x82\xA2\x83I\x83u\x83W\x83F\x83N\x83g\x82̎\x9F\x82̊\xF9\x92\xE8\x92l
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1001
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif

Modified: branches/cmake/teraterm/ttpcmn/ttcmn.c
===================================================================
--- branches/cmake/teraterm/ttpcmn/ttcmn.c	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpcmn/ttcmn.c	2019-05-19 15:06:12 UTC (rev 7694)
@@ -104,8 +104,6 @@
 
 BOOL WINAPI StartTeraTerm(PTTSet ts)
 {
-	char Temp[MAX_PATH];
-
 	if (FirstInstance) {
 		// init window list
 		pm->NWin = 0;
@@ -123,10 +121,7 @@
 	// if (FirstInstance) { \x82̕\x94\x95\xAA\x82\xA9\x82\xE7\x88ړ\xAE (2008.3.13 maya)
 	// \x8BN\x93\xAE\x8E\x9E\x82ɂ́A\x8B\xA4\x97L\x83\x81\x83\x82\x83\x8A\x82\xCC HomeDir \x82\xC6 SetupFName \x82͋\xF3\x82ɂȂ\xE9
 	/* Get home directory */
-	if (GetModuleFileNameA(hInst,Temp,sizeof(Temp)) == 0) {
-		return TRUE;
-	}
-	ExtractDirName(Temp, ts->HomeDir);
+	GetHomeDir(hInst, ts->HomeDir, sizeof(ts->HomeDir));
 	_chdir(ts->HomeDir);
 	GetDefaultSetupFName(ts->HomeDir, ts->SetupFName, sizeof(ts->SetupFName));
 

Modified: branches/cmake/teraterm/ttpcmn/ttpcmn-version.rc
===================================================================
--- branches/cmake/teraterm/ttpcmn/ttpcmn-version.rc	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpcmn/ttpcmn-version.rc	2019-05-19 15:06:12 UTC (rev 7694)
@@ -3,10 +3,12 @@
 // Version
 //
 
-#include <winver.h>
+#include <winresrc.h>
 
 #include "tt-version.h"
 
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION TT_VERSION_MAJOR,TT_VERSION_MINOR,0,0
  PRODUCTVERSION TT_VERSION_MAJOR,TT_VERSION_MINOR,0,0

Modified: branches/cmake/teraterm/ttpcmn/ttpcmn.v10.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpcmn/ttpcmn.v10.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpcmn/ttpcmn.v10.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
@@ -81,7 +81,6 @@
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreSpecificDefaultLibraries>nafxcw.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -120,7 +119,6 @@
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -132,7 +130,6 @@
     <ClCompile Include="..\common\ttlib.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="cmn_res.h" />
     <ClInclude Include="..\common\i18n.h" />
     <ClInclude Include="language.h" />
     <ClInclude Include="..\common\servicenames.h" />
@@ -143,7 +140,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpcmn-version.rc" />
-    <ResourceCompile Include="ttpcmn.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Modified: branches/cmake/teraterm/ttpcmn/ttpcmn.v10.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpcmn/ttpcmn.v10.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpcmn/ttpcmn.v10.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -34,11 +34,11 @@
     <ClCompile Include="..\common\ttlib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\common\codeconv.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="cmn_res.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\common\i18n.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -61,8 +61,5 @@
     <ResourceCompile Include="ttpcmn-version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="ttpcmn.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
   </ItemGroup>
 </Project>

Modified: branches/cmake/teraterm/ttpcmn/ttpcmn.v11.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpcmn/ttpcmn.v11.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpcmn/ttpcmn.v11.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
@@ -87,7 +87,6 @@
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-      <IgnoreSpecificDefaultLibraries>nafxcw.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -126,7 +125,6 @@
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -138,7 +136,6 @@
     <ClCompile Include="..\common\ttlib.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="cmn_res.h" />
     <ClInclude Include="..\common\i18n.h" />
     <ClInclude Include="language.h" />
     <ClInclude Include="..\common\servicenames.h" />
@@ -149,7 +146,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpcmn-version.rc" />
-    <ResourceCompile Include="ttpcmn.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Modified: branches/cmake/teraterm/ttpcmn/ttpcmn.v11.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpcmn/ttpcmn.v11.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpcmn/ttpcmn.v11.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -34,11 +34,11 @@
     <ClCompile Include="..\common\ttlib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\common\codeconv.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="cmn_res.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\common\i18n.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -61,8 +61,5 @@
     <ResourceCompile Include="ttpcmn-version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="ttpcmn.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
   </ItemGroup>
 </Project>

Modified: branches/cmake/teraterm/ttpcmn/ttpcmn.v12.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpcmn/ttpcmn.v12.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpcmn/ttpcmn.v12.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
@@ -87,7 +87,6 @@
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-      <IgnoreSpecificDefaultLibraries>nafxcw.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -126,7 +125,6 @@
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -138,7 +136,6 @@
     <ClCompile Include="ttcmn.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="cmn_res.h" />
     <ClInclude Include="..\common\i18n.h" />
     <ClInclude Include="..\common\ttlib.h" />
     <ClInclude Include="language.h" />
@@ -149,7 +146,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpcmn-version.rc" />
-    <ResourceCompile Include="ttpcmn.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Modified: branches/cmake/teraterm/ttpcmn/ttpcmn.v12.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpcmn/ttpcmn.v12.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpcmn/ttpcmn.v12.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -34,11 +34,11 @@
     <ClCompile Include="..\common\ttlib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\common\codeconv.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="cmn_res.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\common\i18n.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -61,8 +61,5 @@
     <ResourceCompile Include="ttpcmn-version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="ttpcmn.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
   </ItemGroup>
 </Project>

Modified: branches/cmake/teraterm/ttpcmn/ttpcmn.v14.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpcmn/ttpcmn.v14.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpcmn/ttpcmn.v14.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
@@ -87,7 +87,6 @@
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-      <IgnoreSpecificDefaultLibraries>nafxcw.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -126,7 +125,6 @@
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -138,7 +136,6 @@
     <ClCompile Include="ttcmn.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="cmn_res.h" />
     <ClInclude Include="..\common\i18n.h" />
     <ClInclude Include="..\common\ttlib.h" />
     <ClInclude Include="language.h" />
@@ -149,7 +146,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpcmn-version.rc" />
-    <ResourceCompile Include="ttpcmn.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Modified: branches/cmake/teraterm/ttpcmn/ttpcmn.v14.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpcmn/ttpcmn.v14.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpcmn/ttpcmn.v14.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -34,11 +34,11 @@
     <ClCompile Include="..\common\ttlib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\common\codeconv.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="cmn_res.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\common\i18n.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -61,8 +61,5 @@
     <ResourceCompile Include="ttpcmn-version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="ttpcmn.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
   </ItemGroup>
 </Project>

Modified: branches/cmake/teraterm/ttpcmn/ttpcmn.v15.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpcmn/ttpcmn.v15.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpcmn/ttpcmn.v15.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
@@ -89,7 +89,6 @@
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-      <IgnoreSpecificDefaultLibraries>nafxcw.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -129,7 +128,6 @@
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -141,7 +139,6 @@
     <ClCompile Include="ttcmn.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="cmn_res.h" />
     <ClInclude Include="..\common\i18n.h" />
     <ClInclude Include="..\common\ttlib.h" />
     <ClInclude Include="language.h" />
@@ -156,4 +153,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

Modified: branches/cmake/teraterm/ttpcmn/ttpcmn.v15.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpcmn/ttpcmn.v15.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpcmn/ttpcmn.v15.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -39,9 +39,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="cmn_res.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\common\i18n.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -65,4 +62,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

Copied: branches/cmake/teraterm/ttpcmn/ttpcmn.v16.vcxproj (from rev 7693, branches/cmake/teraterm/ttpcmn/ttpcmn.v14.vcxproj)
===================================================================
--- branches/cmake/teraterm/ttpcmn/ttpcmn.v16.vcxproj	                        (rev 0)
+++ branches/cmake/teraterm/ttpcmn/ttpcmn.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,156 @@
+<?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>{118E0D32-5553-4F73-9927-E873C1C500E4}</ProjectGuid>
+    <RootNamespace>ttpcmn</RootNamespace>
+    <ProjectName>ttpcmn</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</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'">
+    <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)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>setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>setupapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <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)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>setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>setupapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\common\codeconv.cpp" />
+    <ClCompile Include="..\common\i18n.c" />
+    <ClCompile Include="..\common\ttlib.c" />
+    <ClCompile Include="language.c" />
+    <ClCompile Include="..\common\servicenames.c" />
+    <ClCompile Include="ttcmn.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\common\i18n.h" />
+    <ClInclude Include="..\common\ttlib.h" />
+    <ClInclude Include="language.h" />
+    <ClInclude Include="..\common\servicenames.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ttpcmn.def" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ttpcmn-version.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

Copied: branches/cmake/teraterm/ttpcmn/ttpcmn.v16.vcxproj.filters (from rev 7693, branches/cmake/teraterm/ttpcmn/ttpcmn.v15.vcxproj.filters)
===================================================================
--- branches/cmake/teraterm/ttpcmn/ttpcmn.v16.vcxproj.filters	                        (rev 0)
+++ branches/cmake/teraterm/ttpcmn/ttpcmn.v16.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,65 @@
+<?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>{961353de-481a-43ea-a3f7-3aa6a40ecc0c}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{ffbe82db-a752-43d2-9655-1a279ac14ec8}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
+    </Filter>
+    <Filter Include="Def File">
+      <UniqueIdentifier>{1faecde1-7990-40de-9a84-08c3801f8730}</UniqueIdentifier>
+      <Extensions>def</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{9abee5ab-c47d-4b80-a1d5-18fcc30c29b2}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\common\i18n.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="language.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\servicenames.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ttcmn.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\ttlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\codeconv.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\common\i18n.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="language.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\servicenames.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ttpcmn.def">
+      <Filter>Def File</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ttpcmn-version.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>

Modified: branches/cmake/teraterm/ttpcmn/ttpcmn.v9.vcproj
===================================================================
--- branches/cmake/teraterm/ttpcmn/ttpcmn.v9.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpcmn/ttpcmn.v9.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -76,7 +76,6 @@
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=""
-				IgnoreDefaultLibraryNames="nafxcw.lib"
 				ModuleDefinitionFile="$(ProjectName).def"
 				DelayLoadDLLs="setupapi.dll;user32.dll"
 				GenerateDebugInformation="true"
@@ -167,7 +166,6 @@
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=""
-				IgnoreDefaultLibraryNames="nafxcwd.lib"
 				ModuleDefinitionFile="$(ProjectName).def"
 				DelayLoadDLLs="setupapi.dll;user32.dll"
 				GenerateDebugInformation="true"
@@ -237,10 +235,6 @@
 			Filter="h;hpp;hxx;hm;inl;fi;fd"
 			>
 			<File
-				RelativePath="cmn_res.h"
-				>
-			</File>
-			<File
 				RelativePath="..\common\i18n.h"
 				>
 			</File>
@@ -274,10 +268,6 @@
 				RelativePath="ttpcmn-version.rc"
 				>
 			</File>
-			<File
-				RelativePath="ttpcmn.rc"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>

Modified: branches/cmake/teraterm/ttpcmn/ttpcmn.vcproj
===================================================================
--- branches/cmake/teraterm/ttpcmn/ttpcmn.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpcmn/ttpcmn.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -75,7 +75,6 @@
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=""
-				IgnoreDefaultLibraryNames="nafxcw.lib"
 				ModuleDefinitionFile="$(ProjectName).def"
 				DelayLoadDLLs="setupapi.dll;user32.dll"
 				GenerateDebugInformation="true"
@@ -167,7 +166,6 @@
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=""
-				IgnoreDefaultLibraryNames="nafxcwd.lib"
 				ModuleDefinitionFile="$(ProjectName).def"
 				DelayLoadDLLs="setupapi.dll;user32.dll"
 				GenerateDebugInformation="true"
@@ -238,10 +236,6 @@
 			Filter="h;hpp;hxx;hm;inl;fi;fd"
 			>
 			<File
-				RelativePath="cmn_res.h"
-				>
-			</File>
-			<File
 				RelativePath="..\common\i18n.h"
 				>
 			</File>

Modified: branches/cmake/teraterm/ttpdlg/ttdlg.c
===================================================================
--- branches/cmake/teraterm/ttpdlg/ttdlg.c	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpdlg/ttdlg.c	2019-05-19 15:06:12 UTC (rev 7694)
@@ -29,6 +29,8 @@
 /* IPv6 modification is Copyright(C) 2000 Jun-ya Kato <kato****@win6*****> */
 
 /* TTDLG.DLL, dialog boxes */
+#include "teraterm_conf.h"
+#include "teraterm.h"
 
 #include <winsock2.h>
 #include <stdio.h>
@@ -268,6 +270,7 @@
 				SetDlgItemTextA(Dialog, IDC_LOCALE_EDIT, ts->Locale);
 				SendDlgItemMessage(Dialog, IDC_LOCALE_EDIT, EM_LIMITTEXT, sizeof(ts->Locale), 0);
 			}
+			CenterWindow(Dialog, GetParent(Dialog));
 			return TRUE;
 
 		case WM_COMMAND:
@@ -679,6 +682,8 @@
 
 			ChangeSB(Dialog,ts,IAttr,IOffset);
 
+			CenterWindow(Dialog, GetParent(Dialog));
+
 			return TRUE;
 
 		case WM_COMMAND:
@@ -1057,6 +1062,9 @@
 				ShowDlgItem(Dialog,IDC_KEYBKEYBTEXT,IDC_KEYBKEYB);
 				SetDropDownList(Dialog, IDC_KEYBKEYB, RussList2, ts->RussKeyb);
 			}
+
+			CenterWindow(Dialog, GetParent(Dialog));
+
 			return TRUE;
 
 		case WM_COMMAND:
@@ -1192,6 +1200,8 @@
 			SetDlgItemInt(Dialog,IDC_SERIALDELAYLINE,ts->DelayPerLine,FALSE);
 			SendDlgItemMessage(Dialog, IDC_SERIALDELAYLINE, EM_LIMITTEXT,4, 0);
 
+			CenterWindow(Dialog, GetParent(Dialog));
+
 			return TRUE;
 
 		case WM_COMMAND:
@@ -1310,6 +1320,8 @@
 			// SSH\x90ڑ\xB1\x82̂Ƃ\xAB\x82ɂ\xE0 TERM \x82𑗂\xE9\x82̂ŁAtelnet\x82\xAA\x96\xB3\x8C\xF8\x82ł\xE0 disabled \x82ɂ\xB5\x82Ȃ\xA2\x81B(2005.11.3 yutaka)
 			EnableDlgItem(Dialog,IDC_TCPIPTERMTYPELABEL,IDC_TCPIPTERMTYPE);
 
+			CenterWindow(Dialog, GetParent(Dialog));
+
 			return TRUE;
 
 		case WM_COMMAND:
@@ -1608,6 +1620,8 @@
 				DisableDlgItem(Dialog,IDC_HOSTTCPPROTOCOLLABEL,IDC_HOSTTCPPROTOCOL);
 			}
 
+			CenterWindow(Dialog, GetParent(Dialog));
+
 			return TRUE;
 
 		case WM_COMMAND:
@@ -1813,6 +1827,8 @@
 			// resize dialog
 			MoveWindow(Dialog,WX,WY,WW,WH,TRUE);
 
+			CenterWindow(Dialog, GetParent(Dialog));
+
 			return TRUE;
 
 		case WM_COMMAND:
@@ -2062,6 +2078,7 @@
 }
 
 #if defined(_MSC_VER)
+// \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\x8E擾\x82\xB7\x82\xE9(2009.3.3 yutaka)
 static void GetCompilerInfo(char *buf, size_t buf_size)
 {
 	char tmpbuf[128];
@@ -2084,12 +2101,13 @@
 		// 1912 = VS2017 update5(VC++15)
 		// 1913 = VS2017 update6(VC++15)
 		// 1914 = VS2017 15.7(VC++15)
+		// 1920 = VS2019 16.0.0(VC++16)
 		// VS2017 Update3\x82\xA9\x82琻\x95i\x83o\x81[\x83W\x83\x87\x83\x93\x82\xAA3\x8C\x85\x95\\x8BL(15.x.x)\x82ɂȂ\xE8\x81A
 		// _MSC_FULL_VER\x82\xA9\x82\xE7\x8EZ\x8Fo\x82ł\xAB\x82Ȃ\xAD\x82Ȃ\xC1\x82\xBD\x82\xBD\x82߁A\x88ꗥ\x82\xC515.0\x82Ƃ\xB7\x82\xE9\x81B
 		if (msc_low_ver >= 10) {
-			vs_ver = msc_ver - 4;
+			vs_ver = msc_ver - 4 + (msc_low_ver - 10)/10;
 			msc_low_ver = 0;
-		} 
+		}
 		else {
 			vs_ver = msc_ver - 5;
 		}
@@ -2115,7 +2133,7 @@
 #elif defined(__MINGW32__)
 static void GetCompilerInfo(char *buf, size_t buf_size)
 {
-#if defined(__GNUC__) || defined(__clang__) 
+#if defined(__GNUC__) || defined(__clang__)
 	_snprintf_s(buf, buf_size, _TRUNCATE,
 				"mingw " __MINGW64_VERSION_STR " "
 #if defined(__clang__)
@@ -2221,7 +2239,7 @@
 			_snprintf_s(buf, sizeof(buf), _TRUNCATE, "Oniguruma %s", onig_version());
 			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)
+			// \x83r\x83\x8B\x83h\x82\xB5\x82\xBD\x82Ƃ\xAB\x82Ɏg\x82\xED\x82ꂽ\x83R\x83\x93\x83p\x83C\x83\x89\x82\xF0\x90ݒ肷\x82\xE9\x81B(2009.3.3 yutaka)
 			GetCompilerInfo(tmpbuf, sizeof(tmpbuf));
 			_snprintf_s(buf, sizeof(buf), _TRUNCATE, "Built using %s", tmpbuf);
 			SetDlgItemTextA(Dialog, IDC_BUILDTOOL, buf);
@@ -2233,6 +2251,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, (HFONT)SendMessage(Dialog, WM_GETFONT, 0, 0));
 			GetDlgItemTextA(Dialog, IDC_AUTHOR_URL, uimsg, sizeof(uimsg));
 			dwExt = GetTabbedTextExtentA(hdc,uimsg,strlen(uimsg),0,NULL);
 			w = LOWORD(dwExt) + 5; // \x95\x9D\x82\xAA\x8E኱\x91\xAB\x82\xE8\x82Ȃ\xA2\x82̂ŕ␳
@@ -2245,6 +2264,7 @@
 
 			hwnd = GetDlgItem(Dialog, IDC_FORUM_URL);
 			hdc = GetDC(hwnd);
+			SelectObject(hdc, (HFONT)SendMessage(Dialog, WM_GETFONT, 0, 0));
 			GetDlgItemTextA(Dialog, IDC_FORUM_URL, uimsg, sizeof(uimsg));
 			dwExt = GetTabbedTextExtentA(hdc,uimsg,strlen(uimsg),0,NULL);
 			w = LOWORD(dwExt) + 5; // \x95\x9D\x82\xAA\x8E኱\x91\xAB\x82\xE8\x82Ȃ\xA2\x82̂ŕ␳
@@ -2315,6 +2335,8 @@
 			ReleaseDC(hwnd, hdc);
 #endif
 
+			CenterWindow(Dialog, GetParent(Dialog));
+
 			return TRUE;
 
 		case WM_COMMAND:
@@ -2591,6 +2613,8 @@
 				EnableWindow(GetDlgItem(Dialog, IDC_GENLANG_UI), FALSE);
 			}
 
+			CenterWindow(Dialog, GetParent(Dialog));
+
 			return TRUE;
 
 		case WM_COMMAND:
@@ -2626,15 +2650,11 @@
 						// \x8C\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82\xAA\x95ύX\x82\xB3\x82\xEA\x82Ă\xA2\x82\xBD\x8Fꍇ
 						w = (WORD)GetCurSel(Dialog, IDC_GENLANG_UI);
 						if (1 <= w && w <= uilist_count && w != langui_sel) {
-							char CurDir[MAX_PATH];
-
 							_snprintf_s(ts->UILanguageFile_ini, sizeof(ts->UILanguageFile_ini), _TRUNCATE,
 								"%s\\%s", LANG_PATH, LangUIList[w - 1]);
 
-							GetCurrentDirectoryA(sizeof(CurDir), CurDir);
-							SetCurrentDirectoryA(ts->HomeDir);
-							_fullpath(ts->UILanguageFile, ts->UILanguageFile_ini, sizeof(ts->UILanguageFile));
-							SetCurrentDirectoryA(CurDir);
+							GetUILanguageFileFull(ts->HomeDir, ts->UILanguageFile_ini,
+												  ts->UILanguageFile, sizeof(ts->UILanguageFile));
 
 							strncpy_s(UILanguageFile, sizeof(UILanguageFile), ts->UILanguageFile, _TRUNCATE);
 
@@ -2689,6 +2709,9 @@
 			SetDlgTexts(Dialog, TextInfos, _countof(TextInfos), UILanguageFile);
 		
 			SetWinList(GetParent(Dialog),Dialog,IDC_WINLISTLIST);
+
+			CenterWindow(Dialog, GetParent(Dialog));
+
 			return TRUE;
 
 		case WM_COMMAND:
@@ -2764,7 +2787,6 @@
 		i = IDD_TERMDLG;
 	}
 
-	SetDialogFont(ts->SetupFName, UILanguageFile, NULL);
 	return
 		(BOOL)DialogBoxParam(hInst,
 		                     MAKEINTRESOURCE(i),
@@ -2773,7 +2795,6 @@
 
 DllExport BOOL WINAPI _SetupWin(HWND WndParent, PTTSet ts)
 {
-	SetDialogFont(ts->SetupFName, UILanguageFile, NULL);
 	return
 		(BOOL)DialogBoxParam(hInst,
 		                     MAKEINTRESOURCE(IDD_WINDLG),
@@ -2782,7 +2803,6 @@
 
 DllExport BOOL WINAPI _SetupKeyboard(HWND WndParent, PTTSet ts)
 {
-	SetDialogFont(ts->SetupFName, UILanguageFile, NULL);
 	return
 		(BOOL)DialogBoxParam(hInst,
 		                     MAKEINTRESOURCE(IDD_KEYBDLG),
@@ -2791,7 +2811,6 @@
 
 DllExport BOOL WINAPI _SetupSerialPort(HWND WndParent, PTTSet ts)
 {
-	SetDialogFont(ts->SetupFName, UILanguageFile, NULL);
 	return
 		(BOOL)DialogBoxParam(hInst,
 		                     MAKEINTRESOURCE(IDD_SERIALDLG),
@@ -2800,7 +2819,6 @@
 
 DllExport BOOL WINAPI _SetupTCPIP(HWND WndParent, PTTSet ts)
 {
-	SetDialogFont(ts->SetupFName, UILanguageFile, NULL);
 	return
 		(BOOL)DialogBoxParam(hInst,
 		                     MAKEINTRESOURCE(IDD_TCPIPDLG),
@@ -2809,7 +2827,6 @@
 
 DllExport BOOL WINAPI _GetHostName(HWND WndParent, PGetHNRec GetHNRec)
 {
-	SetDialogFont(ts.SetupFName, UILanguageFile, NULL);
 	return
 		(BOOL)DialogBoxParam(hInst,
 		                     MAKEINTRESOURCE(IDD_HOSTDLG),
@@ -2818,7 +2835,6 @@
 
 DllExport BOOL WINAPI _ChangeDirectory(HWND WndParent, PCHAR CurDir)
 {
-	SetDialogFont(ts.SetupFName, UILanguageFile, NULL);
 	return
 		(BOOL)DialogBoxParam(hInst,
 		                     MAKEINTRESOURCE(IDD_DIRDLG),
@@ -2827,7 +2843,6 @@
 
 DllExport BOOL WINAPI _AboutDialog(HWND WndParent)
 {
-	SetDialogFont(ts.SetupFName, UILanguageFile, NULL);
 	return
 		(BOOL)DialogBox(hInst,
 		                MAKEINTRESOURCE(IDD_ABOUTDLG),
@@ -2852,6 +2867,8 @@
 
 			SetFocus(GetDlgItem(Dialog,cmb1));
 
+			CenterWindow(Dialog, GetParent(Dialog));
+
 			break;
 		}
 #if 0
@@ -2904,7 +2921,6 @@
 
 DllExport BOOL WINAPI _SetupGeneral(HWND WndParent, PTTSet ts)
 {
-	SetDialogFont(ts->SetupFName, UILanguageFile, NULL);
 	return
 		(BOOL)DialogBoxParam(hInst,
 		                     MAKEINTRESOURCE(IDD_GENDLG),
@@ -2913,7 +2929,6 @@
 
 DllExport BOOL WINAPI _WindowWindow(HWND WndParent, PBOOL Close)
 {
-	SetDialogFont(ts.SetupFName, UILanguageFile, NULL);
 	*Close = FALSE;
 	return
 		(BOOL)DialogBoxParam(hInst,

Modified: branches/cmake/teraterm/ttpfile/ttfile.c
===================================================================
--- branches/cmake/teraterm/ttpfile/ttfile.c	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpfile/ttfile.c	2019-05-19 15:06:12 UTC (rev 7694)
@@ -252,6 +252,14 @@
 	}
 }
 
+/* \x83_\x83C\x83A\x83\x8D\x83O\x82𒆉\x9B\x82Ɉړ\xAE\x82\xB7\x82\xE9 */
+static void CenterCommonDialog(HWND hDlg)
+{
+	/* hDlg\x82̐e\x82\xAA\x83_\x83C\x83A\x83\x8D\x83O\x82̃E\x83B\x83\x93\x83h\x83E\x83n\x83\x93\x83h\x83\x8B */
+	HWND hWndDlgRoot = GetParent(hDlg);
+	CenterWindow(hWndDlgRoot, GetParent(hWndDlgRoot));
+}
+
 /* Hook function for file name dialog box */
 static BOOL CALLBACK LogFnHook(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
 {
@@ -388,6 +396,8 @@
 			DisableDlgItem(Dialog, IDC_TIMESTAMPTYPE, IDC_TIMESTAMPTYPE);
 		}
 
+		CenterCommonDialog(Dialog);
+
 		return TRUE;
 
 	case WM_COMMAND: // for old style dialog
@@ -509,7 +519,7 @@
 	if (FuncId == GTF_LOG) {
 		DWORD logdir = GetFileAttributes(fv->LogDefaultPath);
 		// \x83\x8D\x83O\x95ۑ\xB6\x82̏ꍇ\x82͏\x89\x8A\xFA\x83t\x83H\x83\x8B\x83_\x82\xF0\x8C\x88\x82ߑł\xBF\x82\xB5\x82Ȃ\xA2\x82悤\x82ɂ\xB7\x82\xE9\x81B(2007.8.24 yutaka)
-		if (logdir != -1 && logdir & FILE_ATTRIBUTE_DIRECTORY) {
+		if (logdir != INVALID_FILE_ATTRIBUTES && logdir & FILE_ATTRIBUTE_DIRECTORY) {
 			// LogDefaultPath\x82\xAA\x91\xB6\x8D݂\xB7\x82\xE9\x82Ȃ\xE7\x81A\x82\xBB\x82\xB1\x82\xF0\x8F\x89\x8A\xFA\x83t\x83H\x83\x8B\x83_\x82ɂ\xB7\x82\xE9\x81B(2007.11.30 maya)
 			ofn.lpstrInitialDir = fv->LogDefaultPath;
 		}
@@ -625,6 +635,9 @@
 		SetDlgItemText(Dialog, IDC_FOPTBIN, uimsg);
 
 		SetRB(Dialog,*pw & 1,IDC_FOPTBIN,IDC_FOPTBIN);
+
+		CenterCommonDialog(Dialog);
+
 		return TRUE;
 	case WM_COMMAND: // for old style dialog
 		switch (LOWORD(wParam)) {
@@ -1040,6 +1053,7 @@
 			ShowDlgItem(Dialog,IDC_XOPTBIN,IDC_XOPTBIN);
 			SetRB(Dialog,LOWORD(*pl),IDC_XOPTBIN,IDC_XOPTBIN);
 		}
+		CenterCommonDialog(Dialog);
 		return TRUE;
 	case WM_COMMAND: // for old style dialog
 		switch (LOWORD(wParam)) {

Modified: branches/cmake/teraterm/ttpfile/ttpfile.v10.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpfile/ttpfile.v10.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpfile/ttpfile.v10.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
@@ -76,6 +76,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
@@ -113,6 +114,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
@@ -120,14 +122,16 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\common\win16api.c" />
     <ClCompile Include="bplus.c" />
     <ClCompile Include="..\common\dlglib.c" />
+    <ClCompile Include="..\common\dlglib_cpp.cpp" />
+    <ClCompile Include="..\common\dlglib_tmpl.cpp" />
     <ClCompile Include="ftlib.c" />
     <ClCompile Include="kermit.c" />
     <ClCompile Include="quickvan.c" />
     <ClCompile Include="ttfile.c" />
     <ClCompile Include="..\common\ttlib.c" />
+    <ClCompile Include="..\common\win16api.c" />
     <ClCompile Include="xmodem.c" />
     <ClCompile Include="ymodem.c" />
     <ClCompile Include="zmodem.c" />
@@ -140,7 +144,9 @@
     <ClInclude Include="kermit.h" />
     <ClInclude Include="quickvan.h" />
     <ClInclude Include="..\common\ttlib.h" />
+    <ClInclude Include="..\common\win16api.h" />
     <ClInclude Include="xmodem.h" />
+    <ClInclude Include="ymodem.h" />
     <ClInclude Include="zmodem.h" />
   </ItemGroup>
   <ItemGroup>

Modified: branches/cmake/teraterm/ttpfile/ttpfile.v10.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpfile/ttpfile.v10.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpfile/ttpfile.v10.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -22,9 +22,6 @@
     <ClCompile Include="bplus.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\dlglib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="ftlib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -49,6 +46,12 @@
     <ClCompile Include="zmodem.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\win16api.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="bplus.h">
@@ -75,9 +78,15 @@
     <ClInclude Include="xmodem.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="ymodem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="zmodem.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\common\win16api.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpfile-version.rc">

Modified: branches/cmake/teraterm/ttpfile/ttpfile.v11.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpfile/ttpfile.v11.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpfile/ttpfile.v11.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
@@ -81,6 +81,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
@@ -117,6 +118,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
@@ -124,14 +126,16 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\common\win16api.c" />
     <ClCompile Include="bplus.c" />
     <ClCompile Include="..\common\dlglib.c" />
+    <ClCompile Include="..\common\dlglib_cpp.cpp" />
+    <ClCompile Include="..\common\dlglib_tmpl.cpp" />
     <ClCompile Include="ftlib.c" />
     <ClCompile Include="kermit.c" />
     <ClCompile Include="quickvan.c" />
     <ClCompile Include="ttfile.c" />
     <ClCompile Include="..\common\ttlib.c" />
+    <ClCompile Include="..\common\win16api.c" />
     <ClCompile Include="xmodem.c" />
     <ClCompile Include="ymodem.c" />
     <ClCompile Include="zmodem.c" />
@@ -144,7 +148,9 @@
     <ClInclude Include="kermit.h" />
     <ClInclude Include="quickvan.h" />
     <ClInclude Include="..\common\ttlib.h" />
+    <ClInclude Include="..\common\win16api.h" />
     <ClInclude Include="xmodem.h" />
+    <ClInclude Include="ymodem.h" />
     <ClInclude Include="zmodem.h" />
   </ItemGroup>
   <ItemGroup>

Modified: branches/cmake/teraterm/ttpfile/ttpfile.v11.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpfile/ttpfile.v11.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpfile/ttpfile.v11.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -22,9 +22,6 @@
     <ClCompile Include="bplus.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\dlglib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="ftlib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -49,6 +46,12 @@
     <ClCompile Include="zmodem.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\win16api.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="bplus.h">
@@ -75,9 +78,15 @@
     <ClInclude Include="xmodem.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="ymodem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="zmodem.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\common\win16api.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpfile-version.rc">

Modified: branches/cmake/teraterm/ttpfile/ttpfile.v12.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpfile/ttpfile.v12.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpfile/ttpfile.v12.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
@@ -81,6 +81,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
@@ -117,6 +118,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
@@ -125,6 +127,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" />
@@ -139,6 +143,7 @@
   <ItemGroup>
     <ClInclude Include="..\common\dlglib.h" />
     <ClInclude Include="..\common\ttlib.h" />
+    <ClInclude Include="..\common\win16api.h" />
     <ClInclude Include="bplus.h" />
     <ClInclude Include="file_res.h" />
     <ClInclude Include="ftlib.h" />
@@ -145,6 +150,7 @@
     <ClInclude Include="kermit.h" />
     <ClInclude Include="quickvan.h" />
     <ClInclude Include="xmodem.h" />
+    <ClInclude Include="ymodem.h" />
     <ClInclude Include="zmodem.h" />
   </ItemGroup>
   <ItemGroup>
@@ -166,4 +172,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

Modified: branches/cmake/teraterm/ttpfile/ttpfile.v12.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpfile/ttpfile.v12.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpfile/ttpfile.v12.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -22,9 +22,6 @@
     <ClCompile Include="bplus.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\dlglib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="ftlib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -49,6 +46,12 @@
     <ClCompile Include="zmodem.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\win16api.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="bplus.h">
@@ -75,9 +78,15 @@
     <ClInclude Include="xmodem.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="ymodem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="zmodem.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\common\win16api.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpfile-version.rc">
@@ -92,4 +101,4 @@
       <Filter>Def File</Filter>
     </None>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file

Modified: branches/cmake/teraterm/ttpfile/ttpfile.v14.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpfile/ttpfile.v14.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpfile/ttpfile.v14.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
@@ -81,6 +81,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
@@ -117,6 +118,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
@@ -125,6 +127,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" />
@@ -139,6 +143,7 @@
   <ItemGroup>
     <ClInclude Include="..\common\dlglib.h" />
     <ClInclude Include="..\common\ttlib.h" />
+    <ClInclude Include="..\common\win16api.h" />
     <ClInclude Include="bplus.h" />
     <ClInclude Include="file_res.h" />
     <ClInclude Include="ftlib.h" />
@@ -145,6 +150,7 @@
     <ClInclude Include="kermit.h" />
     <ClInclude Include="quickvan.h" />
     <ClInclude Include="xmodem.h" />
+    <ClInclude Include="ymodem.h" />
     <ClInclude Include="zmodem.h" />
   </ItemGroup>
   <ItemGroup>

Modified: branches/cmake/teraterm/ttpfile/ttpfile.v14.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpfile/ttpfile.v14.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpfile/ttpfile.v14.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -22,9 +22,6 @@
     <ClCompile Include="bplus.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\dlglib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="ftlib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -49,6 +46,12 @@
     <ClCompile Include="zmodem.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\win16api.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="bplus.h">
@@ -75,9 +78,15 @@
     <ClInclude Include="xmodem.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="ymodem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="zmodem.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\common\win16api.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpfile-version.rc">

Modified: branches/cmake/teraterm/ttpfile/ttpfile.v15.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpfile/ttpfile.v15.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpfile/ttpfile.v15.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
@@ -83,6 +83,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
@@ -120,6 +121,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
@@ -151,6 +153,7 @@
     <ClInclude Include="kermit.h" />
     <ClInclude Include="quickvan.h" />
     <ClInclude Include="xmodem.h" />
+    <ClInclude Include="ymodem.h" />
     <ClInclude Include="zmodem.h" />
   </ItemGroup>
   <ItemGroup>

Modified: branches/cmake/teraterm/ttpfile/ttpfile.v15.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpfile/ttpfile.v15.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpfile/ttpfile.v15.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
@@ -78,6 +78,9 @@
     <ClInclude Include="xmodem.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="ymodem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="zmodem.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Copied: branches/cmake/teraterm/ttpfile/ttpfile.v16.vcxproj (from rev 7693, branches/cmake/teraterm/ttpfile/ttpfile.v15.vcxproj)
===================================================================
--- branches/cmake/teraterm/ttpfile/ttpfile.v16.vcxproj	                        (rev 0)
+++ branches/cmake/teraterm/ttpfile/ttpfile.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,178 @@
+<?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>{311F2B21-AEC4-4384-8209-BB83B54749B4}</ProjectGuid>
+    <RootNamespace>ttpfile</RootNamespace>
+    <ProjectName>ttpfile</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</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'">
+    <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)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>ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <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)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>ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <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_cpp.cpp" />
+    <ClCompile Include="..\common\dlglib_tmpl.cpp" />
+    <ClCompile Include="..\common\ttlib.c" />
+    <ClCompile Include="..\common\win16api.c" />
+    <ClCompile Include="bplus.c" />
+    <ClCompile Include="ftlib.c" />
+    <ClCompile Include="kermit.c" />
+    <ClCompile Include="quickvan.c" />
+    <ClCompile Include="ttfile.c" />
+    <ClCompile Include="xmodem.c" />
+    <ClCompile Include="ymodem.c" />
+    <ClCompile Include="zmodem.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\common\dlglib.h" />
+    <ClInclude Include="..\common\ttlib.h" />
+    <ClInclude Include="..\common\win16api.h" />
+    <ClInclude Include="bplus.h" />
+    <ClInclude Include="file_res.h" />
+    <ClInclude Include="ftlib.h" />
+    <ClInclude Include="kermit.h" />
+    <ClInclude Include="quickvan.h" />
+    <ClInclude Include="xmodem.h" />
+    <ClInclude Include="ymodem.h" />
+    <ClInclude Include="zmodem.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ttpfile-version.rc" />
+    <ResourceCompile Include="ttpfile.rc">
+      <Culture Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">0x0411</Culture>
+      <Culture Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">0x0411</Culture>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ttpfile.def" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ttpcmn\ttpcmn.v16.vcxproj">
+      <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/cmake/teraterm/ttpfile/ttpfile.v16.vcxproj.filters (from rev 7693, branches/cmake/teraterm/ttpfile/ttpfile.v15.vcxproj.filters)
===================================================================
--- branches/cmake/teraterm/ttpfile/ttpfile.v16.vcxproj.filters	                        (rev 0)
+++ branches/cmake/teraterm/ttpfile/ttpfile.v16.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,104 @@
+<?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>{4c3c8ccd-b3e9-440d-80d1-aaf7b21b8b66}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{bf5356c3-e3a3-4281-9958-e8f6a7d0c356}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{360711e5-7725-4557-b8cd-c23158cc1480}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+    <Filter Include="Def File">
+      <UniqueIdentifier>{61d48d45-2990-41db-9324-17ab8b0a2d3d}</UniqueIdentifier>
+      <Extensions>def</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="bplus.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ftlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="kermit.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="quickvan.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ttfile.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\ttlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="xmodem.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ymodem.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="zmodem.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\win16api.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="bplus.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\dlglib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="file_res.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ftlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="kermit.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="quickvan.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="xmodem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ymodem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="zmodem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\win16api.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ttpfile-version.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="ttpfile.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ttpfile.def">
+      <Filter>Def File</Filter>
+    </None>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Modified: branches/cmake/teraterm/ttpfile/ttpfile.v9.vcproj
===================================================================
--- branches/cmake/teraterm/ttpfile/ttpfile.v9.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpfile/ttpfile.v9.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -77,6 +77,7 @@
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ModuleDefinitionFile="$(ProjectName).def"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -166,6 +167,7 @@
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ModuleDefinitionFile="$(ProjectName).def"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -212,6 +214,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\common\dlglib_cpp.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\common\dlglib_tmpl.cpp"
+				>
+			</File>
+			<File
 				RelativePath="ftlib.c"
 				>
 			</File>
@@ -232,6 +242,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\common\win16api.c"
+				>
+			</File>
+			<File
 				RelativePath="xmodem.c"
 				>
 			</File>
@@ -243,10 +257,6 @@
 				RelativePath="zmodem.c"
 				>
 			</File>
-			<File
-				RelativePath="..\common\win16api.c"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -281,10 +291,18 @@
 				>
 			</File>
 			<File
+				RelativePath="..\common\win16api.h"
+				>
+			</File>
+			<File
 				RelativePath="xmodem.h"
 				>
 			</File>
 			<File
+				RelativePath="ymodem.h"
+				>
+			</File>
+			<File
 				RelativePath="zmodem.h"
 				>
 			</File>

Modified: branches/cmake/teraterm/ttpfile/ttpfile.vcproj
===================================================================
--- branches/cmake/teraterm/ttpfile/ttpfile.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpfile/ttpfile.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -76,6 +76,7 @@
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ModuleDefinitionFile="$(ProjectName).def"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				ImportLibrary="$(OutDir)\$(ProjectName).lib"
@@ -166,6 +167,7 @@
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ModuleDefinitionFile="$(ProjectName).def"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				ImportLibrary="$(OutDir)\$(ProjectName).lib"
@@ -213,6 +215,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\common\dlglib_cpp.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\common\dlglib_tmpl.cpp"
+				>
+			</File>
+			<File
 				RelativePath="ftlib.c"
 				>
 			</File>
@@ -282,10 +292,18 @@
 				>
 			</File>
 			<File
+				RelativePath="..\common\win16api.h"
+				>
+			</File>
+			<File
 				RelativePath="xmodem.h"
 				>
 			</File>
 			<File
+				RelativePath="ymodem.h"
+				>
+			</File>
+			<File
 				RelativePath="zmodem.h"
 				>
 			</File>

Modified: branches/cmake/teraterm/ttpmacro/ttl.cpp
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttl.cpp	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpmacro/ttl.cpp	2019-05-19 15:06:12 UTC (rev 7694)
@@ -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
@@ -1262,11 +1262,16 @@
 		bRet = CreateProcess(NULL, StrT_NC, NULL, NULL, FALSE, NORMAL_PRIORITY_CLASS, NULL, NULL, &sui, &pi);
 	else
 		bRet = CreateProcess(NULL, StrT_NC, NULL, NULL, FALSE, NORMAL_PRIORITY_CLASS, NULL, CurDirT, &sui, &pi);
-	// TODO: check bRet
-	if (wait) {
-		WaitForSingleObject(pi.hProcess, INFINITE);
-		GetExitCodeProcess(pi.hProcess, &ret);
-		SetResult(ret);
+	if (bRet == FALSE) {
+		Err = ErrCantExec;
+	} else {
+		if (wait) {
+			WaitForSingleObject(pi.hProcess, INFINITE);
+			GetExitCodeProcess(pi.hProcess, &ret);
+			SetResult(ret);
+		}
+		CloseHandle(pi.hThread);
+		CloseHandle(pi.hProcess);
 	}
 	return Err;
 }

Modified: branches/cmake/teraterm/ttpmacro/ttl_gui.cpp
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttl_gui.cpp	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpmacro/ttl_gui.cpp	2019-05-19 15:06:12 UTC (rev 7694)
@@ -456,51 +456,6 @@
 	return Err;
 }
 
-/* ttmparse.c\x82\xA9\x82\xE7\x88ړ\xAE */
-extern "C" void DispErr(WORD Err)
-{
-	const TCHAR *Msg;
-	int i;
-	int no, start, end;
-	char *filename;
-
-	Msg = _T("Unknown error message number.");
-
-	switch (Err) {
-		case ErrCloseParent: Msg = _T("\")\" expected."); break;
-		case ErrCantCall: Msg = _T("Can't call sub."); break;
-		case ErrCantConnect: Msg = _T("Can't link macro."); break;
-		case ErrCantOpen: Msg = _T("Can't open file."); break;
-		case ErrDivByZero: Msg = _T("Divide by zero."); break;
-		case ErrInvalidCtl: Msg = _T("Invalid control."); break;
-		case ErrLabelAlreadyDef: Msg = _T("Label already defined."); break;
-		case ErrLabelReq: Msg = _T("Label requiered."); break;
-		case ErrLinkFirst: Msg = _T("Link macro first. Use 'connect' macro."); break;
-		case ErrStackOver: Msg = _T("Stack overflow."); break;
-		case ErrSyntax: Msg = _T("Syntax error."); break;
-		case ErrTooManyLabels: Msg = _T("Too many labels."); break;
-		case ErrTooManyVar: Msg = _T("Too many variables."); break;
-		case ErrTypeMismatch: Msg = _T("Type mismatch."); break;
-		case ErrVarNotInit: Msg = _T("Variable not initialized."); break;
-		case ErrCloseComment: Msg = _T("\"*/\" expected."); break;
-		case ErrOutOfRange: Msg = _T("Index out of range."); break;
-		case ErrCloseBracket: Msg = _T("\"]\" expected."); break;
-		case ErrFewMemory: Msg = _T("Can't allocate memory."); break;
-		case ErrNotSupported: Msg = _T("Unknown command."); break;
-	}
-
-	no = GetLineNo();
-	start = LineParsePtr;
-	end = LinePtr;
-	if (start == end)
-		end = LineLen;
-
-	filename = GetMacroFileName();
-
-	i = OpenErrDlg(Msg, tc::fromUtf8(LineBuff), no, start, end, (tc)filename);
-	if (i==IDOK) TTLStatus = IdTTLEnd;
-}
-
 WORD TTLGetPassword()
 {
 	TStrVal Str, Str2, Temp2;

Modified: branches/cmake/teraterm/ttpmacro/ttmacro.cpp
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttmacro.cpp	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpmacro/ttmacro.cpp	2019-05-19 15:06:12 UTC (rev 7694)
@@ -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
@@ -49,11 +49,12 @@
 #include "ttmlib.h"
 #include "ttlib.h"
 
-#ifdef _DEBUG
+#if defined(_MSC_VER) && defined(_DEBUG)
 #define new new(_NORMAL_BLOCK, __FILE__, __LINE__)
 #endif
 
 char UILanguageFile[MAX_PATH];
+static char SetupFName[MAX_PATH];
 static HWND CtrlWnd;
 static HINSTANCE hInst;
 
@@ -72,13 +73,31 @@
 
 static void init()
 {
+	char UILanguageFileRel[MAX_PATH];
+
+	GetHomeDir(hInst, HomeDir, sizeof(HomeDir));
+	GetDefaultFName(HomeDir, "TERATERM.INI", SetupFName, sizeof(SetupFName));
+	GetPrivateProfileStringA("Tera Term", "UILanguageFile", "lang\\Default.lng",
+	                        UILanguageFileRel, sizeof(UILanguageFileRel), SetupFName);
+	GetUILanguageFileFull(HomeDir, UILanguageFileRel,
+						  UILanguageFile, sizeof(UILanguageFile));
+
 	DLLInit();
 	WinCompatInit();
-	if (pSetThreadDpiAwarenessContext) {
-		pSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
+
+	// DPI Aware (\x8D\x82DPI\x91Ή\x9E)
+	{
+		int dip_aware = 0;
+		dip_aware = GetPrivateProfileIntA("Tera Term", "DPIAware", dip_aware, SetupFName);
+		if (dip_aware != 0) {
+			if (pSetThreadDpiAwarenessContext != NULL) {
+				pSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
+			}
+		}
 	}
-	// messagebox\x82̃t\x83H\x83\x93\x83g\x82ɐݒ肷\x82\xE9
-	SetDialogFont(NULL, NULL, NULL);
+
+	// UILanguageFile\x82\xCC "Tera Term" \x83Z\x83N\x83V\x83\x87\x83\x93 "DLG_SYSTEM_FONT" \x82̃t\x83H\x83\x93\x83g\x82ɐݒ肷\x82\xE9
+	SetDialogFont(SetupFName, UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
 }
 
 // TTMACRO main engine
@@ -101,12 +120,6 @@
 	return Continue;
 }
 
-/////////////////////////////////////////////////////////////////////////////
-
-// CCtrlApp theApp;
-
-/////////////////////////////////////////////////////////////////////////////
-
 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPreInst,
                    LPSTR lpszCmdLine, int nCmdShow)
 {
@@ -115,12 +128,11 @@
 	DWORD SleepTick = 1;
 
 #ifdef _DEBUG
-	::_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
+	_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
 #endif
 
+//	InitCommonControls();
 	init();
-//	InitCommonControls();
-	GetUILanguageFile(UILanguageFile, sizeof(UILanguageFile));
 
 	Busy = TRUE;
 	pCCtrlWindow = new CCtrlWindow();
@@ -130,7 +142,7 @@
 	HWND hWnd = pCCtrlWindow->GetSafeHwnd();
 	CtrlWnd = hWnd;
 
-	//////////////////////////////////////////////////////////////////////
+	// message pump
 	MSG msg;
 	while (GetMessage(&msg, NULL, 0, 0)) {
 
@@ -158,10 +170,10 @@
 		}
 	}
 
-	// TODO \x82\xB7\x82łɕ‚\xB6\x82\xE7\x82\xEA\x82Ă\xA2\x82\xE9\x81A\x82\xB1\x82̏\x88\x97\x9D\x95s\x97v?
-	if (pCCtrlWindow) {
-		pCCtrlWindow->DestroyWindow();
-	}
+	pCCtrlWindow->DestroyWindow();
+	delete pCCtrlWindow;
 	pCCtrlWindow = NULL;
+
+	DLLExit();
 	return ExitCode;
 }

Modified: branches/cmake/teraterm/ttpmacro/ttmdlg.cpp
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttmdlg.cpp	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpmacro/ttmdlg.cpp	2019-05-19 15:06:12 UTC (rev 7694)
@@ -56,12 +56,12 @@
 #define malloc(l)     _malloc_dbg((l), _NORMAL_BLOCK, __FILE__, __LINE__)
 #define realloc(p, l) _realloc_dbg((p), (l), _NORMAL_BLOCK, __FILE__, __LINE__)
 #define calloc(c, s)  _calloc_dbg((c), (s), _NORMAL_BLOCK, __FILE__, __LINE__)
-#define free(p)       _free_dbg((p), _NORMAL_BLOCK, __FILE__, __LINE__)
+#define free(p)       _free_dbg((p), _NORMAL_BLOCK)
 #define strdup(s)	  _strdup_dbg((s), _NORMAL_BLOCK, __FILE__, __LINE__)
 #define _strdup(s)	  _strdup_dbg((s), _NORMAL_BLOCK, __FILE__, __LINE__)
 #endif
 
-char HomeDir[MAXPATHLEN];
+char HomeDir[MAX_PATH];
 char FileName[MAX_PATH];
 char TopicName[11];
 char ShortName[MAX_PATH];
@@ -82,11 +82,7 @@
 	char Temp[MaxStrLen];
 	PCHAR start, cur, next;
 
-	// Get home directory
-	if (GetModuleFileNameA(GetInstance(), FileName,sizeof(FileName)) == 0) {
-		return;
-	}
-	ExtractDirName(FileName,HomeDir);
+	// go home directory
 	_chdir(HomeDir);
 
 	// Get command line parameters
@@ -303,9 +299,6 @@
  */
 int OpenListDlg(const TCHAR *Text, const TCHAR *Caption, const TCHAR **Lists, int Selected)
 {
-	HINSTANCE hInst = GetInstance();
-	HWND hWnd = GetHWND();
-
 	CListDlg ListDlg(Text, Caption, Lists, Selected, DlgPosX, DlgPosY);
 	INT_PTR r = ListDlg.DoModal();
 	if (r == IDOK) {

Modified: branches/cmake/teraterm/ttpmacro/ttmdlg.h
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttmdlg.h	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpmacro/ttmdlg.h	2019-05-19 15:06:12 UTC (rev 7694)
@@ -50,7 +50,7 @@
 
 int OpenListDlg(const TCHAR *Text, const TCHAR *Caption, const TCHAR **Lists, int Selected);
 
-extern char HomeDir[MAXPATHLEN];
+extern char HomeDir[MAX_PATH];
 extern char FileName[MAX_PATH];
 extern char TopicName[11];
 extern char ShortName[MAX_PATH];

Modified: branches/cmake/teraterm/ttpmacro/ttmmain.cpp
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttmmain.cpp	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpmacro/ttmmain.cpp	2019-05-19 15:06:12 UTC (rev 7694)
@@ -621,7 +621,6 @@
 
 BOOL CCtrlWindow::PostNcDestroy()
 {
-	delete this;
 	PostQuitMessage(0);
 	return TRUE;
 }

Modified: branches/cmake/teraterm/ttpmacro/ttmparse.c
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttmparse.c	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpmacro/ttmparse.c	2019-05-19 15:06:12 UTC (rev 7694)
@@ -40,15 +40,7 @@
 #include "codeconv.h"
 
 #ifdef _DEBUG
-
-#define malloc(l)     _malloc_dbg((l), _NORMAL_BLOCK, __FILE__, __LINE__)
-#define realloc(p, l) _realloc_dbg((p), (l), _NORMAL_BLOCK, __FILE__, __LINE__)
 #define calloc(c, s)  _calloc_dbg((c), (s), _NORMAL_BLOCK, __FILE__, __LINE__)
-#define free(p)       _free_dbg((p), _NORMAL_BLOCK, __FILE__, __LINE__)
-#endif
-
-#ifdef _DEBUG
-#define calloc(c, s)  _calloc_dbg((c), (s), _NORMAL_BLOCK, __FILE__, __LINE__)
 #define malloc(l)     _malloc_dbg((l), _NORMAL_BLOCK, __FILE__, __LINE__)
 #define free(p)       _free_dbg((p), _NORMAL_BLOCK)
 #endif
@@ -133,38 +125,37 @@
 	GlobalFree(HStrBuff);
 }
 
-#if 0	// ttl_gui.c\x82ɂƂ肠\x82\xA6\x82\xB8\x8E\x9D\x82\xC1\x82Ă\xA2\x82\xC1\x82\xBD
 void DispErr(WORD Err)
 {
-	char Msg[41];
+	const char *Msg;
 	int i;
 	int no, start, end;
 	char *filename;
 
-	strncpy_s(Msg, sizeof(Msg), "Unknown error message number.", _TRUNCATE);
-
 	switch (Err) {
-		case ErrCloseParent: strncpy_s(Msg, sizeof(Msg),"\")\" expected.", _TRUNCATE); break;
-		case ErrCantCall: strncpy_s(Msg, sizeof(Msg),"Can't call sub.", _TRUNCATE); break;
-		case ErrCantConnect: strncpy_s(Msg, sizeof(Msg),"Can't link macro.", _TRUNCATE); break;
-		case ErrCantOpen: strncpy_s(Msg, sizeof(Msg),"Can't open file.", _TRUNCATE); break;
-		case ErrDivByZero: strncpy_s(Msg, sizeof(Msg),"Divide by zero.", _TRUNCATE); break;
-		case ErrInvalidCtl: strncpy_s(Msg, sizeof(Msg),"Invalid control.", _TRUNCATE); break;
-		case ErrLabelAlreadyDef: strncpy_s(Msg, sizeof(Msg),"Label already defined.", _TRUNCATE); break;
-		case ErrLabelReq: strncpy_s(Msg, sizeof(Msg),"Label requiered.", _TRUNCATE); break;
-		case ErrLinkFirst: strncpy_s(Msg, sizeof(Msg),"Link macro first. Use 'connect' macro.", _TRUNCATE); break;
-		case ErrStackOver: strncpy_s(Msg, sizeof(Msg),"Stack overflow.", _TRUNCATE); break;
-		case ErrSyntax: strncpy_s(Msg, sizeof(Msg),"Syntax error.", _TRUNCATE); break;
-		case ErrTooManyLabels: strncpy_s(Msg, sizeof(Msg),"Too many labels.", _TRUNCATE); break;
-		case ErrTooManyVar: strncpy_s(Msg, sizeof(Msg),"Too many variables.", _TRUNCATE); break;
-		case ErrTypeMismatch: strncpy_s(Msg, sizeof(Msg),"Type mismatch.", _TRUNCATE); break;
-		case ErrVarNotInit: strncpy_s(Msg, sizeof(Msg),"Variable not initialized.", _TRUNCATE); break;
-		case ErrCloseComment: strncpy_s(Msg, sizeof(Msg),"\"*/\" expected.", _TRUNCATE); break;
-		case ErrOutOfRange: strncpy_s(Msg, sizeof(Msg), "Index out of range.", _TRUNCATE); break;
-		case ErrCloseBracket: strncpy_s(Msg, sizeof(Msg), "\"]\" expected.", _TRUNCATE); break;
-		case ErrFewMemory: strncpy_s(Msg, sizeof(Msg), "Can't allocate memory.", _TRUNCATE); break;
-		case ErrNotSupported: strncpy_s(Msg, sizeof(Msg), "Unknown command.", _TRUNCATE); break;
-	}
+		case ErrCloseParent: Msg = "\")\" expected."; break;
+		case ErrCantCall: Msg = "Can't call sub."; break;
+		case ErrCantConnect: Msg = "Can't link macro."; break;
+		case ErrCantOpen: Msg = "Can't open file."; break;
+		case ErrDivByZero: Msg = "Divide by zero."; break;
+		case ErrInvalidCtl: Msg = "Invalid control."; break;
+		case ErrLabelAlreadyDef: Msg = "Label already defined."; break;
+		case ErrLabelReq: Msg = "Label requiered."; break;
+		case ErrLinkFirst: Msg = "Link macro first. Use 'connect' macro."; break;
+		case ErrStackOver: Msg = "Stack overflow."; break;
+		case ErrSyntax: Msg = "Syntax error."; break;
+		case ErrTooManyLabels: Msg = "Too many labels."; break;
+		case ErrTooManyVar: Msg = "Too many variables."; break;
+		case ErrTypeMismatch: Msg = "Type mismatch."; break;
+		case ErrVarNotInit: Msg = "Variable not initialized."; break;
+		case ErrCloseComment: Msg = "\"*/\" expected."; break;
+		case ErrOutOfRange: Msg = "Index out of range."; break;
+		case ErrCloseBracket: Msg = "\"]\" expected."; break;
+		case ErrFewMemory: Msg = "Can't allocate memory."; break;
+		case ErrNotSupported: Msg = "Unknown command."; break;
+		case ErrCantExec: Msg = "Can't execute command."; break;
+		default: Msg = "Unknown error message number."; break;
+	};
 
 	no = GetLineNo();
 	start = LineParsePtr;
@@ -174,10 +165,9 @@
 
 	filename = GetMacroFileName();
 
-	i = OpenErrDlg((tc)Msg, (tc)LineBuff, no, start, end, (tc)filename);
+	i = OpenErrDlg(Msg, LineBuff, no, start, end, filename);
 	if (i==IDOK) TTLStatus = IdTTLEnd;
 }
-#endif
 
 void LockVar()
 {

Modified: branches/cmake/teraterm/ttpmacro/ttmparse.h
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttmparse.h	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpmacro/ttmparse.h	2019-05-19 15:06:12 UTC (rev 7694)
@@ -67,6 +67,7 @@
 #define ErrCloseBracket     18
 #define ErrFewMemory        19
 #define ErrNotSupported     20
+#define ErrCantExec         21
 
 #define TypUnknown  0
 #define TypInteger  1

Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.v10.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.v10.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.v10.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
@@ -23,11 +23,11 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -78,7 +78,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>nafxcw.lib;LIBCMT.lib;onig_s.lib;SFMT.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>LIBCMT.lib;onig_s.lib;SFMT.lib;iphlpapi.lib;Comctl32.lib;ws2_32.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,7 +85,6 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreSpecificDefaultLibraries>nafxcw.lib;LIBCMT.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -115,7 +114,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;onig_sd.lib;SFMTd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>LIBCMTD.lib;onig_sd.lib;SFMTd.lib;iphlpapi.lib;Comctl32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>iphlpapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -122,11 +121,19 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\common\codeconv.cpp" />
+    <ClCompile Include="..\common\compat_win.cpp" />
+    <ClCompile Include="..\common\dlglib.c" />
+    <ClCompile Include="..\common\dlglib_cpp.cpp" />
+    <ClCompile Include="..\common\dlglib_tmpl.cpp" />
+    <ClCompile Include="..\common\dllutil.cpp" />
+    <ClCompile Include="..\common\i18n.c" />
+    <ClCompile Include="..\common\tmfc.cpp" />
+    <ClCompile Include="..\common\tmfc_frame.cpp" />
+    <ClCompile Include="..\common\ttlib.c" />
     <ClCompile Include="..\common\win16api.c" />
     <ClCompile Include="errdlg.cpp" />
     <ClCompile Include="fileread.cpp" />
@@ -134,15 +141,12 @@
     <ClCompile Include="ListDlg.cpp" />
     <ClCompile Include="msgdlg.cpp" />
     <ClCompile Include="statdlg.cpp" />
-    <ClCompile Include="..\common\stdafx.cpp" />
+    <ClCompile Include="ttl.c" />
     <ClCompile Include="ttmacro.cpp" />
-    <ClCompile Include="ttmdlg.cpp" />
     <ClCompile Include="ttmmain.cpp" />
-    <ClCompile Include="..\common\i18n.c" />
-    <ClCompile Include="ttl.c" />
-    <ClCompile Include="..\common\ttlib.c" />
     <ClCompile Include="ttmbuff.c" />
     <ClCompile Include="ttmdde.c" />
+    <ClCompile Include="ttmdlg.cpp" />
     <ClCompile Include="ttmenc.c" />
     <ClCompile Include="ttmlib.c" />
     <ClCompile Include="ttmparse.c" />
@@ -150,6 +154,13 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\common\codeconv.h" />
+    <ClInclude Include="..\common\compat_win.h" />
+    <ClInclude Include="..\common\dlglib.h" />
+    <ClInclude Include="..\common\dllutil.h" />
+    <ClInclude Include="..\common\tmfc.h" />
+    <ClInclude Include="..\common\ttddecmnd.h" />
+    <ClInclude Include="..\common\ttlib.h" />
+    <ClInclude Include="..\common\win16api.h" />
     <ClInclude Include="errdlg.h" />
     <ClInclude Include="fileread.h" />
     <ClInclude Include="inpdlg.h" />
@@ -156,11 +167,7 @@
     <ClInclude Include="ListDlg.h" />
     <ClInclude Include="msgdlg.h" />
     <ClInclude Include="statdlg.h" />
-    <ClInclude Include="stdafx.h" />
-    <ClInclude Include="..\common\ttddecmnd.h" />
     <ClInclude Include="ttl.h" />
-    <ClInclude Include="..\common\ttlib.h" />
-    <ClInclude Include="ttm_res.h" />
     <ClInclude Include="ttmacro.h" />
     <ClInclude Include="ttmbuff.h" />
     <ClInclude Include="ttmdde.h" />
@@ -170,10 +177,11 @@
     <ClInclude Include="ttmmain.h" />
     <ClInclude Include="ttmmsg.h" />
     <ClInclude Include="ttmparse.h" />
-    <ClInclude Include="..\common\win16api.h" />
+    <ClInclude Include="ttm_res.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="ttmacro.ico" />
+    <None Include="ttmacro_3d.ico" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttm-version.rc" />

Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.v10.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.v10.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.v10.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -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>
@@ -82,6 +79,27 @@
     <ClCompile Include="fileread.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\common\tmfc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\tmfc_frame.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\dlglib_tmpl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\dlglib_cpp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\compat_win.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\dllutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="errdlg.h">
@@ -99,9 +117,6 @@
     <ClInclude Include="statdlg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="stdafx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\common\ttddecmnd.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -150,11 +165,26 @@
     <ClInclude Include="fileread.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\common\tmfc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\dlglib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\compat_win.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\dllutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="ttmacro.ico">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="ttmacro_3d.ico">
+      <Filter>Resource Files</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttm-version.rc">

Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.v11.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.v11.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.v11.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
@@ -20,12 +20,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v110</PlatformToolset>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v110</PlatformToolset>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -79,7 +79,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>nafxcw.lib;LIBCMT.lib;onig_s.lib;SFMT.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>LIBCMT.lib;onig_s.lib;SFMT.lib;iphlpapi.lib;Comctl32.lib;ws2_32.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,7 +86,6 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreSpecificDefaultLibraries>nafxcw.lib;LIBCMT.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -115,7 +114,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;onig_sd.lib;SFMTd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>LIBCMTD.lib;onig_sd.lib;SFMTd.lib;iphlpapi.lib;Comctl32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>iphlpapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -122,11 +121,19 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\common\codeconv.cpp" />
+    <ClCompile Include="..\common\compat_win.cpp" />
+    <ClCompile Include="..\common\dlglib.c" />
+    <ClCompile Include="..\common\dlglib_cpp.cpp" />
+    <ClCompile Include="..\common\dlglib_tmpl.cpp" />
+    <ClCompile Include="..\common\dllutil.cpp" />
+    <ClCompile Include="..\common\i18n.c" />
+    <ClCompile Include="..\common\tmfc.cpp" />
+    <ClCompile Include="..\common\tmfc_frame.cpp" />
+    <ClCompile Include="..\common\ttlib.c" />
     <ClCompile Include="..\common\win16api.c" />
     <ClCompile Include="errdlg.cpp" />
     <ClCompile Include="fileread.cpp" />
@@ -134,15 +141,12 @@
     <ClCompile Include="ListDlg.cpp" />
     <ClCompile Include="msgdlg.cpp" />
     <ClCompile Include="statdlg.cpp" />
-    <ClCompile Include="..\common\stdafx.cpp" />
+    <ClCompile Include="ttl.c" />
     <ClCompile Include="ttmacro.cpp" />
-    <ClCompile Include="ttmdlg.cpp" />
     <ClCompile Include="ttmmain.cpp" />
-    <ClCompile Include="..\common\i18n.c" />
-    <ClCompile Include="ttl.c" />
-    <ClCompile Include="..\common\ttlib.c" />
     <ClCompile Include="ttmbuff.c" />
     <ClCompile Include="ttmdde.c" />
+    <ClCompile Include="ttmdlg.cpp" />
     <ClCompile Include="ttmenc.c" />
     <ClCompile Include="ttmlib.c" />
     <ClCompile Include="ttmparse.c" />
@@ -150,6 +154,13 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\common\codeconv.h" />
+    <ClInclude Include="..\common\compat_win.h" />
+    <ClInclude Include="..\common\dlglib.h" />
+    <ClInclude Include="..\common\dllutil.h" />
+    <ClInclude Include="..\common\tmfc.h" />
+    <ClInclude Include="..\common\ttddecmnd.h" />
+    <ClInclude Include="..\common\ttlib.h" />
+    <ClInclude Include="..\common\win16api.h" />
     <ClInclude Include="errdlg.h" />
     <ClInclude Include="fileread.h" />
     <ClInclude Include="inpdlg.h" />
@@ -156,11 +167,7 @@
     <ClInclude Include="ListDlg.h" />
     <ClInclude Include="msgdlg.h" />
     <ClInclude Include="statdlg.h" />
-    <ClInclude Include="stdafx.h" />
-    <ClInclude Include="..\common\ttddecmnd.h" />
     <ClInclude Include="ttl.h" />
-    <ClInclude Include="..\common\ttlib.h" />
-    <ClInclude Include="ttm_res.h" />
     <ClInclude Include="ttmacro.h" />
     <ClInclude Include="ttmbuff.h" />
     <ClInclude Include="ttmdde.h" />
@@ -170,10 +177,11 @@
     <ClInclude Include="ttmmain.h" />
     <ClInclude Include="ttmmsg.h" />
     <ClInclude Include="ttmparse.h" />
-    <ClInclude Include="..\common\win16api.h" />
+    <ClInclude Include="ttm_res.h" />
   </ItemGroup>
   <ItemGroup>
     <Image Include="ttmacro.ico" />
+    <Image Include="ttmacro_3d.ico" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttm-version.rc" />

Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.v11.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.v11.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.v11.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -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>
@@ -82,6 +79,27 @@
     <ClCompile Include="fileread.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\common\tmfc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\tmfc_frame.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\dlglib_tmpl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\dlglib_cpp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\compat_win.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\dllutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="errdlg.h">
@@ -99,9 +117,6 @@
     <ClInclude Include="statdlg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="stdafx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\common\ttddecmnd.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -150,11 +165,26 @@
     <ClInclude Include="fileread.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\common\tmfc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\dlglib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\compat_win.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\dllutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="ttmacro.ico">
       <Filter>Resource Files</Filter>
     </Image>
+    <Image Include="ttmacro_3d.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttm-version.rc">

Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.v12.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.v12.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.v12.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
@@ -20,12 +20,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -79,7 +79,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>nafxcw.lib;LIBCMT.lib;onig_s.lib;SFMT.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>LIBCMT.lib;onig_s.lib;SFMT.lib;iphlpapi.lib;Comctl32.lib;ws2_32.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,7 +86,6 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreSpecificDefaultLibraries>nafxcw.lib;LIBCMT.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -115,7 +114,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;onig_sd.lib;SFMTd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>LIBCMTD.lib;onig_sd.lib;SFMTd.lib;iphlpapi.lib;Comctl32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>iphlpapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -122,13 +121,18 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\common\codeconv.cpp" />
+    <ClCompile Include="..\common\compat_win.cpp" />
+    <ClCompile Include="..\common\dlglib.c" />
+    <ClCompile Include="..\common\dlglib_cpp.cpp" />
+    <ClCompile Include="..\common\dlglib_tmpl.cpp" />
+    <ClCompile Include="..\common\dllutil.cpp" />
     <ClCompile Include="..\common\i18n.c" />
-    <ClCompile Include="..\common\stdafx.cpp" />
+    <ClCompile Include="..\common\tmfc.cpp" />
+    <ClCompile Include="..\common\tmfc_frame.cpp" />
     <ClCompile Include="..\common\ttlib.c" />
     <ClCompile Include="..\common\win16api.c" />
     <ClCompile Include="errdlg.cpp" />
@@ -150,6 +154,10 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\common\codeconv.h" />
+    <ClInclude Include="..\common\compat_win.h" />
+    <ClInclude Include="..\common\dlglib.h" />
+    <ClInclude Include="..\common\dllutil.h" />
+    <ClInclude Include="..\common\tmfc.h" />
     <ClInclude Include="..\common\ttddecmnd.h" />
     <ClInclude Include="..\common\ttlib.h" />
     <ClInclude Include="..\common\win16api.h" />
@@ -159,7 +167,6 @@
     <ClInclude Include="ListDlg.h" />
     <ClInclude Include="msgdlg.h" />
     <ClInclude Include="statdlg.h" />
-    <ClInclude Include="stdafx.h" />
     <ClInclude Include="ttl.h" />
     <ClInclude Include="ttmacro.h" />
     <ClInclude Include="ttmbuff.h" />
@@ -174,6 +181,7 @@
   </ItemGroup>
   <ItemGroup>
     <Image Include="ttmacro.ico" />
+    <Image Include="ttmacro_3d.ico" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttm-version.rc" />

Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.v12.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.v12.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.v12.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -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>
@@ -82,6 +79,27 @@
     <ClCompile Include="fileread.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\common\tmfc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\tmfc_frame.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\dlglib_tmpl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\dlglib_cpp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\compat_win.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\dllutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="errdlg.h">
@@ -99,9 +117,6 @@
     <ClInclude Include="statdlg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="stdafx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\common\ttddecmnd.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -150,11 +165,26 @@
     <ClInclude Include="fileread.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\common\tmfc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\dlglib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\compat_win.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\dllutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="ttmacro.ico">
       <Filter>Resource Files</Filter>
     </Image>
+    <Image Include="ttmacro_3d.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttm-version.rc">

Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.v14.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.v14.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.v14.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
@@ -20,12 +20,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -79,7 +79,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>nafxcw.lib;LIBCMT.lib;onig_s.lib;SFMT.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>LIBCMT.lib;onig_s.lib;SFMT.lib;iphlpapi.lib;Comctl32.lib;ws2_32.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,7 +86,6 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreSpecificDefaultLibraries>nafxcw.lib;LIBCMT.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -115,7 +114,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;onig_sd.lib;SFMTd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>LIBCMTD.lib;onig_sd.lib;SFMTd.lib;iphlpapi.lib;Comctl32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>iphlpapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -122,13 +121,18 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\common\codeconv.cpp" />
+    <ClCompile Include="..\common\compat_win.cpp" />
+    <ClCompile Include="..\common\dlglib.c" />
+    <ClCompile Include="..\common\dlglib_cpp.cpp" />
+    <ClCompile Include="..\common\dlglib_tmpl.cpp" />
+    <ClCompile Include="..\common\dllutil.cpp" />
     <ClCompile Include="..\common\i18n.c" />
-    <ClCompile Include="..\common\stdafx.cpp" />
+    <ClCompile Include="..\common\tmfc.cpp" />
+    <ClCompile Include="..\common\tmfc_frame.cpp" />
     <ClCompile Include="..\common\ttlib.c" />
     <ClCompile Include="..\common\win16api.c" />
     <ClCompile Include="errdlg.cpp" />
@@ -150,6 +154,10 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\common\codeconv.h" />
+    <ClInclude Include="..\common\compat_win.h" />
+    <ClInclude Include="..\common\dlglib.h" />
+    <ClInclude Include="..\common\dllutil.h" />
+    <ClInclude Include="..\common\tmfc.h" />
     <ClInclude Include="..\common\ttddecmnd.h" />
     <ClInclude Include="..\common\ttlib.h" />
     <ClInclude Include="..\common\win16api.h" />
@@ -159,7 +167,6 @@
     <ClInclude Include="ListDlg.h" />
     <ClInclude Include="msgdlg.h" />
     <ClInclude Include="statdlg.h" />
-    <ClInclude Include="stdafx.h" />
     <ClInclude Include="ttl.h" />
     <ClInclude Include="ttmacro.h" />
     <ClInclude Include="ttmbuff.h" />
@@ -174,6 +181,7 @@
   </ItemGroup>
   <ItemGroup>
     <Image Include="ttmacro.ico" />
+    <Image Include="ttmacro_3d.ico" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttm-version.rc" />

Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.v14.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.v14.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.v14.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -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>
@@ -82,6 +79,27 @@
     <ClCompile Include="fileread.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\common\tmfc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\tmfc_frame.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\dlglib_tmpl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\dlglib_cpp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\compat_win.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\dllutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="errdlg.h">
@@ -99,9 +117,6 @@
     <ClInclude Include="statdlg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="stdafx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\common\ttddecmnd.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -150,11 +165,26 @@
     <ClInclude Include="fileread.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\common\tmfc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\dlglib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\compat_win.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\dllutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="ttmacro.ico">
       <Filter>Resource Files</Filter>
     </Image>
+    <Image Include="ttmacro_3d.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttm-version.rc">

Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.v15.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.v15.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.v15.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
@@ -124,7 +124,6 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -185,6 +184,7 @@
   </ItemGroup>
   <ItemGroup>
     <Image Include="ttmacro.ico" />
+    <Image Include="ttmacro_3d.ico" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttm-version.rc" />

Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -182,6 +182,9 @@
     <Image Include="ttmacro.ico">
       <Filter>Resource Files</Filter>
     </Image>
+    <Image Include="ttmacro_3d.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttm-version.rc">

Copied: branches/cmake/teraterm/ttpmacro/ttpmacro.v16.vcxproj (from rev 7693, branches/cmake/teraterm/ttpmacro/ttpmacro.v15.vcxproj)
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.v16.vcxproj	                        (rev 0)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,210 @@
+<?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>{BA519362-A2C2-4B1A-905B-F00791F9038A}</ProjectGuid>
+    <RootNamespace>ttpmacro</RootNamespace>
+    <Keyword>MFCProj</Keyword>
+    <ProjectName>ttpmacro</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</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'">
+    <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)..\libs\SFMT;$(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>LIBCMT.lib;onig_s.lib;SFMT.lib;iphlpapi.lib;Comctl32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <DelayLoadDLLs>iphlpapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <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)..\libs\SFMT;$(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>LIBCMTD.lib;onig_sd.lib;SFMTd.lib;iphlpapi.lib;Comctl32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <DelayLoadDLLs>iphlpapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\common\codeconv.cpp" />
+    <ClCompile Include="..\common\compat_win.cpp" />
+    <ClCompile Include="..\common\dlglib.c" />
+    <ClCompile Include="..\common\dlglib_cpp.cpp" />
+    <ClCompile Include="..\common\dlglib_tmpl.cpp" />
+    <ClCompile Include="..\common\dllutil.cpp" />
+    <ClCompile Include="..\common\i18n.c" />
+    <ClCompile Include="..\common\tmfc.cpp" />
+    <ClCompile Include="..\common\tmfc_frame.cpp" />
+    <ClCompile Include="..\common\ttlib.c" />
+    <ClCompile Include="..\common\win16api.c" />
+    <ClCompile Include="errdlg.cpp" />
+    <ClCompile Include="fileread.cpp" />
+    <ClCompile Include="inpdlg.cpp" />
+    <ClCompile Include="ListDlg.cpp" />
+    <ClCompile Include="msgdlg.cpp" />
+    <ClCompile Include="statdlg.cpp" />
+    <ClCompile Include="ttl.c" />
+    <ClCompile Include="ttmacro.cpp" />
+    <ClCompile Include="ttmmain.cpp" />
+    <ClCompile Include="ttmbuff.c" />
+    <ClCompile Include="ttmdde.c" />
+    <ClCompile Include="ttmdlg.cpp" />
+    <ClCompile Include="ttmenc.c" />
+    <ClCompile Include="ttmlib.c" />
+    <ClCompile Include="ttmparse.c" />
+    <ClCompile Include="wait4all.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\common\codeconv.h" />
+    <ClInclude Include="..\common\compat_win.h" />
+    <ClInclude Include="..\common\dlglib.h" />
+    <ClInclude Include="..\common\dllutil.h" />
+    <ClInclude Include="..\common\tmfc.h" />
+    <ClInclude Include="..\common\ttddecmnd.h" />
+    <ClInclude Include="..\common\ttlib.h" />
+    <ClInclude Include="..\common\win16api.h" />
+    <ClInclude Include="errdlg.h" />
+    <ClInclude Include="fileread.h" />
+    <ClInclude Include="inpdlg.h" />
+    <ClInclude Include="ListDlg.h" />
+    <ClInclude Include="msgdlg.h" />
+    <ClInclude Include="statdlg.h" />
+    <ClInclude Include="ttl.h" />
+    <ClInclude Include="ttmacro.h" />
+    <ClInclude Include="ttmbuff.h" />
+    <ClInclude Include="ttmdde.h" />
+    <ClInclude Include="ttmdlg.h" />
+    <ClInclude Include="ttmenc.h" />
+    <ClInclude Include="ttmlib.h" />
+    <ClInclude Include="ttmmain.h" />
+    <ClInclude Include="ttmmsg.h" />
+    <ClInclude Include="ttmparse.h" />
+    <ClInclude Include="ttm_res.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="ttmacro.ico" />
+    <Image Include="ttmacro_3d.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ttm-version.rc" />
+    <ResourceCompile Include="ttpmacro.rc">
+      <Culture Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">0x0411</Culture>
+      <Culture Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">0x0411</Culture>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ttpcmn\ttpcmn.v16.vcxproj">
+      <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties RESOURCE_FILE="ttpmacro.rc" />
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file

Copied: branches/cmake/teraterm/ttpmacro/ttpmacro.v16.vcxproj.filters (from rev 7693, branches/cmake/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters)
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.v16.vcxproj.filters	                        (rev 0)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.v16.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,197 @@
+<?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>{924f64f3-99d1-4df3-a201-68b1b1a000c5}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{a572c283-2f72-45e8-8e83-9b17b3960cb5}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{51ae6c43-0b05-42b4-881b-b0b848091d1b}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+    <Filter Include="Source Files %28C%29">
+      <UniqueIdentifier>{1744405b-5e2a-4278-ac2e-19f0db3d82d1}</UniqueIdentifier>
+      <Extensions>c</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="errdlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="inpdlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ListDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="msgdlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="statdlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ttmacro.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ttmdlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ttmmain.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\i18n.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="ttl.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\ttlib.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="ttmbuff.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="ttmdde.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="ttmenc.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="ttmlib.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="ttmparse.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="wait4all.c">
+      <Filter>Source Files %28C%29</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\win16api.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\codeconv.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="fileread.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\tmfc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\tmfc_frame.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\dlglib_tmpl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\dlglib_cpp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\compat_win.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\dllutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="errdlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inpdlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ListDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="msgdlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="statdlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttddecmnd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttm_res.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttmacro.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttmbuff.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttmdde.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttmdlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttmenc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttmlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttmmain.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttmmsg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttmparse.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\win16api.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\codeconv.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="fileread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\tmfc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\dlglib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\compat_win.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\dllutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="ttmacro.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="ttmacro_3d.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ttm-version.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="ttpmacro.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.v9.vcproj
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.v9.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.v9.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -21,7 +21,7 @@
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
-			UseOfMFC="1"
+			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			>
 			<Tool
@@ -73,11 +73,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="nafxcw.lib LIBCMT.lib onig_s.lib SFMT.lib iphlpapi.lib"
+				AdditionalDependencies="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"
@@ -112,7 +111,7 @@
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
-			UseOfMFC="1"
+			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			>
 			<Tool
@@ -162,11 +161,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="nafxcwd.lib LIBCMTD.lib onig_sd.lib SFMTd.lib iphlpapi.lib"
+				AdditionalDependencies="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"
@@ -209,10 +207,34 @@
 				>
 			</File>
 			<File
+				RelativePath="..\common\compat_win.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\common\dlglib.c"
+				>
+			</File>
+			<File
+				RelativePath="..\common\dlglib_cpp.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\common\dlglib_tmpl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\common\dllutil.cpp"
+				>
+			</File>
+			<File
 				RelativePath="errdlg.cpp"
 				>
 			</File>
 			<File
+				RelativePath="fileread.cpp"
+				>
+			</File>
+			<File
 				RelativePath="inpdlg.cpp"
 				>
 			</File>
@@ -229,10 +251,14 @@
 				>
 			</File>
 			<File
-				RelativePath="..\common\stdafx.cpp"
+				RelativePath="..\common\tmfc.cpp"
 				>
 			</File>
 			<File
+				RelativePath="..\common\tmfc_frame.cpp"
+				>
+			</File>
+			<File
 				RelativePath="ttmacro.cpp"
 				>
 			</File>
@@ -244,6 +270,10 @@
 				RelativePath="ttmmain.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\common\win16api.c"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -254,6 +284,18 @@
 				>
 			</File>
 			<File
+				RelativePath="..\common\compat_win.h"
+				>
+			</File>
+			<File
+				RelativePath="..\common\dlglib.h"
+				>
+			</File>
+			<File
+				RelativePath="..\common\dllutil.h"
+				>
+			</File>
+			<File
 				RelativePath="errdlg.h"
 				>
 			</File>
@@ -278,7 +320,7 @@
 				>
 			</File>
 			<File
-				RelativePath="stdafx.h"
+				RelativePath="..\common\tmfc.h"
 				>
 			</File>
 			<File
@@ -351,6 +393,10 @@
 				>
 			</File>
 			<File
+				RelativePath="ttmacro_3d.ico"
+				>
+			</File>
+			<File
 				RelativePath="ttpmacro.rc"
 				>
 				<FileConfiguration
@@ -413,14 +459,6 @@
 				RelativePath="wait4all.c"
 				>
 			</File>
-			<File
-				RelativePath="..\common\win16api.c"
-				>
-			</File>
-			<File
-				RelativePath="fileread.cpp"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>

Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.vcproj
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -234,6 +234,10 @@
 				>
 			</File>
 			<File
+				RelativePath="fileread.cpp"
+				>
+			</File>
+			<File
 				RelativePath="inpdlg.cpp"
 				>
 			</File>
@@ -269,6 +273,10 @@
 				RelativePath="ttmmain.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\common\win16api.c"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -283,6 +291,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\common\dlglib.h"
+				>
+			</File>
+			<File
 				RelativePath="..\common\dllutil.h"
 				>
 			</File>
@@ -311,10 +323,6 @@
 				>
 			</File>
 			<File
-				RelativePath="stdafx.h"
-				>
-			</File>
-			<File
 				RelativePath="..\common\tmfc.h"
 				>
 			</File>
@@ -419,10 +427,6 @@
 			Filter="c"
 			>
 			<File
-				RelativePath="fileread.cpp"
-				>
-			</File>
-			<File
 				RelativePath="..\common\i18n.c"
 				>
 			</File>
@@ -458,10 +462,6 @@
 				RelativePath="wait4all.c"
 				>
 			</File>
-			<File
-				RelativePath="..\common\win16api.c"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>

Deleted: branches/cmake/teraterm/ttpset/set_res.h
===================================================================
--- branches/cmake/teraterm/ttpset/set_res.h	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpset/set_res.h	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,14 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by ttpset.rc
-
-// \x90V\x82\xB5\x82\xA2\x83I\x83u\x83W\x83F\x83N\x83g\x82̎\x9F\x82̊\xF9\x92\xE8\x92l
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1001
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif

Modified: branches/cmake/teraterm/ttpset/ttpset-version.rc
===================================================================
--- branches/cmake/teraterm/ttpset/ttpset-version.rc	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpset/ttpset-version.rc	2019-05-19 15:06:12 UTC (rev 7694)
@@ -3,8 +3,12 @@
 // Version
 //
 
+#include <winresrc.h>
+
 #include "tt-version.h"
 
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION TT_VERSION_MAJOR,TT_VERSION_MINOR,0,0
  PRODUCTVERSION TT_VERSION_MAJOR,TT_VERSION_MINOR,0,0

Modified: branches/cmake/teraterm/ttpset/ttpset.v10.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpset/ttpset.v10.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpset/ttpset.v10.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -76,6 +76,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
@@ -115,6 +116,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
@@ -126,7 +128,6 @@
     <ClCompile Include="ttset.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="set_res.h" />
     <ClInclude Include="..\common\teraterm.h" />
     <ClInclude Include="..\common\tt-version.h" />
     <ClInclude Include="..\common\ttlib.h" />
@@ -137,7 +138,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpset-version.rc" />
-    <ResourceCompile Include="ttpset.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v10.vcxproj">

Modified: branches/cmake/teraterm/ttpset/ttpset.v10.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpset/ttpset.v10.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpset/ttpset.v10.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -27,9 +27,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="set_res.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\common\teraterm.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -50,10 +47,7 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpset-version.rc">
-      <Filter>Resource File</Filter>
+      <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="ttpset.rc">
-      <Filter>Resource File</Filter>
-    </ResourceCompile>
   </ItemGroup>
 </Project>

Modified: branches/cmake/teraterm/ttpset/ttpset.v11.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpset/ttpset.v11.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpset/ttpset.v11.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -81,6 +81,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
@@ -119,6 +120,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
@@ -130,7 +132,6 @@
     <ClCompile Include="ttset.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="set_res.h" />
     <ClInclude Include="..\common\teraterm.h" />
     <ClInclude Include="..\common\tt-version.h" />
     <ClInclude Include="..\common\ttlib.h" />
@@ -141,7 +142,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpset-version.rc" />
-    <ResourceCompile Include="ttpset.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v11.vcxproj">

Modified: branches/cmake/teraterm/ttpset/ttpset.v11.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpset/ttpset.v11.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpset/ttpset.v11.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -27,9 +27,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="set_res.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\common\teraterm.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -50,10 +47,7 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpset-version.rc">
-      <Filter>Resource File</Filter>
+      <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="ttpset.rc">
-      <Filter>Resource File</Filter>
-    </ResourceCompile>
   </ItemGroup>
 </Project>

Modified: branches/cmake/teraterm/ttpset/ttpset.v12.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpset/ttpset.v12.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpset/ttpset.v12.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -81,6 +81,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
@@ -119,6 +120,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
@@ -130,7 +132,6 @@
     <ClCompile Include="ttset.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="set_res.h" />
     <ClInclude Include="..\common\teraterm.h" />
     <ClInclude Include="..\common\tt-version.h" />
     <ClInclude Include="..\common\ttlib.h" />
@@ -141,7 +142,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpset-version.rc" />
-    <ResourceCompile Include="ttpset.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v12.vcxproj">

Modified: branches/cmake/teraterm/ttpset/ttpset.v12.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpset/ttpset.v12.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpset/ttpset.v12.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -27,9 +27,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="set_res.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\common\teraterm.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -50,10 +47,7 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpset-version.rc">
-      <Filter>Resource File</Filter>
+      <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="ttpset.rc">
-      <Filter>Resource File</Filter>
-    </ResourceCompile>
   </ItemGroup>
 </Project>

Modified: branches/cmake/teraterm/ttpset/ttpset.v14.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpset/ttpset.v14.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpset/ttpset.v14.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -81,6 +81,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
@@ -130,7 +131,6 @@
     <ClCompile Include="ttset.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="set_res.h" />
     <ClInclude Include="..\common\teraterm.h" />
     <ClInclude Include="..\common\tt-version.h" />
     <ClInclude Include="..\common\ttlib.h" />
@@ -141,7 +141,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpset-version.rc" />
-    <ResourceCompile Include="ttpset.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v14.vcxproj">

Modified: branches/cmake/teraterm/ttpset/ttpset.v14.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpset/ttpset.v14.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpset/ttpset.v14.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -27,9 +27,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="set_res.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\common\teraterm.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -50,10 +47,7 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpset-version.rc">
-      <Filter>Resource File</Filter>
+      <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="ttpset.rc">
-      <Filter>Resource File</Filter>
-    </ResourceCompile>
   </ItemGroup>
 </Project>

Modified: branches/cmake/teraterm/ttpset/ttpset.v15.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpset/ttpset.v15.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpset/ttpset.v15.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -83,6 +83,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
@@ -122,6 +123,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
@@ -133,7 +135,6 @@
     <ClCompile Include="ttset.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="set_res.h" />
     <ClInclude Include="..\common\teraterm.h" />
     <ClInclude Include="..\common\tt-version.h" />
     <ClInclude Include="..\common\ttlib.h" />
@@ -144,7 +145,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpset-version.rc" />
-    <ResourceCompile Include="ttpset.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v15.vcxproj">

Modified: branches/cmake/teraterm/ttpset/ttpset.v15.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpset/ttpset.v15.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpset/ttpset.v15.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -27,9 +27,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="set_res.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\common\teraterm.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -50,10 +47,7 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpset-version.rc">
-      <Filter>Resource File</Filter>
+      <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="ttpset.rc">
-      <Filter>Resource File</Filter>
-    </ResourceCompile>
   </ItemGroup>
 </Project>

Copied: branches/cmake/teraterm/ttpset/ttpset.v16.vcxproj (from rev 7693, branches/cmake/teraterm/ttpset/ttpset.v15.vcxproj)
===================================================================
--- branches/cmake/teraterm/ttpset/ttpset.v16.vcxproj	                        (rev 0)
+++ branches/cmake/teraterm/ttpset/ttpset.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,158 @@
+<?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>{5CF58947-E861-4A5C-B0B1-E85486F149CD}</ProjectGuid>
+    <RootNamespace>ttpset</RootNamespace>
+    <ProjectName>ttpset</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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>
+  <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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <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)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessToFile>false</PreprocessToFile>
+      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
+      <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>ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <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)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>ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\common\ttlib.c" />
+    <ClCompile Include="ttset.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\common\teraterm.h" />
+    <ClInclude Include="..\common\tt-version.h" />
+    <ClInclude Include="..\common\ttlib.h" />
+    <ClInclude Include="..\common\tttypes.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ttpset.def" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ttpset-version.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ttpcmn\ttpcmn.v16.vcxproj">
+      <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

Copied: branches/cmake/teraterm/ttpset/ttpset.v16.vcxproj.filters (from rev 7693, branches/cmake/teraterm/ttpset/ttpset.v15.vcxproj.filters)
===================================================================
--- branches/cmake/teraterm/ttpset/ttpset.v16.vcxproj.filters	                        (rev 0)
+++ branches/cmake/teraterm/ttpset/ttpset.v16.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,53 @@
+<?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>{231eb625-d36d-4fcd-b765-38c34ddf68b4}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{bc796587-a18b-4d16-a02f-fd5d92b753a1}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
+    </Filter>
+    <Filter Include="Def File">
+      <UniqueIdentifier>{0c0e3885-2eac-4958-8c3d-2b3501e30482}</UniqueIdentifier>
+      <Extensions>def</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{a485420e-6b4b-47df-9138-6d817f8e258b}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\common\ttlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ttset.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\common\teraterm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\tt-version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ttlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\tttypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ttpset.def">
+      <Filter>Def File</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ttpset-version.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>

Modified: branches/cmake/teraterm/ttpset/ttpset.v9.vcproj
===================================================================
--- branches/cmake/teraterm/ttpset/ttpset.v9.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpset/ttpset.v9.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -76,6 +76,7 @@
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ModuleDefinitionFile="$(ProjectName).def"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -167,6 +168,7 @@
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ModuleDefinitionFile="$(ProjectName).def"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -218,10 +220,6 @@
 			Filter="h;hpp;hxx;hm;inl;fi;fd"
 			>
 			<File
-				RelativePath="set_res.h"
-				>
-			</File>
-			<File
 				RelativePath="..\common\teraterm.h"
 				>
 			</File>
@@ -255,10 +253,6 @@
 				RelativePath="ttpset-version.rc"
 				>
 			</File>
-			<File
-				RelativePath="ttpset.rc"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>

Modified: branches/cmake/teraterm/ttpset/ttpset.vcproj
===================================================================
--- branches/cmake/teraterm/ttpset/ttpset.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpset/ttpset.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -75,6 +75,7 @@
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ModuleDefinitionFile="$(ProjectName).def"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				ImportLibrary="$(OutDir)\$(ProjectName).lib"
@@ -167,6 +168,7 @@
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ModuleDefinitionFile="$(ProjectName).def"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				ImportLibrary="$(OutDir)\$(ProjectName).lib"
@@ -219,10 +221,6 @@
 			Filter="h;hpp;hxx;hm;inl;fi;fd"
 			>
 			<File
-				RelativePath="set_res.h"
-				>
-			</File>
-			<File
 				RelativePath="..\common\teraterm.h"
 				>
 			</File>
@@ -256,10 +254,6 @@
 				RelativePath="ttpset-version.rc"
 				>
 			</File>
-			<File
-				RelativePath="ttpset.rc"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>

Modified: branches/cmake/teraterm/ttpset/ttset.c
===================================================================
--- branches/cmake/teraterm/ttpset/ttset.c	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttpset/ttset.c	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1594,21 +1594,14 @@
 	                        Temp, sizeof(Temp), FName);
 	strncpy_s(ts->Locale, sizeof(ts->Locale), Temp, _TRUNCATE);
 
-	// UI language message file
+	// UI language message file (\x91\x8A\x91΃p\x83X)
 	GetPrivateProfileString(Section, "UILanguageFile", "lang\\Default.lng",
-	                        Temp, sizeof(Temp), FName);
-	{
-		char CurDir[MAX_PATH];
+	                        ts->UILanguageFile_ini, sizeof(ts->UILanguageFile_ini), FName);
 
-		// \x83t\x83\x8B\x83p\x83X\x89\xBB\x82\xB7\x82\xE9\x91O\x82ɓǂݍ\x9E\x82ݎ\x9E\x82̐ݒ\xE8\x82\xF0\x8E\xE6\x82\xC1\x82Ă\xA8\x82\xAD
-		strncpy_s(ts->UILanguageFile_ini, sizeof(ts->UILanguageFile_ini), Temp, _TRUNCATE);
+	// UI language message file (full path)
+	GetUILanguageFileFull(ts->HomeDir, ts->UILanguageFile_ini,
+						  ts->UILanguageFile, sizeof(ts->UILanguageFile));
 
-		GetCurrentDirectory(sizeof(CurDir), CurDir);
-		SetCurrentDirectory(ts->HomeDir);
-		_fullpath(ts->UILanguageFile, Temp, sizeof(ts->UILanguageFile));
-		SetCurrentDirectory(CurDir);
-	}
-
 	// Broadcast Command History (2007.3.3 maya)
 	ts->BroadcastCommandHistory =
 		GetOnOff(Section, "BroadcastCommandHistory", FName, FALSE);

Modified: branches/cmake/teraterm/ttptek/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/ttptek/CMakeLists.txt	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttptek/CMakeLists.txt	2019-05-19 15:06:12 UTC (rev 7694)
@@ -22,7 +22,6 @@
   )
 
 set(SRC
-  tek_res.h
   tekesc.c
   tekesc.h
 #  ttptek.rc

Deleted: branches/cmake/teraterm/ttptek/tek_res.h
===================================================================
--- branches/cmake/teraterm/ttptek/tek_res.h	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttptek/tek_res.h	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1,14 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by ttptek.rc
-
-// \x90V\x82\xB5\x82\xA2\x83I\x83u\x83W\x83F\x83N\x83g\x82̎\x9F\x82̊\xF9\x92\xE8\x92l
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1001
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif

Modified: branches/cmake/teraterm/ttptek/ttptek-version.rc
===================================================================
--- branches/cmake/teraterm/ttptek/ttptek-version.rc	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttptek/ttptek-version.rc	2019-05-19 15:06:12 UTC (rev 7694)
@@ -3,10 +3,12 @@
 // Version
 //
 
-//#include "afxres.h"
+#include <winresrc.h>
 
 #include "tt-version.h"
 
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION TT_VERSION_MAJOR,TT_VERSION_MINOR,0,0
  PRODUCTVERSION TT_VERSION_MAJOR,TT_VERSION_MINOR,0,0

Modified: branches/cmake/teraterm/ttptek/ttptek.v10.vcxproj
===================================================================
--- branches/cmake/teraterm/ttptek/ttptek.v10.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttptek/ttptek.v10.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -74,6 +74,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
@@ -113,6 +114,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
@@ -125,7 +127,6 @@
     <ClCompile Include="tttek.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="tek_res.h" />
     <ClInclude Include="tekesc.h" />
   </ItemGroup>
   <ItemGroup>
@@ -133,7 +134,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttptek-version.rc" />
-    <ResourceCompile Include="ttptek.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v10.vcxproj">

Modified: branches/cmake/teraterm/ttptek/ttptek.v10.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttptek/ttptek.v10.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttptek/ttptek.v10.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -30,9 +30,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="tek_res.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="tekesc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -43,11 +40,8 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ResouceCompile Include="ttptek-version.rc">
-      <Filter>Resource File</Filter>
-    </ResouceCompile>
-    <ResouceCompile Include="ttptek.rc">
-      <Filter>Resource File</Filter>
-    </ResouceCompile>
+    <ResourceCompile Include="ttptek-version.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
   </ItemGroup>
 </Project>

Modified: branches/cmake/teraterm/ttptek/ttptek.v11.vcxproj
===================================================================
--- branches/cmake/teraterm/ttptek/ttptek.v11.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttptek/ttptek.v11.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -79,6 +79,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
@@ -117,6 +118,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
@@ -129,7 +131,6 @@
     <ClCompile Include="tttek.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="tek_res.h" />
     <ClInclude Include="tekesc.h" />
   </ItemGroup>
   <ItemGroup>
@@ -137,7 +138,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttptek-version.rc" />
-    <ResourceCompile Include="ttptek.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v11.vcxproj">

Modified: branches/cmake/teraterm/ttptek/ttptek.v11.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttptek/ttptek.v11.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttptek/ttptek.v11.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -30,9 +30,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="tek_res.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="tekesc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -43,11 +40,8 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ResouceCompile Include="ttptek-version.rc">
-      <Filter>Resource File</Filter>
-    </ResouceCompile>
-    <ResouceCompile Include="ttptek.rc">
-      <Filter>Resource File</Filter>
-    </ResouceCompile>
+    <ResourceCompile Include="ttptek-version.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
   </ItemGroup>
 </Project>

Modified: branches/cmake/teraterm/ttptek/ttptek.v12.vcxproj
===================================================================
--- branches/cmake/teraterm/ttptek/ttptek.v12.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttptek/ttptek.v12.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -79,6 +79,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
@@ -117,6 +118,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
@@ -129,7 +131,6 @@
     <ClCompile Include="tttek.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="tek_res.h" />
     <ClInclude Include="tekesc.h" />
   </ItemGroup>
   <ItemGroup>
@@ -137,7 +138,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttptek-version.rc" />
-    <ResourceCompile Include="ttptek.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v12.vcxproj">

Modified: branches/cmake/teraterm/ttptek/ttptek.v12.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttptek/ttptek.v12.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttptek/ttptek.v12.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -30,9 +30,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="tek_res.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="tekesc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -43,11 +40,8 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ResouceCompile Include="ttptek-version.rc">
-      <Filter>Resource File</Filter>
-    </ResouceCompile>
-    <ResouceCompile Include="ttptek.rc">
-      <Filter>Resource File</Filter>
-    </ResouceCompile>
+    <ResourceCompile Include="ttptek-version.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
   </ItemGroup>
 </Project>

Modified: branches/cmake/teraterm/ttptek/ttptek.v14.vcxproj
===================================================================
--- branches/cmake/teraterm/ttptek/ttptek.v14.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttptek/ttptek.v14.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -79,6 +79,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
@@ -117,6 +118,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
@@ -129,7 +131,6 @@
     <ClCompile Include="tttek.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="tek_res.h" />
     <ClInclude Include="tekesc.h" />
   </ItemGroup>
   <ItemGroup>
@@ -137,7 +138,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttptek-version.rc" />
-    <ResourceCompile Include="ttptek.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v14.vcxproj">

Modified: branches/cmake/teraterm/ttptek/ttptek.v14.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttptek/ttptek.v14.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttptek/ttptek.v14.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -30,9 +30,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="tek_res.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="tekesc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -43,11 +40,8 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ResouceCompile Include="ttptek-version.rc">
-      <Filter>Resource File</Filter>
-    </ResouceCompile>
-    <ResouceCompile Include="ttptek.rc">
-      <Filter>Resource File</Filter>
-    </ResouceCompile>
+    <ResourceCompile Include="ttptek-version.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
   </ItemGroup>
 </Project>

Modified: branches/cmake/teraterm/ttptek/ttptek.v15.vcxproj
===================================================================
--- branches/cmake/teraterm/ttptek/ttptek.v15.vcxproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttptek/ttptek.v15.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -81,6 +81,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
@@ -120,6 +121,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
@@ -132,7 +134,6 @@
     <ClCompile Include="tttek.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="tek_res.h" />
     <ClInclude Include="tekesc.h" />
   </ItemGroup>
   <ItemGroup>
@@ -140,7 +141,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttptek-version.rc" />
-    <ResourceCompile Include="ttptek.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v15.vcxproj">

Modified: branches/cmake/teraterm/ttptek/ttptek.v15.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttptek/ttptek.v15.vcxproj.filters	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttptek/ttptek.v15.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -30,9 +30,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="tek_res.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="tekesc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -43,11 +40,8 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ResouceCompile Include="ttptek-version.rc">
-      <Filter>Resource File</Filter>
-    </ResouceCompile>
-    <ResouceCompile Include="ttptek.rc">
-      <Filter>Resource File</Filter>
-    </ResouceCompile>
+    <ResourceCompile Include="ttptek-version.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
   </ItemGroup>
 </Project>

Copied: branches/cmake/teraterm/ttptek/ttptek.v16.vcxproj (from rev 7693, branches/cmake/teraterm/ttptek/ttptek.v15.vcxproj)
===================================================================
--- branches/cmake/teraterm/ttptek/ttptek.v16.vcxproj	                        (rev 0)
+++ branches/cmake/teraterm/ttptek/ttptek.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,154 @@
+<?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>{6D08053B-1C68-4A7E-8766-3553F5AF010B}</ProjectGuid>
+    <RootNamespace>ttptek</RootNamespace>
+    <ProjectName>ttptek</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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>
+  <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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <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)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>ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <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)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>ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\common\ttlib.c" />
+    <ClCompile Include="tekesc.c" />
+    <ClCompile Include="tttek.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="tekesc.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ttptek.def" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ttptek-version.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ttpcmn\ttpcmn.v16.vcxproj">
+      <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

Copied: branches/cmake/teraterm/ttptek/ttptek.v16.vcxproj.filters (from rev 7693, branches/cmake/teraterm/ttptek/ttptek.v15.vcxproj.filters)
===================================================================
--- branches/cmake/teraterm/ttptek/ttptek.v16.vcxproj.filters	                        (rev 0)
+++ branches/cmake/teraterm/ttptek/ttptek.v16.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,47 @@
+<?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>{cd70a60d-5951-488c-93cc-0c2419f89c8b}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93efeea4-5f64-40cc-aed8-ba244e2256ed}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
+    </Filter>
+    <Filter Include="Def File">
+      <UniqueIdentifier>{93c1d8ea-0c5e-44c9-bc67-c1d9be0cbb9a}</UniqueIdentifier>
+      <Extensions>def</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67c506c6-8a75-4b2e-ba7a-e0439cddeab9}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="tekesc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\ttlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="tttek.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="tekesc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ttptek.def">
+      <Filter>Def File</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ttptek-version.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>

Modified: branches/cmake/teraterm/ttptek/ttptek.v9.vcproj
===================================================================
--- branches/cmake/teraterm/ttptek/ttptek.v9.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttptek/ttptek.v9.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -75,6 +75,7 @@
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ModuleDefinitionFile="$(ProjectName).def"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -166,6 +167,7 @@
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ModuleDefinitionFile="$(ProjectName).def"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -221,10 +223,6 @@
 			Filter="h;hpp;hxx;hm;inl;fi;fd"
 			>
 			<File
-				RelativePath="tek_res.h"
-				>
-			</File>
-			<File
 				RelativePath="tekesc.h"
 				>
 			</File>
@@ -246,10 +244,6 @@
 				RelativePath="ttptek-version.rc"
 				>
 			</File>
-			<File
-				RelativePath="ttptek.rc"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>

Modified: branches/cmake/teraterm/ttptek/ttptek.vcproj
===================================================================
--- branches/cmake/teraterm/ttptek/ttptek.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/teraterm/ttptek/ttptek.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -74,6 +74,7 @@
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ModuleDefinitionFile="$(ProjectName).def"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				ImportLibrary="$(OutDir)\$(ProjectName).lib"
@@ -166,6 +167,7 @@
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(OutDir)"
 				ModuleDefinitionFile="$(ProjectName).def"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				ImportLibrary="$(OutDir)\$(ProjectName).lib"
@@ -222,10 +224,6 @@
 			Filter="h;hpp;hxx;hm;inl;fi;fd"
 			>
 			<File
-				RelativePath="tek_res.h"
-				>
-			</File>
-			<File
 				RelativePath="tekesc.h"
 				>
 			</File>
@@ -247,10 +245,6 @@
 				RelativePath="ttptek-version.rc"
 				>
 			</File>
-			<File
-				RelativePath="ttptek.rc"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>

Modified: branches/cmake/ttpmenu/registry.cpp
===================================================================
--- branches/cmake/ttpmenu/registry.cpp	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/ttpmenu/registry.cpp	2019-05-19 15:06:12 UTC (rev 7694)
@@ -46,7 +46,7 @@
 void checkIniFile()
 {
 	DWORD dwAttr = ::GetFileAttributes(getModuleName());
-	bUseINI = dwAttr != 0xFFFFFFFF;
+	bUseINI = dwAttr != INVALID_FILE_ATTRIBUTES;
 }
 
 /* ==========================================================================

Modified: branches/cmake/ttpmenu/ttpmenu.cpp
===================================================================
--- branches/cmake/ttpmenu/ttpmenu.cpp	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/ttpmenu/ttpmenu.cpp	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1769,7 +1769,7 @@
 	GetModuleFileName(NULL, modulePath, sizeof(modulePath));
 	ExtractDirName(modulePath, modulePath);
 	SetCurrentDirectory(modulePath);
-	if (::GetFileAttributes(g_JobInfo.szTeraTerm) == 0xFFFFFFFF) {
+	if (::GetFileAttributes(g_JobInfo.szTeraTerm) == INVALID_FILE_ATTRIBUTES) {
 		dwErr = ::GetLastError();
 		if (dwErr == ERROR_FILE_NOT_FOUND || dwErr == ERROR_PATH_NOT_FOUND) {
 			UTIL_get_lang_msg("MSG_ERROR_CHECKFILE", uimsg, sizeof(uimsg),

Added: branches/cmake/ttpmenu/ttpmenu.v16.sln
===================================================================
--- branches/cmake/ttpmenu/ttpmenu.v16.sln	                        (rev 0)
+++ branches/cmake/ttpmenu/ttpmenu.v16.sln	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 16
+VisualStudioVersion = 16.0.28803.156
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpmenu", "ttpmenu.v16.vcxproj", "{594F6499-8EDA-44DC-AC41-830A754FF1C8}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{594F6499-8EDA-44DC-AC41-830A754FF1C8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{594F6499-8EDA-44DC-AC41-830A754FF1C8}.Debug|Win32.Build.0 = Debug|Win32
+		{594F6499-8EDA-44DC-AC41-830A754FF1C8}.Release|Win32.ActiveCfg = Release|Win32
+		{594F6499-8EDA-44DC-AC41-830A754FF1C8}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Copied: branches/cmake/ttpmenu/ttpmenu.v16.vcxproj (from rev 7693, branches/cmake/teraterm/ttptek/ttptek.v15.vcxproj)
===================================================================
--- branches/cmake/ttpmenu/ttpmenu.v16.vcxproj	                        (rev 0)
+++ branches/cmake/ttpmenu/ttpmenu.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.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>{594F6499-8EDA-44DC-AC41-830A754FF1C8}</ProjectGuid>
+    <RootNamespace>ttpmenu</RootNamespace>
+    <ProjectName>ttpmenu</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</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'">
+    <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>MinSpace</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0411</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;comctl32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <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>Disabled</Optimization>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>false</StringPooling>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0411</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;comctl32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </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="ttpmenu.cpp">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MinSpace</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+    </ClCompile>
+    <ClCompile Include="winmisc.cpp">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MinSpace</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="left.ico" />
+    <Image Include="right.ico" />
+    <Image Include="teraterm.ico" />
+    <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" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Modified: branches/cmake/ttpmenu/ttpmenu.v9.vcproj
===================================================================
--- branches/cmake/ttpmenu/ttpmenu.v9.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/ttpmenu/ttpmenu.v9.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -73,6 +73,7 @@
 				AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib version.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -160,6 +161,7 @@
 				AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib version.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"

Modified: branches/cmake/ttpmenu/ttpmenu.vcproj
===================================================================
--- branches/cmake/ttpmenu/ttpmenu.vcproj	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/ttpmenu/ttpmenu.vcproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -69,9 +69,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib version.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib version.lib user32.lib gdi32.lib comdlg32.lib Advapi32.lib Shell32.lib Ole32.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -157,9 +158,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib version.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib version.lib user32.lib gdi32.lib comdlg32.lib Advapi32.lib Shell32.lib Ole32.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"

Copied: branches/cmake/ttssh2/matcher/matcher.v16.vcxproj (from rev 7693, branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj)
===================================================================
--- branches/cmake/ttssh2/matcher/matcher.v16.vcxproj	                        (rev 0)
+++ branches/cmake/ttssh2/matcher/matcher.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.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>{C4B19BFB-8068-4EF2-A3A1-4EC4C40BE7F1}</ProjectGuid>
+    <RootNamespace>matcher</RootNamespace>
+    <ProjectName>matcher</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </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>$(ProjectDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <TypeLibraryName>$(OutDir)$(ProjectName)matcher.tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="matcher.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+    </ClCompile>
+    <ClCompile Include="test.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+    </ClCompile>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/cmake/ttssh2/putty/putty.v16.vcxproj (from rev 7693, branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj)
===================================================================
--- branches/cmake/ttssh2/putty/putty.v16.vcxproj	                        (rev 0)
+++ branches/cmake/ttssh2/putty/putty.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.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>{98CA1284-8F6C-4791-BF57-7E5FAD33744E}</ProjectGuid>
+    <RootNamespace>putty</RootNamespace>
+    <ProjectName>putty</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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>
+  <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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\putty;$(SolutionDir)..\libs\putty\windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WINDOWS;_CRT_SECURE_NO_DEPRECATE;SECURITY_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\putty;$(SolutionDir)..\libs\putty\windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WINDOWS;_CRT_SECURE_NO_DEPRECATE;SECURITY_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\libs\putty\CONF.C" />
+    <ClCompile Include="..\..\libs\putty\MISC.C" />
+    <ClCompile Include="..\..\libs\putty\TREE234.C" />
+    <ClCompile Include="..\..\libs\putty\VERSION.C" />
+    <ClCompile Include="..\..\libs\putty\WINDOWS\WINMISC.C" />
+    <ClCompile Include="..\..\libs\putty\WINDOWS\WINPGNTC.C" />
+    <ClCompile Include="..\..\libs\putty\WINDOWS\WINSECUR.C" />
+    <ClCompile Include="libputty.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="libputty.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Added: branches/cmake/ttssh2/putty/putty.v16.vcxproj.filters
===================================================================
--- branches/cmake/ttssh2/putty/putty.v16.vcxproj.filters	                        (rev 0)
+++ branches/cmake/ttssh2/putty/putty.v16.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Putty Files">
+      <UniqueIdentifier>{6907d95d-706b-4797-acc8-556c5fc25181}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\libs\putty\CONF.C">
+      <Filter>Putty Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libs\putty\MISC.C">
+      <Filter>Putty Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libs\putty\TREE234.C">
+      <Filter>Putty Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libs\putty\VERSION.C">
+      <Filter>Putty Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libs\putty\WINDOWS\WINMISC.C">
+      <Filter>Putty Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libs\putty\WINDOWS\WINPGNTC.C">
+      <Filter>Putty Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libs\putty\WINDOWS\WINSECUR.C">
+      <Filter>Putty Files</Filter>
+    </ClCompile>
+    <ClCompile Include="libputty.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="libputty.h" />
+  </ItemGroup>
+</Project>
\ No newline at end of file

Copied: branches/cmake/ttssh2/puttyrev/puttyrev.v16.vcxproj (from rev 7693, branches/cmake/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj)
===================================================================
--- branches/cmake/ttssh2/puttyrev/puttyrev.v16.vcxproj	                        (rev 0)
+++ branches/cmake/ttssh2/puttyrev/puttyrev.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.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>{61EB955F-2794-4607-860F-0AA296FA58BD}</ProjectGuid>
+    <RootNamespace>puttyrev</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>puttyrev</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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>
+  <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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)ttxssh\$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)ttxssh\$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="puttyrev.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="puttyrev.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Added: branches/cmake/ttssh2/puttyrev/puttyrev.v16.vcxproj.filters
===================================================================
--- branches/cmake/ttssh2/puttyrev/puttyrev.v16.vcxproj.filters	                        (rev 0)
+++ branches/cmake/ttssh2/puttyrev/puttyrev.v16.vcxproj.filters	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,23 @@
+<?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>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="puttyrev.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="puttyrev.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Copied: branches/cmake/ttssh2/ttssh/ttssh.v16.vcxproj (from rev 7693, branches/cmake/teraterm/ttptek/ttptek.v14.vcxproj)
===================================================================
--- branches/cmake/ttssh2/ttssh/ttssh.v16.vcxproj	                        (rev 0)
+++ branches/cmake/ttssh2/ttssh/ttssh.v16.vcxproj	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.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>{3D8EF809-7131-4AB2-B442-032A8F49DE33}</ProjectGuid>
+    <RootNamespace>ttssh</RootNamespace>
+    <ProjectName>ttssh</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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>
+  <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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <Optimization>MinSpace</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <Image Include="ttsecure.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="ttssh.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ttssh.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Added: branches/cmake/ttssh2/ttssh.v16.sln
===================================================================
--- branches/cmake/ttssh2/ttssh.v16.sln	                        (rev 0)
+++ branches/cmake/ttssh2/ttssh.v16.sln	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1,45 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 16
+VisualStudioVersion = 16.0.28803.156
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "matcher", "matcher\matcher.v16.vcxproj", "{C4B19BFB-8068-4EF2-A3A1-4EC4C40BE7F1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttssh", "ttssh\ttssh.v16.vcxproj", "{3D8EF809-7131-4AB2-B442-032A8F49DE33}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttxssh", "ttxssh\ttxssh.v16.vcxproj", "{5638BB89-44E3-4D55-BA98-A01142B4223E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "putty", "putty\putty.v16.vcxproj", "{98CA1284-8F6C-4791-BF57-7E5FAD33744E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "puttyrev", "puttyrev\puttyrev.v16.vcxproj", "{61EB955F-2794-4607-860F-0AA296FA58BD}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C4B19BFB-8068-4EF2-A3A1-4EC4C40BE7F1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C4B19BFB-8068-4EF2-A3A1-4EC4C40BE7F1}.Debug|Win32.Build.0 = Debug|Win32
+		{C4B19BFB-8068-4EF2-A3A1-4EC4C40BE7F1}.Release|Win32.ActiveCfg = Release|Win32
+		{C4B19BFB-8068-4EF2-A3A1-4EC4C40BE7F1}.Release|Win32.Build.0 = Release|Win32
+		{3D8EF809-7131-4AB2-B442-032A8F49DE33}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3D8EF809-7131-4AB2-B442-032A8F49DE33}.Debug|Win32.Build.0 = Debug|Win32
+		{3D8EF809-7131-4AB2-B442-032A8F49DE33}.Release|Win32.ActiveCfg = Release|Win32
+		{3D8EF809-7131-4AB2-B442-032A8F49DE33}.Release|Win32.Build.0 = Release|Win32
+		{5638BB89-44E3-4D55-BA98-A01142B4223E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5638BB89-44E3-4D55-BA98-A01142B4223E}.Debug|Win32.Build.0 = Debug|Win32
+		{5638BB89-44E3-4D55-BA98-A01142B4223E}.Release|Win32.ActiveCfg = Release|Win32
+		{5638BB89-44E3-4D55-BA98-A01142B4223E}.Release|Win32.Build.0 = Release|Win32
+		{98CA1284-8F6C-4791-BF57-7E5FAD33744E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{98CA1284-8F6C-4791-BF57-7E5FAD33744E}.Debug|Win32.Build.0 = Debug|Win32
+		{98CA1284-8F6C-4791-BF57-7E5FAD33744E}.Release|Win32.ActiveCfg = Release|Win32
+		{98CA1284-8F6C-4791-BF57-7E5FAD33744E}.Release|Win32.Build.0 = Release|Win32
+		{61EB955F-2794-4607-860F-0AA296FA58BD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{61EB955F-2794-4607-860F-0AA296FA58BD}.Debug|Win32.Build.0 = Debug|Win32
+		{61EB955F-2794-4607-860F-0AA296FA58BD}.Release|Win32.ActiveCfg = Release|Win32
+		{61EB955F-2794-4607-860F-0AA296FA58BD}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Modified: branches/cmake/ttssh2/ttxssh/CMakeLists.txt
===================================================================
--- branches/cmake/ttssh2/ttxssh/CMakeLists.txt	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/ttssh2/ttxssh/CMakeLists.txt	2019-05-19 15:06:12 UTC (rev 7694)
@@ -14,6 +14,7 @@
   ../../teraterm/common/ttcommon.h
   ../../teraterm/common/i18n.h
   ../../teraterm/common/ttlib.h
+#  ../../teraterm/common/ttlib.c
   ../../teraterm/common/dlglib.h
   ../../teraterm/common/dlglib.c
   ../../teraterm/common/dlglib_cpp.cpp

Modified: branches/cmake/ttssh2/ttxssh/auth.c
===================================================================
--- branches/cmake/ttssh2/ttxssh/auth.c	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/ttssh2/ttxssh/auth.c	2019-05-19 15:06:12 UTC (rev 7694)
@@ -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
@@ -34,18 +34,26 @@
 #include "dlglib.h"
 #include "codeconv.h"
 #include "ttlib.h"
+#include "dlglib.h"
 
 #include <io.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <tchar.h>
+#include <Lmcons.h>		// for UNLEN
+#include <crtdbg.h>
 
 #include "resource.h"
 #include "keyfiles.h"
 #include "libputty.h"
 #include "tipwin.h"
+#include "auth.h"
 
+#if defined(_DEBUG) && !defined(_CRTDBG_MAP_ALLOC)
+#define malloc(l) _malloc_dbg((l), _NORMAL_BLOCK, __FILE__, __LINE__)
+#define free(p)   _free_dbg((p), _NORMAL_BLOCK)
+#endif
+
 #define AUTH_START_USER_AUTH_ON_ERROR_END 1
 
 #define MAX_AUTH_CONTROL IDC_SSHUSEPAGEANT
@@ -91,61 +99,87 @@
 	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)
+typedef struct {
+	WNDPROC ProcOrg;
+	PTInstVar pvar;
+	TipWin *tipwin;
+	BOOL *UseControlChar;
+} TPasswordControlData;
+
+static void password_wnd_proc_close_tooltip(TPasswordControlData *data)
 {
+	if (data->tipwin != NULL) {
+		TipWinDestroy(data->tipwin);
+		data->tipwin = NULL;
+	}
+}
+
+static LRESULT CALLBACK password_wnd_proc(HWND control, UINT msg,
+										  WPARAM wParam, LPARAM lParam)
+{
+	LRESULT result;
+	TPasswordControlData *data = (TPasswordControlData *)GetWindowLongPtr(control, GWLP_USERDATA);
 	switch (msg) {
 	case WM_CHAR:
-		if ((GetKeyState(VK_CONTROL) & 0x8000) != 0) {
+		if ((data->UseControlChar == NULL || *data->UseControlChar == TRUE) &&
+			(GetKeyState(VK_CONTROL) & 0x8000) != 0)
+		{	// \x90\xA7\x8C䕶\x8E\x9A\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9 && CTRL\x83L\x81[\x82\xAA\x89\x9F\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9
 			TCHAR chars[] = { (TCHAR) wParam, 0 };
 
 			SendMessage(control, EM_REPLACESEL, (WPARAM) TRUE,
 			            (LPARAM) (TCHAR *) chars);
 
-			if (tipwin == NULL) {
-				TCHAR *s;
+			if (data->tipwin == NULL) {
+				TCHAR uimsg[MAX_UIMSG];
 				RECT rect;
+				PTInstVar pvar = data->pvar;
+				UTIL_get_lang_msgT("DLG_AUTH_TIP_CONTROL_CODE", uimsg, _countof(uimsg), _T("control character is entered"),
+								   pvar->ts->UILanguageFile);
 				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");
+					// CTRL + V
+					TCHAR uimsg_tmp[MAX_UIMSG];
+					UTIL_get_lang_msgT("DLG_AUTH_TIP_PASTE_KEY", uimsg_tmp, _countof(uimsg_tmp), _T("Use Shift + Insert to paste from clipboard"),
+						pvar->ts->UILanguageFile);
+					_tcscat_s(uimsg, _countof(uimsg), _T("\n"));
+					_tcscat_s(uimsg, _countof(uimsg), uimsg_tmp);
 				}
 				GetWindowRect(control, &rect);
-				tipwin = TipWinCreate(control, rect.left, rect.bottom, s);
+				data->tipwin = TipWinCreate(control, rect.left, rect.bottom, uimsg);
 			}
 
 			return 0;
 		} else {
-			if (tipwin != NULL) {
-				TipWinDestroy(tipwin);
-				tipwin = NULL;
-			}
+			password_wnd_proc_close_tooltip(data);
 		}
 		break;
-	case WM_NCDESTROY:
-		if (tipwin != NULL) {
-			TipWinDestroy(tipwin);
-			tipwin = NULL;
-		}
+	case WM_KILLFOCUS:
+		password_wnd_proc_close_tooltip(data);
 		break;
 	}
 
-	return CallWindowProc((WNDPROC) GetWindowLongPtr(control, GWLP_USERDATA),
-	                      control, msg, wParam, lParam);
+	result = CallWindowProc((WNDPROC)data->ProcOrg,
+							control, msg, wParam, lParam);
+
+	if (msg == WM_NCDESTROY) {
+		SetWindowLongPtr(control, GWLP_WNDPROC, (LONG_PTR)data->ProcOrg);
+		password_wnd_proc_close_tooltip(data);
+		free(data);
+	}
+
+	return result;
 }
 
-static void init_password_control(HWND dlg)
+void init_password_control(PTInstVar pvar, HWND dlg, int item, BOOL *UseControlChar)
 {
-	HWND passwordControl = GetDlgItem(dlg, IDC_SSHPASSWORD);
-
-	SetWindowLongPtr(passwordControl, GWLP_USERDATA,
-	              SetWindowLongPtr(passwordControl, GWLP_WNDPROC,
-	                            (LONG_PTR) password_wnd_proc));
-
+	HWND passwordControl = GetDlgItem(dlg, item);
+	TPasswordControlData *data = (TPasswordControlData *)malloc(sizeof(TPasswordControlData));
+	data->ProcOrg = (WNDPROC)GetWindowLongPtr(passwordControl, GWLP_WNDPROC);
+	data->pvar = pvar;
+	data->tipwin = NULL;
+	data->UseControlChar = UseControlChar;
+	SetWindowLongPtr(passwordControl, GWLP_WNDPROC, (LONG_PTR)password_wnd_proc);
+	SetWindowLongPtr(passwordControl, GWLP_USERDATA, (LONG_PTR)data);
 	SetFocus(passwordControl);
 }
 
@@ -161,7 +195,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));
+	EnableWindow(GetDlgItem(dlg, IDC_SSHPASSWORD_OPTION), (!TIS_enabled && !PAGEANT_enabled));
 
 	for (i = IDC_CHOOSERSAFILE; i <= IDC_RSAFILENAME; i++) {
 		EnableWindow(GetDlgItem(dlg, i), RSA_enabled);
@@ -241,8 +275,36 @@
 	}
 }
 
-static void init_auth_dlg(PTInstVar pvar, HWND dlg)
+static LRESULT CALLBACK username_proc(HWND hWnd, UINT msg,
+									  WPARAM wParam, LPARAM lParam)
 {
+	const WNDPROC ProcOrg = (WNDPROC)GetWindowLongPtr(hWnd, GWLP_USERDATA);
+	const LRESULT result = CallWindowProc(ProcOrg, hWnd, msg, wParam, lParam);
+	switch (msg) {
+	case WM_CHAR:
+	case WM_SETTEXT: {
+		// \x83\x86\x81[\x83U\x81[\x96\xBC\x82\xAA\x93\xFC\x97͂\xB3\x82\xEA\x82Ă\xA2\x82\xBD\x8Fꍇ\x81A\x83I\x83v\x83V\x83\x87\x83\x93\x82\xF0\x8Eg\x82\xA4\x82\xB1\x82Ƃ͂Ȃ\xA2\x82̂ŁA
+		// tab\x82ł̃t\x83H\x81[\x83J\x83X\x88ړ\xAE\x8E\x9E\x81A\x83I\x83v\x83V\x83\x87\x83\x93\x83{\x83^\x83\x93\x82\xF0\x83p\x83X\x82\xB7\x82\xE9\x82悤\x82ɂ\xB7\x82\xE9
+		// \x8F]\x97\x88\x82Ɠ\xAF\x82\xB6\x83L\x81[\x91\x80\x8D\xEC\x82Ń\x86\x81[\x83U\x81[\x96\xBC\x82ƃp\x83X\x83t\x83\x8C\x81[\x83Y\x82\xF0\x93\xFC\x97͉”\\x82Ƃ\xB7\x82\xE9
+		const HWND dlg = GetParent(hWnd);
+		const HWND hWndOption = GetDlgItem(dlg, IDC_USERNAME_OPTION);
+		const int len = GetWindowTextLength(hWnd);
+		LONG_PTR style = GetWindowLongPtr(hWndOption, GWL_STYLE);
+		if (len > 0) {
+			// \x95s\x97vtabstop
+			style = style & (~(LONG_PTR)WS_TABSTOP);
+		} else {
+			// \x97vtabstop
+			style = style | WS_TABSTOP;
+		}
+		SetWindowLongPtr(hWndOption, GWL_STYLE, style);
+	}
+	}
+	return result;
+}
+
+static void init_auth_dlg(PTInstVar pvar, HWND dlg, BOOL *UseControlChar)
+{
 	const static DlgTextInfo text_info[] = {
 		{ 0, "DLG_AUTH_TITLE" },
 		{ IDC_SSHAUTHBANNER, "DLG_AUTH_BANNER" },
@@ -255,9 +317,9 @@
 		{ IDC_SSHUSERSA, "DLG_AUTH_METHOD_RSA" },
 		{ IDC_SSHUSERHOSTS, "DLG_AUTH_METHOD_RHOST" },
 		{ IDC_SSHUSEPAGEANT, "DLG_AUTH_METHOD_PAGEANT" },
-		{ IDC_CHOOSERSAFILE, "DLG_AUTH_PRIVATEKEY" },
+		{ IDC_RSAFILENAMELABEL, "DLG_AUTH_PRIVATEKEY" },
 		{ IDC_LOCALUSERNAMELABEL, "DLG_AUTH_LOCALUSER" },
-		{ IDC_CHOOSEHOSTRSAFILE, "DLG_AUTH_HOST_PRIVATEKEY" },
+		{ IDC_HOSTRSAFILENAMELABEL, "DLG_AUTH_HOST_PRIVATEKEY" },
 		{ IDOK, "BTN_OK" },
 		{ IDCANCEL, "BTN_DISCONNECT" },
 	};
@@ -265,59 +327,9 @@
 	int default_method = pvar->session_settings.DefaultAuthMethod;
 
 	SetI18DlgStrs("TTSSH", dlg, text_info, _countof(text_info), pvar->ts->UILanguageFile);
-#if 0
-	GetWindowText(dlg, uimsg, _countof(uimsg));
-	UTIL_get_lang_msgT("DLG_AUTH_TITLE", pvar, uimsg);
-	SetWindowText(dlg, pvar->ts->UIMsg);
-	GetDlgItemText(dlg, IDC_SSHAUTHBANNER, uimsg, _countof(uimsg));
-	UTIL_get_lang_msg("DLG_AUTH_BANNER", pvar, uimsg);
-	SetDlgItemText(dlg, IDC_SSHAUTHBANNER, pvar->ts->UIMsg);
-	GetDlgItemText(dlg, IDC_SSHAUTHBANNER2, uimsg, _countof(uimsg));
-	UTIL_get_lang_msg("DLG_AUTH_BANNER2", pvar, uimsg);
-	SetDlgItemText(dlg, IDC_SSHAUTHBANNER2, pvar->ts->UIMsg);
-	GetDlgItemText(dlg, IDC_SSHUSERNAMELABEL, uimsg, _countof(uimsg));
-	UTIL_get_lang_msg("DLG_AUTH_USERNAME", pvar, uimsg);
-	SetDlgItemText(dlg, IDC_SSHUSERNAMELABEL, pvar->ts->UIMsg);
-	GetDlgItemText(dlg, IDC_SSHPASSWORDCAPTION, uimsg, _countof(uimsg));
-	UTIL_get_lang_msg("DLG_AUTH_PASSWORD", pvar, uimsg);
-	SetDlgItemText(dlg, IDC_SSHPASSWORDCAPTION, pvar->ts->UIMsg);
-	GetDlgItemText(dlg, IDC_REMEMBER_PASSWORD, uimsg, _countof(uimsg));
-	UTIL_get_lang_msg("DLG_AUTH_REMEMBER_PASSWORD", pvar, uimsg);
-	SetDlgItemText(dlg, IDC_REMEMBER_PASSWORD, pvar->ts->UIMsg);
-	GetDlgItemText(dlg, IDC_FORWARD_AGENT, uimsg, _countof(uimsg));
-	UTIL_get_lang_msg("DLG_AUTH_FWDAGENT", pvar, uimsg);
-	SetDlgItemText(dlg, IDC_FORWARD_AGENT, pvar->ts->UIMsg);
-	GetDlgItemText(dlg, IDC_SSHUSEPASSWORD, uimsg, _countof(uimsg));
-	UTIL_get_lang_msg("DLG_AUTH_METHOD_PASSWORD", pvar, uimsg);
-	SetDlgItemText(dlg, IDC_SSHUSEPASSWORD, pvar->ts->UIMsg);
-	GetDlgItemText(dlg, IDC_SSHUSERSA, uimsg, _countof(uimsg));
-	UTIL_get_lang_msg("DLG_AUTH_METHOD_RSA", pvar, uimsg);
-	SetDlgItemText(dlg, IDC_SSHUSERSA, pvar->ts->UIMsg);
-	GetDlgItemText(dlg, IDC_SSHUSERHOSTS, uimsg, _countof(uimsg));
-	UTIL_get_lang_msg("DLG_AUTH_METHOD_RHOST", pvar, uimsg);
-	SetDlgItemText(dlg, IDC_SSHUSERHOSTS, pvar->ts->UIMsg);
-	GetDlgItemText(dlg, IDC_SSHUSEPAGEANT, uimsg, _countof(uimsg));
-	UTIL_get_lang_msg("DLG_AUTH_METHOD_PAGEANT", pvar, uimsg);
-	SetDlgItemText(dlg, IDC_SSHUSEPAGEANT, pvar->ts->UIMsg);
-	GetDlgItemText(dlg, IDC_CHOOSERSAFILE, uimsg, _countof(uimsg));
-	UTIL_get_lang_msg("DLG_AUTH_PRIVATEKEY", pvar, uimsg);
-	SetDlgItemText(dlg, IDC_CHOOSERSAFILE, pvar->ts->UIMsg);
-	GetDlgItemText(dlg, IDC_LOCALUSERNAMELABEL, uimsg, _countof(uimsg));
-	UTIL_get_lang_msg("DLG_AUTH_LOCALUSER", pvar, uimsg);
-	SetDlgItemText(dlg, IDC_LOCALUSERNAMELABEL, pvar->ts->UIMsg);
-	GetDlgItemText(dlg, IDC_CHOOSEHOSTRSAFILE, uimsg, _countof(uimsg));
-	UTIL_get_lang_msg("DLG_AUTH_HOST_PRIVATEKEY", pvar, uimsg);
-	SetDlgItemText(dlg, IDC_CHOOSEHOSTRSAFILE, pvar->ts->UIMsg);
-	GetDlgItemText(dlg, IDOK, uimsg, _countof(uimsg));
-	UTIL_get_lang_msg("BTN_OK", pvar, uimsg);
-	SetDlgItemText(dlg, IDOK, pvar->ts->UIMsg);
-	GetDlgItemText(dlg, IDCANCEL, uimsg, _countof(uimsg));
-	UTIL_get_lang_msg("BTN_DISCONNECT", pvar, uimsg);
-	SetDlgItemText(dlg, IDCANCEL, pvar->ts->UIMsg);
-#endif
 
 	init_auth_machine_banner(pvar, dlg);
-	init_password_control(dlg);
+	init_password_control(pvar, dlg, IDC_SSHPASSWORD, UseControlChar);
 
 	// \x94F\x8F؎\xB8\x94s\x8C\xE3\x82̓\x89\x83x\x83\x8B\x82\xF0\x8F\x91\x82\xAB\x8A\xB7\x82\xA6
 	if (pvar->auth_state.failed_method != SSH_AUTH_NONE) {
@@ -353,9 +365,18 @@
 		SetDlgItemTextT(dlg, IDC_SSHUSETIS, uimsg);
 	}
 
+	// username\x82̃T\x83u\x83N\x83\x89\x83X\x89\xBB
+	{
+		HWND hWndUserName = GetDlgItem(dlg, IDC_SSHUSERNAME);
+		LONG_PTR ProcOrg =
+			SetWindowLongPtr(hWndUserName, GWLP_WNDPROC, (LONG_PTR)username_proc);
+		SetWindowLongPtr(hWndUserName, GWLP_USERDATA, ProcOrg);
+	}
+
 	if (pvar->auth_state.user != NULL) {
 		SetDlgItemTextA(dlg, IDC_SSHUSERNAME, pvar->auth_state.user);
 		EnableWindow(GetDlgItem(dlg, IDC_SSHUSERNAME), FALSE);
+		EnableWindow(GetDlgItem(dlg, IDC_USERNAME_OPTION), FALSE);
 		EnableWindow(GetDlgItem(dlg, IDC_SSHUSERNAMELABEL), FALSE);
 	}
 	else if (strlen(pvar->ssh2_username) > 0) {
@@ -362,12 +383,38 @@
 		SetDlgItemTextA(dlg, IDC_SSHUSERNAME, pvar->ssh2_username);
 		if (pvar->ssh2_autologin == 1) {
 			EnableWindow(GetDlgItem(dlg, IDC_SSHUSERNAME), FALSE);
+			EnableWindow(GetDlgItem(dlg, IDC_USERNAME_OPTION), FALSE);
 			EnableWindow(GetDlgItem(dlg, IDC_SSHUSERNAMELABEL), FALSE);
 		}
 	}
-	else if (pvar->session_settings.DefaultUserName[0] != 0) {
-		SetDlgItemTextA(dlg, IDC_SSHUSERNAME,
-		               pvar->session_settings.DefaultUserName);
+	else {
+		switch(pvar->session_settings.DefaultUserType) {
+		case 0:
+			// \x93\xFC\x97͂\xB5\x82Ȃ\xA2
+			break;
+		case 1:
+			// use DefaultUserName
+			if (pvar->session_settings.DefaultUserName[0] == 0) {
+				// \x81u\x93\xFC\x97͂\xB5\x82Ȃ\xA2\x81v\x82ɂ\xB5\x82Ă\xA8\x82\xAD
+				pvar->session_settings.DefaultUserType = 0;
+			} else {
+				SetDlgItemText(dlg, IDC_SSHUSERNAME,
+							   pvar->session_settings.DefaultUserName);
+			}
+			break;
+		case 2: {
+			TCHAR user_name[UNLEN+1];
+			DWORD len = _countof(user_name);
+			BOOL r = GetUserName(user_name, &len);
+			if (r != 0) {
+				SetDlgItemTextT(dlg, IDC_SSHUSERNAME, user_name);
+			}
+			break;
+		}
+		default:
+			// \x93\xFC\x97͂\xB5\x82Ȃ\xA2\x82ɂ\xB5\x82Ă\xA8\x82\xAD
+			pvar->session_settings.DefaultUserType = 0;
+		}
 	}
 
 	if (strlen(pvar->ssh2_password) > 0) {
@@ -375,7 +422,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);
+			EnableWindow(GetDlgItem(dlg, IDC_SSHPASSWORD_OPTION), FALSE);
 		}
 	}
 
@@ -402,7 +449,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);
+		EnableWindow(GetDlgItem(dlg, IDC_SSHPASSWORD_OPTION), FALSE);
 		SetDlgItemText(dlg, IDC_SSHPASSWORD, "");
 
 	// /auth=pageant \x82\xF0\x92lj\xC1
@@ -409,7 +456,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);
+		EnableWindow(GetDlgItem(dlg, IDC_SSHPASSWORD_OPTION), FALSE);
 		SetDlgItemText(dlg, IDC_SSHPASSWORD, "");
 
 	} else {
@@ -776,6 +823,7 @@
 		DeleteObject(DlgAuthFont);
 	}
 #endif
+
 	return TRUE;
 }
 
@@ -830,6 +878,9 @@
 	PTInstVar pvar;
 //	LOGFONT logfont;
 //	HFONT font;
+	static BOOL UseControlChar;
+	static BOOL ShowPassPhrase;
+	static HICON hIconDropdown;
 
 	switch (msg) {
 	case WM_INITDIALOG:
@@ -837,7 +888,9 @@
 		pvar->auth_state.auth_dialog = dlg;
 		SetWindowLongPtr(dlg, DWLP_USER, lParam);
 
-		init_auth_dlg(pvar, dlg);
+		UseControlChar = TRUE;
+		ShowPassPhrase = FALSE;
+		init_auth_dlg(pvar, dlg, &UseControlChar);
 #if 0
 		font = (HFONT)SendMessage(dlg, WM_GETFONT, 0, 0);
 		GetObject(font, sizeof(LOGFONT), &logfont);
@@ -868,6 +921,12 @@
 			DlgAuthFont = NULL;
 		}
 #endif
+		// "\x81\xA5"\x89摜\x82\xF0\x83Z\x83b\x83g\x82\xB7\x82\xE9
+		hIconDropdown = LoadImage(hInst, MAKEINTRESOURCE(IDI_DROPDOWN),
+								  IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR);
+		SendMessage(GetDlgItem(dlg, IDC_USERNAME_OPTION), BM_SETIMAGE, IMAGE_ICON, (LPARAM)hIconDropdown);
+		SendMessage(GetDlgItem(dlg, IDC_SSHPASSWORD_OPTION), BM_SETIMAGE, IMAGE_ICON, (LPARAM)hIconDropdown);
+
 		// 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) {
 			autologin_sent_none = FALSE;
@@ -889,6 +948,7 @@
 				SetTimer(dlg, IDC_TIMER3, autologin_timeout, 0);
 			}
 		}
+		CenterWindow(dlg, GetParent(dlg));
 		return FALSE;			/* because we set the focus */
 
 	case WM_TIMER:
@@ -949,6 +1009,7 @@
 
 					// \x83\x86\x81[\x83U\x96\xBC\x82\xF0\x95ύX\x82\xB3\x82\xB9\x82Ȃ\xA2
 					EnableWindow(GetDlgItem(dlg, IDC_SSHUSERNAME), FALSE);
+					EnableWindow(GetDlgItem(dlg, IDC_USERNAME_OPTION), FALSE);
 
 					// \x94F\x8F؃\x81\x83\\x83b\x83h none \x82𑗂\xE9
 					do_SSH2_userauth(pvar);
@@ -1042,6 +1103,7 @@
 
 					// \x83\x86\x81[\x83U\x96\xBC\x82\xF0\x95ύX\x82\xB3\x82\xB9\x82Ȃ\xA2
 					EnableWindow(GetDlgItem(dlg, IDC_SSHUSERNAME), FALSE);
+					EnableWindow(GetDlgItem(dlg, IDC_USERNAME_OPTION), FALSE);
 
 					// \x94F\x8F؃\x81\x83\\x83b\x83h none \x82𑗂\xE9
 					do_SSH2_userauth(pvar);
@@ -1072,14 +1134,123 @@
 			pvar->session_settings.ForwardAgent = IsDlgButtonChecked(dlg, IDC_FORWARD_AGENT);
 			return TRUE;
 
-		case IDC_FROM_CLIPBOARD: {
-			char *clipboard = GetClipboardTextA(dlg, TRUE);
+		case IDC_SSHPASSWORD_OPTION: {
+			TCHAR uimsg[MAX_UIMSG];
+			RECT rect;
+			HWND hWndButton;
+			int result;
+			HMENU hMenu= CreatePopupMenu();
+			char *clipboard = GetClipboardTextA(dlg, FALSE);
+			GetI18nStrT("TTSSH", "DLG_AUTH_PASTE_CLIPBOARD",
+						uimsg, _countof(uimsg),
+						_T("Paste from &clipboard"),
+						pvar->ts->UILanguageFile);
+			AppendMenu(hMenu, MF_ENABLED | MF_STRING | (clipboard == NULL ? MFS_DISABLED : 0), 1, uimsg);
+			GetI18nStrT("ttssh", "DLG_AUTH_CLEAR_CLIPBOARD",
+						uimsg, _countof(uimsg),
+						_T("Paste from &clipboard and cl&ear clipboard"),
+						pvar->ts->UILanguageFile);
+			AppendMenu(hMenu, MF_ENABLED | MF_STRING | (clipboard == NULL ? MFS_DISABLED : 0), 2, uimsg);
+			GetI18nStrT("ttssh", "DLG_AUTH_USE_CONTORL_CHARACTERS",
+						uimsg, _countof(uimsg),
+						_T("Use control charac&ters"),
+						pvar->ts->UILanguageFile);
+			AppendMenu(hMenu, MF_ENABLED | MF_STRING  | (UseControlChar ? MFS_CHECKED : 0), 3, uimsg);
+			GetI18nStrT("ttssh", "DLG_AUTH_SHOW_PASSPHRASE",
+						uimsg, _countof(uimsg),
+						_T("&Show passphrase"),
+						pvar->ts->UILanguageFile);
+			AppendMenu(hMenu, MF_ENABLED | MF_STRING | (ShowPassPhrase ? MFS_CHECKED : 0), 4, uimsg);
 			if (clipboard != NULL) {
-				SetDlgItemTextA(dlg, IDC_SSHPASSWORD, clipboard);
 				free(clipboard);
-				SendMessage(dlg, WM_NEXTDLGCTL, (WPARAM)GetDlgItem(dlg, IDOK), TRUE);
-				return FALSE;
 			}
+			hWndButton = GetDlgItem(dlg, IDC_SSHPASSWORD_OPTION);
+			GetWindowRect(hWndButton, &rect);
+			result = TrackPopupMenu(hMenu, TPM_RETURNCMD, rect.left, rect.bottom, 0 , hWndButton, NULL);
+			DestroyMenu(hMenu);
+			switch(result) {
+			case 1:
+			case 2: {
+				// \x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82\xA9\x82\xE7\x83y\x81[\x83X\x83g
+				BOOL clear_clipboard = result == 2;
+				clipboard = GetClipboardTextA(dlg, clear_clipboard);
+				if (clipboard != NULL) {
+					SetDlgItemTextA(dlg, IDC_SSHPASSWORD, clipboard);
+					free(clipboard);
+					SendDlgItemMessage(dlg, IDC_SSHPASSWORD, EM_SETSEL, 0, -1);
+					SendMessage(dlg, WM_NEXTDLGCTL, (WPARAM)GetDlgItem(dlg, IDC_SSHPASSWORD), TRUE);
+					return FALSE;
+				}
+				return TRUE;
+			}
+			case 3:
+				// \x90\xA7\x8C\xE4\x83R\x81[\x83h\x8Eg\x97p/\x96\xA2\x8Eg\x97p
+				UseControlChar = !UseControlChar;
+				break;
+			case 4:
+				// \x83p\x83X\x83t\x83\x8C\x81[\x83Y\x95\\x8E\xA6/\x94\xF1\x95\\x8E\xA6
+				ShowPassPhrase = !ShowPassPhrase;
+				{
+					// \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 (ShowPassPhrase) {
+						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;
+				}
+				break;
+			}
+			break;
+		}
+
+		case IDC_USERNAME_OPTION: {
+			TCHAR uimsg[MAX_UIMSG];
+			RECT rect;
+			HWND hWndButton;
+			HMENU hMenu= CreatePopupMenu();
+			int result;
+			GetI18nStrT("TTSSH", "DLG_AUTH_PASTE_WINDOWS_USERNAME",
+						uimsg, _countof(uimsg),
+						_T("Paste &Windows username"),
+						pvar->ts->UILanguageFile);
+			AppendMenu(hMenu, MF_ENABLED | MF_STRING, 1, uimsg);
+			hWndButton = GetDlgItem(dlg, IDC_USERNAME_OPTION);
+			GetWindowRect(hWndButton, &rect);
+			result = TrackPopupMenu(hMenu, TPM_RETURNCMD, rect.left, rect.bottom, 0 , hWndButton, NULL);
+			DestroyMenu(hMenu);
+			switch (result) {
+			case 1: {
+				TCHAR user_name[UNLEN+1];
+				DWORD len = _countof(user_name);
+				BOOL r = GetUserName(user_name, &len);
+				if (r != 0) {
+					SetDlgItemTextT(dlg, IDC_SSHUSERNAME, user_name);
+					SendDlgItemMessage(dlg, IDC_SSHUSERNAME, EM_SETSEL, 0, -1);
+					SendMessage(dlg, WM_NEXTDLGCTL, (WPARAM)GetDlgItem(dlg, IDC_SSHUSERNAME), TRUE);
+				}
+				break;
+			}
+			}
 			return TRUE;
 		}
 
@@ -1087,6 +1258,12 @@
 			return FALSE;
 		}
 
+	case WM_DESTROY:
+		if (hIconDropdown != NULL) {
+			DeleteObject(hIconDropdown);
+		}
+		return FALSE;
+
 	default:
 		return FALSE;
 	}
@@ -1264,7 +1441,7 @@
 	SetDlgItemText(dlg, IDCANCEL, pvar->ts->UIMsg);
 #endif
 	init_auth_machine_banner(pvar, dlg);
-	init_password_control(dlg);
+	init_password_control(pvar, dlg, IDC_SSHPASSWORD, NULL);
 
 	if (pvar->auth_state.TIS_prompt != NULL) {
 		if (strlen(pvar->auth_state.TIS_prompt) > 10000) {
@@ -1335,6 +1512,7 @@
 			SendMessage(dlg, WM_COMMAND, IDOK, 0);
 		}
 
+		CenterWindow(dlg, GetParent(dlg));
 		return FALSE;			/* because we set the focus */
 
 	case WM_COMMAND:
@@ -1403,67 +1581,32 @@
 
 static void init_default_auth_dlg(PTInstVar pvar, HWND dlg)
 {
+	int id;
+	TCHAR user_name[UNLEN+1];
+	DWORD len;
+	TCHAR uimsg[MAX_UIMSG];
+	TCHAR uimsg2[MAX_UIMSG];
 	const static DlgTextInfo text_info[] = {
 		{ 0, "DLG_AUTHSETUP_TITLE" },
 		{ IDC_SSHAUTHBANNER, "DLG_AUTHSETUP_BANNER" },
-		{ IDC_SSHUSERNAMELABEL, "DLG_AUTHSETUP_USERNAME" },
+		{ IDC_SSH_NO_USERNAME, "DLG_AUTHSETUP_NO_USERNAME" },
+		{ IDC_SSH_DEFAULTUSERNAME, "DLG_AUTHSETUP_USERNAME" },
+		{ IDC_SSH_WINDOWS_USERNAME, "DLG_AUTHSETUP_SYSTEM_USERNAME" },
+		{ IDC_SSH_WINDOWS_USERNAME_TEXT, "DLG_AUTHSETUP_SYSTEM_USERNAME_TEXT" },
 		{ IDC_SSHUSEPASSWORD, "DLG_AUTHSETUP_METHOD_PASSWORD" },
 		{ IDC_SSHUSERSA, "DLG_AUTHSETUP_METHOD_RSA" },
 		{ IDC_SSHUSERHOSTS, "DLG_AUTHSETUP_METHOD_RHOST" },
 		{ IDC_SSHUSETIS, "DLG_AUTHSETUP_METHOD_CHALLENGE" },
 		{ IDC_SSHUSEPAGEANT, "DLG_AUTHSETUP_METHOD_PAGEANT" },
-		{ IDC_CHOOSERSAFILE, "DLG_AUTH_PRIVATEKEY" },
+		{ IDC_RSAFILENAMELABEL, "DLG_AUTH_PRIVATEKEY" },
 		{ IDC_LOCALUSERNAMELABEL, "DLG_AUTH_LOCALUSER" },
-		{ IDC_CHOOSEHOSTRSAFILE, "DLG_AUTH_HOST_PRIVATEKEY" },
+		{ IDC_HOSTRSAFILENAMELABEL, "DLG_AUTH_HOST_PRIVATEKEY" },
 		{ IDC_CHECKAUTH, "DLG_AUTHSETUP_CHECKAUTH" },
 		{ IDOK, "BTN_OK" },
 		{ IDCANCEL, "BTN_CANCEL" },
 	};
+
 	SetI18DlgStrs("TTSSH", dlg, text_info, _countof(text_info), pvar->ts->UILanguageFile);
-#if 0
-	GetWindowText(dlg, uimsg, sizeof(uimsg));
-	UTIL_get_lang_msg("DLG_AUTHSETUP_TITLE", pvar, uimsg);
-	SetWindowText(dlg, pvar->ts->UIMsg);
-	GetDlgItemText(dlg, IDC_SSHAUTHBANNER, uimsg, sizeof(uimsg));
-	UTIL_get_lang_msg("DLG_AUTHSETUP_BANNER", pvar, uimsg);
-	SetDlgItemText(dlg, IDC_SSHAUTHBANNER, pvar->ts->UIMsg);
-	GetDlgItemText(dlg, IDC_SSHUSERNAMELABEL, uimsg, sizeof(uimsg));
-	UTIL_get_lang_msg("DLG_AUTHSETUP_USERNAME", pvar, uimsg);
-	SetDlgItemText(dlg, IDC_SSHUSERNAMELABEL, pvar->ts->UIMsg);
-	GetDlgItemText(dlg, IDC_SSHUSEPASSWORD, uimsg, sizeof(uimsg));
-	UTIL_get_lang_msg("DLG_AUTHSETUP_METHOD_PASSWORD", pvar, uimsg);
-	SetDlgItemText(dlg, IDC_SSHUSEPASSWORD, pvar->ts->UIMsg);
-	GetDlgItemText(dlg, IDC_SSHUSERSA, uimsg, sizeof(uimsg));
-	UTIL_get_lang_msg("DLG_AUTHSETUP_METHOD_RSA", pvar, uimsg);
-	SetDlgItemText(dlg, IDC_SSHUSERSA, pvar->ts->UIMsg);
-	GetDlgItemText(dlg, IDC_SSHUSERHOSTS, uimsg, sizeof(uimsg));
-	UTIL_get_lang_msg("DLG_AUTHSETUP_METHOD_RHOST", pvar, uimsg);
-	SetDlgItemText(dlg, IDC_SSHUSERHOSTS, pvar->ts->UIMsg);
-	GetDlgItemText(dlg, IDC_SSHUSETIS, uimsg, sizeof(uimsg));
-	UTIL_get_lang_msg("DLG_AUTHSETUP_METHOD_CHALLENGE", pvar, uimsg);
-	SetDlgItemText(dlg, IDC_SSHUSETIS, pvar->ts->UIMsg);
-	GetDlgItemText(dlg, IDC_SSHUSEPAGEANT, uimsg, sizeof(uimsg));
-	UTIL_get_lang_msg("DLG_AUTHSETUP_METHOD_PAGEANT", pvar, uimsg);
-	SetDlgItemText(dlg, IDC_SSHUSEPAGEANT, pvar->ts->UIMsg);
-	GetDlgItemText(dlg, IDC_CHOOSERSAFILE, uimsg, sizeof(uimsg));
-	UTIL_get_lang_msg("DLG_AUTH_PRIVATEKEY", pvar, uimsg);
-	SetDlgItemText(dlg, IDC_CHOOSERSAFILE, pvar->ts->UIMsg);
-	GetDlgItemText(dlg, IDC_LOCALUSERNAMELABEL, uimsg, sizeof(uimsg));
-	UTIL_get_lang_msg("DLG_AUTH_LOCALUSER", pvar, uimsg);
-	SetDlgItemText(dlg, IDC_LOCALUSERNAMELABEL, pvar->ts->UIMsg);
-	GetDlgItemText(dlg, IDC_CHOOSEHOSTRSAFILE, uimsg, sizeof(uimsg));
-	UTIL_get_lang_msg("DLG_AUTH_HOST_PRIVATEKEY", pvar, uimsg);
-	SetDlgItemText(dlg, IDC_CHOOSEHOSTRSAFILE, pvar->ts->UIMsg);
-	GetDlgItemText(dlg, IDC_CHECKAUTH, uimsg, sizeof(uimsg));
-	UTIL_get_lang_msg("DLG_AUTHSETUP_CHECKAUTH", pvar, uimsg);
-	SetDlgItemText(dlg, IDC_CHECKAUTH, pvar->ts->UIMsg);
-	GetDlgItemText(dlg, IDOK, uimsg, sizeof(uimsg));
-	UTIL_get_lang_msg("BTN_OK", pvar, uimsg);
-	SetDlgItemText(dlg, IDOK, pvar->ts->UIMsg);
-	GetDlgItemText(dlg, IDCANCEL, uimsg, sizeof(uimsg));
-	UTIL_get_lang_msg("BTN_CANCEL", pvar, uimsg);
-	SetDlgItemText(dlg, IDCANCEL, pvar->ts->UIMsg);
-#endif
 
 	switch (pvar->settings.DefaultAuthMethod) {
 	case SSH_AUTH_RSA:
@@ -1500,6 +1643,22 @@
 	if (pvar->settings.CheckAuthListFirst) {
 		CheckDlgButton(dlg, IDC_CHECKAUTH, TRUE);
 	}
+
+	if (pvar->session_settings.DefaultUserName[0] == 0) {
+		// \x8B\xF3\x82Ȃ̂Łu\x93\xFC\x97͂\xB5\x82Ȃ\xA2\x81v\x82ɂ\xB5\x82Ă\xA8\x82\xAD
+		pvar->session_settings.DefaultUserType = 0;
+	}
+	id = pvar->settings.DefaultUserType == 1 ? IDC_SSH_DEFAULTUSERNAME :
+		pvar->settings.DefaultUserType == 2 ? IDC_SSH_WINDOWS_USERNAME :
+		IDC_SSH_NO_USERNAME;
+	CheckRadioButton(dlg, IDC_SSH_NO_USERNAME, IDC_SSH_WINDOWS_USERNAME, id);
+
+	len = _countof(user_name);
+	GetUserName(user_name, &len);
+
+	GetDlgItemTextT(dlg, IDC_SSH_WINDOWS_USERNAME_TEXT, uimsg, _countof(uimsg));
+	_stprintf_s(uimsg2, _countof(uimsg2), uimsg, user_name);
+	SetDlgItemTextT(dlg, IDC_SSH_WINDOWS_USERNAME_TEXT, uimsg2);
 }
 
 static BOOL end_default_auth_dlg(PTInstVar pvar, HWND dlg)
@@ -1531,6 +1690,9 @@
 	GetDlgItemText(dlg, IDC_LOCALUSERNAME,
 	               pvar->settings.DefaultRhostsLocalUserName,
 	               sizeof(pvar->settings.DefaultRhostsLocalUserName));
+	pvar->settings.DefaultUserType =
+		IsDlgButtonChecked(dlg, IDC_SSH_DEFAULTUSERNAME) ? 1 :
+		IsDlgButtonChecked(dlg, IDC_SSH_WINDOWS_USERNAME) ? 2 : 0;
 
 	if (IsDlgButtonChecked(dlg, IDC_CHECKAUTH)) {
 		pvar->settings.CheckAuthListFirst = TRUE;
@@ -1582,6 +1744,7 @@
 			DlgAuthSetupFont = NULL;
 		}
 #endif
+		CenterWindow(dlg, GetParent(dlg));
 		return TRUE;			/* because we do not set the focus */
 
 	case WM_COMMAND:

Modified: branches/cmake/ttssh2/ttxssh/auth.h
===================================================================
--- branches/cmake/ttssh2/ttxssh/auth.h	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/ttssh2/ttxssh/auth.h	2019-05-19 15:06:12 UTC (rev 7694)
@@ -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
@@ -73,8 +73,7 @@
 void AUTH_notify_end_error(PTInstVar pvar);
 void AUTH_end(PTInstVar pvar);
 void destroy_malloced_string(char **str);
-LRESULT CALLBACK password_wnd_proc(HWND control, UINT msg,
-                                   WPARAM wParam, LPARAM lParam);
+void init_password_control(PTInstVar pvar, HWND dlg, int item, BOOL *UseControlChar);
 
 #define AUTH_get_cur_cred(pvar) (&(pvar)->auth_state.cur_cred)
 

Modified: branches/cmake/ttssh2/ttxssh/buffer.c
===================================================================
--- branches/cmake/ttssh2/ttxssh/buffer.c	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/ttssh2/ttxssh/buffer.c	2019-05-19 15:06:12 UTC (rev 7694)
@@ -38,10 +38,6 @@
 #include <openssl/ec.h>
 #include <zlib.h>
 
-#if defined(__MINGW32__)
-#define __FUNCTION__
-#endif
-
 // \x83o\x83b\x83t\x83@\x82̃I\x83t\x83Z\x83b\x83g\x82\xF0\x8F\x89\x8A\x{227B0B5}\x81A\x82܂\xBE\x93ǂ\xF1\x82ł\xA2\x82Ȃ\xA2\x8F\xF3\x91Ԃɂ\xB7\x82\xE9\x81B
 // Tera Term(TTSSH)\x83I\x83\x8A\x83W\x83i\x83\x8B\x8A֐\x94\x81B
 void buffer_rewind(buffer_t *buf)
@@ -251,7 +247,7 @@
 
 	ptr = malloc(buflen + 1);
 	if (ptr == NULL) {
-		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": malloc failed.");
+		logprintf(LOG_LEVEL_ERROR, "%s: malloc failed.", __FUNCTION__);
 		if (buflen_ptr != NULL)
 			*buflen_ptr = 0;
 		return NULL;

Added: branches/cmake/ttssh2/ttxssh/dropdown.ico
===================================================================
--- branches/cmake/ttssh2/ttxssh/dropdown.ico	                        (rev 0)
+++ branches/cmake/ttssh2/ttxssh/dropdown.ico	2019-05-19 15:06:12 UTC (rev 7694)
@@ -0,0 +1 @@
+       \xB0      (                                                                                                            \xFF\xFF  \xFF\xFF  \xFF\xFF  \xFF\xFF  \xFF\xFF  \xFE  \xFC?  \xF8  \xF0  \xE0  \xFF\xFF  \xFF\xFF  \xFF\xFF  \xFF\xFF  \xFF\xFF  \xFF\xFF  
\ No newline at end of file

Modified: branches/cmake/ttssh2/ttxssh/fwd-socks.c
===================================================================
--- branches/cmake/ttssh2/ttxssh/fwd-socks.c	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/ttssh2/ttxssh/fwd-socks.c	2019-05-19 15:06:12 UTC (rev 7694)
@@ -65,10 +65,6 @@
 #define SOCKS5_ERROR_COMMAND     129
 #define SOCKS5_ERROR_ADDRTYPE    130
 
-#if defined(__MINGW32__)
-#define __FUNCTION__
-#endif
-
 typedef struct {
 	PTInstVar pvar;
 
@@ -88,7 +84,7 @@
 	FWDDynamicFilterClosure *closure = malloc(sizeof(FWDDynamicFilterClosure));
 
 	if (closure == NULL) {
-		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": Can't allocate memory for closure.");
+		logprintf(LOG_LEVEL_ERROR, "%s: Can't allocate memory for closure.", __FUNCTION__);
 		return NULL;
 	}
 
@@ -125,7 +121,7 @@
 	PTInstVar pvar = closure->pvar;
 	FWDChannel *c = pvar->fwd_state.channels + closure->channel_num;
 
-	logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending %d bytes.", len);
+	logprintf(LOG_LEVEL_VERBOSE, "%s: sending %d bytes.", __FUNCTION__, len);
 
 	return UTIL_sock_buffered_write(pvar, &c->writebuf, dummy_blocking_write, c->local_socket, data, len);
 }
@@ -420,9 +416,9 @@
 
 	if (newlen > SOCKS_REQUEST_MAXLEN || *len < 0) {
 		// \x83\x8A\x83N\x83G\x83X\x83g\x82\xAA\x91傫\x82\xB7\x82\xAC\x82\xE9\x8Fꍇ\x82͐ؒf\x82\xB7\x82\xE9
-		logprintf(LOG_LEVEL_ERROR, __FUNCTION__
-			": request too large: state=%d, buflen=%d, reqlen=%d",
-			closure->status, closure->buflen, *len);
+		logprintf(LOG_LEVEL_ERROR,
+			"%s: request too large: state=%d, buflen=%d, reqlen=%d",
+			__FUNCTION__, closure->status, closure->buflen, *len);
 		return FWD_FILTER_CLOSECHANNEL;
 	}
 
@@ -446,7 +442,7 @@
 		}
 		else {
 			// Invalid request
-			logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": Invalid request. protocol-version=%d", buf[0]);
+			logprintf(LOG_LEVEL_ERROR, "%s: Invalid request. protocol-version=%d", __FUNCTION__, buf[0]);
 			result = -1;
 		}
 		break;
@@ -456,7 +452,7 @@
 		}
 		else {
 			// Invalid request
-			logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": Invalid request. protocol-version=%d", buf[0]);
+			logprintf(LOG_LEVEL_ERROR, "%s: Invalid request. protocol-version=%d", __FUNCTION__, buf[0]);
 			result = -1;
 		}
 		break;
@@ -482,7 +478,7 @@
 	FWDDynamicFilterClosure *closure = (FWDDynamicFilterClosure *)void_closure;
 
 	if (closure == NULL) {
-		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": closure does not available. event=%d", event);
+		logprintf(LOG_LEVEL_VERBOSE, "%s: closure does not available. event=%d", __FUNCTION__, event);
 		return FWD_FILTER_REMOVE;
 	}
 
@@ -489,7 +485,7 @@
 	switch (event) {
 	case FWD_FILTER_CLEANUP:
 		// FWD_FILTER_REMOVE \x82\xF0\x95Ԃ\xB7\x82ƁA\x83\x8A\x83\\x81[\x83X\x8AJ\x95\xFA\x82ׂ̈ɂ\xB1\x82\xEA\x82ōēx\x8CĂ΂\xEA\x82\xE9
-		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": closure cleanup. channel=%d", closure->channel_num);
+		logprintf(LOG_LEVEL_VERBOSE, "%s: closure cleanup. channel=%d", __FUNCTION__, closure->channel_num);
 		free(closure->peer_name);
 		free(closure);
 		return FWD_FILTER_REMOVE;
@@ -496,7 +492,7 @@
 
 	case FWD_FILTER_OPENCONFIRM:
 		// SSH_open_channel() \x82\xAA\x90\xAC\x8C\xF7
-		logputs(LOG_LEVEL_VERBOSE, __FUNCTION__ ": OpenConfirmation received");
+		logprintf(LOG_LEVEL_VERBOSE, "%s: OpenConfirmation received", __FUNCTION__ );
 		if (closure->socks_ver == 4) {
 			send_socks4_reply(closure, SOCKS4_RESULT_OK);
 		}
@@ -504,13 +500,13 @@
 			send_socks5_open_success(closure);
 		}
 		else {
-			logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": protocol version missmatch. version=%d", closure->socks_ver);
+			logprintf(LOG_LEVEL_VERBOSE, "%s: protocol version missmatch. version=%d", __FUNCTION__, closure->socks_ver);
 		}
 		return FWD_FILTER_REMOVE;
 
 	case FWD_FILTER_OPENFAILURE:
 		// SSH_open_channel() \x82\xAA\x8E\xB8\x94s
-		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": Open Failure. reason=%d", *len);
+		logprintf(LOG_LEVEL_VERBOSE, "%s: Open Failure. reason=%d", __FUNCTION__, *len);
 		if (closure->socks_ver == 4) {
 			send_socks4_reply(closure, SOCKS4_RESULT_NG);
 		}
@@ -518,7 +514,7 @@
 			send_socks5_open_failure(closure, *len);
 		}
 		else {
-			logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": protocol version missmatch. version=%d", closure->socks_ver);
+			logprintf(LOG_LEVEL_VERBOSE, "%s: protocol version missmatch. version=%d", __FUNCTION__, closure->socks_ver);
 		}
 		return FWD_FILTER_CLOSECHANNEL;
 
@@ -525,12 +521,12 @@
 	case FWD_FILTER_FROM_SERVER:
 		// \x82\xB1\x82̃t\x83B\x83\x8B\x83^\x82\xAA\x97L\x8C\xF8\x82Ȏ\x9E\x93_\x82ł̓T\x81[\x83o\x82ւ̃`\x83\x83\x83l\x83\x8B\x82͊J\x82\xA2\x82Ă\xA2\x82Ȃ\xA2\x82̂\xC5
 		// \x82\xB1\x82\xB1\x82ɂ͂\xB1\x82Ȃ\xA2\x82͂\xB8
-		logputs(LOG_LEVEL_VERBOSE, __FUNCTION__ ": data received from server. (bug?)");
+		logprintf(LOG_LEVEL_VERBOSE, "%s: data received from server. (bug?)", __FUNCTION__);
 		return FWD_FILTER_RETAIN;
 
 	case FWD_FILTER_FROM_CLIENT:
 		// \x83N\x83\x89\x83C\x83A\x83\x93\x83g\x82\xA9\x82\xE7\x82̗v\x8B\x81\x82\xF0\x8F\x88\x97\x9D\x82\xB7\x82\xE9
-		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": data received from client. size=%d", *len);
+		logprintf(LOG_LEVEL_VERBOSE, "%s: data received from client. size=%d", __FUNCTION__, *len);
 		return parse_client_request(closure, len, buf);
 	}
 

Modified: branches/cmake/ttssh2/ttxssh/fwd.c
===================================================================
--- branches/cmake/ttssh2/ttxssh/fwd.c	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/ttssh2/ttxssh/fwd.c	2019-05-19 15:06:12 UTC (rev 7694)
@@ -48,10 +48,6 @@
 
 #define CHANNEL_READ_BUF_SIZE 8192
 
-#if defined(__MINGW32__)
-#define __FUNCTION__
-#endif
-
 static LRESULT CALLBACK accept_wnd_proc(HWND wnd, UINT msg, WPARAM wParam,
                                         LPARAM lParam);
 
@@ -653,8 +649,8 @@
 	channel->local_socket = s;
 
 	if (request->spec.type == FWD_LOCAL_TO_REMOTE) {
-		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__
-		          ": Host %s(%d) connecting to port %d; forwarding to %s:%d; type=LtoR",
+		logprintf(LOG_LEVEL_VERBOSE,
+		          "%s: Host %s(%d) connecting to port %d; forwarding to %s:%d; type=LtoR", __FUNCTION__,
 		          hname, port, request->spec.from_port, request->spec.to_host, request->spec.to_port);
 
 		channel->filter_closure = NULL;
@@ -663,9 +659,9 @@
 		                 request->spec.to_port, hname, port);
 	}
 	else { // FWD_LOCAL_DYNAMIC
-		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__
-		          ": Host %s(%d) connecting to port %d; type=dynamic",
-		          hname, port, request->spec.from_port);
+		logprintf(LOG_LEVEL_VERBOSE,
+		          "%s: Host %s(%d) connecting to port %d; type=dynamic",
+				  __FUNCTION__, hname, port, request->spec.from_port);
 
 		// SOCKS \x82̃\x8A\x83N\x83G\x83X\x83g\x82\xF0\x8F\x88\x97\x9D\x82\xB7\x82\xE9\x88ׂ\xCC filter \x82\xF0\x93o\x98^
 		channel->filter_closure = SOCKS_init_filter(pvar, channel_num, hname, port);
@@ -675,7 +671,7 @@
 		channel->status |= FWD_BOTH_CONNECTED;
 
 	}
-	logprintf(150, __FUNCTION__ ": channel info: %s", dump_fwdchannel(channel));
+	logprintf(150, "%s: channel info: %s", __FUNCTION__, dump_fwdchannel(channel));
 }
 
 static void write_local_connection_buffer(PTInstVar pvar, int channel_num)
@@ -694,7 +690,7 @@
 {
 	FWDChannel *channel = pvar->fwd_state.channels + channel_num;
 
-	logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": channel=%d", channel_num);
+	logprintf(LOG_LEVEL_VERBOSE, "%s: channel=%d", __FUNCTION__, channel_num);
 
 	if ((channel->status & FWD_BOTH_CONNECTED) != FWD_BOTH_CONNECTED) {
 		return;
@@ -1237,20 +1233,20 @@
 	// \x91\xBC\x82̂\xE0\x8A܂߂\xC4 LOG_LEVEL \x82𐮗\x9D\x82\xB5\x82\xBD\x82\xA2\x81c\x81c
 	//
 	if (LogLevel(pvar, 150)) {
-		logprintf(150, __FUNCTION__ ": old specs: %d", pvar->fwd_state.num_requests);
+		logprintf(150, "%s: old specs: %d", __FUNCTION__, pvar->fwd_state.num_requests);
 		for (i=0; i < pvar->fwd_state.num_requests; i++) {
-			logprintf(150, __FUNCTION__ ":   #%d: %s", i,
+			logprintf(150, "%s:   #%d: %s", __FUNCTION__, i,
 				dump_fwdspec(&pvar->fwd_state.requests[i].spec, pvar->fwd_state.requests[i].status));
 		}
 
-		logprintf(150, __FUNCTION__ ": new specs: %d", num_specs);
+		logprintf(150, "%s: new specs: %d", __FUNCTION__, num_specs);
 		for (i=0; i < num_specs; i++) {
-			logprintf(150, __FUNCTION__ ":   #%d: %s", i, dump_fwdspec(new_specs+i, 0));
+			logprintf(150, "%s:   #%d: %s", __FUNCTION__, i, dump_fwdspec(new_specs+i, 0));
 		}
 
-		logprintf(150, __FUNCTION__ ": listening specs: %d", num_cur_listening);
+		logprintf(150, "%s: listening specs: %d", __FUNCTION__, num_cur_listening);
 		for (i=0; i < num_cur_listening; i++) {
-			logprintf(150, __FUNCTION__ ":   #%d: %s", i,
+			logprintf(150, "%s:   #%d: %s", __FUNCTION__, i,
 				dump_fwdspec(&server_listening_specs[i], 0));
 		}
 	}
@@ -1392,14 +1388,14 @@
 	}
 
 	if (LogLevel(pvar, 150)) {
-		logprintf(150, __FUNCTION__ ": updated specs: %d", pvar->fwd_state.num_requests);
+		logprintf(150, "%s: updated specs: %d", __FUNCTION__, pvar->fwd_state.num_requests);
 		for (i=0; i < pvar->fwd_state.num_requests; i++) {
-			logprintf(150, __FUNCTION__ ":   #%d: %s", i,
+			logprintf(150, "%s:   #%d: %s", __FUNCTION__, i,
 				dump_fwdspec(&pvar->fwd_state.requests[i].spec, pvar->fwd_state.requests[i].status));
 		}
-		logprintf(150, __FUNCTION__ ": new listening specs: %d", pvar->fwd_state.num_server_listening_specs);
+		logprintf(150, "%s: new listening specs: %d", __FUNCTION__, pvar->fwd_state.num_server_listening_specs);
 		for (i=0; i < pvar->fwd_state.num_server_listening_specs; i++) {
-			logprintf(150, __FUNCTION__ ":   #%d: %s", i,
+			logprintf(150, "%s:   #%d: %s", __FUNCTION__, i,
 				dump_fwdspec(&pvar->fwd_state.server_listening_specs[i], 0));
 		}
 	}

Modified: branches/cmake/ttssh2/ttxssh/fwdui.c
===================================================================
--- branches/cmake/ttssh2/ttxssh/fwdui.c	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/ttssh2/ttxssh/fwdui.c	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1071,6 +1071,7 @@
 			DlgFwdEditFont = NULL;
 		}
 #endif
+		CenterWindow(dlg, GetParent(dlg));
 		return FALSE;			/* because we set the focus */
 
 	case WM_COMMAND:
@@ -1224,6 +1225,7 @@
 			DlgFwdFont = NULL;
 		}
 #endif
+		CenterWindow(dlg, GetParent(dlg));
 		return TRUE;			/* because we do not set the focus */
 
 	case WM_COMMAND:

Modified: branches/cmake/ttssh2/ttxssh/hosts.c
===================================================================
--- branches/cmake/ttssh2/ttxssh/hosts.c	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/ttssh2/ttxssh/hosts.c	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1874,6 +1874,8 @@
 		// add host check box\x82Ƀ`\x83F\x83b\x83N\x82\xF0\x83f\x83t\x83H\x83\x8B\x83g\x82œ\xFC\x82\xEA\x82Ă\xA8\x82\xAD 
 		SendMessage(GetDlgItem(dlg, IDC_ADDTOKNOWNHOSTS), BM_SETCHECK, BST_CHECKED, 0);
 
+		CenterWindow(dlg, GetParent(dlg));
+
 		return TRUE;			/* because we do not set the focus */
 
 	case WM_COMMAND:
@@ -2060,6 +2062,7 @@
 			DlgHostsReplaceFont = NULL;
 		}
 #endif
+		CenterWindow(dlg, GetParent(dlg));
 		// \x83f\x83t\x83H\x83\x8B\x83g\x82Ń`\x83F\x83b\x83N\x82͓\xFC\x82\xEA\x82Ȃ\xA2
 		return TRUE;			/* because we do not set the focus */
 
@@ -2249,6 +2252,7 @@
 			DlgHostsAddFont = NULL;
 		}
 #endif
+		CenterWindow(dlg, GetParent(dlg));
 		// add host check box \x82̃f\x83t\x83H\x83\x8B\x83g\x82\xCD off \x82ɂ\xB7\x82\xE9
 		// SendMessage(GetDlgItem(dlg, IDC_ADDTOKNOWNHOSTS), BM_SETCHECK, BST_CHECKED, 0);
 

Modified: branches/cmake/ttssh2/ttxssh/key.c
===================================================================
--- branches/cmake/ttssh2/ttxssh/key.c	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/ttssh2/ttxssh/key.c	2019-05-19 15:06:12 UTC (rev 7694)
@@ -2266,6 +2266,7 @@
 			DlgHostsAddFont = NULL;
 		}
 #endif
+		CenterWindow(dlg, GetParent(dlg));
 		return TRUE;			/* because we do not set the focus */
 
 	case WM_COMMAND:

Modified: branches/cmake/ttssh2/ttxssh/keyfiles.c
===================================================================
--- branches/cmake/ttssh2/ttxssh/keyfiles.c	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/ttssh2/ttxssh/keyfiles.c	2019-05-19 15:06:12 UTC (rev 7694)
@@ -454,7 +454,7 @@
 	ciphername = buffer_get_string_msg(copy_consumed, NULL);
 	cipher = get_cipher_by_name(ciphername);
 	if (cipher == NULL && strcmp(ciphername, "none") != 0) {
-		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": unknown cipher name");
+		logprintf(LOG_LEVEL_ERROR, "%s: unknown cipher name", __FUNCTION__);
 		goto error;
 	}
 	// \x83p\x83X\x83t\x83\x8C\x81[\x83Y\x82̃`\x83F\x83b\x83N\x81B\x88Í\x86\x89\xBB\x82\xAA none \x82łȂ\xA2\x8Fꍇ\x82͋\xF3\x82̃p\x83X\x83\x8F\x81[\x83h\x82\xF0\x94F\x82߂Ȃ\xA2\x81B

Modified: branches/cmake/ttssh2/ttxssh/resource.h
===================================================================
--- branches/cmake/ttssh2/ttxssh/resource.h	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/ttssh2/ttxssh/resource.h	2019-05-19 15:06:12 UTC (rev 7694)
@@ -18,6 +18,7 @@
 #define IDI_SECURETT_YELLOW             110
 #define IDD_SSHUPDATE_HOSTKEY           111
 #define IDI_SECURETT_GREEN              113
+#define IDI_DROPDOWN                    114
 #define IDD_HOSTDLG                     600
 #define IDC_HOSTTCPIP                   601
 #define IDD_SSHDIFFERENTKEY             601
@@ -117,7 +118,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 +177,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 +200,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
@@ -227,15 +225,22 @@
 #define IDC_SSHDYNFROMPORT              1228
 #define IDC_SSHFWDLOCALDYNAMIC_LISTEN   1229
 #define IDC_SSHDYNLISTENADDR            1230
-#define IDC_FROM_CLIPBOARD              1231
+#define IDC_SSHPASSWORD_OPTION          1231
+#define IDC_USERNAME_OPTION             1232
+#define IDC_HOSTRSAFILENAMELABEL        1235
+#define IDC_RSAFILENAMELABEL            1236
+#define IDC_SSH_NO_USERNAME             1237
+#define IDC_SSH_DEFAULTUSERNAME         1238
+#define IDC_SSH_WINDOWS_USERNAME        1239
+#define IDC_SSH_WINDOWS_USERNAME_TEXT   1241
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        115
+#define _APS_NEXT_RESOURCE_VALUE        118
 #define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1232
+#define _APS_NEXT_CONTROL_VALUE         1242
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

Modified: branches/cmake/ttssh2/ttxssh/sftp.c
===================================================================
--- branches/cmake/ttssh2/ttxssh/sftp.c	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/ttssh2/ttxssh/sftp.c	2019-05-19 15:06:12 UTC (rev 7694)
@@ -1076,6 +1076,8 @@
 			hEditProc = (WNDPROC)GetWindowLongPtr(hEdit, GWLP_WNDPROC);
 			SetWindowLongPtr(hEdit, GWLP_WNDPROC, (LONG)EditProc);
 
+			CenterWindow(hDlgWnd, GetParent(hDlgWnd));
+
 			return TRUE;
 
 		case WM_COMMAND:

Modified: branches/cmake/ttssh2/ttxssh/ssh.c
===================================================================
--- branches/cmake/ttssh2/ttxssh/ssh.c	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/ttssh2/ttxssh/ssh.c	2019-05-19 15:06:12 UTC (rev 7694)
@@ -103,10 +103,6 @@
 //
 #define NonNull(msg) ((msg)?(msg):"(null)")
 
-#if defined(__MINGW32__)
-#define __FUNCTION__
-#endif
-
 typedef enum {
 	GetPayloadError = 0,
 	GetPayloadOK = 1,
@@ -379,12 +375,12 @@
 	Channel_t *c;
 
 	if (id < 0 || id >= CHANNEL_MAX) {
-		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": invalid channel id. (%d)", id);
+		logprintf(LOG_LEVEL_VERBOSE, "%s: invalid channel id. (%d)", __FUNCTION__, id);
 		return (NULL);
 	}
 	c = &channels[id];
 	if (c->used == 0) { // already freed
-		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": channel was already freed. id:%d", id);
+		logprintf(LOG_LEVEL_VERBOSE, "%s: channel was already freed. id:%d", __FUNCTION__, id);
 		return (NULL);
 	}
 	return (c);
@@ -1223,7 +1219,7 @@
 			msg = buffer_init();
 			if (msg == NULL) {
 				// TODO: error check
-				logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
+				logprintf(LOG_LEVEL_ERROR, "%s: buffer_init returns NULL.", __FUNCTION__);
 				return;
 			}
 
@@ -1305,9 +1301,10 @@
 
 		data_length = encryption_size + aadlen + maclen;
 
-		logprintf(150, __FUNCTION__
-			": built packet info: aadlen:%d, enclen:%d, padlen:%d, datalen:%d, maclen:%d, mode:%s",
-			aadlen, encryption_size, padding, data_length, maclen, aadlen ? "EtM" : "E&M");
+		logprintf(150,
+				  "%s: built packet info: aadlen:%d, enclen:%d, padlen:%d, datalen:%d, maclen:%d, mode:%s",
+				  __FUNCTION__,
+				  aadlen, encryption_size, padding, data_length, maclen, aadlen ? "EtM" : "E&M");
 	}
 
 	send_packet_blocking(pvar, data, data_length);
@@ -2263,7 +2260,7 @@
 
 	if (handle_message_count >= HANDLE_MESSAGE_MAX) {
 		// TODO: error check
-		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": too many handlers. handlers:%d, max:%d",
+		logprintf(LOG_LEVEL_ERROR, "%s: too many handlers. handlers:%d, max:%d", __FUNCTION__,
 			handle_message_count, HANDLE_MESSAGE_MAX);
 		return;
 	}
@@ -2341,7 +2338,7 @@
 			set_uint32(outmsg, pvar->ssh_state.receiver_sequence_number - 1);
 			finish_send_packet(pvar);
 
-			logputs(LOG_LEVEL_VERBOSE, __FUNCTION__ ": SSH2_MSG_UNIMPLEMENTED was sent.");
+			logprintf(LOG_LEVEL_VERBOSE, "%s: SSH2_MSG_UNIMPLEMENTED was sent.", __FUNCTION__);
 			/* XXX need to decompress incoming packet, but how? */
 		} else {
 			if (!handler(pvar)) {
@@ -2958,7 +2955,7 @@
 		msg = buffer_init();
 		if (msg == NULL) {
 			// TODO: error check
-			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
+			logprintf(LOG_LEVEL_ERROR, "%s: buffer_init returns NULL.", __FUNCTION__);
 			return;
 		}
 		buffer_put_int(msg, SSH2_DISCONNECT_BY_APPLICATION);
@@ -3019,8 +3016,8 @@
 			set_uint32(outmsg + 8, x);    // window width  (pixels)
 			set_uint32(outmsg + 12, y);   // window height (pixels)
 			finish_send_packet(pvar);
-			logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH_CMSG_WINDOW_SIZE. "
-			          "cols: %d, rows: %d, x: %d, y: %d", cols, rows, x, y);
+			logprintf(LOG_LEVEL_VERBOSE, "%s: sending SSH_CMSG_WINDOW_SIZE. "
+			          "cols: %d, rows: %d, x: %d, y: %d", __FUNCTION__, cols, rows, x, y);
 		}
 
 	} else if (SSHv2(pvar)) {
@@ -3034,7 +3031,7 @@
 
 		c = ssh2_channel_lookup(pvar->shell_id);
 		if (c == NULL) {
-			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": shell channel not found.");
+			logprintf(LOG_LEVEL_ERROR, "%s: shell channel not found.", __FUNCTION__);
 			return;
 		}
 
@@ -3042,7 +3039,7 @@
 		msg = buffer_init();
 		if (msg == NULL) {
 			// TODO: error check
-			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
+			logprintf(LOG_LEVEL_ERROR, "%s: buffer_init returns NULL.", __FUNCTION__);
 			return;
 		}
 		buffer_put_int(msg, c->remote_id);
@@ -3058,8 +3055,8 @@
 		finish_send_packet(pvar);
 		buffer_free(msg);
 
-		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH2_MSG_CHANNEL_REQUEST. "
-		          "local: %d, remote: %d, request-type: %s, cols: %d, rows: %d, x: %d, y: %d",
+		logprintf(LOG_LEVEL_VERBOSE, "%s: sending SSH2_MSG_CHANNEL_REQUEST. "
+		          "local: %d, remote: %d, request-type: %s, cols: %d, rows: %d, x: %d, y: %d", __FUNCTION__,
 		          c->self_id, c->remote_id, req_type, cols, rows, x, y);
 
 	} else {
@@ -3083,13 +3080,13 @@
 
 		c = ssh2_channel_lookup(pvar->shell_id);
 		if (c == NULL) {
-			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": shell channel not found.");
+			logprintf(LOG_LEVEL_ERROR, "%s: shell channel not found.", __FUNCTION__);
 			goto error;
 		}
 
 		msg = buffer_init();
 		if (msg == NULL) {
-			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
+			logprintf(LOG_LEVEL_ERROR, "%s: buffer_init returns NULL.", __FUNCTION__);
 			goto error;
 		}
 		buffer_put_int(msg, c->remote_id);
@@ -3102,8 +3099,8 @@
 		finish_send_packet(pvar);
 		buffer_free(msg);
 
-		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH2_MSG_CHANNEL_REQUEST. "
-		          "local: %d, remote: %d, request-type: %s, break-length: %d",
+		logprintf(LOG_LEVEL_VERBOSE, "%s: sending SSH2_MSG_CHANNEL_REQUEST. "
+		          "local: %d, remote: %d, request-type: %s, break-length: %d", __FUNCTION__,
 		          c->self_id, c->remote_id, req_type, 1000);
 
 		ret = 1;
@@ -3240,7 +3237,7 @@
 	} else { // for SSH2(yutaka)
 		Channel_t *c = ssh2_channel_lookup(pvar->shell_id);
 		if (c == NULL) {
-			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": shell channel not found.");
+			logprintf(LOG_LEVEL_ERROR, "%s: shell channel not found.", __FUNCTION__);
 		}
 		else {
 			SSH2_send_channel_data(pvar, c, (unsigned char *)buf, buflen, 0);
@@ -3519,7 +3516,7 @@
 	if (pvar->rekeying) {
 		// TODO: \x97\x9D\x91z\x82Ƃ\xB5\x82Ă̓p\x83P\x83b\x83g\x94j\x8A\xFC\x82ł͂Ȃ\xAD\x81A\x83p\x83P\x83b\x83g\x93ǂݎ\xE6\x82\xE8\x92x\x89\x84\x82ɂ\xB5\x82\xBD\x82\xA2\x82Ƃ\xB1\x82낾\x82\xAA\x81A
 		// \x8F\xAB\x97\x88\x92\xBC\x82\xB7\x82\xB1\x82Ƃɂ\xB7\x82\xE9\x81B
-		logputs(LOG_LEVEL_INFO, __FUNCTION__ ": now rekeying. data is not sent.");
+		logprintf(LOG_LEVEL_INFO, "%s: now rekeying. data is not sent.", __FUNCTION__);
 
 		c = NULL;
 
@@ -3549,7 +3546,7 @@
 		msg = buffer_init();
 		if (msg == NULL) {
 			// TODO: error check
-			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
+			logprintf(LOG_LEVEL_ERROR, "%s: buffer_init returns NULL.", __FUNCTION__);
 			return;
 		}
 		buffer_put_int(msg, c->remote_id);
@@ -3562,8 +3559,8 @@
 		finish_send_packet(pvar);
 		buffer_free(msg);
 
-		logprintf(LOG_LEVEL_SSHDUMP, __FUNCTION__ ": sending SSH2_MSG_CHANNEL_DATA. "
-			"local:%d remote:%d len:%d", c->self_id, c->remote_id, buflen);
+		logprintf(LOG_LEVEL_SSHDUMP, "%s: sending SSH2_MSG_CHANNEL_DATA. "
+				  "local:%d remote:%d len:%d", __FUNCTION__, c->self_id, c->remote_id, buflen);
 
 		// remote window size\x82̒\xB2\x90\xAE
 		if (buflen <= c->remote_window) {
@@ -3651,7 +3648,7 @@
 		msg = buffer_init();
 		if (msg == NULL) {
 			// TODO: error check
-			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
+			logprintf(LOG_LEVEL_ERROR, "%s: buffer_init returns NULL.", __FUNCTION__);
 			return;
 		}
 		buffer_put_int(msg, remote_channel_num);
@@ -3681,7 +3678,7 @@
 	msg = buffer_init();
 	if (msg == NULL) {
 		// TODO: error check
-		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
+		logprintf(LOG_LEVEL_ERROR, "%s: buffer_init returns NULL.", __FUNCTION__);
 		return;
 	}
 	buffer_put_int(msg, c->remote_id);
@@ -3750,7 +3747,7 @@
 	if (pvar->rekeying) {
 		// TODO: \x97\x9D\x91z\x82Ƃ\xB5\x82Ă̓p\x83P\x83b\x83g\x94j\x8A\xFC\x82ł͂Ȃ\xAD\x81A\x83p\x83P\x83b\x83g\x93ǂݎ\xE6\x82\xE8\x92x\x89\x84\x82ɂ\xB5\x82\xBD\x82\xA2\x82Ƃ\xB1\x82낾\x82\xAA\x81A
 		// \x8F\xAB\x97\x88\x92\xBC\x82\xB7\x82\xB1\x82Ƃɂ\xB7\x82\xE9\x81B
-		logputs(LOG_LEVEL_INFO, __FUNCTION__ ": now rekeying. data is not sent.");
+		logprintf(LOG_LEVEL_INFO, "%s: now rekeying. data is not sent.", __FUNCTION__);
 
 		c = NULL;
 
@@ -3760,7 +3757,7 @@
 	msg = buffer_init();
 	if (msg == NULL) {
 		// TODO: error check
-		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
+		logprintf(LOG_LEVEL_ERROR, "%s: buffer_init returns NULL.", __FUNCTION__);
 		return;
 	}
 	buffer_put_int(msg, c->remote_id);  // remote ID
@@ -3803,8 +3800,8 @@
 		unsigned char *outmsg =
 			begin_send_packet(pvar, SSH_CMSG_PORT_FORWARD_REQUEST, 12 + host_len);
 
-		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": Forwarding request (SSH1 RtoL): "
-			"remote_port=%d, to_host=%s, to_port=%d",
+		logprintf(LOG_LEVEL_VERBOSE, "%s: Forwarding request (SSH1 RtoL): "
+				  "remote_port=%d, to_host=%s, to_port=%d", __FUNCTION__,
 			from_server_port, to_local_host, to_local_port);
 
 		set_uint32(outmsg, from_server_port);
@@ -3815,8 +3812,8 @@
 
 		enque_forwarding_request_handlers(pvar);
 
-		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH_CMSG_PORT_FORWARD_REQUEST."
-			"remote_port=%d, to_host=%s, to_port=%d",
+		logprintf(LOG_LEVEL_VERBOSE, "%s: sending SSH_CMSG_PORT_FORWARD_REQUEST."
+				  "remote_port=%d, to_host=%s, to_port=%d", __FUNCTION__,
 			from_server_port, to_local_host, to_local_port);
 
 	} else {
@@ -3826,14 +3823,14 @@
 		unsigned char *outmsg;
 		int len;
 
-		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": Forwarding request (SSH2 RtoL): "
-			"bind_addr=%s, remote_port=%d, to_host=%s, to_port=%d",
+		logprintf(LOG_LEVEL_VERBOSE, "%s: Forwarding request (SSH2 RtoL): "
+				  "bind_addr=%s, remote_port=%d, to_host=%s, to_port=%d", __FUNCTION__,
 			bind_address, from_server_port, to_local_host, to_local_port);
 
 		msg = buffer_init();
 		if (msg == NULL) {
 			// TODO: error check
-			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
+			logprintf(LOG_LEVEL_ERROR, "%s: buffer_init returns NULL.", __FUNCTION__);
 			return;
 		}
 		req = "tcpip-forward";
@@ -3849,8 +3846,8 @@
 		finish_send_packet(pvar);
 		buffer_free(msg);
 
-		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH2_MSG_GLOBAL_REQUEST. "
-			"request=%s, want_reply=%d, bind_address=%s, remote_port=%d",
+		logprintf(LOG_LEVEL_VERBOSE, "%s: sending SSH2_MSG_GLOBAL_REQUEST. "
+				  "request=%s, want_reply=%d, bind_address=%s, remote_port=%d", __FUNCTION__,
 			req, 1, bind_address, from_server_port);
 	}
 }
@@ -3866,7 +3863,7 @@
 		msg = buffer_init();
 		if (msg == NULL) {
 			// TODO: error check
-			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
+			logprintf(LOG_LEVEL_ERROR, "%s: buffer_init returns NULL.", __FUNCTION__);
 			return;
 		}
 		s = "cancel-tcpip-forward";
@@ -3929,13 +3926,13 @@
 		msg = buffer_init();
 		if (msg == NULL) {
 			// TODO: error check
-			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
+			logprintf(LOG_LEVEL_ERROR, "%s: buffer_init returns NULL.", __FUNCTION__);
 			return;
 		}
 
 		c = ssh2_channel_lookup(pvar->shell_id);
 		if (c == NULL) {
-			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": shell channel not found.");
+			logprintf(LOG_LEVEL_ERROR, "%s: shell channel not found.", __FUNCTION__);
 			return;
 		}
 
@@ -3965,8 +3962,8 @@
 		finish_send_packet(pvar);
 		buffer_free(msg);
 
-		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH2_MSG_CHANNEL_REQUEST. "
-		          "local: %d, remote: %d, request-type: %s, proto: %s, cookie: %s, screen: %d",
+		logprintf(LOG_LEVEL_VERBOSE, "%s: sending SSH2_MSG_CHANNEL_REQUEST. "
+		          "local: %d, remote: %d, request-type: %s, proto: %s, cookie: %s, screen: %d", __FUNCTION__,
 		          c->self_id, c->remote_id, req_type, auth_protocol, newdata, screen_num);
 
 		free(newdata);
@@ -4022,7 +4019,7 @@
 			if (pvar->rekeying) {
 				// TODO: \x97\x9D\x91z\x82Ƃ\xB5\x82Ă̓p\x83P\x83b\x83g\x94j\x8A\xFC\x82ł͂Ȃ\xAD\x81A\x83p\x83P\x83b\x83g\x93ǂݎ\xE6\x82\xE8\x92x\x89\x84\x82ɂ\xB5\x82\xBD\x82\xA2\x82Ƃ\xB1\x82낾\x82\xAA\x81A
 				// \x8F\xAB\x97\x88\x92\xBC\x82\xB7\x82\xB1\x82Ƃɂ\xB7\x82\xE9\x81B
-				logputs(LOG_LEVEL_INFO, __FUNCTION__ ": now rekeying. channel open request is not sent.");
+				logprintf(LOG_LEVEL_INFO, "%s: now rekeying. channel open request is not sent.", __FUNCTION__);
 
 				c = NULL;
 
@@ -4046,7 +4043,7 @@
 			msg = buffer_init();
 			if (msg == NULL) {
 				// TODO: error check
-				logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
+				logprintf(LOG_LEVEL_ERROR, "%s: buffer_init returns NULL.", __FUNCTION__);
 				return;
 			}
 			s = "direct-tcpip";
@@ -4851,7 +4848,7 @@
 	msg = buffer_init();
 	if (msg == NULL) {
 		// TODO: error check
-		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
+		logprintf(LOG_LEVEL_ERROR, "%s: buffer_init returns NULL.", __FUNCTION__);
 		return;
 	}
 	if (pvar->my_kex != NULL)
@@ -5121,7 +5118,9 @@
 	else {
 		pvar->peer_kex = buffer_init();
 		if (pvar->peer_kex == NULL) {
-			msg = __FUNCTION__ ": Out of memory";
+			_snprintf_s(tmp, sizeof(tmp), _TRUNCATE,
+						"%s: Out of memory", __FUNCTION__);
+			msg = tmp;
 			goto error;
 		}
 	}
@@ -5131,7 +5130,9 @@
 
 	// cookie; \x82\xB1\x82\xB1\x82ł͎g\x82\xED\x82Ȃ\xA2\x82̂œǂݔ\xF2\x82΂\xB7
 	if (! grab_payload(pvar, SSH2_COOKIE_LENGTH)) {
-		msg = __FUNCTION__ ": truncated packet (cookie)";
+		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE,
+					"%s: truncated packet (cookie)", __FUNCTION__);
+		msg = tmp;
 		goto error;
 	}
 
@@ -5143,10 +5144,12 @@
 	// \x8C\xAE\x8C\xF0\x8A\xB7\x83A\x83\x8B\x83S\x83\x8A\x83Y\x83\x80
 	switch (get_namelist_from_payload(pvar, buf, sizeof(buf), &size)) {
 	case GetPayloadError:
-		msg = __FUNCTION__ ": truncated packet (kex algorithms)";
+		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE,
+					"%s: truncated packet (kex algorithms)", __FUNCTION__);
+		msg = tmp;
 		goto error;
 	case GetPayloadTruncate:
-		logputs(LOG_LEVEL_WARNING, __FUNCTION__ ": server proposed kex algorithms is too long.");
+		logprintf(LOG_LEVEL_WARNING, "%s: server proposed kex algorithms is too long.", __FUNCTION__);
 		break;
 	}
 
@@ -5163,10 +5166,12 @@
 	// \x83z\x83X\x83g\x8C\xAE\x83A\x83\x8B\x83S\x83\x8A\x83Y\x83\x80
 	switch (get_namelist_from_payload(pvar, buf, sizeof(buf), &size)) {
 	case GetPayloadError:
-		msg = __FUNCTION__ ": truncated packet (hostkey algorithms)";
+		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE,
+					"%s: truncated packet (hostkey algorithms)", __FUNCTION__);
+		msg = tmp;
 		goto error;
 	case GetPayloadTruncate:
-		logputs(LOG_LEVEL_WARNING, __FUNCTION__ ": server proposed hostkey algorithms is too long.");
+		logprintf(LOG_LEVEL_WARNING, "%s: server proposed hostkey algorithms is too long.", __FUNCTION__);
 		break;
 	}
 
@@ -5191,10 +5196,12 @@
 	// \x88Í\x86\x83A\x83\x8B\x83S\x83\x8A\x83Y\x83\x80(\x83N\x83\x89\x83C\x83A\x83\x93\x83g -> \x83T\x81[\x83o)
 	switch (get_namelist_from_payload(pvar, buf, sizeof(buf), &size)) {
 	case GetPayloadError:
-		msg = __FUNCTION__ ": truncated packet (encryption algorithms client to server)";
+		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE,
+					"%s: truncated packet (encryption algorithms client to server)", __FUNCTION__);
+		msg = tmp;
 		goto error;
 	case GetPayloadTruncate:
-		logputs(LOG_LEVEL_WARNING, __FUNCTION__ ": server proposed encryption algorithms (client to server) is too long.");
+		logprintf(LOG_LEVEL_WARNING, "%s: server proposed encryption algorithms (client to server) is too long.", __FUNCTION__);
 		break;
 	}
 
@@ -5211,10 +5218,12 @@
 	// \x88Í\x86\x83A\x83\x8B\x83S\x83\x8A\x83Y\x83\x80(\x83T\x81[\x83o -> \x83N\x83\x89\x83C\x83A\x83\x93\x83g)
 	switch (get_namelist_from_payload(pvar, buf, sizeof(buf), &size)) {
 	case GetPayloadError:
-		msg = __FUNCTION__ ": truncated packet (encryption algorithms server to client)";
+		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE,
+					"%s: truncated packet (encryption algorithms server to client)", __FUNCTION__);
+		msg = tmp;
 		goto error;
 	case GetPayloadTruncate:
-		logputs(LOG_LEVEL_WARNING, __FUNCTION__ ": server proposed encryption algorithms (server to client) is too long.");
+		logprintf(LOG_LEVEL_WARNING, "%s: server proposed encryption algorithms (server to client) is too long.", __FUNCTION__);
 		break;
 	}
 
@@ -5231,10 +5240,12 @@
 	// MAC\x83A\x83\x8B\x83S\x83\x8A\x83Y\x83\x80(\x83N\x83\x89\x83C\x83A\x83\x93\x83g -> \x83T\x81[\x83o)
 	switch (get_namelist_from_payload(pvar, buf, sizeof(buf), &size)) {
 	case GetPayloadError:
-		msg = __FUNCTION__ ": truncated packet (MAC algorithms client to server)";
+		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE,
+					"%s: truncated packet (MAC algorithms client to server)", __FUNCTION__);
+		msg = tmp;
 		goto error;
 	case GetPayloadTruncate:
-		logputs(LOG_LEVEL_WARNING, __FUNCTION__ ": server proposed MAC algorithms (client to server) is too long.");
+		logprintf(LOG_LEVEL_WARNING, "%s: server proposed MAC algorithms (client to server) is too long.", __FUNCTION__);
 		break;
 	}
 
@@ -5257,10 +5268,12 @@
 	// MAC\x83A\x83\x8B\x83S\x83\x8A\x83Y\x83\x80(\x83T\x81[\x83o -> \x83N\x83\x89\x83C\x83A\x83\x93\x83g)
 	switch (get_namelist_from_payload(pvar, buf, sizeof(buf), &size)) {
 	case GetPayloadError:
-		msg = __FUNCTION__ ": truncated packet (MAC algorithms server to client)";
+		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE,
+					"%s: truncated packet (MAC algorithms server to client)", __FUNCTION__);
+		msg = tmp;
 		goto error;
 	case GetPayloadTruncate:
-		logputs(LOG_LEVEL_WARNING, __FUNCTION__ ": server proposed MAC algorithms (server to client) is too long.");
+		logprintf(LOG_LEVEL_WARNING, "%s: server proposed MAC algorithms (server to client) is too long.", __FUNCTION__);
 		break;
 	}
 
@@ -5283,10 +5296,12 @@
 	// \x88\xB3\x8Fk\x83A\x83\x8B\x83S\x83\x8A\x83Y\x83\x80(\x83N\x83\x89\x83C\x83A\x83\x93\x83g -> \x83T\x81[\x83o)
 	switch (get_namelist_from_payload(pvar, buf, sizeof(buf), &size)) {
 	case GetPayloadError:
-		msg = __FUNCTION__ ": truncated packet (compression algorithms client to server)";
+		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE,
+					"%s: truncated packet (compression algorithms client to server)", __FUNCTION__);
+		msg = tmp;
 		goto error;
 	case GetPayloadTruncate:
-		logputs(LOG_LEVEL_WARNING, __FUNCTION__ ": server proposed compression algorithms (client to server) is too long.");
+		logprintf(LOG_LEVEL_WARNING, "%s: server proposed compression algorithms (client to server) is too long.", __FUNCTION__);
 		break;
 	}
 
@@ -5303,10 +5318,12 @@
 	// \x88\xB3\x8Fk\x83A\x83\x8B\x83S\x83\x8A\x83Y\x83\x80(\x83T\x81[\x83o -> \x83N\x83\x89\x83C\x83A\x83\x93\x83g)
 	switch (get_namelist_from_payload(pvar, buf, sizeof(buf), &size)) {
 	case GetPayloadError:
-		msg = __FUNCTION__ ": truncated packet (compression algorithms server to client)";
+		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE,
+					"%s: truncated packet (compression algorithms server to client)", __FUNCTION__);
+		msg = tmp;
 		goto error;
 	case GetPayloadTruncate:
-		logputs(LOG_LEVEL_WARNING, __FUNCTION__ ": server proposed compression algorithms (server to client) is too long.");
+		logprintf(LOG_LEVEL_WARNING, "%s: server proposed compression algorithms (server to client) is too long.", __FUNCTION__);
 		break;
 	}
 
@@ -5327,10 +5344,10 @@
 		// \x8C\xBE\x8C\xEA\x82\xCC name-list \x82\xAA\x8E\xE6\x82\xEA\x82Ȃ\xA2\x82Ƃ\xA2\x82\xA4\x8E\x96\x82\xCD KEXINIT \x83p\x83P\x83b\x83g\x82̃t\x83H\x81[\x83}\x83b\x83g\x8E\xA9\x91̂\xAA\x91z\x92\xE8\x8AO\x82ł\xA0\x82\xE8
 		// \x88ُ\xED\x82ȏ\xF3\x91Ԃł\xA0\x82邪\x81A\x92ʐM\x82ɕK\x97v\x82ȃA\x83\x8B\x83S\x83\x8A\x83Y\x83\x80\x82͂\xB7\x82łɃl\x83S\x8Dς݂ŒʐM\x8E\xA9\x91͍̂s\x82\xA6\x82\xE9\x81B
 		// \x8D\xA1\x82܂ł͂\xB1\x82̕\x94\x95\xAA\x82̃`\x83F\x83b\x83N\x82\xF0\x8Ds\x82\xC1\x82Ă\xA2\x82Ȃ\xA9\x82\xC1\x82\xBD\x82̂ŁA\x8Cx\x8D\x90\x82\xF0\x8BL\x98^\x82\xB7\x82\xE9\x82݂̂ŏ\x88\x97\x9D\x82𑱍s\x82\xB7\x82\xE9\x81B
-		logputs(LOG_LEVEL_WARNING, __FUNCTION__ ": truncated packet (language client to server)");
+		logprintf(LOG_LEVEL_WARNING, "%s: truncated packet (language client to server)", __FUNCTION__);
 		goto skip;
 	case GetPayloadTruncate:
-		logputs(LOG_LEVEL_WARNING, __FUNCTION__ ": server proposed language (client to server) is too long.");
+		logprintf(LOG_LEVEL_WARNING, "%s: server proposed language (client to server) is too long.", __FUNCTION__);
 		break;
 	}
 
@@ -5341,10 +5358,10 @@
 	switch (get_namelist_from_payload(pvar, buf, sizeof(buf), &size)) {
 	case GetPayloadError:
 		// \x8C\xBE\x8C\xEA(\x83N\x83\x89\x83C\x83A\x83\x93\x83g -> \x83T\x81[\x83o) \x82Ɠ\xAF\x97l\x82ɁA\x96\xE2\x91肪\x82\xA0\x82\xC1\x82Ă\xE0\x8Cx\x8D\x90\x82݂̂Ƃ\xB7\x82\xE9\x81B
-		logputs(LOG_LEVEL_WARNING, __FUNCTION__ ": truncated packet (language server to client)");
+		logprintf(LOG_LEVEL_WARNING, "%s: truncated packet (language server to client)", __FUNCTION__);
 		goto error;
 	case GetPayloadTruncate:
-		logputs(LOG_LEVEL_WARNING, __FUNCTION__ ": server proposed language (server to client) is too long.");
+		logprintf(LOG_LEVEL_WARNING, "%s: server proposed language (server to client) is too long.", __FUNCTION__);
 		break;
 	}
 
@@ -5355,22 +5372,22 @@
 	// SSH_MSG_KEXINIT \x82̌\xE3\x82̌\xAE\x8C\xF0\x8A\xB7\x82̓N\x83\x89\x83C\x83A\x83\x93\x83g\x91\xA4\x82\xA9\x82瑗\x82\xE9\x82̂ŃT\x81[\x83o\x91\xA4\x82\xAA 1 \x82ɂ\xB7\x82鎖\x82͂Ȃ\xA2\x82͂\xB8\x81B
 	if (!get_boolean_from_payload(pvar, buf)) {
 		// \x8C\xBE\x8C\xEA(\x83N\x83\x89\x83C\x83A\x83\x93\x83g -> \x83T\x81[\x83o) \x82Ɠ\xAF\x97l\x82ɁA\x96\xE2\x91肪\x82\xA0\x82\xC1\x82Ă\xE0\x8Cx\x8D\x90\x82݂̂Ƃ\xB7\x82\xE9\x81B
-		logputs(LOG_LEVEL_WARNING, __FUNCTION__ ": truncated packet (first_kex_packet_follows)");
+		logprintf(LOG_LEVEL_WARNING, "%s: truncated packet (first_kex_packet_follows)", __FUNCTION__);
 		goto skip;
 	}
 	if (buf[0] != 0) {
 		// \x91O\x8Fq\x82̂悤\x82ɃT\x81[\x83o\x91\xA4\x82\xCD 0 \x88ȊO\x82ɂ\xB7\x82鎖\x82͂Ȃ\xA2\x82͂\xB8\x82Ȃ̂ŁA\x8Cx\x8D\x90\x82\xF0\x8BL\x98^\x82\xB7\x82\xE9\x81B
-		logprintf(LOG_LEVEL_WARNING, __FUNCTION__ ": first_kex_packet_follows is not 0. (%d)", buf[0]);
+		logprintf(LOG_LEVEL_WARNING, "%s: first_kex_packet_follows is not 0. (%d)", __FUNCTION__, buf[0]);
 	}
 
 	// reserved: \x8C\xBB\x8F\xF3\x82͏\xED\x82\xC9 0 \x82ƂȂ\xE9\x81B
 	if (!get_uint32_from_payload(pvar, &size)) {
 		// \x8C\xBE\x8C\xEA(\x83N\x83\x89\x83C\x83A\x83\x93\x83g -> \x83T\x81[\x83o) \x82Ɠ\xAF\x97l\x82ɁA\x96\xE2\x91肪\x82\xA0\x82\xC1\x82Ă\xE0\x8Cx\x8D\x90\x82݂̂Ƃ\xB7\x82\xE9\x81B
-		logputs(LOG_LEVEL_WARNING, __FUNCTION__ ": truncated packet (reserved)");
+		logprintf(LOG_LEVEL_WARNING, "%s: truncated packet (reserved)", __FUNCTION__ );
 		goto skip;
 	}
 	if (size != 0) {
-		logprintf(LOG_LEVEL_INFO, __FUNCTION__ ": reserved data is not 0. (%d)", size);
+		logprintf(LOG_LEVEL_INFO, "%s: reserved data is not 0. (%d)", __FUNCTION__, size);
 	}
 
 skip:
@@ -5475,7 +5492,7 @@
 	msg = buffer_init();
 	if (msg == NULL) {
 		// TODO: error check
-		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
+		logprintf(LOG_LEVEL_ERROR, "%s: buffer_init returns NULL.", __FUNCTION__);
 		return;
 	}
 
@@ -5539,13 +5556,13 @@
 	else if (pvar->settings.GexMinimalGroupSize < GEX_GRP_LIMIT_MIN) {
 		min = GEX_GRP_LIMIT_MIN;
 		logprintf(LOG_LEVEL_NOTICE,
-			__FUNCTION__ ": small GexMinimalGroupSize is too small (%d), use minimum limit (%sd)",
+			"%s: small GexMinimalGroupSize is too small (%d), use minimum limit (%d)", __FUNCTION__,
 			pvar->settings.GexMinimalGroupSize, GEX_GRP_LIMIT_MIN);
 	}
 	else if (pvar->settings.GexMinimalGroupSize > GEX_GRP_LIMIT_MAX) {
 		min = GEX_GRP_LIMIT_MAX;
 		logprintf(LOG_LEVEL_NOTICE,
-			__FUNCTION__ ": small GexMinimalGroupSize is too larse (%d), use maximum limit (%sd)",
+			"%s: small GexMinimalGroupSize is too large (%d), use maximum limit (%d)", __FUNCTION__,
 			pvar->settings.GexMinimalGroupSize, GEX_GRP_LIMIT_MAX);
 	}
 	else {
@@ -5631,7 +5648,9 @@
 		goto error;
 
 	if (!get_mpint_from_payload(pvar, p) || !get_mpint_from_payload(pvar, g)) {
-		notify_fatal_error(pvar, __FUNCTION__ ":truncated packet (mpint)", FALSE);
+		_snprintf_s(tmpbuf, sizeof(tmpbuf), _TRUNCATE,
+					"%s:truncated packet (mpint)", __FUNCTION__);
+		notify_fatal_error(pvar, tmpbuf, FALSE);
 		return FALSE;
 	}
 
@@ -5775,7 +5794,7 @@
 	msg = buffer_init();
 	if (msg == NULL) {
 		// TODO: error check
-		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
+		logprintf(LOG_LEVEL_ERROR, "%s: buffer_init returns NULL.", __FUNCTION__);
 		return;
 	}
 
@@ -5851,8 +5870,8 @@
 	if ((ret = key_verify(hostkey, signature, siglen, hash, hashlen)) != 1) {
 		if (ret == -3 && hostkey->type == KEY_RSA) {
 			if (!pvar->settings.EnableRsaShortKeyServer) {
-				_snprintf_s(emsg, sizeof(emsg), _TRUNCATE, __FUNCTION__
-					": key verify error. remote rsa key length is too short (%d-bit)",
+				_snprintf_s(emsg, sizeof(emsg), _TRUNCATE,
+					"%s: key verify error. remote rsa key length is too short (%d-bit)", __FUNCTION__,
 					BN_num_bits(hostkey->rsa->n));
 			}
 			else {
@@ -5860,7 +5879,7 @@
 			}
 		}
 		else {
-			_snprintf_s(emsg, sizeof(emsg), _TRUNCATE, __FUNCTION__ ": key verify error (%d)\r\n%s", ret, SENDTOME);
+			_snprintf_s(emsg, sizeof(emsg), _TRUNCATE, "%s: key verify error (%d)\r\n%s", __FUNCTION__, ret, SENDTOME);
 		}
 
 		save_memdump(LOGDUMP);
@@ -5875,7 +5894,7 @@
 	begin_send_packet(pvar, SSH2_MSG_NEWKEYS, 0);
 	finish_send_packet(pvar);
 
-	logputs(LOG_LEVEL_VERBOSE, __FUNCTION__ ": SSH2_MSG_NEWKEYS was sent.");
+	logprintf(LOG_LEVEL_VERBOSE, "%s: SSH2_MSG_NEWKEYS was sent.", __FUNCTION__);
 
 	// SSH2_MSG_NEWKEYS\x82𑗂\xE8\x8FI\x82\xED\x82\xC1\x82\xBD\x82\xA0\x82ƂɃL\x81[\x82̐ݒ肨\x82\xE6\x82эĐݒ\xE8\x82\xF0\x8Ds\x82\xA4
 	// \x91\x97\x90M\x97p\x82̈Í\x86\x8C\xAE\x82\xCD SSH2_MSG_NEWKEYS \x82̑\x97\x90M\x8C\xE3\x82ɁA\x8E\xF3\x90M\x97p\x82̂\xCD SSH2_MSG_NEWKEYS \x82\xCC
@@ -5954,7 +5973,9 @@
 
 	hostkey = key_from_blob(data, bloblen);
 	if (hostkey == NULL) {
-		emsg = __FUNCTION__ ": key_from_blob error";
+		_snprintf_s(emsg_tmp, sizeof(emsg_tmp), _TRUNCATE,
+					"%s: key_from_blob error", __FUNCTION__);
+		emsg = emsg_tmp;
 		goto error;
 	}
 	data += bloblen;
@@ -5969,13 +5990,17 @@
 	}
 	HOSTS_check_host_key(pvar, pvar->ssh_state.hostname, pvar->ssh_state.tcpport, hostkey);
 	if (pvar->socket == INVALID_SOCKET) {
-		emsg = __FUNCTION__ ": Server disconnected";
+		_snprintf_s(emsg_tmp, sizeof(emsg_tmp), _TRUNCATE,
+					"%s: Server disconnected", __FUNCTION__);
+		emsg = emsg_tmp;
 		goto error;
 	}
 
 	server_public = BN_new();
 	if (server_public == NULL) {
-		emsg = __FUNCTION__ ": Out of memory (1)";
+		_snprintf_s(emsg_tmp, sizeof(emsg_tmp), _TRUNCATE,
+					"%s: Out of memory (1)", __FUNCTION__);
+		emsg = emsg_tmp;
 		goto error;
 	}
 
@@ -5990,7 +6015,9 @@
 
 	// check public key
 	if (!dh_pub_is_valid(pvar->kexdh, server_public)) {
-		emsg = __FUNCTION__ ": invalid server public key";
+		_snprintf_s(emsg_tmp, sizeof(emsg_tmp), _TRUNCATE,
+					"%s: invalid server public key", __FUNCTION__);
+		emsg = emsg_tmp;
 		goto error;
 	}
 	// \x8B\xA4\x92ʌ\xAE\x82̐\xB6\x90\xAC
@@ -5997,13 +6024,17 @@
 	dh_len = DH_size(pvar->kexdh);
 	dh_buf = malloc(dh_len);
 	if (dh_buf == NULL) {
-		emsg = __FUNCTION__ ": Out of memory (2)";
+		_snprintf_s(emsg_tmp, sizeof(emsg_tmp), _TRUNCATE,
+					"%s: Out of memory (2)", __FUNCTION__);
+		emsg = emsg_tmp;
 		goto error;
 	}
 	share_len = DH_compute_key(dh_buf, server_public, pvar->kexdh);
 	share_key = BN_new();
 	if (share_key == NULL) {
-		emsg = __FUNCTION__ ": Out of memory (3)";
+		_snprintf_s(emsg_tmp, sizeof(emsg_tmp), _TRUNCATE,
+					"%s: Out of memory (3)", __FUNCTION__);
+		emsg = emsg_tmp;
 		goto error;
 	}
 	// 'share_key'\x82\xAA\x83T\x81[\x83o\x82ƃN\x83\x89\x83C\x83A\x83\x93\x83g\x82ŋ\xA4\x97L\x82\xB7\x82錮\x81iG^A\x81~B mod P\x81j\x82ƂȂ\xE9\x81B
@@ -6097,7 +6128,9 @@
 
 	hostkey = key_from_blob(data, bloblen);
 	if (hostkey == NULL) {
-		emsg = __FUNCTION__ ": key_from_blob error";
+		_snprintf_s(emsg_tmp, sizeof(emsg_tmp), _TRUNCATE,
+					"%s: key_from_blob error", __FUNCTION__);
+		emsg = emsg_tmp;
 		goto error;
 	}
 	data += bloblen;
@@ -6112,13 +6145,17 @@
 	}
 	HOSTS_check_host_key(pvar, pvar->ssh_state.hostname, pvar->ssh_state.tcpport, hostkey);
 	if (pvar->socket == INVALID_SOCKET) {
-		emsg = __FUNCTION__ ": Server disconnected";
+		_snprintf_s(emsg_tmp, sizeof(emsg_tmp), _TRUNCATE,
+					"%s: Server disconnected", __FUNCTION__);
+		emsg = emsg_tmp;
 		goto error;
 	}
 
 	server_public = BN_new();
 	if (server_public == NULL) {
-		emsg = __FUNCTION__ ": Out of memory (1)";
+		_snprintf_s(emsg_tmp, sizeof(emsg_tmp), _TRUNCATE,
+					"%s: Out of memory (1)", __FUNCTION__);
+		emsg = emsg_tmp;
 		goto error;
 	}
 
@@ -6133,7 +6170,9 @@
 
 	// check public key
 	if (!dh_pub_is_valid(pvar->kexdh, server_public)) {
-		emsg = __FUNCTION__ ": invalid server public key";
+		_snprintf_s(emsg_tmp, sizeof(emsg_tmp), _TRUNCATE,
+					"%s: invalid server public key", __FUNCTION__);
+		emsg = emsg_tmp;
 		goto error;
 	}
 	// \x8B\xA4\x92ʌ\xAE\x82̐\xB6\x90\xAC
@@ -6140,13 +6179,17 @@
 	dh_len = DH_size(pvar->kexdh);
 	dh_buf = malloc(dh_len);
 	if (dh_buf == NULL) {
-		emsg = __FUNCTION__ ": Out of memory (2)";
+		_snprintf_s(emsg_tmp, sizeof(emsg_tmp), _TRUNCATE,
+					"%s: Out of memory (2)", __FUNCTION__);
+		emsg = emsg_tmp;
 		goto error;
 	}
 	share_len = DH_compute_key(dh_buf, server_public, pvar->kexdh);
 	share_key = BN_new();
 	if (share_key == NULL) {
-		emsg = __FUNCTION__ ": Out of memory (3)";
+		_snprintf_s(emsg_tmp, sizeof(emsg_tmp), _TRUNCATE,
+					"%s: Out of memory (3)", __FUNCTION__);
+		emsg = emsg_tmp;
 		goto error;
 	}
 	// 'share_key'\x82\xAA\x83T\x81[\x83o\x82ƃN\x83\x89\x83C\x83A\x83\x93\x83g\x82ŋ\xA4\x97L\x82\xB7\x82錮\x81iG^A\x81~B mod P\x81j\x82ƂȂ\xE9\x81B
@@ -6246,7 +6289,9 @@
 
 	hostkey = key_from_blob(data, bloblen);
 	if (hostkey == NULL) {
-		emsg = __FUNCTION__ ": key_from_blob error";
+		_snprintf_s(emsg_tmp, sizeof(emsg_tmp), _TRUNCATE,
+					"%s: key_from_blob error", __FUNCTION__);
+		emsg = emsg_tmp;
 		goto error;
 	}
 	data += bloblen;
@@ -6261,7 +6306,9 @@
 	}
 	HOSTS_check_host_key(pvar, pvar->ssh_state.hostname, pvar->ssh_state.tcpport, hostkey);
 	if (pvar->socket == INVALID_SOCKET) {
-		emsg = __FUNCTION__ ": Server disconnected";
+		_snprintf_s(emsg_tmp, sizeof(emsg_tmp), _TRUNCATE,
+					"%s: Server disconnected", __FUNCTION__);
+		emsg = emsg_tmp;
 		goto error;
 	}
 
@@ -6269,7 +6316,9 @@
 	group = EC_KEY_get0_group(pvar->ecdh_client_key);
 	server_public = EC_POINT_new(group);
 	if (server_public == NULL) {
-		emsg = __FUNCTION__ ": Out of memory (1)";
+		_snprintf_s(emsg_tmp, sizeof(emsg_tmp), _TRUNCATE,
+					"%s: Out of memory (1)", __FUNCTION__);
+		emsg = emsg_tmp;
 		goto error;
 	}
 
@@ -6284,7 +6333,9 @@
 
 	// check public key
 	if (key_ec_validate_public(group, server_public) != 0) {
-		emsg = __FUNCTION__ ": invalid server public key";
+		_snprintf_s(emsg_tmp, sizeof(emsg_tmp), _TRUNCATE,
+					"%s: invalid server public key", __FUNCTION__);
+		emsg = emsg_tmp;
 		goto error;
 	}
 	// \x8B\xA4\x92ʌ\xAE\x82̐\xB6\x90\xAC
@@ -6291,17 +6342,23 @@
 	ecdh_len = (EC_GROUP_get_degree(group) + 7) / 8;
 	ecdh_buf = malloc(ecdh_len);
 	if (ecdh_buf == NULL) {
-		emsg = __FUNCTION__ ": Out of memory (2)";
+		_snprintf_s(emsg_tmp, sizeof(emsg_tmp), _TRUNCATE,
+					"%s: Out of memory (2)", __FUNCTION__);
+		emsg = emsg_tmp;
 		goto error;
 	}
 	if (ECDH_compute_key(ecdh_buf, ecdh_len, server_public,
 	                     pvar->ecdh_client_key, NULL) != (int)ecdh_len) {
-		emsg = __FUNCTION__ ": Out of memory (3)";
+		_snprintf_s(emsg_tmp, sizeof(emsg_tmp), _TRUNCATE,
+					"%s: Out of memory (3)", __FUNCTION__);
+		emsg = emsg_tmp;
 		goto error;
 	}
 	share_key = BN_new();
 	if (share_key == NULL) {
-		emsg = __FUNCTION__ ": Out of memory (4)";
+		_snprintf_s(emsg_tmp, sizeof(emsg_tmp), _TRUNCATE,
+					"%s: Out of memory (4)", __FUNCTION__);
+		emsg = emsg_tmp;
 		goto error;
 	}
 	// 'share_key'\x82\xAA\x83T\x81[\x83o\x82ƃN\x83\x89\x83C\x83A\x83\x93\x83g\x82ŋ\xA4\x97L\x82\xB7\x82錮\x81iG^A\x81~B mod P\x81j\x82ƂȂ\xE9\x81B
@@ -6507,7 +6564,7 @@
 	msg = buffer_init();
 	if (msg == NULL) {
 		// TODO: error check
-		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
+		logprintf(LOG_LEVEL_ERROR, "%s: buffer_init returns NULL.", __FUNCTION__);
 		return FALSE;
 	}
 	s = "ssh-userauth";
@@ -6536,7 +6593,7 @@
 	data = pvar->ssh_state.payload;
 
 	if ((svc = buffer_get_string(&data, NULL)) == NULL) {
-		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_get_string returns NULL.");
+		logprintf(LOG_LEVEL_ERROR, "%s: buffer_get_string returns NULL.", __FUNCTION__);
 	}
 	logprintf(LOG_LEVEL_VERBOSE, "SSH2_MSG_SERVICE_ACCEPT was received. service-name=%s", NonNull(svc));
 	free(svc);
@@ -6572,7 +6629,7 @@
 	msg = buffer_init();
 	if (msg == NULL) {
 		// TODO: error check
-		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
+		logprintf(LOG_LEVEL_ERROR, "%s: buffer_init returns NULL.", __FUNCTION__);
 		return FALSE;
 	}
 
@@ -6765,7 +6822,7 @@
 			msg = buffer_init();
 			if (msg == NULL) {
 				// TODO: error check
-				logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
+				logprintf(LOG_LEVEL_ERROR, "%s: buffer_init returns NULL.", __FUNCTION__);
 				return FALSE;
 			}
 			s = "ssh-heartbeat";
@@ -6939,7 +6996,7 @@
 		msg = buffer_init();
 		if (msg == NULL) {
 			// TODO: error check
-			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
+			logprintf(LOG_LEVEL_ERROR, "%s: buffer_init returns NULL.", __FUNCTION__);
 			return FALSE;
 		}
 		s = "session";
@@ -7138,7 +7195,7 @@
 	logputs(LOG_LEVEL_INFO, "SSH2_MSG_USERAUTH_BANNER was received.");
 
 	if (!get_string_from_payload(pvar, buff, sizeof(buff), &msglen, TRUE)) {
-		logputs(LOG_LEVEL_WARNING, __FUNCTION__ ": banner payload corrupted.");
+		logprintf(LOG_LEVEL_WARNING, "%s: banner payload corrupted.", __FUNCTION__);
 		return TRUE;
 	}
 
@@ -7191,7 +7248,7 @@
 	}
 
 	if (!get_string_from_payload(pvar, buff, sizeof(buff), &ltaglen, TRUE)) {
-		logprintf(LOG_LEVEL_WARNING, __FUNCTION__ ": langtag payload corrupted.");
+		logprintf(LOG_LEVEL_WARNING, "%s: langtag payload corrupted.", __FUNCTION__);
 		return TRUE;
 	}
 
@@ -7268,7 +7325,7 @@
 	lang = buffer_get_string(&data, NULL);
 	lprompt[0] = 0;
 	if (inst == NULL) {
-		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_get_string returns NULL. (inst)");
+		logprintf(LOG_LEVEL_ERROR, "%s: buffer_get_string returns NULL. (inst)", __FUNCTION__);
 	}
 	else if (strlen(inst) > 0) {
 		strncat_s(lprompt, sizeof(lprompt), inst, _TRUNCATE);
@@ -7275,7 +7332,7 @@
 		strncat_s(lprompt, sizeof(lprompt), "\r\n", _TRUNCATE);
 	}
 	if (lang == NULL) {
-		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_get_string returns NULL. (lang)");
+		logprintf(LOG_LEVEL_ERROR, "%s: buffer_get_string returns NULL. (lang)", __FUNCTION__);
 	}
 	else if (strlen(lang) > 0) {
 		strncat_s(lprompt, sizeof(lprompt), lang, _TRUNCATE);
@@ -7282,7 +7339,7 @@
 		strncat_s(lprompt, sizeof(lprompt), "\r\n", _TRUNCATE);
 	}
 
-	logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": user=%s, inst=%s, lang=%s",
+	logprintf(LOG_LEVEL_VERBOSE, "%s: user=%s, inst=%s, lang=%s", __FUNCTION__,
 		NonNull(name), NonNull(inst), NonNull(lang));
 
 	free(name);
@@ -7293,7 +7350,7 @@
 	num = get_uint32_MSBfirst(data);
 	data += 4;
 
-	logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": prompts=%d", num);
+	logprintf(LOG_LEVEL_VERBOSE, "%s: prompts=%d", __FUNCTION__, num);
 
 	///////// step2
 	// \x83T\x81[\x83o\x82փp\x83X\x83t\x83\x8C\x81[\x83Y\x82𑗂\xE9
@@ -7300,7 +7357,7 @@
 	msg = buffer_init();
 	if (msg == NULL) {
 		// TODO: error check
-		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
+		logprintf(LOG_LEVEL_ERROR, "%s: buffer_init returns NULL.", __FUNCTION__);
 		return FALSE;
 	}
 	buffer_put_int(msg, num);
@@ -7323,7 +7380,7 @@
 		echo = data[0];
 		data[0] = '\0'; // \x83\x8D\x83O\x8Fo\x97ׁ͂̈A\x88ꎞ\x93I\x82\xC9 NUL Terminate \x82\xB7\x82\xE9
 
-		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ":   prompt[%d]=\"%s\", echo=%d, pass-state=%d",
+		logprintf(LOG_LEVEL_VERBOSE, "%s:   prompt[%d]=\"%s\", echo=%d, pass-state=%d", __FUNCTION__,
 			i, prompt, slen, pvar->keyboard_interactive_password_input);
 
 		data[0] = echo; // \x83\x8D\x83O\x8Fo\x97͂\xF0\x8Ds\x82\xC1\x82\xBD\x82̂ŁA\x8C\xB3\x82̒l\x82ɏ\x91\x82\xAB\x96߂\xB7
@@ -7354,7 +7411,7 @@
 	finish_send_packet(pvar);
 	buffer_free(msg);
 
-	logputs(LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH2_MSG_USERAUTH_INFO_RESPONSE.");
+	logprintf(LOG_LEVEL_VERBOSE, "%s: sending SSH2_MSG_USERAUTH_INFO_RESPONSE.", __FUNCTION__);
 	return TRUE;
 }
 
@@ -7457,7 +7514,7 @@
 		finish_send_packet(pvar);
 		buffer_free(msg);
 
-		logputs(LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH2_MSG_USERAUTH_REQUEST method=publickey");
+		logprintf(LOG_LEVEL_VERBOSE, "%s: sending SSH2_MSG_USERAUTH_REQUEST method=publickey", __FUNCTION__);
 
 		pvar->pageant_keyfinal = TRUE;
 
@@ -7488,6 +7545,7 @@
 //	LOGFONT logfont;
 //	HFONT font;
 //	static HFONT DlgChgPassFont;
+	char uimsg[MAX_UIMSG];
 	static PTInstVar pvar;
 
 
@@ -7531,6 +7589,8 @@
 #endif
 		SetFocus(GetDlgItem(dlg, IDC_OLD_PASSWD));
 
+		CenterWindow(dlg, GetParent(dlg));
+
 		return FALSE;
 
 	case WM_COMMAND:
@@ -7603,11 +7663,11 @@
 	ret = DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_SSHPASSWD_INPUT), pvar->cv->HWin, passwd_change_dialog, (LPARAM)&cp);
 
 	if (ret == -1) {
-		logprintf(LOG_LEVEL_WARNING, __FUNCTION__ ": DialogBoxParam failed.");
+		logprintf(LOG_LEVEL_WARNING, "%s: DialogBoxParam failed.", __FUNCTION__);
 		return FALSE;
 	}
 	else if (ret == 0) {
-		logprintf(LOG_LEVEL_NOTICE, __FUNCTION__ ": dialog cancelled.");
+		logprintf(LOG_LEVEL_NOTICE, "%s: dialog cancelled.", __FUNCTION__);
 		return FALSE;
 	}
 
@@ -7620,11 +7680,11 @@
 	lang = buffer_get_string(&data, NULL);
 	if (info == NULL || lang == NULL) {
 		logprintf(LOG_LEVEL_ERROR,
-			__FUNCTION__ ": buffer_get_string returns NULL. info=%s, lang=%s",
+			"%s: buffer_get_string returns NULL. info=%s, lang=%s", __FUNCTION__,
 			NonNull(info), NonNull(lang));
 	}
 	else {
-		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": info=%s, lang=%s\n", info, lang);
+		logprintf(LOG_LEVEL_VERBOSE, "%s: info=%s, lang=%s\n", __FUNCTION__, info, lang);
 	}
 	free(info);
 	free(lang);
@@ -7632,7 +7692,7 @@
 	msg = buffer_init();
 	if (msg == NULL) {
 		// TODO: error check
-		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
+		logprintf(LOG_LEVEL_ERROR, "%s: buffer_init returns NULL.", __FUNCTION__);
 		return FALSE;
 	}
 
@@ -7699,8 +7759,8 @@
 	finish_send_packet(pvar);
 	buffer_free(msg);
 
-	logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH2_MSG_CHANNEL_REQUEST. "
-	          "local: %d, remote: %d, request-type: %s, msg1=%s, msg2=%s",
+	logprintf(LOG_LEVEL_VERBOSE, "%s: sending SSH2_MSG_CHANNEL_REQUEST. "
+	          "local: %d, remote: %d, request-type: %s, msg1=%s, msg2=%s", __FUNCTION__,
 	          c->self_id, c->remote_id, req, msg1 ? msg1 : "none", msg2 ? msg2 : "none");
 	return TRUE;
 }
@@ -7721,13 +7781,13 @@
 	msg = buffer_init();
 	if (msg == NULL) {
 		// TODO: error check
-		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL. (msg)");
+		logprintf(LOG_LEVEL_ERROR, "%s: buffer_init returns NULL. (msg)", __FUNCTION__);
 		return FALSE;
 	}
 	ttymsg = buffer_init();
 	if (ttymsg == NULL) {
 		// TODO: error check
-		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL. (ttymsg)");
+		logprintf(LOG_LEVEL_ERROR, "%s: buffer_init returns NULL. (ttymsg)", __FUNCTION__);
 		buffer_free(msg);
 		return FALSE;
 	}
@@ -7782,10 +7842,10 @@
 	buffer_free(msg);
 	buffer_free(ttymsg);
 
-	logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH2_MSG_CHANNEL_REQUEST. "
+	logprintf(LOG_LEVEL_VERBOSE, "%s: sending SSH2_MSG_CHANNEL_REQUEST. "
 	          "local: %d, remote: %d, request-type: %s, "
 	          "term: %s, cols: %d, rows: %d, x: %d, y: %d, "
-	          "out-speed: %d, in-speed: %d, verase: %s, onlcr: %s",
+	          "out-speed: %d, in-speed: %d, verase: %s, onlcr: %s", __FUNCTION__,
 	          c->self_id, c->remote_id, req_type, pvar->ts->TermType,
 	          pvar->ssh_state.win_cols, pvar->ssh_state.win_rows, x, y,
 	          pvar->ts->TerminalOutputSpeed, pvar->ts->TerminalInputSpeed,
@@ -7827,7 +7887,7 @@
 	c = ssh2_channel_lookup(id);
 	if (c == NULL) {
 		// TODO:
-		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": channel not found. (%d)", id);
+		logprintf(LOG_LEVEL_ERROR, "%s: channel not found. (%d)", __FUNCTION__, id);
 		return FALSE;
 	}
 
@@ -7910,7 +7970,7 @@
 		break;
 
 	default: // NOT REACHED
-		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": Invalid channel-type. (%d)", c->type);
+		logprintf(LOG_LEVEL_ERROR, "%s: Invalid channel-type. (%d)", __FUNCTION__, c->type);
 		return FALSE;
 	}
 	return TRUE;
@@ -7942,7 +8002,7 @@
 	c = ssh2_channel_lookup(id);
 	if (c == NULL) {
 		// TODO: SSH2_MSG_DISCONNECT\x82𑗂\xE9
-		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": channel not found. (%d)", id);
+		logprintf(LOG_LEVEL_ERROR, "%s: channel not found. (%d)", __FUNCTION__, id);
 		return FALSE;
 	}
 
@@ -7964,7 +8024,7 @@
 	cstring = buffer_get_string(&data, NULL);
 
 	if (cstring == NULL) {
-		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_get_string returns NULL");
+		logprintf(LOG_LEVEL_ERROR, "%s: buffer_get_string returns NULL", __FUNCTION__);
 	}
 	UTIL_get_lang_msgU8("MSG_SSH_CHANNEL_OPEN_ERROR", uimsg, _countof(uimsg),
 						"SSH2_MSG_CHANNEL_OPEN_FAILURE was received.\r\nchannel [%d]: reason: %s(%d) message: %s",
@@ -8022,7 +8082,7 @@
 
 	if (rtype == NULL) {
 		// rtype \x82\xAA NULL \x82Ŗ\xB3\x82\xA2\x8E\x96\x82̕ۏ\xD8
-		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_get_string returns NULL.");
+		logprintf(LOG_LEVEL_ERROR, "%s: buffer_get_string returns NULL.", __FUNCTION__);
 	}
 	else if (strcmp(rtype, "hostk****@opens*****") == 0) {
 		// OpenSSH 6.8\x82ł́A\x83T\x81[\x83o\x82̃z\x83X\x83g\x8C\xAE\x82\xAA\x8DX\x90V\x82\xB3\x82\xEA\x82\xE9\x82ƁA\x82\xB1\x82̒ʒm\x82\xAA\x97\x88\x82\xE9\x81B
@@ -8089,7 +8149,7 @@
 		c = ssh2_channel_lookup(pvar->shell_id);
 		if (c == NULL) {
 			// TODO: error check
-			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": shell channel not found.");
+			logprintf(LOG_LEVEL_ERROR, "%s: shell channel not found.", __FUNCTION__);
 			return FALSE;
 		}
 		pvar->agentfwd_enable = TRUE;
@@ -8102,7 +8162,7 @@
 		c = ssh2_channel_lookup(pvar->shell_id);
 		if (c == NULL) {
 			// TODO: error check
-			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": shell channel not found.");
+			logprintf(LOG_LEVEL_ERROR, "%s: shell channel not found.", __FUNCTION__);
 			return FALSE;
 		}
 
@@ -8138,7 +8198,7 @@
 	c = ssh2_channel_lookup(channel_id);
 	if (c == NULL) {
 		// TODO: error check
-		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": channel not found. (%d)", channel_id);
+		logprintf(LOG_LEVEL_ERROR, "%s: channel not found. (%d)", __FUNCTION__, channel_id);
 		return FALSE;
 	}
 
@@ -8189,7 +8249,7 @@
 		msg = buffer_init();
 		if (msg == NULL) {
 			// TODO: error check
-			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
+			logprintf(LOG_LEVEL_ERROR, "%s: buffer_init returns NULL.", __FUNCTION__);
 			return;
 		}
 		buffer_put_int(msg, c->remote_id);
@@ -8225,7 +8285,7 @@
 		msg = buffer_init();
 		if (msg == NULL) {
 			// TODO: error check
-			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
+			logprintf(LOG_LEVEL_ERROR, "%s: buffer_init returns NULL.", __FUNCTION__);
 			return;
 		}
 		buffer_put_int(msg, c->remote_id);
@@ -8261,6 +8321,7 @@
 	switch (msg) {
 		case WM_INITDIALOG:
 			closed = 0;
+			CenterWindow(hWnd, GetParent(hWnd));
 			return FALSE;
 
 		// SCP\x83t\x83@\x83C\x83\x8B\x8E\xF3\x90M(remote-to-local)\x8E\x9E\x81A\x8Eg\x97p\x82\xB7\x82\xE9\x81B
@@ -8340,6 +8401,7 @@
 		return 0;
 }
 
+/* dlglib \x82ɑS\x82\xAD\x93\xAF\x82\xB6\x82\xE0\x82̂\xAA\x82\xA0\x82\xE9\x82̂ł\xBB\x82\xBF\x82\xE7\x82𗘗p\x82\xB7\x82\xE9 */
 #if 0
 void InitDlgProgress(HWND HDlg, int id_Progress, int *CurProgStat) {
 	HWND HProg;
@@ -8901,7 +8963,7 @@
 	c = ssh2_channel_lookup(id);
 	if (c == NULL) {
 		// TODO:
-		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": channel not found. (%d)", id);
+		logprintf(LOG_LEVEL_ERROR, "%s: channel not found. (%d)", __FUNCTION__, id);
 		return FALSE;
 	}
 
@@ -8917,14 +8979,14 @@
 
 	// \x83o\x83b\x83t\x83@\x83T\x83C\x83Y\x82̃`\x83F\x83b\x83N
 	if (str_len > c->local_maxpacket) {
-		logprintf(LOG_LEVEL_WARNING, __FUNCTION__ ": Data length is larger than local_maxpacket. "
-			"len:%d local_maxpacket:%d", str_len, c->local_maxpacket);
+		logprintf(LOG_LEVEL_WARNING, "%s: Data length is larger than local_maxpacket. "
+			"len:%d local_maxpacket:%d", __FUNCTION__, str_len, c->local_maxpacket);
 	}
 	if (str_len > c->local_window) {
 		// TODO: logging
 		// local window size\x82\xE6\x82\xE8\x91傫\x82ȃp\x83P\x83b\x83g\x82͎̂Ă\xE9
-		logprintf(LOG_LEVEL_WARNING, __FUNCTION__ ": Data length is larger than local_window. "
-			"len:%d local_window:%d", str_len, c->local_window);
+		logprintf(LOG_LEVEL_WARNING, "%s: Data length is larger than local_window. "
+			"len:%d local_window:%d", __FUNCTION__, str_len, c->local_window);
 		return FALSE;
 	}
 
@@ -8986,7 +9048,7 @@
 	c = ssh2_channel_lookup(id);
 	if (c == NULL) {
 		// TODO:
-		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": channel not found. (%d)", id);
+		logprintf(LOG_LEVEL_ERROR, "%s: channel not found. (%d)", __FUNCTION__, id);
 		return FALSE;
 	}
 
@@ -9001,14 +9063,14 @@
 	// \x83o\x83b\x83t\x83@\x83T\x83C\x83Y\x82̃`\x83F\x83b\x83N
 	if (strlen > c->local_maxpacket) {
 		// TODO: logging
-		logprintf(LOG_LEVEL_WARNING, __FUNCTION__ ": Data length is larger than local_maxpacket. "
-			"len:%d local_maxpacket:%d", strlen, c->local_maxpacket);
+		logprintf(LOG_LEVEL_WARNING, "%s: Data length is larger than local_maxpacket. "
+			"len:%d local_maxpacket:%d", __FUNCTION__, strlen, c->local_maxpacket);
 	}
 	if (strlen > c->local_window) {
 		// TODO: logging
 		// local window size\x82\xE6\x82\xE8\x91傫\x82ȃp\x83P\x83b\x83g\x82͎̂Ă\xE9
-		logprintf(LOG_LEVEL_WARNING, __FUNCTION__ ": Data length is larger than local_window. "
-			"len:%d local_window:%d", strlen, c->local_window);
+		logprintf(LOG_LEVEL_WARNING, "%s: Data length is larger than local_window. "
+			"len:%d local_window:%d", __FUNCTION__, strlen, c->local_window);
 		return FALSE;
 	}
 
@@ -9064,7 +9126,7 @@
 	c = ssh2_channel_lookup(id);
 	if (c == NULL) {
 		// TODO:
-		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": channel not found. (%d)", id);
+		logprintf(LOG_LEVEL_ERROR, "%s: channel not found. (%d)", __FUNCTION__, id);
 		return FALSE;
 	}
 
@@ -9097,7 +9159,7 @@
 	buffer_t *msg;
 	unsigned char *outmsg;
 
-	logputs(LOG_LEVEL_VERBOSE, __FUNCTION__ ": SSH2_MSG_CHANNEL_OPEN was received.");
+	logprintf(LOG_LEVEL_VERBOSE, "%s: SSH2_MSG_CHANNEL_OPEN was received.", __FUNCTION__);
 
 	// 6byte\x81i\x83T\x83C\x83Y\x81{\x83p\x83f\x83B\x83\x93\x83O\x81{\x83^\x83C\x83v\x81j\x82\xF0\x8E\xE6\x82菜\x82\xA2\x82\xBD\x88ȍ~\x82̃y\x83C\x83\x8D\x81[\x83h
 	data = pvar->ssh_state.payload;
@@ -9115,14 +9177,14 @@
 	remote_maxpacket = get_uint32_MSBfirst(data);
 	data += 4;
 
-	logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__
-		": type=%s, channel=%d, init_winsize=%d, max_packetsize:%d",
+	logprintf(LOG_LEVEL_VERBOSE,
+		"%s: type=%s, channel=%d, init_winsize=%d, max_packetsize:%d", __FUNCTION__,
 		NonNull(ctype), remote_id, remote_window, remote_maxpacket);
 
 	// check Channel Type(string)
 	if (ctype == NULL) {
 		// ctype \x82\xAA NULL \x82Ŗ\xB3\x82\xA2\x8E\x96\x82̕ۏ؂ׁ̈A\x90\xE6\x82Ƀ`\x83F\x83b\x83N\x82\xB7\x82\xE9
-		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_get_string returns NULL. (ctype)");
+		logprintf(LOG_LEVEL_ERROR, "%s: buffer_get_string returns NULL. (ctype)", __FUNCTION__);
 	}
 	else if (strcmp(ctype, "forwarded-tcpip") == 0) { // port-forwarding(remote to local)
 		char *listen_addr, *orig_addr;
@@ -9137,8 +9199,8 @@
 		data += 4;
 
 		if (listen_addr && orig_addr) {
-			logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__
-				": %s: listen_addr=%s, listen_port=%d, orig_addr=%s, orig_port=%d",
+			logprintf(LOG_LEVEL_VERBOSE,
+				"%s: %s: listen_addr=%s, listen_port=%d, orig_addr=%s, orig_port=%d", __FUNCTION__,
 				ctype, listen_addr, listen_port, orig_addr, orig_port);
 			// searching request entry by listen_port & create_local_channel
 			FWD_open(pvar, remote_id, listen_addr, listen_port, orig_addr, orig_port, &chan_num);
@@ -9162,8 +9224,8 @@
 			c->remote_maxpacket = remote_maxpacket;
 		}
 		else {
-			logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": %s: buffer_get_string returns NULL. "
-				"linsten_addr=%s, orig_addr=%s",
+			logprintf(LOG_LEVEL_ERROR, "%s: %s: buffer_get_string returns NULL. "
+				"linsten_addr=%s, orig_addr=%s", __FUNCTION__,
 				ctype, NonNull(listen_addr), NonNull(orig_addr));
 		}
 		free(listen_addr);
@@ -9178,7 +9240,7 @@
 		orig_port = get_uint32_MSBfirst(data);
 		data += 4;
 
-		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": %s: orig_addr=%s, orig_port=%d",
+		logprintf(LOG_LEVEL_VERBOSE, "%s: %s: orig_addr=%s, orig_port=%d", __FUNCTION__,
 			ctype, orig_str, orig_port);
 
 		free(orig_str);
@@ -9226,7 +9288,7 @@
 			msg = buffer_init();
 			if (msg == NULL) {
 				// TODO: error check
-				logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
+				logprintf(LOG_LEVEL_ERROR, "%s: buffer_init returns NULL.", __FUNCTION__);
 				return FALSE;
 			}
 			buffer_put_int(msg, remote_id);
@@ -9240,7 +9302,7 @@
 			finish_send_packet(pvar);
 			buffer_free(msg);
 
-			logputs(LOG_LEVEL_VERBOSE, __FUNCTION__ ": SSH2_MSG_CHANNEL_OPEN_FAILURE was sent.");
+			logprintf(LOG_LEVEL_VERBOSE, "%s: SSH2_MSG_CHANNEL_OPEN_FAILURE was sent.", __FUNCTION__ );
 		}
 
 	} else {
@@ -9276,7 +9338,7 @@
 	c = ssh2_channel_lookup(id);
 	if (c == NULL) {
 		// TODO:
-		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": channel not found. (%d)", id);
+		logprintf(LOG_LEVEL_ERROR, "%s: channel not found. (%d)", __FUNCTION__, id);
 		return FALSE;
 	}
 
@@ -9336,7 +9398,7 @@
 	c = ssh2_channel_lookup(id);
 	if (c == NULL) {
 		// TODO:
-		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": channel not found. (%d)", id);
+		logprintf(LOG_LEVEL_ERROR, "%s: channel not found. (%d)", __FUNCTION__, id);
 		return FALSE;
 	}
 
@@ -9345,19 +9407,19 @@
 	want_reply = data[0];
 	data += 1;
 
-	logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__
-		": local=%d, remote=%d, request=%s, want_reply=%d",
+	logprintf(LOG_LEVEL_VERBOSE,
+		"%s: local=%d, remote=%d, request=%s, want_reply=%d",  __FUNCTION__,
 		c->self_id, c->remote_id, NonNull(request), want_reply);
 
 	if (request == NULL) {
 		// request \x82\xAA NULL \x82Ŗ\xB3\x82\xA2\x8E\x96\x82̕ۏ\xD8
-		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_get_string returns NULL. (request)");
+		logprintf(LOG_LEVEL_ERROR, "%s: buffer_get_string returns NULL. (request)", __FUNCTION__);
 	}
 	else if (strcmp(request, "exit-status") == 0) {
 		// \x8FI\x97\xB9\x83R\x81[\x83h\x82\xAA\x8A܂܂\xEA\x82Ă\xA2\x82\xE9\x82Ȃ\xE7\x82\xCE
 		int estat = get_uint32_MSBfirst(data);
 		success = 1;
-		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": exit-status=%d", estat);
+		logprintf(LOG_LEVEL_VERBOSE, "%s: exit-status=%d", __FUNCTION__, estat);
 	}
 	else if (strcmp(request, "keepa****@opens*****") == 0) {
 		// \x8CÂ\xA2 OpenSSH \x82ł\xCD SUCCESS \x82\xF0\x95Ԃ\xB5\x82Ă\xE0 keepalive \x82\xC9
@@ -9382,7 +9444,7 @@
 		msg = buffer_init();
 		if (msg == NULL) {
 			// TODO: error check
-			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
+			logprintf(LOG_LEVEL_ERROR, "%s: buffer_init returns NULL.", __FUNCTION__);
 			return FALSE;
 		}
 		buffer_put_int(msg, c->remote_id);
@@ -9394,9 +9456,9 @@
 		buffer_free(msg);
 
 		if (success) {
-			logputs(LOG_LEVEL_VERBOSE, __FUNCTION__ ": SSH2_MSG_CHANNEL_SUCCESS was sent.");
+			logprintf(LOG_LEVEL_VERBOSE, "%s: SSH2_MSG_CHANNEL_SUCCESS was sent.", __FUNCTION__);
 		} else {
-			logputs(LOG_LEVEL_VERBOSE, __FUNCTION__ ": SSH2_MSG_CHANNEL_FAILURE was sent.");
+			logprintf(LOG_LEVEL_VERBOSE, "%s: SSH2_MSG_CHANNEL_FAILURE was sent.", __FUNCTION__);
 		}
 	}
 
@@ -9429,7 +9491,7 @@
 	if (c == NULL) {
 		// channel close\x8C\xE3\x82\xC9adjust message\x82\xAA\x92x\x82\xEA\x82Ă\xE2\x82\xC1\x82Ă\xAD\x82\xE9\x83P\x81[\x83X\x82\xE0\x82\xA0\x82邽\x82߁A
 		// FALSE\x82ł͕Ԃ\xB3\x82Ȃ\xA2\x82悤\x82ɂ\xB7\x82\xE9\x81B(2007.12.26 yutaka)
-		logprintf(LOG_LEVEL_WARNING, __FUNCTION__ ": channel not found. (%d)", id);
+		logprintf(LOG_LEVEL_WARNING, "%s: channel not found. (%d)", __FUNCTION__, id);
 		return TRUE;
 	}
 
@@ -9473,8 +9535,8 @@
 		req_len = get_uint32_MSBfirst(data);
 		if (req_len > AGENT_MAX_MSGLEN - 4) {
 			logprintf(LOG_LEVEL_NOTICE,
-				__FUNCTION__ ": Agent Forwarding Error: server request is too large. "
-				"size=%u, allowd max=%u.", req_len, AGENT_MAX_MSGLEN-4);
+				"%s: Agent Forwarding Error: server request is too large. size=%u, allowd max=%u.",
+				__FUNCTION__ , req_len, AGENT_MAX_MSGLEN-4);
 			if (pvar->session_settings.ForwardAgentNotify) {
 				TCHAR title[MAX_UIMSG];
 				TCHAR uimsg[MAX_UIMSG];
@@ -9507,7 +9569,7 @@
 
 	agent_query(data, *agent_request_len, &response, &resplen, NULL, NULL);
 	if (response == NULL || resplen < 5) {
-		logprintf(LOG_LEVEL_NOTICE, __FUNCTION__ "Agent Forwarding Error: agent_query is failed.");
+		logprintf(LOG_LEVEL_NOTICE, "%s Agent Forwarding Error: agent_query is failed.", __FUNCTION__);
 		goto error;
 	}
 

Modified: branches/cmake/ttssh2/ttxssh/ttxssh.c
===================================================================
--- branches/cmake/ttssh2/ttxssh/ttxssh.c	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/ttssh2/ttxssh/ttxssh.c	2019-05-19 15:06:12 UTC (rev 7694)
@@ -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
@@ -33,6 +33,7 @@
    Tera Term by Takashi Teranishi (teran****@rikax*****)
 */
 
+#include "teraterm_conf.h"
 #include "ttxssh.h"
 #include "fwdui.h"
 #include "util.h"
@@ -41,6 +42,7 @@
 #include "ttlib.h"
 #include "keyfiles.h"
 #include "arc4random.h"
+#include "auth.h"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -82,6 +84,7 @@
 #include "sftp.h"
 
 #include "compat_w95.h"
+#include "compat_win.h"
 
 #include "libputty.h"
 
@@ -470,6 +473,8 @@
 	}
 
 	READ_STD_STRING_OPTION(DefaultUserName);
+	settings->DefaultUserType = GetPrivateProfileInt("TTSSH", "DefaultUserType", 1, fileName);
+
 	READ_STD_STRING_OPTION(DefaultForwarding);
 	READ_STD_STRING_OPTION(DefaultRhostsLocalUserName);
 	READ_STD_STRING_OPTION(DefaultRhostsHostPrivateKeyFile);
@@ -594,6 +599,8 @@
 	_itoa(settings->CompressionLevel, buf, 10);
 	WritePrivateProfileString("TTSSH", "Compression", buf, fileName);
 
+	_itoa(settings->DefaultUserType, buf, 10);
+	WritePrivateProfileString("TTSSH", "DefaultUserType", buf, fileName);
 	WritePrivateProfileString("TTSSH", "DefaultUserName",
 	                          settings->DefaultUserName, fileName);
 
@@ -1000,7 +1007,11 @@
 	}
 }
 
-void logprintf(int level, char *fmt, ...)
+#if defined(_MSC_VER)
+void logprintf(int level, _Printf_format_string_ const char *fmt, ...)
+#else
+void logprintf(int level, const char *fmt, ...)
+#endif
 {
 	char buff[4096];
 	va_list params;
@@ -1054,7 +1065,11 @@
 	//strncat_s(buf, buflen, "\n", _TRUNCATE);
 }
 
-void logprintf_hexdump(int level, char *data, int len, char *fmt, ...)
+#if defined(_MSC_VER)
+void logprintf_hexdump(int level, const char *data, int len, _Printf_format_string_ const char *fmt, ...)
+#else
+void logprintf_hexdump(int level, const char *data, int len, const char *fmt, ...)
+#endif
 {
 	char buff[4096];
 	va_list params;
@@ -1302,6 +1317,7 @@
 	BOOL Ok;
 //	LOGFONT logfont;
 //	HFONT font;
+	char uimsg[MAX_UIMSG];
 	static HWND hwndHostname     = NULL; // HOSTNAME dropdown
 	static HWND hwndHostnameEdit = NULL; // Edit control on HOSTNAME dropdown
 
@@ -1538,6 +1554,8 @@
 		}
 #endif
 
+		CenterWindow(dlg, GetParent(dlg));
+
 		// SetFocus()\x82Ńt\x83H\x81[\x83J\x83X\x82\xF0\x82\xA0\x82킹\x82\xBD\x8Fꍇ\x81AFALSE\x82\xF0\x95Ԃ\xB7\x95K\x97v\x82\xAA\x82\xA0\x82\xE9\x81B
 		// TRUE\x82\xF0\x95Ԃ\xB7\x82ƁATABSTOP\x91Ώۂ̈\xEA\x94Ԃ͂\xB6\x82߂̃R\x83\x93\x83g\x83\x8D\x81[\x83\x8B\x82\xAA\x91I\x82΂\xEA\x82\xE9\x81B
 		// (2004.11.23 yutaka)
@@ -1716,12 +1734,13 @@
 
 static void UTIL_SetDialogFont()
 {
-	SetDialogFont(pvar->ts->SetupFName, pvar->ts->UILanguageFile, "TTSSH");
+	SetDialogFont(pvar->ts->SetupFName, pvar->ts->UILanguageFile, "TTSSH", "DLG_TAHOMA_FONT");
 }
 
 static BOOL PASCAL TTXGetHostName(HWND parent, PGetHNRec rec)
 {
-	UTIL_SetDialogFont();
+	SetDialogFont(pvar->ts->SetupFName,
+				  pvar->ts->UILanguageFile, "TTSSH", "DLG_SYSTEM_FONT");
 	return (BOOL) DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_HOSTDLG),
 	                             parent, TTXHostDlg, (LPARAM)rec);
 }
@@ -2485,11 +2504,13 @@
 	SetDlgItemTextA(dlg, IDC_PUTTY_VERSION, buf);
 }
 
+#if 0
 // WM_MOUSEWHEEL \x82\xCD winuser.h \x83w\x83b\x83_\x82Ő錾\x82\xB3\x82\xEA\x82Ă\xA2\x82܂\xB7\x82\xAA\x81A#define _WIN32_WINNT 0x0400 \x82\xAA\x90錾\x82\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x82ƔF\x8E\xAF\x82\xB3\x82\xEA\x82܂\xB9\x82\xF1\x81B
-#define WM_MOUSEWHEEL                   0x020A
+#define WM_MOUSEWHEEL                   0x020A1
 #define WHEEL_DELTA                     120
 #define GET_WHEEL_DELTA_WPARAM(wParam)  ((short)HIWORD(wParam))
 #define GET_KEYSTATE_WPARAM(wParam)     (LOWORD(wParam))
+#endif
 
 static WNDPROC g_defAboutDlgEditWndProc;  // Edit Control\x82̃T\x83u\x83N\x83\x89\x83X\x89\xBB\x97p
 static int g_deltaSumAboutDlg = 0;        // \x83}\x83E\x83X\x83z\x83C\x81[\x83\x8B\x82\xCCDelta\x97ݐϗp
@@ -2566,27 +2587,20 @@
 
 		// Edit control\x82͓\x99\x95\x9D\x83t\x83H\x83\x93\x83g\x82ŕ\\x8E\xA6\x82\xB5\x82\xBD\x82\xA2\x82̂ŁA\x95ʐݒ\xE8\x8F\xEE\x95񂩂\xE7\x83t\x83H\x83\x93\x83g\x82\xF0\x83Z\x83b\x83g\x82\xB7\x82\xE9\x81B
 		// (2014.5.5. yutaka)
-#if 0
-		if (UTIL_get_lang_font("DLG_ABOUT_FONT", dlg, &logfont, &DlgAboutTextFont, pvar)) {
-			SendDlgItemMessage(dlg, IDC_ABOUTTEXT, WM_SETFONT, (WPARAM)DlgAboutTextFont, MAKELPARAM(TRUE,0));
-		} else {
+		if (!UTIL_get_lang_font("DLG_ABOUT_FONT", dlg, NULL, &DlgAboutTextFont, pvar)) {
 			// \x93ǂݍ\x9E\x82߂Ȃ\xA9\x82\xC1\x82\xBD\x8Fꍇ\x82͓\x99\x95\x9D\x83t\x83H\x83\x93\x83g\x82\xF0\x8Ew\x92肷\x82\xE9\x81B
 			// \x83G\x83f\x83B\x83b\x83g\x83R\x83\x93\x83g\x83\x8D\x81[\x83\x8B\x82̓_\x83C\x83A\x83\x8D\x83O\x82Ɠ\xAF\x82\xB6\x83t\x83H\x83\x93\x83g\x82\xF0\x8E\x9D\x82\xC1\x82Ă\xA8\x82\xE8
 			// \x93\x99\x95\x9D\x83t\x83H\x83\x93\x83g\x82ł͂Ȃ\xA2\x82\xBD\x82߁B
+			LOGFONTA logfont = {0};
 			strncpy_s(logfont.lfFaceName, sizeof(logfont.lfFaceName), "Courier New", _TRUNCATE);
 			logfont.lfCharSet = 0;
 			logfont.lfHeight = MulDiv(8, GetDeviceCaps(GetDC(dlg),LOGPIXELSY) * -1, 72);
 			logfont.lfWidth = 0;
-			if ((DlgAboutTextFont = CreateFontIndirectA(&logfont)) != NULL) {
-				SendDlgItemMessage(dlg, IDC_ABOUTTEXT, WM_SETFONT, (WPARAM)DlgAboutTextFont, MAKELPARAM(TRUE,0));
-			}
-			else {
-				DlgAboutTextFont = NULL;
-			}
+			DlgAboutTextFont = CreateFontIndirect(&logfont);	// \x83G\x83\x89\x81[\x8E\x9E NULL
 		}
-#else
-		DlgAboutTextFont = NULL;
-#endif
+		if (DlgAboutTextFont != NULL) {
+			SendDlgItemMessage(dlg, IDC_ABOUTTEXT, WM_SETFONT, (WPARAM)DlgAboutTextFont, MAKELPARAM(TRUE,0));
+		}
 
 		// \x83A\x83C\x83R\x83\x93\x82𓮓I\x82ɃZ\x83b\x83g
 		{
@@ -2611,6 +2625,8 @@
 		g_deltaSumAboutDlg = 0;
 		g_defAboutDlgEditWndProc = (WNDPROC)SetWindowLongPtr(GetDlgItem(dlg, IDC_ABOUTTEXT), GWLP_WNDPROC, (LONG_PTR)AboutDlgEditWindowProc);
 
+		CenterWindow(dlg, GetParent(dlg));
+
 		return FALSE;
 
 	case WM_COMMAND:
@@ -3524,6 +3540,9 @@
 			DlgSetupFont = NULL;
 		}
 #endif
+
+		CenterWindow(dlg, GetParent(dlg));
+
 		return TRUE;
 	case WM_COMMAND:
 		switch (LOWORD(wParam)) {
@@ -4087,6 +4106,7 @@
 #ifdef SFTP_DEBUG
 		ShowWindow(GetDlgItem(dlg, IDC_SFTP_TEST), SW_SHOW);
 #endif
+		CenterWindow(dlg, GetParent(dlg));
 
 		return TRUE;
 
@@ -4291,15 +4311,6 @@
 	return;
 }
 
-static void init_password_control(HWND dlg, int item)
-{
-	HWND passwordControl = GetDlgItem(dlg, item);
-
-	SetWindowLongPtr(passwordControl, GWLP_USERDATA,
-	              SetWindowLongPtr(passwordControl, GWLP_WNDPROC,
-	                            (LONG_PTR) password_wnd_proc));
-}
-
 // bcrypt KDF\x8C`\x8E\xAE\x82Ŕ閧\x8C\xAE\x82\xF0\x95ۑ\xB6\x82\xB7\x82\xE9
 // based on OpenSSH 6.5:key_save_private(), key_private_to_blob2()
  static void save_bcrypt_private_key(char *passphrase, const TCHAR *filename, char *comment, HWND dlg, PTInstVar pvar, int rounds)
@@ -4555,14 +4566,13 @@
 				DlgHostFont = NULL;
 			}
 #endif
-
+#if 0
 			init_password_control(dlg, IDC_KEY_EDIT);
 			init_password_control(dlg, IDC_CONFIRM_EDIT);
+#endif
 
-			// default key type
-			SendMessage(GetDlgItem(dlg, IDC_RSA_TYPE), BM_SETCHECK, BST_CHECKED, 0);
-			key_type = KEY_RSA;
-			saved_key_bits = GetDlgItemInt(dlg, IDC_KEYBITS, NULL, FALSE);
+		init_password_control(pvar, dlg, IDC_KEY_EDIT, NULL);
+		init_password_control(pvar, dlg, IDC_CONFIRM_EDIT, NULL);
 
 			// default key bits
 			SetDlgItemInt(dlg, IDC_KEYBITS, SSH_KEYGEN_DEFAULT_BITS, FALSE);
@@ -4592,6 +4602,8 @@
 		SetDlgItemInt(dlg, IDC_BCRYPT_KDF_ROUNDS, DEFAULT_ROUNDS, FALSE);
 		SendDlgItemMessage(dlg, IDC_BCRYPT_KDF_ROUNDS, EM_LIMITTEXT, 4, 0);
 
+		CenterWindow(dlg, GetParent(dlg));
+
 		}
 		return TRUE;
 

Modified: branches/cmake/ttssh2/ttxssh/ttxssh.h
===================================================================
--- branches/cmake/ttssh2/ttxssh/ttxssh.h	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/ttssh2/ttxssh/ttxssh.h	2019-05-19 15:06:12 UTC (rev 7694)
@@ -90,6 +90,11 @@
 #include "tttypes.h"
 #include "ttplugin.h"
 
+#if defined(_MSC_VER) && _MSC_VER < 1910
+// 2017\x96\xA2\x96\x9E\x82̂Ƃ\xAB\x82͖\xB3\x8C\xF8\x82Ƃ\xB7\x82\xE9
+#define _Printf_format_string_
+#endif
+
 HANDLE hInst; /* Instance handle of TTXSSH.DLL */
 
 #define ID_SSHSCPMENU       52110
@@ -136,6 +141,8 @@
 typedef struct _TS_SSH {
 	BOOL Enabled;
 	int CompressionLevel; /* 0 = NONE, else 1-9 */
+
+	int DefaultUserType;	/* 0/1/2 = no input/DefaultUserName/Windows logon user */
 	char DefaultUserName[256];
 
 	/* this next option is a string of digits. Each digit represents a
@@ -354,8 +361,16 @@
 void notify_nonfatal_error(PTInstVar pvar, char *msg);
 void notify_fatal_error(PTInstVar pvar, char *msg, BOOL send_disconnect);
 void logputs(int level, char *msg);
-void logprintf(int level, char *fmt, ...);
-void logprintf_hexdump(int level, char *data, int len, char *fmt, ...);
+#if defined(_MSC_VER)
+void logprintf(int level, _Printf_format_string_ const char *fmt, ...);
+void logprintf_hexdump(int level, const char *data, int len, _Printf_format_string_ const char *fmt, ...);
+#elif defined(__GNUC__)
+void logprintf(int level, const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
+void logprintf_hexdump(int level, const char *data, int len, const char *fmt, ...) __attribute__ ((format (printf, 4, 5)));
+#else
+void logprintf(int level, const char *fmt, ...);
+void logprintf_hexdump(int level, const char *data, int len, const char *fmt, ...);
+#endif
 
 void get_teraterm_dir_relative_name(char *buf, int bufsize, char *basename);
 int copy_teraterm_dir_relative_path(char *dest, int destsize, const char *basename);

Modified: branches/cmake/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- branches/cmake/ttssh2/ttxssh/ttxssh.rc	2019-05-19 15:04:55 UTC (rev 7693)
+++ branches/cmake/ttssh2/ttxssh/ttxssh.rc	2019-05-19 15:06:12 UTC (rev 7694)
@@ -19,10 +19,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
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -51,42 +49,41 @@
     DEFPUSHBUTTON   "OK",IDOK,112,310,50,14
 END
 
-IDD_SSHAUTH DIALOGEX 0, 0, 330, 262
+IDD_SSHAUTH DIALOGEX 0, 0, 307, 247
 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,281,10
+    LTEXT           "User &name:",IDC_SSHUSERNAMELABEL,17,31,46,8
+    EDITTEXT        IDC_SSHUSERNAME,73,29,146,12,ES_AUTOHSCROLL
+    PUSHBUTTON      "",IDC_USERNAME_OPTION,224,28,14,14,BS_ICON
+    LTEXT           "&Passphrase:",IDC_SSHPASSWORDCAPTION,17,46,47,8
+    EDITTEXT        IDC_SSHPASSWORD,73,44,146,12,ES_PASSWORD | ES_AUTOHSCROLL
+    PUSHBUTTON      "",IDC_SSHPASSWORD_OPTION,224,43,14,14,BS_ICON
     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,61,132,10
+    CONTROL         "F&orward agent",IDC_FORWARD_AGENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,75,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,16,102,252,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,16,115,251,10
+    CONTROL         "Use r&hosts to log in (SSH1)",IDC_SSHUSERHOSTS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,17,140,250,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,17,187,252,10
+    CONTROL         "Use P&ageant to log in",IDC_SSHUSEPAGEANT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,17,203,249,8
+    LTEXT           "Private &key file:",IDC_RSAFILENAMELABEL,29,129,88,8
+    EDITTEXT        IDC_RSAFILENAME,122,127,150,13,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_CHOOSERSAFILE,276,127,13,13,WS_GROUP
+    LTEXT           "Local &user name:",IDC_LOCALUSERNAMELABEL,29,155,88,8
+    EDITTEXT        IDC_LOCALUSERNAME,122,153,106,13,ES_AUTOHSCROLL
+    LTEXT           "Host private key &file:",IDC_HOSTRSAFILENAMELABEL,28,173,88,8
+    EDITTEXT        IDC_HOSTRSAFILENAME,122,171,151,13,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_CHOOSEHOSTRSAFILE,276,171,13,13
+    DEFPUSHBUTTON   "OK",IDOK,199,227,50,14,WS_GROUP
+    PUSHBUTTON      "&Disconnect",IDCANCEL,255,227,47,14
+    GROUPBOX        "Authentication methods ",IDC_STATIC,6,89,295,132
 END
 
 IDD_HOSTDLG DIALOGEX 20, 20, 240, 128
@@ -214,37 +211,39 @@
     DEFPUSHBUTTON   "&Disconnect",IDCANCEL,145,256,50,14,WS_GROUP
 END
 
-IDD_SSHAUTHSETUP DIALOGEX 0, 0, 330, 228
+IDD_SSHAUTHSETUP DIALOGEX 0, 0, 305, 345
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "TTSSH: Authentication Setup"
 FONT 8, "Tahoma", 0, 0, 0x0
 BEGIN
     LTEXT           "Select defaults for authentication:",IDC_SSHAUTHBANNER,6,7,166,10
-    LTEXT           "User &name:",IDC_SSHUSERNAMELABEL,13,24,57,8,0,WS_EX_RIGHT
-    EDITTEXT        IDC_SSHUSERNAME,75,22,145,12,ES_AUTOHSCROLL
+    GROUPBOX        "User name",IDC_STATIC,6,22,295,88
+    CONTROL         "&Do not enter username",IDC_SSH_NO_USERNAME,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,19,35,152,10
+    CONTROL         "U&se following username",IDC_SSH_DEFAULTUSERNAME,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,19,50,152,10
+    CONTROL         "Us&e system username",IDC_SSH_WINDOWS_USERNAME,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,19,78,152,10
+    EDITTEXT        IDC_SSHUSERNAME,35,62,145,12,ES_AUTOHSCROLL
+    LTEXT           "Current username is ""%s""",IDC_SSH_WINDOWS_USERNAME_TEXT,35,93,128,10
+    GROUPBOX        "Authentication methods ",IDC_STATIC,6,120,295,200
     CONTROL         "Use p&lain password to log in",IDC_SSHUSEPASSWORD,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,13,45,120,10
+                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,19,134,120,10
     CONTROL         "Use &RSA/DSA/ECDSA/ED25519 key to log in",IDC_SSHUSERSA,
-                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,73,152,10
-    CONTROL         "Use r&hosts to log in (SSH1)",IDC_SSHUSERHOSTS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,100,99,10
+                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,19,148,152,10
+    CONTROL         "Use r&hosts to log in (SSH1)",IDC_SSHUSERHOSTS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,19,191,99,10
     CONTROL         "Use SSH1:challenge/response(&TIS) / SSH2:keyboard-interactive to log in",IDC_SSHUSETIS,
-                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,14,144,300,10
-    CONTROL         "Use P&ageant to log in",IDC_SSHUSEPAGEANT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,14,171,278,10
-    PUSHBUTTON      "Private &key file:",IDC_CHOOSERSAFILE,169,72,58,14,WS_GROUP
-    EDITTEXT        IDC_RSAFILENAME,231,73,89,13,ES_AUTOHSCROLL
-    RTEXT           "Local &user name:",IDC_LOCALUSERNAMELABEL,118,100,91,8,0,WS_EX_RIGHT
-    EDITTEXT        IDC_LOCALUSERNAME,214,99,106,13,ES_AUTOHSCROLL
-    PUSHBUTTON      "Host private key &file:",IDC_CHOOSEHOSTRSAFILE,92,114,73,14
-    EDITTEXT        IDC_HOSTRSAFILENAME,169,115,151,13,ES_AUTOHSCROLL
+                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,19,271,282,10
+    CONTROL         "Use P&ageant to log in",IDC_SSHUSEPAGEANT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,19,286,278,10
+    LTEXT           "Private &key file:",IDC_RSAFILENAMELABEL,35,160,144,8
+    EDITTEXT        IDC_RSAFILENAME,46,172,153,13,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_CHOOSERSAFILE,207,172,15,14,WS_GROUP
+    LTEXT           "Local &user name:",IDC_LOCALUSERNAMELABEL,35,206,91,8
+    EDITTEXT        IDC_LOCALUSERNAME,46,219,106,13,ES_AUTOHSCROLL
+    LTEXT           "Host private key &file:",IDC_HOSTRSAFILENAMELABEL,35,234,165,8
+    EDITTEXT        IDC_HOSTRSAFILENAME,46,247,151,13,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_CHOOSEHOSTRSAFILE,210,246,15,14
     CONTROL         "&Check the enabled authentication methods before login (SSH2)",IDC_CHECKAUTH,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,192,281,10
-    DEFPUSHBUTTON   "OK",IDOK,96,207,50,14,WS_GROUP
-    PUSHBUTTON      "Cancel",IDCANCEL,183,207,50,14
-    GROUPBOX        "",IDC_STATIC,6,36,320,25
-    GROUPBOX        "",IDC_STATIC,6,64,320,25
-    GROUPBOX        "",IDC_STATIC,6,91,320,42
-    GROUPBOX        "",IDC_STATIC,6,135,320,25
-    GROUPBOX        "",IDC_STATIC,6,162,320,25
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,303,281,10
+    DEFPUSHBUTTON   "OK",IDOK,195,324,50,14,WS_GROUP
+    PUSHBUTTON      "Cancel",IDCANCEL,251,324,50,14
 END
 
 IDD_SSHFWDSETUP DIALOGEX 0, 0, 309, 185
@@ -449,7 +448,7 @@
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
+GUIDELINES DESIGNINFO
 BEGIN
     IDD_ABOUTDIALOG, DIALOG
     BEGIN
@@ -463,8 +462,23 @@
     BEGIN
         LEFTMARGIN, 6
         RIGHTMARGIN, 302
+        VERTGUIDE, 17
+        VERTGUIDE, 28
+        VERTGUIDE, 40
+        VERTGUIDE, 73
+        VERTGUIDE, 117
+        VERTGUIDE, 122
+        VERTGUIDE, 219
+        VERTGUIDE, 224
+        VERTGUIDE, 276
+        VERTGUIDE, 287
         TOPMARGIN, 3
-        BOTTOMMARGIN, 256
+        BOTTOMMARGIN, 241
+        HORZGUIDE, 35
+        HORZGUIDE, 50
+        HORZGUIDE, 133
+        HORZGUIDE, 159
+        HORZGUIDE, 177
     END
 
     IDD_HOSTDLG, DIALOG
@@ -501,9 +515,12 @@
     IDD_SSHAUTHSETUP, DIALOG
     BEGIN
         LEFTMARGIN, 6
-        RIGHTMARGIN, 302
+        RIGHTMARGIN, 301
+        VERTGUIDE, 19
+        VERTGUIDE, 35
+        VERTGUIDE, 46
         TOPMARGIN, 7
-        BOTTOMMARGIN, 221
+        BOTTOMMARGIN, 338
     END
 
     IDD_SSHFWDSETUP, DIALOG
@@ -602,7 +619,10 @@
 
 2 TEXTINCLUDE 
 BEGIN
-    "#include ""afxres.h""\r\n"
+    "#include <windows.h>\r\n"
+    "#ifndef IDC_STATIC\r\n"
+    "#define IDC_STATIC -1\r\n"
+    "#endif\r\n"
     "\0"
 END
 
@@ -623,8 +643,29 @@
 // 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"
+
+IDI_DROPDOWN